Merge git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 8fcc791..3d90dbc 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
 
 #ifdef CONFIG_EDB9301
-#define CONFIG_EP9301
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
 #define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9302)
@@ -76,12 +75,9 @@
 
 /* Monitor configuration */
 
-#define CONFIG_SYS_LONGHELP                    /* Enable "long" help in mon */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O buffer size */
 
 /* Serial port hardware configuration */
-#define CONFIG_PL010_SERIAL
-#define CONFIG_CONS_INDEX              0
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, \
                         115200, 230400}
 #define CONFIG_SYS_SERIAL0             0x808C0000
@@ -97,8 +93,6 @@
 /* Network hardware configuration */
 #define CONFIG_DRIVER_EP93XX_MAC
 #define CONFIG_MII_SUPPRESS_PREAMBLE
-#define CONFIG_MII
-#define CONFIG_PHY_ADDR                1
 #undef CONFIG_NETCONSOLE
 
 /* SDRAM configuration */
@@ -142,7 +136,6 @@
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_NR_DRAM_BANKS           8
 
 #define CONFIG_SYS_INIT_SP_ADDR \
     (CONFIG_SYS_SDRAM_BASE + 32*1024 - GENERATED_GBL_DATA_SIZE)
@@ -176,15 +169,10 @@
  * 0x600C0000 - 0x00FFFFFF    unused                 unused
  * 0x61000000 - 0x01FFFFFF    not present            unused
  */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
-#define CONFIG_SYS_FLASH_PROTECTION
-#define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      (256+8)
 
-#define CONFIG_SYS_TEXT_BASE           0x60000000
 #define PHYS_FLASH_1                   CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE