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

Commit 4fbcf362 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: build correct dtbs to append to zImage" into msm-4.9

parents 90c30f03 175fa869

arch/arm/Makefile

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

endif



DTSSUBDIR	:= qcom



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)



boot := arch/arm/boot
@@ -337,13 +339,9 @@ $(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



dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(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:
@@ -352,7 +350,7 @@ ifeq ($(CONFIG_VDSO),y) 
endif



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

+4 −3
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ 


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



ifneq ($(MACHINE),)

include $(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)

arch/arm/boot/dts/Makefile

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

else

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

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

endif

clean-files	:= *.dtb