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

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

diff --git a/include/configs/io.h b/include/configs/io.h
index af01ae25b374cceefe3f40a438ab50bcca0bab9a..79ada68ac7715b54964f842a16eaee47fb0518a4 100644 (file)
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -18,7 +18,7 @@
  * Include common defines/options for all AMCC eval boards
  */
 #define CONFIG_HOSTNAME                io
-#define CONFIG_IDENT_STRING    " io 0.05"
+#define CONFIG_IDENT_STRING    " io 0.06"
 #include "amcc-common.h"
 
 #define CONFIG_BOARD_EARLY_INIT_F
@@ -98,7 +98,7 @@
 /*
  * I2C stuff
  */
-#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_SYS_I2C_PPC4XX_SPEED_0          100000
 
 /* Temp sensor/hwmon/dtt */
 #define CONFIG_DTT_LM63                1       /* National LM63        */
@@ -123,7 +123,6 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Timeout for Flash Write/ms */
 
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1    /* use buff'd writes */
-#define CONFIG_SYS_FLASH_PROTECTION    1       /* use hardware flash protect */
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* 'E' for empty sector on flinfo */
 #define CONFIG_SYS_FLASH_QUIET_TEST    1       /* no warn upon unknown flash */
@@ -230,6 +229,11 @@
 
 #define CONFIG_SYS_FPGA_COUNT          1
 
+#define CONFIG_SYS_FPGA_PTR \
+       { (struct ihs_fpga *)CONFIG_SYS_FPGA0_BASE }
+
+#define CONFIG_SYS_FPGA_COMMON
+
 /* Memory Bank 3 (Latches) initialization */
 #define CONFIG_SYS_LATCH_BASE          0x7f200000
 #define CONFIG_SYS_EBC_PB3AP           0xa2015480