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

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

Merge "arm64: msm: Add support for uncompressed kernel image"

parents 90df5bc0 f1d581c7

arch/arm64/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,29 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES 
	  Space separated list of names of dtbs to append when

	  building a concatenated Image.gz-dtb.



choice

	prompt "Kernel compression method"

	default BUILD_ARM64_KERNEL_COMPRESSION_GZIP

	help

	  Allows choice between gzip compressed or uncompressed

	  kernel image



config BUILD_ARM64_KERNEL_COMPRESSION_GZIP

	bool "Build compressed kernel image"

	help

	  Build a kernel image using gzip

	  compression with concatenated dtb.

	  gzip is based on the DEFLATE

	  algorithm.



config BUILD_ARM64_UNCOMPRESSED_KERNEL

	bool "Build uncompressed kernel image"

	help

	  Build a kernel image without

	  compression and with

	  concatenated dtb.

endchoice



config BUILD_ARM64_DT_OVERLAY

	bool "enable DT overlay compilation support"

	depends on OF

arch/arm64/Makefile

+7 −3
Original line number Diff line number Diff line
@@ -109,11 +109,15 @@ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ 
libs-y		:= arch/arm64/lib/ $(libs-y)

core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a



ifeq ($(CONFIG_BUILD_ARM64_KERNEL_COMPRESSION_GZIP),y)

KBUILD_IMAGE   := Image.gz

else

KBUILD_IMAGE   := Image

endif



# Default target when executing plain make

ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)

KBUILD_IMAGE	:= $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))

else

KBUILD_IMAGE	:= Image.gz

KBUILD_IMAGE	:=  $(addsuffix -dtb,$(KBUILD_IMAGE))

endif



KBUILD_DTBS	:= dtbs

arch/arm64/boot/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -45,7 +45,11 @@ $(obj)/Image: vmlinux FORCE 
$(obj)/Image.bz2: $(obj)/Image FORCE

	$(call if_changed,bzip2)



$(obj)/Image-dtb: $(obj)/Image $(DTB_OBJS) FORCE

$(obj)/Image-dtb-hdr: $(obj)/Image FORCE

	echo -n 'UNCOMPRESSED_IMG' > $@ && \

	$(call size_append, $(filter-out FORCE,$^)) >> $@



$(obj)/Image-dtb: $(obj)/Image-dtb-hdr $(obj)/Image $(DTB_OBJS) FORCE

	$(call if_changed,cat)



$(obj)/Image.gz: $(obj)/Image FORCE