Skip to contentSkip to conversation

iodc console patch

parisc-linux Thomas Bogendoerfer 2 participants 3 messages Oct 27, 1999 – Nov 8, 1999

lore
Share & tools
lore
#0 lore raw

To get a sash prompt on my 715/33 I need the patch below. Even if this patch isn't release quality something like that is needed to get the iodc console going.

Because I still have some problems with the first few printed lines, I haven't checked it into cvs. Hope it helps others as well. Ohh and changing "console=ttyS0" to "console=tty" in boot_code/ipl_c.c is required, too.

Thomas.

Index: arch/parisc/kernel/pdc_cons.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/pdc_cons.c,v retrieving revision 1.24

parisc/kernel/pdc_cons.c +2 -0
diff -u -r1.24 pdc_cons.c
@@ -146,6 +146,8 @@
 	memcpy(&PAGE0->mem_kbd, &PAGE0->mem_cons, sizeof(PAGE0->mem_cons));
 
     /* register the pdc console */
+#ifndef CONFIG_IODC_CONSOLE
     register_console(&pdc_cons);
+#endif
 #endif
 }

Index: arch/parisc/kernel/setup.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/setup.c,v retrieving revision 1.70

parisc/kernel/setup.c +12 -11
diff -u -r1.70 setup.c
@@ -655,6 +655,12 @@
 extern asmlinkage void __init start_kernel(void);
 extern char _bss_start;	/* the very first BSS-byte, defined in head.S */
 
+#ifdef CONFIG_VT
+#ifdef CONFIG_IODC_CONSOLE
+extern void iodc_con_init(void);
+#endif
+#endif
+
 __initfunc(void start_parisc(unsigned long new_memory_start, 
 			     char *bootloader_command_line))
 {
@@ -672,6 +678,12 @@
 		}
 	}
 	pdc_console_init();
+#ifdef CONFIG_VT
+#ifdef CONFIG_IODC_CONSOLE
+	conswitchp = &prom_con;
+	iodc_con_init();
+#endif
+#endif
 
 	printk("The Kernel has started...\n");
 
@@ -726,21 +738,10 @@
 	start_kernel(); 	/* now we start our kernel ! */
 }
 
-#ifdef CONFIG_VT
-#ifdef CONFIG_IODC_CONSOLE
-extern void iodc_con_init(void);
-#endif
-#endif
 
 __initfunc(void setup_arch(char **cmdline_p,
 	unsigned long * memory_start_p, unsigned long * memory_end_p))
 {
-#ifdef CONFIG_VT
-#ifdef CONFIG_IODC_CONSOLE
-	iodc_con_init();
-#endif
-#endif
-
 	*cmdline_p = &saved_command_line[0];	// set the ptr to the command-line
 	initrd_below_start_ok = 1;
 	
Signature · 3 lines
   This device has completely bogus header. Compaq scores again :-|
It's a host bridge, but it should be called ghost bridge instead ;^)
                                        [Martin `MJ' Mares on linux-kernel]
#1 lore raw
Quoted 7 lines · Thomas Bogendoerfer

To get a sash prompt on my 715/33 I need the patch below. Even if this patch isn't release quality something like that is needed to get the iodc console going.

Because I still have some problems with the first few printed lines, I haven't checked it into cvs. Hope it helps others as well. Ohh and changing "console=ttyS0" to "console=tty" in boot_code/ipl_c.c is required, too.

I've just checked in something similar. You should also disable CONFIG_VT_CONSOLE, or you'll see all lines printed twice. I think it will now work out of the box for the 715/33 if you have the right .config.

Signature · 4 lines
Matthew Wilcox <[email protected]>
"Windows and MacOS are products, contrived by engineers in the service of
specific companies. Unix, by contrast, is not so much a product as it is a
painstakingly compiled oral history of the hacker subculture." - N Stephenson
#2 lore raw
Quoted 3 lines · Matthew Wilcox

I've just checked in something similar. You should also disable CONFIG_VT_CONSOLE, or you'll see all lines printed twice. I think it will now work out of the box for the 715/33 if you have the right .config.

*ahem*. Of course, if you do, it will be unable to open an initial console and panic. Oops. Don't do this for the moment :-)

Signature · 4 lines
Matthew Wilcox <[email protected]>
"Windows and MacOS are products, contrived by engineers in the service of
specific companies. Unix, by contrast, is not so much a product as it is a
painstakingly compiled oral history of the hacker subculture." - N Stephenson