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

Commit aaa665cc authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by Bryan Huntsman
Browse files

ANDROID: ARM64: Allow to choose appended kernel image 



By default appended kernel image is Image.gz-dtb.
New config option BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME
allows to choose between Image.gz-dtb and Image-dtb.

Change-Id: I1c71b85136f1beeb61782e4646820718c1ccd7e4
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
Signed-off-by: default avatarRishabh Bhatnagar <rishabhb@codeaurora.org>
parent 04df94fb

arch/arm64/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,26 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE 
	  DTBs to be built by default (instead of a standalone Image.gz.)

	  The image will built in arch/arm64/boot/Image.gz-dtb



choice

	prompt "Appended DTB Kernel Image name"

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

	help

	  Enabling this option will cause a specific kernel image Image or

	  Image.gz to be used for final image creation.

	  The image will built in arch/arm64/boot/IMAGE-NAME-dtb



	config IMG_GZ_DTB

		bool "Image.gz-dtb"

	config IMG_DTB

		bool "Image-dtb"

endchoice



config BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME

	string

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

	default "Image.gz-dtb" if IMG_GZ_DTB

	default "Image-dtb" if IMG_DTB



config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES

	string "Default dtb names"

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

arch/arm64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -124,9 +124,9 @@ 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	:= Image.gz-dtb

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

else

KBUILD_IMAGE	:= Image.gz

KBUILD_IMAGE	:= $(boot)/Image.gz

endif



KBUILD_DTBS	:= dtbs