Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/mips32/Makefile.inc	(revision 231fcb23cee33316ea3e310a65aa685ed0fc8538)
@@ -34,11 +34,4 @@
 TOOLCHAIN_DIR = /usr/local/mipsel/bin
 
-## Make some default assumptions
-#
-
-ifndef MIPS_MACHINE
-	MIPS_MACHINE = msim
-endif
-
 KERNEL_LOAD_ADDRESS = 0x80100000
 INIT_ADDRESS = 0x81000000
@@ -47,5 +40,5 @@
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
 
-DEFS += -D__32_BITS__ -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -D__32_BITS__ -DMACHINE=$(MACHINE) -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Compile with hierarchical page tables support.
@@ -64,5 +57,5 @@
 #
 
-ifeq ($(MIPS_MACHINE),indy)
+ifeq ($(MACHINE),indy)
 	# GCC 4.0.1 compiled for mipsEL has problems compiling in 
 	# BigEndian mode with the swl/swr/lwl/lwr instructions.
@@ -78,10 +71,10 @@
 	INIT_SIZE = 0
 endif
-ifeq ($(MIPS_MACHINE),lgxemul)
+ifeq ($(MACHINE),lgxemul)
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary
 	CFLAGS += -DFB_BIG_ENDIAN -DARCH_HAS_FPU -mips3
 endif
-ifeq ($(MIPS_MACHINE),bgxemul)
+ifeq ($(MACHINE),bgxemul)
 	BFD_NAME = elf32-bigmips
 	BFD = ecoff-bigmips
@@ -91,5 +84,5 @@
 	INIT_ADDRESS = 0x81800000
 endif
-ifeq ($(MIPS_MACHINE),simics)
+ifeq ($(MACHINE),simics)
 	# SIMICS 4kc emulation is broken, although for instructions
 	# that do not bother us
@@ -100,5 +93,5 @@
 	TLBCNT = 16
 endif
-ifeq ($(MIPS_MACHINE),msim)
+ifeq ($(MACHINE),msim)
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary