[PATCH 07/11] x86: move all simple arch settings to Kconfig

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Sam Ravnborg <sam@ravnborg.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 07/11] x86: move all simple arch settings to Kconfig
Date: Sat, 10 Nov 2007 00:20:41 +0100	[thread overview]
Message-ID: <11946504463431-git-send-email-sam@ravnborg.org> (raw)
In-Reply-To: <20071109230812.GA5176@uranus.ravnborg.org>

Most of the arch settings were equal so combine them
in the first part of Kconfig.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 arch/x86/Kconfig        |  136 +++++++++++++++++++++++++++++++++++++++++++++++
 arch/x86/Kconfig.i386   |  119 -----------------------------------------
 arch/x86/Kconfig.x86_64 |  115 ---------------------------------------
 3 files changed, 136 insertions(+), 234 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9fbb049..d47b5a2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,6 +1,86 @@
 # x86 configuration
 
 ### Arch settings
+config X86
+	bool
+	default y
+
+config 64BIT
+	def_bool X86_64
+
+config GENERIC_TIME
+	bool
+	default y
+
+config GENERIC_CMOS_UPDATE
+	bool
+	default y
+
+config CLOCKSOURCE_WATCHDOG
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+	bool
+	default y
+	depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
+
+config LOCKDEP_SUPPORT
+	bool
+	default y
+
+config STACKTRACE_SUPPORT
+	bool
+	default y
+
+config SEMAPHORE_SLEEPERS
+	bool
+	default y
+
+config MMU
+	bool
+	default y
+
+config ZONE_DMA
+	bool
+	default y
+
+config QUICKLIST
+	bool
+	default X86_32
+
+config SBUS
+	bool
+
+config GENERIC_ISA_DMA
+	bool
+	default y
+
+config GENERIC_IOMAP
+	bool
+	default y
+
+config GENERIC_BUG
+	bool
+	default y
+	depends on BUG
+
+config GENERIC_HWEIGHT
+	bool
+	default y
+
+config ARCH_MAY_HAVE_PC_FDC
+	bool
+	default y
+
+config DMI
+	bool
+	default y
+
 config RWSEM_GENERIC_SPINLOCK
 	def_bool !X86_XADD
 
@@ -16,6 +96,62 @@ config ARCH_HAS_ILOG2_U64
 config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
+config GENERIC_TIME_VSYSCALL
+	bool
+	default X86_64
+
+
+
+
+
+config ZONE_DMA32
+	bool
+	default X86_64
+
+config ARCH_POPULATES_NODE_MAP
+	def_bool y
+
+config AUDIT_ARCH
+	bool
+	default X86_64
+
+# Use the generic interrupt handling code in kernel/irq/:
+config GENERIC_HARDIRQS
+	bool
+	default y
+
+config GENERIC_IRQ_PROBE
+	bool
+	default y
+
+config GENERIC_PENDING_IRQ
+	bool
+	depends on GENERIC_HARDIRQS && SMP
+	default y
+
+config X86_SMP
+	bool
+	depends on X86_32 && SMP && !X86_VOYAGER
+	default y
+
+config X86_HT
+	bool
+	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
+	default y
+
+config X86_BIOS_REBOOT
+	bool
+	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+	default y
+
+config X86_TRAMPOLINE
+	bool
+	depends on X86_SMP || (X86_VOYAGER && SMP)
+	default y
+
+config KTIME_SCALAR
+	def_bool X86_32
+
 
 menu "Power management options"
 	depends on !X86_VOYAGER
diff --git a/arch/x86/Kconfig.i386 b/arch/x86/Kconfig.i386
index 3be7672..b8b462a 100644
--- a/arch/x86/Kconfig.i386
+++ b/arch/x86/Kconfig.i386
@@ -14,83 +14,6 @@ config X86_32
 	  486, 586, Pentiums, and various instruction-set-compatible chips by
 	  AMD, Cyrix, and others.
 
