Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 6f4495f5c6915097f277fabc29a874343f77e88a)
+++ HelenOS.config	(revision 1ba41c5ae41f66c7fa3ef1caef4b77d414202fb3)
@@ -6,13 +6,17 @@
 @ "ia32xen" Intel IA-32 on Xen hypervisor
 @ "ia64" Intel IA-64
-@ "mips32msim" MIPS 32-bit (MSIM)
-@ "mips32sim" MIPS 32-bit (Simics)
-@ "mips32gbe" MIPS 32-bit (GXEmul big endian)
-@ "mips32gle" MIPS 32-bit (GXEmul little endian)
-@ "mips32sgi" MIPS 32-bit (Sgi Indy)
+@ "mips32" MIPS 32-bit
 @ "ppc32" PowerPC 32-bit (iMac G4)
 @ "ppc64" PowerPC 64-bit (iMac G5)
 @ "sparc64" Sun UltraSPARC 64-bit
 ! PLATFORM (choice)
+
+# Machine
+@ "msim" MSIM
+@ "simics" Simics
+@ "bgxemul" GXEmul big endian
+@ "lgxemul" GXEmul little endia
+@ "indy" Sgi Indy
+! [PLATFORM=mips32] MACHINE (choice)
 
 # Compiler
Index: Makefile
===================================================================
--- Makefile	(revision 6f4495f5c6915097f277fabc29a874343f77e88a)
+++ Makefile	(revision 1ba41c5ae41f66c7fa3ef1caef4b77d414202fb3)
@@ -54,42 +54,32 @@
 endif
 
-ifeq ($(PLATFORM),mips32msim)
+ifeq ($(PLATFORM),mips32)
 	KARCH = mips32
-	MACHINE = msim
-	UARCH = mips32
 	BARCH = mips32
-	IMAGE = binary
-endif
-
-ifeq ($(PLATFORM),mips32sim)
-	KARCH = mips32
-	MACHINE = simics
-	UARCH = mips32
-	BARCH = mips32
-	IMAGE = ecoff
-endif
-
-ifeq ($(PLATFORM),mips32gbe)
-	KARCH = mips32
-	MACHINE = bgxemul
-	UARCH = mips32eb
-	BARCH = mips32
-	IMAGE = ecoff
-endif
-
-ifeq ($(PLATFORM),mips32gle)
-	KARCH = mips32
-	MACHINE = lgxemul
-	UARCH = mips32
-	BARCH = mips32
-	IMAGE = ecoff
-endif
-
-ifeq ($(PLATFORM),mips32sgi)
-	KARCH = mips32
-	MACHINE = indy
-	UARCH = mips32eb
-	BARCH = mips32
-	IMAGE = ecoff
+	
+	ifeq ($(MACHINE),msim)
+		UARCH = mips32
+		IMAGE = binary
+	endif
+	
+	ifeq ($(MACHINE),simics)
+		UARCH = mips32
+		IMAGE = ecoff
+	endif
+	
+	ifeq ($(MACHINE),bgxemul)
+		UARCH = mips32eb
+		IMAGE = ecoff
+	endif
+	
+	ifeq ($(MACHINE),lgxemul)
+		UARCH = mips32
+		IMAGE = ecoff
+	endif
+	
+	ifeq ($(MACHINE),indy)
+		UARCH = mips32eb
+		IMAGE = ecoff
+	endif
 endif