Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61bee204 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of arch/um/Kconfig.arch 



Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile
is allowed to say Kconfig := <whatever I want instead of arch/blah/Kconfig>.
Rewrite arch/um/Kconfig and arch/um/Kconfig.<subarch> so that the latter
would be top-level one (and include the pieces of the former).

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent ec82c32d

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ ifeq ($(config-targets),1) 
# KBUILD_DEFCONFIG may point out an alternative default configuration

# used for 'make defconfig'

include $(srctree)/arch/$(SRCARCH)/Makefile

export KBUILD_DEFCONFIG

export KBUILD_DEFCONFIG KBUILD_KCONFIG



config %config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux include/config

arch/um/Kconfig.common

0 → 100644
+77 −0
Original line number Diff line number Diff line 
config DEFCONFIG_LIST

	string

	option defconfig_list

	default "arch/$ARCH/defconfig"



# UML uses the generic IRQ subsystem

config GENERIC_HARDIRQS

	bool

	default y



config UML

	bool

	default y



config MMU

	bool

	default y



config NO_IOMEM

	def_bool y



mainmenu "Linux/Usermode Kernel Configuration"



config ISA

	bool



config SBUS

	bool



config PCI

	bool



config PCMCIA

	bool



# Yet to do!

config TRACE_IRQFLAGS_SUPPORT

	bool

	default n



config LOCKDEP_SUPPORT

	bool

	default y



config STACKTRACE_SUPPORT

	bool

	default n



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



config GENERIC_TIME

	bool

	default y



config GENERIC_CLOCKEVENTS

	bool

	default y



# Used in kernel/irq/manage.c and include/linux/irq.h

config IRQ_RELEASE_METHOD

	bool

	default y



config HZ

	int

	default 100



config SUBARCH

	string

	option env="SUBARCH"

arch/um/Kconfig.rest

0 → 100644
+42 −0
Original line number Diff line number Diff line 
source "init/Kconfig"



source "kernel/Kconfig.freezer"



source "drivers/block/Kconfig"



source "arch/um/Kconfig.char"



source "drivers/base/Kconfig"



source "net/Kconfig"



source "arch/um/Kconfig.net"



source "drivers/net/Kconfig"



source "drivers/connector/Kconfig"



source "fs/Kconfig"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"



source "drivers/scsi/Kconfig"



source "drivers/md/Kconfig"



if BROKEN

	source "drivers/mtd/Kconfig"

endif



source "drivers/leds/Kconfig"



#This is just to shut up some Kconfig warnings, so no prompt.

config INPUT

	bool

	default n



source "arch/um/Kconfig.debug"

arch/um/Kconfig→arch/um/Kconfig.um

+0 −126
Original line number Diff line number Diff line 
config DEFCONFIG_LIST

	string

	option defconfig_list

	default "arch/$ARCH/defconfig"



# UML uses the generic IRQ subsystem

config GENERIC_HARDIRQS

	bool

	default y



config UML

	bool

	default y



config MMU

	bool

	default y



config NO_IOMEM

	def_bool y



mainmenu "Linux/Usermode Kernel Configuration"



config ISA

	bool



config SBUS

	bool



config PCI

	bool



config PCMCIA

	bool



# Yet to do!

config TRACE_IRQFLAGS_SUPPORT

	bool

	default n



config LOCKDEP_SUPPORT

	bool

	default y



config STACKTRACE_SUPPORT

	bool

	default n



config GENERIC_CALIBRATE_DELAY

	bool

	default y



config GENERIC_BUG

	bool

	default y

	depends on BUG



config GENERIC_TIME

	bool

	default y



config GENERIC_CLOCKEVENTS

	bool

	default y



# Used in kernel/irq/manage.c and include/linux/irq.h

config IRQ_RELEASE_METHOD

	bool

	default y



config HZ

	int

	default 100



menu "UML-specific options"



config STATIC_LINK

	bool "Force a static link"

	default n
@@ -85,11 +9,6 @@ config STATIC_LINK 
	  Additionally, this option enables using higher memory spaces (up to

	  2.75G) for UML.



config SUBARCH

	string

	option env="SUBARCH"



source "arch/um/Kconfig.arch"

source "mm/Kconfig"

source "kernel/time/Kconfig"
@@ -228,48 +147,3 @@ config KERNEL_STACK_ORDER 
	  This option determines the size of UML kernel stacks.  They will

	  be 1 << order pages.  The default is OK unless you're running Valgrind

	  on UML, in which case, set this to 3.
 


endmenu



source "init/Kconfig"



source "kernel/Kconfig.freezer"



source "drivers/block/Kconfig"



source "arch/um/Kconfig.char"



source "drivers/base/Kconfig"



source "net/Kconfig"



source "arch/um/Kconfig.net"



source "drivers/net/Kconfig"



source "drivers/connector/Kconfig"



source "fs/Kconfig"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"



source "drivers/scsi/Kconfig"



source "drivers/md/Kconfig"



if BROKEN

	source "drivers/mtd/Kconfig"

endif



source "drivers/leds/Kconfig"



#This is just to shut up some Kconfig warnings, so no prompt.

config INPUT

	bool

	default n



source "arch/um/Kconfig.debug"

arch/um/Kconfig.x86

+10 −0
Original line number Diff line number Diff line 
source "arch/um/Kconfig.common"



menu "UML-specific options"



menu "Host processor type and features"



source "arch/x86/Kconfig.cpu"
@@ -44,3 +48,9 @@ config SMP_BROKEN 


config GENERIC_HWEIGHT

	def_bool y



source "arch/um/Kconfig.um"



endmenu



source "arch/um/Kconfig.rest"