env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check

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

diff --git a/include/configs/strider.h b/include/configs/strider.h
index fe2d89f2a61cb2008c5be698f42ff2e440f74aea..d270d8a2dd4f9cdf4175a02b31d4aad86097280a 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -15,50 +15,16 @@
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 
-/*
- * System IO Config
- */
-#define CONFIG_SYS_SICRH (\
-       SICRH_ESDHC_A_SD |\
-       SICRH_ESDHC_B_SD |\
-       SICRH_ESDHC_C_SD |\
-       SICRH_GPIO_A_GPIO |\
-       SICRH_GPIO_B_GPIO |\
-       SICRH_IEEE1588_A_GPIO |\
-       SICRH_USB |\
-       SICRH_GTM_GPIO |\
-       SICRH_IEEE1588_B_GPIO |\
-       SICRH_ETSEC2_GPIO |\
-       SICRH_GPIOSEL_1 |\
-       SICRH_TMROBI_V3P3 |\
-       SICRH_TSOBI1_V2P5 |\
-       SICRH_TSOBI2_V2P5)      /* 0x0037f103 */
-#define CONFIG_SYS_SICRL (\
-       SICRL_SPI_PF0 |\
-       SICRL_UART_PF0 |\
-       SICRL_IRQ_PF0 |\
-       SICRL_I2C2_PF0 |\
-       SICRL_ETSEC1_TX_CLK)    /* 0x00000000 */
-
 /*
  * SERDES
  */
 #define CONFIG_FSL_SERDES
 #define CONFIG_FSL_SERDES1     0xe3000
 
-/*
- * Arbiter Setup
- */
-#define CONFIG_SYS_ACR_PIPE_DEP        3 /* Arbiter pipeline depth is 4 */
-#define CONFIG_SYS_ACR_RPTCNT  3 /* Arbiter repeat count is 4 */
-#define CONFIG_SYS_SPCR_TSECEP 3 /* eTSEC emergency priority is highest */
-
 /*
  * DDR Setup
  */
-#define CONFIG_SYS_DDR_BASE            0x00000000 /* DDR is system memory */
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_BASE
-#define CONFIG_SYS_DDR_SDRAM_BASE      CONFIG_SYS_DDR_BASE
+#define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory */
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  DDR_SDRAM_CLK_CNTL_CLK_ADJUST_05
 #define CONFIG_SYS_DDRCDR_VALUE        (DDRCDR_EN \
                                | DDRCDR_PZ_LOZ \
@@ -144,13 +110,6 @@
 #define CONFIG_SYS_GBL_DATA_OFFSET     \
        (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
-/*
- * Local Bus Configuration & Clock Setup
- */
-#define CONFIG_SYS_LCRR_DBYP           LCRR_DBYP
-#define CONFIG_SYS_LCRR_CLKDIV         LCRR_CLKDIV_2
-#define CONFIG_SYS_LBC_LBCR            0x00040000
-
 /*
  * FLASH on the Local Bus
  */
@@ -168,14 +127,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT    60000 /* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500 /* Flash Write Timeout (ms) */
 
-/*
- * FPGA
- */
-#define CONFIG_SYS_FPGA0_BASE          0xE0600000
-#define CONFIG_SYS_FPGA0_SIZE          1 /* FPGA size is 1M */
-
-
-#define CONFIG_SYS_FPGA_BASE(k)                CONFIG_SYS_FPGA0_BASE
 #define CONFIG_SYS_FPGA_DONE(k)                0x0010
 
 #define CONFIG_SYS_FPGA_COUNT          1
@@ -439,7 +390,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #else
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #endif
@@ -485,8 +435,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_BOOTFILE                "uImage"
 
-#define CONFIG_PREBOOT         /* enable preboot variable */
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "consoledev=ttyS1\0"                                            \