Update BSPs

Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>

7 files changed, 1123 insertions, 889 deletions

diff --git a/bsp/coreip-e24-arty/metal.h b/bsp/coreip-e24-arty/metal.h
index 0306e2c..19cdfaa 100644
--- a/bsp/coreip-e24-arty/metal.h
+++ b/bsp/coreip-e24-arty/metal.h
@@ -4,58 +4,69 @@
 #define COREIP_E24_ARTY__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
+
 #define __METAL_CLIC_SUBINTERRUPTS 169
 
-/* To Satisfy libmetal build */
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_INTERRUPT_CONTROLLER_2000000_INTERRUPTS 		3
-#define METAL_MAX_CLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_CLIC_SUBINTERRUPTS 169
+#define METAL_MAX_CLINT_INTERRUPTS 0
+
+#define METAL_MAX_PLIC_INTERRUPTS 0
+
+#define __METAL_INTERRUPT_CONTROLLER_2000000_INTERRUPTS 3
+
+#define METAL_MAX_CLIC_INTERRUPTS 3
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 127
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 127
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		127
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 4
 
-#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 		4
-#define METAL_MAX_GLOBAL_EXT_INTERRUPTS	 __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 4
 
-#define __METAL_GPIO_20002000_INTERRUPTS 		16
-#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_20002000_INTERRUPTS
+#define __METAL_GPIO_20002000_INTERRUPTS 16
 
-#define __METAL_SERIAL_20000000_INTERRUPTS 		1
-#define METAL_MAX_UART_INTERRUPTS 		 1
+#define METAL_MAX_GPIO_INTERRUPTS 16
 
+#define __METAL_SERIAL_20000000_INTERRUPTS 1
+
+#define METAL_MAX_UART_INTERRUPTS 1
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,cpu.h>
+#include <metal/pmp.h>
 #include <metal/drivers/sifive,clic0.h>
-#include <metal/drivers/fixed-clock.h>
-#include <metal/drivers/sifive,gpio0.h>
-#include <metal/drivers/sifive,uart0.h>
 #include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,global-external-interrupts0.h>
-#include <metal/drivers/sifive,gpio-leds.h>
+#include <metal/drivers/sifive,gpio0.h>
 #include <metal/drivers/sifive,gpio-buttons.h>
+#include <metal/drivers/sifive,gpio-leds.h>
 #include <metal/drivers/sifive,gpio-switches.h>
+#include <metal/drivers/sifive,spi0.h>
 #include <metal/drivers/sifive,test0.h>
+#include <metal/drivers/sifive,uart0.h>
+
+/* From clock@0 */
+asm (".weak __metal_dt_clock_0");
+struct __metal_driver_fixed_clock __metal_dt_clock_0;
+
 /* From cpu@0 */
 asm (".weak __metal_dt_cpu_0");
 struct __metal_driver_cpu __metal_dt_cpu_0;
 
-/* From interrupt_controller@2000000 */
-asm (".weak __metal_dt_interrupt_controller_2000000");
-struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000;
-
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
-/* From clock@0 */
-asm (".weak __metal_dt_clock_0");
-struct __metal_driver_fixed_clock __metal_dt_clock_0;
+/* From interrupt_controller@2000000 */
+asm (".weak __metal_dt_interrupt_controller_2000000");
+struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000;
 
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
@@ -69,22 +80,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
 asm (".weak __metal_dt_gpio_20002000");
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000;
 
-/* From serial@20000000 */
-asm (".weak __metal_dt_serial_20000000");
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
-
-/* From led@0red */
-asm (".weak __metal_dt_led_0red");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
-
-/* From led@0green */
-asm (".weak __metal_dt_led_0green");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
-
-/* From led@0blue */
-asm (".weak __metal_dt_led_0blue");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
-
 /* From button@0 */
 asm (".weak __metal_dt_button_0");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0;
@@ -101,6 +96,18 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_2;
 asm (".weak __metal_dt_button_3");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_3;
 
+/* From led@0red */
+asm (".weak __metal_dt_led_0red");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
+
+/* From led@0green */
+asm (".weak __metal_dt_led_0green");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
+
+/* From led@0blue */
+asm (".weak __metal_dt_led_0blue");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
+
 /* From switch@0 */
 asm (".weak __metal_dt_switch_0");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0;
@@ -117,22 +124,18 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2;
 asm (".weak __metal_dt_switch_3");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3;
 
+/* From spi@20004000 */
+asm (".weak __metal_dt_spi_20004000");
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000;
+
 /* From teststatus@4000 */
 asm (".weak __metal_dt_teststatus_4000");
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
 
-/* From cpu@0 */
-struct __metal_driver_cpu __metal_dt_cpu_0 = {
-    .vtable = &__metal_driver_vtable_cpu,
-    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
-};
-
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+/* From serial@20000000 */
+asm (".weak __metal_dt_serial_20000000");
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
 
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
@@ -141,6 +144,14 @@ struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
     .rate = 32500000UL,
 };
 
+/* From cpu@0 */
+struct __metal_driver_cpu __metal_dt_cpu_0 = {
+    .vtable = &__metal_driver_vtable_cpu,
+    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
+    .timebase = 1000000UL,
+    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
+};
+
 /* From interrupt_controller */
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .vtable = &__metal_driver_vtable_riscv_cpu_intc,
@@ -149,11 +160,6 @@ struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .interrupt_controller = 1,
 };
 
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
 /* From interrupt_controller@2000000 */
 struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000 = {
     .vtable = &__metal_driver_vtable_sifive_clic0,
@@ -172,11 +178,6 @@ struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000 = {
     .interrupt_controller = 1,
 };
 
-/* From interrupt_controller@2000000 */
-#define __METAL_DT_SIFIVE_CLIC0_HANDLE (&__metal_dt_interrupt_controller_2000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_2000000_HANDLE (&__metal_dt_interrupt_controller_2000000.controller)
-
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
     .vtable = &__metal_driver_vtable_sifive_local_external_interrupts0,
@@ -314,11 +315,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[126] = 152,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
 /* From global_external_interrupts */
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
     .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
@@ -333,11 +329,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
     .interrupt_lines[3] = 25,
 };
 
-/* From global_external_interrupts */
-#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
 /* From gpio@20002000 */
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .vtable = &__metal_driver_vtable_sifive_gpio0,
@@ -364,51 +355,6 @@ struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .interrupt_lines[15] = 15,
 };
 
-/* From serial@20000000 */
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
-    .vtable = &__metal_driver_vtable_sifive_uart0,
-    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
-    .control_base = 536870912UL,
-    .control_size = 4096UL,
-/* From clock@0 */
-    .clock = &__metal_dt_clock_0.clock,
-    .pinmux = NULL,
-/* From interrupt_controller@2000000 */
-    .interrupt_parent = &__metal_dt_interrupt_controller_2000000.controller,
-    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
-    .interrupt_line = 16UL,
-};
-
-/* From led@0red */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 0UL,
-    .label = "LD0red",
-};
-
-/* From led@0green */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 1UL,
-    .label = "LD0green",
-};
-
-/* From led@0blue */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 2UL,
-    .label = "LD0blue",
-};
-
 /* From button@0 */
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0 = {
     .vtable = &__metal_driver_vtable_sifive_button,
@@ -461,10 +407,42 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_3 = {
     .label = "BTN3",
 };
 
+/* From led@0red */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 0UL,
+    .label = "LD0red",
+};
+
+/* From led@0green */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 1UL,
+    .label = "LD0green",
+};
+
+/* From led@0blue */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 2UL,
+    .label = "LD0blue",
+};
+
 /* From switch@0 */
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 0UL,
@@ -475,6 +453,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 1UL,
@@ -485,6 +465,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 2UL,
@@ -495,12 +477,24 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
     .interrupt_line = 8UL,
     .label = "SW3",
 };
 