-config GENERIC_TIME
-	bool
-	default y
-
-config GENERIC_CMOS_UPDATE
-	bool
-	default y
-
-config CLOCKSOURCE_WATCHDOG
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-	default y
-	depends on X86_LOCAL_APIC
-
-config LOCKDEP_SUPPORT
-	bool
-	default y
-
-config STACKTRACE_SUPPORT
-	bool
-	default y
-
-config SEMAPHORE_SLEEPERS
-	bool
-	default y
-
-config X86
-	bool
-	default y
-
-config MMU
-	bool
-	default y
-
-config ZONE_DMA
-	bool
-	default y
-
-config QUICKLIST
-	bool
-	default y
-
-config SBUS
-	bool
-
-config GENERIC_ISA_DMA
-	bool
-	default y
-
-config GENERIC_IOMAP
-	bool
-	default y
-
-config GENERIC_BUG
-	bool
-	default y
-	depends on BUG
-
-config GENERIC_HWEIGHT
-	bool
-	default y
-
-config ARCH_MAY_HAVE_PC_FDC
-	bool
-	default y
-
-config DMI
-	bool
-	default y
-
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -837,9 +760,6 @@ config ARCH_SELECT_MEMORY_MODEL
 	def_bool y
 	depends on X86_32 && ARCH_SPARSEMEM_ENABLE
 
-config ARCH_POPULATES_NODE_MAP
-	def_bool y
-
 config ARCH_MEMORY_PROBE
 	def_bool X86_64
 	depends on MEMORY_HOTPLUG
@@ -1148,43 +1068,4 @@ config OUT_OF_LINE_PFN_TO_PAGE
 	def_bool X86_64
 	depends on DISCONTIGMEM
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-	bool
-	default y
-
-config GENERIC_IRQ_PROBE
-	bool
-	default y
-
-config GENERIC_PENDING_IRQ
-	bool
-	depends on GENERIC_HARDIRQS && SMP
-	default y
-
-config X86_SMP
-	bool
-	depends on X86_32 && SMP && !X86_VOYAGER
-	default y
-
-config X86_HT
-	bool
-	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
-	default y
-
-config X86_BIOS_REBOOT
-	bool
-	depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
-	default y
-
-config X86_TRAMPOLINE
-	bool
-	depends on X86_SMP || (X86_VOYAGER && SMP)
-	default y
-
-config KTIME_SCALAR
-	def_bool X86_32
-
 source "arch/x86/Kconfig"
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64
index 36bb856..e441062 100644
--- a/arch/x86/Kconfig.x86_64
+++ b/arch/x86/Kconfig.x86_64
@@ -17,100 +17,6 @@ config X86_64
 	  classical 32-bit x86 architecture. For details see
 	  <http://www.x86-64.org/>.
 
-config 64BIT
-	def_bool X86_64
-
-config X86
-	bool
-	default y
-
-config GENERIC_TIME
-	bool
-	default y
-
-config GENERIC_TIME_VSYSCALL
-	bool
-	default y
-
-config GENERIC_CMOS_UPDATE
-	bool
-	default y
-
-config CLOCKSOURCE_WATCHDOG
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS
-	bool
-	default y
-
-config GENERIC_CLOCKEVENTS_BROADCAST
-	bool
-	default y
-
-config ZONE_DMA32
-	bool
-	default y
-
-config LOCKDEP_SUPPORT
-	bool
-	default y
-
-config STACKTRACE_SUPPORT
-	bool
-	default y
-
-config SEMAPHORE_SLEEPERS
-	bool
-	default y
-
-config MMU
-	bool
-	default y
-
-config ZONE_DMA
-	bool
-	default y
-
-config ISA
-	bool
-
-config SBUS
-	bool
-
-config GENERIC_HWEIGHT
-	bool
-	default y
-
-config GENERIC_ISA_DMA
-	bool
-	default y
-
-config GENERIC_IOMAP
-	bool
-	default y
-
-config ARCH_MAY_HAVE_PC_FDC
-	bool
-	default y
-
-config ARCH_POPULATES_NODE_MAP
-	def_bool y
-
-config DMI
-	bool
-	default y
-
-config AUDIT_ARCH
-	bool
-	default y
-
-config GENERIC_BUG
-	bool
-	default y
-	depends on BUG
-
-
 source "init/Kconfig"
 
 
