Index: kernel/arch/arm32/Makefile.inc
===================================================================
--- kernel/arch/arm32/Makefile.inc	(revision 7f34182064fa93a69263014cb1b9789bf87da965)
+++ kernel/arch/arm32/Makefile.inc	(revision e45a3b956a50d651b4b2367622385152bfc43b08)
@@ -36,12 +36,9 @@
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm
 
-KERNEL_LOAD_ADDRESS = 0x80200000
-DMACHINE = MACHINE_GXEMUL_TESTARM
-
 ATSIGN = %
 
 GCC_CFLAGS += -fno-zero-initialized-in-bss
 
-DEFS += -D__32_BITS__ -DKERNEL_LOAD_ADDRESS=$(KERNEL_LOAD_ADDRESS) -D$(DMACHINE)
+DEFS += -D__32_BITS__
 
 ARCH_SOURCES = \
Index: kernel/arch/arm32/_link.ld.in
===================================================================
--- kernel/arch/arm32/_link.ld.in	(revision 7f34182064fa93a69263014cb1b9789bf87da965)
+++ kernel/arch/arm32/_link.ld.in	(revision e45a3b956a50d651b4b2367622385152bfc43b08)
@@ -1,13 +1,14 @@
 /*
- *  ARM linker script
- *  
+ * ARM linker script
+ *
  *  kernel text
  *  kernel data
- *  
+ *
  */
 
+#define KERNEL_LOAD_ADDRESS 0x80200000
+
 OUTPUT_ARCH(arm)
-ENTRY(kernel_image_start) 
-
+ENTRY(kernel_image_start)
 
 SECTIONS {
@@ -20,19 +21,19 @@
 	.data : {
 		kdata_start = .;
-		*(.data);		/* initialized data */
+		*(.data);                       /* initialized data */
 		hardcoded_ktext_size = .;
-		LONG(ktext_end - ktext_start);	
+		LONG(ktext_end - ktext_start);
 		hardcoded_kdata_size = .;
 		LONG(kdata_end - kdata_start);
 		hardcoded_load_address = .;
 		LONG(KERNEL_LOAD_ADDRESS);
-		*(.bss);		/* uninitialized static variables */
-		*(COMMON); 		/* global variables */
-
+		*(.bss);                        /* uninitialized static variables */
+		*(COMMON);                      /* global variables */
+		
 		*(.rodata*);
 		*(.sdata);
 		*(.reginfo);
 		symbol_table = .;
-		*(symtab.*);             
+		*(symtab.*);
 	}
 	.sbss : {
@@ -40,7 +41,7 @@
 		*(.scommon);
 	}
-
+	
 	kdata_end = .;
-
+	
 	/DISCARD/ : {
 	  *(.mdebug*);
@@ -49,4 +50,3 @@
 	  *(.note);
 	}
-
 }
Index: kernel/arch/arm32/include/machine.h
===================================================================
--- kernel/arch/arm32/include/machine.h	(revision 7f34182064fa93a69263014cb1b9789bf87da965)
+++ kernel/arch/arm32/include/machine.h	(revision e45a3b956a50d651b4b2367622385152bfc43b08)
@@ -103,5 +103,5 @@
 
 
-#ifdef MACHINE_GXEMUL_TESTARM
+#ifdef MACHINE_gxemul
 	#define machine_console_init(devno)            gxemul_console_init(devno)
 	#define machine_grab_console                   gxemul_grab_console