[PATCH] Narcissus assemble_image: Make image ready for flashing NAND

[Joel A Fernandes]

* Copy a user.txt and uEnv.txt if they exist in /boot in the root fs to the boot partition,
When the user button is pressed, U-boot chooses between these 2 files, user.txt is used
for flashing while uEnv.txt is for a regular boot

* For SD Card image builds, also make a ubi image and copy it to /boot in the root filesystem
This is used by the flashing script to ubiformat the NAND

Signed-off-by: Joel A Fernandes <agnel...@gmail.com>
---
scripts/assemble-image.sh | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/scripts/assemble-image.sh b/scripts/assemble-image.sh
index 6043bde..9c61d7d 100755
--- a/scripts/assemble-image.sh
+++ b/scripts/assemble-image.sh
@@ -126,6 +126,14 @@ if [ -e ${WORKDIR}/conf/${MACHINE}/sd ] ; then
echo "Using uImage from narcissus, no uImage found in rootfs"
fi

+ if [ -e ${TARGET_DIR}/boot/user.txt ]; then
+ cp -v ${TARGET_DIR}/boot/user.txt /mnt/narcissus/sd_image1/
+ fi
+
+ if [ -e ${TARGET_DIR}/boot/uEnv.txt ]; then
+ cp -v ${TARGET_DIR}/boot/uEnv.txt /mnt/narcissus/sd_image1/
+ fi
+
echo "Remounting ${LOOP_DEV}"
umount ${LOOP_DEV}
mount ${LOOP_DEV}
@@ -139,6 +147,10 @@ if [ -e ${WORKDIR}/conf/${MACHINE}/sd ] ; then
tar xzf ${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.tar.gz -C /mnt/narcissus/sd_image2
touch /mnt/narcissus/sd_image2/narcissus-was-here

+ # Make a ubifs and copy it to /boot in the root filesystem. This is required by the flasher
+ do_ubifs
+ mv ${TARGET_DIR}/../${IMAGENAME}-${MACHINE}.ubi /mnt/narcissus/sd_image2/boot/fs.ubi
+
echo "Remounting ${LOOP_DEV_FS}"
umount ${LOOP_DEV_FS}
mount ${LOOP_DEV_FS}
--
1.7.0.4

[Kooi, Koen]

THat's 2 changes in one and I don't like the second one.

Could you please split this patch up and when sending the new one put angstrom-devel in CC:?

Texas Instruments Limited, 800 Pavilion Drive, Northampton, NN4 7YL. Registered in England & Wales under company number 00574102

________________________________________