omap3_pandora: Switch to use config_distro_bootcmd.
authorVagrant Cascadian <vagrant@debian.org>
Tue, 30 Aug 2016 20:16:31 +0000 (13:16 -0700)
committerTom Rini <trini@konsulko.com>
Wed, 7 Sep 2016 12:48:59 +0000 (08:48 -0400)
Add support for using distro_bootcmd to the omap3_pandora target,
falling back to prior behavior.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
include/configs/omap3_pandora.h

index 728a4e573183433ff61cd922e40c9d0918f39da4..fd51811a20dd158415cf23f38608a9d811c77309 100644 (file)
 #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 + \