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

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

diff --git a/include/configs/io64.h b/include/configs/io64.h
index 274625dbd4860f306d1ad07365c70f4cad767c84..f110b706020f73fc01d6dee5a2f7497c5ece9e8f 100644 (file)
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -324,7 +324,7 @@
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_I2C_SPEED   400000  /* I2C speed and slave address */
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0  400000
 
 #define CONFIG_PCA9698         1       /* NXP PCA9698 */
 
@@ -498,6 +498,12 @@
 
 #define CONFIG_SYS_FPGA_COUNT          2
 
+#define CONFIG_SYS_FPGA_PTR { \
+       (struct ihs_fpga *)CONFIG_SYS_FPGA0_BASE, \
+       (struct ihs_fpga *)CONFIG_SYS_FPGA1_BASE }
+
+#define CONFIG_SYS_FPGA_COMMON
+
 #define CONFIG_SYS_LATCH0_RESET                0xffff
 #define CONFIG_SYS_LATCH0_BOOT         0xffff
 #define CONFIG_SYS_LATCH1_RESET                0xffbf