diff options
| -rw-r--r-- | board/amcc/katmai/katmai.c | 9 | ||||
| -rw-r--r-- | board/amcc/yucca/yucca.c | 6 | ||||
| -rw-r--r-- | cpu/ppc4xx/4xx_pcie.c (renamed from cpu/ppc4xx/440spe_pcie.c) | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/Makefile | 5 | ||||
| -rw-r--r-- | include/asm-ppc/4xx_pcie.h (renamed from cpu/ppc4xx/440spe_pcie.h) | 0 |
5 files changed, 10 insertions, 12 deletions
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c index a49066f..0c8e6cb 100644 --- a/board/amcc/katmai/katmai.c +++ b/board/amcc/katmai/katmai.c @@ -24,12 +24,11 @@ #include <common.h> #include <ppc4xx.h> -#include <asm/processor.h> #include <i2c.h> -#include <asm-ppc/io.h> -#include <asm-ppc/gpio.h> - -#include "../cpu/ppc4xx/440spe_pcie.h" +#include <asm/processor.h> +#include <asm/io.h> +#include <asm/gpio.h> +#include <asm/4xx_pcie.h> #undef PCIE_ENDPOINT /* #define PCIE_ENDPOINT 1 */ diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c index d7cc384..17c3ba0 100644 --- a/board/amcc/yucca/yucca.c +++ b/board/amcc/yucca/yucca.c @@ -27,12 +27,12 @@ #include <common.h> #include <ppc4xx.h> -#include <asm/processor.h> #include <i2c.h> -#include <asm-ppc/io.h> +#include <asm/processor.h> +#include <asm/io.h> +#include <asm/4xx_pcie.h> #include "yucca.h" -#include "../cpu/ppc4xx/440spe_pcie.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/cpu/ppc4xx/440spe_pcie.c b/cpu/ppc4xx/4xx_pcie.c index 3eac0ae..8906adc 100644 --- a/cpu/ppc4xx/440spe_pcie.c +++ b/cpu/ppc4xx/4xx_pcie.c @@ -28,7 +28,7 @@ #if defined(CONFIG_440SPE) && defined(CONFIG_PCI) -#include "440spe_pcie.h" +#include <asm/4xx_pcie.h> enum { PTYPE_ENDPOINT = 0x0, diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index af9da5b..28a8e2b 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -27,13 +27,12 @@ LIB = $(obj)lib$(CPU).a START = start.o resetvec.o kgdb.o SOBJS = dcr.o -COBJS = 405gp_pci.o 440spe_pcie.o 4xx_enet.o \ +COBJS = 405gp_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 \ - tlb.o traps.o usb_ohci.o usb.o usbdev.o \ - 440spe_pcie.o + tlb.o traps.o usb_ohci.o usb.o usbdev.o SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/ppc4xx/440spe_pcie.h b/include/asm-ppc/4xx_pcie.h index 38745eb..38745eb 100644 --- a/cpu/ppc4xx/440spe_pcie.h +++ b/include/asm-ppc/4xx_pcie.h |