Changeset a27d1c5 in mainline


Ignore:
Timestamp:
2012-07-13T22:00:45Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2d9197e
Parents:
e677b08
Message:

Add option to set number of consoles, make kernel log console optional.

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    re677b08 ra27d1c5  
    562562! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
    563563
     564% Number of consoles
     565@ "1"
     566@ "2"
     567@ "3"
     568@ "4"
     569@ "5"
     570@ "6"
     571! CONFIG_VC_COUNT(choice)
     572
     573%Kernel log on console 6
     574! CONFIG_KERNEL_LOG_VC_6 (y/n)
     575
    564576% Barebone build with essential binaries only
    565577! CONFIG_BAREBONE (n/y)

  • defaults/amd64/Makefile.config

    re677b08 ra27d1c5  
    2525# Kernel console support
    2626CONFIG_KCONSOLE = y
     27
     28# Number of shell consoles
     29CONFIG_VC_COUNT = 5
    2730
    2831# Kernel symbol information

  • defaults/arm32/Makefile.config

    re677b08 ra27d1c5  
    1616# Kernel console support
    1717CONFIG_KCONSOLE = y
     18
     19# Number of shell consoles
     20CONFIG_VC_COUNT = 5
    1821
    1922# Kernel symbol information

  • defaults/ia32/Makefile.config

    re677b08 ra27d1c5  
    3131# Kernel console support
    3232CONFIG_KCONSOLE = y
     33
     34# Number of shell consoles
     35CONFIG_VC_COUNT = 5
    3336
    3437# Kernel symbol information

  • defaults/ia64/Makefile.config

    re677b08 ra27d1c5  
    2929CONFIG_KCONSOLE = y
    3030
     31# Number of shell consoles
     32CONFIG_VC_COUNT = 5
     33
    3134# Kernel symbol information
    3235CONFIG_SYMTAB = y

  • defaults/mips32/Makefile.config

    re677b08 ra27d1c5  
    2222# Kernel console support
    2323CONFIG_KCONSOLE = y
     24
     25# Number of shell consoles
     26CONFIG_VC_COUNT = 5
    2427
    2528# Kernel symbol information

  • defaults/mips64/Makefile.config

    re677b08 ra27d1c5  
    2222# Kernel console support
    2323CONFIG_KCONSOLE = y
     24
     25# Number of shell consoles
     26CONFIG_VC_COUNT = 5
    2427
    2528# Kernel symbol information

  • defaults/ppc32/Makefile.config

    re677b08 ra27d1c5  
    1616# Kernel console support
    1717CONFIG_KCONSOLE = y
     18
     19# Number of shell consoles
     20CONFIG_VC_COUNT = 5
    1821
    1922# Kernel symbol information

  • defaults/sparc64/Makefile.config

    re677b08 ra27d1c5  
    3232CONFIG_KCONSOLE = y
    3333
     34# Number of shell consoles
     35CONFIG_VC_COUNT = 5
     36
    3437# Kernel symbol information
    3538CONFIG_SYMTAB = y

  • defaults/special/Makefile.config

    re677b08 ra27d1c5  
    1717CONFIG_KCONSOLE = y
    1818
     19# Number of shell consoles
     20CONFIG_VC_COUNT = 5
     21
    1922# Kernel symbol information
    2023CONFIG_SYMTAB = y

  • uspace/app/init/init.c

    re677b08 ra27d1c5  
    340340       
    341341        spawn("/srv/hound");
    342         getterm("term/vc0", "/app/bdsh", true);
    343         getterm("term/vc1", "/app/bdsh", false);
    344         getterm("term/vc2", "/app/bdsh", false);
    345         getterm("term/vc3", "/app/bdsh", false);
    346         getterm("term/vc4", "/app/bdsh", false);
    347         getterm("term/vc5", "/app/bdsh", false);
     342        switch((unsigned)CONFIG_VC_COUNT) {
     343        default:
     344        case 6: getterm("term/vc5", "/app/bdsh", false);
     345        case 5: getterm("term/vc4", "/app/bdsh", false);
     346        case 4: getterm("term/vc3", "/app/bdsh", false);
     347        case 3: getterm("term/vc2", "/app/bdsh", false);
     348        case 2: getterm("term/vc1", "/app/bdsh", false);
     349        case 1: getterm("term/vc0", "/app/bdsh", true);
     350        }
     351#ifdef CONFIG_KERNEL_LOG_VC_6
    348352        getterm("term/vc6", "/app/klog", false);
     353#endif
    349354       
    350355        return 0;
Note: See TracChangeset for help on using the changeset viewer.