Changes in HelenOS.config [3acb285a:ad8f03d2] in mainline

File:

• HelenOS.config (modified) (9 diffs)

HelenOS.config

@@ -58 +58 @@
 
 % Machine type
-@ "gta02" GTA02 / Neo FreeRunner
 @ "testarm" GXEmul Testarm
 @ "integratorcp" Integratorcp
@@ -390 +389 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -417 +416 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
 
-% PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
-
 % Support for msim/GXemul keyboard
 ! [CONFIG_HID_IN=generic&PLATFORM=mips32] CONFIG_MIPS_KBD (y/n)
@@ -441 +437 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
-% Support for Samsung S3C24XX on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_UART (y/n)
-
-% Support for Samsung S3C24XX on-chip interrupt controller
-! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
-
 % Support for Z8530 controller
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic] CONFIG_Z8530 (y/n)
@@ -475 +465 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support
@@ -501 +491 @@
 @ "1152x720"
 @ "1152x864"
-@ "1280x720"
-@ "1280x800"
 @ "1280x960"
 @ "1280x1024"
@@ -528 +516 @@
 ! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y)
 
-% Run devman on startup
-! CONFIG_START_DEVMAN (y/n)
-
-% Launch (devman) test drivers
-! [CONFIG_START_DEVMAN=y&CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (y/n)
-
 % Load disk drivers on startup
 ! CONFIG_START_BD (n/y)
@@ -543 +525 @@
 ! CONFIG_WRITE_CORE_FILES (n/y)
 
+% Bundle netif/nil network layer
+! CONFIG_NETIF_NIL_BUNDLE (n/y)
+
 % Strip binaries
 ! CONFIG_STRIP_BINARIES (n/y)
@@ -552 +537 @@
 ! CONFIG_BAREBONE (n/y)
 
-% Line debugging information
-! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)