diff mbox

[U-Boot,1/2] omap3_pandora: Switch to use config_distro_bootcmd.

Message ID 20160830201632.10704-2-vagrant@debian.org
State Accepted
Commit 40abfeecf107d79493bfdb6fb5bed3648a97f669
Delegated to: Tom Rini
Headers show

Commit Message

Vagrant Cascadian Aug. 30, 2016, 8:16 p.m. UTC 
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 | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Comments

Tom Rini Sept. 7, 2016, 5:59 p.m. UTC | #1 
On Tue, Aug 30, 2016 at 01:16:31PM -0700, Vagrant Cascadian wrote:

> Add support for using distro_bootcmd to the omap3_pandora target,
> falling back to prior behavior.
> 
> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 728a4e5..fd51811 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 + \