From 1a5fe94b7a86d36fba08fb77665c3b298d44a9dd Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Mon, 7 Jun 2021 07:28:18 -0500
Subject: [PATCH] riscv: Fix build, handle .riscv loader

* 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 <no-reply+buildbot@haiku-os.org>
Reviewed-by: X512 <danger_mail@list.ru>
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
---
 build/jam/images/MMCImage              | 12 ++++++++++--
 src/system/boot/platform/riscv/cpu.cpp |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/jam/images/MMCImage b/build/jam/images/MMCImage
index 4df22c18fa..9606545e41 100644
--- a/build/jam/images/MMCImage
+++ b/build/jam/images/MMCImage
@@ -36,8 +36,13 @@ rule BuildSDImage image : files
 				Exit "Error: Unknown EFI architecture!" ;
 		}
 		BuildEfiSDImage1 $(image) : $(mbrtool) $(fatshell) $(files) ;
-	} else {
+	} else if $(TARGET_BOOT_PLATFORM) = u-boot {
 		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)
 					haiku_loader.$(TARGET_BOOT_PLATFORM) ;
 			}
-		} else {
+		} else if $(TARGET_BOOT_PLATFORM) = u-boot {
 			BuildSDImage $(HAIKU_MMC_NAME) :
 				$(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 ;
 		}
 	}
 }
diff --git a/src/system/boot/platform/riscv/cpu.cpp b/src/system/boot/platform/riscv/cpu.cpp
index 2f15c6d99c..af19c5d768 100644
--- a/src/system/boot/platform/riscv/cpu.cpp
+++ b/src/system/boot/platform/riscv/cpu.cpp
@@ -12,6 +12,7 @@
 #include <boot/kernel_args.h>
 #include <boot/stage2.h>
 #include <arch/cpu.h>
+#include <arch_cpu_defs.h>
 #include <arch_kernel.h>
 #include <arch_system_info.h>