Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/twister.h b/include/configs/twister.h
index 4f5560f..30ad241 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -14,13 +14,11 @@
 
 #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"
 
@@ -43,7 +41,6 @@
 #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