Merge with git://www.denx.de/git/u-boot.git

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

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index c750e14..7f55366 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -78,7 +78,7 @@
 #define CONFIG_PCI_SYS_MEM_PHYS        CFG_SDRAM_BASE
 #define CONFIG_PCI_SYS_MEM_SIZE        (1024 * 1024 * 1024)
 
-#define CFG_ACE_BASE           0xe0000000      /* Xilinx ACE controller - Compact Flash */
+#define CFG_ACE_BASE           0xfe000000      /* Xilinx ACE controller - Compact Flash */
 
 /*-----------------------------------------------------------------------
  * Initial RAM & stack pointer (placed in internal SRAM)
@@ -107,11 +107,9 @@
  * DDR SDRAM
  *----------------------------------------------------------------------*/
 #define CONFIG_SPD_EEPROM      1       /* Use SPD EEPROM for setup     */
-#define SPD_EEPROM_ADDRESS {0x51, 0x52}        /* SPD i2c spd addresses        */
-#define IIC0_DIMM0_ADDR                0x51
-#define IIC0_DIMM1_ADDR                0x52
+#define SPD_EEPROM_ADDRESS     {0x51, 0x52}    /* SPD i2c spd addresses*/
+#define CONFIG_DDR_ECC         1       /* with ECC support             */
 #undef  CONFIG_STRESS
-#undef  ENABLE_ECC
 
 /*-----------------------------------------------------------------------
  * I2C
@@ -384,6 +382,22 @@
                                 EBC_CFG_PME_DISABLE  | \
                                 EBC_CFG_PR_16)
 
+/*-----------------------------------------------------------------------
+ * GPIO Setup
+ *----------------------------------------------------------------------*/
+#define CFG_GPIO_PCIE_PRESENT0 17
+#define CFG_GPIO_PCIE_PRESENT1 21
+#define CFG_GPIO_PCIE_PRESENT2 23
+#define CFG_GPIO_RS232_FORCEOFF        30
+
+#define CFG_PFC0               (GPIO_VAL(CFG_GPIO_PCIE_PRESENT0) | \
+                                GPIO_VAL(CFG_GPIO_PCIE_PRESENT1) | \
+                                GPIO_VAL(CFG_GPIO_PCIE_PRESENT2) | \
+                                GPIO_VAL(CFG_GPIO_RS232_FORCEOFF))
+#define CFG_GPIO_OR            GPIO_VAL(CFG_GPIO_RS232_FORCEOFF)
+#define CFG_GPIO_TCR           GPIO_VAL(CFG_GPIO_RS232_FORCEOFF)
+#define CFG_GPIO_ODR           0
+
 /*
  * For booting Linux, the board info and command line data
  * have to be in the first 8 MB of memory, since this is