diff options
| author | Srinivas Ramana <sramana@codeaurora.org> | 2016-06-09 15:01:48 +0530 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-06-15 16:15:56 -0700 |
| commit | 2f17079bfbed6f5eed018bb5950601a5d65f2060 (patch) | |
| tree | 539d79635c3bd81eb0069a1361578392495db69d | |
| parent | 96315acfc1075b102b944df163be62a312f0b827 (diff) | |
ARM: dts: Make sure to add the dts files to compilation target
Add the dts files to the compilation target when compiling
for arm.
Change-Id: I3146989f6e73bfe101ac9363428bd0beecd09c32
Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/Makefile | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d83f20080c0a..0aeb5a198801 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -768,7 +768,6 @@ dtb-$(CONFIG_MACH_DOVE) += \ dove-cubox-es.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ -<<<<<<< HEAD dove-dove-db.dtb \ dove-sbc-a510.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += \ @@ -806,5 +805,9 @@ endif targets += dtbs dtbs_install targets += $(DTB_LIST) +ifeq ($(CONFIG_ARM64),y) always := $(DTB_LIST) +else +dtbs: $(addprefix $(obj)/, $(DTB_LIST)) +endif clean-files := *.dtb diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index 2ac6627f4d8d..dd955be6c908 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -118,6 +118,16 @@ dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb -always := $(dtb-y) -subdir-y := $(dts-dirs) -clean-files := *.dtb +ifeq ($(CONFIG_ARM64),y) +always := $(dtb-y) +subdir-y := $(dts-dirs) +else +targets += dtbs +targets += $(addprefix ../, $(dtb-y)) + +$(obj)/../%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + +dtbs: $(addprefix $(obj)/../,$(dtb-y)) +endif +clean-files := *.dtb |