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

Commit a34006fc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable uncompressed image option for Kona"

parents 2245273b d378f86b

arch/arm64/Kconfig

+23 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,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 KRYO_PMU_WORKAROUND

	bool "Workaround for PMU IRQ burst"

	default n

arch/arm64/Makefile

+9 −4
Original line number Diff line number Diff line
@@ -115,13 +115,18 @@ 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

boot		:= arch/arm64/boot



ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)

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

else

KBUILD_IMAGE	:= $(boot)/Image.gz

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

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

endif



KBUILD_DTBS	:= dtbs
@@ -130,7 +135,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
export DTC_FLAGS := -@

endif



all:	$(KBUILD_DTBS) $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))

all:	$(KBUILD_DTBS) $(KBUILD_TARGET)



Image: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/arm64/boot/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -34,7 +34,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

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_SETEND_EMULATION=y 
CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y

CONFIG_KRYO_PMU_WORKAROUND=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_SETEND_EMULATION=y 
# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y

CONFIG_KRYO_PMU_WORKAROUND=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y