diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2016-08-30 13:16:32 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-07 08:49:00 -0400 |
| commit | db18a24f0b978eb0a6641ceb1573279916b50006 (patch) | |
| tree | fc334c6e94774b7b0461c671822df97e589552ae /include/configs | |
| parent | 40abfeecf107d79493bfdb6fb5bed3648a97f669 (diff) | |
omap3_pandora: Only set bootargs if distro_bootcmd failed to load.
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>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/omap3_pandora.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index fd51811a20..b66431929c 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 \ |