Changes in HelenOS.config [6db5d4b:1f5c9c96] in mainline

File:

• HelenOS.config (modified) (22 diffs)

HelenOS.config

@@ -44 +44 @@
 % Machine type
 @ "msim" MSIM
-@ "bmalta" MIPS Malta Development Board big endian
-@ "lmalta" MIPS Malta Development Board little endian
+@ "bgxemul" GXEmul big endian
+@ "lgxemul" GXEmul little endian
 ! [PLATFORM=mips32] MACHINE (choice)
 
@@ -63 +63 @@
 % Machine type
 @ "gta02" GTA02 / Neo FreeRunner
+@ "testarm" GXEmul Testarm
 @ "integratorcp" Integratorcp
-@ "beagleboardxm" BeagleBoard-xM
-@ "beaglebone" BeagleBone
 ! [PLATFORM=arm32] MACHINE (choice)
 
@@ -87 +86 @@
 ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
 
-% CPU type
-@ "cortex_a8" ARM Cortex A-8
-! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
-
-% CPU type
-@ "arm920t" ARM920T
-! [PLATFORM=arm32&MACHINE=gta02] PROCESSOR (choice)
-
-% CPU type
-@ "arm926ej_s" ARM926EJ-S
-! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
-
-
-# Add more ARMv4 CPUs
-% CPU arch
-@ "armv4" ARMv4
-! [PLATFORM=arm32&(PROCESSOR=arm920t)] PROCESSOR_ARCH (choice)
-
-# Add more ARMv5 CPUs
-% CPU arch
-@ "armv5" ARMv5
-! [PLATFORM=arm32&(PROCESSOR=arm926ej_s)] PROCESSOR_ARCH (choice)
-
-# Add more ARMv7-A CPUs
-% CPU arch
-@ "armv7_a" ARMv7-A
-! [PLATFORM=arm32&(PROCESSOR=cortex_a8)] PROCESSOR_ARCH (choice)
-
-% CPU type
-@ "R4000" MIPS R4000
-! [PLATFORM=mips32&MACHINE=msim] PROCESSOR (choice)
-
-% CPU type
-@ "4Kc" MIPS 4Kc
-! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] PROCESSOR (choice)
-
 % RAM disk format
 @ "tmpfs" TMPFS image
 @ "fat" FAT16 image
-@ "ext4fs" ext4 image
+@ "ext2fs" EXT2 image
 ! RDFMT (choice)
 
@@ -201 +164 @@
 % User space architecture
 @ "mips32"
-! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lmalta)] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul)] UARCH (choice)
 
 % User space architecture
 @ "mips32eb"
-! [PLATFORM=mips32&MACHINE=bmalta] UARCH (choice)
+! [PLATFORM=mips32&MACHINE=bgxemul] UARCH (choice)
 
 % User space architecture
@@ -278 +241 @@
 
 % Image format
-@ "elf"
-! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
+@ "ecoff"
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
 
 % Image format
@@ -292 +255 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
+@ "suncc" Sun Studio C Compiler
 @ "clang" Clang
 ! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
@@ -304 +268 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
+@ "suncc" Sun Studio C Compiler
+! [PLATFORM=sparc64] COMPILER (choice)
+
+% Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
 
 % Compiler
@@ -310 +280 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "clang" Clang
-! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
+! [PLATFORM=abs32le] COMPILER (choice)
 
 
@@ -363 +333 @@
 ! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
 
-## armv7 made fpu hardware compulsory
 % FPU support
-! [PLATFORM=arm32&PROCESSOR_ARCH=armv7_a] CONFIG_FPU (y)
-
-% FPU support
-! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_FPU (y)
+! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
 
 
@@ -431 +397 @@
 @ "generic" Keyboard or serial line
 @ "none" No input device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|(PLATFORM=arm32&MACHINE=testarm)|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
 
 % Input device class
@@ -442 +408 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp)] CONFIG_HID_OUT (choice)
 
 % Output device class
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice)
+
+% Output device class
+@ "generic" Monitor or serial line
+@ "monitor" Monitor
+@ "serial" Serial line
+@ "none" No output device
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
+
+% Output device class
+@ "generic" Monitor or serial line
+@ "monitor" Monitor
+@ "serial" Serial line
+@ "none" No output device
+! [PLATFORM=arm32&MACHINE=testarm] CONFIG_HID_OUT (choice)
 
 % PC keyboard support
@@ -458 +438 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
 
-% Support for msim keyboard
-! [CONFIG_HID_IN=generic&MACHINE=msim] CONFIG_MSIM_KBD (y/n)
-
-% Support for msim printer
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=msim] CONFIG_MSIM_PRN (y/n)
+% Support for msim/GXemul keyboard
+! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
+
+% Support for msim/GXemul printer
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
+
+% Support for GXemul keyboard
+! [CONFIG_HID_IN=generic&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_KBD (y/n)
+
+% Support for GXemul printer
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=testarm] CONFIG_ARM_PRN (y/n)
 
 % Support for VIA CUDA controller
@@ -473 +459 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
-% Support for ARM926 on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_ARM926_UART (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)
@@ -482 +465 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for TI AM335x timers support
-! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
-
-% Support for OMAP on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
-
 % Support for i8042 controller
 ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
@@ -501 +478 @@
 
 % Dummy serial line input
-! [CONFIG_MSIM_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
+! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
 
 % Dummy serial line output
-! [CONFIG_MSIM_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support
@@ -517 +494 @@
 % Framebuffer support
 ! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n)
+
+% Framebuffer support
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)
 
 % Framebuffer support
@@ -540 +520 @@
 @ "1920x1080"
 @ "1920x1200"
-! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
 
 % Default framebuffer depth
@@ -546 +526 @@
 @ "16"
 @ "24"
-! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
 
 % Start AP processors by the loader
@@ -576 +556 @@
 
 % Include development files (headers, libraries)
-! CONFIG_DEVEL_FILES (n/y)
+! [RDFMT=tmpfs|RDFMT=ext2fs] CONFIG_DEVEL_FILES (n/y)
 
 % Strip binaries
@@ -593 +573 @@
 ! CONFIG_BINUTILS (n/y)
 
-% Build MSIM binary
-! CONFIG_MSIM (n/y)
-
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
 
 # USB settings
+
+% USB release build (less logging)
+! CONFIG_USB_RELEASE_BUILD (y/n)
 
 % Start virtual USB host controller
@@ -608 +588 @@
 @ "ganged" Root hub ports are all powered or all off.
 @ "per_port" Powered status of every root hub port is independent.
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32] OHCI_POWER_SWITCH (choice)
+! [PLATFORM=ia32|PLATFORM=amd64] OHCI_POWER_SWITCH (choice)
 
 % GRUB boot loader architecture
@@ -614 +594 @@
 @ "efi" GRUB for UEFI
 ! [PLATFORM=ia32|PLATFORM=amd64] GRUB_ARCH (choice)
-
-% uImage OS type
-@ "2" NetBSD stage 2 boot loader
-! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] UIMAGE_OS (choice)
-
-% uImage OS type
-@ "5" Linux kernel
-! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)