Evolution-X-Devices/kernel_google_wahoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: ARM64: Allow to choose appended kernel image

Browse Source 
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>
This commit is contained in:
Dmitry Shmidt
2017-03-28 13:30:18 -07:00
parent 0c61bc75ee
commit a08cafa7e0
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/Kconfig
View File

@@ -930,6 +930,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

2
arch/arm64/Makefile
View File

@@ -85,7 +85,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