Changes in HelenOS.config [d776329:6db5d4b] in mainline

File:

• HelenOS.config (modified) (29 diffs)

HelenOS.config

@@ -32 +32 @@
 % Platform
 @ "abs32le" abstract 32-bit little endian
-@ "amd64" AMD64/EM64T 64-bit (PC)
+@ "amd64" AMD64/Intel EM64T (PC)
 @ "arm32" ARM 32-bit
-@ "ia32" IA-32 32-bit (PC)
-@ "ia64" IA-64 64-bit
+@ "ia32" Intel IA-32 (PC)
+@ "ia64" Intel IA-64
 @ "mips32" MIPS 32-bit
-@ "ppc32" PowerPC 32-bit
-@ "riscv64" RISC-V 64-bit
-@ "sparc64" SPARCv9 64-bit
+@ "mips64" MIPS 64-bit
+@ "ppc32" PowerPC 32-bit (iMac G4)
+@ "sparc64" Sun UltraSPARC 64-bit
 ! PLATFORM (choice)
 
@@ -49 +49 @@
 
 % Machine type
+@ "msim" MSIM
+! [PLATFORM=mips64] MACHINE (choice)
+
+% Machine type
 @ "i460GX" i460GX chipset machine
 @ "ski" Ski ia64 simulator
@@ -62 +66 @@
 @ "beagleboardxm" BeagleBoard-xM
 @ "beaglebone" BeagleBone
-@ "raspberrypi" Raspberry Pi
 ! [PLATFORM=arm32] MACHINE (choice)
 
@@ -96 +99 @@
 ! [PLATFORM=arm32&MACHINE=integratorcp] PROCESSOR (choice)
 
-% CPU type
-@ "arm1176" ARM1176
-! [PLATFORM=arm32&MACHINE=raspberrypi] PROCESSOR (choice)
 
 # Add more ARMv4 CPUs
@@ -110 +110 @@
 ! [PLATFORM=arm32&(PROCESSOR=arm926ej_s)] PROCESSOR_ARCH (choice)
 
-# Add more ARMv6 CPUs
-% CPU arch
-@ "armv6" ARMv6
-! [PLATFORM=arm32&(PROCESSOR=arm1176)] PROCESSOR_ARCH (choice)
-
 # Add more ARMv7-A CPUs
 % CPU arch
@@ -127 +122 @@
 @ "4Kc" MIPS 4Kc
 ! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] PROCESSOR (choice)
-
-% Kernel memory model
-@ "kernel" Kernel
-@ "large" Large
-! [PLATFORM=amd64] MEMORY_MODEL (choice)
 
 % RAM disk format
@@ -171 +161 @@
 
 % Kernel architecture
+@ "mips64"
+! [PLATFORM=mips64] KARCH (choice)
+
+% Kernel architecture
 @ "ppc32"
 ! [PLATFORM=ppc32] KARCH (choice)
@@ -179 +173 @@
 
 % Kernel architecture
-@ "riscv64"
-! [PLATFORM=riscv64] KARCH (choice)
-
-% Kernel architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] KARCH (choice)
@@ -218 +208 @@
 
 % User space architecture
+@ "mips64"
+! [PLATFORM=mips64] UARCH (choice)
+
+% User space architecture
 @ "ppc32"
 ! [PLATFORM=ppc32] UARCH (choice)
@@ -226 +220 @@
 
 % User space architecture
-@ "riscv64"
-! [PLATFORM=riscv64] UARCH (choice)
-
-% User space architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] UARCH (choice)
@@ -265 +255 @@
 
 % Boot architecture
+@ "mips64"
+! [PLATFORM=mips64] BARCH (choice)
+
+% Boot architecture
 @ "ppc32"
 ! [PLATFORM=ppc32] BARCH (choice)
@@ -271 +265 @@
 @ "ppc64"
 ! [PLATFORM=ppc64] BARCH (choice)
-
-% Boot architecture
-@ "riscv64"
-! [PLATFORM=riscv64] BARCH (choice)
 
 % Boot architecture
@@ -291 +281 @@
 ! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice)
 
+% Image format
+@ "binary"
+! [PLATFORM=mips64] IMAGE (choice)
+
 
 ## Compiler options
@@ -296 +290 @@
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "icc" Intel C Compiler
 @ "clang" Clang
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "icc" Intel C Compiler
-@ "gcc_native" GNU C Compiler (native)
 ! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
-@ "gcc_native" GNU C Compiler (native)
 ! [PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=riscv64] COMPILER (choice)
+! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
 @ "clang" Clang
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
 
 
@@ -329 +319 @@
 @ "ia32" Intel IA-32
 @ "mips32" MIPS 32-bit
-! [PLATFORM=abs32le&(COMPILER=gcc_cross|COMPILER=gcc_helenos)] CROSS_TARGET (choice)
+! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
 
 
@@ -343 +333 @@
 ! [PLATFORM=amd64] CONFIG_FENCES_P4 (y)
 
-% IOMAP bitmap support
-! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_IOMAP_BITMAP (y)
-
-% IOMAP dummy support
-! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y)
-
 % ACPI support
 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
 
 % Hierarchical page tables support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64] CONFIG_PAGE_PT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
 
 % Page hash table support
-! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
+! [PLATFORM=ia64|PLATFORM=mips64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
 
 % Software integer division support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] CONFIG_SOFTINT (y)
 
 % ASID support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
 
 % ASID FIFO support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
 
 % OpenFirmware tree support
@@ -377 +361 @@
 
 % FPU support
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_FPU (y)
-
-## ARMv7 made FPU hardware compulsory
+! [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)
@@ -390 +374 @@
 
 % Support for SMP
-! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n)
+! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|(PLATFORM=mips64&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n)
 
 % Debug build
@@ -436 +420 @@
 % Use link-time optimization
 ! [COMPILER=gcc_cross|COMPILER=gcc_native] CONFIG_LTO (n/y)
-
-% Kernel RCU algorithm
-@ "PREEMPT_PODZIMEK" Preemptible Podzimek-RCU
-@ "PREEMPT_A" Preemptible A-RCU
-! RCU (choice)
-
-
-## User space features options
-
-% Light weight futex locks
-! FUTEX_UPGRADABLE (n/y)
 
 
@@ -458 +431 @@
 @ "generic" Keyboard or serial line
 @ "none" No input device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_HID_IN (choice)
 
 % Input device class
@@ -469 +442 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone|MACHINE=raspberrypi)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] 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=riscv64] CONFIG_HID_OUT (choice)
+! [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)
 
 % PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
 
 % PC keyboard support
@@ -483 +456 @@
 
 % PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_AT_KBD (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n)
 
 % Support for msim keyboard
@@ -500 +473 @@
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
-% Support for PL011 UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=integratorcp|MACHINE=raspberrypi)] CONFIG_PL011_UART (y/n)
-
-% Support for NS16550 controller (kernel console)
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_NS16550_KCON (n/y)
-
-% Use NS16550 controller as serial input (kernel console)
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550 (y)
-
-% Use NS16550 controller as dummy serial output (kernel console)
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550_OUT (y)
+% 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
@@ -524 +488 @@
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
 
-% Support for BCM2835 mailbox
-! [PLATFORM=arm32&MACHINE=raspberrypi] CONFIG_BCM2835_MAILBOX (y/n)
-
 % Support for i8042 controller
 ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
@@ -546 +507 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_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)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)] CONFIG_SRLN (y)
+! [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)
 
 % EGA support
@@ -585 +546 @@
 @ "16"
 @ "24"
-@ "32"
 ! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
 
@@ -593 +553 @@
 % Dynamic linking support
 ! [PLATFORM=ia32] CONFIG_RTLD (n/y)
-! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n)
+! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_RTLD (n)
 
 % Build shared libraries
@@ -606 +566 @@
 ! [CONFIG_DEBUG=y] CONFIG_TEST_DRIVERS (n/y)
 
+% Load disk drivers on startup
+! CONFIG_START_BD (n/y)
+
+% Mount /data on startup
+! [CONFIG_START_BD=y] CONFIG_MOUNT_DATA (n/y)
+
 % Write core files
 ! CONFIG_WRITE_CORE_FILES (n/y)
 
-% Include userspace unit tests (PCUT)
-! CONFIG_PCUT_TESTS (n/y)
-
-% Include PCUT self-tests
-! CONFIG_PCUT_SELF_TESTS (n/y)
-
 % Include development files (headers, libraries)
 ! CONFIG_DEVEL_FILES (n/y)
@@ -626 +586 @@
 % Barebone build with essential binaries only 
 ! CONFIG_BAREBONE (n/y)
+
+% Build pcc binaries 
+! CONFIG_PCC (n/y)
+
+% Build binutils binaries
+! CONFIG_BINUTILS (n/y)
+
+% Build MSIM binary
+! CONFIG_MSIM (n/y)
 
 % Line debugging information