+/* From spi@20004000 */
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000 = {
+    .vtable = &__metal_driver_vtable_sifive_spi0,
+    .spi.vtable = &__metal_driver_vtable_sifive_spi0.spi,
+    .control_base = 536887296UL,
+    .control_size = 4096UL,
+    .clock = NULL,
+    .pinmux = NULL,
+};
+
 /* From teststatus@4000 */
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .vtable = &__metal_driver_vtable_sifive_test0,
@@ -509,10 +503,21 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .size = 4096UL,
 };
 
-/* From teststatus@4000 */
-#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+/* From serial@20000000 */
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
+    .vtable = &__metal_driver_vtable_sifive_uart0,
+    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
+    .control_base = 536870912UL,
+    .control_size = 4096UL,
+/* From clock@0 */
+    .clock = &__metal_dt_clock_0.clock,
+    .pinmux = NULL,
+/* From interrupt_controller@2000000 */
+    .interrupt_parent = &__metal_dt_interrupt_controller_2000000.controller,
+    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
+    .interrupt_line = 16UL,
+};
 
-#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
 /* From serial@20000000 */
 #define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_20000000.uart)
@@ -521,19 +526,36 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
 
 #define __METAL_DT_STDOUT_UART_BAUD 115200
 
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
+
 #define __METAL_DT_MAX_HARTS 1
 
 asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 3
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					&__metal_dt_led_0red,
-					&__metal_dt_led_0green,
-					&__metal_dt_led_0blue};
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@2000000 */
+#define __METAL_DT_SIFIVE_CLIC0_HANDLE (&__metal_dt_interrupt_controller_2000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_2000000_HANDLE (&__metal_dt_interrupt_controller_2000000.controller)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+/* From global_external_interrupts */
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
+
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
 
 #define __METAL_DT_MAX_BUTTONS 4
 
@@ -544,6 +566,14 @@ struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					&__metal_dt_button_2,
 					&__metal_dt_button_3};
 
+#define __METAL_DT_MAX_LEDS 3
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					&__metal_dt_led_0red,
+					&__metal_dt_led_0green,
+					&__metal_dt_led_0blue};
+
 #define __METAL_DT_MAX_SWITCHES 4
 
 asm (".weak __metal_switch_table");
@@ -553,8 +583,18 @@ struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					&__metal_dt_switch_2,
 					&__metal_dt_switch_3};
 
-#endif
+#define __METAL_DT_MAX_SPIS 1
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					&__metal_dt_spi_20004000};
+
+/* From teststatus@4000 */
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#endif /*METAL__MACHINE__COREIP_E24_ARTY__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* COREIP_E24_ARTY__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/coreip-e31-arty/metal.h b/bsp/coreip-e31-arty/metal.h
index 564414b..8c2ead9 100644
--- a/bsp/coreip-e31-arty/metal.h
+++ b/bsp/coreip-e31-arty/metal.h
@@ -4,63 +4,77 @@
 #define COREIP_E31_ARTY__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 		4
-#define METAL_MAX_GLOBAL_EXT_INTERRUPTS	 __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#define __METAL_GPIO_20002000_INTERRUPTS 		16
-#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_20002000_INTERRUPTS
+#define METAL_MAX_PLIC_INTERRUPTS 1
 
-#define __METAL_SERIAL_20000000_INTERRUPTS 		1
-#define METAL_MAX_UART_INTERRUPTS 		 1
+#define METAL_MAX_CLIC_INTERRUPTS 0
 
-#include <metal/drivers/riscv,cpu.h>
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 4
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 4
+
+#define __METAL_GPIO_20002000_INTERRUPTS 16
+
+#define METAL_MAX_GPIO_INTERRUPTS 16
+
+#define __METAL_SERIAL_20000000_INTERRUPTS 1
+
+#define METAL_MAX_UART_INTERRUPTS 1
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
-#include <metal/drivers/fixed-clock.h>
-#include <metal/drivers/sifive,gpio0.h>
-#include <metal/drivers/sifive,uart0.h>
 #include <metal/pmp.h>
 #include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,global-external-interrupts0.h>
-#include <metal/drivers/sifive,gpio-leds.h>
+#include <metal/drivers/sifive,gpio0.h>
 #include <metal/drivers/sifive,gpio-buttons.h>
+#include <metal/drivers/sifive,gpio-leds.h>
 #include <metal/drivers/sifive,gpio-switches.h>
+#include <metal/drivers/sifive,spi0.h>
 #include <metal/drivers/sifive,test0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
+#include <metal/drivers/sifive,uart0.h>
+
+/* From clock@0 */
+asm (".weak __metal_dt_clock_0");
+struct __metal_driver_fixed_clock __metal_dt_clock_0;
 
 /* From clint@2000000 */
 asm (".weak __metal_dt_clint_2000000");
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
-/* From clock@0 */
-asm (".weak __metal_dt_clock_0");
-struct __metal_driver_fixed_clock __metal_dt_clock_0;
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+
+asm (".weak __metal_dt_pmp_0");
+struct metal_pmp __metal_dt_pmp_0;
 
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
@@ -74,25 +88,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
 asm (".weak __metal_dt_gpio_20002000");
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000;
 
-/* From serial@20000000 */
-asm (".weak __metal_dt_serial_20000000");
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
-
-asm (".weak __metal_dt_pmp_0");
-struct metal_pmp __metal_dt_pmp_0;
-
-/* From led@0red */
-asm (".weak __metal_dt_led_0red");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
-
-/* From led@0green */
-asm (".weak __metal_dt_led_0green");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
-
-/* From led@0blue */
-asm (".weak __metal_dt_led_0blue");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
-
 /* From button@0 */
 asm (".weak __metal_dt_button_0");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0;
@@ -109,6 +104,18 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_2;
 asm (".weak __metal_dt_button_3");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_3;
 
+/* From led@0red */
+asm (".weak __metal_dt_led_0red");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
+
+/* From led@0green */
+asm (".weak __metal_dt_led_0green");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
+
+/* From led@0blue */
+asm (".weak __metal_dt_led_0blue");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
+
 /* From switch@0 */
 asm (".weak __metal_dt_switch_0");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0;
@@ -125,22 +132,18 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2;
 asm (".weak __metal_dt_switch_3");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3;
 
+/* From spi@20004000 */
+asm (".weak __metal_dt_spi_20004000");
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000;
+
 /* From teststatus@4000 */
 asm (".weak __metal_dt_teststatus_4000");
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
 
-/* From cpu@0 */
-struct __metal_driver_cpu __metal_dt_cpu_0 = {
-    .vtable = &__metal_driver_vtable_cpu,
-    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
-};
-
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+/* From serial@20000000 */
+asm (".weak __metal_dt_serial_20000000");
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
 
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
@@ -149,19 +152,6 @@ struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
     .rate = 32500000UL,
 };
 
-/* From interrupt_controller */
-struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
-    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
-    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
-    .init_done = 0,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
 /* From clint@2000000 */
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .vtable = &__metal_driver_vtable_riscv_clint0,
@@ -175,10 +165,41 @@ struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .interrupt_lines[1] = 7,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From cpu@0 */
+struct __metal_driver_cpu __metal_dt_cpu_0 = {
+    .vtable = &__metal_driver_vtable_cpu,
+    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
+    .timebase = 1000000UL,
+    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
+};
 
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From interrupt_controller */
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
+    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
+    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
+    .init_done = 0,
+    .interrupt_controller = 1,
+};
+
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
+    .init_done = 0,
+/* From interrupt_controller */
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 26UL,
+    .interrupt_controller = 1,
+};
+
+/* From pmp@0 */
+struct metal_pmp __metal_dt_pmp_0 = {
+    .num_regions = 8UL,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -206,31 +227,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 26UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
 /* From global_external_interrupts */
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
     .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
@@ -245,11 +241,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
     .interrupt_lines[3] = 4,
 };
 
