Remove config_distro_defaults.h

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

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index aec39db6c1b2802e95057f672f6f521d4cc31dda..35a6eca9f60093737f01112de9bec352f6aeea8b 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -11,15 +11,12 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"
 
 /* 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 +29,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
 
@@ -61,16 +59,11 @@
        func(MMC, mmc, 0) \
        func(DHCP, dhcp, na)
 
-#define CONFIG_BOOTCOMMAND \
-       "run findfdt; " \
-       "run distro_bootcmd"
-
 #include <config_distro_bootcmd.h>
 
 /* 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
@@ -87,7 +80,6 @@
 /* Environment organization */
 #define CONFIG_ENV_OFFSET              (8 * SZ_64K)
 #define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
 
 #define CONFIG_IMX_THERMAL
 
@@ -115,7 +107,4 @@
 #define CONFIG_FEC_XCV_TYPE             RMII
 #define CONFIG_ETHPRIME                 "FEC0"
 
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
-
 #endif                         /* __CONFIG_H */