Merge branch 'master' of git://git.denx.de/u-boot-sh

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

diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index 07a44c88c73dc22cfce8ac8ab513e6fd1240275b..f6ce4303a44597b83d4b76af759f4bd800cdab60 100644 (file)
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -19,11 +19,7 @@
 /*
  * CFI Flash
  */
-#define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_CFI_FLASH_STATUS_POLL /* fix amd flash issue */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-#define CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_SYS_MAX_FLASH_BANKS_DETECT      1
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 
@@ -32,7 +28,6 @@
  */
 #define CONFIG_SYS_RX_ETH_BUFFER       0
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#define CONFIG_PHY_MARVELL
 
 /*
  * BOOTP options
@@ -52,7 +47,6 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0xD0000000
 #define CONFIG_SYS_SDRAM_SIZE          0x08000000
-#define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_MONITOR_IS_IN_RAM
 #define CONFIG_SYS_MONITOR_LEN         0x80000 /* Reserve 512k */
 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_SDRAM_BASE + \