diff options
| author | Rohit Vaswani <rvaswani@codeaurora.org> | 2016-02-08 13:57:06 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:04:53 -0700 |
| commit | 50de92cd6d2b57305664dd7e6488619b7290859f (patch) | |
| tree | 3d9c2e34408b6b09d86ffaee31183756972cf18e /arch | |
| parent | c75946685baebd0b9c6b2e546e143c16589effd3 (diff) | |
ARM64: Enable APPENDED_DTB in Makefile and defconfig
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/Makefile | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/Makefile | 17 | ||||
| -rw-r--r-- | arch/arm64/configs/msm_defconfig | 1 |
3 files changed, 3 insertions, 21 deletions
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index ddd405f88344..a0cef8edcbad 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -14,17 +14,15 @@ # Based on the ia64 boot/Makefile. # -include $(srctree)/arch/arm64/boot/dts/Makefile - targets := Image Image.gz DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES)) ifneq ($(DTB_NAMES),) DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES)) +DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST)) else -DTB_LIST := $(dtb-y) +DTB_OBJS := $(shell find $(obj)/dts/ -name \*.dtb) endif -DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST)) $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index 5602017eb5ed..6441404ee2ed 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -18,24 +18,7 @@ subdir-y := $(dts-dirs) dtstree := $(srctree)/$(src) -targets += dtbs - -dtbs: $(addprefix $(obj)/, $(DTB_LIST)) - dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts))) always := $(dtb-y) - targets += dtbs - -DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES)) -ifneq ($(DTB_NAMES),) -DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES)) -else -DTB_LIST := $(dtb-y) -endif -targets += $(DTB_LIST) - -dtbs: $(addprefix $(obj)/, $(DTB_LIST)) - -clean-files := dts/*.dtb *.dtb diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index 0246ebe54a1e..cd00563523fd 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -41,6 +41,7 @@ CONFIG_KSM=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA=y CONFIG_CMDLINE="console=ttyAMA0" +CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_COMPAT=y CONFIG_CPU_IDLE=y |