Merge branch 'master' of git://git.denx.de/u-boot-nios

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

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index cbf04e3f2d2934f8f3a01fe61ff3d598744e5282..35feed0fe14f0e10569fda2c81491a01f67a26df 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -186,9 +186,10 @@
 
 #define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_FPGA_BASE + 0x70)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define NAND_MAX_CHIPS         1
 #define CONFIG_CMD_NAND
 
+#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
+
 /* LIME GDC */
 #define CONFIG_SYS_LIME_BASE           0xc8000000
 #define CONFIG_SYS_LIME_SIZE           0x04000000      /* 64 MB        */
@@ -244,7 +245,6 @@
 #define CONFIG_SYS_I2C_OFFSET          0x3000
 
 #define CONFIG_I2C_MULTI_BUS
-#define CONFIG_I2C_CMD_TREE
 #define CONFIG_SYS_I2C2_OFFSET         0x3100
 
 /* I2C RTC */