aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-11 11:57:08 +0100
committerMark Brown <broonie@linaro.org>2013-08-11 11:57:08 +0100
commit05299d3dafd25738682a0f93bb8764563413b385 (patch)
treeb63e81c784161103535d8d49d24836850806c36f /arch/arm/Kconfig
parent5d17a870a98442a3f116326f756c516fa1445d63 (diff)
parente9b3bd248b349433215cf01064a866b632fb3f4b (diff)
downloadlinaro-lsk-05299d3dafd25738682a0f93bb8764563413b385.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/android-fixes' into linux-linaro-lsk-android
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 594dce426f4..385fef3ebeb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1970,16 +1970,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.