|author||Mark Brown <firstname.lastname@example.org>||2013-07-19 10:42:11 +0100|
|committer||Mark Brown <email@example.com>||2013-07-19 10:42:11 +0100|
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android
Conflicts: arch/arm/include/asm/smp.h arch/arm/kernel/smp.c kernel/futex.c
Diffstat (limited to 'arch/arm/Kconfig')
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index effe59d4774..594dce426f4 100644
@@ -1928,6 +1928,15 @@ config XEN
Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
+ bool "Force flush the console on restart"
+ If the console is locked while the system is rebooted, the messages
+ in the temporary logbuffer would not have propogated to all the
+ console drivers. This option forces the console lock to be
+ released if it failed to be acquired, which will cause all the
+ pending messages to be flushed.
menu "Boot options"
@@ -1957,6 +1966,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.
+ bool "Build a concatenated zImage/dtb by default"
+ depends on OF
+ 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
+ string "Default dtb names"
+ depends on BUILD_ARM_APPENDED_DTB_IMAGE
+ Space separated list of names of dtbs 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.