Changeset 35c5d6b in mainline


Ignore:
Timestamp:
2013-08-22T14:52:43Z (11 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a6bdccc
Parents:
4da8fdb
Message:

revert unnecessary global configuration

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r4da8fdb r35c5d6b  
    584584! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
    585585
    586 % Number of consoles
    587 @ "1"
    588 @ "2"
    589 @ "3"
    590 @ "4"
    591 @ "5"
    592 @ "6"
    593 ! [CONFIG_FB=n] CONFIG_VC_COUNT(choice)
    594 
    595 %Kernel log on console 6
    596 ! [CONFIG_FB=n] CONFIG_KERNEL_LOG_VC_6 (y/n)
    597 
    598586% Barebone build with essential binaries only
    599587! CONFIG_BAREBONE (n/y)

  • defaults/amd64/Makefile.config

    r4da8fdb r35c5d6b  
    2525# Kernel console support
    2626CONFIG_KCONSOLE = y
    27 
    28 # Number of shell consoles
    29 CONFIG_VC_COUNT = 5
    3027
    3128# Kernel symbol information

  • defaults/arm32/Makefile.config

    r4da8fdb r35c5d6b  
    1616# Kernel console support
    1717CONFIG_KCONSOLE = y
    18 
    19 # Number of shell consoles
    20 CONFIG_VC_COUNT = 5
    2118
    2219# Kernel symbol information

  • defaults/ia32/Makefile.config

    r4da8fdb r35c5d6b  
    3131# Kernel console support
    3232CONFIG_KCONSOLE = y
    33 
    34 # Number of shell consoles
    35 CONFIG_VC_COUNT = 5
    3633
    3734# Kernel symbol information

  • defaults/ia64/Makefile.config

    r4da8fdb r35c5d6b  
    2929CONFIG_KCONSOLE = y
    3030
    31 # Number of shell consoles
    32 CONFIG_VC_COUNT = 5
    33 
    3431# Kernel symbol information
    3532CONFIG_SYMTAB = y

  • defaults/mips32/Makefile.config

    r4da8fdb r35c5d6b  
    2222# Kernel console support
    2323CONFIG_KCONSOLE = y
    24 
    25 # Number of shell consoles
    26 CONFIG_VC_COUNT = 5
    2724
    2825# Kernel symbol information

  • defaults/mips64/Makefile.config

    r4da8fdb r35c5d6b  
    2222# Kernel console support
    2323CONFIG_KCONSOLE = y
    24 
    25 # Number of shell consoles
    26 CONFIG_VC_COUNT = 5
    2724
    2825# Kernel symbol information

  • defaults/ppc32/Makefile.config

    r4da8fdb r35c5d6b  
    1616# Kernel console support
    1717CONFIG_KCONSOLE = y
    18 
    19 # Number of shell consoles
    20 CONFIG_VC_COUNT = 5
    2118
    2219# Kernel symbol information

  • defaults/sparc64/Makefile.config

    r4da8fdb r35c5d6b  
    3232CONFIG_KCONSOLE = y
    3333
    34 # Number of shell consoles
    35 CONFIG_VC_COUNT = 5
    36 
    3734# Kernel symbol information
    3835CONFIG_SYMTAB = y

  • defaults/special/Makefile.config

    r4da8fdb r35c5d6b  
    1717CONFIG_KCONSOLE = y
    1818
    19 # Number of shell consoles
    20 CONFIG_VC_COUNT = 5
    21 
    2219# Kernel symbol information
    2320CONFIG_SYMTAB = y

  • uspace/app/init/init.c

    r4da8fdb r35c5d6b  
    392392                rc = console(HID_INPUT, HID_OUTPUT);
    393393                if (rc == EOK) {
    394 #ifndef CONFIG_VC_COUNT
    395 #define CONFIG_VC_COUNT 6
    396 #endif
    397                         switch((unsigned)CONFIG_VC_COUNT) {
    398                         default:
    399                         case 6: getterm("term/vc5", "/app/bdsh", false);
    400                         case 5: getterm("term/vc4", "/app/bdsh", false);
    401                         case 4: getterm("term/vc3", "/app/bdsh", false);
    402                         case 3: getterm("term/vc2", "/app/bdsh", false);
    403                         case 2: getterm("term/vc1", "/app/bdsh", false);
    404                         case 1: getterm("term/vc0", "/app/bdsh", true);
    405                         }
    406 #ifdef CONFIG_KERNEL_LOG_VC_6
     394                        getterm("term/vc0", "/app/bdsh", true);
     395                        getterm("term/vc1", "/app/bdsh", false);
     396                        getterm("term/vc2", "/app/bdsh", false);
     397                        getterm("term/vc3", "/app/bdsh", false);
     398                        getterm("term/vc4", "/app/bdsh", false);
     399                        getterm("term/vc5", "/app/bdsh", false);
    407400                        getterm("term/vc6", "/app/klog", false);
    408 #endif
    409401                }
    410402        }
    411         srv_start("/srv/hound");
    412403       
    413404        return 0;
Note: See TracChangeset for help on using the changeset viewer.