From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 1 Sep 2011 13:34:32 +0200 Subject: [U-Boot] [PATCH 06/15] Look for boot.scr on 'mmc 0:3' instead 'mmc 0' and add support for loading boot.scr from 'mmc 2:1' In-Reply-To: <1314876881-9669-1-git-send-email-pali.rohar@gmail.com> References: <201109011304.46581.marek.vasut@gmail.com> <1314876881-9669-1-git-send-email-pali.rohar@gmail.com> Message-ID: <1314876881-9669-6-git-send-email-pali.rohar@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Matan Ziv-Av --- include/configs/nokia_rx51.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 5c3b068..bc4bd0b 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -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" -- 1.7.4.1