remove _IO_BASE and KSEG1ADDR from board configuration files
PATCH v2 1/1 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.
--- include/configs/HIDDEN_DRAGON.h | 4 +--- include/configs/M5253DEMO.h | 1 - include/configs/M5253EVBE.h | 1 - include/configs/M54455EVB.h | 1 - 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/MVBLM7.h | 2 -- include/configs/P2020DS.h | 6 ------ include/configs/PN62.h | 2 -- include/configs/mpc7448hpc2.h | 4 ---- include/configs/r2dplus.h | 2 -- 15 files changed, 1 insertions(+), 55 deletions(-)
include/configs/HIDDEN_DRAGON.h +1 -3
@@ -103,9 +103,7 @@#define PCI_ENET1_MEMADDR 0x81000000#define CONFIG_RTL8139 -#define _IO_BASE 0x00000000 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR (x) (x) +/* Make sure the ethaddr can be overwritten TODO: Remove this on final product */
include/configs/M5253DEMO.h +0 -1
@@ -85,7 +85,6 @@# define CONFIG_SYS_ATA_REG_OFFSET 0xA0/* Offset for normal register accesses */ # define CONFIG_SYS_ATA_ALT_OFFSET 0xC0/* Offset for alternate registers */ # define CONFIG_SYS_ATA_STRIDE 4/* Interval between registers */ -# define _IO_BASE 0#endif #define CONFIG_NET_MULTI 1
include/configs/M5253EVBE.h +0 -1
@@ -91,7 +91,6 @@#define CONFIG_SYS_ATA_REG_OFFSET 0xA0/* Offset for normal register accesses */ #define CONFIG_SYS_ATA_ALT_OFFSET 0xC0/* Offset for alternate registers */ #define CONFIG_SYS_ATA_STRIDE 4/* Interval between registers */ -#define _IO_BASE 0#define CONFIG_SYS_PROMPT "=> "#define CONFIG_SYS_LONGHELP /* undef to save memory */
include/configs/M54455EVB.h +0 -1
@@ -180,7 +180,6 @@#define CONFIG_SYS_ATA_REG_OFFSET 0xA0/* Offset for normal register accesses */ #define CONFIG_SYS_ATA_ALT_OFFSET 0xC0/* Offset for alternate registers */ #define CONFIG_SYS_ATA_STRIDE 4/* Interval between registers */ -#define _IO_BASE 0/* Realtime clock */ #define CONFIG_MCFRTC
include/configs/MPC8349ITX.h +0 -7
@@ -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
include/configs/MPC8536DS.h +0 -6
@@ -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
include/configs/MPC8544DS.h +0 -6
@@ -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
include/configs/MPC8572DS.h +0 -6
@@ -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
include/configs/MPC8610HPCD.h +0 -4
@@ -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
include/configs/MPC8641HPCN.h +0 -4
@@ -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.
include/configs/MVBLM7.h +0 -2
@@ -193,8 +193,6 @@#define CONFIG_SYS_PCI1_IO_PHYS 0xE2000000#define CONFIG_SYS_PCI1_IO_SIZE 0x01000000 -#define _IO_BASE 0x00000000 -#define CONFIG_NET_MULTI 1#define CONFIG_NET_RETRY_COUNT 3
include/configs/P2020DS.h +0 -6
@@ -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
include/configs/PN62.h +0 -2
@@ -133,8 +133,6 @@#define CONFIG_PCNET /* there are 2 AMD PCnet 79C973 */ #define CONFIG_PCNET_79C973 -#define _IO_BASE 0xfe000000/* points to PCI I/O space */ -/* * Start addresses for the final memory configuration
include/configs/mpc7448hpc2.h +0 -4
@@ -124,8 +124,6 @@/* Networking Configuration */ -#define KSEG1ADDR (a) (a)/* Needed by the rtl8139 driver */ -#define CONFIG_TSI108_ETH #define CONFIG_TSI108_ETH_NUM_PORTS 2
@@ -303,8 +301,6 @@#define CONFIG_SYS_PCI_IO_SIZE 0x01000000/* 16MB */ -#define _IO_BASE 0x00000000/* points to PCI I/O space */ -/* PCI Config Space mapping */ #define CONFIG_SYS_PCI_CFG_BASE 0xfb000000/* Changed from FE000000 */ #define CONFIG_SYS_PCI_CFG_SIZE 0x01000000/* 16MB */
include/configs/r2dplus.h +0 -2
@@ -123,7 +123,5 @@*/ #define CONFIG_NET_MULTI #define CONFIG_RTL8139 -#define _IO_BASE 0x00000000 -#define KSEG1ADDR (x) (x)#endif /* __CONFIG_H */
Signature · 1 line
1.6.0.6
PATCH v2 1/1 remove _IO_BASE and KSEG1ADDR from board configuration files
Quoted 8 lines · On Wed, 17 Jun 2009 10:34:55 -0500 Timur Tabi <[email protected]> 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_BASEmacro 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 <[email protected]>
Best regards,
Nobuhiro
Signature · 2 lines
Nobuhiro Iwamatsu GPG ID: 3170EBE9
PATCH v2 1/1 remove _IO_BASE and KSEG1ADDR from board configuration files
Quoted 8 lines · Nobuhiro Iwamatsu
Quoted 1 line · On Wed, 17 Jun 2009 10:34:55 -0500 Timur Tabi <[email protected]> wrote:
The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet driver,
but
Quoted 3 lines
the code that used that macro was removed over a year ago, so board configuration files no longer need to define it.
Quoted 7 lines
Quoted 1 line
The
_IO_BASEmacro is also automatically defined to 0 if it isn't alreadyset,
Quoted 1 line
so there's no need to define that macro either in the board configuration
files.
Quoted 2 lines
Signed-off-by Timur Tabi <[email protected]>
PATCH v2 1/1 remove _IO_BASE and KSEG1ADDR from board configuration files
Quoted 12 lines · Andy Fleming
Quoted 10 lines · Nobuhiro Iwamatsu
Quoted 1 line · On Wed, 17 Jun 2009 10:34:55 -0500 Timur Tabi <[email protected]> wrote:
The KSEG1ADDR macro used to be necessary for the RTL8139 Ethernet driver,
but
Quoted 4 lines
the code that used that macro was removed over a year ago, so board configuration files no longer need to define it.
The
_IO_BASEmacro is also automatically defined to 0 if it isn't alreadyset,
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
so there's no need to define that macro either in the board configuration
files.
Quoted 2 lines
Signed-off-by Timur Tabi <[email protected]>Acked-by Andy Fleming <[email protected]>
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
PATCH v2 1/1 remove _IO_BASE and KSEG1ADDR from board configuration files
In reply to Timur TabiQuoted 2 lines · On Wed, 17 Jun 2009 10:34:55 -0500 Timur Tabi <[email protected]> wrote:
The
_IO_BASEmacro 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.
...
include/configs/PN62.h line 137
Quoted 7 lines
+++
b/include/configs/PN62.hinclude/configs/PN62.h +0
-2@@ -133,8 +133,6 @@#define CONFIG_PCNET /* there are 2 AMD PCnet 79C973 */ #define CONFIG_PCNET_79C973 -#define _IO_BASE 0xfe000000/* points to PCI I/O space */ -
but the PN62 doesn't set it to 0!
Kim
PATCH v2 1/1 remove _IO_BASE and KSEG1ADDR from board configuration files
Quoted 4 lines · Kim Phillips
include/configs/PN62.h line 137
Quoted 2 lines
include/configs/PN62.h +0
-2-#define _IO_BASE 0xfe000000/* points to PCI I/O space */ -but the PN62 doesn't set it to 0!
Doh! I don't know how I missed that.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale