summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Spinrath <christopher.spinrath@rwth-aachen.de>2016-07-12 23:37:34 +0200
committerStefano Babic <sbabic@denx.de>2016-07-19 19:52:12 +0200
commitf0f6724f86b4e86c8977f33a835a1b77352be7c4 (patch)
tree0bed542b399938533f87ac2627d2ee606367a193
parent88e4774efdf6ae4bf43969ad95ce67d0f228b91a (diff)
downloadu-boot-imx-f0f6724f86b4e86c8977f33a835a1b77352be7c4.zip
u-boot-imx-f0f6724f86b4e86c8977f33a835a1b77352be7c4.tar.gz
u-boot-imx-f0f6724f86b4e86c8977f33a835a1b77352be7c4.tar.bz2
ARM: configs: cm_fx6: improve default environment
Currently, entire script segments have to be changed in the default environment to change the kernel image location or to append kernel cmdline parameters. In the later case this has to be changed for every possible boot device. Introduce new variables for kernel image locations and boot device independent kernel parameters to make it easier to change these settings. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Nikita Kiryanov <nikita@compulab.co.il>
-rw-r--r--include/configs/cm_fx6.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 1f20ec3..f054ca8 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -69,6 +69,8 @@
"stderr=serial,vga\0" \
"panel=HDMI\0" \
"autoload=no\0" \
+ "uImage=uImage-cm-fx6\0" \
+ "zImage=zImage-cm-fx6\0" \
"kernel=uImage-cm-fx6\0" \
"script=boot.scr\0" \
"dtb=cm-fx6.dtb\0" \
@@ -81,10 +83,10 @@
"video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
"doboot=bootm ${loadaddr}\0" \
"doloadfdt=false\0" \
- "setboottypez=setenv kernel zImage-cm-fx6;" \
+ "setboottypez=setenv kernel ${zImage};" \
"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
"setenv doloadfdt true;\0" \
- "setboottypem=setenv kernel uImage-cm-fx6;" \
+ "setboottypem=setenv kernel ${uImage};" \
"setenv doboot bootm ${loadaddr};" \
"setenv doloadfdt false;\0"\
"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
@@ -92,13 +94,13 @@
"nandroot=/dev/mtdblock4 rw\0" \
"nandrootfstype=ubifs\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
- "${video}\0" \
+ "${video} ${extrabootargs}\0" \
"sataargs=setenv bootargs console=${console} root=${sataroot} " \
- "${video}\0" \
+ "${video} ${extrabootargs}\0" \
"nandargs=setenv bootargs console=${console} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype} " \
- "${video}\0" \
+ "${video} ${extrabootargs}\0" \
"nandboot=if run nandloadkernel; then " \
"run nandloadfdt;" \
"run setboottypem;" \