[kernel] r6678 - in dists/sid/linux-2.6/debian: patches
patches/series
Martin Michlmayr
tbm at costa.debian.org
Wed May 24 12:31:11 UTC 2006
Author: tbm
Date: Wed May 24 12:31:10 2006
New Revision: 6678
Added:
dists/sid/linux-2.6/debian/patches/mips-dec-serial.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/15-extra
Log:
Add a patch that let's you enable serial console on DECstation.
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Wed May 24 12:31:10 2006
@@ -10,6 +10,7 @@
[ Martin Michlmayr ]
* [mips/b1-bcm91250a] Enable SMP.
* [mips] Add a compile fix for the Maxine fb.
+ * [mipsel] Add a patch that let's you enable serial console on DECstation.
-- maximilian attems <maks at sternwelten.at> Wed, 24 May 2006 11:29:16 +0200
Added: dists/sid/linux-2.6/debian/patches/mips-dec-serial.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/mips-dec-serial.patch Wed May 24 12:31:10 2006
@@ -0,0 +1,99 @@
+# Upstream status: won't go into Linus' tree like this but is in the
+# linux-mips tree. The drivers/char serial drivers need to be converted to
+# real serial drivers in drivers/serial
+
+# Author: Martin Michlmayr <tbm at cyrius.com>, mostly taken from the
+# linux-mips tree
+
+
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 78d928f..10027dd 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -354,6 +354,41 @@ config AU1000_SERIAL_CONSOLE
+ If you have an Alchemy AU1000 processor (MIPS based) and you want
+ to use a console on a serial port, say Y. Otherwise, say N.
+
++config SERIAL_DEC
++ bool "DECstation serial support"
++ depends on MACH_DECSTATION
++ default y
++ help
++ This selects whether you want to be asked about drivers for
++ DECstation serial ports.
++
++ Note that the answer to this question won't directly affect the
++ kernel: saying N will just cause the configurator to skip all
++ the questions about DECstation serial ports.
++
++ If unsure, say Y.
++
++config SERIAL_DEC_CONSOLE
++ bool "Support for console on a DECstation serial port"
++ depends on SERIAL_DEC
++ default y
++ help
++ If you say Y here, it will be possible to use a serial port as the
++ system console (the system console is the device which receives all
++ kernel messages and warnings and which allows logins in single user
++ mode). Note that the firmware uses ttyS0 as the serial console on
++ the Maxine and ttyS2 on the others.
++
++ If unsure, say Y.
++
++config ZS
++ bool "Z85C30 Serial Support"
++ depends on SERIAL_DEC
++ default y
++ help
++ Documentation on the Zilog 85C350 serial communications controller
++ is downloadable at <http://www.zilog.com/pdfs/serial/z85c30.pdf>.
++
+ config QTRONIX_KEYBOARD
+ bool "Enable Qtronix 990P Keyboard Support"
+ depends on IT8712
+diff --git a/drivers/char/Makefile b/drivers/char/Makefile
+index f5b01c6..5a6f7d6 100644
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -51,6 +51,7 @@ obj-$(CONFIG_VIOCONS) += viocons.o
+ obj-$(CONFIG_VIOTAPE) += viotape.o
+ obj-$(CONFIG_HVCS) += hvcs.o
+ obj-$(CONFIG_SGI_MBCS) += mbcs.o
++obj-$(CONFIG_SERIAL_DEC) += decserial.o
+
+ obj-$(CONFIG_PRINTER) += lp.o
+ obj-$(CONFIG_TIPAR) += tipar.o
+diff --git a/drivers/char/decserial.c b/drivers/char/decserial.c
+index aa14409..71f3d9c 100644
+--- a/drivers/char/decserial.c
++++ b/drivers/char/decserial.c
+@@ -28,7 +28,7 @@ extern int zs_init(void);
+ extern int dz_init(void);
+ #endif
+
+-#ifdef CONFIG_SERIAL_CONSOLE
++#ifdef CONFIG_SERIAL_CORE_CORE_CONSOLE
+
+ #ifdef CONFIG_ZS
+ extern void zs_serial_console_init(void);
+@@ -43,7 +43,7 @@ extern void dz_serial_console_init(void)
+ /* rs_init - starts up the serial interface -
+ handle normal case of starting up the serial interface */
+
+-#ifdef CONFIG_SERIAL
++#ifdef CONFIG_SERIAL_CORE
+
+ int __init rs_init(void)
+ {
+@@ -70,7 +70,7 @@ __initcall(rs_init);
+
+ #endif
+
+-#ifdef CONFIG_SERIAL_CONSOLE
++#ifdef CONFIG_SERIAL_CORE_CORE_CONSOLE
+
+ /* serial_console_init handles the special case of starting
+ * up the console on the serial port
+diff --git a/include/asm-arm/arch-rpc/uncompress.h b/include/asm-arm/arch-rpc/uncompress.h
+
Modified: dists/sid/linux-2.6/debian/patches/series/15-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/15-extra (original)
+++ dists/sid/linux-2.6/debian/patches/series/15-extra Wed May 24 12:31:10 2006
@@ -1,2 +1,3 @@
#+ m68k-dma.patch m68k
#+ m68k-via2-scsi.patch m68k
++ mips-dec-serial.patch mipsel
More information about the Kernel-svn-changes
mailing list