Index: boot/arch/arm32/loader/Makefile
===================================================================
--- boot/arch/arm32/loader/Makefile	(revision 2a18193cff1ab235b82cb6c1fd4897417beec7c3)
+++ boot/arch/arm32/loader/Makefile	(revision 5e738155aabe3b1083edd0a2e466ca19dd31d8ed)
@@ -42,4 +42,13 @@
 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)
 	CC = gcc
@@ -65,5 +74,5 @@
 	asm.S \
 	mm.c \
-	print/gxemul.c \
+	print/print.c \
 	_components.c \
 	../../../generic/printf.c \
@@ -93,6 +102,9 @@
 	$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
 	$(USPACEDIR)/srv/fs/fat/fat \
-	$(USPACEDIR)/srv/bd/file_bd/file_bd \
-	$(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
+	$(USPACEDIR)/srv/bd/file_bd/file_bd
+ifeq ($(MACHINE), testarm)
+	RD_SRVS += \
+		$(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
+endif
 
 RD_APPS = \
@@ -149,3 +161,3 @@
 
 %.o: %.c
-	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+	$(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@