i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U-Boot: Cleanup; s/arm/$(TARGET_ARCH)/g

Browse Source 
U-Boot is not only about arm...
This commit is contained in:
François Revol
2011-11-21 01:36:43 +01:00
parent d1460ff57b
commit 70ac17baab
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/Jamfile
+4 -7
View File
@@ -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 ] ;