kbuild: Descend into SOC directory from CPU directory
Some CPUs of some architectures have SOC directories. At present, the build system directly descends into SOC directories from the top Makefile, but it should generally descend into each directory from its parent directory. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>utp
parent
be25d875b9
commit
165ecd26f0
3
Makefile
3
Makefile
|
@ -610,9 +610,6 @@ HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(srctree)/board/$(VENDOR)/common/Makef
|
||||||
libs-y += lib/
|
libs-y += lib/
|
||||||
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
|
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
|
||||||
libs-y += $(CPUDIR)/
|
libs-y += $(CPUDIR)/
|
||||||
ifdef SOC
|
|
||||||
libs-y += $(CPUDIR)/$(SOC)/
|
|
||||||
endif
|
|
||||||
libs-$(CONFIG_OF_EMBED) += dts/
|
libs-$(CONFIG_OF_EMBED) += dts/
|
||||||
libs-y += arch/$(ARCH)/lib/
|
libs-y += arch/$(ARCH)/lib/
|
||||||
libs-y += fs/
|
libs-y += fs/
|
||||||
|
|
|
@ -7,3 +7,5 @@
|
||||||
|
|
||||||
extra-y = start.o
|
extra-y = start.o
|
||||||
obj-y = cpu.o
|
obj-y = cpu.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -10,3 +10,5 @@
|
||||||
|
|
||||||
extra-y = start.o
|
extra-y = start.o
|
||||||
obj-y = cpu.o
|
obj-y = cpu.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -9,3 +9,5 @@ extra-y = start.o
|
||||||
obj-y = interrupts.o cpu.o
|
obj-y = interrupts.o cpu.o
|
||||||
|
|
||||||
obj-$(CONFIG_TEGRA) += tegra-common/
|
obj-$(CONFIG_TEGRA) += tegra-common/
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -9,3 +9,5 @@ extra-y = start.o
|
||||||
|
|
||||||
obj-y += cpu.o
|
obj-y += cpu.o
|
||||||
obj-$(CONFIG_USE_IRQ) += interrupts.o
|
obj-$(CONFIG_USE_IRQ) += interrupts.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -13,3 +13,5 @@ ifdef CONFIG_SPL_NO_CPU_SUPPORT_CODE
|
||||||
extra-y :=
|
extra-y :=
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -37,3 +37,5 @@ obj-$(CONFIG_TEGRA) += tegra-common/
|
||||||
ifneq (,$(filter s5pc1xx exynos,$(SOC)))
|
ifneq (,$(filter s5pc1xx exynos,$(SOC)))
|
||||||
obj-y += s5p-common/
|
obj-y += s5p-common/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -14,3 +14,5 @@ obj-y += exceptions.o
|
||||||
obj-y += cache.o
|
obj-y += cache.o
|
||||||
obj-y += tlb.o
|
obj-y += tlb.o
|
||||||
obj-y += transition.o
|
obj-y += transition.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -16,3 +16,5 @@ obj-y += cache.o
|
||||||
obj-y += interrupts.o
|
obj-y += interrupts.o
|
||||||
obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
|
obj-$(CONFIG_PORTMUX_PIO) += portmux-pio.o
|
||||||
obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
|
obj-$(CONFIG_PORTMUX_GPIO) += portmux-gpio.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -8,3 +8,5 @@
|
||||||
extra-y = start.o
|
extra-y = start.o
|
||||||
obj-y = cache.o
|
obj-y = cache.o
|
||||||
obj-y += cpu.o interrupts.o time.o
|
obj-y += cpu.o interrupts.o time.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -13,3 +13,5 @@
|
||||||
obj- := __dummy__.o
|
obj- := __dummy__.o
|
||||||
|
|
||||||
extra-y = start.o
|
extra-y = start.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -11,3 +11,5 @@
|
||||||
extra-y = start.o
|
extra-y = start.o
|
||||||
obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
|
obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
|
||||||
obj-y += interrupts.o cpu.o call64.o
|
obj-y += interrupts.o cpu.o call64.o
|
||||||
|
|
||||||
|
obj-y += $(if $(SOC),$(SOC)/)
|
||||||
|
|
|
@ -20,7 +20,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
*(.vectors)
|
*(.vectors)
|
||||||
arch/arm/cpu/arm926ejs/start.o (.text*)
|
arch/arm/cpu/arm926ejs/start.o (.text*)
|
||||||
arch/arm/cpu/arm926ejs/davinci/built-in.o (.text*)
|
arch/arm/cpu/arm926ejs/built-in.o (.text*)
|
||||||
drivers/mtd/nand/built-in.o (.text*)
|
drivers/mtd/nand/built-in.o (.text*)
|
||||||
|
|
||||||
*(.text*)
|
*(.text*)
|
||||||
|
|
|
@ -60,9 +60,6 @@ libs-y += arch/$(ARCH)/lib/
|
||||||
|
|
||||||
libs-y += $(CPUDIR)/
|
libs-y += $(CPUDIR)/
|
||||||
|
|
||||||
ifdef SOC
|
|
||||||
libs-y += $(CPUDIR)/$(SOC)/
|
|
||||||
endif
|
|
||||||
libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
|
libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
|
||||||
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
|
libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue