global: Convert CONFIG_LOADADDR to CONFIG_SYS_LOADADDR

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

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 4cffc7f..b736d19 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -34,14 +34,6 @@
 
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
-/* I2C Configs */
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_MXC_I2C3_SPEED      400000
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       3
@@ -67,8 +59,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
@@ -81,8 +71,7 @@
 #define CONFIG_NETMASK                 255.255.255.0
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP                        192.168.10.1
-
-#define CONFIG_LOADADDR                        0x12000000
+#define CONFIG_SYS_LOAD_ADDR                   0x12000000
 
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
@@ -164,11 +153,8 @@
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "splashpos=m,m\0" \
-       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
-       "vidargs=mxc_hdmi.only_cea=1 " \
-               "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
-               "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
-               "fbmem=32M\0 "
+       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "vidargs=mxc_hdmi.only_cea=1 fbmem=32M\0"
 
 /* Miscellaneous configurable options */
 #undef CONFIG_SYS_CBSIZE
@@ -176,8 +162,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             48
 
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR