global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

[platform/kernel/u-boot.git] / include / configs / colibri_vf.h

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7d17bd8..96fef9f 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -19,7 +19,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
 #ifdef CONFIG_VIDEO_FSL_DCU_FB
-#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_SYS_FSL_DCU_LE
@@ -31,9 +30,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * SZ_1M)
 
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 /* NAND support */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
@@ -42,7 +38,7 @@
 #define CONFIG_NETMASK         255.255.255.0
 #define CONFIG_SERVERIP                192.168.10.1
 
-#define CONFIG_LOADADDR                        0x80008000
+#define CONFIG_SYS_LOAD_ADDR                   0x80008000
 #define CONFIG_FDTADDR                 0x84000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
@@ -69,21 +65,6 @@
        "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
-#define SD_BOOTCMD \
-       "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0"  \
-       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
-       "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \
-               "${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-       "sdbootpart=1\0" \
-       "sddev=0\0" \
-       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
-       "sdrootpart=2\0"
-
-
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
        "ubi.fm_autoconvert=1\0" \
@@ -95,8 +76,7 @@
        "ubi read ${fdt_addr_r} dtb && " \
        "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
-#define CONFIG_BOOTCOMMAND "run ubiboot; " \
-       "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
+#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;"
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
@@ -112,7 +92,6 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        UBI_BOOTCMD \
        UBOOT_UPDATE \
        "console=ttyLP0\0" \
@@ -120,7 +99,7 @@
        "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \
        "fdt_board=eval-v3\0" \
        "fdt_fixup=;\0" \
-       "kernel_file=zImage\0" \
+       "kernel_image=zImage\0" \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setsdupdate=mmc rescan && set interface mmc && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
@@ -138,7 +117,6 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical memory map */
@@ -164,6 +142,5 @@
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /* USB DFU */
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M)
 
 #endif /* __CONFIG_H */