|
@@ -331,14 +331,17 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|
|
* General PCI
|
|
|
* Addresses are mapped 1-1.
|
|
|
*/
|
|
|
-#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000
|
|
|
+
|
|
|
+#define CONFIG_SYS_PCI1_MEM_VIRT 0x80000000
|
|
|
#ifdef CONFIG_PHYS_64BIT
|
|
|
+#define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_VIRT
|
|
|
#define CONFIG_SYS_PCI1_MEM_PHYS 0x0000000c00000000ULL
|
|
|
#else
|
|
|
-#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE
|
|
|
+#define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_VIRT
|
|
|
+#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_VIRT
|
|
|
#endif
|
|
|
#define CONFIG_SYS_PCI1_MEM_SIZE 0x20000000 /* 512M */
|
|
|
-#define CONFIG_SYS_PCI1_IO_BASE 0x00000000
|
|
|
+#define CONFIG_SYS_PCI1_IO_BUS 0x00000000
|
|
|
#define CONFIG_SYS_PCI1_IO_VIRT 0xffc00000
|
|
|
#define CONFIG_SYS_PCI1_IO_PHYS (CONFIG_SYS_PCI1_IO_VIRT \
|
|
|
| CONFIG_SYS_PHYS_ADDR_HIGH)
|
|
@@ -348,12 +351,14 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|
|
#define KSEG1ADDR(x) ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);})
|
|
|
#define _IO_BASE 0x00000000
|
|
|
|
|
|
-#define CONFIG_SYS_PCI2_MEM_BASE (CONFIG_SYS_PCI1_MEM_BASE \
|
|
|
+#define CONFIG_SYS_PCI2_MEM_BUS (CONFIG_SYS_PCI1_MEM_BUS \
|
|
|
+ + CONFIG_SYS_PCI1_MEM_SIZE)
|
|
|
+#define CONFIG_SYS_PCI2_MEM_VIRT (CONFIG_SYS_PCI1_MEM_VIRT \
|
|
|
+ CONFIG_SYS_PCI1_MEM_SIZE)
|
|
|
#define CONFIG_SYS_PCI2_MEM_PHYS (CONFIG_SYS_PCI1_MEM_PHYS \
|
|
|
+ CONFIG_SYS_PCI1_MEM_SIZE)
|
|
|
#define CONFIG_SYS_PCI2_MEM_SIZE 0x20000000 /* 512M */
|
|
|
-#define CONFIG_SYS_PCI2_IO_BASE 0x00000000
|
|
|
+#define CONFIG_SYS_PCI2_IO_BUS 0x00000000
|
|
|
#define CONFIG_SYS_PCI2_IO_VIRT (CONFIG_SYS_PCI1_IO_VIRT \
|
|
|
+ CONFIG_SYS_PCI1_IO_SIZE)
|
|
|
#define CONFIG_SYS_PCI2_IO_PHYS (CONFIG_SYS_PCI1_IO_PHYS \
|
|
@@ -501,7 +506,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|
|
#define CONFIG_SYS_DBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_PCI1_MEM_PHYS) \
|
|
|
| BATL_PP_RW | BATL_CACHEINHIBIT \
|
|
|
| BATL_GUARDEDSTORAGE)
|
|
|
-#define CONFIG_SYS_DBAT2U (CONFIG_SYS_PCI1_MEM_BASE | BATU_BL_1G \
|
|
|
+#define CONFIG_SYS_DBAT2U (CONFIG_SYS_PCI1_MEM_VIRT | BATU_BL_1G \
|
|
|
| BATU_VS | BATU_VP)
|
|
|
#define CONFIG_SYS_IBAT2L (BAT_PHYS_ADDR(CONFIG_SYS_PCI1_MEM_PHYS) \
|
|
|
| BATL_PP_RW | BATL_CACHEINHIBIT)
|