From 4f880c317379ee90868cd4f5a67080ef560dac83 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 9 May 2015 11:14:15 +0200 Subject: trdx-image-fstype: fix/improve messages during update Fix and enhance messages durring Colibri VF50/VF61 upgrade. Fix missing run command --- recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr | 7 ++++--- recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr index b2a3bf6..5a00983 100644 --- a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_blk.scr @@ -9,11 +9,12 @@ setenv update_new 'run update_uboot; run update_rootfs; reset' # Upgrade part 1, write new U-Boot, but with old ECC format still... # Store config block temporarly in memory at kernel_addr_r. -setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "successfully updated U-Boot, enter \"reset\", interrupt boot process and enter \"run setupdate\; run upgrade_part2\" to complete upgrade"' +setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' +setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' # Upgrade part 2, use new ECC format for the whole device... -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && \ -run update_uboot && nand erase.part ubi && run update_rootfs' +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' +setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' # fsl_nfc indicates old NAND format (24-bit ECC), start migration process setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' diff --git a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr index 36da10b..f7e9709 100644 --- a/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr +++ b/recipes/images/files/colibri-vf/colibri-vf_bin/flash_eth.scr @@ -9,11 +9,12 @@ setenv update_new 'run update_uboot; run update_rootfs; reset' # Upgrade part 1, write new U-Boot, but with old ECC format still... # Store config block temporarly in memory at kernel_addr_r. -setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "successfully updated U-Boot, enter \"reset\", interrupt boot process and enter \"run setupdate\; run upgrade_part2\" to complete upgrade"' +setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' +setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; upgrade_part2" to complete upgrade.' # Upgrade part 2, use new ECC format for the whole device... -setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && \ -run update_uboot && nand erase.part ubi && run update_rootfs' +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' +setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' # fsl_nfc indicates old NAND format (24-bit ECC), start migration process setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' -- cgit v1.2.3