Changeset 753d851 in mainline


Ignore:
Timestamp:
2009-02-08T22:25:30Z (16 years ago)
Author:
Pavel Rimsky <rimskyp@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
198a9ef
Parents:
fd375a8d
Message:

Allow to suppress compilation of FB code on Sparc machines that do not have FB.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    rfd375a8d r753d851  
    176176
    177177% Framebuffer support
    178 ! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)] CONFIG_FB (y/n)
     178! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
    179179
    180180% Framebuffer width

  • kernel/arch/sparc64/Makefile.inc

    rfd375a8d r753d851  
    6565#
    6666
    67 CONFIG_FB = y
     67ifeq ($(MACHINE),us)
     68        CONFIG_FB = y
     69endif
    6870
    6971## Compile with support for Sun keyboard.
    … …  
    118120        arch/$(ARCH)/src/drivers/tick.c \
    119121        arch/$(ARCH)/src/drivers/kbd.c \
    120         arch/$(ARCH)/src/drivers/scr.c \
    121122        arch/$(ARCH)/src/drivers/sgcn.c \
    122123        arch/$(ARCH)/src/drivers/pci.c
    123124
     125ifeq ($(CONFIG_FB),y)
     126        ARCH_SOURCES += \
     127                arch/$(ARCH)/src/drivers/scr.c
     128endif
    124129
    125130ifeq ($(CONFIG_SMP),y)

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

    rfd375a8d r753d851  
    7070static void standard_console_init(ofw_tree_node_t *aliases)
    7171{
     72#ifdef CONFIG_FB
    7273        stdin = NULL;
    7374
    … …  
    9798
    9899        kbd_init(keyboard);
     100#else
     101        panic("Standard console requires FB, "
     102              "but the kernel is not compiled with FB support.");
     103#endif
    99104}
    100105
    … …  
    176181void arch_grab_console(void)
    177182{
     183#ifdef CONFIG_FB
    178184        scr_redraw();
     185#endif
    179186        switch (kbd_type) {
    180187#ifdef CONFIG_Z8530

  • kernel/generic/src/main/kinit.c

    rfd375a8d r753d851  
    7575#define ALIVE_CHARS  4
    7676
     77#ifdef CONFIG_KCONSOLE
    7778static char alive[ALIVE_CHARS] = "-\\|/";
     79#endif
    7880
    7981/** Kernel initialization thread.
Note: See TracChangeset for help on using the changeset viewer.