checkpatch.pl: Request if() instead #ifdef

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

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index d18b999dda9d33484a4fbf2c33ff19e6fdb2bcfa..e74ba6cc34cc1ea4bc6b194bf9283e587f6a3ce7 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -13,7 +13,6 @@
 /* U-Boot Load Address */
 
 /* Ethernet driver configuration */
-#define CONFIG_MII
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 
 /* USBD driver configuration */
@@ -100,7 +99,6 @@
  * Environment is in serial NOR flash
  */
 #define CONFIG_SYS_MONITOR_LEN                 0x00040000
-#define CONFIG_ENV_SECT_SIZE                   0x00010000
 #define CONFIG_FSMTDBLK                                "/dev/mtdblock3 "
 
 #define CONFIG_BOOTCOMMAND                     "bootm 0xf8050000"
@@ -110,21 +108,16 @@
  * Environment is in parallel NOR flash
  */
 #define CONFIG_SYS_MONITOR_LEN                 0x00060000
-#define CONFIG_ENV_SECT_SIZE                   0x00020000
 #define CONFIG_FSMTDBLK                                "/dev/mtdblock3 "
 
 #define CONFIG_BOOTCOMMAND                     "cp.b 0x50080000 0x1600000 " \
                                                "0x4C0000; bootm 0x1600000"
 #endif
-
-#define CONFIG_ENV_ADDR                                (CONFIG_SYS_FLASH_BASE + \
-                                               CONFIG_SYS_MONITOR_LEN)
 #elif defined(CONFIG_ENV_IS_IN_NAND)
 /*
  * Environment is in NAND
  */
 
-#define CONFIG_ENV_OFFSET                      0x60000
 #define CONFIG_ENV_RANGE                       0x10000
 #define CONFIG_FSMTDBLK                                "/dev/mtdblock7 "
 
@@ -147,18 +140,13 @@
                "console=ttyAMA0,115200 $(othbootargs);"                \
        CONFIG_BOOTCOMMAND
 
-#define CONFIG_ENV_SIZE                                0x02000
 #define CONFIG_SYS_MONITOR_BASE                        CONFIG_SYS_TEXT_BASE
 
 /* Miscellaneous configurable options */
-#define CONFIG_ARCH_CPU_INIT
 #define CONFIG_BOOT_PARAMS_ADDR                        0x00000100
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_MISC_INIT_R
 
-#define CONFIG_SYS_MEMTEST_START               0x00800000
-#define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (1024*1024)
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000