Changeset 8b4be29 in mainline for kernel/arch/sparc64


Ignore:
Timestamp:
2006-08-09T18:33:32Z (19 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/arch/sparc64
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/Makefile.inc

    rd46c6ecd r8b4be29  
    6161CONFIG_FB = y
    6262
    63 ## Compile with support for z8530 controller.
    64 #
    6563
    66 CONFIG_Z8530 = y
    67 DEFS += -DCONFIG_Z8530
     64ifeq ($(MACHINE),enterprise)
     65        ## Compile with support for z8530 controller.
     66        #
     67
     68        CONFIG_Z8530 = y
     69        DEFS += -DCONFIG_Z8530
     70endif
     71ifeq ($(MACHINE),ultra)
     72        ## Compile with support for ns16550 controller.
     73        #
     74       
     75        CONFIG_NS16550 = y
     76        DEFS += -DCONFIG_NS16550
     77       
     78        DEFS += -DKBD_ADDR_OVRD=0x1fff13083f8ULL
     79endif
     80
    6881
    6982ARCH_SOURCES = \

  • kernel/arch/sparc64/src/console.c

    rd46c6ecd r8b4be29  
    4343#include <genarch/kbd/z8530.h>
    4444#endif
    45 #ifdef CONFIG_16550A
    46 #include <genarch/kbd/16550a.h>
     45#ifdef CONFIG_NS16550
     46#include <genarch/kbd/ns16550.h>
    4747#endif
    4848
    … …  
    6565                bootinfo.screen.bpp, bootinfo.screen.scanline, true);
    6666
     67#ifdef KBD_ADDR_OVRD
     68        if (!bootinfo.keyboard.addr)
     69                bootinfo.keyboard.addr = KBD_ADDR_OVRD;
     70#endif
     71
    6772        if (bootinfo.keyboard.addr)
    6873                kbd_init();
    … …  
    8287                z8530_poll();
    8388#endif
    84 #ifdef CONFIG_16550A
    85                 16550a_poll();
     89#ifdef CONFIG_NS16550
     90                ns16550_poll();
    8691#endif
    8792                thread_usleep(KEYBOARD_POLL_PAUSE);

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

    rd46c6ecd r8b4be29  
    3737#include <genarch/kbd/z8530.h>
    3838#endif
    39 #ifdef CONFIG_16650A
    40 #include <genarch/kbd/16650a.h>
     39#ifdef CONFIG_NS16550
     40#include <genarch/kbd/ns16550.h>
    4141#endif
    4242
    … …  
    7070        z8530_init();
    7171#endif
    72 #ifdef CONFIG_16650A
    73         16650A_init();
     72#ifdef CONFIG_NS16550
     73        ns16550_init();
    7474#endif
    7575}
Note: See TracChangeset for help on using the changeset viewer.