diff options
| -rw-r--r-- | board/freescale/mpc8536ds/mpc8536ds.c | 8 | ||||
| -rw-r--r-- | board/freescale/mpc8544ds/mpc8544ds.c | 8 | ||||
| -rw-r--r-- | board/freescale/mpc8548cds/mpc8548cds.c | 4 | ||||
| -rw-r--r-- | board/freescale/mpc8568mds/mpc8568mds.c | 4 | ||||
| -rw-r--r-- | board/freescale/mpc8572ds/mpc8572ds.c | 6 | ||||
| -rw-r--r-- | cpu/mpc85xx/pci.c | 16 | ||||
| -rw-r--r-- | include/configs/MPC8536DS.h | 12 | ||||
| -rw-r--r-- | include/configs/MPC8540ADS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8541CDS.h | 4 | ||||
| -rw-r--r-- | include/configs/MPC8544DS.h | 12 | ||||
| -rw-r--r-- | include/configs/MPC8548CDS.h | 6 | ||||
| -rw-r--r-- | include/configs/MPC8555CDS.h | 4 | ||||
| -rw-r--r-- | include/configs/MPC8560ADS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8568MDS.h | 4 | ||||
| -rw-r--r-- | include/configs/MPC8572DS.h | 10 | 
15 files changed, 55 insertions, 47 deletions
| diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 280ae1a31..1e2e2dc13 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -199,7 +199,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE3_IO_BASE, +			       CONFIG_SYS_PCIE3_IO_BUS,  			       CONFIG_SYS_PCIE3_IO_PHYS,  			       CONFIG_SYS_PCIE3_IO_SIZE,  			       PCI_REGION_IO); @@ -254,7 +254,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE1_IO_BASE, +			       CONFIG_SYS_PCIE1_IO_BUS,  			       CONFIG_SYS_PCIE1_IO_PHYS,  			       CONFIG_SYS_PCIE1_IO_SIZE,  			       PCI_REGION_IO); @@ -317,7 +317,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE2_IO_BASE, +			       CONFIG_SYS_PCIE2_IO_BUS,  			       CONFIG_SYS_PCIE2_IO_PHYS,  			       CONFIG_SYS_PCIE2_IO_SIZE,  			       PCI_REGION_IO); @@ -385,7 +385,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCI1_IO_BASE, +			       CONFIG_SYS_PCI1_IO_BUS,  			       CONFIG_SYS_PCI1_IO_PHYS,  			       CONFIG_SYS_PCI1_IO_SIZE,  			       PCI_REGION_IO); diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index c3bf60a46..7ff5a9bb8 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -146,7 +146,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE3_IO_BASE, +			       CONFIG_SYS_PCIE3_IO_BUS,  			       CONFIG_SYS_PCIE3_IO_PHYS,  			       CONFIG_SYS_PCIE3_IO_SIZE,  			       PCI_REGION_IO); @@ -213,7 +213,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE1_IO_BASE, +			       CONFIG_SYS_PCIE1_IO_BUS,  			       CONFIG_SYS_PCIE1_IO_PHYS,  			       CONFIG_SYS_PCIE1_IO_SIZE,  			       PCI_REGION_IO); @@ -276,7 +276,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE2_IO_BASE, +			       CONFIG_SYS_PCIE2_IO_BUS,  			       CONFIG_SYS_PCIE2_IO_PHYS,  			       CONFIG_SYS_PCIE2_IO_SIZE,  			       PCI_REGION_IO); @@ -344,7 +344,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCI1_IO_BASE, +			       CONFIG_SYS_PCI1_IO_BUS,  			       CONFIG_SYS_PCI1_IO_PHYS,  			       CONFIG_SYS_PCI1_IO_SIZE,  			       PCI_REGION_IO); diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index ff8d26fb9..70320ea1a 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -313,7 +313,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCI1_IO_BASE, +			       CONFIG_SYS_PCI1_IO_BUS,  			       CONFIG_SYS_PCI1_IO_PHYS,  			       CONFIG_SYS_PCI1_IO_SIZE,  			       PCI_REGION_IO); @@ -397,7 +397,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -			       CONFIG_SYS_PCIE1_IO_BASE, +			       CONFIG_SYS_PCIE1_IO_BUS,  			       CONFIG_SYS_PCIE1_IO_PHYS,  			       CONFIG_SYS_PCIE1_IO_SIZE,  			       PCI_REGION_IO); diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 20f70fb52..915fae7fa 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -404,7 +404,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -				CONFIG_SYS_PCI1_IO_BASE, +				CONFIG_SYS_PCI1_IO_BUS,  				CONFIG_SYS_PCI1_IO_PHYS,  				CONFIG_SYS_PCI1_IO_SIZE,  				PCI_REGION_IO); @@ -457,7 +457,7 @@ pci_init_board(void)  		/* outbound io */  		pci_set_region(r++, -				CONFIG_SYS_PCIE1_IO_BASE, +				CONFIG_SYS_PCIE1_IO_BUS,  				CONFIG_SYS_PCIE1_IO_PHYS,  				CONFIG_SYS_PCIE1_IO_SIZE,  				PCI_REGION_IO); diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 01143ec89..5148d337d 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -192,7 +192,7 @@ void pci_init_board(void)  			/* outbound io */  			pci_set_region(r++, -					CONFIG_SYS_PCIE3_IO_BASE, +					CONFIG_SYS_PCIE3_IO_BUS,  					CONFIG_SYS_PCIE3_IO_PHYS,  					CONFIG_SYS_PCIE3_IO_SIZE,  					PCI_REGION_IO); @@ -259,7 +259,7 @@ void pci_init_board(void)  			/* outbound io */  			pci_set_region(r++, -					CONFIG_SYS_PCIE2_IO_BASE, +					CONFIG_SYS_PCIE2_IO_BUS,  					CONFIG_SYS_PCIE2_IO_PHYS,  					CONFIG_SYS_PCIE2_IO_SIZE,  					PCI_REGION_IO); @@ -314,7 +314,7 @@ void pci_init_board(void)  			/* outbound io */  			pci_set_region(r++, -					CONFIG_SYS_PCIE1_IO_BASE, +					CONFIG_SYS_PCIE1_IO_BUS,  					CONFIG_SYS_PCIE1_IO_PHYS,  					CONFIG_SYS_PCIE1_IO_SIZE,  					PCI_REGION_IO); diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c index 7a8184a50..fedf1a54d 100644 --- a/cpu/mpc85xx/pci.c +++ b/cpu/mpc85xx/pci.c @@ -35,10 +35,18 @@  #define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_BASE  #endif +#ifndef CONFIG_SYS_PCI1_IO_BUS +#define CONFIG_SYS_PCI1_IO_BUS CONFIG_SYS_PCI1_IO_BASE +#endif +  #ifndef CONFIG_SYS_PCI2_MEM_BUS  #define CONFIG_SYS_PCI2_MEM_BUS CONFIG_SYS_PCI2_MEM_BASE  #endif +#ifndef CONFIG_SYS_PCI2_IO_BUS +#define CONFIG_SYS_PCI2_IO_BUS CONFIG_SYS_PCI2_IO_BASE +#endif +  static struct pci_controller *pci_hose;  void @@ -95,7 +103,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)  	pcix->powar1 = (POWAR_EN | POWAR_MEM_READ |  			POWAR_MEM_WRITE | (__ilog2(CONFIG_SYS_PCI1_MEM_SIZE) - 1)); -	pcix->potar2  = (CONFIG_SYS_PCI1_IO_BASE >> 12) & 0x000fffff; +	pcix->potar2  = (CONFIG_SYS_PCI1_IO_BUS >> 12) & 0x000fffff;  	pcix->potear2  = 0x00000000;  	pcix->powbar2  = (CONFIG_SYS_PCI1_IO_PHYS >> 12) & 0x000fffff;  	pcix->powbear2 = 0x00000000; @@ -119,7 +127,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)  		       PCI_REGION_MEM);  	pci_set_region(hose->regions + 1, -		       CONFIG_SYS_PCI1_IO_BASE, +		       CONFIG_SYS_PCI1_IO_BUS,  		       CONFIG_SYS_PCI1_IO_PHYS,  		       CONFIG_SYS_PCI1_IO_SIZE,  		       PCI_REGION_IO); @@ -180,7 +188,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)  	pcix2->powar1 = (POWAR_EN | POWAR_MEM_READ |  			POWAR_MEM_WRITE | (__ilog2(CONFIG_SYS_PCI2_MEM_SIZE) - 1)); -	pcix2->potar2  = (CONFIG_SYS_PCI2_IO_BASE >> 12) & 0x000fffff; +	pcix2->potar2  = (CONFIG_SYS_PCI2_IO_BUS >> 12) & 0x000fffff;  	pcix2->potear2  = 0x00000000;  	pcix2->powbar2  = (CONFIG_SYS_PCI2_IO_PHYS >> 12) & 0x000fffff;  	pcix2->powbear2 = 0x00000000; @@ -204,7 +212,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)  		       PCI_REGION_MEM);  	pci_set_region(hose->regions + 1, -		       CONFIG_SYS_PCI2_IO_BASE, +		       CONFIG_SYS_PCI2_IO_BUS,  		       CONFIG_SYS_PCI2_IO_PHYS,  		       CONFIG_SYS_PCI2_IO_SIZE,  		       PCI_REGION_IO); diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index e280311a0..b2a7d9ef0 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -360,7 +360,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #define CONFIG_SYS_PCI1_MEM_SIZE	0x10000000	/* 256M */ -#define CONFIG_SYS_PCI1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCI1_IO_BUS	0x00000000  #define CONFIG_SYS_PCI1_IO_PHYS	0xffc00000  #define CONFIG_SYS_PCI1_IO_SIZE	0x00010000	/* 64k */ @@ -368,7 +368,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE1_MEM_BUS	0x90000000  #define CONFIG_SYS_PCIE1_MEM_PHYS	CONFIG_SYS_PCIE1_MEM_BUS  #define CONFIG_SYS_PCIE1_MEM_SIZE	0x08000000	/* 128M */ -#define CONFIG_SYS_PCIE1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE1_IO_PHYS	0xffc10000  #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */ @@ -376,7 +376,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE2_MEM_BUS	0x98000000  #define CONFIG_SYS_PCIE2_MEM_PHYS	CONFIG_SYS_PCIE2_MEM_BUS  #define CONFIG_SYS_PCIE2_MEM_SIZE	0x08000000	/* 128M */ -#define CONFIG_SYS_PCIE2_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE2_IO_PHYS	0xffc20000  #define CONFIG_SYS_PCIE2_IO_SIZE	0x00010000	/* 64k */ @@ -384,7 +384,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE3_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCIE3_MEM_PHYS	CONFIG_SYS_PCIE3_MEM_BUS  #define CONFIG_SYS_PCIE3_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE3_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE3_IO_PHYS	0xffc30000  #define CONFIG_SYS_PCIE3_IO_SIZE	0x00010000	/* 64k */ @@ -424,8 +424,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #endif  #ifndef CONFIG_PCI_PNP -	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BASE -	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCI1_IO_BASE +	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS +	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCI1_IO_BUS  	#define PCI_IDSEL_NUMBER	0x11	/* IDSEL = AD11 */  #endif diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 2483d507e..18e4105ae 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -319,7 +319,7 @@  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */ diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 850384a9e..03f6a6993 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -344,14 +344,14 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */  #define CONFIG_SYS_PCI2_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCI2_MEM_PHYS	CONFIG_SYS_PCI2_MEM_BUS  #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_PHYS	0xe2100000  #define CONFIG_SYS_PCI2_IO_SIZE	0x100000	/* 1M */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index e31c65b0c..8d0d7848d 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -269,7 +269,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  #define CONFIG_SYS_PCI1_MEM_BUS	0xc0000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe1000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x00010000	/* 64k */ @@ -277,7 +277,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE2_MEM_BUS	0x80000000  #define CONFIG_SYS_PCIE2_MEM_PHYS	CONFIG_SYS_PCIE2_MEM_BUS  #define CONFIG_SYS_PCIE2_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE2_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE2_IO_PHYS	0xe1010000  #define CONFIG_SYS_PCIE2_IO_SIZE	0x00010000	/* 64k */ @@ -285,7 +285,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE1_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCIE1_MEM_PHYS	CONFIG_SYS_PCIE1_MEM_BUS  #define CONFIG_SYS_PCIE1_MEM_SIZE	0x10000000	/* 256M */ -#define CONFIG_SYS_PCIE1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE1_IO_PHYS	0xe1020000  #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */ @@ -293,7 +293,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE3_MEM_BUS	0xb0000000  #define CONFIG_SYS_PCIE3_MEM_PHYS	CONFIG_SYS_PCIE3_MEM_BUS  #define CONFIG_SYS_PCIE3_MEM_SIZE	0x00100000	/* 1M */ -#define CONFIG_SYS_PCIE3_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE3_IO_PHYS	0xb0100000	/* reuse mem LAW */  #define CONFIG_SYS_PCIE3_IO_SIZE	0x00100000	/* 1M */  #define CONFIG_SYS_PCIE3_MEM_BUS2	0xb0200000 @@ -336,8 +336,8 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);  #endif  #ifndef CONFIG_PCI_PNP -	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BASE -	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCI1_IO_BASE +	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCI1_IO_BUS +	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCI1_IO_BUS  	#define PCI_IDSEL_NUMBER	0x11	/* IDSEL = AD11 */  #endif diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 2477c4839..d76e38cca 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -370,7 +370,7 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x00100000	/* 1M */ @@ -378,7 +378,7 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCI2_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCI2_MEM_PHYS	CONFIG_SYS_PCI2_MEM_BUS  #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_PHYS	0xe2800000  #define CONFIG_SYS_PCI2_IO_SIZE	0x00100000	/* 1M */  #endif @@ -387,7 +387,7 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCIE1_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCIE1_MEM_PHYS	CONFIG_SYS_PCIE1_MEM_BUS  #define CONFIG_SYS_PCIE1_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE1_IO_PHYS	0xe3000000  #define CONFIG_SYS_PCIE1_IO_SIZE	0x00100000	/*   1M */  #endif diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 7c6e68a9b..738fe52a5 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -342,14 +342,14 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x00100000	/* 1M */  #define CONFIG_SYS_PCI2_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCI2_MEM_PHYS	CONFIG_SYS_PCI2_MEM_BUS  #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_PHYS	0xe2100000  #define CONFIG_SYS_PCI2_IO_SIZE	0x00100000	/* 1M */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 91512056d..0ef5acdf1 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -311,7 +311,7 @@  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x100000	/* 1M */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 6cc0685ad..8b067394e 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -325,14 +325,14 @@ extern unsigned long get_clock_freq(void);  #define CONFIG_SYS_PCI1_MEM_BUS	0x80000000  #define CONFIG_SYS_PCI1_MEM_PHYS	CONFIG_SYS_PCI1_MEM_BUS  #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_PHYS	0xe2000000  #define CONFIG_SYS_PCI1_IO_SIZE	0x00800000	/* 8M */  #define CONFIG_SYS_PCIE1_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCIE1_MEM_PHYS	CONFIG_SYS_PCIE1_MEM_BUS  #define CONFIG_SYS_PCIE1_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE1_IO_PHYS	0xe2800000  #define CONFIG_SYS_PCIE1_IO_SIZE	0x00800000	/* 8M */ diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 58b92acff..f665fecc7 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -383,7 +383,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE3_MEM_BUS	0x80000000  #define CONFIG_SYS_PCIE3_MEM_PHYS	CONFIG_SYS_PCIE3_MEM_BUS  #define CONFIG_SYS_PCIE3_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE3_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE3_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE3_IO_PHYS	0xffc00000  #define CONFIG_SYS_PCIE3_IO_SIZE	0x00010000	/* 64k */ @@ -391,7 +391,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE2_MEM_BUS	0xa0000000  #define CONFIG_SYS_PCIE2_MEM_PHYS	CONFIG_SYS_PCIE2_MEM_BUS  #define CONFIG_SYS_PCIE2_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE2_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE2_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE2_IO_PHYS	0xffc10000  #define CONFIG_SYS_PCIE2_IO_SIZE	0x00010000	/* 64k */ @@ -399,7 +399,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #define CONFIG_SYS_PCIE1_MEM_BUS	0xc0000000  #define CONFIG_SYS_PCIE1_MEM_PHYS	CONFIG_SYS_PCIE1_MEM_BUS  #define CONFIG_SYS_PCIE1_MEM_SIZE	0x20000000	/* 512M */ -#define CONFIG_SYS_PCIE1_IO_BASE	0x00000000 +#define CONFIG_SYS_PCIE1_IO_BUS	0x00000000  #define CONFIG_SYS_PCIE1_IO_PHYS	0xffc20000  #define CONFIG_SYS_PCIE1_IO_SIZE	0x00010000	/* 64k */ @@ -436,8 +436,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);  #endif  #ifndef CONFIG_PCI_PNP -	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BASE -	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCIE3_IO_BASE +	#define PCI_ENET0_IOADDR	CONFIG_SYS_PCIE3_IO_BUS +	#define PCI_ENET0_MEMADDR	CONFIG_SYS_PCIE3_IO_BUS  	#define PCI_IDSEL_NUMBER	0x11	/* IDSEL = AD11 */  #endif |