diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 0f3e8118fc..e74950e3d4 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -332,9 +332,9 @@ rule KernelArchitectureSetup architecture
 	HAIKU_KERNEL_ADDON_LINKFLAGS = ;
 
 	# Any special kernel base addresses
-	if $(HAIKU_BOARD_LOADER_BASE) {
+	if $(HAIKU_BOOT_LOADER_BASE) {
 		HAIKU_BOOT_LDFLAGS +=
-			--defsym BOARD_LOADER_BASE=$(HAIKU_BOARD_LOADER_BASE) ;
+			--defsym BOOT_LOADER_BASE=$(HAIKU_BOOT_LOADER_BASE) ;
 	}
 
 	switch $(cpu) {
diff --git a/src/system/ldscripts/arm/boot_loader_u-boot.ld b/src/system/ldscripts/arm/boot_loader_u-boot.ld
index 577ee75245..6108a21ab7 100644
--- a/src/system/ldscripts/arm/boot_loader_u-boot.ld
+++ b/src/system/ldscripts/arm/boot_loader_u-boot.ld
@@ -6,7 +6,7 @@ STACK_SIZE = 16384;
 ENTRY(_start)
 SECTIONS
 {
-	. = BOARD_LOADER_BASE;
+	. = BOOT_LOADER_BASE;
 
 	/* text/read-only data */
 	.text :	{ *(.text .gnu.linkonce.t.*) }