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

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

diff --git a/include/configs/twister.h b/include/configs/twister.h
index fd117b8..94dde90 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -14,7 +14,6 @@
 
 #include "tam3517-common.h"
 
-#define MACH_TYPE_TAM3517      2818
 #define CONFIG_MACH_TYPE       MACH_TYPE_TAM3517
 
 #define CONFIG_TAM3517_SW3_SETTINGS
@@ -44,9 +43,5 @@
                                                0x600000)
 
 #define CONFIG_SYS_SPL_ARGS_ADDR       (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SPL_BOARD_INIT
-
-/* gpio 55 is used as SPL_OS_BOOT_KEY */
-#define CONFIG_OMAP3_GPIO_2
 
 #endif /* __CONFIG_H */