Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 18ec6cb..d801c66 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -31,39 +31,29 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_BOOTFILE                "edb93xx.img"
 
-#define CONFIG_SYS_LDSCRIPT    "board/cirrus/edb93xx/u-boot.lds"
-
 #ifdef CONFIG_EDB9301
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9301
-#define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9302)
 #define CONFIG_EP9302
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302
-#define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9302A)
 #define CONFIG_EP9302
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9302A
-#define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9307)
 #define CONFIG_EP9307
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307
-#define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9307A)
 #define CONFIG_EP9307
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9307A
-#define CONFIG_ENV_SECT_SIZE           0x00020000
 #elif defined(CONFIG_EDB9312)
 #define CONFIG_EP9312
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9312
-#define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9315)
 #define CONFIG_EP9315
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315
-#define CONFIG_ENV_SECT_SIZE           0x00040000
 #elif defined(CONFIG_EDB9315A)
 #define CONFIG_EP9315
 #define CONFIG_MACH_TYPE               MACH_TYPE_EDB9315A
-#define CONFIG_ENV_SECT_SIZE           0x00020000
 #else
 #error "no board defined"
 #endif
@@ -78,7 +68,6 @@
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O buffer size */
 
 /* Serial port hardware configuration */
-#define CONFIG_CONS_INDEX              0
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600, 19200, 38400, 57600, \
                         115200, 230400}
 #define CONFIG_SYS_SERIAL0             0x808C0000
@@ -94,8 +83,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 */
@@ -139,7 +126,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)
@@ -173,11 +159,7 @@
  * 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)
 
@@ -189,12 +171,6 @@
 
 #define CONFIG_ENV_OVERWRITE           /* Vendor params unprotected */
 
-#define CONFIG_ENV_ADDR                        0x60040000
-#define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-
-#define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
-
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_USB_OHCI_EP93XX
 #define CONFIG_SYS_USB_OHCI_CPU_INIT