Merge with /home/hs/U-Boot/u-boot-dev

[u-boot] / include / configs / delta.h

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 5edea95a4f34b2bf87d0ec29658533253852b56d..91284fdace858fe5e3052e0de788267a49d3001e 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -66,6 +66,17 @@
 #define CFG_I2C_INIT_BOARD     1
 /* #define CONFIG_HW_WATCHDOG  1       /\* Required for hitting the DA9030 WD *\/ */
 
+#define DELTA_CHECK_KEYBD      1       /* check for keys pressed during boot */
+#define CONFIG_PREBOOT         "\0"
+
+#ifdef DELTA_CHECK_KEYBD
+# define KEYBD_DATALEN         4       /* we have four keys */
+# define KEYBD_KP_DKIN0                0x1     /* vol+ */
+# define KEYBD_KP_DKIN1                0x2     /* vol- */
+# define KEYBD_KP_DKIN2                0x3     /* multi */
+# define KEYBD_KP_DKIN5                0x4     /* SWKEY_GN */
+#endif /* DELTA_CHECK_KEYBD */
+
 /*
  * select serial console configuration
  */
@@ -178,7 +189,8 @@
  * NAND Flash
  */
 /* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
-#define CONFIG_NEW_NAND_CODE
+#undef CFG_NAND_LEGACY
+
 #define CFG_NAND0_BASE         0x0 /* 0x43100040 */ /* 0x10000000 */
 #undef CFG_NAND1_BASE