global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*

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

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index b3348bc..1734f32 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -37,19 +37,17 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
-#define CONFIG_SYS_FSL_ESDHC_NUM       1
+#define CFG_SYS_FSL_ESDHC_ADDR 0
 #endif
 
 /*
  * NAND
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_BASE           NFC_BASE_ADDR_AXI
+#define CFG_SYS_NAND_BASE              NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_REGS_BASE      NFC_BASE_ADDR_AXI
 #define CONFIG_MXC_NAND_IP_REGS_BASE   NFC_BASE_ADDR
-#define CONFIG_SYS_NAND_LARGEPAGE
+#define CFG_SYS_NAND_LARGEPAGE
 #define CONFIG_MXC_NAND_HWECC
 #endif
 
@@ -67,7 +65,6 @@
  */
 #ifdef CONFIG_CMD_DATE
 #define CONFIG_SYS_I2C_RTC_ADDR                0x68
-#define CONFIG_SYS_M41T11_BASE_YEAR    2000
 #endif
 
 /*
@@ -79,11 +76,6 @@
 #define CONFIG_MXC_USB_FLAGS           0
 #endif
 
-/*
- * LCD
- */
-#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
-
 /* LVDS display */
 #define CONFIG_SYS_LDB_CLOCK                   33260000
 #define CONFIG_IMX_VIDEO_SKIP
@@ -94,12 +86,6 @@
 /* Watchdog */
 
 /*
- * NAND SPL
- */
-
-#define CONFIG_SYS_NAND_SIZE           (256 * 1024 * 1024)
-
-/*
  * Extra Environments
  */
 #define CONFIG_HOSTNAME                "m53menlo"