ti_omap4_common.h: Switch to CONFIG_OMAP_SERIAL for non-SPL DM_SERIAL

[u-boot] / include / configs / odroid.h

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index e45b00eaeec1130b2d986532052d4a41f8a559c0..4c85e851ab17d8edcc26523279fdff926488a350 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -108,6 +108,8 @@
  * 2.  ROOT:  -
 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
+               "boot.scr\0" \
        "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
                "${kernelname}\0" \
        "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
@@ -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 */