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

Commit 962fc811 authored by Joonwoo Park's avatar Joonwoo Park Committed by Kyle Yan
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>
parent 2f17079b

arch/arm/Makefile

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

endif



DTSSUBDIR := qcom



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)



boot := arch/arm/boot
@@ -334,22 +336,18 @@ $(INSTALL_TARGETS): 
%.dtb: | scripts

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



PHONY += dtbs dtbs_install



dtbs: prepare scripts

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



PHONY += vdso_install

vdso_install:

ifeq ($(CONFIG_VDSO),y)

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

endif



dtbs dtbs_install: prepare scripts

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

dtbs: scripts

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

	$(foreach DIR, $(DTSSUBDIR), $(Q)$(MAKE) $(build)=$(boot)/dts/$(DIR) MACHINE=$(MACHINE) 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

archclean:

arch/arm/boot/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -11,11 +11,14 @@ 
# Copyright (C) 1995-2002 Russell King

#



ifneq ($(MACHINE),)

include $(MACHINE)/Makefile.boot

endif

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:

#   ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)

#   PARAMS_PHYS must be within 4MB of ZRELADDR

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -809,5 +809,6 @@ ifeq ($(CONFIG_ARM64),y) 
always		:= $(DTB_LIST)

else

dtbs: $(addprefix $(obj)/, $(DTB_LIST))

	$(Q)rm -f $(obj)/../*.dtb

endif

clean-files	:= *.dtb