Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved default environment #1

Open
wants to merge 2 commits into
base: imx6
Choose a base branch
from
Open

Improved default environment #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71eb015
Add support for loading ramdisks by default when booting from mmc
vorlonofportland Mar 11, 2014
e80d086
Use prefix search for bootscripts as well
vorlonofportland Mar 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions include/configs/mx6_cubox-i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"ramdiskaddr=0x11800000\0" \
"ramdisk=uInitrd\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
Expand All @@ -184,7 +186,7 @@
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot};\0" \
"loadbootscript=" \
"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${file_prefix}${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source;\0" \
"autodetectfdt=if test ${cpu} = 6SOLO || test ${cpu} = 6DL; then " \
Expand All @@ -204,19 +206,26 @@
"${get_cmd} ${fdt_addr} ${fdt_file}; " \
"fi;\0 " \
"loadbootfile=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${file_prefix}${bootfile};\0" \
"loadramdisk=if test -n ${ramdisk}; then " \
"if load mmc ${mmcdev}:${mmcpart} ${ramdiskaddr} ${file_prefix}${ramdisk}; then; else " \
"setenv ramdiskaddr -; " \
"fi; " \
"else " \
" setenv ramdiskaddr -; " \
"fi;\0" \
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize};\0" \
"autobootfdt=echo Booting ${boot_file}; " \
"if test ${boot_file} = zImage; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \
"bootz ${loadaddr} ${ramdiskaddr} ${fdt_addr}; " \
"else " \
"bootm ${loadaddr} - ${fdt_addr}; " \
"bootm ${loadaddr} ${ramdiskaddr} ${fdt_addr}; " \
"fi;\0 " \
"autoboot=echo Booting ${boot_file}; " \
"if test ${boot_file} = zImage; then " \
"bootz; " \
"bootz ${loadaddr} ${ramdiskaddr}; " \
"else " \
"bootm; " \
"bootm ${loadaddr} ${ramdiskaddr}; " \
"fi;\0 " \
"bootit=setenv boot_file ${bootfile}; " \
"if test ${boot_file} = zImage; then " \
Expand Down Expand Up @@ -280,12 +289,14 @@
"setenv origbootfile auto; " \
"setenv bootfile zImage; " \
"if run loadbootfile; then " \
"run loadramdisk; " \
"run mmcboot; " \
"else " \
"setenv bootfile uImage; " \
"fi; " \
"fi; " \
"if run loadbootfile; then " \
"run loadramdisk; " \
"run mmcboot; " \
"else " \
"setenv bootfile ${origbootfile}; " \
Expand Down