diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index ee773a4cfc..d630163ed9 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -283,10 +283,39 @@ rule KernelArchitectureSetup architecture
 			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
 
 		case arm :
-			HAIKU_BOOT_PLATFORM ?= u-boot ;
-			HAIKU_BOOT_BOARD ?= verdex ;
-			HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
-				# in kB (there is not really a floppy on the gumstix ;) )
+			switch $(HAIKU_BOOT_BOARD) {
+				case beagleboneblk :
+				{
+					HAIKU_BOOT_PLATFORM ?= u-boot ;
+					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+				}
+				case neo_freerunner :
+				{
+					HAIKU_BOOT_PLATFORM ?= u-boot ;
+					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+				}
+				case overo :
+				{
+					HAIKU_BOOT_PLATFORM ?= u-boot ;
+					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+				}
+				case raspberry_pi :
+				{
+					# For now rpi has a custom non u-boot loader
+					HAIKU_BOOT_PLATFORM ?= raspberrypi_arm ;
+					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+				}
+				case verdex :
+				{
+					HAIKU_BOOT_PLATFORM ?= u-boot ;
+					HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ;
+				}
+				case * :
+				{
+					Exit "Set HAIKU_BOOT_BOARD for your target ARM device!" ;
+				}
+			}
+					
 			# offset in floppy image (>= sizeof(haiku_loader))
 			HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
 
diff --git a/build/jam/board/beagle/BoardSetup b/build/jam/board/beagleboneblk/BoardSetup
similarity index 100%
rename from build/jam/board/beagle/BoardSetup
rename to build/jam/board/beagleboneblk/BoardSetup
diff --git a/headers/private/kernel/arch/arm/board/beagle/board_config.h b/headers/private/kernel/arch/arm/board/beagleboneblk/board_config.h
similarity index 100%
rename from headers/private/kernel/arch/arm/board/beagle/board_config.h
rename to headers/private/kernel/arch/arm/board/beagleboneblk/board_config.h