Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / board / technexion / twister / twister.h

diff --git a/board/technexion/twister/twister.h b/board/technexion/twister/twister.h
index a2051c004426833f04a4b1a2661b01be3669b0a1..cff479c07f6d1a66b4dcbef2ad0e7ddc82583a82 100644 (file)
--- a/board/technexion/twister/twister.h
+++ b/board/technexion/twister/twister.h
@@ -38,6 +38,8 @@ const omap3_sysinfo sysinfo = {
 #define XR16L2751_UART1_BASE   0x21000000
 #define XR16L2751_UART2_BASE   0x23000000
 
+/* GPIO used to select between U-Boot and kernel */
+#define SPL_OS_BOOT_KEY        55
 
 /*
  * IEN  - Input Enable