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

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

diff --git a/include/configs/strider.h b/include/configs/strider.h
index f65e602..a702ec7 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -28,9 +28,6 @@
 
 #define CONFIG_SYS_ALT_MEMTEST
 
-#define CONFIG_CMD_FPGAD
-#define CONFIG_CMD_IOLOOP
-
 /*
  * System Clock Setup
  */
@@ -532,7 +529,6 @@ void fpga_control_clear(unsigned int bus, int pin);
  * Environment
  */
 #if 1
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + \
                                 CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
@@ -540,7 +536,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #else
-#define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #endif
 
@@ -632,8 +627,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_HAS_ETH0
 #endif
 
-#define CONFIG_BAUDRATE 115200
-
 #define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */