Convert CONFIG_SPLASH_SCREEN et al to Kconfig

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

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index b1726b1..16b8c07 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -81,8 +81,8 @@
        "fdt_addr_r=0x83000000\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=0x83100000\0" \
+       "ramdiskaddr=0x83100000\0" \
        "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
        "videomode=video=ctfb:x:480,y:272,depth:24,pclk:108695,le:8,ri:4,up:2,lo:4,hs:41,vs:10,sync:0,vmode:0\0" \
        BOOTENV
@@ -94,9 +94,6 @@
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x20000000)
-
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 #define CONFIG_SYS_HZ                  1000
 
@@ -134,9 +131,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 #endif
 
-#define CONFIG_SYS_MMC_ENV_DEV         0   /* USDHC1 */
-#define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
-
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 
@@ -147,19 +141,9 @@
 #ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_MXS
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_VIDEO_BMP_LOGO
 #endif
 
-#ifdef CONFIG_FSL_QSPI
-#define CONFIG_SYS_FSL_QSPI_AHB
-#define FSL_QSPI_FLASH_NUM             1
-#define FSL_QSPI_FLASH_SIZE            SZ_64M
-#define QSPI0_BASE_ADDR                        QSPI1_IPS_BASE_ADDR
-#define QSPI0_AMBA_BASE                        QSPI0_ARB_BASE_ADDR
-#endif
-
 #endif /* __CONFIG_H */