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

[people/ms/u-boot.git] / include / configs / MPC8610HPCD.h

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 678e1e151af6e4f95dc50fcbf013e62132b57f43..67b2764289ac4203360c0e97e1eaac15b024de43 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -41,6 +41,7 @@
 #define CONFIG_PCIE1           1       /* PCIe 1 connected to ULI bridge */
 #define CONFIG_PCIE2           1       /* PCIe 2 connected to slot */
 #define CONFIG_FSL_PCI_INIT    1       /* Use common FSL init code */
+#define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
 #define CONFIG_FSL_LAW         1       /* Use common FSL init code */
 
 #define CONFIG_ENV_OVERWRITE
@@ -125,15 +126,6 @@
 #define CONFIG_SYS_DDR_ERR_DIS         0x00000000
 #define CONFIG_SYS_DDR_SBE             0x000f0000
 
-/*
- * FIXME: Not used in fixed_sdram function
- */
-#define CONFIG_SYS_DDR_MODE            0x00000022
-#define CONFIG_SYS_DDR_CS1_BNDS        0x00000000
-#define CONFIG_SYS_DDR_CS2_BNDS        0x00000FFF      /* Not done */
-#define CONFIG_SYS_DDR_CS3_BNDS        0x00000FFF      /* Not done */
-#define CONFIG_SYS_DDR_CS4_BNDS        0x00000FFF      /* Not done */
-#define CONFIG_SYS_DDR_CS5_BNDS        0x00000FFF      /* Not done */
 #endif
 
 
@@ -278,11 +270,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS        0xe1000000
 #define CONFIG_SYS_PCI1_IO_SIZE        0x00100000      /* 1M */
 
-/* PCI view of System Memory */
-#define CONFIG_SYS_PCI_MEMORY_BUS      0x00000000
-#define CONFIG_SYS_PCI_MEMORY_PHYS     0x00000000
-#define CONFIG_SYS_PCI_MEMORY_SIZE     0x80000000
-
 /* For RTL8139 */
 #define KSEG1ADDR(x)   ({u32 _x = le32_to_cpu(*(u32 *)(x)); (&_x); })
 #define _IO_BASE               0x00000000