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: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 4bda2c06fe0543cd3356877c5bfd61c3a4f21a17..bf87f37e84b2244d6c9ca5b4de2932f00cc9b1cb 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -934,6 +934,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

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index f76ec8d5ac6be4509c2161500b40feb75d2b5276..f1d8a05727cfb46c5efdad263cf877acd8f13a1d 100644 (file)
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -87,7 +87,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)
-KBUILD_IMAGE   := Image.gz-dtb
+KBUILD_IMAGE   := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))
 else
 KBUILD_IMAGE   := Image.gz
 endif