Index: boot/arch/arm32/loader/Makefile
===================================================================
--- boot/arch/arm32/loader/Makefile	(revision 6ac14a70ed101ee9fa8379a5f9ef15a38f08aec5)
+++ boot/arch/arm32/loader/Makefile	(revision 30885b92b99d4bae510111a9b90bc2b5bf34fe14)
@@ -41,13 +41,4 @@
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
-
-ifeq ($(MACHINE), testarm)
-	DMACHINE = MACHINE_GXEMUL_TESTARM
-endif
-
-ifeq ($(MACHINE), integratorcp)
-	DMACHINE = MACHINE_ICP
-endif
-
 
 ifeq ($(COMPILER),gcc_native)
@@ -103,5 +94,5 @@
 	$(USPACEDIR)/srv/fs/fat/fat \
 	$(USPACEDIR)/srv/bd/file_bd/file_bd
-ifeq ($(MACHINE), testarm)
+ifeq ($(MACHINE),testarm)
 	RD_SRVS += \
 		$(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
@@ -161,3 +152,3 @@
 
 %.o: %.c
-	$(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
Index: boot/arch/arm32/loader/print/print.c
===================================================================
--- boot/arch/arm32/loader/print/print.c	(revision 6ac14a70ed101ee9fa8379a5f9ef15a38f08aec5)
+++ boot/arch/arm32/loader/print/print.c	(revision 30885b92b99d4bae510111a9b90bc2b5bf34fe14)
@@ -41,9 +41,10 @@
 
 /** Address where characters to be printed are expected. */
-#ifdef MACHINE_GXEMUL_TESTARM
-#define PUTC_ADDRESS	0x10000000
+#ifdef MACHINE_testarm
+	#define PUTC_ADDRESS  0x10000000
 #endif
-#ifdef MACHINE_ICP
-#define  PUTC_ADDRESS    0x16000000
+
+#ifdef MACHINE_integratorcp
+	#define PUTC_ADDRESS  0x16000000
 #endif