* [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files
@ 2009-06-19 19:10 Timur Tabi
2009-06-19 19:31 ` Kim Phillips
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Timur Tabi @ 2009-06-19 19:10 UTC (permalink / raw)
To: u-boot
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>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Andy Fleming <afleming@freescale.com>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
---
v3: removed the change for PN62.h, which does not have _IO_BASE at 0
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/mpc7448hpc2.h | 4 ----
include/configs/r2dplus.h | 2 --
14 files changed, 1 insertions(+), 53 deletions(-)
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index f6777b9..251fe67 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -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
*/
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 50b3a03..5e86e4c 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -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
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index cf8b773..df6970c 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -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 */
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 101dced..87f3a73 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -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
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/MVBLM7.h b/include/configs/MVBLM7.h
index 9675205..ac8cb57 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -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
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
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 7d42155..4f98ba4 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -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 */
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 6fa1eaf..37d4fff 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -123,7 +123,5 @@
*/
#define CONFIG_NET_MULTI
#define CONFIG_RTL8139
-#define _IO_BASE 0x00000000
-#define KSEG1ADDR(x) (x)
#endif /* __CONFIG_H */
--
1.6.0.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files
2009-06-19 19:10 [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files Timur Tabi
@ 2009-06-19 19:31 ` Kim Phillips
2009-07-09 18:06 ` Timur Tabi
2009-07-10 22:19 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Kim Phillips @ 2009-06-19 19:31 UTC (permalink / raw)
To: u-boot
On Fri, 19 Jun 2009 14:10:52 -0500
Timur Tabi <timur@freescale.com> 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>
> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Acked-by: Andy Fleming <afleming@freescale.com>
> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
> ---
ack
Kim
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files
2009-06-19 19:10 [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files Timur Tabi
2009-06-19 19:31 ` Kim Phillips
@ 2009-07-09 18:06 ` Timur Tabi
2009-07-10 22:19 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Timur Tabi @ 2009-07-09 18:06 UTC (permalink / raw)
To: u-boot
Wolfgang, please apply this version of the patch. Thanks.
On Fri, Jun 19, 2009 at 2:10 PM, Timur Tabi<timur@freescale.com> 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>
> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Acked-by: Andy Fleming <afleming@freescale.com>
> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
> ---
>
> v3: removed the change for PN62.h, which does not have _IO_BASE at 0
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files
2009-06-19 19:10 [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files Timur Tabi
2009-06-19 19:31 ` Kim Phillips
2009-07-09 18:06 ` Timur Tabi
@ 2009-07-10 22:19 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2009-07-10 22:19 UTC (permalink / raw)
To: u-boot
Dear Timur Tabi,
In message <1245438652-6489-1-git-send-email-timur@freescale.com> you 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>
> Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> Acked-by: Andy Fleming <afleming@freescale.com>
> Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
> ---
>
> v3: removed the change for PN62.h, which does not have _IO_BASE at 0
>
> 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/mpc7448hpc2.h | 4 ----
> include/configs/r2dplus.h | 2 --
> 14 files changed, 1 insertions(+), 53 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
--
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
"Why waste negative entropy on comments, when you could use the same
entropy to create bugs instead?" - Steve Elias
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-10 22:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-19 19:10 [U-Boot] [PATCH v3] remove _IO_BASE and KSEG1ADDR from board configuration files Timur Tabi
2009-06-19 19:31 ` Kim Phillips
2009-07-09 18:06 ` Timur Tabi
2009-07-10 22:19 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.