mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-02 17:40:41 +09:00
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>
This commit is contained in:
parent
40abfeecf1
commit
db18a24f0b
@ -88,6 +88,7 @@
|
|||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
"run distro_bootcmd; " \
|
"run distro_bootcmd; " \
|
||||||
|
"setenv bootargs ${bootargs_ubi}; " \
|
||||||
"if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
|
"if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
|
||||||
"source ${loadaddr}; " \
|
"source ${loadaddr}; " \
|
||||||
"fi; " \
|
"fi; " \
|
||||||
@ -102,7 +103,7 @@
|
|||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
DEFAULT_LINUX_BOOT_ENV \
|
DEFAULT_LINUX_BOOT_ENV \
|
||||||
"usbtty=cdc_acm\0" \
|
"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" \
|
"rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
|
||||||
"mtdparts=" MTDPARTS_DEFAULT "\0" \
|
"mtdparts=" MTDPARTS_DEFAULT "\0" \
|
||||||
BOOTENV \
|
BOOTENV \
|
||||||
|
Loading…
Reference in New Issue
Block a user