Merge git://git.denx.de/u-boot-net

[oweals/u-boot.git] / include / configs / udoo_neo.h

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 9835ce887536859f6ab292d59b99da9eca0dd69c..c6f39c38b33275cf01b6d30ab577976c4f927472 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -30,10 +30,12 @@
 /* Linux only */
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "console=ttymxc0,115200\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdtfile=undefined\0" \
        "fdt_addr=0x83000000\0" \
+       "fdt_addr_r=0x83000000\0" \
        "ip_dyn=yes\0" \
        "mmcdev=0\0" \
        "mmcrootfstype=ext4\0" \
@@ -47,11 +49,10 @@
                "if test $board_name = EXTENDED; then " \
                        "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \
                "if test $fdtfile = UNDEFINED; then " \
-                       "echo WARNING: Could not determine dtb to use; fi; \0" \
+                       "echo WARNING: Could not determine dtb to use; fi\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "ramdisk_addr_r=0x83000000\0" \
-       "ramdiskaddr=0x83000000\0" \
+       "ramdisk_addr_r=0x84000000\0" \
        "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
        BOOTENV
 
@@ -68,7 +69,6 @@
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_MEMTEST_START       0x80000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000)
-#define CONFIG_STACKSIZE               SZ_128K
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1