| /trunk/kernel/genarch/include/kbd/ns16550.h |
|---|
| File deleted |
| /trunk/kernel/genarch/Makefile.inc |
|---|
| 79,11 → 79,3 |
| genarch/src/kbd/key.c \ |
| 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 |
| /trunk/kernel/genarch/src/kbd/ns16550.c |
|---|
| File deleted |
| /trunk/kernel/genarch/src/kbd/key.c |
|---|
| 36,12 → 36,7 |
| #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> |
| #include <typedefs.h> |
| /trunk/kernel/arch/sparc64/include/drivers/ns16550.h |
|---|
| File deleted |
| /trunk/kernel/arch/sparc64/Makefile.inc |
|---|
| 60,25 → 60,12 |
| CONFIG_FB = y |
| ## Compile with support for z8530 controller. |
| # |
| ifeq ($(MACHINE),enterprise) |
| ## Compile with support for z8530 controller. |
| # |
| CONFIG_Z8530 = y |
| DEFS += -DCONFIG_Z8530 |
| 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 = \ |
| arch/$(ARCH)/src/cpu/cpu.c \ |
| arch/$(ARCH)/src/asm.S \ |
| /trunk/kernel/arch/sparc64/src/console.c |
|---|
| 42,8 → 42,8 |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #endif |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #ifdef CONFIG_16550A |
| #include <genarch/kbd/16550a.h> |
| #endif |
| #include <console/chardev.h> |
| 64,11 → 64,6 |
| fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, |
| 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(); |
| } |
| 86,8 → 81,8 |
| #ifdef CONFIG_Z8530 |
| z8530_poll(); |
| #endif |
| #ifdef CONFIG_NS16550 |
| ns16550_poll(); |
| #ifdef CONFIG_16550A |
| 16550a_poll(); |
| #endif |
| thread_usleep(KEYBOARD_POLL_PAUSE); |
| } |
| /trunk/kernel/arch/sparc64/src/drivers/kbd.c |
|---|
| 36,8 → 36,8 |
| #ifdef CONFIG_Z8530 |
| #include <genarch/kbd/z8530.h> |
| #endif |
| #ifdef CONFIG_NS16550 |
| #include <genarch/kbd/ns16550.h> |
| #ifdef CONFIG_16650A |
| #include <genarch/kbd/16650a.h> |
| #endif |
| #include <arch/boot/boot.h> |
| 69,8 → 69,8 |
| #ifdef CONFIG_Z8530 |
| z8530_init(); |
| #endif |
| #ifdef CONFIG_NS16550 |
| ns16550_init(); |
| #ifdef CONFIG_16650A |
| 16650A_init(); |
| #endif |
| } |
| /trunk/kernel/arch/amd64/Makefile.inc |
|---|
| 61,7 → 61,6 |
| # |
| CONFIG_I8042 = y |
| DEFS += -DCONFIG_I8042 |
| ## Accepted configuration directives |
| # |
| /trunk/kernel/arch/ia32/Makefile.inc |
|---|
| 80,7 → 80,6 |
| # |
| CONFIG_I8042 = y |
| DEFS += -DCONFIG_I8042 |
| ## Accepted configuration directives |
| # |
| /trunk/kernel/kernel.config |
|---|
| 36,11 → 36,6 |
| @ "indy" SGI Indy |
| ! [ARCH=mips32] MACHINE (choice) |
| # Machine type |
| @ "ultra" Sun Ultra 5 |
| @ "enterprise" Sun Enterprise E6500 |
| ! [ARCH=sparc64] MACHINE (choice) |
| # Framebuffer support |
| ! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)] CONFIG_FB (y/n) |