Index: boot/Makefile.uboot
===================================================================
--- boot/Makefile.uboot	(revision f4660690050e75ed8bc4e4ef3469baa0f79f00e5)
+++ boot/Makefile.uboot	(revision d969a9a5ef26ff6a30b02ed7596a95a0a74f0b6a)
@@ -40,5 +40,5 @@
 
 $(POST_OUTPUT): $(BIN_OUTPUT)
-	$(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30000000 -saddr 0x30000000 \
+	$(MKUIMAGE) -name "$(IMAGE_NAME)" -laddr 0x30008000 -saddr 0x30008000 \
     $< $@
 
Index: boot/arch/arm32/_link.ld.in
===================================================================
--- boot/arch/arm32/_link.ld.in	(revision f4660690050e75ed8bc4e4ef3469baa0f79f00e5)
+++ boot/arch/arm32/_link.ld.in	(revision d969a9a5ef26ff6a30b02ed7596a95a0a74f0b6a)
@@ -1,11 +1,13 @@
+#include <arch/arch.h>
+
 ENTRY(start)
 
 SECTIONS {
-	. = 0x0000;
+	. = BOOT_BASE;
 	.text : {
 		*(BOOTSTRAP);
 		*(.text);
 	}
-	. = 0x8000;
+	. = BOOT_BASE + 0x8000;
 	.data : {
 		*(BOOTPT);      /* bootstrap page table */
Index: boot/arch/arm32/include/arch.h
===================================================================
--- boot/arch/arm32/include/arch.h	(revision f4660690050e75ed8bc4e4ef3469baa0f79f00e5)
+++ boot/arch/arm32/include/arch.h	(revision d969a9a5ef26ff6a30b02ed7596a95a0a74f0b6a)
@@ -36,5 +36,15 @@
 #define PTL0_ENTRY_SIZE  4
 
-#define BOOT_OFFSET  0xa00000
+/*
+ * Address where the boot stage image starts (beginning of usable physical
+ * memory).
+ */
+#ifdef MACHINE_gta02
+#define BOOT_BASE	0x30008000
+#else
+#define BOOT_BASE	0x00000000
+#endif
+
+#define BOOT_OFFSET	(BOOT_BASE + 0xa00000)
 
 #ifndef __ASM__