-/* From global_external_interrupts */
-#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
 /* From gpio@20002000 */
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .vtable = &__metal_driver_vtable_sifive_gpio0,
@@ -276,51 +267,6 @@ struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .interrupt_lines[15] = 22,
 };
 
-/* From serial@20000000 */
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
-    .vtable = &__metal_driver_vtable_sifive_uart0,
-    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
-    .control_base = 536870912UL,
-    .control_size = 4096UL,
-/* From clock@0 */
-    .clock = &__metal_dt_clock_0.clock,
-    .pinmux = NULL,
-/* From interrupt_controller@c000000 */
-    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
-    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
-    .interrupt_line = 5UL,
-};
-
-/* From led@0red */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 0UL,
-    .label = "LD0red",
-};
-
-/* From led@0green */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 1UL,
-    .label = "LD0green",
-};
-
-/* From led@0blue */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 2UL,
-    .label = "LD0blue",
-};
-
 /* From button@0 */
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0 = {
     .vtable = &__metal_driver_vtable_sifive_button,
@@ -373,10 +319,42 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_3 = {
     .label = "BTN3",
 };
 
+/* From led@0red */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 0UL,
+    .label = "LD0red",
+};
+
+/* From led@0green */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 1UL,
+    .label = "LD0green",
+};
+
+/* From led@0blue */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 2UL,
+    .label = "LD0blue",
+};
+
 /* From switch@0 */
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 0UL,
@@ -387,6 +365,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 1UL,
@@ -397,6 +377,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 2UL,
@@ -407,19 +389,24 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
     .interrupt_line = 3UL,
     .label = "SW3",
 };
 
-/* From pmp@0 */
-struct metal_pmp __metal_dt_pmp_0 = {
-    .num_regions = 8UL,
+/* From spi@20004000 */
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000 = {
+    .vtable = &__metal_driver_vtable_sifive_spi0,
+    .spi.vtable = &__metal_driver_vtable_sifive_spi0.spi,
+    .control_base = 536887296UL,
+    .control_size = 4096UL,
+    .clock = NULL,
+    .pinmux = NULL,
 };
 
-#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
-
 /* From teststatus@4000 */
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .vtable = &__metal_driver_vtable_sifive_test0,
@@ -428,10 +415,21 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .size = 4096UL,
 };
 
-/* From teststatus@4000 */
-#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+/* From serial@20000000 */
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
+    .vtable = &__metal_driver_vtable_sifive_uart0,
+    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
+    .control_base = 536870912UL,
+    .control_size = 4096UL,
+/* From clock@0 */
+    .clock = &__metal_dt_clock_0.clock,
+    .pinmux = NULL,
+/* From interrupt_controller@c000000 */
+    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
+    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
+    .interrupt_line = 5UL,
+};
 
-#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
 /* From serial@20000000 */
 #define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_20000000.uart)
@@ -440,19 +438,44 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
 
 #define __METAL_DT_STDOUT_UART_BAUD 115200
 
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
+
 #define __METAL_DT_MAX_HARTS 1
 
 asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 3
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					&__metal_dt_led_0red,
-					&__metal_dt_led_0green,
-					&__metal_dt_led_0blue};
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From pmp@0 */
+#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+/* From global_external_interrupts */
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
+
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
 
 #define __METAL_DT_MAX_BUTTONS 4
 
@@ -463,6 +486,14 @@ struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					&__metal_dt_button_2,
 					&__metal_dt_button_3};
 
+#define __METAL_DT_MAX_LEDS 3
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					&__metal_dt_led_0red,
+					&__metal_dt_led_0green,
+					&__metal_dt_led_0blue};
+
 #define __METAL_DT_MAX_SWITCHES 4
 
 asm (".weak __metal_switch_table");
@@ -472,8 +503,18 @@ struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					&__metal_dt_switch_2,
 					&__metal_dt_switch_3};
 
-#endif
+#define __METAL_DT_MAX_SPIS 1
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					&__metal_dt_spi_20004000};
+
+/* From teststatus@4000 */
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#endif /*METAL__MACHINE__COREIP_E31_ARTY__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* COREIP_E31_ARTY__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/coreip-e31/metal.h b/bsp/coreip-e31/metal.h
index cf0fb4f..d2c696b 100644
--- a/bsp/coreip-e31/metal.h
+++ b/bsp/coreip-e31/metal.h
@@ -4,48 +4,64 @@
 #define COREIP_E31__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 		127
-#define METAL_MAX_GLOBAL_EXT_INTERRUPTS	 __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#include <metal/drivers/riscv,cpu.h>
+#define METAL_MAX_PLIC_INTERRUPTS 1
+
+#define METAL_MAX_CLIC_INTERRUPTS 0
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 127
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 127
+
+#define METAL_MAX_GPIO_INTERRUPTS 0
+
+#define METAL_MAX_UART_INTERRUPTS 0
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
 #include <metal/pmp.h>
 #include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,global-external-interrupts0.h>
 #include <metal/drivers/sifive,test0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From clint@2000000 */
 asm (".weak __metal_dt_clint_2000000");
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+
+asm (".weak __metal_dt_pmp_0");
+struct metal_pmp __metal_dt_pmp_0;
+
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0;
@@ -54,13 +70,24 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
 asm (".weak __metal_dt_global_external_interrupts");
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts;
 
-asm (".weak __metal_dt_pmp_0");
-struct metal_pmp __metal_dt_pmp_0;
-
 /* From teststatus@4000 */
 asm (".weak __metal_dt_teststatus_4000");
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
 
+
+/* From clint@2000000 */
+struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
+    .vtable = &__metal_driver_vtable_riscv_clint0,
+    .controller.vtable = &__metal_driver_vtable_riscv_clint0.clint_vtable,
+    .control_base = 33554432UL,
+    .control_size = 65536UL,
+    .init_done = 0,
+    .num_interrupts = METAL_MAX_CLINT_INTERRUPTS,
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_lines[0] = 3,
+    .interrupt_lines[1] = 7,
+};
+
 /* From cpu@0 */
 struct __metal_driver_cpu __metal_dt_cpu_0 = {
     .vtable = &__metal_driver_vtable_cpu,
@@ -69,11 +96,6 @@ struct __metal_driver_cpu __metal_dt_cpu_0 = {
     .interrupt_controller = &__metal_dt_interrupt_controller.controller,
 };
 
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
-
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
-
 /* From interrupt_controller */
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .vtable = &__metal_driver_vtable_riscv_cpu_intc,
@@ -82,28 +104,25 @@ struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .interrupt_controller = 1,
 };
 
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-/* From clint@2000000 */
-struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
-    .vtable = &__metal_driver_vtable_riscv_clint0,
-    .controller.vtable = &__metal_driver_vtable_riscv_clint0.clint_vtable,
-    .control_base = 33554432UL,
-    .control_size = 65536UL,
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
-    .num_interrupts = METAL_MAX_CLINT_INTERRUPTS,
+/* From interrupt_controller */
     .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_lines[0] = 3,
