diff options
| author | Guillaume GARDET <guillaume.gardet@free.fr> | 2014-09-11 11:59:52 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-09-22 15:52:58 +0200 |
| commit | 05d1c24517726c73fabb16c483a5cbd3737ed2a6 (patch) | |
| tree | 3e2bc906d0ea8f9f8b1ff13dd02f9ec92dbbdffe | |
| parent | 42817eb85de1d7dec399c75dbd133ea6b5351a72 (diff) | |
| download | blackbird-obmc-uboot-05d1c24517726c73fabb16c483a5cbd3737ed2a6.tar.gz blackbird-obmc-uboot-05d1c24517726c73fabb16c483a5cbd3737ed2a6.zip | |
imx: nitrogen6x: Make use of both uSD and SD slots to load script or kernel on Sabrelite board
Sabrelite board has two solts: 0 is SD3 (bottom) slot and 1 is uSD4 (top) slot.
This patch makes use of both slots instead of only one.
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
Reviewed-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | include/configs/nitrogen6x.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index d4b0ac9fdb..2a1eb3b773 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -186,7 +186,7 @@ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ - "mmcdev=0\0" \ + "mmcdevs=0 1\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ @@ -238,16 +238,19 @@ "fi;\0" #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "else run netboot; fi" + "for mmcdev in ${mmcdevs}; do " \ + "mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "fi; " \ + "fi; " \ + "fi; " \ + "done; " \ + "run netboot; " #else #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc1\0" \ |
