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

Commit 8a4ab68a authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by Patrick Daly
Browse files

ANDROID: ARM: Allow to choose appended kernel image 



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

Change-Id: I1c71b85136f1beeb61782e4646820718c1ccd7e4
Signed-off-by: default avatarDmitry Shmidt <dimitrysh@google.com>
Git-Repo: https://android.googlesource.com/kernel/common


Git-Commit: 4bdcc9366ab74f0880ba72f7a1a98391359f127f
[pdaly] Ported to ARM32
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent cdc02dd0

arch/arm/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -1902,6 +1902,26 @@ config BUILD_ARM_APPENDED_DTB_IMAGE 
	  Enabling this option will cause a concatenated zImage and list of

	  DTBs to be built by default (instead of a standalone zImage.)

	  The image will built in arch/arm/boot/zImage-dtb

choice

	prompt "Appended DTB Kernel Image name"

	depends on BUILD_ARM_APPENDED_DTB_IMAGE

	default ZIMG_DTB

	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/arm/boot/IMAGE-NAME-dtb



	config ZIMG_DTB

		bool "zImage-dtb"

	config IMG_DTB

		bool "Image-dtb"

endchoice



config BUILD_ARM_APPENDED_KERNEL_IMAGE_NAME

	string

	depends on BUILD_ARM_APPENDED_DTB_IMAGE

	default "zImage-dtb" if ZIMG_DTB

	default "Image-dtb" if IMG_DTB



config BUILD_ARM_APPENDED_DTB_IMAGE_NAMES

	string "Default dtb names"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ boot := arch/arm/boot 
ifeq ($(CONFIG_XIP_KERNEL),y)

KBUILD_IMAGE := $(boot)/xipImage

else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y)

KBUILD_IMAGE := $(boot)/zImage-dtb

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

else

KBUILD_IMAGE := $(boot)/zImage

endif