Merge branch 'master' of /home/wd/git/u-boot/master

[platform/kernel/u-boot.git] / include / configs / PMC405.h

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index c598d00..00a12fb 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -181,6 +181,8 @@
 #define CONFIG_SYS_PCI_PTM2MS  0xff000001      /* 16MB, enable */
 #define CONFIG_SYS_PCI_PTM2PCI 0x00000000      /* Host: use this pci address */
 
+#define CONFIG_PCI_4xx_PTM_OVERWRITE   1 /* overwrite PTMx settings by env */
+
 /*
  * Start addresses for the final memory configuration
  * (Set up by the startup code)
@@ -233,6 +235,7 @@
  * I2C EEPROM (CAT24WC16) for environment
  */
 #define CONFIG_HARD_I2C                        /* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           100000 /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
@@ -282,9 +285,6 @@
 /*
  * FPGA stuff
  */
-#define CONFIG_SYS_FPGA_XC95XL         1       /* using Xilinx XC95XL CPLD */
-#define CONFIG_SYS_FPGA_MAX_SIZE       (32 * 1024) /* 32kByte for CPLD */
-
 /* FPGA program pin configuration */
 #define CONFIG_SYS_FPGA_PRG            0x04000000 /* JTAG TMS pin (output) */
 #define CONFIG_SYS_FPGA_CLK            0x02000000 /* JTAG TCK pin (output) */