-    .interrupt_lines[1] = 7,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 127UL,
+    .interrupt_controller = 1,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
-
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From pmp@0 */
+struct metal_pmp __metal_dt_pmp_0 = {
+    .num_regions = 8UL,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -131,31 +150,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 127UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
 /* From global_external_interrupts */
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
     .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
@@ -293,18 +287,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
     .interrupt_lines[126] = 127,
 };
 
-/* From global_external_interrupts */
-#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-/* From pmp@0 */
-struct metal_pmp __metal_dt_pmp_0 = {
-    .num_regions = 8UL,
-};
-
-#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
-
 /* From teststatus@4000 */
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .vtable = &__metal_driver_vtable_sifive_test0,
@@ -313,10 +295,16 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .size = 4096UL,
 };
 
-/* From teststatus@4000 */
-#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 #define __METAL_DT_MAX_HARTS 1
 
@@ -324,23 +312,55 @@ asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 0
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From pmp@0 */
+#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+/* From global_external_interrupts */
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
+
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					NULL };
 #define __METAL_DT_MAX_BUTTONS 0
 
 asm (".weak __metal_button_table");
 struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					NULL };
+#define __METAL_DT_MAX_LEDS 0
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					NULL };
 #define __METAL_DT_MAX_SWITCHES 0
 
 asm (".weak __metal_switch_table");
 struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					NULL };
-#endif
+#define __METAL_DT_MAX_SPIS 0
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					NULL };
+/* From teststatus@4000 */
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#endif /*METAL__MACHINE__COREIP_E31__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* COREIP_E31__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/coreip-s51-arty/metal.h b/bsp/coreip-s51-arty/metal.h
index 6d90081..4ee37f3 100644
--- a/bsp/coreip-s51-arty/metal.h
+++ b/bsp/coreip-s51-arty/metal.h
@@ -4,63 +4,77 @@
 #define COREIP_S51_ARTY__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 		4
-#define METAL_MAX_GLOBAL_EXT_INTERRUPTS	 __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#define __METAL_GPIO_20002000_INTERRUPTS 		16
-#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_20002000_INTERRUPTS
+#define METAL_MAX_PLIC_INTERRUPTS 1
 
-#define __METAL_SERIAL_20000000_INTERRUPTS 		1
-#define METAL_MAX_UART_INTERRUPTS 		 1
+#define METAL_MAX_CLIC_INTERRUPTS 0
 
-#include <metal/drivers/riscv,cpu.h>
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 4
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 4
+
+#define __METAL_GPIO_20002000_INTERRUPTS 16
+
+#define METAL_MAX_GPIO_INTERRUPTS 16
+
+#define __METAL_SERIAL_20000000_INTERRUPTS 1
+
+#define METAL_MAX_UART_INTERRUPTS 1
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
-#include <metal/drivers/fixed-clock.h>
-#include <metal/drivers/sifive,gpio0.h>
-#include <metal/drivers/sifive,uart0.h>
 #include <metal/pmp.h>
 #include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,global-external-interrupts0.h>
-#include <metal/drivers/sifive,gpio-leds.h>
+#include <metal/drivers/sifive,gpio0.h>
 #include <metal/drivers/sifive,gpio-buttons.h>
+#include <metal/drivers/sifive,gpio-leds.h>
 #include <metal/drivers/sifive,gpio-switches.h>
+#include <metal/drivers/sifive,spi0.h>
 #include <metal/drivers/sifive,test0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
+#include <metal/drivers/sifive,uart0.h>
+
+/* From clock@0 */
+asm (".weak __metal_dt_clock_0");
+struct __metal_driver_fixed_clock __metal_dt_clock_0;
 
 /* From clint@2000000 */
 asm (".weak __metal_dt_clint_2000000");
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
-/* From clock@0 */
-asm (".weak __metal_dt_clock_0");
-struct __metal_driver_fixed_clock __metal_dt_clock_0;
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+
+asm (".weak __metal_dt_pmp_0");
+struct metal_pmp __metal_dt_pmp_0;
 
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
@@ -74,25 +88,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
 asm (".weak __metal_dt_gpio_20002000");
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000;
 
-/* From serial@20000000 */
-asm (".weak __metal_dt_serial_20000000");
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
-
-asm (".weak __metal_dt_pmp_0");
-struct metal_pmp __metal_dt_pmp_0;
-
-/* From led@0red */
-asm (".weak __metal_dt_led_0red");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
-
-/* From led@0green */
-asm (".weak __metal_dt_led_0green");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
-
-/* From led@0blue */
-asm (".weak __metal_dt_led_0blue");
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
-
 /* From button@0 */
 asm (".weak __metal_dt_button_0");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0;
@@ -109,6 +104,18 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_2;
 asm (".weak __metal_dt_button_3");
 struct __metal_driver_sifive_gpio_button __metal_dt_button_3;
 
+/* From led@0red */
+asm (".weak __metal_dt_led_0red");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red;
+
+/* From led@0green */
+asm (".weak __metal_dt_led_0green");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green;
+
+/* From led@0blue */
+asm (".weak __metal_dt_led_0blue");
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue;
+
 /* From switch@0 */
 asm (".weak __metal_dt_switch_0");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0;
@@ -125,22 +132,18 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2;
 asm (".weak __metal_dt_switch_3");
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3;
 
+/* From spi@20004000 */
+asm (".weak __metal_dt_spi_20004000");
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000;
+
 /* From teststatus@4000 */
 asm (".weak __metal_dt_teststatus_4000");
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
 
-/* From cpu@0 */
-struct __metal_driver_cpu __metal_dt_cpu_0 = {
-    .vtable = &__metal_driver_vtable_cpu,
-    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
-};
-
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+/* From serial@20000000 */
+asm (".weak __metal_dt_serial_20000000");
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000;
 
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
@@ -149,19 +152,6 @@ struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
     .rate = 32500000UL,
 };
 
-/* From interrupt_controller */
-struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
-    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
-    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
-    .init_done = 0,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
 /* From clint@2000000 */
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .vtable = &__metal_driver_vtable_riscv_clint0,
@@ -175,10 +165,41 @@ struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .interrupt_lines[1] = 7,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From cpu@0 */
+struct __metal_driver_cpu __metal_dt_cpu_0 = {
+    .vtable = &__metal_driver_vtable_cpu,
+    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
+    .timebase = 1000000UL,
+    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
+};
 
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From interrupt_controller */
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
+    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
+    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
+    .init_done = 0,
+    .interrupt_controller = 1,
+};
+
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
+    .init_done = 0,
+/* From interrupt_controller */
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 26UL,
+    .interrupt_controller = 1,
+};
+
+/* From pmp@0 */
+struct metal_pmp __metal_dt_pmp_0 = {
+    .num_regions = 8UL,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -206,31 +227,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 26UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
 /* From global_external_interrupts */
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
     .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
@@ -245,11 +241,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
     .interrupt_lines[3] = 4,
 };
 
-/* From global_external_interrupts */
-#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
 /* From gpio@20002000 */
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .vtable = &__metal_driver_vtable_sifive_gpio0,
@@ -276,51 +267,6 @@ struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = {
     .interrupt_lines[15] = 22,
 };
 
