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

riscv64: Generate a bootable EFI MMC image

Browse Source 
* mmc might be not ideal. But raw is just a single partition and
  anyboot is heavily x86. MMC will technically work for now to get
  bootable images.
* floppyboot isn't used on EFI platforms, since we call two different
  actions, just drop floppyboot altogether on EFI SD Images.

Change-Id: Idabb5483304007dd601bf8a1158036ffd24f73aa
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3165
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-08-25 12:53:56 +00:00
committed by Alex von Gluck IV
parent e178540314
commit b3cd2bdfa7
8 changed files with 134 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/MMCImage
+12 -6
View File
@@ -38,6 +38,7 @@ rule BuildSDImage image : files
}
}
# Usage: image : loader floppyboot everything_else
actions BuildUBootSDImage1
{
$(RM) $(1)
@@ -81,7 +82,7 @@ actions BuildUBootSDImage1
cat $(2[0]) >> $(1)
}
# Usage: image : loader everything_else
actions BuildEfiSDImage1
{
$(RM) $(1)
@@ -110,9 +111,7 @@ actions BuildEfiSDImage1
MTOOLSRC=$(1).mtools mmd i:/EFI
MTOOLSRC=$(1).mtools mmd i:/EFI/BOOT
MTOOLSRC=$(1).mtools mcopy $(2[2-2]) i:/EFI/BOOT/$(EFINAME)
# Not really needed on EFI since we use EFI runtime services.
#MTOOLSRC=$(1).mtools mcopy $(2[3-3]) i:/haiku_floppyboot.ub
MTOOLSRC=$(1).mtools mcopy $(2[4-]) i:
MTOOLSRC=$(1).mtools mcopy $(2[3-]) i:
MTOOLSRC=$(1).mtools mcopy uEnv.txt i:
# populate fdts
MTOOLSRC=$(1).mtools mmd i:/fdt
@@ -133,8 +132,15 @@ for platform in [ MultiBootSubDirSetup ] {
on $(platform) {
# SD/mmc image targets
if $(TARGET_BOOT_PLATFORM) = efi {
BuildSDImage $(HAIKU_MMC_NAME) :
$(HAIKU_IMAGE) haiku_loader.$(TARGET_BOOT_PLATFORM) haiku-floppyboot.tgz.$(TARGET_BOOT_PLATFORM) boot.scr ;
if $(TARGET_ARCH) = arm || $(TARGET_ARCH) = arm64 {
# These EFI platforms need u-boot to get them going
BuildSDImage $(HAIKU_MMC_NAME) : $(HAIKU_IMAGE)
haiku_loader.$(TARGET_BOOT_PLATFORM)
boot.scr ;
} else {
BuildSDImage $(HAIKU_MMC_NAME) : $(HAIKU_IMAGE)
haiku_loader.$(TARGET_BOOT_PLATFORM) ;
}
} else {
BuildSDImage $(HAIKU_MMC_NAME) :
$(HAIKU_IMAGE) haiku_loader.$(TARGET_BOOT_PLATFORM) haiku-floppyboot.tgz.$(TARGET_BOOT_PLATFORM) boot.scr ;