X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fudoo_neo.h;h=c6f39c38b33275cf01b6d30ab577976c4f927472;hb=5cafcbab580bac6c7f44ca4a164c422b7e1ecf20;hp=aec39db6c1b2802e95057f672f6f521d4cc31dda;hpb=8ea05705a70135a94419b0d243666c1b51fe1f8d;p=oweals%2Fu-boot.git

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index aec39db6c1..c6f39c38b3 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -18,8 +18,6 @@
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(3 * SZ_1M)
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_MXC_UART
 
 /* MMC Configuration */
@@ -32,28 +30,29 @@
 /* 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" \
-	"fdt_file=undefined\0" \
+	"fdtfile=undefined\0" \
 	"fdt_addr=0x83000000\0" \
+	"fdt_addr_r=0x83000000\0" \
 	"ip_dyn=yes\0" \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4\0" \
 	"findfdt="\
 		"if test $board_name = BASIC; then " \
-			"setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \
+			"setenv fdtfile imx6sx-udoo-neo-basic.dtb; fi; " \
 		"if test $board_name = BASICKS; then " \
-			"setenv fdt_file imx6sx-udoo-neo-basic.dtb; fi; " \
+			"setenv fdtfile imx6sx-udoo-neo-basic.dtb; fi; " \
 		"if test $board_name = FULL; then " \
-			"setenv fdt_file imx6sx-udoo-neo-full.dtb; fi; " \
+			"setenv fdtfile imx6sx-udoo-neo-full.dtb; fi; " \
 		"if test $board_name = EXTENDED; then " \
-			"setenv fdt_file imx6sx-udoo-neo-extended.dtb; fi; " \
-		"if test $fdt_file = UNDEFINED; then " \
-			"echo WARNING: Could not determine dtb to use; fi; \0" \
+			"setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \
+		"if test $fdtfile = UNDEFINED; then " \
+			"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
 
@@ -70,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