spi: Migrate CONFIG_CF_SPI to Kconfig

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

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index f75e4e9..fbd7258 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -18,7 +18,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_M54418TWR       /* M54418TWR board */
 
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
@@ -155,7 +154,6 @@
 #define CONFIG_SYS_IMMR                CONFIG_SYS_MBAR
 
 /* DSPI and Serial Flash */
-#define CONFIG_CF_SPI
 #define CONFIG_CF_DSPI
 #define CONFIG_SERIAL_FLASH
 #define CONFIG_HARD_SPI
@@ -180,9 +178,6 @@
 
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
-/* Boot Argument Buffer Size    */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x10000)
 
 #define CONFIG_SYS_MBAR                0xFC000000
@@ -296,20 +291,12 @@
 #define CONFIG_JFFS2_DEV               "nand0"
 #define CONFIG_JFFS2_PART_OFFSET       (0x800000)
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT         "nand0=m54418twr.nand"
-
-#define MTDPARTS_DEFAULT       "mtdparts=m54418twr.nand:1m(data),"     \
-                                               "7m(kernel),"           \
-                                               "-(rootfs)"
 
 #endif
 
 #ifdef CONFIG_CMD_UBI
 #define CONFIG_MTD_DEVICE      /* needed for mtdparts command */
 #define CONFIG_MTD_PARTITIONS  /* mtdparts and UBI support */
-#define MTDIDS_DEFAULT         "nand0=NAND"
-#define MTDPARTS_DEFAULT       "mtdparts=NAND:1m(u-boot),"     \
-                                       "-(ubi)"
 #endif
 /* Cache Configuration */
 #define CONFIG_SYS_CACHELINE_SIZE      16