[haiku-commits] haiku: hrev46934 - build/jam/board/beagleboneblk build/jam/board/beagle build/jam headers/private/kernel/arch/arm/board/beagleboneblk headers/private/kernel/arch/arm/board/beagle
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 26 Feb 2014 07:27:37 +0100 (CET)
hrev46934 adds 1 changeset to branch 'master'
old head: 75a80fb34167f42bdcc1d0e955c186122d3dda3d
new head: 6d3363214fbdc305f8b225099e055c910272b19a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6d33632+%5E75a80fb
----------------------------------------------------------------------------
6d33632: ARM: Simplify board specification
* Don't assume verdex as it isn't clear this was
occurring.
* Make an educated guess on HAIKU_BOOT_PLATFORM
based on provided board (but still allow it to
be overridden)
* Error out if user doesn't populate
HAIKU_BOOT_PLATFORM or enters an unknown board
name.
* You need to add "-sHAIKU_BOOT_BOARD=xxx" to
your jam to build for the proper ARM device.
* Rename beagle to beagleboneblk as per the
documentation.
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46934
Commit: 6d3363214fbdc305f8b225099e055c910272b19a
URL: http://cgit.haiku-os.org/haiku/commit/?id=6d33632
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Feb 26 06:26:49 2014 UTC
----------------------------------------------------------------------------
3 files changed, 33 insertions(+), 4 deletions(-)
build/jam/ArchitectureRules | 37 +++++++++++++++++---
.../board/{beagle => beagleboneblk}/BoardSetup | 0
.../{beagle => beagleboneblk}/board_config.h | 0
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index ee773a4..d630163 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
Other related posts:
