Commit 60201644 authored by Frank Rowand's avatar Frank Rowand Committed by Paul Mackerras
Browse files

[PATCH] ppc64: change duplicate Kconfig menu "General setup" to "Bus Options" 



arch/ppc64/Kconfig defines a "General setup" menu, but also sources
init/Kconfig which also defines a "General setup" menu.  Both of these
menus appear at the top level of make menuconfig.  Having two menus with
the same name is confusing.  This patch renames the ppc64/Kconfig menu to
be "Bus Options" and moves options in this menu which are not bus related
to the end of the "Platform support" menu.

There are many variations among architectures on the exact naming of the
"Bus Options" menu.  I chose to use the simplest one, which is also used
in arch/ppc/Kconfig.

Signed-off-by: default avatarFrank Rowand <frowand@mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 293da76b

arch/ppc64/Kconfig

+34 −34
Original line number Diff line number Diff line
@@ -350,13 +350,46 @@ config SECCOMP 


	  If unsure, say Y. Only embedded should say N here.



source "fs/Kconfig.binfmt"



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	depends on SMP && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)

	select HOTPLUG

	---help---

	  Say Y here to be able to turn CPUs off and on.



	  Say N if you are unsure.



config PROC_DEVICETREE

	bool "Support for Open Firmware device tree in /proc"

	depends on !PPC_ISERIES

	help

	  This option adds a device-tree directory under /proc which contains

	  an image of the device tree that the kernel copies from Open

	  Firmware. If unsure, say Y here.



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

	depends on !PPC_ISERIES



config CMDLINE

	string "Initial kernel command string"

	depends on CMDLINE_BOOL

	default "console=ttyS0,9600 console=tty0 root=/dev/sda2"

	help

	  On some platforms, there is currently no way for the boot loader to

	  pass arguments to the kernel. For these platforms, you can supply

	  some command-line options at build time by entering them here.  In

	  most cases you will need to specify the root device here.



endmenu



config ISA_DMA_API

	bool

	default y



menu "General setup"

menu "Bus Options"



config ISA

	bool
@@ -389,45 +422,12 @@ config PCI_DOMAINS 
	bool

	default PCI



source "fs/Kconfig.binfmt"



source "drivers/pci/Kconfig"



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	depends on SMP && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)

	select HOTPLUG

	---help---

	  Say Y here to be able to turn CPUs off and on.



	  Say N if you are unsure.



source "drivers/pcmcia/Kconfig"



source "drivers/pci/hotplug/Kconfig"



config PROC_DEVICETREE

	bool "Support for Open Firmware device tree in /proc"

	depends on !PPC_ISERIES

	help

	  This option adds a device-tree directory under /proc which contains

	  an image of the device tree that the kernel copies from Open

	  Firmware. If unsure, say Y here.



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

	depends on !PPC_ISERIES



config CMDLINE

	string "Initial kernel command string"

	depends on CMDLINE_BOOL

	default "console=ttyS0,9600 console=tty0 root=/dev/sda2"

	help

	  On some platforms, there is currently no way for the boot loader to

	  pass arguments to the kernel. For these platforms, you can supply

	  some command-line options at build time by entering them here.  In

	  most cases you will need to specify the root device here.



endmenu



source "net/Kconfig"

CRA Git | Maintained and supported by SUSTech CRA and CCSE