Convert CONFIG_SPLASH_SCREEN et al to Kconfig

[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 0d57e30..86d4621 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
@@ -51,13 +47,15 @@
 #define MEM_LAYOUT_ENV_SETTINGS \
        "bootm_size=0x10000000\0" \
        "fdt_addr_r=0x82000000\0" \
-       "fdt_high=0xffffffff\0" \
-       "initrd_high=0xffffffff\0" \
        "kernel_addr_r=0x81000000\0" \
        "pxefile_addr_r=0x87100000\0" \
        "ramdisk_addr_r=0x82100000\0" \
        "scriptaddr=0x87000000\0"
 
+#define UBOOT_UPDATE \
+       "update_uboot=nand erase.part u-boot && " \
+               "nand write ${loadaddr} u-boot ${filesize}\0" \
+
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
        "nfsboot=run setup; " \
@@ -67,14 +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 \
-       "sdargs=root=/dev/mmcblk0p2 ro rootwait\0"      \
-       "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
-       "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-       "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
-       "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
-       "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
-
 #define UBI_BOOTCMD \
        "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \
        "ubi.fm_autoconvert=1\0" \
@@ -103,14 +93,14 @@
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
        NFS_BOOTCMD \
-       SD_BOOTCMD \
        UBI_BOOTCMD \
+       UBOOT_UPDATE \
        "console=ttyLP0\0" \
        "defargs=user_debug=30\0" \
        "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 && " \
@@ -128,9 +118,6 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_MEMTEST_START       0x80010000
-#define CONFIG_SYS_MEMTEST_END         0x87C00000
-
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
@@ -149,9 +136,7 @@
 
 /* Environment organization */
 #ifdef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_SIZE                        (64 * 2048)
 #define CONFIG_ENV_RANGE               (4 * 64 * 2048)
-#define CONFIG_ENV_OFFSET              (12 * 64 * 2048)
 #endif
 
 /* USB Host Support */