diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-07-31 23:41:39 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:18:05 -0700 |
| commit | ccf495752b106f4343a971b32441c358f8256ad6 (patch) | |
| tree | 6eaab42abd5aa971819abbb16e277189a75f1ec6 /arch/arm/Kconfig | |
| parent | 65832a6d9f2603a1e6a1d12a313b7b7f823ac9f6 (diff) | |
UPSTREAM Revert Android "ARM: convert build of appended dtb zImage to list of dtbs"
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6ac20c6ef068..920f1dcd9060 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2005,16 +2005,16 @@ 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 list of - DTBs to be built by default (instead of a standalone zImage.) - The image will built in arch/arm/boot/zImage-dtb + 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_NAMES - string "Default dtb names" +config BUILD_ARM_APPENDED_DTB_IMAGE_NAME + string "Default dtb name" depends on BUILD_ARM_APPENDED_DTB_IMAGE help - Space separated list of names of dtbs to append when - building a concatenated zImage-dtb. + 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. |