Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 0fcfa488af4d5256b39dbabfae819c9a889745c1)
+++ HelenOS.config	(revision fe33ac2e3061e5631751e422e402df120872781a)
@@ -34,9 +34,7 @@
 @ "arm32" ARM 32-bit
 @ "ia32" Intel IA-32 (PC)
-@ "ia32xen" Intel IA-32 on Xen hypervisor
 @ "ia64" Intel IA-64
 @ "mips32" MIPS 32-bit
 @ "ppc32" PowerPC 32-bit (iMac G4)
-@ "ppc64" PowerPC 64-bit (iMac G5)
 @ "sparc64" Sun UltraSPARC 64-bit
 ! PLATFORM (choice)
@@ -60,5 +58,5 @@
 @ "athlon-xp" Athlon XP
 @ "athlon-mp" Athlon MP
-! [PLATFORM=ia32|PLATFORM=ia32xen] MACHINE (choice)
+! [PLATFORM=ia32] MACHINE (choice)
 
 % CPU type
@@ -84,5 +82,5 @@
 @ "icc_native" ICC Native
 @ "suncc_native" Sun Studio C Compiler
-! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen] COMPILER (choice)
+! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
@@ -101,5 +99,5 @@
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=ppc64] COMPILER (choice)
+! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 
 
@@ -113,8 +111,8 @@
 
 % Support for SMP
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64] CONFIG_SMP (y/n)
 
 % Improved support for hyperthreading
-! [(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia32xen)&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 % Simics BIOS AP boot fix
@@ -122,5 +120,5 @@
 
 % Lazy FPU context switching
-! [(PLATFORM=mips32&MACHINE!=msim&MACHINE!=simics)|PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64|PLATFORM=sparc64|PLATFORM=ia32xen] CONFIG_FPU_LAZY (y/n)
+! [(PLATFORM=mips32&MACHINE!=msim&MACHINE!=simics)|PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU_LAZY (y/n)
 
 % Use VHPT
@@ -164,8 +162,8 @@
 
 % Watchpoint on rewriting AS with zero
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
 
 % Save all interrupt registers
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32|PLATFORM=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n)
+! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=mips32|PLATFORM=ia32)] CONFIG_DEBUG_ALLREGS (y/n)
 
 % Compile kernel tests