config: Move CONFIG_BOARD_LATE_INIT to defconfigs

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

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 0cd77fff51ac2992c74e4b61574bab365e250703..d2d4330ddc143929543d54517502dddc9e078126 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -16,8 +16,6 @@
 
 #define CONFIG_VF610
 #define CONFIG_SYS_THUMB_BUILD
-#define CONFIG_USE_ARCH_MEMCPY
-#define CONFIG_USE_ARCH_MEMSET
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_ARCH_MISC_INIT
@@ -58,13 +56,10 @@
                                "512k(u-boot-env),"             \
                                "-(ubi)"
 
-#define CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
-
 #define CONFIG_GENERIC_MMC
 #define CONFIG_DOS_PARTITION
 
@@ -84,8 +79,6 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_SERVERIP                192.168.10.1
 
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_LOADADDR                        0x80008000
 #define CONFIG_FDTADDR                 0x84000000
 
@@ -99,7 +92,7 @@
        "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
        "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
        "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-       "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
@@ -108,7 +101,7 @@
        "${setupargs} ${vidargs}; echo Booting from NFS...;" \
        "dhcp ${kernel_addr_r} && "     \
        "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-       "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define UBI_BOOTCMD    \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
@@ -116,10 +109,10 @@
        "ubiboot=run setup; " \
        "setenv bootargs ${defargs} ${ubiargs} ${mtdparts} "   \
        "${setupargs} ${vidargs}; echo Booting from NAND...; " \
-       "ubi part ubi && ubifsmount ubi0:rootfs && " \
-       "ubifsload ${kernel_addr_r} /boot/${kernel_file} && " \
-       "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
-       "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+       "ubi part ubi && " \
+       "ubi read ${kernel_addr_r} kernel && " \
+       "ubi read ${fdt_addr_r} dtb && " \
+       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot"
 
@@ -131,6 +124,7 @@
        "kernel_file=zImage\0" \
        "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \
        "fdt_board=eval-v3\0" \
+       "fdt_fixup=;\0" \
        "defargs=\0" \
        "console=ttyLP0\0" \
        "setup=setenv setupargs " \