[haiku-commits] haiku: hrev43298 - src/system/boot/platform/u-boot
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 21 Nov 2011 01:37:44 +0100 (CET)
hrev43298 adds 1 changeset to branch 'master'
old head: d1460ff57b0d23d93eecb44e53ef3fc06e8b10f1
new head: 70ac17baab59be3a1c82826119e235d3a4549a4d
----------------------------------------------------------------------------
1 files changed, 4 insertions(+), 7 deletions(-)
src/system/boot/platform/u-boot/Jamfile | 11 ++++-------
############################################################################
Revision: hrev43298
Commit: 70ac17baab59be3a1c82826119e235d3a4549a4d
URL: http://cgit.haiku-os.org/haiku/commit/?id=70ac17b
Author: François Revol <revol@xxxxxxx>
Date: Mon Nov 21 00:36:43 2011 UTC
U-Boot: Cleanup; s/arm/$(TARGET_ARCH)/g
U-Boot is not only about arm...
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/Jamfile
b/src/system/boot/platform/u-boot/Jamfile
index d708deb..2aa123c 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -11,7 +11,7 @@ UsePrivateHeaders [ FDirName storage ] ;
# TODO: move this to arch/arm !
-UsePrivateHeaders [ FDirName kernel arch arm board $(TARGET_BOOT_BOARD) ] ;
+UsePrivateHeaders [ FDirName kernel arch $(TARGET_ARCH) board
$(TARGET_BOOT_BOARD) ] ;
{
local defines = _BOOT_MODE ;
@@ -133,7 +133,7 @@ actions BuildUImageScript1
{
rm -f $(<) $(<).txt
echo '$(SCRIPTCONTENT)' > $(<).txt
- mkimage -A arm -O $(FAKEOS) -T script -C none -n $(SCRIPTNAME) \
+ mkimage -A $(TARGET_ARCH) -O $(FAKEOS) -T script -C none -n
$(SCRIPTNAME) \
-d $(<).txt $(<)
rm -f $(<).txt
}
@@ -184,13 +184,13 @@ actions BuildUBootSDImage1
# uimage targets
BuildUImage haiku_loader.ub : haiku_loader :
- -A arm -O $(uImageFakeOS) -T kernel -C none
+ -A $(TARGET_ARCH) -O $(uImageFakeOS) -T kernel -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW)
-n 'haiku_loader' ;
local tgzArchive = haiku-floppyboot.tgz ;
BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) :
- -A arm -O $(uImageFakeOS) -T multi -C none
+ -A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
-n 'haiku_loader' ;
@@ -230,9 +230,6 @@ BuildUBootSDImage haiku-$(HAIKU_BOOT_BOARD).mmc :
$(HAIKU_BOARD_SDIMAGE_FILES) ;
NotFile haiku-mmc-image ;
Depends haiku-mmc-image : haiku-$(HAIKU_BOOT_BOARD).mmc ;
-# TODO: move to arch/arm
-SEARCH on [ FGristFiles shell.S arch_start_kernel.S ]
- = [ FDirName $(HAIKU_TOP) src system boot platform
$(TARGET_BOOT_PLATFORM) arch $(TARGET_ARCH) ] ;
SEARCH on [ FGristFiles $(genericPlatformSources) ]
= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
Other related posts:
- » [haiku-commits] haiku: hrev43298 - src/system/boot/platform/u-boot - revol
