diff options
| author | Erik Gilling <konkers@android.com> | 2013-03-25 15:04:41 -0700 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2019-05-18 01:33:38 +0200 |
| commit | c1cb2ea535c5e576389f9242d7f4aa258451469e (patch) | |
| tree | 11e4344b225fc78da105c92a1984de49a45d8601 | |
| parent | f236e10fabb6232b6292df497d3adb5bb27741eb (diff) | |
| download | kernel_replicant_linux-c1cb2ea535c5e576389f9242d7f4aa258451469e.tar.gz kernel_replicant_linux-c1cb2ea535c5e576389f9242d7f4aa258451469e.tar.bz2 kernel_replicant_linux-c1cb2ea535c5e576389f9242d7f4aa258451469e.zip | |
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/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 664e918e2624..cb08db528d36 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1809,6 +1809,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 9db3c584b2cb..0bbc3f5f02a2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 := zImage-dtb.$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAME) else KBUILD_IMAGE := $(boot)/zImage endif |