forked from pool/u-boot
2bae78bb08
- add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - add u-boot-snow (for Chromebook ARM) - add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) OBS-URL: https://build.opensuse.org/request/show/229036 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=24
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
--- ./include/configs/nitrogen6x.h.orig 2014-03-31 23:17:24.341995637 +0200
|
|
+++ ./include/configs/nitrogen6x.h 2014-04-03 10:07:06.314594508 +0200
|
|
@@ -183,13 +183,12 @@
|
|
"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} " \
|
|
"root=${mmcroot}\0" \
|
|
- "loadbootscript=" \
|
|
- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} ${script};\0" \
|
|
"bootscript=echo Running bootscript from mmc ...; " \
|
|
"source\0" \
|
|
"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
|
|
@@ -235,16 +234,14 @@
|
|
"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; " \
|
|
+ "fi; " \
|
|
+ "fi; " \
|
|
+ "done;"
|
|
#else
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"console=ttymxc1\0" \
|