[U-Boot] [PATCH] fsl: remove _IO_BASE and KSEG1ADDR from board configuration files
The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet driver, but the code that used that macro was removed over a year ago, so board configuration files no longer need to define it.
The _IO_BASE macro is also automatically defined to 0 if it isn't already set, so there's no need to define that macro either in the board configuration files.
Signed-off-by: Timur Tabi timur@freescale.com --- include/configs/MPC8349ITX.h | 7 ------- include/configs/MPC8536DS.h | 6 ------ include/configs/MPC8544DS.h | 6 ------ include/configs/MPC8572DS.h | 6 ------ include/configs/MPC8610HPCD.h | 4 ---- include/configs/MPC8641HPCN.h | 4 ---- include/configs/P2020DS.h | 6 ------ 7 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index f2e574b..d4d3256 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -360,16 +360,9 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CONFIG_SYS_PCI2_IO_SIZE 0x01000000 /* 16M */ #endif
-#define _IO_BASE 0x00000000 /* points to PCI I/O space */ - #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */
-#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) (x) -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR 0x00000000 #define PCI_ENET0_MEMADDR CONFIG_SYS_PCI2_MEM_BASE diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 9e00b89..7085d28 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -427,12 +427,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #undef CONFIG_TULIP #undef CONFIG_RTL8139
-#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);}) -#define _IO_BASE 0x00000000 -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BUS #define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BUS diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 59cfde6..1d8fecf 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -340,12 +340,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_TULIP #define CONFIG_RTL8139
-#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) (x) -#define _IO_BASE 0x00000000 -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BUS #define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BUS diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 2aba689..c7385e4 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -484,12 +484,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #undef CONFIG_TULIP #undef CONFIG_RTL8139
-#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) (x) -#define _IO_BASE 0x00000000 -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR CONFIG_SYS_PCIE3_IO_BUS #define PCI_ENET0_MEMADDR CONFIG_SYS_PCIE3_IO_BUS diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 1091043..2f40ef4 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -280,10 +280,6 @@ #define CONFIG_SYS_PCI1_IO_VIRT 0xe1000000 #define CONFIG_SYS_PCI1_IO_SIZE 0x00100000 /* 1M */
-/* For RTL8139 */ -#define KSEG1ADDR(x) ({u32 _x = le32_to_cpu(*(u32 *)(x)); (&_x); }) -#define _IO_BASE 0x00000000 - /* controller 1, Base address 0xa000 */ #define CONFIG_SYS_PCIE1_MEM_BUS 0xa0000000 #define CONFIG_SYS_PCIE1_MEM_PHYS CONFIG_SYS_PCIE1_MEM_BUS diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index d8042fb..de2cf1a 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -348,10 +348,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); | CONFIG_SYS_PHYS_ADDR_HIGH) #define CONFIG_SYS_PCI1_IO_SIZE 0x00010000 /* 64K */
-/* For RTL8139 */ -#define KSEG1ADDR(x) ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);}) -#define _IO_BASE 0x00000000 - #ifdef CONFIG_PHYS_64BIT /* * Use the same PCI bus address on PCI1 and PCI2 if we have PHYS_64BIT. diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index a39ff26..443bc40 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -517,12 +517,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); #undef CONFIG_TULIP #define CONFIG_RTL8139
-#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) (x) -#define _IO_BASE 0x00000000 -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR CONFIG_SYS_PCIE3_IO_BUS #define PCI_ENET0_MEMADDR CONFIG_SYS_PCIE3_IO_BUS
On Jun 15, 2009, at 4:53 PM, Timur Tabi wrote:
The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet driver, but the code that used that macro was removed over a year ago, so board configuration files no longer need to define it.
The _IO_BASE macro is also automatically defined to 0 if it isn't already set, so there's no need to define that macro either in the board configuration files.
Signed-off-by: Timur Tabi timur@freescale.com
include/configs/MPC8349ITX.h | 7 ------- include/configs/MPC8536DS.h | 6 ------ include/configs/MPC8544DS.h | 6 ------ include/configs/MPC8572DS.h | 6 ------ include/configs/MPC8610HPCD.h | 4 ---- include/configs/MPC8641HPCN.h | 4 ---- include/configs/P2020DS.h | 6 ------ 7 files changed, 0 insertions(+), 39 deletions(-)
Kim, do you want to ack this 8349itx and I'll pick it up.
- k
On Mon, 15 Jun 2009 21:51:14 -0500 Kumar Gala galak@kernel.crashing.org wrote:
On Jun 15, 2009, at 4:53 PM, Timur Tabi wrote:
The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet driver, but the code that used that macro was removed over a year ago, so board configuration files no longer need to define it.
The _IO_BASE macro is also automatically defined to 0 if it isn't already set, so there's no need to define that macro either in the board configuration files.
Signed-off-by: Timur Tabi timur@freescale.com
include/configs/MPC8349ITX.h | 7 ------- include/configs/MPC8536DS.h | 6 ------ include/configs/MPC8544DS.h | 6 ------ include/configs/MPC8572DS.h | 6 ------ include/configs/MPC8610HPCD.h | 4 ---- include/configs/MPC8641HPCN.h | 4 ---- include/configs/P2020DS.h | 6 ------ 7 files changed, 0 insertions(+), 39 deletions(-)
Kim, do you want to ack this 8349itx and I'll pick it up.
it's missing other boards like the MVBLM7, mpc7448hpc2...
Kim
Kim Phillips wrote:
it's missing other boards like the MVBLM7, mpc7448hpc2...
I'm not familiar with those boards, so I didn't touch them. If you give me a list of which boards I should add, I can post an updated version of the patch.
On Tue, 16 Jun 2009 13:31:38 -0500 Timur Tabi timur@freescale.com wrote:
Kim Phillips wrote:
it's missing other boards like the MVBLM7, mpc7448hpc2...
I'm not familiar with those boards, so I didn't touch them. If you give me a list of which boards I should add, I can post an updated version of the patch.
all ppc boards with KSEG1ADDR and _IO_BASE? isn't that what your commit message says the domain is?
Kim
Kim Phillips wrote:
all ppc boards with KSEG1ADDR and _IO_BASE? isn't that what your commit message says the domain is?
I was hoping you'd be more specific. The patch title says, "fsl:", so I'm restricting it to FSL boards.
The only config files that have either of these two macros are:
HIDDEN_DRAGON.h M5253DEMO.h M5253EVBE.h M54455EVB.h mpc7448hpc2.h MVBLM7.h PN62.h r2dplus.h
I think all but the last are PPC boards. Should I include those?
On Tue, 16 Jun 2009 13:49:57 -0500 Timur Tabi timur@freescale.com wrote:
Kim Phillips wrote:
all ppc boards with KSEG1ADDR and _IO_BASE? isn't that what your commit message says the domain is?
I was hoping you'd be more specific. The patch title says, "fsl:", so I'm restricting it to FSL boards.
while that may suit you, that's not in the best interest of u-boot, since the patch addresses a problem with an affliction that spreads beyond fsl boards.
The only config files that have either of these two macros are:
HIDDEN_DRAGON.h M5253DEMO.h M5253EVBE.h M54455EVB.h mpc7448hpc2.h MVBLM7.h PN62.h r2dplus.h
I think all but the last are PPC boards. Should I include those?
sure, why not? Be sure to test and CC maintainers appropriately.
Thanks,
Kim
Ok, I need a consensus. It's not clear to me if I should post a patch that
1) Updates only FSL boards 2) Updates all PPC boards 3) Updates all boards
On Tue, 16 Jun 2009 16:23:40 -0500 Timur Tabi timur@freescale.com wrote:
Ok, I need a consensus. It's not clear to me if I should post a patch that
- Updates only FSL boards
- Updates all PPC boards
- Updates all boards
based on the content of the patch:
-/* This macro is used by RTL8139 but not defined in PPC architecture */
I'd say 2, all ppc boards.
Kim
Kim Phillips wrote:
based on the content of the patch:
-/* This macro is used by RTL8139 but not defined in PPC architecture */
I'd say 2, all ppc boards.
rd2plus.h, which is an SH board, has this:
/* * Network device (RTL8139) support */ #define CONFIG_NET_MULTI #define CONFIG_RTL8139 #define _IO_BASE 0x00000000 #define KSEG1ADDR(x) (x)
So PPC isn't the only architecture affected by this. However, since I don't have an SH cross-compiler, I can't test it.
Hi, all.
2009/6/17 Timur Tabi timur@freescale.com
Kim Phillips wrote:
based on the content of the patch:
-/* This macro is used by RTL8139 but not defined in PPC architecture */
I'd say 2, all ppc boards.
rd2plus.h, which is an SH board, has this:
/* * Network device (RTL8139) support */ #define CONFIG_NET_MULTI #define CONFIG_RTL8139 #define _IO_BASE 0x00000000 #define KSEG1ADDR(x) (x)
So PPC isn't the only architecture affected by this. However, since I don't have an SH cross-compiler, I can't test it.
No problem, if remove this line. I recivce mail about this. And I checked this code and compiling. This work fine.
Best regards, Nobuhiro -- Nobuhiro Iwamatsu
On Tue, 2009-06-16 at 13:31 -0500, Timur Tabi wrote:
Kim Phillips wrote:
it's missing other boards like the MVBLM7, mpc7448hpc2...
I'm not familiar with those boards, so I didn't touch them. If you give me a list of which boards I should add, I can post an updated version of the patch.
MVBLM7 is mpc8343 ... please apply your patch.
Thanks,
André
MATRIX VISION GmbH, Talstra�e 16, DE-71570 Oppenweiler Registergericht: Amtsgericht Stuttgart, HRB 271090 Gesch�ftsf�hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Hans-Joachim Reich
2009/6/19 André Schwarz andre.schwarz@matrix-vision.de:
MVBLM7 is mpc8343 ... please apply your patch.
I posted another version of my patch that include MVBLM7. Please ACK that patch.
participants (5)
-
André Schwarz -
Kim Phillips -
Kumar Gala -
Nobuhiro Iwamatsu -
Timur Tabi