-/* From serial@20000000 */
-struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
-    .vtable = &__metal_driver_vtable_sifive_uart0,
-    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
-    .control_base = 536870912UL,
-    .control_size = 4096UL,
-/* From clock@0 */
-    .clock = &__metal_dt_clock_0.clock,
-    .pinmux = NULL,
-/* From interrupt_controller@c000000 */
-    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
-    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
-    .interrupt_line = 5UL,
-};
-
-/* From led@0red */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 0UL,
-    .label = "LD0red",
-};
-
-/* From led@0green */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 1UL,
-    .label = "LD0green",
-};
-
-/* From led@0blue */
-struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
-    .vtable = &__metal_driver_vtable_sifive_led,
-    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
-/* From gpio@20002000 */
-    .gpio = &__metal_dt_gpio_20002000,
-    .pin = 2UL,
-    .label = "LD0blue",
-};
-
 /* From button@0 */
 struct __metal_driver_sifive_gpio_button __metal_dt_button_0 = {
     .vtable = &__metal_driver_vtable_sifive_button,
@@ -373,10 +319,42 @@ struct __metal_driver_sifive_gpio_button __metal_dt_button_3 = {
     .label = "BTN3",
 };
 
+/* From led@0red */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0red = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 0UL,
+    .label = "LD0red",
+};
+
+/* From led@0green */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0green = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 1UL,
+    .label = "LD0green",
+};
+
+/* From led@0blue */
+struct __metal_driver_sifive_gpio_led __metal_dt_led_0blue = {
+    .vtable = &__metal_driver_vtable_sifive_led,
+    .led.vtable = &__metal_driver_vtable_sifive_led.led_vtable,
+/* From gpio@20002000 */
+    .gpio = &__metal_dt_gpio_20002000,
+    .pin = 2UL,
+    .label = "LD0blue",
+};
+
 /* From switch@0 */
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 0UL,
@@ -387,6 +365,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_0 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 1UL,
@@ -397,6 +377,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_1 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From global_external_interrupts */
     .interrupt_parent = &__metal_dt_global_external_interrupts.irc,
     .interrupt_line = 2UL,
@@ -407,19 +389,24 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_2 = {
 struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3 = {
     .vtable = &__metal_driver_vtable_sifive_switch,
     .flip.vtable = &__metal_driver_vtable_sifive_switch.switch_vtable,
+    .gpio = NULL,
+    .pin = 0,
 /* From local_external_interrupts_0 */
     .interrupt_parent = &__metal_dt_local_external_interrupts_0.irc,
     .interrupt_line = 3UL,
     .label = "SW3",
 };
 
-/* From pmp@0 */
-struct metal_pmp __metal_dt_pmp_0 = {
-    .num_regions = 8UL,
+/* From spi@20004000 */
+struct __metal_driver_sifive_spi0 __metal_dt_spi_20004000 = {
+    .vtable = &__metal_driver_vtable_sifive_spi0,
+    .spi.vtable = &__metal_driver_vtable_sifive_spi0.spi,
+    .control_base = 536887296UL,
+    .control_size = 4096UL,
+    .clock = NULL,
+    .pinmux = NULL,
 };
 
-#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
-
 /* From teststatus@4000 */
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .vtable = &__metal_driver_vtable_sifive_test0,
@@ -428,10 +415,21 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .size = 4096UL,
 };
 
-/* From teststatus@4000 */
-#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+/* From serial@20000000 */
+struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000 = {
+    .vtable = &__metal_driver_vtable_sifive_uart0,
+    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
+    .control_base = 536870912UL,
+    .control_size = 4096UL,
+/* From clock@0 */
+    .clock = &__metal_dt_clock_0.clock,
+    .pinmux = NULL,
+/* From interrupt_controller@c000000 */
+    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
+    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
+    .interrupt_line = 5UL,
+};
 
-#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
 /* From serial@20000000 */
 #define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_20000000.uart)
@@ -440,19 +438,44 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
 
 #define __METAL_DT_STDOUT_UART_BAUD 115200
 
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
+
 #define __METAL_DT_MAX_HARTS 1
 
 asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 3
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					&__metal_dt_led_0red,
-					&__metal_dt_led_0green,
-					&__metal_dt_led_0blue};
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From pmp@0 */
+#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+/* From global_external_interrupts */
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
+
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
 
 #define __METAL_DT_MAX_BUTTONS 4
 
@@ -463,6 +486,14 @@ struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					&__metal_dt_button_2,
 					&__metal_dt_button_3};
 
+#define __METAL_DT_MAX_LEDS 3
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					&__metal_dt_led_0red,
+					&__metal_dt_led_0green,
+					&__metal_dt_led_0blue};
+
 #define __METAL_DT_MAX_SWITCHES 4
 
 asm (".weak __metal_switch_table");
@@ -472,8 +503,18 @@ struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					&__metal_dt_switch_2,
 					&__metal_dt_switch_3};
 
-#endif
+#define __METAL_DT_MAX_SPIS 1
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					&__metal_dt_spi_20004000};
+
+/* From teststatus@4000 */
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#endif /*METAL__MACHINE__COREIP_S51_ARTY__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* COREIP_S51_ARTY__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/coreip-s51/metal.h b/bsp/coreip-s51/metal.h
index 07c59cf..6ee7908 100644
--- a/bsp/coreip-s51/metal.h
+++ b/bsp/coreip-s51/metal.h
@@ -4,48 +4,64 @@
 #define COREIP_S51__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 		255
-#define METAL_MAX_GLOBAL_EXT_INTERRUPTS	 __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#include <metal/drivers/riscv,cpu.h>
+#define METAL_MAX_PLIC_INTERRUPTS 1
+
+#define METAL_MAX_CLIC_INTERRUPTS 0
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 255
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 255
+
+#define METAL_MAX_GPIO_INTERRUPTS 0
+
+#define METAL_MAX_UART_INTERRUPTS 0
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
 #include <metal/pmp.h>
 #include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,global-external-interrupts0.h>
 #include <metal/drivers/sifive,test0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From clint@2000000 */
 asm (".weak __metal_dt_clint_2000000");
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+
+asm (".weak __metal_dt_pmp_0");
+struct metal_pmp __metal_dt_pmp_0;
+
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0;
@@ -54,13 +70,24 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
 asm (".weak __metal_dt_global_external_interrupts");
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts;
 
-asm (".weak __metal_dt_pmp_0");
-struct metal_pmp __metal_dt_pmp_0;
-
 /* From teststatus@4000 */
 asm (".weak __metal_dt_teststatus_4000");
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
 
+
+/* From clint@2000000 */
+struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
+    .vtable = &__metal_driver_vtable_riscv_clint0,
+    .controller.vtable = &__metal_driver_vtable_riscv_clint0.clint_vtable,
+    .control_base = 33554432UL,
+    .control_size = 65536UL,
+    .init_done = 0,
+    .num_interrupts = METAL_MAX_CLINT_INTERRUPTS,
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_lines[0] = 3,
+    .interrupt_lines[1] = 7,
+};
+
 /* From cpu@0 */
 struct __metal_driver_cpu __metal_dt_cpu_0 = {
     .vtable = &__metal_driver_vtable_cpu,
@@ -69,11 +96,6 @@ struct __metal_driver_cpu __metal_dt_cpu_0 = {
     .interrupt_controller = &__metal_dt_interrupt_controller.controller,
 };
 
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
-
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
-
 /* From interrupt_controller */
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .vtable = &__metal_driver_vtable_riscv_cpu_intc,
@@ -82,28 +104,25 @@ struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
     .interrupt_controller = 1,
 };
 
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-/* From clint@2000000 */
-struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
-    .vtable = &__metal_driver_vtable_riscv_clint0,
-    .controller.vtable = &__metal_driver_vtable_riscv_clint0.clint_vtable,
-    .control_base = 33554432UL,
-    .control_size = 65536UL,
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
     .init_done = 0,
-    .num_interrupts = METAL_MAX_CLINT_INTERRUPTS,
+/* From interrupt_controller */
     .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_lines[0] = 3,
