GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-22 15:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: configs: cm_fx6: improve default environment

Browse source 
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>
This commit is contained in:
Christopher Spinrath 2016-07-12 23:37:34 +02:00 • committed by Stefano Babic
parent 88e4774efd
commit f0f6724f86
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/configs/cm_fx6.h
View file

@ -69,6 +69,8 @@
"stderr=serial,vga\0" \ "stderr=serial,vga\0" \
"panel=HDMI\0" \ "panel=HDMI\0" \
"autoload=no\0" \ "autoload=no\0" \
"uImage=uImage-cm-fx6\0" \
"zImage=zImage-cm-fx6\0" \
"kernel=uImage-cm-fx6\0" \ "kernel=uImage-cm-fx6\0" \
"script=boot.scr\0" \ "script=boot.scr\0" \
"dtb=cm-fx6.dtb\0" \ "dtb=cm-fx6.dtb\0" \
@ -81,10 +83,10 @@
"video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \ "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
"doboot=bootm ${loadaddr}\0" \ "doboot=bootm ${loadaddr}\0" \
"doloadfdt=false\0" \ "doloadfdt=false\0" \
"setboottypez=setenv kernel zImage-cm-fx6;" \ "setboottypez=setenv kernel ${zImage};" \
"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \ "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
"setenv doloadfdt true;\0" \ "setenv doloadfdt true;\0" \
"setboottypem=setenv kernel uImage-cm-fx6;" \ "setboottypem=setenv kernel ${uImage};" \
"setenv doboot bootm ${loadaddr};" \ "setenv doboot bootm ${loadaddr};" \
"setenv doloadfdt false;\0"\ "setenv doloadfdt false;\0"\
"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
@ -92,13 +94,13 @@
"nandroot=/dev/mtdblock4 rw\0" \ "nandroot=/dev/mtdblock4 rw\0" \
"nandrootfstype=ubifs\0" \ "nandrootfstype=ubifs\0" \
"mmcargs=setenv bootargs console=${console} root=${mmcroot} " \ "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
"${video}\0" \ "${video} ${extrabootargs}\0" \
"sataargs=setenv bootargs console=${console} root=${sataroot} " \ "sataargs=setenv bootargs console=${console} root=${sataroot} " \
"${video}\0" \ "${video} ${extrabootargs}\0" \
"nandargs=setenv bootargs console=${console} " \ "nandargs=setenv bootargs console=${console} " \
"root=${nandroot} " \ "root=${nandroot} " \
"rootfstype=${nandrootfstype} " \ "rootfstype=${nandrootfstype} " \
"${video}\0" \ "${video} ${extrabootargs}\0" \
"nandboot=if run nandloadkernel; then " \ "nandboot=if run nandloadkernel; then " \
"run nandloadfdt;" \ "run nandloadfdt;" \
"run setboottypem;" \ "run setboottypem;" \