* [U-Boot] [PATCH 0/2] Add support for config_distro_bootcmd to the omap3_pandora target.
@ 2016-08-30 20:16 Vagrant Cascadian
2016-08-30 20:16 ` [U-Boot] [PATCH 1/2] omap3_pandora: Switch to use config_distro_bootcmd Vagrant Cascadian
2016-08-30 20:16 ` [U-Boot] [PATCH 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load Vagrant Cascadian
0 siblings, 2 replies; 5+ messages in thread
From: Vagrant Cascadian @ 2016-08-30 20:16 UTC (permalink / raw)
To: u-boot
The first patch enables distro bootcmd support.
The second patch only sets the bootargs if distro_bootcmd loading
failed.
This is based on the patch series submitted yesterday fixing the mmc
boot syntax for omap3_pandora, though could easily be merged together
into a single patch series if that is preferred.
Vagrant Cascadian (2):
omap3_pandora: Switch to use config_distro_bootcmd.
omap3_pandora: Only set bootargs if distro_bootcmd failed to load.
include/configs/omap3_pandora.h | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/2] omap3_pandora: Switch to use config_distro_bootcmd.
2016-08-30 20:16 [U-Boot] [PATCH 0/2] Add support for config_distro_bootcmd to the omap3_pandora target Vagrant Cascadian
@ 2016-08-30 20:16 ` Vagrant Cascadian
2016-09-07 17:59 ` [U-Boot] [U-Boot, " Tom Rini
2016-08-30 20:16 ` [U-Boot] [PATCH 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load Vagrant Cascadian
1 sibling, 1 reply; 5+ messages in thread
From: Vagrant Cascadian @ 2016-08-30 20:16 UTC (permalink / raw)
To: u-boot
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(-)
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 + \
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load.
2016-08-30 20:16 [U-Boot] [PATCH 0/2] Add support for config_distro_bootcmd to the omap3_pandora target Vagrant Cascadian
2016-08-30 20:16 ` [U-Boot] [PATCH 1/2] omap3_pandora: Switch to use config_distro_bootcmd Vagrant Cascadian
@ 2016-08-30 20:16 ` Vagrant Cascadian
2016-09-07 17:59 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 1 reply; 5+ messages in thread
From: Vagrant Cascadian @ 2016-08-30 20:16 UTC (permalink / raw)
To: u-boot
As bootargs is hard-coded for the default behavior on the
omap3_pandora, only set the bootargs if distro_bootcmd fails to
load. This leaves distro_bootcmd free to use alternate boot arguments.
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---
include/configs/omap3_pandora.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index fd51811..b664319 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -88,6 +88,7 @@
#define CONFIG_BOOTCOMMAND \
"run distro_bootcmd; " \
+ "setenv bootargs ${bootargs_ubi}; " \
"if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
"source ${loadaddr}; " \
"fi; " \
@@ -102,7 +103,7 @@
#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 " \
+ "bootargs_ubi=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 \
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-07 17:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-30 20:16 [U-Boot] [PATCH 0/2] Add support for config_distro_bootcmd to the omap3_pandora target Vagrant Cascadian
2016-08-30 20:16 ` [U-Boot] [PATCH 1/2] omap3_pandora: Switch to use config_distro_bootcmd Vagrant Cascadian
2016-09-07 17:59 ` [U-Boot] [U-Boot, " Tom Rini
2016-08-30 20:16 ` [U-Boot] [PATCH 2/2] omap3_pandora: Only set bootargs if distro_bootcmd failed to load Vagrant Cascadian
2016-09-07 17:59 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox