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 646b9960f45edec2b83f4adb3bc5a501c2b28e9b)
@@ -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