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

riscv: Fix build, handle .riscv loader

Browse Source 
* We accept the riscv loader to build it, but don't really put it
  into the image since for now you'll just want the haiku_loader.riscv
  for things like TinyEMU

Change-Id: I5005dd5063f2a84cf426db4c40635e87e579ad80
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4075
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: X512 <[email protected]>
Reviewed-by: Alex von Gluck IV <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2021-06-08 02:19:02 +00:00
committed by Alex von Gluck IV
parent d407b17b18
commit 1a5fe94b7a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/MMCImage
+10 -2
View File
@@ -36,8 +36,13 @@ rule BuildSDImage image : files
Exit "Error: Unknown EFI architecture!" ; Exit "Error: Unknown EFI architecture!" ;
} }
BuildEfiSDImage1 $(image) : $(mbrtool) $(fatshell) $(files) ; BuildEfiSDImage1 $(image) : $(mbrtool) $(fatshell) $(files) ;
} else { } else if $(TARGET_BOOT_PLATFORM) = u-boot {
BuildUBootSDImage1 $(image) : $(mbrtool) $(fatshell) $(files) ; BuildUBootSDImage1 $(image) : $(mbrtool) $(fatshell) $(files) ;
} else {
# TODO: For now we do nothing. Maybe we want a "AddSDImage" to
# append additional loaders like the raw riscv one?
echo "Asked for $(TARGET_BOOT_PLATFORM) target boot platform" ;
echo "Unknown path to handle adding to image" ;
} }
} }
@@ -176,9 +181,12 @@ for platform in [ MultiBootSubDirSetup ] {
BuildSDImage $(HAIKU_MMC_NAME) : $(HAIKU_IMAGE) BuildSDImage $(HAIKU_MMC_NAME) : $(HAIKU_IMAGE)
haiku_loader.$(TARGET_BOOT_PLATFORM) ; haiku_loader.$(TARGET_BOOT_PLATFORM) ;
} }
} else { } else if $(TARGET_BOOT_PLATFORM) = u-boot {
BuildSDImage $(HAIKU_MMC_NAME) : BuildSDImage $(HAIKU_MMC_NAME) :
$(HAIKU_IMAGE) haiku_loader.$(TARGET_BOOT_PLATFORM) haiku-floppyboot.tgz.$(TARGET_BOOT_PLATFORM) boot.scr ; $(HAIKU_IMAGE) haiku_loader.$(TARGET_BOOT_PLATFORM) haiku-floppyboot.tgz.$(TARGET_BOOT_PLATFORM) boot.scr ;
} else {
BuildSDImage $(HAIKU_MMC_NAME) :
$(HAIKU_IMAGE) haiku_loader.$(TARGET_BOOT_PLATFORM) boot.scr ;
} }
} }
} }
src/system/boot/platform/riscv/cpu.cpp
+1
View File
@@ -12,6 +12,7 @@
#include <boot/kernel_args.h> #include <boot/kernel_args.h>
#include <boot/stage2.h> #include <boot/stage2.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <arch_cpu_defs.h>
#include <arch_kernel.h> #include <arch_kernel.h>
#include <arch_system_info.h> #include <arch_system_info.h>