diff options
| author | Erik Gilling <konkers@android.com> | 2013-03-25 15:04:41 -0700 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2014-06-20 14:58:35 +0800 |
| commit | ebd916ac83b9e65018c86e382493f3f2bf91a6ff (patch) | |
| tree | c36e1cc43fb76d2488cc4cc8377533bdf2620dcd | |
| parent | 26cf50f1fa322f4b40c75217162233b3f21aa152 (diff) | |
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/Kconfig | 15 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5b0cb17f10af..d3d4345a9460 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1951,6 +1951,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 9a4fae86e19a..2caa8087ab5f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -277,6 +277,8 @@ libs-y := arch/arm/lib/ $(libs-y) # Default target when executing plain make ifeq ($(CONFIG_XIP_KERNEL),y) KBUILD_IMAGE := xipImage +else ifeq ($(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE),y) +KBUILD_IMAGE := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME) else KBUILD_IMAGE := zImage endif |