aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2013-03-25 22:04:41 (GMT)
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-06-06 15:43:12 (GMT)
commitdccbcdb6ea8d95db97865f4fe8f2dd47af0cf490 (patch)
tree25042227c3f962d0577defe7a315ad3cf221584e
parent93d1f945d2b35c93b08598c4854340627ad5ebbb (diff)
downloadkernel_replicant_linux-dccbcdb6ea8d95db97865f4fe8f2dd47af0cf490.zip
kernel_replicant_linux-dccbcdb6ea8d95db97865f4fe8f2dd47af0cf490.tar.gz
kernel_replicant_linux-dccbcdb6ea8d95db97865f4fe8f2dd47af0cf490.tar.bz2
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> Signed-off-by: Erik Gilling <konkers@android.com> Change-Id: I34b643b1c49228fbae88a56e46c93c478089620d
-rw-r--r--arch/arm/Kconfig15
-rw-r--r--arch/arm/Makefile2
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9aed25a..a9f5158 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1816,6 +1816,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
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 807a7d0..f5f68eb 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -301,6 +301,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 := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME)
else
KBUILD_IMAGE := $(boot)/zImage
endif