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

Automatic whitespace cleanup. No functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38983 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-10-16 16:44:29 +00:00
parent 51ff3ec972
commit fc9a8806b1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/Jamfile
+9 -9
View File
@@ -139,13 +139,13 @@ actions BuildUImageScript1
# SD/mmc image rule # SD/mmc image rule
# requires sfdisk and mtools packages on linux # requires sfdisk and mtools packages on linux
rule BuildUBootSDImage image : files rule BuildUBootSDImage image : files
{ {
Depends $(image) : $(files) ; Depends $(image) : $(files) ;
SDIMAGE_BLOCK_SIZE on $(image) = 1M ; SDIMAGE_BLOCK_SIZE on $(image) = 1M ;
SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ; SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ;
SDIMAGE_FDISK on $(image) = $(HOST_SFDISK) ; SDIMAGE_FDISK on $(image) = $(HOST_SFDISK) ;
SDIMAGE_FDISK_SCRIPT on $(image) = SDIMAGE_FDISK_SCRIPT on $(image) =
"0,$(HAIKU_BOARD_SDIMAGE_FAT_SIZE),0c,-\\\n,,eb\\\n\\\n" ; "0,$(HAIKU_BOARD_SDIMAGE_FAT_SIZE),0c,-\\\n,,eb\\\n\\\n" ;
SDIMAGE_FDISK_H on $(image) = 255 ; SDIMAGE_FDISK_H on $(image) = 255 ;
SDIMAGE_FDISK_S on $(image) = 63 ; SDIMAGE_FDISK_S on $(image) = 63 ;
@@ -182,19 +182,19 @@ actions BuildUBootSDImage1
} }
# uimage targets # uimage targets
BuildUImage haiku_loader.ub : haiku_loader : BuildUImage haiku_loader.ub : haiku_loader :
-A arm -O $(uImageFakeOS) -T kernel -C none -A arm -O $(uImageFakeOS) -T kernel -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW) -a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_RAW)
-n 'haiku_loader' ; -n 'haiku_loader' ;
local tgzArchive = haiku-floppyboot.tgz ; local tgzArchive = haiku-floppyboot.tgz ;
BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) : BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) :
-A arm -O $(uImageFakeOS) -T multi -C none -A arm -O $(uImageFakeOS) -T multi -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD) -a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
-n 'haiku_loader' ; -n 'haiku_loader' ;
if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) { if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) {
BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) : BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) :
$(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT) ; $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT) ;
} }
@@ -204,16 +204,16 @@ if $(HAIKU_BOARD_MLO_IMAGE) && $(HAIKU_BOARD_MLO_IMAGE_URL) {
if $(HAIKU_BOARD_UBOOT_IMAGE) && $(HAIKU_BOARD_UBOOT_IMAGE_URL) { if $(HAIKU_BOARD_UBOOT_IMAGE) && $(HAIKU_BOARD_UBOOT_IMAGE_URL) {
# Download the u-boot binary file. # Download the u-boot binary file.
ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE) ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE)
: $(HAIKU_BOARD_UBOOT_IMAGE_URL) ] ; : $(HAIKU_BOARD_UBOOT_IMAGE_URL) ] ;
} }
# flash image targets # flash image targets
BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img : haiku_loader : BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img : haiku_loader :
$(ubootFile) ; $(ubootFile) ;
#BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img : boot_loader_u-boot : #BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img : boot_loader_u-boot :
# $(ubootFile) ; # $(ubootFile) ;
BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img : haiku_loader.ub : BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img : haiku_loader.ub :
$(ubootFile) ; $(ubootFile) ;
# SD/mmc image targets # SD/mmc image targets