Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90711737 authored by Jeevan Shriram's avatar Jeevan Shriram
Browse files

ARM: build correct dtbs to append to zImage 



The boot/dts/Makefile and boot/dts/*/Makefile provide DTB_LIST which is
equal to dtb-y when CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y.
Include these Makefiles to build dtbs for dtb appended zImage.

Change-Id: Ib8218135dc923d1ba4098d74dbd7da159368a188
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
[abhimany: resolve trivial merge conflict]
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
[sramana: Fixed merge conflicts]
Signed-off-by: default avatarSrinivas Ramana <sramana@codeaurora.org>
[jshriram: Fix trivial merge conflicts]
Signed-off-by: default avatarJeevan Shriram <jshriram@codeaurora.org>
[akdwived: Fix trivial merge conflicts]
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
parent 56f0491c

arch/arm/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ endif 


all:	$(notdir $(KBUILD_IMAGE))



DTSSUBDIR	:= qcom



archheaders:

	$(Q)$(MAKE) $(build)=arch/arm/tools uapi
@@ -343,12 +344,22 @@ $(BOOT_TARGETS): vmlinux 
$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb: | scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@



dtbs: scripts

	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs

	$(foreach DIR, $(DTSSUBDIR), $(Q)$(MAKE) $(build)=$(boot)/dts/$(DIR) MACHINE=$(MACHINE) dtbs)



PHONY += vdso_install

vdso_install:

ifeq ($(CONFIG_VDSO),y)

	$(Q)$(MAKE) $(build)=arch/arm/vdso $@

endif



zImage-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) DTSSUBDIR=$(DTSSUBDIR) $(boot)/$@



# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/arm/boot/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ 


OBJCOPYFLAGS	:=-O binary -R .comment -S



ifneq ($(MACHINE),)

include $(MACHINE)/Makefile.boot

include $(srctree)/arch/arm/boot/dts/Makefile

ifneq ($(DTSSUBDIR),)

DTSSUBDIR_INCS=$(foreach DIR, $(DTSSUBDIR), $(addsuffix /Makefile, $(addprefix $(srctree)/arch/arm/boot/dts/, $(DIR))))

include $(DTSSUBDIR_INCS)

endif



# Note: the following conditions must always be true:

arch/arm/boot/dts/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -1303,3 +1303,9 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-opp-zaius.dtb \

	aspeed-bmc-portwell-neptune.dtb \

	aspeed-bmc-quanta-q71l.dtb



dtstree := $(srctree)/$(src)

vendor := $(dtstree)/vendor

ifneq "$(wildcard $(vendor)/Makefile)" ""

    subdir-y += vendor

endif