* make xmenuconfig is broken
@ 2002-10-29 18:35 Jun Sun
2002-10-29 19:24 ` Karsten Merker
2002-10-30 15:58 ` Ralf Baechle
0 siblings, 2 replies; 13+ messages in thread
From: Jun Sun @ 2002-10-29 18:35 UTC (permalink / raw)
To: linux-mips; +Cc: jsun
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
There is an obvious typo.
In addition, there are two SERIAL and SERIAL_CONSOLE related
setting which should be in drivers/char/Config.in
instead of arch/mips/config-shared.in.
The following hack makes xmenuconfig work again, apparently breaking
decstation and IP22. If nobody interested in those two machines
move the config, I will make an attempt to do so.
BTW, the symptom without the later two hacks is that you can set
SERIAL or SERIAL_CONSOLE options in xmenuconfig.
Any comments?
Jun
[-- Attachment #2: junk --]
[-- Type: text/plain, Size: 2050 bytes --]
diff -Nru arch/mips/config-shared.in.orig arch/mips/config-shared.in
--- arch/mips/config-shared.in.orig Sun Oct 6 05:28:03 2002
+++ arch/mips/config-shared.in Tue Oct 29 10:29:14 2002
@@ -513,7 +513,7 @@
if [ "$CONFIG_CPU_SB1" = "y" ]; then
choice 'SB1 Pass' \
"Pass1 CONFIG_CPU_SB1_PASS_1 \
- Pass2 CONFIG_CPU_SB1_PASS_2
+ Pass2 CONFIG_CPU_SB1_PASS_2 \
Pass2.2 CONFIG_CPU_SB1_PASS_2_2" Pass1
if [ "$CONFIG_CPU_SB1_PASS_1" = "y" ]; then
define_bool CONFIG_SB1_PASS_1_WORKAROUNDS y
@@ -764,18 +764,18 @@
#source drivers/misc/Config.in
-if [ "$CONFIG_DECSTATION" = "y" ]; then
- mainmenu_option next_comment
- comment 'DECStation Character devices'
-
- tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
- dep_bool ' DZ11 Serial Support' CONFIG_DZ $CONFIG_SERIAL
- dep_bool ' Z85C30 Serial Support' CONFIG_ZS $CONFIG_SERIAL $CONFIG_TC
- dep_bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE $CONFIG_SERIAL
-# dep_bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
- bool 'Enhanced Real Time Clock Support' CONFIG_RTC
- endmenu
-fi
+#if [ "$CONFIG_DECSTATION" = "y" ]; then
+# mainmenu_option next_comment
+# comment 'DECStation Character devices'
+#
+# tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
+# dep_bool ' DZ11 Serial Support' CONFIG_DZ $CONFIG_SERIAL
+# dep_bool ' Z85C30 Serial Support' CONFIG_ZS $CONFIG_SERIAL $CONFIG_TC
+# dep_bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE $CONFIG_SERIAL
+## dep_bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
+# bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+# endmenu
+#fi
if [ "$CONFIG_SGI_IP22" = "y" ]; then
mainmenu_option next_comment
@@ -814,9 +814,9 @@
fi
endmenu
-if [ "$CONFIG_SGI_IP22" = "y" ]; then
- source drivers/sgi/Config.in
-fi
+#if [ "$CONFIG_SGI_IP22" = "y" ]; then
+# source drivers/sgi/Config.in
+#fi
source drivers/usb/Config.in
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-10-29 18:35 make xmenuconfig is broken Jun Sun
@ 2002-10-29 19:24 ` Karsten Merker
2002-10-29 21:30 ` Jun Sun
2002-10-30 15:58 ` Ralf Baechle
1 sibling, 1 reply; 13+ messages in thread
From: Karsten Merker @ 2002-10-29 19:24 UTC (permalink / raw)
To: linux-mips
On Tue, Oct 29, 2002 at 10:35:45AM -0800, Jun Sun wrote:
> In addition, there are two SERIAL and SERIAL_CONSOLE related
> setting which should be in drivers/char/Config.in
> instead of arch/mips/config-shared.in.
>
> The following hack makes xmenuconfig work again, apparently breaking
> decstation and IP22. If nobody interested in those two machines
> move the config, I will make an attempt to do so.
Why do you want to move the config? Is there any technical reason besides
grouping the subarch specific character devices below the generic
character devices instead of having a subarch specific menu ("DECstation
character devices")?
Regards,
Karsten
--
#include <standard_disclaimer>
Nach Paragraph 28 Abs. 3 Bundesdatenschutzgesetz widerspreche ich der Nutzung
oder Uebermittlung meiner Daten fuer Werbezwecke oder fuer die Markt- oder
Meinungsforschung.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-10-29 19:24 ` Karsten Merker
@ 2002-10-29 21:30 ` Jun Sun
2002-10-30 13:07 ` Maciej W. Rozycki
0 siblings, 1 reply; 13+ messages in thread
From: Jun Sun @ 2002-10-29 21:30 UTC (permalink / raw)
To: Karsten Merker, linux-mips; +Cc: jsun
On Tue, Oct 29, 2002 at 08:24:36PM +0100, Karsten Merker wrote:
> On Tue, Oct 29, 2002 at 10:35:45AM -0800, Jun Sun wrote:
>
> > In addition, there are two SERIAL and SERIAL_CONSOLE related
> > setting which should be in drivers/char/Config.in
> > instead of arch/mips/config-shared.in.
> >
> > The following hack makes xmenuconfig work again, apparently breaking
> > decstation and IP22. If nobody interested in those two machines
> > move the config, I will make an attempt to do so.
>
> Why do you want to move the config? Is there any technical reason besides
> grouping the subarch specific character devices below the generic
> character devices instead of having a subarch specific menu ("DECstation
> character devices")?
>
My limited xconfig knowledge seems to tell me that moving to the generic
config file is the only way to make it work. If you know a better way to fix
this, I will be happy to see it.
Jun
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-10-29 21:30 ` Jun Sun
@ 2002-10-30 13:07 ` Maciej W. Rozycki
2002-11-07 19:26 ` Maciej W. Rozycki
0 siblings, 1 reply; 13+ messages in thread
From: Maciej W. Rozycki @ 2002-10-30 13:07 UTC (permalink / raw)
To: Jun Sun; +Cc: Karsten Merker, linux-mips
On Tue, 29 Oct 2002, Jun Sun wrote:
> > Why do you want to move the config? Is there any technical reason besides
> > grouping the subarch specific character devices below the generic
> > character devices instead of having a subarch specific menu ("DECstation
> > character devices")?
>
> My limited xconfig knowledge seems to tell me that moving to the generic
> config file is the only way to make it work. If you know a better way to fix
> this, I will be happy to see it.
The DECstation setup is plain broken. I've promised to look into it
once, but I haven't looked into it yet, sorry. I'll see what I can do --
it shouldn't be hard. I'll make a fix and ask you to test if it makes
your problems go away. The submenu for "DECstation character devices" is
going to remain where it is now for 2.4, as the devices are (incorrectly)
scattered across directories. For 2.5 they are going to be moved to
"drivers/serial" where they belong. Especially as they are not really
DECstation-specific -- the VAX and Alpha (DEC 3000) ports may want to use
them as well.
The problem is CONFIG_SERIAL having different meanings for the MIPS port.
It causes annoyance with dynamic parsers (like `make config') and I'm not
surprised it breaks the xconfig static parser.
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-10-29 18:35 make xmenuconfig is broken Jun Sun
2002-10-29 19:24 ` Karsten Merker
@ 2002-10-30 15:58 ` Ralf Baechle
1 sibling, 0 replies; 13+ messages in thread
From: Ralf Baechle @ 2002-10-30 15:58 UTC (permalink / raw)
To: Jun Sun; +Cc: linux-mips
On Tue, Oct 29, 2002 at 10:35:45AM -0800, Jun Sun wrote:
> diff -Nru arch/mips/config-shared.in.orig arch/mips/config-shared.in
> --- arch/mips/config-shared.in.orig Sun Oct 6 05:28:03 2002
> +++ arch/mips/config-shared.in Tue Oct 29 10:29:14 2002
> @@ -513,7 +513,7 @@
> if [ "$CONFIG_CPU_SB1" = "y" ]; then
> choice 'SB1 Pass' \
> "Pass1 CONFIG_CPU_SB1_PASS_1 \
> - Pass2 CONFIG_CPU_SB1_PASS_2
> + Pass2 CONFIG_CPU_SB1_PASS_2 \
> Pass2.2 CONFIG_CPU_SB1_PASS_2_2" Pass1
> if [ "$CONFIG_CPU_SB1_PASS_1" = "y" ]; then
> define_bool CONFIG_SB1_PASS_1_WORKAROUNDS y
Just fixed that one and another choice statement.
Thanks,
Ralf
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-10-30 13:07 ` Maciej W. Rozycki
@ 2002-11-07 19:26 ` Maciej W. Rozycki
2002-11-07 20:33 ` SEGEV defines Bradley Bozarth
2002-11-07 22:23 ` make xmenuconfig is broken Jun Sun
0 siblings, 2 replies; 13+ messages in thread
From: Maciej W. Rozycki @ 2002-11-07 19:26 UTC (permalink / raw)
To: Jun Sun, Karsten Merker, linux-mips
On Wed, 30 Oct 2002, Maciej W. Rozycki wrote:
> On Tue, 29 Oct 2002, Jun Sun wrote:
>
> > My limited xconfig knowledge seems to tell me that moving to the generic
> > config file is the only way to make it work. If you know a better way to fix
> > this, I will be happy to see it.
[...]
> The problem is CONFIG_SERIAL having different meanings for the MIPS port.
> It causes annoyance with dynamic parsers (like `make config') and I'm not
> surprised it breaks the xconfig static parser.
I renamed the guilty options and also I decided moving DECstation serial
port configuration to drivers/char is the way to go. As a side effect you
now may build both the dz11/z8530 drivers and the i8250 one (as an advance
towards a generic kernel).
Here is a patch for 2.4. Does it fix things for you? And is it
acceptable for the others? Specifically, I mean putting the questions
under CONFIG_SERIAL_NONSTANDARD (the name is unfortunate, but that's
heritage from the old days and is going to vainsh in 2.6 anyway).
If no objections arise, I'll check the patch in soon, probably tomorrow.
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
patch-mips-2.4.20-pre6-20021017-dec-serial-1
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/Documentation/Configure.help linux-mips-2.4.20-pre6-20021017/Documentation/Configure.help
--- linux-mips-2.4.20-pre6-20021017.macro/Documentation/Configure.help 2002-10-03 02:56:16.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/Documentation/Configure.help 2002-11-05 21:01:48.000000000 +0000
@@ -2148,6 +2148,27 @@ SGI PROM Console Support
CONFIG_SGI_PROM_CONSOLE
Say Y here to set up the boot console on serial port 0.
+DECstation serial support
+CONFIG_SERIAL_DEC
+ 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.
+
+Support for console on a DECstation serial port
+CONFIG_SERIAL_DEC_CONSOLE
+ 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.
+
DZ11 Serial Support
CONFIG_DZ
DZ11-family serial controllers for VAXstations, including the
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/arch/mips/config-shared.in linux-mips-2.4.20-pre6-20021017/arch/mips/config-shared.in
--- linux-mips-2.4.20-pre6-20021017.macro/arch/mips/config-shared.in 2002-10-07 02:56:25.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/arch/mips/config-shared.in 2002-10-30 23:31:32.000000000 +0000
@@ -764,19 +764,6 @@ source drivers/char/Config.in
#source drivers/misc/Config.in
-if [ "$CONFIG_DECSTATION" = "y" ]; then
- mainmenu_option next_comment
- comment 'DECStation Character devices'
-
- tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
- dep_bool ' DZ11 Serial Support' CONFIG_DZ $CONFIG_SERIAL
- dep_bool ' Z85C30 Serial Support' CONFIG_ZS $CONFIG_SERIAL $CONFIG_TC
- dep_bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE $CONFIG_SERIAL
-# dep_bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
- bool 'Enhanced Real Time Clock Support' CONFIG_RTC
- endmenu
-fi
-
if [ "$CONFIG_SGI_IP22" = "y" ]; then
mainmenu_option next_comment
comment 'SGI Character devices'
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/char/Config.in linux-mips-2.4.20-pre6-20021017/drivers/char/Config.in
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/char/Config.in 2002-10-08 02:56:56.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/char/Config.in 2002-11-05 20:54:55.000000000 +0000
@@ -104,7 +104,14 @@ if [ "$CONFIG_SERIAL_NONSTANDARD" = "y"
fi
fi
fi
+ if [ "$CONFIG_DECSTATION" = "y" ]; then
+ bool ' DECstation serial support' CONFIG_SERIAL_DEC
+ dep_bool ' Support for console on a DECstation serial port' CONFIG_SERIAL_DEC_CONSOLE $CONFIG_SERIAL_DEC
+ dep_bool ' DZ11 serial support' CONFIG_DZ $CONFIG_SERIAL_DEC
+ dep_bool ' Z85C30 serial support' CONFIG_ZS $CONFIG_SERIAL_DEC $CONFIG_TC
+ fi
fi
+
if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
fi
@@ -161,6 +168,9 @@ if [ "$CONFIG_BUSMOUSE" != "n" ]; then
if [ "$CONFIG_ADB" = "y" -a "$CONFIG_ADB_KEYBOARD" = "y" ]; then
dep_tristate ' Apple Desktop Bus mouse support (old driver)' CONFIG_ADBMOUSE $CONFIG_BUSMOUSE
fi
+# if [ "$CONFIG_DECSTATION" = "y" ]; then
+# dep_bool ' MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
+# fi
fi
tristate 'Mouse Support (not serial and bus mice)' CONFIG_MOUSE
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/char/Makefile linux-mips-2.4.20-pre6-20021017/drivers/char/Makefile
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/char/Makefile 2002-09-12 03:09:53.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/char/Makefile 2002-11-05 20:37:50.000000000 +0000
@@ -126,7 +126,6 @@ endif
ifeq ($(CONFIG_DECSTATION),y)
KEYMAP =
KEYBD =
- SERIAL = decserial.o
endif
ifeq ($(CONFIG_BAGET_MIPS),y)
@@ -158,6 +157,7 @@ obj-$(CONFIG_SERIAL_21285) += serial_212
obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
obj-$(CONFIG_TS_AU1000_ADS7846) += au1000_ts.o
+obj-$(CONFIG_SERIAL_DEC) += decserial.o
ifndef CONFIG_SUN_KEYBOARD
obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/char/decserial.c linux-mips-2.4.20-pre6-20021017/drivers/char/decserial.c
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/char/decserial.c 2001-07-17 19:49:00.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/char/decserial.c 2002-11-05 20:31:26.000000000 +0000
@@ -28,7 +28,7 @@ extern int zs_init(void);
extern int dz_init(void);
#endif
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_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_DEC
int __init rs_init(void)
{
@@ -70,12 +70,12 @@ __initcall(rs_init);
#endif
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
-/* serial_console_init handles the special case of starting
+/* dec_serial_console_init handles the special case of starting
* up the console on the serial port
*/
-void __init serial_console_init(void)
+void __init dec_serial_console_init(void)
{
#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
if (IOASIC)
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/char/dz.c linux-mips-2.4.20-pre6-20021017/drivers/char/dz.c
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/char/dz.c 2002-10-02 02:56:52.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/char/dz.c 2002-11-05 20:32:23.000000000 +0000
@@ -1411,7 +1411,7 @@ int __init dz_init(void)
}
/* reset the chip */
-#ifndef CONFIG_SERIAL_CONSOLE
+#ifndef CONFIG_SERIAL_DEC_CONSOLE
dz_out(info, DZ_CSR, DZ_CLR);
while ((tmp = dz_in(info, DZ_CSR)) & DZ_CLR);
iob();
@@ -1433,7 +1433,7 @@ int __init dz_init(void)
return 0;
}
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
static void dz_console_put_char(unsigned char ch)
{
unsigned long flags;
@@ -1587,6 +1587,6 @@ void __init dz_serial_console_init(void)
register_console(&dz_sercons);
}
-#endif /* CONFIG_SERIAL_CONSOLE */
+#endif /* CONFIG_SERIAL_DEC_CONSOLE */
MODULE_LICENSE("GPL");
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/char/tty_io.c linux-mips-2.4.20-pre6-20021017/drivers/char/tty_io.c
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/char/tty_io.c 2002-09-16 02:58:19.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/char/tty_io.c 2002-11-05 20:30:00.000000000 +0000
@@ -2240,6 +2240,9 @@ void __init console_init(void)
sci_console_init();
#endif
#endif
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
+ dec_serial_console_init();
+#endif
#ifdef CONFIG_TN3270_CONSOLE
tub3270_con_init();
#endif
diff -up --recursive --new-file linux-mips-2.4.20-pre6-20021017.macro/drivers/tc/zs.c linux-mips-2.4.20-pre6-20021017/drivers/tc/zs.c
--- linux-mips-2.4.20-pre6-20021017.macro/drivers/tc/zs.c 2002-08-06 02:58:08.000000000 +0000
+++ linux-mips-2.4.20-pre6-20021017/drivers/tc/zs.c 2002-11-05 20:39:27.000000000 +0000
@@ -56,7 +56,7 @@
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/ioport.h>
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
#include <linux/console.h>
#endif
@@ -157,10 +157,10 @@ struct dec_serial *zs_chain; /* list of
struct tty_struct zs_ttys[NUM_CHANNELS];
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
static struct console sercons;
#endif
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) \
+#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) \
&& !defined(MODULE)
static unsigned long break_pressed; /* break, really ... */
#endif
@@ -416,7 +416,7 @@ static _INLINE_ void receive_chars(struc
if (tty_break) {
tty_break = 0;
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
+#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
if (info->line == sercons.index) {
if (!break_pressed) {
break_pressed = jiffies;
@@ -442,7 +442,7 @@ static _INLINE_ void receive_chars(struc
write_zsreg(info->zs_channel, R0, ERR_RES);
}
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
+#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
if (break_pressed && info->line == sercons.index) {
if (ch != 0 &&
time_before(jiffies, break_pressed + HZ*5)) {
@@ -473,7 +473,7 @@ static _INLINE_ void receive_chars(struc
*tty->flip.flag_buf_ptr++ = flag;
*tty->flip.char_buf_ptr++ = ch;
-#if defined(CONFIG_SERIAL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
+#if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && !defined(MODULE)
ignore_char:
#endif
}
@@ -1701,7 +1701,7 @@ int rs_open(struct tty_struct *tty, stru
*tty->termios = info->callout_termios;
change_speed(info);
}
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
if (sercons.cflag && sercons.index == line) {
tty->termios->c_cflag = sercons.cflag;
sercons.cflag = 0;
@@ -1801,7 +1801,7 @@ static void __init probe_sccs(void)
zs_channels[n_channels].data =
zs_channels[n_channels].control + 4;
-#ifndef CONFIG_SERIAL_CONSOLE
+#ifndef CONFIG_SERIAL_DEC_CONSOLE
/*
* We're called early and memory managment isn't up, yet.
* Thus check_region would fail.
@@ -2111,7 +2111,7 @@ unsigned int unregister_zs_hook(unsigned
* Serial console driver
* ------------------------------------------------------------
*/
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_SERIAL_DEC_CONSOLE
/*
@@ -2279,7 +2279,7 @@ void __init zs_serial_console_init(void)
{
register_console(&sercons);
}
-#endif /* ifdef CONFIG_SERIAL_CONSOLE */
+#endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */
#ifdef CONFIG_KGDB
struct dec_zschannel *zs_kgdbchan;
^ permalink raw reply [flat|nested] 13+ messages in thread
* SEGEV defines
2002-11-07 19:26 ` Maciej W. Rozycki
@ 2002-11-07 20:33 ` Bradley Bozarth
2002-11-07 22:10 ` Daniel Jacobowitz
2002-11-07 22:23 ` make xmenuconfig is broken Jun Sun
1 sibling, 1 reply; 13+ messages in thread
From: Bradley Bozarth @ 2002-11-07 20:33 UTC (permalink / raw)
To: linux-mips; +Cc: george
Can these be changed?
> Now a question, why does mips use these values:
> #define SIGEV_SIGNAL 129 /* notify via signal */
> #define SIGEV_CALLBACK 130 /* ??? */
> #define SIGEV_THREAD 131 /* deliver via thread
> creation */
>
> It is the only platform that adds anything to the simple
> 1,2,3 values used on other platforms. The reason I ask, is
> that I would like to change them to conform to all the
> others.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: SEGEV defines
2002-11-07 20:33 ` SEGEV defines Bradley Bozarth
@ 2002-11-07 22:10 ` Daniel Jacobowitz
0 siblings, 0 replies; 13+ messages in thread
From: Daniel Jacobowitz @ 2002-11-07 22:10 UTC (permalink / raw)
To: Bradley Bozarth; +Cc: linux-mips, george
Presumably they match IRIX... like the rest of MIPS's oddball
definitions. A little hard to change them now.
On Thu, Nov 07, 2002 at 12:33:55PM -0800, Bradley Bozarth wrote:
> Can these be changed?
>
> > Now a question, why does mips use these values:
> > #define SIGEV_SIGNAL 129 /* notify via signal */
> > #define SIGEV_CALLBACK 130 /* ??? */
> > #define SIGEV_THREAD 131 /* deliver via thread
> > creation */
> >
> > It is the only platform that adds anything to the simple
> > 1,2,3 values used on other platforms. The reason I ask, is
> > that I would like to change them to conform to all the
> > others.
>
>
>
>
>
--
Daniel Jacobowitz
MontaVista Software Debian GNU/Linux Developer
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-11-07 19:26 ` Maciej W. Rozycki
2002-11-07 20:33 ` SEGEV defines Bradley Bozarth
@ 2002-11-07 22:23 ` Jun Sun
2002-11-08 12:25 ` Maciej W. Rozycki
1 sibling, 1 reply; 13+ messages in thread
From: Jun Sun @ 2002-11-07 22:23 UTC (permalink / raw)
To: Maciej W. Rozycki; +Cc: Karsten Merker, linux-mips, jsun
Yes, this patch takes care of DECSTATION part of the xconfig problem.
Thanks.
Now we still have IP22 config which needs to be fixed. Any volunteers?
This is the additional hack needed that would make xconfig (serial/serial
console options) work.
diff -Nru arch/mips/config-shared.in.orig arch/mips/config-shared.in
--- arch/mips/config-shared.in.orig Thu Nov 7 14:14:09 2002
+++ arch/mips/config-shared.in Thu Nov 7 14:17:33 2002
@@ -800,9 +800,9 @@
fi
endmenu
-if [ "$CONFIG_SGI_IP22" = "y" ]; then
- source drivers/sgi/Config.in
-fi
+#if [ "$CONFIG_SGI_IP22" = "y" ]; then
+# source drivers/sgi/Config.in
+#fi
source drivers/usb/Config.in
Jun
On Thu, Nov 07, 2002 at 08:26:19PM +0100, Maciej W. Rozycki wrote:
> On Wed, 30 Oct 2002, Maciej W. Rozycki wrote:
>
> > On Tue, 29 Oct 2002, Jun Sun wrote:
> >
> > > My limited xconfig knowledge seems to tell me that moving to the generic
> > > config file is the only way to make it work. If you know a better way to fix
> > > this, I will be happy to see it.
> [...]
> > The problem is CONFIG_SERIAL having different meanings for the MIPS port.
> > It causes annoyance with dynamic parsers (like `make config') and I'm not
> > surprised it breaks the xconfig static parser.
>
> I renamed the guilty options and also I decided moving DECstation serial
> port configuration to drivers/char is the way to go. As a side effect you
> now may build both the dz11/z8530 drivers and the i8250 one (as an advance
> towards a generic kernel).
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-11-07 22:23 ` make xmenuconfig is broken Jun Sun
@ 2002-11-08 12:25 ` Maciej W. Rozycki
2002-11-08 17:35 ` Ralf Baechle
0 siblings, 1 reply; 13+ messages in thread
From: Maciej W. Rozycki @ 2002-11-08 12:25 UTC (permalink / raw)
To: Jun Sun; +Cc: Karsten Merker, linux-mips
On Thu, 7 Nov 2002, Jun Sun wrote:
> Yes, this patch takes care of DECSTATION part of the xconfig problem.
Thanks for testing.
> Now we still have IP22 config which needs to be fixed. Any volunteers?
Renaming CONFIG_SERIAL_CONSOLE to CONFIG_SGI_SERIAL_CONSOLE where
appropriate should suffice.
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-11-08 12:25 ` Maciej W. Rozycki
@ 2002-11-08 17:35 ` Ralf Baechle
2002-11-08 18:30 ` Maciej W. Rozycki
0 siblings, 1 reply; 13+ messages in thread
From: Ralf Baechle @ 2002-11-08 17:35 UTC (permalink / raw)
To: Maciej W. Rozycki; +Cc: Jun Sun, Karsten Merker, linux-mips
On Fri, Nov 08, 2002 at 01:25:26PM +0100, Maciej W. Rozycki wrote:
> > Now we still have IP22 config which needs to be fixed. Any volunteers?
>
> Renaming CONFIG_SERIAL_CONSOLE to CONFIG_SGI_SERIAL_CONSOLE where
> appropriate should suffice.
That's my part to fix, I guess. However since not all SGI's are
using the Zilog 8530 for their serial interfaces I'll rename it
CONFIG_IP22_SERIAL_CONSOLE.
Ralf
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-11-08 17:35 ` Ralf Baechle
@ 2002-11-08 18:30 ` Maciej W. Rozycki
2002-11-08 19:31 ` Ralf Baechle
0 siblings, 1 reply; 13+ messages in thread
From: Maciej W. Rozycki @ 2002-11-08 18:30 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Jun Sun, Karsten Merker, linux-mips
On Fri, 8 Nov 2002, Ralf Baechle wrote:
> > Renaming CONFIG_SERIAL_CONSOLE to CONFIG_SGI_SERIAL_CONSOLE where
> > appropriate should suffice.
>
> That's my part to fix, I guess. However since not all SGI's are
Yes, please -- I can do that myself, but it'd better be done by someone
familiar with SGI hardware, so that all details are handled right.
> using the Zilog 8530 for their serial interfaces I'll rename it
> CONFIG_IP22_SERIAL_CONSOLE.
Well, the name of a variable doesn't matter (as my analysis professor
used to say). ;-)
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: make xmenuconfig is broken
2002-11-08 18:30 ` Maciej W. Rozycki
@ 2002-11-08 19:31 ` Ralf Baechle
0 siblings, 0 replies; 13+ messages in thread
From: Ralf Baechle @ 2002-11-08 19:31 UTC (permalink / raw)
To: Maciej W. Rozycki; +Cc: Jun Sun, Karsten Merker, linux-mips
On Fri, Nov 08, 2002 at 07:30:15PM +0100, Maciej W. Rozycki wrote:
> > > Renaming CONFIG_SERIAL_CONSOLE to CONFIG_SGI_SERIAL_CONSOLE where
> > > appropriate should suffice.
> >
> > That's my part to fix, I guess. However since not all SGI's are
>
> Yes, please -- I can do that myself, but it'd better be done by someone
> familiar with SGI hardware, so that all details are handled right.
>
> > using the Zilog 8530 for their serial interfaces I'll rename it
> > CONFIG_IP22_SERIAL_CONSOLE.
>
> Well, the name of a variable doesn't matter (as my analysis professor
> used to say). ;-)
With no more generic stuff like CONFIG_SERIAL_CONSOLE in use by the Indy
code there will be less subtilities ...
Ralf
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2002-11-08 19:33 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-10-29 18:35 make xmenuconfig is broken Jun Sun
2002-10-29 19:24 ` Karsten Merker
2002-10-29 21:30 ` Jun Sun
2002-10-30 13:07 ` Maciej W. Rozycki
2002-11-07 19:26 ` Maciej W. Rozycki
2002-11-07 20:33 ` SEGEV defines Bradley Bozarth
2002-11-07 22:10 ` Daniel Jacobowitz
2002-11-07 22:23 ` make xmenuconfig is broken Jun Sun
2002-11-08 12:25 ` Maciej W. Rozycki
2002-11-08 17:35 ` Ralf Baechle
2002-11-08 18:30 ` Maciej W. Rozycki
2002-11-08 19:31 ` Ralf Baechle
2002-10-30 15:58 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox