diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /arch/alpha | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.bz2 |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/Kconfig | 18 | ||||
-rw-r--r-- | arch/alpha/Kconfig.debug | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 48f6e22b6447..10862c5a8c76 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -83,7 +83,7 @@ menu "System setup" choice prompt "Alpha system type" default ALPHA_GENERIC - ---help--- + help This is the system type of your hardware. A "generic" kernel will run on any supported Alpha system. However, if you configure a kernel for your specific system, it will be faster and smaller. @@ -480,7 +480,7 @@ config VGA_HOSE config ALPHA_QEMU bool "Run under QEMU emulation" depends on !ALPHA_GENERIC - ---help--- + help Assume the presence of special features supported by QEMU PALcode that reduce the overhead of system emulation. @@ -495,7 +495,7 @@ config ALPHA_SRM bool "Use SRM as bootloader" if ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS || ALPHA_NONAME depends on TTY default y if ALPHA_JENSEN || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL - ---help--- + help There are two different types of booting firmware on Alphas: SRM, which is command line driven, and ARC, which uses menus and arrow keys. Details about the Linux/Alpha booting process are contained in @@ -521,7 +521,7 @@ config ARCH_MAY_HAVE_PC_FDC config SMP bool "Symmetric multi-processing support" depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL - ---help--- + help This enables support for systems with more than one CPU. If you have a system with only one CPU, say N. If you have a system with more than one CPU, say Y. @@ -569,7 +569,7 @@ config ALPHA_WTINT default n if ALPHA_EV5 || ALPHA_EV56 || (ALPHA_EV4 && !ALPHA_LCA) default n if !ALPHA_SRM && !ALPHA_GENERIC default y if SMP - ---help--- + help The Wait for Interrupt (WTINT) PALcall attempts to place the CPU to sleep until the next interrupt. This may reduce the power consumed, and the heat produced by the computer. However, it has @@ -595,7 +595,7 @@ config NODES_SHIFT # LARGE_VMALLOC is racy, if you *really* need it then fix it first config ALPHA_LARGE_VMALLOC bool - ---help--- + help Process creation and other aspects of virtual memory management can be streamlined if we restrict the kernel to one PGD for all vmalloc allocations. This equates to about 8GB. @@ -614,7 +614,7 @@ config VERBOSE_MCHECK_ON int "Verbose Printing Mode (0=off, 1=on, 2=all)" depends on VERBOSE_MCHECK default 1 - ---help--- + help This option allows the default printing mode to be set, and then possibly overridden by a boot command argument. @@ -633,7 +633,7 @@ choice default HZ_128 if ALPHA_QEMU default HZ_1200 if ALPHA_RAWHIDE default HZ_1024 - ---help--- + help The frequency at which timer interrupts occur. A high frequency minimizes latency, whereas a low frequency minimizes overhead of process accounting. The later effect is especially significant @@ -668,7 +668,7 @@ config HZ config SRM_ENV tristate "SRM environment through procfs" depends on PROC_FS - ---help--- + help If you enable this option, a subdirectory inside /proc called /proc/srm_environment will give you access to the all important SRM environment variables (those which have a name) and also diff --git a/arch/alpha/Kconfig.debug b/arch/alpha/Kconfig.debug index b88c7b641d72..f85f4281cc48 100644 --- a/arch/alpha/Kconfig.debug +++ b/arch/alpha/Kconfig.debug @@ -9,7 +9,7 @@ config ALPHA_LEGACY_START_ADDRESS bool "Legacy kernel start address" depends on ALPHA_GENERIC default n - ---help--- + help The 2.4 kernel changed the kernel start address from 0x310000 to 0x810000 to make room for the Wildfire's larger SRM console. Recent consoles on Titan and Marvel machines also require the |