Delete an accidentally added .rej file

[karo-tx-uboot.git] / include / configs / twister.h

diff --git a/include/configs/twister.h b/include/configs/twister.h
index b6ca59c33c3368c37e14eea4789396d7d889a780..4f5560fec3ba603d53153815fa7e134db3ea92da 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -29,8 +29,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT              "twister => "
-
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_SMC911X_BASE            0x2C000000
@@ -50,4 +48,7 @@
 #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 */