Merge "ARM: dts: msm: Add 32-bit DT Overlay support" (220df69e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,10 @@
		# Ensure linker flags are correct
		LDFLAGS :=

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		export DTC_FLAGS := -@
		endif

		LDFLAGS_vmlinux :=-p --no-undefined -X --pic-veneer
		ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
		LDFLAGS_vmlinux += --be8

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,10 +34,10 @@ targets := Image zImage xipImage bootpImage uImage
		DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
		ifneq ($(DTB_NAMES),)
		DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
		DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))
		else
		DTB_LIST := $(dtb-y)
		DTB_OBJS := $(shell find $(obj)/dts/ -name \*.dtb)
		endif
		DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))

		ifeq ($(CONFIG_XIP_KERNEL),y)

+9 −5

Original line number	Diff line number	Diff line
		@@ -21,14 +21,18 @@ dtb-$(CONFIG_ARCH_MDM9607) += mdm9607-mtp.dtb \
		mdm9607-ttp.dtb

		targets += dtbs
		targets += $(addprefix ../, $(dtb-y))

		$(obj)/../%.dtb: $(src)/%.dts FORCE
		include $(srctree)/arch/arm64/boot/dts/qcom/Makefile
		$(obj)/%.dtb: $(src)/../../../../arm64/boot/dts/qcom/%.dts FORCE
		$(call if_changed_dep,dtc)

		include $(srctree)/arch/arm64/boot/dts/qcom/Makefile
		$(obj)/../%.dtb: $(src)/../../../../arm64/boot/dts/qcom/%.dts FORCE
		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		$(obj)/%.dtbo:$(src)/../../../../arm64/boot/dts/qcom/%.dts FORCE
		$(call if_changed_dep,dtc)
		$(call if_changed,dtbo_verify)

		dtbs: $(addprefix $(obj)/../,$(dtb-y))
		dtbs: $(addprefix $(obj)/,$(dtb-y)) $(addprefix $(obj)/,$(dtbo-y))
		else
		dtbs: $(addprefix $(obj)/,$(dtb-y))
		endif
		clean-files := *.dtb