-    .interrupt_lines[1] = 7,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 255UL,
+    .interrupt_controller = 1,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
-
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From pmp@0 */
+struct metal_pmp __metal_dt_pmp_0 = {
+    .num_regions = 8UL,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -131,31 +150,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 255UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
 /* From global_external_interrupts */
 struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
     .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
@@ -421,18 +415,6 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter
     .interrupt_lines[254] = 255,
 };
 
-/* From global_external_interrupts */
-#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
-
-/* From pmp@0 */
-struct metal_pmp __metal_dt_pmp_0 = {
-    .num_regions = 8UL,
-};
-
-#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
-
 /* From teststatus@4000 */
 struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .vtable = &__metal_driver_vtable_sifive_test0,
@@ -441,10 +423,16 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
     .size = 4096UL,
 };
 
-/* From teststatus@4000 */
-#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 #define __METAL_DT_MAX_HARTS 1
 
@@ -452,23 +440,55 @@ asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 0
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From pmp@0 */
+#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+/* From global_external_interrupts */
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
+
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					NULL };
 #define __METAL_DT_MAX_BUTTONS 0
 
 asm (".weak __metal_button_table");
 struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					NULL };
+#define __METAL_DT_MAX_LEDS 0
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					NULL };
 #define __METAL_DT_MAX_SWITCHES 0
 
 asm (".weak __metal_switch_table");
 struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					NULL };
-#endif
+#define __METAL_DT_MAX_SPIS 0
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					NULL };
+/* From teststatus@4000 */
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
+
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
 
-#endif /*METAL__MACHINE__COREIP_S51__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* COREIP_S51__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/freedom-e310-arty/metal.h b/bsp/freedom-e310-arty/metal.h
index e1e2dd0..d0a59b0 100644
--- a/bsp/freedom-e310-arty/metal.h
+++ b/bsp/freedom-e310-arty/metal.h
@@ -4,54 +4,67 @@
 #define FREEDOM_E310_ARTY__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GPIO_10012000_INTERRUPTS 		16
-#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_10012000_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#define __METAL_SERIAL_10013000_INTERRUPTS 		1
-#define METAL_MAX_UART_INTERRUPTS 		 1
+#define METAL_MAX_PLIC_INTERRUPTS 1
 
-#include <metal/drivers/riscv,cpu.h>
+#define METAL_MAX_CLIC_INTERRUPTS 0
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 0
+
+#define __METAL_GPIO_10012000_INTERRUPTS 16
+
+#define METAL_MAX_GPIO_INTERRUPTS 16
+
+#define __METAL_SERIAL_10013000_INTERRUPTS 1
+
+#define METAL_MAX_UART_INTERRUPTS 1
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
-#include <metal/drivers/fixed-clock.h>
+#include <metal/pmp.h>
+#include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,gpio0.h>
+#include <metal/drivers/sifive,spi0.h>
 #include <metal/drivers/sifive,uart0.h>
-#include <metal/drivers/sifive,local-external-interrupts0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
+
+/* From clock@0 */
+asm (".weak __metal_dt_clock_0");
+struct __metal_driver_fixed_clock __metal_dt_clock_0;
 
 /* From clint@2000000 */
 asm (".weak __metal_dt_clint_2000000");
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
 /* From interrupt_controller */
 asm (".weak __metal_dt_interrupt_controller");
 struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
-/* From clock@0 */
-asm (".weak __metal_dt_clock_0");
-struct __metal_driver_fixed_clock __metal_dt_clock_0;
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
 
 /* From local_external_interrupts_0 */
 asm (".weak __metal_dt_local_external_interrupts_0");
@@ -61,22 +74,14 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
 asm (".weak __metal_dt_gpio_10012000");
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000;
 
+/* From spi@10014000 */
+asm (".weak __metal_dt_spi_10014000");
+struct __metal_driver_sifive_spi0 __metal_dt_spi_10014000;
+
 /* From serial@10013000 */
 asm (".weak __metal_dt_serial_10013000");
 struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000;
 
-/* From cpu@0 */
-struct __metal_driver_cpu __metal_dt_cpu_0 = {
-    .vtable = &__metal_driver_vtable_cpu,
-    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
-};
-
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
-
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
@@ -85,19 +90,6 @@ struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
     .rate = 65000000UL,
 };
 
-/* From interrupt_controller */
-struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
-    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
-    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
-    .init_done = 0,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
 /* From clint@2000000 */
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .vtable = &__metal_driver_vtable_riscv_clint0,
@@ -111,10 +103,36 @@ struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .interrupt_lines[1] = 7,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From cpu@0 */
+struct __metal_driver_cpu __metal_dt_cpu_0 = {
+    .vtable = &__metal_driver_vtable_cpu,
+    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
+    .timebase = 1000000UL,
+    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
+};
 
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From interrupt_controller */
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
+    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
+    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
+    .init_done = 0,
+    .interrupt_controller = 1,
+};
+
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
+    .init_done = 0,
+/* From interrupt_controller */
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 26UL,
+    .interrupt_controller = 1,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -142,31 +160,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 26UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
 /* From gpio@10012000 */
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000 = {
     .vtable = &__metal_driver_vtable_sifive_gpio0,
@@ -193,6 +186,16 @@ struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000 = {
     .interrupt_lines[15] = 22,
 };
 
+/* From spi@10014000 */
+struct __metal_driver_sifive_spi0 __metal_dt_spi_10014000 = {
+    .vtable = &__metal_driver_vtable_sifive_spi0,
+    .spi.vtable = &__metal_driver_vtable_sifive_spi0.spi,
+    .control_base = 268517376UL,
+    .control_size = 4096UL,
+    .clock = NULL,
+    .pinmux = NULL,
+};
+
 /* From serial@10013000 */
 struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
     .vtable = &__metal_driver_vtable_sifive_uart0,
@@ -211,6 +214,7 @@ struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
     .interrupt_line = 5UL,
 };
 
+
 /* From serial@10013000 */
 #define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_10013000.uart)
 
@@ -218,29 +222,59 @@ struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
 
 #define __METAL_DT_STDOUT_UART_BAUD 115200
 
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
+
 #define __METAL_DT_MAX_HARTS 1
 
 asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 0
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					NULL };
 #define __METAL_DT_MAX_BUTTONS 0
 
 asm (".weak __metal_button_table");
 struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					NULL };
+#define __METAL_DT_MAX_LEDS 0
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					NULL };
 #define __METAL_DT_MAX_SWITCHES 0
 
 asm (".weak __metal_switch_table");
 struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					NULL };
-#endif
+#define __METAL_DT_MAX_SPIS 1
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					&__metal_dt_spi_10014000};
 
-#endif /*METAL__MACHINE__FREEDOM_E310_ARTY__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* FREEDOM_E310_ARTY__METAL_H*/
+#endif /* ! ASSEMBLY */
diff --git a/bsp/sifive-hifive1/metal.h b/bsp/sifive-hifive1/metal.h
index 0459928..6fdbb23 100644
--- a/bsp/sifive-hifive1/metal.h
+++ b/bsp/sifive-hifive1/metal.h
@@ -4,54 +4,51 @@
 #define SIFIVE_HIFIVE1__METAL_H
 
 #ifdef __METAL_MACHINE_MACROS
-/* To Satisfy libmetal build */
+
 #ifndef __METAL_CLIC_SUBINTERRUPTS
 #define __METAL_CLIC_SUBINTERRUPTS 0
 #endif
-#endif
 
