Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u-boot/arm: Add missing floppyboot to mmc

Browse Source
This commit is contained in:
Alexander von Gluck IV 2017-07-10 14:53:04 -05:00
parent f5d7446b5b
commit aba7320584
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/boot/platform/u-boot/Jamfile
View File

@ -233,16 +233,14 @@ actions BlessSDImage1 bind HAIKU_BOARD_SDIMAGE_BOOT0_SEEK HAIKU_BOARD_SDIMAGE_BO
HAIKU_BOOT_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;10 + %x\\n\" $(HAIKU_BOOT_LOADER_BASE)|bc` ; HAIKU_BOOT_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;10 + %x\\n\" $(HAIKU_BOOT_LOADER_BASE)|bc` ;
# uimage targets # uimage targets
local tgzArchive = haiku-floppyboot.tgz ; BuildUImage haiku-floppyboot.tgz.ub : haiku-floppyboot.tgz :
BuildUImage $(tgzArchive).ub : $(tgzArchive) :
-A $(TARGET_ARCH) -O linux -T ramdisk -C none -A $(TARGET_ARCH) -O linux -T ramdisk -C none
-n '$(tgzArchive)' ; -n 'Haiku $(TARGET_KERNEL_ARCH) floppyboot' ;
BuildUImage haiku_loader.ub : haiku_loader : BuildUImage haiku_loader.ub : haiku_loader :
-A $(TARGET_ARCH) -O linux -T kernel -C none -A $(TARGET_ARCH) -O linux -T kernel -C none
-a $(HAIKU_BOOT_LOADER_BASE) -e $(HAIKU_BOOT_LOADER_ENTRY_LINUX) -a $(HAIKU_BOOT_LOADER_BASE) -e $(HAIKU_BOOT_LOADER_ENTRY_LINUX)
-n 'haiku_loader' ; -n 'Haiku $(TARGET_KERNEL_ARCH) 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) :
@ -267,7 +265,8 @@ NotFile haiku-flash-uimage ;
Depends haiku-flash-uimage : haiku-$(TARGET_KERNEL_ARCH)_flash_image_uimage.img ; Depends haiku-flash-uimage : haiku-$(TARGET_KERNEL_ARCH)_flash_image_uimage.img ;
# SD/mmc image targets # SD/mmc image targets
BuildUBootSDImage haiku-$(TARGET_KERNEL_ARCH).mmc : $(HAIKU_IMAGE) haiku_loader.ub ; BuildUBootSDImage haiku-$(TARGET_KERNEL_ARCH).mmc :
$(HAIKU_IMAGE) haiku_loader.ub haiku-floppyboot.tgz.ub ;
BlessSDImage haiku-$(TARGET_KERNEL_ARCH).mmc ; BlessSDImage haiku-$(TARGET_KERNEL_ARCH).mmc ;
NotFile haiku-mmc-image ; NotFile haiku-mmc-image ;
Depends haiku-mmc-image : haiku-$(TARGET_KERNEL_ARCH).mmc ; Depends haiku-mmc-image : haiku-$(TARGET_KERNEL_ARCH).mmc ;