diff options
author | Stefan Roese <sr@denx.de> | 2007-10-03 15:01:02 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-10-31 21:20:49 +0100 |
commit | 3048bcbf0bad262378c5af68f2bf6778fb7d829a (patch) | |
tree | 0c8ae4bb3e8bf5464250ab5c9cb71fffd0601638 | |
parent | 94276eb0a7a35b9e8c053d589ae225b0f017a237 (diff) |
ppc4xx: Rename 405gp_pci to 4xx_pci since its used on all 4xx platforms
These files were introduced with the IBM 405GP but are currently used on all
4xx PPC platforms. So the name doesn't match the content anymore. This patch
renames the files to 4xx_pci.c/h.
Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r-- | board/esd/ocrtc/cmd_ocrtc.c | 2 | ||||
-rw-r--r-- | board/esd/pci405/cmd_pci405.c | 2 | ||||
-rw-r--r-- | board/esd/pci405/pci405.c | 2 | ||||
-rw-r--r-- | board/mpl/common/common_util.c | 4 | ||||
-rw-r--r-- | board/mpl/common/flash.c | 2 | ||||
-rw-r--r-- | common/usb.c | 2 | ||||
-rw-r--r-- | cpu/ppc4xx/4xx_pci.c (renamed from cpu/ppc4xx/405gp_pci.c) | 2 | ||||
-rw-r--r-- | cpu/ppc4xx/Makefile | 6 | ||||
-rw-r--r-- | include/asm-ppc/4xx_pci.h (renamed from include/405gp_pci.h) | 0 |
9 files changed, 11 insertions, 11 deletions
diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c index 4177f68ef..f83dfe870 100644 --- a/board/esd/ocrtc/cmd_ocrtc.c +++ b/board/esd/ocrtc/cmd_ocrtc.c @@ -25,7 +25,7 @@ #include <command.h> #include <pci.h> #include <pci_ids.h> -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #if defined(CONFIG_CMD_BSP) diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c index 5b5ad8c44..9a0bf1e36 100644 --- a/board/esd/pci405/cmd_pci405.c +++ b/board/esd/pci405/cmd_pci405.c @@ -27,7 +27,7 @@ #include <net.h> #include <asm/io.h> #include <pci.h> -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #include <asm/processor.h> #include "pci405.h" diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index e5d2273f0..c4ab07200 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -26,7 +26,7 @@ #include <command.h> #include <malloc.h> #include <pci.h> -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #include "pci405.h" diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 278ad5c34..f3aa0a730 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -36,11 +36,11 @@ #ifdef CONFIG_PIP405 #include "../pip405/pip405.h" -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif #ifdef CONFIG_MIP405 #include "../mip405/mip405.h" -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif DECLARE_GLOBAL_DATA_PTR; diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index fd430083e..6f53192ac 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -47,7 +47,7 @@ #if defined(CONFIG_PIP405) #include "../pip405/pip405.h" #endif -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #else /* defined(CONFIG_PATI) */ #include <mpc5xx.h> #endif diff --git a/common/usb.c b/common/usb.c index 933afa9e7..4df01eabe 100644 --- a/common/usb.c +++ b/common/usb.c @@ -53,7 +53,7 @@ #include <usb.h> #ifdef CONFIG_4xx -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif #undef USB_DEBUG diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/4xx_pci.c index 282e7a1ba..e6170517a 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/4xx_pci.c @@ -72,7 +72,7 @@ #include <common.h> #include <command.h> #if !defined(CONFIG_440) -#include <405gp_pci.h> +#include <asm/4xx_pci.h> #endif #include <asm/processor.h> #include <pci.h> diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 28a8e2bcb..a11faec14 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -27,11 +27,11 @@ LIB = $(obj)lib$(CPU).a START = start.o resetvec.o kgdb.o SOBJS = dcr.o -COBJS = 405gp_pci.o 4xx_pcie.o 4xx_enet.o \ +COBJS = 40x_spd_sdram.o 44x_spd_ddr.o 44x_spd_ddr2.o \ + 4xx_pci.o 4xx_pcie.o 4xx_enet.o \ bedbug_405.o commproc.o \ cpu.o cpu_init.o gpio.o i2c.o interrupts.o \ - miiphy.o ndfc.o sdram.o serial.o \ - 40x_spd_sdram.o 44x_spd_ddr.o 44x_spd_ddr2.o speed.o \ + miiphy.o ndfc.o sdram.o serial.o speed.o \ tlb.o traps.o usb_ohci.o usb.o usbdev.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/include/405gp_pci.h b/include/asm-ppc/4xx_pci.h index 3c1adec19..3c1adec19 100644 --- a/include/405gp_pci.h +++ b/include/asm-ppc/4xx_pci.h |