-#ifndef __METAL_MACHINE_MACROS
-#define __METAL_CLINT_2000000_INTERRUPTS 		2
-#define METAL_MAX_CLINT_INTERRUPTS	 __METAL_CLINT_2000000_INTERRUPTS
+#else /* ! __METAL_MACHINE_MACROS */
 
-#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
 
-#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+#define METAL_MAX_CLINT_INTERRUPTS 2
 
-#define __METAL_GPIO_10012000_INTERRUPTS 		16
-#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_10012000_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
 
-#define __METAL_SERIAL_10013000_INTERRUPTS 		1
-#define METAL_MAX_UART_INTERRUPTS 		 1
+#define METAL_MAX_PLIC_INTERRUPTS 1
 
-#include <metal/drivers/riscv,cpu.h>
+#define METAL_MAX_CLIC_INTERRUPTS 0
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS 16
+
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS 0
+
+#define __METAL_GPIO_10012000_INTERRUPTS 16
+
+#define METAL_MAX_GPIO_INTERRUPTS 16
+
+#define __METAL_SERIAL_10013000_INTERRUPTS 1
+
+#define METAL_MAX_UART_INTERRUPTS 1
+
+
+#include <metal/drivers/fixed-clock.h>
 #include <metal/drivers/riscv,clint0.h>
+#include <metal/drivers/riscv,cpu.h>
 #include <metal/drivers/riscv,plic0.h>
-#include <metal/drivers/fixed-clock.h>
-#include <metal/drivers/sifive,fe310-g000,pll.h>
-#include <metal/drivers/sifive,fe310-g000,prci.h>
-#include <metal/drivers/sifive,fe310-g000,hfxosc.h>
-#include <metal/drivers/sifive,fe310-g000,hfrosc.h>
+#include <metal/pmp.h>
+#include <metal/drivers/sifive,local-external-interrupts0.h>
 #include <metal/drivers/sifive,gpio0.h>
+#include <metal/drivers/sifive,spi0.h>
 #include <metal/drivers/sifive,uart0.h>
-#include <metal/drivers/sifive,local-external-interrupts0.h>
-/* From cpu@0 */
-asm (".weak __metal_dt_cpu_0");
-struct __metal_driver_cpu __metal_dt_cpu_0;
-
-/* From clint@2000000 */
-asm (".weak __metal_dt_clint_2000000");
-struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
-
-/* From interrupt_controller@c000000 */
-asm (".weak __metal_dt_interrupt_controller_c000000");
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
-
-/* From interrupt_controller */
-asm (".weak __metal_dt_interrupt_controller");
-struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
+#include <metal/drivers/sifive,fe310-g000,hfrosc.h>
+#include <metal/drivers/sifive,fe310-g000,hfxosc.h>
+#include <metal/drivers/sifive,fe310-g000,pll.h>
+#include <metal/drivers/sifive,fe310-g000,prci.h>
 
 /* From clock@0 */
 asm (".weak __metal_dt_clock_0");
@@ -65,46 +62,54 @@ struct __metal_driver_fixed_clock __metal_dt_clock_2;
 asm (".weak __metal_dt_clock_5");
 struct __metal_driver_fixed_clock __metal_dt_clock_5;
 
-/* From local_external_interrupts_0 */
-asm (".weak __metal_dt_local_external_interrupts_0");
-struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0;
+/* From clint@2000000 */
+asm (".weak __metal_dt_clint_2000000");
+struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
 
-/* From clock@4 */
-asm (".weak __metal_dt_clock_4");
-struct __metal_driver_sifive_fe310_g000_pll __metal_dt_clock_4;
+/* From cpu@0 */
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
 
-/* From prci@10008000 */
-asm (".weak __metal_dt_prci_10008000");
-struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000;
+/* From interrupt_controller */
+asm (".weak __metal_dt_interrupt_controller");
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
 
-/* From clock@1 */
-asm (".weak __metal_dt_clock_1");
-struct __metal_driver_sifive_fe310_g000_hfxosc __metal_dt_clock_1;
+/* From interrupt_controller@c000000 */
+asm (".weak __metal_dt_interrupt_controller_c000000");
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000;
 
-/* From clock@3 */
-asm (".weak __metal_dt_clock_3");
-struct __metal_driver_sifive_fe310_g000_hfrosc __metal_dt_clock_3;
+/* From local_external_interrupts_0 */
+asm (".weak __metal_dt_local_external_interrupts_0");
+struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0;
 
 /* From gpio@10012000 */
 asm (".weak __metal_dt_gpio_10012000");
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000;
 
+/* From spi@10014000 */
+asm (".weak __metal_dt_spi_10014000");
+struct __metal_driver_sifive_spi0 __metal_dt_spi_10014000;
+
 /* From serial@10013000 */
 asm (".weak __metal_dt_serial_10013000");
 struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000;
 
-/* From cpu@0 */
-struct __metal_driver_cpu __metal_dt_cpu_0 = {
-    .vtable = &__metal_driver_vtable_cpu,
-    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
-};
+/* From clock@3 */
+asm (".weak __metal_dt_clock_3");
+struct __metal_driver_sifive_fe310_g000_hfrosc __metal_dt_clock_3;
 
-/* From cpu@0 */
-#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+/* From clock@1 */
+asm (".weak __metal_dt_clock_1");
+struct __metal_driver_sifive_fe310_g000_hfxosc __metal_dt_clock_1;
+
+/* From clock@4 */
+asm (".weak __metal_dt_clock_4");
+struct __metal_driver_sifive_fe310_g000_pll __metal_dt_clock_4;
+
+/* From prci@10008000 */
+asm (".weak __metal_dt_prci_10008000");
+struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000;
 
-#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
 
 /* From clock@0 */
 struct __metal_driver_fixed_clock __metal_dt_clock_0 = {
@@ -127,19 +132,6 @@ struct __metal_driver_fixed_clock __metal_dt_clock_5 = {
     .rate = 32000000UL,
 };
 
-/* From interrupt_controller */
-struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
-    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
-    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
-    .init_done = 0,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller */
-#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
-
 /* From clint@2000000 */
 struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .vtable = &__metal_driver_vtable_riscv_clint0,
@@ -153,10 +145,36 @@ struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000 = {
     .interrupt_lines[1] = 7,
 };
 
-/* From clint@2000000 */
-#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From cpu@0 */
+struct __metal_driver_cpu __metal_dt_cpu_0 = {
+    .vtable = &__metal_driver_vtable_cpu,
+    .cpu.vtable = &__metal_driver_vtable_cpu.cpu_vtable,
+    .timebase = 1000000UL,
+    .interrupt_controller = &__metal_dt_interrupt_controller.controller,
+};
 
-#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+/* From interrupt_controller */
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller = {
+    .vtable = &__metal_driver_vtable_riscv_cpu_intc,
+    .controller.vtable = &__metal_driver_vtable_riscv_cpu_intc.controller_vtable,
+    .init_done = 0,
+    .interrupt_controller = 1,
+};
+
+/* From interrupt_controller@c000000 */
+struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
+    .vtable = &__metal_driver_vtable_riscv_plic0,
+    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
+    .init_done = 0,
+/* From interrupt_controller */
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .interrupt_line = 11UL,
+    .control_base = 201326592UL,
+    .control_size = 67108864UL,
+    .max_priority = 7UL,
+    .num_interrupts = 26UL,
+    .interrupt_controller = 1,
+};
 
 /* From local_external_interrupts_0 */
 struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0 = {
@@ -184,82 +202,6 @@ struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_externa
     .interrupt_lines[15] = 31,
 };
 
