diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-16 07:19:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-16 07:19:47 -0400 |
| commit | a7e2c6f6bb0b28d5b7f08bf407742fc3fddf701b (patch) | |
| tree | 96477a41911b22773f8dd897e76d2fb2ba2e1cfa /include/configs | |
| parent | 53fd4b8c22bbdf4598f87e701e9a6c6ee50172ff (diff) | |
| parent | 2308ea7c6fe003f699f4648d4ac3bb030fdc64d0 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/odroid.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 1afe04ad8b..4c85e851ab 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -108,11 +108,13 @@ * 2. ROOT: - */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ + "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \ + "boot.scr\0" \ + "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ "${kernelname}\0" \ - "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ + "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname}\0" \ - "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ + "loaddtb=load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ "${fdtfile}\0" \ "check_ramdisk=" \ "if run loadinitrd; then " \ @@ -129,6 +131,9 @@ "kernel_args=" \ "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \ " rootwait ${console} ${opts}\0" \ + "boot_script=" \ + "run loadbootscript;" \ + "source ${scriptaddr}\0" \ "boot_fit=" \ "setenv kerneladdr 0x42000000;" \ "setenv kernelname Image.itb;" \ @@ -152,7 +157,9 @@ "run kernel_args;" \ "bootz ${kerneladdr} ${initrd_addr} ${fdt_addr};\0" \ "autoboot=" \ - "if test -e mmc 0 Image.itb; then; " \ + "if test -e mmc 0 boot.scr; then; " \ + "run boot_script; " \ + "elif test -e mmc 0 Image.itb; then; " \ "run boot_fit;" \ "elif test -e mmc 0 zImage; then; " \ "run boot_zimg;" \ @@ -171,6 +178,7 @@ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ "initrdaddr=42000000\0" \ + "scriptaddr=0x42000000\0" \ "fdtaddr=40800000\0" /* I2C */ |