summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-10-17 20:38:55 +0900
committerTom Rini <trini@ti.com>2013-10-31 13:26:44 -0400
commit3c5edd8ca594c73162ef01c45dbf4ea6f7148003 (patch)
treec9493a055a5d73e64e4431770f6a06f21b32c108
parent37d82beb57fa5ff2cee42b7caebfbb9f6c2c3f42 (diff)
downloadu-boot-imx-3c5edd8ca594c73162ef01c45dbf4ea6f7148003.zip
u-boot-imx-3c5edd8ca594c73162ef01c45dbf4ea6f7148003.tar.gz
u-boot-imx-3c5edd8ca594c73162ef01c45dbf4ea6f7148003.tar.bz2
ARM: omap: move OMAP specific code under arch/arm/
This patch moves OMAP specific directory entries from the toplevel Makefile and spl/Makefile to arch/arm/cpu/armv7/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Rini <trini@ti.com>
-rw-r--r--Makefile4
-rw-r--r--arch/arm/cpu/armv7/Makefile3
-rw-r--r--spl/Makefile4
3 files changed, 3 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7e5fd94..c6a9c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -300,10 +300,6 @@ LIBS-y += api/libapi.o
LIBS-y += post/libpost.o
LIBS-y += test/libtest.o
-ifneq ($(CONFIG_OMAP_COMMON),)
-LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
-endif
-
ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 2c17322..a5d5bf3 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -13,12 +13,15 @@ obj-y += cpu.o
obj-y += syslib.o
ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX),)
+ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y)
obj-y += lowlevel_init.o
endif
+endif
ifneq ($(CONFIG_ARMV7_NONSEC)$(CONFIG_ARMV7_VIRT),)
obj-y += nonsec_virt.o
obj-y += virt-v7.o
endif
+obj-$(CONFIG_OMAP_COMMON) += omap-common/
obj-$(CONFIG_TEGRA) += tegra-common/
diff --git a/spl/Makefile b/spl/Makefile
index d3dc511..8e7daa2 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -101,10 +101,6 @@ LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
LIBS-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/libwatchdog.o
-ifneq ($(CONFIG_OMAP_COMMON),)
-LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
-endif
-
ifneq (,$(CONFIG_MX23)$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35))
LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
endif