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 f2e0a8ce15194d545bcd83b339e6b1e8779ec2db..91284fdace858fe5e3052e0de788267a49d3001e 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -63,8 +63,20 @@
 #define CFG_I2C_SLAVE          1       /* I2C controllers address */
 #define DA9030_I2C_ADDR                0x49    /* I2C address of DA9030 */
 #define CFG_DA9030_EXTON_DELAY 100000  /* wait x us after DA9030 reset via EXTON */
+#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
  */
@@ -125,8 +137,8 @@
 #define CFG_BARGSIZE           CFG_CBSIZE      /* Boot Argument Buffer Size    */
 #define CFG_DEVICE_NULLDEV     1
 
-#define CFG_MEMTEST_START      0xa0400000      /* memtest works on     */
-#define CFG_MEMTEST_END                0xa0800000      /* 4 ... 8 MB in DRAM   */
+#define CFG_MEMTEST_START      0x80400000      /* memtest works on     */
+#define CFG_MEMTEST_END                0x80800000      /* 4 ... 8 MB in DRAM   */
 
 #undef CFG_CLKS_IN_HZ          /* everything, incl board info, in Hz */
 
@@ -159,16 +171,16 @@
  * Physical Memory Map
  */
 #define CONFIG_NR_DRAM_BANKS   4          /* we have 2 banks of DRAM */
-#define PHYS_SDRAM_1           0xa0000000 /* SDRAM Bank #1 */
+#define PHYS_SDRAM_1           0x80000000 /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x1000000  /* 64 MB */
-#define PHYS_SDRAM_2           0xa1000000 /* SDRAM Bank #2 */
+#define PHYS_SDRAM_2           0x81000000 /* SDRAM Bank #2 */
 #define PHYS_SDRAM_2_SIZE      0x1000000  /* 64 MB */
-#define PHYS_SDRAM_3           0xa2000000 /* SDRAM Bank #3 */
+#define PHYS_SDRAM_3           0x82000000 /* SDRAM Bank #3 */
 #define PHYS_SDRAM_3_SIZE      0x1000000  /* 64 MB */
-#define PHYS_SDRAM_4           0xa3000000 /* SDRAM Bank #4 */
+#define PHYS_SDRAM_4           0x83000000 /* SDRAM Bank #4 */
 #define PHYS_SDRAM_4_SIZE      0x1000000  /* 64 MB */
 
-#define CFG_DRAM_BASE          0xa0000000 /* at CS0 */
+#define CFG_DRAM_BASE          0x80000000 /* at CS0 */
 #define CFG_DRAM_SIZE          0x04000000 /* 64 MB Ram */
 
 #undef CFG_SKIP_DRAM_SCRUB
@@ -177,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