Merge "arm64: Properly compile Image.gz-dtb" (1a613c9d) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -128,8 +128,10 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
		boot := arch/arm64/boot
		ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)
		KBUILD_IMAGE := $(boot)/$(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
		KBUILD_TARGET := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
		else
		KBUILD_IMAGE := $(boot)/Image.gz
		KBUILD_TARGET := Image.gz
		endif

		KBUILD_DTBS := dtbs
		@@ -138,7 +140,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		export DTC_FLAGS := -@
		endif

		all: Image.gz $(KBUILD_DTBS) $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
		all: $(KBUILD_DTBS) $(KBUILD_TARGET)

		Image: vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@