olofk · m42uko · May 5, 2026 · May 5, 2026
diff --git a/west.yml b/west.yml
@@ -5,5 +5,5 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: v4.0.0
+      revision: v4.4.0
       import: true
diff --git a/...yr/boards/riscv/service/Kconfig.defconfig → ...yr/boards/olofk/service/Kconfig.defconfig b/...yr/boards/riscv/service/Kconfig.defconfig → ...yr/boards/olofk/service/Kconfig.defconfig
diff --git a/zephyr/boards/riscv/service/Kconfig.board → zephyr/boards/olofk/service/Kconfig.service b/zephyr/boards/riscv/service/Kconfig.board → zephyr/boards/olofk/service/Kconfig.service
@@ -4,4 +4,4 @@
 
 config BOARD_SERVICE
 	bool "servant SoC for iCE40"
-	depends on SOC_RISCV32_SERVANT
+	select SOC_RISCV32_SERVANT
diff --git a/zephyr/boards/riscv/service/board.h → zephyr/boards/olofk/service/board.h b/zephyr/boards/riscv/service/board.h → zephyr/boards/olofk/service/board.h
diff --git a/zephyr/boards/olofk/service/board.yml b/zephyr/boards/olofk/service/board.yml
@@ -0,0 +1,6 @@
+board:
+  name: service
+  full_name: Servant
+  vendor: olofk
+  socs:
+    - name: servant
diff --git a/zephyr/boards/riscv/service/service.dts → zephyr/boards/olofk/service/service.dts b/zephyr/boards/riscv/service/service.dts → zephyr/boards/olofk/service/service.dts
@@ -9,6 +9,9 @@
 #include <serv.dtsi>
 
 / {
+	model = "Service";
+	compatible = "service";
+
 	chosen {
 		zephyr,sram = &ram;
 		zephyr,console = &uart0;
@@ -20,7 +23,7 @@
 	};
 
 	soc {
-		compatible = "olofk,serv";
+		compatible = "olofk,servant";
 		#address-cells = <1>;
 		#size-cells = <1>;
 
@@ -29,5 +32,17 @@
 			compatible = "olofk,serial";
 		};
 	};
-};
 
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu0: cpu@0 {
+			compatible = "riscv";
+			reg = <0>;
+			device_type = "cpu";
+			riscv,isa-base = "rv32i";
+			riscv,isa-extensions = "i", "zicsr", "zifencei";
+		};
+	};
+};
diff --git a/zephyr/boards/riscv/service/service.yaml → zephyr/boards/olofk/service/service.yml b/zephyr/boards/riscv/service/service.yaml → zephyr/boards/olofk/service/service.yml
diff --git a/...yr/boards/riscv/service/service_defconfig → ...yr/boards/olofk/service/service_defconfig b/...yr/boards/riscv/service/service_defconfig → ...yr/boards/olofk/service/service_defconfig
diff --git a/zephyr/soc/riscv/servant/CMakeLists.txt → zephyr/soc/olofk/servant/CMakeLists.txt b/zephyr/soc/riscv/servant/CMakeLists.txt → zephyr/soc/olofk/servant/CMakeLists.txt
@@ -4,5 +4,6 @@
 zephyr_sources(
     soc_irq.S
     vector.S
-    cpu_idle.c
     irq.c)
+
+set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "")
diff --git a/zephyr/soc/olofk/servant/Kconfig b/zephyr/soc/olofk/servant/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2021,2025 Henrik Brix Andersen <henrik@brixandersen.dk>
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_RISCV32_SERVANT
+	select RISCV
+	#select RISCV_PRIVILEGED
+	#select RISCV_SOC_HAS_GP_RELATIVE_ADDRESSING
+	select ATOMIC_OPERATIONS_C
+	select RISCV_ISA_EXT_ZICSR
+	imply XIP
diff --git a/zephyr/soc/riscv/servant/Kconfig.defconfig → zephyr/soc/olofk/servant/Kconfig.defconfig b/zephyr/soc/riscv/servant/Kconfig.defconfig → zephyr/soc/olofk/servant/Kconfig.defconfig
@@ -3,10 +3,6 @@
 
 if SOC_RISCV32_SERVANT
 
-config SOC
-	string
-	default "servant"
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	int
 	default 16000000
@@ -23,14 +19,6 @@ config SERV_TIMER
 	bool
 	default y
 
-config ARCH_HAS_CUSTOM_CPU_IDLE
-        bool
-        default y
-
-config ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
-        bool
-        default y
-
 config RISCV_SOC_EXCEPTION_FROM_IRQ
 	bool
 	default y

diff --git a/zephyr/soc/riscv/servant/Kconfig.soc → zephyr/soc/olofk/servant/Kconfig.soc b/zephyr/soc/riscv/servant/Kconfig.soc → zephyr/soc/olofk/servant/Kconfig.soc
@@ -3,6 +3,6 @@
 
 config SOC_RISCV32_SERVANT
 	bool "servant SoC"
-	select RISCV
-	select ATOMIC_OPERATIONS_C
-	select RISCV_ISA_EXT_ZICSR
+
+config SOC
+	default "servant" if SOC_RISCV32_SERVANT
diff --git a/zephyr/soc/riscv/servant/irq.c → zephyr/soc/olofk/servant/irq.c b/zephyr/soc/riscv/servant/irq.c → zephyr/soc/olofk/servant/irq.c
diff --git a/zephyr/soc/riscv/servant/linker.ld → zephyr/soc/olofk/servant/linker.ld b/zephyr/soc/riscv/servant/linker.ld → zephyr/soc/olofk/servant/linker.ld
diff --git a/zephyr/soc/riscv/servant/soc.h → zephyr/soc/olofk/servant/soc.h b/zephyr/soc/riscv/servant/soc.h → zephyr/soc/olofk/servant/soc.h
diff --git a/zephyr/soc/olofk/servant/soc.yml b/zephyr/soc/olofk/servant/soc.yml
@@ -0,0 +1,2 @@
+socs:
+  - name: servant
diff --git a/zephyr/soc/riscv/servant/soc_common.h → zephyr/soc/olofk/servant/soc_common.h b/zephyr/soc/riscv/servant/soc_common.h → zephyr/soc/olofk/servant/soc_common.h
diff --git a/zephyr/soc/riscv/servant/soc_irq.S → zephyr/soc/olofk/servant/soc_irq.S b/zephyr/soc/riscv/servant/soc_irq.S → zephyr/soc/olofk/servant/soc_irq.S
diff --git a/zephyr/soc/riscv/servant/vector.S → zephyr/soc/olofk/servant/vector.S b/zephyr/soc/riscv/servant/vector.S → zephyr/soc/olofk/servant/vector.S
diff --git a/zephyr/soc/riscv/servant/cpu_idle.c b/zephyr/soc/riscv/servant/cpu_idle.c