Skip to contentSkip to conversation

Remove the obsolete cfg definition

PATCH New Dave Liu 2 participants 2 messages Jun 7, 2008 – Jul 5, 2008

lore
Share & tools
lore

Dave Liu

author
#0 lore raw

PATCH 1/1 Remove the obsolete cfg definition

From: Dave Liu <[email protected]>

The rtl8139 driver doesn't need KSEG again, remove it. the _IO_BASE has default value as 0, so also remove it.

Signed-off-by Dave Liu <[email protected]>
---
 include/configs/HIDDEN_DRAGON.h |    3 ---
 include/configs/MPC8349ITX.h    |    6 ------
 include/configs/MPC8544DS.h     |    6 ------
 include/configs/MPC8610HPCD.h   |    4 ----
 include/configs/MPC8641HPCN.h   |    4 ----
 include/configs/mpc7448hpc2.h   |    3 ---
 6 files changed, 0 insertions(+), 26 deletions(-)
include/configs/HIDDEN_DRAGON.h +0 -3
index 26dd954..33e5939 100644
@@ -103,9 +103,6 @@
 #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/MPC8349ITX.h +0 -6
index 38410a1..dfacbe1 100644
@@ -347,16 +347,10 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CFG_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	CFG_PCI2_MEM_BASE
include/configs/MPC8544DS.h +0 -6
index ffe9e00..1e77808 100644
@@ -325,12 +325,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	CFG_PCI1_IO_BASE
 	#define PCI_ENET0_MEMADDR	CFG_PCI1_IO_BASE
include/configs/MPC8610HPCD.h +0 -4
index a051b6d..a0ad515 100644
@@ -288,10 +288,6 @@
 #define CFG_PCI_MEMORY_PHYS	0x00000000
 #define CFG_PCI_MEMORY_SIZE	0x80000000
 
-/* For RTL8139 */
-#define KSEG1ADDR(x)	({u32 _x = le32_to_cpu(*(u32 *)(x)); (&_x); })
-#define _IO_BASE		0x00000000
-
 /* controller 1, Base address 0xa000 */
 #define CFG_PCIE1_MEM_BASE	0xa0000000
 #define CFG_PCIE1_MEM_PHYS	CFG_PCIE1_MEM_BASE
include/configs/MPC8641HPCN.h +0 -4
index 49ee7ff..f959367 100644
@@ -313,10 +313,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CFG_PCI_MEMORY_PHYS	0x00000000
 #define CFG_PCI_MEMORY_SIZE	0x80000000
 
-/* For RTL8139 */
-#define KSEG1ADDR(x)		({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);})
-#define _IO_BASE		0x00000000
-
 #define CFG_PCI2_MEM_BASE	0xa0000000
 #define CFG_PCI2_MEM_PHYS	CFG_PCI2_MEM_BASE
 #define CFG_PCI2_MEM_SIZE	0x20000000	/* 512M */
include/configs/mpc7448hpc2.h +0 -3
index a218f75..e426f41 100644
@@ -123,8 +123,6 @@
 
 /* Networking Configuration */
 
-#define KSEG1ADDR(a)	(a)	/* Needed by the rtl8139 driver */
-
 #define CONFIG_TSI108_ETH
 #define CONFIG_TSI108_ETH_NUM_PORTS	2
 

@@ -301,7 +299,6 @@
 
 #define CFG_PCI_IO_SIZE		0x01000000	/* 16MB */
 
-#define _IO_BASE		0x00000000	/* points to PCI I/O space      */
 
 /* PCI Config Space mapping */
 #define CFG_PCI_CFG_BASE	0xfb000000	/* Changed from FE000000 */
Signature · 1 line
1.5.5
#1 lore raw

PATCH 1/1 Remove the obsolete cfg definition

Quoted 7 lines · In message <1212824256.3835.4.camel@mars> you wrote:

From: Dave Liu <[email protected]>

The rtl8139 driver doesn't need KSEG again, remove it. the _IO_BASE has default value as 0, so also remove it.

Signed-off-by Dave Liu <[email protected]>
Quoted 8 lines
---
 include/configs/HIDDEN_DRAGON.h |    3 ---
 include/configs/MPC8349ITX.h    |    6 ------
 include/configs/MPC8544DS.h     |    6 ------
 include/configs/MPC8610HPCD.h   |    4 ----
 include/configs/MPC8641HPCN.h   |    4 ----
 include/configs/mpc7448hpc2.h   |    3 ---
 6 files changed, 0 insertions(+), 26 deletions(-)

Can you please split this into two separate patches? Thanks in advance.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The optimum committee has no members.
                                                   - Norman Augustine