summaryrefslogtreecommitdiffstats
path: root/include/configs/ti_omap4_common.h
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2015-08-28 13:35:07 +0530
committerTom Rini <trini@konsulko.com>2015-09-11 14:05:37 -0400
commit85d17be374678ec37fd1e55db994a942e400dc80 (patch)
treefae05a2401d0aaf17b21c4f3ea1445efcb84759a /include/configs/ti_omap4_common.h
parent8ebaaed22b1d0d9dfa60d7e7e69b8628a8a34245 (diff)
downloadblackbird-obmc-uboot-85d17be374678ec37fd1e55db994a942e400dc80.tar.gz
blackbird-obmc-uboot-85d17be374678ec37fd1e55db994a942e400dc80.zip
ti_armv7_common: env: Consolidate MMC args
Define default mmc args in ti_armv7_common.h so that all TI platforms can reuse. Reported-by: Yan Liu <yan-liu@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'include/configs/ti_omap4_common.h')
-rw-r--r--include/configs/ti_omap4_common.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 6139246daa..1cd7dae85b 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -83,6 +83,7 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
+ DEFAULT_MMC_TI_ARGS \
"console=ttyO2,115200n8\0" \
"fdtfile=undefined\0" \
"bootpart=0:2\0" \
@@ -90,13 +91,6 @@
"bootfile=zImage\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
- "mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 rw\0" \
- "mmcrootfstype=ext4 rootwait\0" \
- "mmcargs=setenv bootargs console=${console} " \
- "vram=${vram} " \
- "root=${mmcroot} " \
- "rootfstype=${mmcrootfstype}\0" \
"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
@@ -106,10 +100,10 @@
"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
"loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
- "run mmcargs; " \
+ "run args_mmc; " \
"bootz ${loadaddr} - ${fdtaddr}\0" \
"uimageboot=echo Booting from mmc${mmcdev} ...; " \
- "run mmcargs; " \
+ "run args_mmc; " \
"bootm ${loadaddr}\0" \
"findfdt="\
"if test $board_name = sdp4430; then " \
OpenPOWER on IntegriCloud