leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: move mpc8xxx entry under arch/powerpc/cpu/

Browse Source 
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2013-11-11 14:35:56 +09:00 committed by Tom Rini
parent 08e39a8434
commit c54ecaa965
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -273,18 +273,10 @@ LIBS-y += drivers/power/libpower.o \
LIBS-y += drivers/spi/libspi.o LIBS-y += drivers/spi/libspi.o
ifeq ($(CPU),mpc83xx) ifeq ($(CPU),mpc83xx)
LIBS-y += drivers/qe/libqe.o LIBS-y += drivers/qe/libqe.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif endif
ifeq ($(CPU),mpc85xx) ifeq ($(CPU),mpc85xx)
LIBS-y += drivers/qe/libqe.o LIBS-y += drivers/qe/libqe.o
LIBS-y += drivers/net/fm/libfm.o LIBS-y += drivers/net/fm/libfm.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif
ifeq ($(CPU),mpc86xx)
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif endif
LIBS-y += drivers/serial/libserial.o LIBS-y += drivers/serial/libserial.o
LIBS-y += drivers/usb/eth/libusb_eth.o LIBS-y += drivers/usb/eth/libusb_eth.o
@ -305,6 +297,7 @@ LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif endif
LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/libcpu.o
LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o

3
arch/powerpc/cpu/Makefile Normal file
View File

@ -0,0 +1,3 @@
ifneq ($(filter mpc83xx mpc85xx mpc86xx,$(CPU)),)
obj-y += mpc8xxx/
endif

6
arch/powerpc/cpu/mpc8xxx/Makefile
View File

@ -31,3 +31,9 @@ obj-$(CONFIG_SYS_SRIO) += srio.o
obj-$(CONFIG_FSL_LAW) += law.o obj-$(CONFIG_FSL_LAW) += law.o
endif endif
ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/
else
obj-y += ddr/
endif

13
spl/Makefile
View File

@ -57,18 +57,6 @@ endif
LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
LIBS-y += $(CPUDIR)/lib$(CPU).o LIBS-y += $(CPUDIR)/lib$(CPU).o
ifeq ($(CPU),mpc83xx)
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif
ifeq ($(CPU),mpc85xx)
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
endif
endif
ifeq ($(CPU),mpc86xx)
LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
endif
ifdef SOC ifdef SOC
LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
@ -106,6 +94,7 @@ LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif endif
LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/libcpu.o
ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o