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

Commit 5cfb0152 authored by Joonwoo Park's avatar Joonwoo Park Committed by Matt Wagantall
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: I5182d88909e68644905a6c91c2cef14642415417
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
[abhimany: resolve trivial merge conflict]
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 850759ef

arch/arm/Makefile

+6 −4
Original line number Original line Diff line number Diff line
@@ -289,6 +289,8 @@ ifeq ($(CONFIG_USE_OF),y) 
KBUILD_DTBS := dtbs

KBUILD_DTBS := dtbs

endif

endif





DTSSUBDIR := qcom



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)

all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)





boot := arch/arm/boot

boot := arch/arm/boot
@@ -313,12 +315,12 @@ $(INSTALL_TARGETS): 
%.dtb: | scripts

%.dtb: | scripts

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

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





PHONY += dtbs dtbs_install

dtbs: scripts

dtbs dtbs_install: prepare scripts

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

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

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





zImage-dtb: vmlinux scripts dtbs

zImage-dtb: vmlinux scripts dtbs

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

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





# We use MRPROPER_FILES and CLEAN_FILES now

# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

archclean:

arch/arm/boot/Makefile

+6 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,12 @@ include $(srctree)/$(MACHINE)/Makefile.boot 
endif

endif

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

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





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:

# Note: the following conditions must always be true:

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   PARAMS_PHYS must be within 4MB of ZRELADDR

#   PARAMS_PHYS must be within 4MB of ZRELADDR