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

Commit d917a1ce authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: build correct dtbs to append to zImage"

parents 5db393de efc025c8

arch/arm/Makefile

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

endif



DTSSUBDIR := qcom



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)



boot := arch/arm/boot
@@ -305,10 +307,10 @@ zinstall uinstall install: vmlinux 


dtbs: scripts

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

	$(Q)$(MAKE) $(build)=$(boot)/dts/qcom 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 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ ifneq ($(MACHINE),) 
include $(srctree)/$(MACHINE)/Makefile.boot

endif



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