Changes in HelenOS.config [d783145:f3287e5] in mainline

File:

• HelenOS.config (modified) (14 diffs)

HelenOS.config

@@ -39 +39 @@
 @ "mips64" MIPS 64-bit
 @ "ppc32" PowerPC 32-bit (iMac G4)
-@ "sparc32" SPARC v8 (32-bit)
 @ "sparc64" Sun UltraSPARC 64-bit
 ! PLATFORM (choice)
@@ -61 +60 @@
 @ "generic" Generic Sun workstation or server
 ! [PLATFORM=sparc64] MACHINE (choice)
-
-% Machine type
-@ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sparc32] MACHINE (choice)
 
 % Machine type
@@ -93 +88 @@
 
 % CPU type
-@ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
-
-% CPU type
 @ "cortex_a8" ARM Cortex A-8
 ! [PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] PROCESSOR (choice)
@@ -185 +176 @@
 ! [PLATFORM=sparc64] KARCH (choice)
 
-% Kernel architecture
-@ "sparc32"
-! [PLATFORM=sparc32] KARCH (choice)
 
 ## Mapping between platform and user space architecture
@@ -235 +223 @@
 ! [PLATFORM=sparc64] UARCH (choice)
 
-% User space architecture
-@ "sparc32"
-! [PLATFORM=sparc32] UARCH (choice)
 
 ## Mapping between platform and boot architecture
@@ -285 +270 @@
 ! [PLATFORM=sparc64] BARCH (choice)
 
-% Boot architecture
-@ "sparc32"
-! [PLATFORM=sparc32] BARCH (choice)
 
 ## Mapping between platform and image format
@@ -303 +285 @@
 ! [PLATFORM=mips64] IMAGE (choice)
 
+
 ## Compiler options
+
+% Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
+@ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+@ "icc" Intel C Compiler
+@ "clang" Clang
+! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
@@ -309 +300 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
-@ "clang" Clang
-! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+! [PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-@ "icc" Intel C Compiler
-! [PLATFORM=ia64] COMPILER (choice)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
+! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "clang" Clang
-! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64|PLATFORM=sparc32] COMPILER (choice)
+! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
 
 
@@ -336 +323 @@
 @ "ia32" Intel IA-32
 @ "mips32" MIPS 32-bit
-! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+! [PLATFORM=abs32le&(COMPILER=gcc_cross|COMPILER=gcc_helenos)] CROSS_TARGET (choice)
 
 
@@ -354 +341 @@
 
 % Hierarchical page tables support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
 
 % Page hash table support
@@ -360 +347 @@
 
 % Software integer division support
-! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc32] 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=mips64|PLATFORM=ppc32|PLATFORM=sparc64|PLATFORM=sparc32] CONFIG_ASID (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
 
 % ASID FIFO support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64|PLATFORM=sparc32] CONFIG_ASID_FIFO (y)
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
 
 % OpenFirmware tree support
@@ -505 +492 @@
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
 
-% Support for GRLIB UART
-! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_UART (y)
-
-% Support for GRLIB IRQMP
-! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_IRQMP (y)
-
 % Support for i8042 controller
 ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
@@ -530 +511 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=sparc32)|(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=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
@@ -645 +626 @@
 @ "5" Linux kernel
 ! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)
-
-% uImage OS type
-@ "5" Linux kernel
-! [PLATFORM=sparc32] UIMAGE_OS (choice)