Index: boot/Makefile.uboot
===================================================================
--- boot/Makefile.uboot	(revision fcc622441d5706c3fcd58ee0e93a8291d7a9abd7)
+++ boot/Makefile.uboot	(revision d7c801bbdcb9a070b8da56879db99ed6e3014322)
@@ -40,5 +40,5 @@
 
 $(POST_OUTPUT): $(BIN_OUTPUT)
-	$(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 $< $@
+	$(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr $(LADDR) -saddr $(SADDR) $< $@
 
 clean:
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision fcc622441d5706c3fcd58ee0e93a8291d7a9abd7)
+++ boot/arch/arm32/Makefile.inc	(revision d7c801bbdcb9a070b8da56879db99ed6e3014322)
@@ -30,4 +30,14 @@
 	BOOT_OUTPUT = image.boot
 	POST_OUTPUT = $(ROOT_PATH)/uImage.bin
+	LADDR = 0x30008000
+	SADDR = 0x30008000
+	POSTBUILD = Makefile.uboot
+endif
+
+ifeq ($(MACHINE), beagleboardxm)
+	BOOT_OUTPUT = image.boot
+	POST_OUTPUT = $(ROOT_PATH)/uImage.bin
+	LADDR = 0x80000000
+	SADDR = 0x80000000
 	POSTBUILD = Makefile.uboot
 endif
@@ -40,10 +50,14 @@
 ENDIANESS = LE
 
+ifeq ($(MACHINE), gta02)
 RD_SRVS_ESSENTIAL += \
 	$(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
 	$(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+endif
 
+ifeq ($(MACHINE), gxemul)
 RD_SRVS_NON_ESSENTIAL += \
 	$(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd
+endif
 
 SOURCES = \