Refactored Ariane and Cheshire to use a shared mach definition

Signed-off-by: Matt Rossouw <[email protected]>
seL4 · Jan 23, 2025 · 9b921a6 · 9b921a6
1 parent ffdfa17
commit 9b921a6
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 323 deletions.
diff --git a/libplatsupport/CMakeLists.txt b/libplatsupport/CMakeLists.txt
@@ -38,6 +38,8 @@ config_choice(
 set(LibPlatSupportMach "")
 if(KernelPlatformRpi3 OR KernelPlatformRpi4)
     set(LibPlatSupportMach "bcm")
+elseif(KernelPlatformCheshire OR KernelPlatformAriane)
+    set(LibPlatSupportMach "cva6")
 elseif(NOT ${KernelArmMach} STREQUAL "")
     # falling back to kernel settings is done to keep legacy compatibility
     set(LibPlatSupportMach "${KernelArmMach}")

diff --git a/libplatsupport/src/plat/cheshire/chardev.c → libplatsupport/src/mach/cva6/chardev.c b/libplatsupport/src/plat/cheshire/chardev.c → libplatsupport/src/mach/cva6/chardev.c
diff --git a/libplatsupport/src/plat/cheshire/serial.c → libplatsupport/src/mach/cva6/serial.c b/libplatsupport/src/plat/cheshire/serial.c → libplatsupport/src/mach/cva6/serial.c
diff --git a/libplatsupport/src/plat/cheshire/apb_timer.c b/libplatsupport/src/plat/cheshire/apb_timer.c
diff --git a/libplatsupport/src/plat/cheshire/ltimer.c b/libplatsupport/src/plat/cheshire/ltimer.c