Merge with /home/m8/git/u-boot

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

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 053a8f726ce1c7e5c4a9539dc5f0f1d77b98c247..e4c8ccab1137231b04ea7469e6a5261d238c7f5a 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -63,6 +63,7 @@
 #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 *\/ */
 
 /*
@@ -177,7 +178,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