-/* From local_external_interrupts_0 */
-#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = {
-    .vtable = &__metal_driver_vtable_riscv_plic0,
-    .controller.vtable = &__metal_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
-    .interrupt_line = 11UL,
-    .control_base = 201326592UL,
-    .control_size = 67108864UL,
-    .max_priority = 7UL,
-    .num_interrupts = 26UL,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller@c000000 */
-#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-
-/* From clock@4 */
-struct __metal_driver_sifive_fe310_g000_pll __metal_dt_clock_4 = {
-    .vtable = &__metal_driver_vtable_sifive_fe310_g000_pll,
-    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_pll.clock,
-/* From clock@3 */
-    .pllsel0 = &__metal_dt_clock_3.clock,
-/* From clock@1 */
-    .pllref = &__metal_dt_clock_1.clock,
-/* From prci@10008000 */
-    .divider_base = &__metal_dt_prci_10008000,
-    .divider_offset = 12UL,
-/* From prci@10008000 */
-    .config_base = &__metal_dt_prci_10008000,
-    .config_offset = 8UL,
-    .init_rate = 16000000UL,
-};
-
-/* From clock@4 */
-#define __METAL_DT_SIFIVE_FE310_G000_PLL_HANDLE (&__metal_dt_clock_4)
-
-#define __METAL_DT_CLOCK_4_HANDLE (&__metal_dt_clock_4)
-
-/* From prci@10008000 */
-struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000 = {
-    .vtable = &__metal_driver_vtable_sifive_fe310_g000_prci,
-    .base = 268468224UL,
-    .size = 32768UL,
-};
-
-/* From clock@1 */
-struct __metal_driver_sifive_fe310_g000_hfxosc __metal_dt_clock_1 = {
-    .vtable = &__metal_driver_vtable_sifive_fe310_g000_hfxosc,
-    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_hfxosc.clock,
-/* From clock@0 */
-    .ref = &__metal_dt_clock_0.clock,
-/* From prci@10008000 */
-    .config_base = &__metal_dt_prci_10008000,
-    .config_offset = 4UL,
-};
-
-/* From clock@3 */
-struct __metal_driver_sifive_fe310_g000_hfrosc __metal_dt_clock_3 = {
-    .vtable = &__metal_driver_vtable_sifive_fe310_g000_hfrosc,
-    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_hfrosc.clock,
-/* From clock@2 */
-    .ref = &__metal_dt_clock_2.clock,
-/* From prci@10008000 */
-    .config_base = &__metal_dt_prci_10008000,
-    .config_offset = 0UL,
-};
-
 /* From gpio@10012000 */
 struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000 = {
     .vtable = &__metal_driver_vtable_sifive_gpio0,
@@ -286,6 +228,20 @@ struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000 = {
     .interrupt_lines[15] = 22,
 };
 
+/* From spi@10014000 */
+struct __metal_driver_sifive_spi0 __metal_dt_spi_10014000 = {
+    .vtable = &__metal_driver_vtable_sifive_spi0,
+    .spi.vtable = &__metal_driver_vtable_sifive_spi0.spi,
+    .control_base = 268517376UL,
+    .control_size = 4096UL,
+/* From clock@4 */
+    .clock = &__metal_dt_clock_4.clock,
+/* From gpio@10012000 */
+    .pinmux = &__metal_dt_gpio_10012000,
+    .pinmux_output_selector = 60UL,
+    .pinmux_source_selector = 60UL,
+};
+
 /* From serial@10013000 */
 struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
     .vtable = &__metal_driver_vtable_sifive_uart0,
@@ -304,6 +260,53 @@ struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
     .interrupt_line = 5UL,
 };
 
+/* From clock@3 */
+struct __metal_driver_sifive_fe310_g000_hfrosc __metal_dt_clock_3 = {
+    .vtable = &__metal_driver_vtable_sifive_fe310_g000_hfrosc,
+    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_hfrosc.clock,
+/* From clock@2 */
+    .ref = &__metal_dt_clock_2.clock,
+/* From prci@10008000 */
+    .config_base = &__metal_dt_prci_10008000,
+    .config_offset = 0UL,
+};
+
+/* From clock@1 */
+struct __metal_driver_sifive_fe310_g000_hfxosc __metal_dt_clock_1 = {
+    .vtable = &__metal_driver_vtable_sifive_fe310_g000_hfxosc,
+    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_hfxosc.clock,
+/* From clock@0 */
+    .ref = &__metal_dt_clock_0.clock,
+/* From prci@10008000 */
+    .config_base = &__metal_dt_prci_10008000,
+    .config_offset = 4UL,
+};
+
+/* From clock@4 */
+struct __metal_driver_sifive_fe310_g000_pll __metal_dt_clock_4 = {
+    .vtable = &__metal_driver_vtable_sifive_fe310_g000_pll,
+    .clock.vtable = &__metal_driver_vtable_sifive_fe310_g000_pll.clock,
+/* From clock@3 */
+    .pllsel0 = &__metal_dt_clock_3.clock,
+/* From clock@1 */
+    .pllref = &__metal_dt_clock_1.clock,
+/* From prci@10008000 */
+    .divider_base = &__metal_dt_prci_10008000,
+    .divider_offset = 12UL,
+/* From prci@10008000 */
+    .config_base = &__metal_dt_prci_10008000,
+    .config_offset = 8UL,
+    .init_rate = 16000000UL,
+};
+
+/* From prci@10008000 */
+struct __metal_driver_sifive_fe310_g000_prci __metal_dt_prci_10008000 = {
+    .vtable = &__metal_driver_vtable_sifive_fe310_g000_prci,
+    .base = 268468224UL,
+    .size = 32768UL,
+};
+
+
 /* From serial@10013000 */
 #define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_10013000.uart)
 
@@ -311,29 +314,64 @@ struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
 
 #define __METAL_DT_STDOUT_UART_BAUD 115200
 
+/* From clint@2000000 */
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
+
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_dt_clint_2000000.controller)
+
+/* From cpu@0 */
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
+
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
+
 #define __METAL_DT_MAX_HARTS 1
 
 asm (".weak __metal_cpu_table");
 struct __metal_driver_cpu *__metal_cpu_table[] = {
 					&__metal_dt_cpu_0};
 
-#define __METAL_DT_MAX_LEDS 0
+/* From interrupt_controller */
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_dt_interrupt_controller.controller)
+
+/* From interrupt_controller@c000000 */
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
+
+/* From local_external_interrupts_0 */
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
+
+#define __METAL_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
 
-asm (".weak __metal_led_table");
-struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
-					NULL };
 #define __METAL_DT_MAX_BUTTONS 0
 
 asm (".weak __metal_button_table");
 struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
 					NULL };
+#define __METAL_DT_MAX_LEDS 0
+
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
+					NULL };
 #define __METAL_DT_MAX_SWITCHES 0
 
 asm (".weak __metal_switch_table");
 struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
 					NULL };
-#endif
+#define __METAL_DT_MAX_SPIS 1
+
+asm (".weak __metal_spi_table");
+struct __metal_driver_sifive_spi0 *__metal_spi_table[] = {
+					&__metal_dt_spi_10014000};
+
+/* From clock@4 */
+#define __METAL_DT_SIFIVE_FE310_G000_PLL_HANDLE (&__metal_dt_clock_4)
+
+#define __METAL_DT_CLOCK_4_HANDLE (&__metal_dt_clock_4)
 
-#endif /*METAL__MACHINE__SIFIVE_HIFIVE1__METAL_H*/
 
-#endif/*ASSEMBLY*/
+#endif /* ! __METAL_MACHINE_MACROS */
+#endif /* SIFIVE_HIFIVE1__METAL_H*/
+#endif /* ! ASSEMBLY */