aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-05-08 13:50:33 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-07-02 14:49:32 -0700
commit24821455e30931094b7bc73ea5f3dcb90b5c19c0 (patch)
treea6e854b912a9049d89c9a130f1829d8b6e5028ed /arch/arm/Kconfig
parent82099ce8cd9af79f7ef1140c33f0d53ca72f124b (diff)
downloadlinaro-lsk-24821455e30931094b7bc73ea5f3dcb90b5c19c0.tar.gz
Revert "ARM: convert build of appended dtb zImage to list of dtbs"
This reverts commit 5e9468632ea81e7d17fc9bd4457acbaffda7b370. Tixy was seeing trouble with "make dtbs" and "make my-boards.dtb", and found reverting this resolves the issue. So for now lets revert this. Reported-by: Jon Medhurst (Tixy) <tixy@linaro.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 99887aaa04b..351e48e45cb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1861,16 +1861,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.