@@ -179,11 +85,6 @@ config X86_CPUID
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 
-config X86_HT
-	bool
-	depends on SMP && !MK8
-	default y
-
 config MATH_EMULATION
 	bool
 
@@ -606,20 +507,4 @@ config K8_NB
 
 endmenu
 
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-	bool
-	default y
-
-config GENERIC_IRQ_PROBE
-	bool
-	default y
-
-config GENERIC_PENDING_IRQ
-	bool
-	depends on GENERIC_HARDIRQS && SMP
-	default y
-
 source "arch/x86/Kconfig"
-- 
1.5.3.4.1157.g0e74-dirty

next prev parent reply	other threads:[~2007-11-09 23:20 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-09 23:08 [PATCH 0/11 v3] enable "make ARCH=x86" Sam Ravnborg
2007-11-09 23:20 ` [PATCH 01/11] x86: unification of cfufreq/Kconfig Sam Ravnborg
2007-11-09 23:20 ` [PATCH 02/11] x86: start unification of arch/x86/Kconfig.* Sam Ravnborg
2007-11-09 23:20 ` [PATCH 03/11] x86: arch/x86/Kconfig.cpu unification Sam Ravnborg
2007-11-09 23:20 ` [PATCH 04/11] x86: add X86_32 dependency to i386 specific symbols in Kconfig.i386 Sam Ravnborg
2007-11-09 23:20 ` [PATCH 05/11] x86: add X86_64 dependency to x86_64 specific symbols in Kconfig.x86_64 Sam Ravnborg
2007-11-09 23:20 ` [PATCH 06/11] x86: copy x86_64 specific Kconfig symbols to Kconfig.i386 Sam Ravnborg
2007-11-09 23:20 ` Sam Ravnborg [this message]
2007-11-09 23:20 ` [PATCH 08/11] x86: move the rest of the menu's to Kconfig Sam Ravnborg
2007-11-09 23:20 ` [PATCH 09/11] x86: enable "make ARCH=x86" Sam Ravnborg
2007-11-09 23:20 ` [PATCH 10/11] x86: drop backward compatibility symlinks to i386/boot and x86_64/boot Sam Ravnborg
2007-11-09 23:20 ` [PATCH 11/11] kbuild: sanity check the specified arch Sam Ravnborg
2007-11-10  3:23 ` [PATCH 0/11 v3] enable "make ARCH=x86" Jeff Garzik
2007-11-10  3:37   ` Randy Dunlap
2007-11-10  3:50   ` Adrian Bunk
2007-11-10  4:05   ` Brian Gerst
2007-11-10  4:12     ` Jeff Garzik
2007-11-14 20:13       ` Roman Zippel
2007-11-10  7:54   ` Sam Ravnborg
2007-11-10  5:26     ` Nick Piggin
2007-11-10  8:21     ` Paul Mundt
2007-11-10  8:24       ` Jeff Garzik
2007-11-10  8:44         ` Paul Mundt
2007-11-10 20:35           ` H. Peter Anvin
2007-11-10 20:46             ` Sam Ravnborg
2007-11-10 21:24             ` Theodore Tso
2007-11-10  9:39         ` Sam Ravnborg
2007-11-10 10:32           ` david
2007-11-10  9:21       ` Adrian Bunk
2007-11-10  9:26         ` Paul Mundt
2007-11-10  8:23     ` Jeff Garzik
2007-11-10 10:13       ` Adrian Bunk
2007-11-10 15:53 ` Christoph Hellwig
2007-11-12 11:59 ` Frans Pop

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9fbb049 dfblob:d47b5a2 dfblob:3be7672 dfblob:b8b462a
dfblob:36bb856 dfblob:e441062 )
 OR (
bs:"[PATCH 07/11] x86: move all simple arch settings to Kconfig" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11946504463431-git-send-email-sam@ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.