checkpatch.pl: Request if() instead #ifdef

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

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 92d4c2274174dd037aa26c7b6a8dd1250e474e4f..4ab3d4831c7651b4097875059a7048ac93753cae 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -29,16 +29,11 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY
 #      define CONFIG_SYS_RX_ETH_BUFFER 8
 #      define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-
-#      define CONFIG_SYS_FEC0_PINMUX           0
-#      define CONFIG_SYS_FEC0_MIIBASE          CONFIG_SYS_FEC0_IOBASE
-#      define MCFFEC_TOUT_LOOP         50000
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY
 #              define FECDUPLEX        FULL
@@ -52,7 +47,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C
@@ -118,9 +112,6 @@
 #define CONFIG_SYS_SDRAM_BASE          0x00000000
 #define CONFIG_SYS_SDRAM_SIZE          16      /* SDRAM size in MB */
 
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE + 0x400
-#define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
-
 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE + 0x400)
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 
@@ -139,9 +130,7 @@
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
-#define CONFIG_SYS_FLASH_CFI
 #ifdef CONFIG_SYS_FLASH_CFI
-#      define CONFIG_FLASH_CFI_DRIVER  1
 #      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
@@ -150,7 +139,6 @@
 #endif
 #      define CONFIG_SYS_MAX_FLASH_BANKS       1       /* max number of memory banks */
 #      define CONFIG_SYS_MAX_FLASH_SECT        137     /* max number of sectors on one chip */
-#      define CONFIG_SYS_FLASH_PROTECTION      /* "Real" (hardware) sectors protection */
 #endif
 
 #define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
@@ -163,16 +151,6 @@
        . = DEFINED(env_offset) ? env_offset : .; \
        env/embedded.o(.text);
 
-#ifdef NORFLASH_PS32BIT
-#      define CONFIG_ENV_OFFSET                (0x8000)
-#      define CONFIG_ENV_SIZE          0x4000
-#      define CONFIG_ENV_SECT_SIZE     0x4000
-#else
-#      define CONFIG_ENV_OFFSET                (0x4000)
-#      define CONFIG_ENV_SIZE          0x2000
-#      define CONFIG_ENV_SECT_SIZE     0x2000
-#endif
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */