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

[people/ms/u-boot.git] / include / configs / twister.h

diff --git a/include/configs/twister.h b/include/configs/twister.h
index b6ca59c33c3368c37e14eea4789396d7d889a780..5626eb1b953f4db693023f4e9000058a6c304e24 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -14,40 +14,22 @@
 
 #include "tam3517-common.h"
 
-#define MACH_TYPE_TAM3517      2818
 #define CONFIG_MACH_TYPE       MACH_TYPE_TAM3517
 
 #define CONFIG_TAM3517_SW3_SETTINGS
 #define CONFIG_XR16L2751
 
-#define CONFIG_BOOTDELAY       10
 
 #define CONFIG_BOOTFILE                "uImage"
 
 #define CONFIG_HOSTNAME twister
 
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_PROMPT              "twister => "
-
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_SMC911X_BASE            0x2C000000
-#define CONFIG_SMC911X_NO_EEPROM
-
 #define        CONFIG_EXTRA_ENV_SETTINGS       CONFIG_TAM3517_SETTINGS \
        "bootcmd=run nandboot\0"
 
 /* SPL OS boot options */
-#define CONFIG_CMD_SPL
-#define CONFIG_CMD_SPL_WRITE_SIZE      0x400 /* 1024 byte */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x00200000
-#define CONFIG_CMD_SPL_NAND_OFS        (CONFIG_SYS_NAND_SPL_KERNEL_OFFS+\
-                                               0x600000)
-#define CONFIG_SPL_OS_BOOT
 
 #define CONFIG_SYS_SPL_ARGS_ADDR       (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SPL_BOARD_INIT
 
 #endif /* __CONFIG_H */