From 10cb6648758a8fb372f384c5caa0e710e957410e Mon Sep 17 00:00:00 2001
From: Gedare Bloom <gedare@rtems.org>
Date: Fri, 27 Feb 2026 13:08:18 -0700
Subject: [PATCH] spec/build/riscv: add SBI

Enable the imported SBI in the build for riscv/riscv.

Other riscv BSPs would need to add the entry for optincludes
in addition to adding objsbi to their grp.

Updates #3337
---
 spec/build/bsps/riscv/objsbi.yml            | 17 +++++++++++++++++
 spec/build/bsps/riscv/riscv/grp.yml         |  4 ++++
 spec/build/bsps/riscv/riscv/optincludes.yml | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 spec/build/bsps/riscv/objsbi.yml
 create mode 100644 spec/build/bsps/riscv/riscv/optincludes.yml

diff --git a/spec/build/bsps/riscv/objsbi.yml b/spec/build/bsps/riscv/objsbi.yml
new file mode 100644
index 0000000000..91b4e3249d
--- /dev/null
+++ b/spec/build/bsps/riscv/objsbi.yml
@@ -0,0 +1,17 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2026 Gedare Bloom
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/machine
+  source:
+  - contrib/bsps/sbi/sbi.h
+links: []
+source:
+- contrib/bsps/riscv/sbi/sbi.c
+type: build
diff --git a/spec/build/bsps/riscv/riscv/grp.yml b/spec/build/bsps/riscv/riscv/grp.yml
index 43f3a91bee..0643233f2c 100644
--- a/spec/build/bsps/riscv/riscv/grp.yml
+++ b/spec/build/bsps/riscv/riscv/grp.yml
@@ -34,6 +34,8 @@ links:
   uid: obj
 - role: build-dependency
   uid: objsmp
+- role: build-dependency
+  uid: ../objsbi
 - role: build-dependency
   uid: ../../objmem
 - role: build-dependency
@@ -68,6 +70,8 @@ links:
   uid: ../start
 - role: build-dependency
   uid: ../../bspopts
+- role: build-dependency
+  uid: optincludes
 type: build
 use-after: []
 use-before: []
diff --git a/spec/build/bsps/riscv/riscv/optincludes.yml b/spec/build/bsps/riscv/riscv/optincludes.yml
new file mode 100644
index 0000000000..f0a10e3bbb
--- /dev/null
+++ b/spec/build/bsps/riscv/riscv/optincludes.yml
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- set-value: |
+    bsps/include bsps/${ARCH}/include bsps/${ARCH}/${BSP_FAMILY}/include contrib/bsps/${ARCH}/include
+- substitute: null
+- split: null
+- env-assign: null
+build-type: option
+copyrights:
+- Copyright (C) 2026 Gedare Bloom
+default: []
+description: ''
+enabled-by: true
+links: []
+name: BSP_INCLUDES
+type: build