Index: arch/mips32/Makefile.inc
===================================================================
--- arch/mips32/Makefile.inc	(revision d43d2f705946ff05da350bbb3b6648898cae3600)
+++ arch/mips32/Makefile.inc	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
@@ -37,6 +37,6 @@
 #
 
-ifndef MACHINE
-	MACHINE = msim
+ifndef MIPS_MACHINE
+	MIPS_MACHINE = msim
 endif
 
@@ -45,10 +45,10 @@
 INIT_SIZE = 65536
 CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss
-DEFS += -DMACHINE=${MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
+DEFS += -DMACHINE=${MIPS_MACHINE} -DKERNEL_LOAD_ADDRESS=${KERNEL_LOAD_ADDRESS} -DINIT_ADDRESS=${INIT_ADDRESS} -DINIT_SIZE=${INIT_SIZE}
 
 ## Accepted MACHINEs
 #
 
-ifeq ($(MACHINE),indy)
+ifeq ($(MIPS_MACHINE),indy)
 	# GCC 4.0.1 compiled for mipsEL has problems compiling in 
 	# BigEndian mode with the swl/swr/lwl/lwr instructions.
@@ -62,10 +62,10 @@
 	CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -march=r4600
 endif
-ifeq ($(MACHINE),lgxemul)
+ifeq ($(MIPS_MACHINE),lgxemul)
 	BFD_NAME=elf32-tradlittlemips
 	BFD = ecoff-littlemips
 	CFLAGS += -DHAVE_FPU -mips3
 endif
-ifeq ($(MACHINE),bgxemul)
+ifeq ($(MIPS_MACHINE),bgxemul)
 	BFD_NAME=elf32-bigmips
 	BFD = ecoff-bigmips
@@ -74,5 +74,5 @@
 	CFLAGS += -EB -DBIG_ENDIAN -DHAVE_FPU -mips3
 endif
-ifeq ($(MACHINE),msim4kc)
+ifeq ($(MIPS_MACHINE),msim4kc)
 	# MSIM needs lwl/swl patch & 4kc instruction patch to work
 	# otherwise add -mmemcpy -mips3
@@ -82,5 +82,5 @@
 	CFLAGS += -mhard-float -march=4kc 
 endif
-ifeq ($(MACHINE),simics)
+ifeq ($(MIPS_MACHINE),simics)
 	# SIMICS 4kc emulation is broken, although for instructions
 	# that do not bother us
@@ -90,14 +90,9 @@
 	CFLAGS += -mhard-float -mips3
 endif
-ifeq ($(MACHINE),msim)
+ifeq ($(MIPS_MACHINE),msim)
 	BFD_NAME = elf32-tradlittlemips
 	BFD = binary
 	CFLAGS += -mhard-float -mips3
 endif
-
-## Own configuration directives
-#
-
-CONFIG_OFW = y
 
 ## Accepted configuration directives