[Fai-commit] r3111 - in people/h01ger/fai-kernels: . debian

[fai-repository at svn.debian.org]

Author: h01ger-guest
Date: 2005-11-27 00:50:37 +0000 (Sun, 27 Nov 2005)
New Revision: 3111

Modified:
   people/h01ger/fai-kernels/debian/changelog
   people/h01ger/fai-kernels/kernel-config-2.4.powerpc
   people/h01ger/fai-kernels/kernel-config-2.6.amd64
   people/h01ger/fai-kernels/kernel-config-2.6.i386
   people/h01ger/fai-kernels/kernel-config-2.6.powerpc
Log:
- reenabled serial console on 2.6 on i386 (closes: #296932) and also on
  powerpc and amd64 as well as on 2.4 on powerpc
    


Modified: people/h01ger/fai-kernels/debian/changelog
===================================================================
--- people/h01ger/fai-kernels/debian/changelog	2005-11-27 00:30:09 UTC (rev 3110)
+++ people/h01ger/fai-kernels/debian/changelog	2005-11-27 00:50:37 UTC (rev 3111)
@@ -1,7 +1,9 @@
 fai-kernels (1.10.1) unstable; urgency=low
 
   * added build-depends on gcc-3.3 (closes: #340884)
-
+  * reenabled serial console on 2.6 on i386 (closes: #296932) and also on
+    powerpc and amd64 as well as on 2.4 on powerpc
+     
  -- Holger Levsen <debian at layer-acht.org>  Sat, 26 Nov 2005 11:13:16 +0000
 
 fai-kernels (1.10) unstable; urgency=low

Modified: people/h01ger/fai-kernels/kernel-config-2.4.powerpc
===================================================================
--- people/h01ger/fai-kernels/kernel-config-2.4.powerpc	2005-11-27 00:30:09 UTC (rev 3110)
+++ people/h01ger/fai-kernels/kernel-config-2.4.powerpc	2005-11-27 00:50:37 UTC (rev 3111)
@@ -615,7 +615,11 @@
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+
 # CONFIG_SERIAL_EXTENDED is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_UNIX98_PTYS=y

Modified: people/h01ger/fai-kernels/kernel-config-2.6.amd64
===================================================================
--- people/h01ger/fai-kernels/kernel-config-2.6.amd64	2005-11-27 00:30:09 UTC (rev 3110)
+++ people/h01ger/fai-kernels/kernel-config-2.6.amd64	2005-11-27 00:50:37 UTC (rev 3111)
@@ -792,7 +792,8 @@
 #
 # Serial drivers
 #
-CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -800,8 +801,9 @@
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_CORE=m
-CONFIG_UNIX98_PTYS=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+#CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_PRINTER=m

Modified: people/h01ger/fai-kernels/kernel-config-2.6.i386
===================================================================
--- people/h01ger/fai-kernels/kernel-config-2.6.i386	2005-11-27 00:30:09 UTC (rev 3110)
+++ people/h01ger/fai-kernels/kernel-config-2.6.i386	2005-11-27 00:50:37 UTC (rev 3111)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14
-# Tue Nov  8 16:41:55 2005
+# Sat Nov 26 11:27:27 2005
 #
 CONFIG_X86=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -128,9 +128,6 @@
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
@@ -855,14 +852,16 @@
 #
 # Serial drivers
 #
-CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_CORE=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y

Modified: people/h01ger/fai-kernels/kernel-config-2.6.powerpc
===================================================================
--- people/h01ger/fai-kernels/kernel-config-2.6.powerpc	2005-11-27 00:30:09 UTC (rev 3110)
+++ people/h01ger/fai-kernels/kernel-config-2.6.powerpc	2005-11-27 00:50:37 UTC (rev 3111)
@@ -574,7 +574,10 @@
 #
 # Serial drivers
 #
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
 
 #
 # Non-8250 serial port support