Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 0c2d9bb57bc590e00bd17e5f7cf0937be160cca7)
+++ HelenOS.config	(revision b51cf2cfbf7533cc494e6a1795d62f5fbd481c87)
@@ -32,13 +32,13 @@
 % Platform
 @ "abs32le" abstract 32-bit little endian
-@ "amd64" AMD64/Intel EM64T (PC)
+@ "amd64" AMD64/EM64T 64-bit (PC)
 @ "arm32" ARM 32-bit
-@ "ia32" Intel IA-32 (PC)
-@ "ia64" Intel IA-64
+@ "ia32" IA-32 32-bit (PC)
+@ "ia64" IA-64 64-bit
 @ "mips32" MIPS 32-bit
 @ "mips64" MIPS 64-bit
-@ "ppc32" PowerPC 32-bit (iMac G4)
-@ "sparc32" SPARC v8 (32-bit)
-@ "sparc64" Sun UltraSPARC 64-bit
+@ "ppc32" PowerPC 32-bit
+@ "sparc32" SPARCv8 32-bit
+@ "sparc64" SPARCv9 64-bit
 ! PLATFORM (choice)
 
@@ -87,12 +87,12 @@
 
 % CPU type
+@ "leon3" Gaisler Aeroflex LEON3
+! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
+
+% CPU type
 @ "us" UltraSPARC I-II subarchitecture
 @ "us3" UltraSPARC III-IV subarchitecture
 @ "sun4v" Niagara (sun4v)
 ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
-
-% CPU type
-@ "leon3" Gaisler Aeroflex LEON3
-! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
 
 % CPU type
@@ -182,10 +182,11 @@
 
 % Kernel architecture
+@ "sparc32"
+! [PLATFORM=sparc32] KARCH (choice)
+
+% Kernel architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] KARCH (choice)
 
-% Kernel architecture
-@ "sparc32"
-! [PLATFORM=sparc32] KARCH (choice)
 
 ## Mapping between platform and user space architecture
@@ -232,10 +233,11 @@
 
 % User space architecture
+@ "sparc32"
+! [PLATFORM=sparc32] UARCH (choice)
+
+% User space architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] UARCH (choice)
 
-% User space architecture
-@ "sparc32"
-! [PLATFORM=sparc32] UARCH (choice)
 
 ## Mapping between platform and boot architecture
@@ -282,10 +284,11 @@
 
 % Boot architecture
+@ "sparc32"
+! [PLATFORM=sparc32] BARCH (choice)
+
+% Boot architecture
 @ "sparc64"
 ! [PLATFORM=sparc64] BARCH (choice)
 
-% Boot architecture
-@ "sparc32"
-! [PLATFORM=sparc32] BARCH (choice)
 
 ## Mapping between platform and image format
@@ -302,4 +305,5 @@
 @ "binary"
 ! [PLATFORM=mips64] IMAGE (choice)
+
 
 ## Compiler options
@@ -331,5 +335,5 @@
 @ "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=sparc32|PLATFORM=sparc64] COMPILER (choice)
 
 
@@ -367,8 +371,8 @@
 
 % 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=sparc32|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=sparc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
 
 % OpenFirmware tree support