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

Commit f1102b80 authored by Erik Gilling's avatar Erik Gilling Committed by Jeevan Shriram
Browse files

ANDROID: ARM: add config option to build zImage/dtb combo 



Allows a defconfig to set a default dtb to concatenate with a zImage
to create a zImage-dtb.<dtb name>.

Change-Id: I34b643b1c49228fbae88a56e46c93c478089620d
Signed-off-by: default avatarErik Gilling <konkers@android.com>
Git-commit: 23a70d4e7b8864cf405f997d3608de65a82cf87d
Git-repo: https://android.googlesource.com/kernel/common


[jshriram@codeaurora.org: Fixed minor merge conflicts]
Signed-off-by: default avatarJeevan Shriram <jshriram@codeaurora.org>
parent 90711737

arch/arm/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -1766,6 +1766,21 @@ config DEPRECATED_PARAM_STRUCT 
	  This was deprecated in 2001 and announced to live on for 5 years.

	  Some old boot loaders still use this way.



config BUILD_ARM_APPENDED_DTB_IMAGE

	bool "Build a concatenated zImage/dtb by default"

	depends on OF

	help

	  Enabling this option will cause a concatenated zImage and DTB to

	  be built by default (instead of a standalone zImage.)  The image

	  will built in arch/arm/boot/zImage-dtb.<dtb name>



config BUILD_ARM_APPENDED_DTB_IMAGE_NAME

	string "Default dtb name"

	depends on BUILD_ARM_APPENDED_DTB_IMAGE

	help

	  name of the dtb to append when building a concatenated

	  zImage/dtb.



# Compressed boot loader in ROM.  Yes, we really want to ask about

# TEXT and BSS so we preserve their values in the config files.

config ZBOOT_ROM_TEXT

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ libs-y := arch/arm/lib/ $(libs-y) 
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.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME)

else

KBUILD_IMAGE := $(boot)/zImage

endif