Changeset 8b4be29 in mainline

Timestamp:

2006-08-09T18:33:32Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5f24137

Parents:

d46c6ecd

Message:

Add an option to compile the sparc64 kernel for Ultra 5 or Enterprise E6500.
Basic keyboard support (polling) based on ns16550 serial port (deployed on Ultra).

Location:

kernel

Files:

• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/drivers/ns16550.h (added)
• arch/sparc64/src/console.c (modified) (3 diffs)
• arch/sparc64/src/drivers/kbd.c (modified) (2 diffs)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/kbd/ns16550.h (added)
• genarch/src/kbd/key.c (modified) (1 diff)
• genarch/src/kbd/ns16550.c (added)
• kernel.config (modified) (1 diff)

kernel/arch/amd64/Makefile.inc

@@ -62 +62 @@
 
 CONFIG_I8042 = y
+DEFS += -DCONFIG_I8042
 
 ## Accepted configuration directives

kernel/arch/ia32/Makefile.inc

@@ -81 +81 @@
 
 CONFIG_I8042 = y
+DEFS += -DCONFIG_I8042
 
 ## Accepted configuration directives

kernel/arch/sparc64/Makefile.inc

@@ -61 +61 @@
 CONFIG_FB = y
 
-## Compile with support for z8530 controller.
-#
 
-CONFIG_Z8530 = y
-DEFS += -DCONFIG_Z8530
+ifeq ($(MACHINE),enterprise)
+        ## Compile with support for z8530 controller.
+        #
+
+        CONFIG_Z8530 = y
+        DEFS += -DCONFIG_Z8530
+endif
+ifeq ($(MACHINE),ultra)
+        ## Compile with support for ns16550 controller.
+        #
+        
+        CONFIG_NS16550 = y
+        DEFS += -DCONFIG_NS16550
+        
+        DEFS += -DKBD_ADDR_OVRD=0x1fff13083f8ULL
+endif
+
 
 ARCH_SOURCES = \

kernel/arch/sparc64/src/console.c

@@ -43 +43 @@
 #include <genarch/kbd/z8530.h>
 #endif
-#ifdef CONFIG_16550A
-#include <genarch/kbd/16550a.h>
+#ifdef CONFIG_NS16550
+#include <genarch/kbd/ns16550.h>
 #endif
 
@@ -65 +65 @@
                 bootinfo.screen.bpp, bootinfo.screen.scanline, true);
 
+#ifdef KBD_ADDR_OVRD
+        if (!bootinfo.keyboard.addr)
+                bootinfo.keyboard.addr = KBD_ADDR_OVRD;
+#endif
+
         if (bootinfo.keyboard.addr)
                 kbd_init();
@@ -82 +87 @@
                 z8530_poll();
 #endif
-#ifdef CONFIG_16550A
-                16550a_poll();
+#ifdef CONFIG_NS16550
+                ns16550_poll();
 #endif
                 thread_usleep(KEYBOARD_POLL_PAUSE);

kernel/arch/sparc64/src/drivers/kbd.c

@@ -37 +37 @@
 #include <genarch/kbd/z8530.h>
 #endif
-#ifdef CONFIG_16650A
-#include <genarch/kbd/16650a.h>
+#ifdef CONFIG_NS16550
+#include <genarch/kbd/ns16550.h>
 #endif
 
@@ -70 +70 @@
         z8530_init();
 #endif
-#ifdef CONFIG_16650A
-        16650A_init();
+#ifdef CONFIG_NS16550
+        ns16550_init();
 #endif
 }

kernel/genarch/Makefile.inc

@@ -80 +80 @@
                 genarch/src/kbd/scanc_sun.c
 endif
+
+## ns16550 controller
+ifeq ($(CONFIG_NS16550),y)
+        GENARCH_SOURCES += \
+                genarch/src/kbd/ns16550.c \
+                genarch/src/kbd/key.c \
+                genarch/src/kbd/scanc_sun.c
+endif

kernel/genarch/src/kbd/key.c

@@ -37 +37 @@
 #include <genarch/kbd/key.h>
 #include <genarch/kbd/scanc.h>
+#ifdef CONFIG_I8042
 #include <genarch/kbd/scanc_pc.h>
+#endif
+#if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550))
+#include <genarch/kbd/scanc_sun.h>
+#endif
 #include <synch/spinlock.h>
 #include <console/chardev.h>

kernel/kernel.config

@@ -36 +36 @@
 @ "indy" SGI Indy
 ! [ARCH=mips32] MACHINE (choice)
+
+# Machine type
+@ "ultra" Sun Ultra 5
+@ "enterprise" Sun Enterprise E6500
+! [ARCH=sparc64] MACHINE (choice)
 
 # Framebuffer support