Convert CONFIG_SYS_FLASH_CFI_WIDTH to Kconfig

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

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index bbe12d1..68b695c 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -31,9 +31,6 @@
 #      endif                   /* CONFIG_SYS_DISCOVER_PHY */
 #endif
 
-/* Timer */
-#define CONFIG_MCFTMR
-
 /* I2C */
 #define CONFIG_SYS_I2C_PINMUX_REG      (gpio->par_qspi)
 #define CONFIG_SYS_I2C_PINMUX_CLR      ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
@@ -89,11 +86,8 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_SIZE          16      /* SDRAM size in MB */
 
-#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE + 0x400)
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 
-#define CONFIG_SYS_BOOTPARAMS_LEN      64*1024
-
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is
@@ -108,11 +102,6 @@
  */
 #ifdef CONFIG_SYS_FLASH_CFI
 #      define CONFIG_SYS_FLASH_SIZE            0x800000        /* Max size that the board might have */
-#ifdef NORFLASH_PS32BIT
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_32BIT
-#else
-#      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
-#endif
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
 #endif
 
@@ -155,7 +144,7 @@
  * CS6 - Available
  * CS7 - Available
  */
-#ifdef NORFLASH_PS32BIT
+#ifdef CONFIG_NORFLASH_PS32BIT
 #      define CONFIG_SYS_CS0_BASE      0xFFC00000
 #      define CONFIG_SYS_CS0_MASK      0x003f0001
 #      define CONFIG_SYS_CS0_CTRL      0x00001D00