summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVagrant Cascadian <vagrant@debian.org>2016-08-30 13:16:31 -0700
committerTom Rini <trini@konsulko.com>2016-09-07 08:48:59 -0400
commit40abfeecf107d79493bfdb6fb5bed3648a97f669 (patch)
treed8e1db0b0360df0c43c4bef7e41729bcd0bf3ffd /include
parent174245b90910438efe31153dd409d53163ea066d (diff)
omap3_pandora: Switch to use config_distro_bootcmd.
Add support for using distro_bootcmd to the omap3_pandora target, falling back to prior behavior. Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Diffstat (limited to 'include')
-rw-r--r--include/configs/omap3_pandora.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 728a4e57318..fd51811a20d 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -85,20 +85,28 @@
#define MTDPARTS_DEFAULT
#endif
-#define CONFIG_EXTRA_ENV_SETTINGS \
- DEFAULT_LINUX_BOOT_ENV \
- "usbtty=cdc_acm\0" \
- "bootargs=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
- "rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
#define CONFIG_BOOTCOMMAND \
+ "run distro_bootcmd; " \
"if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
"source ${loadaddr}; " \
"fi; " \
"ubi part boot && ubifsmount ubi:boot && " \
"ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ DEFAULT_LINUX_BOOT_ENV \
+ "usbtty=cdc_acm\0" \
+ "bootargs=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
+ "rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
+ BOOTENV \
+
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0)
#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \