Look for boot.scr on 'mmc 0:3' instead 'mmc 0' and add support for loading boot.scr from 'mmc 2:1'
PATCH 6/15 Look for boot.scr on 'mmc 0:3' instead 'mmc 0' and add support for loading boot.scr from 'mmc 2:1'
--- include/configs/nokia_rx51.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-)
include/configs/nokia_rx51.h +18 -6
@@ -188,16 +188,22 @@ int rx51_kp_getc(void);"vgacon=setenv con vga; run setcon\0" \"loadaddr=0x82000000\0" \"meegoargs=setenv bootargs\0" \ -"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ +"loadbootscript=fatload mmc 0:3 ${loadaddr} boot.scr\0" \ +"loadibootscript=fatload mmc 2:1 ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \"source ${loadaddr}\0" \"loaduimage=fatload mmc 0:3 ${loadaddr} uImage\0" \ +"loadiuimage=fatload mmc 2:1 ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc ...; " \"run meegoargs; " \"bootm ${loadaddr}\0" \"noloboot=echo Booting NOLO supplied kernel ...; " \"setenv atags ${nolo_atagaddr};" \ -"bootm ${nolo_kernaddr}\0" +"bootm ${nolo_kernaddr}\0" \ +"mmciboot=echo Booting from internal mmc ...; " \ +"fatload mmc 2:1 ${loadaddr} uImage;" \ +"run meegoargs; " \ +"bootm ${loadaddr}\0" #define CONFIG_PREBOOT \"if test $slide_sw != open ; then run noloboot; fi ;" \
@@ -210,12 +216,18 @@ int rx51_kp_getc(void);#define CONFIG_BOOTCOMMAND \ "if mmc init; then " \ - "if run loadbootscript; then " \ + "if run loadibootscript; then " \ + "echo Found boot.scr on mmc 2:1; " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "else run noloboot; " \ + "if run loadbootscript; then " \ + "echo Found boot.scr on mmc 0:3; " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run noloboot; " \ + "fi; " \ "fi; " \ "fi; " \ "else run noloboot; fi"
Signature · 7 lines
1.7.4.1 --nextPart1511561.nRVgJThL9n Content-Disposition: attachment; filename="0007-RX-51-Fixed-compilation-on-top-of-master-changes-fro.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0007-RX-51-Fixed-compilation-on-top-of-master-changes-fro.patch"