Skip to contentSkip to conversation

x86: merge EARLY_PRINTK options

PATCH Applied Adrian Bunk 2 participants 2 messages Oct 29, 2007 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: merge EARLY_PRINTK options

This patch merges the x86_64 EARLY_PRINTK option into the i386 one.

---

 arch/x86/Kconfig.debug  |    3 +--
 arch/x86/Kconfig.x86_64 |    4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

9ac736d36f60cbfe4343f51b0f776e2068ceebe4

arch/x86/Kconfig.debug +1 -2
index a2fa37d..3de185a 100644
@@ -6,9 +6,8 @@ config TRACE_IRQFLAGS_SUPPORT
 source "lib/Kconfig.debug"
 
 config EARLY_PRINTK
-	bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+	bool "Early printk" if EMBEDDED && DEBUG_KERNEL && X86_32
 	default y
-	depends on X86_32
 	help
 	  Write kernel log output directly into the VGA buffer or to a serial
 	  port.
arch/x86/Kconfig.x86_64 +0 -4
index e2542e5..04b8095 100644
@@ -97,10 +97,6 @@ config X86_CMPXCHG
 	bool
 	default y
 
-config EARLY_PRINTK
-	bool
-	default y
-
 config GENERIC_ISA_DMA
 	bool
 	default y
#1 lore raw
Quoted 3 lines · Adrian Bunk

This patch merges the x86_64 EARLY_PRINTK option into the i386 one.

Applied, thanks

tglx

Quoted 38 lines

---

 arch/x86/Kconfig.debug  |    3 +--
 arch/x86/Kconfig.x86_64 |    4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

9ac736d36f60cbfe4343f51b0f776e2068ceebe4

arch/x86/Kconfig.debug +1 -2
index a2fa37d..3de185a 100644
@@ -6,9 +6,8 @@ config TRACE_IRQFLAGS_SUPPORT
 source "lib/Kconfig.debug"
 
 config EARLY_PRINTK
-	bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+	bool "Early printk" if EMBEDDED && DEBUG_KERNEL && X86_32
 	default y
-	depends on X86_32
 	help
 	  Write kernel log output directly into the VGA buffer or to a serial
 	  port.
arch/x86/Kconfig.x86_64 +0 -4
index e2542e5..04b8095 100644
@@ -97,10 +97,6 @@ config X86_CMPXCHG
 	bool
 	default y
 
-config EARLY_PRINTK
-	bool
-	default y
-
 config GENERIC_ISA_DMA
 	bool
 	default y