Regen BSPs for metal rename

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

3 files changed, 259 insertions, 259 deletions

diff --git a/bsp/freedom-e310-arty/mee.h b/bsp/freedom-e310-arty/mee.h
deleted file mode 100644
index 39278ea..0000000
--- a/bsp/freedom-e310-arty/mee.h
+++ /dev/null
@@ -1,246 +0,0 @@
-#ifndef ASSEMBLY
-
-#ifndef FREEDOM_E310_ARTY__MEE_H
-#define FREEDOM_E310_ARTY__MEE_H
-
-#ifdef __MEE_MACHINE_MACROS
-/* To Satisfy libmetal build */
-#ifndef __MEE_CLIC_SUBINTERRUPTS
-#define __MEE_CLIC_SUBINTERRUPTS 0
-#endif
-#endif
-
-#ifndef __MEE_MACHINE_MACROS
-#define __MEE_CLINT_2000000_INTERRUPTS 		2
-#define MEE_MAX_CLINT_INTERRUPTS	 __MEE_CLINT_2000000_INTERRUPTS
-
-#define __MEE_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
-#define MEE_MAX_PLIC_INTERRUPTS	 __MEE_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
-
-#define __MEE_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
-#define MEE_MAX_LOCAL_EXT_INTERRUPTS	 __MEE_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
-
-#define __MEE_GPIO_10012000_INTERRUPTS 		16
-#define MEE_MAX_GPIO_INTERRUPTS	 __MEE_GPIO_10012000_INTERRUPTS
-
-#define __MEE_SERIAL_10013000_INTERRUPTS 		1
-#define MEE_MAX_UART_INTERRUPTS 		 1
-
-#include <mee/drivers/riscv,cpu.h>
-#include <mee/drivers/riscv,clint0.h>
-#include <mee/drivers/riscv,plic0.h>
-#include <mee/drivers/fixed-clock.h>
-#include <mee/drivers/sifive,gpio0.h>
-#include <mee/drivers/sifive,uart0.h>
-#include <mee/drivers/sifive,local-external-interrupts0.h>
-/* From cpu@0 */
-asm (".weak __mee_dt_cpu_0");
-struct __mee_driver_cpu __mee_dt_cpu_0;
-
-/* From clint@2000000 */
-asm (".weak __mee_dt_clint_2000000");
-struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000;
-
-/* From interrupt_controller@c000000 */
-asm (".weak __mee_dt_interrupt_controller_c000000");
-struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000;
-
-/* From interrupt_controller */
-asm (".weak __mee_dt_interrupt_controller");
-struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller;
-
-/* From clock@0 */
-asm (".weak __mee_dt_clock_0");
-struct __mee_driver_fixed_clock __mee_dt_clock_0;
-
-/* From local_external_interrupts_0 */
-asm (".weak __mee_dt_local_external_interrupts_0");
-struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0;
-
-/* From gpio@10012000 */
-asm (".weak __mee_dt_gpio_10012000");
-struct __mee_driver_sifive_gpio0 __mee_dt_gpio_10012000;
-
-/* From serial@10013000 */
-asm (".weak __mee_dt_serial_10013000");
-struct __mee_driver_sifive_uart0 __mee_dt_serial_10013000;
-
-/* From cpu@0 */
-struct __mee_driver_cpu __mee_dt_cpu_0 = {
-    .vtable = &__mee_driver_vtable_cpu,
-    .cpu.vtable = &__mee_driver_vtable_cpu.cpu_vtable,
-    .timebase = 1000000UL,
-    .interrupt_controller = &__mee_dt_interrupt_controller.controller,
-};
-
-/* From cpu@0 */
-#define __MEE_DT_RISCV_CPU_HANDLE (&__mee_dt_cpu_0.cpu)
-
-#define __MEE_DT_CPU_0_HANDLE (&__mee_dt_cpu_0.cpu)
-
-/* From clock@0 */
-struct __mee_driver_fixed_clock __mee_dt_clock_0 = {
-    .vtable = &__mee_driver_vtable_fixed_clock,
-    .clock.vtable = &__mee_driver_vtable_fixed_clock.clock,
-    .rate = 65000000UL,
-};
-
-/* From interrupt_controller */
-struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller = {
-    .vtable = &__mee_driver_vtable_riscv_cpu_intc,
-    .controller.vtable = &__mee_driver_vtable_riscv_cpu_intc.controller_vtable,
-    .init_done = 0,
-    .interrupt_controller = 1,
-};
-
-/* From interrupt_controller */
-#define __MEE_DT_RISCV_CPU_INTC_HANDLE (&__mee_dt_interrupt_controller.controller)
-
-#define __MEE_DT_INTERRUPT_CONTROLLER_HANDLE (&__mee_dt_interrupt_controller.controller)
-
-/* From clint@2000000 */
-struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000 = {
-    .vtable = &__mee_driver_vtable_riscv_clint0,
-    .controller.vtable = &__mee_driver_vtable_riscv_clint0.clint_vtable,
-    .control_base = 33554432UL,
-    .control_size = 65536UL,
-    .init_done = 0,
-    .num_interrupts = MEE_MAX_CLINT_INTERRUPTS,
-    .interrupt_parent = &__mee_dt_interrupt_controller.controller,
-    .interrupt_lines[0] = 3,
-    .interrupt_lines[1] = 7,
-};
-
-/* From clint@2000000 */
-#define __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
-
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
-
-/* From local_external_interrupts_0 */
-struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_interrupts_0 = {
-    .vtable = &__mee_driver_vtable_sifive_local_external_interrupts0,
-    .irc.vtable = &__mee_driver_vtable_sifive_local_external_interrupts0.local0_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__mee_dt_interrupt_controller.controller,
-    .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS,
-    .interrupt_lines[0] = 16,
-    .interrupt_lines[1] = 17,
-    .interrupt_lines[2] = 18,
-    .interrupt_lines[3] = 19,
-    .interrupt_lines[4] = 20,
-    .interrupt_lines[5] = 21,
-    .interrupt_lines[6] = 22,
-    .interrupt_lines[7] = 23,
-    .interrupt_lines[8] = 24,
-    .interrupt_lines[9] = 25,
-    .interrupt_lines[10] = 26,
-    .interrupt_lines[11] = 27,
-    .interrupt_lines[12] = 28,
-    .interrupt_lines[13] = 29,
-    .interrupt_lines[14] = 30,
-    .interrupt_lines[15] = 31,
-};
-
-/* From local_external_interrupts_0 */
-#define __MEE_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__mee_dt_local_external_interrupts_0.irc)
-
-#define __MEE_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__mee_dt_local_external_interrupts_0.irc)
-
-/* From interrupt_controller@c000000 */
-struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
-    .vtable = &__mee_driver_vtable_riscv_plic0,
-    .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
-    .init_done = 0,
-/* From interrupt_controller */
-    .interrupt_parent = &__mee_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 __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
-
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
-
-/* From gpio@10012000 */
-struct __mee_driver_sifive_gpio0 __mee_dt_gpio_10012000 = {
-    .vtable = &__mee_driver_vtable_sifive_gpio0,
-    .base = 268509184UL,
-    .size = 4096UL,
-/* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
-    .num_interrupts = MEE_MAX_GPIO_INTERRUPTS,
-    .interrupt_lines[0] = 7,
-    .interrupt_lines[1] = 8,
-    .interrupt_lines[2] = 9,
-    .interrupt_lines[3] = 10,
-    .interrupt_lines[4] = 11,
-    .interrupt_lines[5] = 12,
-    .interrupt_lines[6] = 13,
-    .interrupt_lines[7] = 14,
-    .interrupt_lines[8] = 15,
-    .interrupt_lines[9] = 16,
-    .interrupt_lines[10] = 17,
-    .interrupt_lines[11] = 18,
-    .interrupt_lines[12] = 19,
-    .interrupt_lines[13] = 20,
-    .interrupt_lines[14] = 21,
-    .interrupt_lines[15] = 22,
-};
-
-/* From serial@10013000 */
-struct __mee_driver_sifive_uart0 __mee_dt_serial_10013000 = {
-    .vtable = &__mee_driver_vtable_sifive_uart0,
-    .uart.vtable = &__mee_driver_vtable_sifive_uart0.uart,
-    .control_base = 268513280UL,
-    .control_size = 4096UL,
-/* From clock@0 */
-    .clock = &__mee_dt_clock_0.clock,
-/* From gpio@10012000 */
-    .pinmux = &__mee_dt_gpio_10012000,
-    .pinmux_output_selector = 196608UL,
-    .pinmux_source_selector = 196608UL,
-/* From interrupt_controller@c000000 */
-    .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
-    .num_interrupts = MEE_MAX_UART_INTERRUPTS,
-    .interrupt_line = 5UL,
-};
-
-/* From serial@10013000 */
-#define __MEE_DT_STDOUT_UART_HANDLE (&__mee_dt_serial_10013000.uart)
-
-#define __MEE_DT_SERIAL_10013000_HANDLE (&__mee_dt_serial_10013000.uart)
-
-#define __MEE_DT_STDOUT_UART_BAUD 115200
-
-#define __MEE_DT_MAX_HARTS 1
-
-asm (".weak __mee_cpu_table");
-struct __mee_driver_cpu *__mee_cpu_table[] = {
-					&__mee_dt_cpu_0};
-
-#define __MEE_DT_MAX_LEDS 0
-
-asm (".weak __mee_led_table");
-struct __mee_driver_sifive_gpio_led *__mee_led_table[] = {
-					NULL };
-#define __MEE_DT_MAX_BUTTONS 0
-
-asm (".weak __mee_button_table");
-struct __mee_driver_sifive_gpio_button *__mee_button_table[] = {
-					NULL };
-#define __MEE_DT_MAX_SWITCHES 0
-
-asm (".weak __mee_switch_table");
-struct __mee_driver_sifive_gpio_switch *__mee_switch_table[] = {
-					NULL };
-#endif
-
-#endif /*MEE__MACHINE__FREEDOM_E310_ARTY__MEE_H*/
-
-#endif/*ASSEMBLY*/
diff --git a/bsp/freedom-e310-arty/metal.h b/bsp/freedom-e310-arty/metal.h
new file mode 100644
index 0000000..e1e2dd0
--- /dev/null
+++ b/bsp/freedom-e310-arty/metal.h
@@ -0,0 +1,246 @@
+#ifndef ASSEMBLY
+
+#ifndef FREEDOM_E310_ARTY__METAL_H
+#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
+
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 		1
+#define METAL_MAX_PLIC_INTERRUPTS	 __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+
+#define __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 		16
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS	 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
+
+#define __METAL_GPIO_10012000_INTERRUPTS 		16
+#define METAL_MAX_GPIO_INTERRUPTS	 __METAL_GPIO_10012000_INTERRUPTS
+
+#define __METAL_SERIAL_10013000_INTERRUPTS 		1
+#define METAL_MAX_UART_INTERRUPTS 		 1
+
+#include <metal/drivers/riscv,cpu.h>
+#include <metal/drivers/riscv,clint0.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/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;
+
+/* From clock@0 */
+asm (".weak __metal_dt_clock_0");
+struct __metal_driver_fixed_clock __metal_dt_clock_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;
+
+/* From gpio@10012000 */
+asm (".weak __metal_dt_gpio_10012000");
+struct __metal_driver_sifive_gpio0 __metal_dt_gpio_10012000;
+
+/* 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 = {
+    .vtable = &__metal_driver_vtable_fixed_clock,
+    .clock.vtable = &__metal_driver_vtable_fixed_clock.clock,
+    .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,
+    .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 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 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,
+    .irc.vtable = &__metal_driver_vtable_sifive_local_external_interrupts0.local0_vtable,
+    .init_done = 0,
+/* From interrupt_controller */
+    .interrupt_parent = &__metal_dt_interrupt_controller.controller,
+    .num_interrupts = METAL_MAX_LOCAL_EXT_INTERRUPTS,
+    .interrupt_lines[0] = 16,
+    .interrupt_lines[1] = 17,
+    .interrupt_lines[2] = 18,
+    .interrupt_lines[3] = 19,
+    .interrupt_lines[4] = 20,
+    .interrupt_lines[5] = 21,
+    .interrupt_lines[6] = 22,
+    .interrupt_lines[7] = 23,
+    .interrupt_lines[8] = 24,
+    .interrupt_lines[9] = 25,
+    .interrupt_lines[10] = 26,
+    .interrupt_lines[11] = 27,
+    .interrupt_lines[12] = 28,
+    .interrupt_lines[13] = 29,
+    .interrupt_lines[14] = 30,
+    .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,
+    .base = 268509184UL,
+    .size = 4096UL,
+/* From interrupt_controller@c000000 */
+    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
+    .num_interrupts = METAL_MAX_GPIO_INTERRUPTS,
+    .interrupt_lines[0] = 7,
+    .interrupt_lines[1] = 8,
+    .interrupt_lines[2] = 9,
+    .interrupt_lines[3] = 10,
+    .interrupt_lines[4] = 11,
+    .interrupt_lines[5] = 12,
+    .interrupt_lines[6] = 13,
+    .interrupt_lines[7] = 14,
+    .interrupt_lines[8] = 15,
+    .interrupt_lines[9] = 16,
+    .interrupt_lines[10] = 17,
+    .interrupt_lines[11] = 18,
+    .interrupt_lines[12] = 19,
+    .interrupt_lines[13] = 20,
+    .interrupt_lines[14] = 21,
+    .interrupt_lines[15] = 22,
+};
+
+/* From serial@10013000 */
+struct __metal_driver_sifive_uart0 __metal_dt_serial_10013000 = {
+    .vtable = &__metal_driver_vtable_sifive_uart0,
+    .uart.vtable = &__metal_driver_vtable_sifive_uart0.uart,
+    .control_base = 268513280UL,
+    .control_size = 4096UL,
+/* From clock@0 */
+    .clock = &__metal_dt_clock_0.clock,
+/* From gpio@10012000 */
+    .pinmux = &__metal_dt_gpio_10012000,
+    .pinmux_output_selector = 196608UL,
+    .pinmux_source_selector = 196608UL,
+/* From interrupt_controller@c000000 */
+    .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
+    .num_interrupts = METAL_MAX_UART_INTERRUPTS,
+    .interrupt_line = 5UL,
+};
+
+/* From serial@10013000 */
+#define __METAL_DT_STDOUT_UART_HANDLE (&__metal_dt_serial_10013000.uart)
+
+#define __METAL_DT_SERIAL_10013000_HANDLE (&__metal_dt_serial_10013000.uart)
+
+#define __METAL_DT_STDOUT_UART_BAUD 115200
+
+#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
+
+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_SWITCHES 0
+
+asm (".weak __metal_switch_table");
+struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
+					NULL };
+#endif
+
+#endif /*METAL__MACHINE__FREEDOM_E310_ARTY__METAL_H*/
+
+#endif/*ASSEMBLY*/
diff --git a/bsp/freedom-e310-arty/mee.lds b/bsp/freedom-e310-arty/metal.lds
index d5f73d5..c0556ee 100644
--- a/bsp/freedom-e310-arty/mee.lds
+++ b/bsp/freedom-e310-arty/metal.lds
@@ -26,7 +26,7 @@ SECTIONS
 
 	.init 		:
 	{
-		KEEP (*(.text.mee.init.enter))
+		KEEP (*(.text.metal.init.enter))
 		KEEP (*(SORT_NONE(.init)))
 	} >flash AT>flash :flash
 
@@ -124,14 +124,14 @@ SECTIONS
 	.litimalign 		:
 	{
 		. = ALIGN(4);
-		PROVIDE( mee_segment_itim_source_start = . );
+		PROVIDE( metal_segment_itim_source_start = . );
 	} >flash AT>flash :flash
 
 
 	.ditimalign 		:
 	{
 		. = ALIGN(4);
-		PROVIDE( mee_segment_itim_target_start = . );
+		PROVIDE( metal_segment_itim_target_start = . );
 	} >itim AT>flash :itim_init
 
 
@@ -142,21 +142,21 @@ SECTIONS
 
 
 	. = ALIGN(8);
-	PROVIDE( mee_segment_itim_target_end = . );
+	PROVIDE( metal_segment_itim_target_end = . );
 
 
 	.lalign 		:
 	{
 		. = ALIGN(4);
 		PROVIDE( _data_lma = . );
-		PROVIDE( mee_segment_data_source_start = . );
+		PROVIDE( metal_segment_data_source_start = . );
 	} >flash AT>flash :flash
 
 
 	.dalign 		:
 	{
 		. = ALIGN(4);
-		PROVIDE( mee_segment_data_target_start = . );
+		PROVIDE( metal_segment_data_target_start = . );
 	} >ram AT>flash :ram_init
 
 
@@ -180,10 +180,10 @@ SECTIONS
 	. = ALIGN(4);
 	PROVIDE( _edata = . );
 	PROVIDE( edata = . );
-	PROVIDE( mee_segment_data_target_end = . );
+	PROVIDE( metal_segment_data_target_end = . );
 	PROVIDE( _fbss = . );
 	PROVIDE( __bss_start = . );
-	PROVIDE( mee_segment_bss_target_start = . );
+	PROVIDE( metal_segment_bss_target_start = . );
 
 
 	.bss 		:
@@ -200,24 +200,24 @@ SECTIONS
 	. = ALIGN(8);
 	PROVIDE( _end = . );
 	PROVIDE( end = . );
-	PROVIDE( mee_segment_bss_target_end = . );
+	PROVIDE( metal_segment_bss_target_end = . );
 
 
 	.stack :
 	{
-		PROVIDE(mee_segment_stack_begin = .);
+		PROVIDE(metal_segment_stack_begin = .);
 		. = __stack_size;
 		PROVIDE( _sp = . );
-		PROVIDE(mee_segment_stack_end = .);
+		PROVIDE(metal_segment_stack_end = .);
 	} >ram AT>ram :ram
 
 
 	.heap :
 	{
-		PROVIDE( mee_segment_heap_target_start = . );
+		PROVIDE( metal_segment_heap_target_start = . );
 		. = __heap_size;
 		. = __heap_size == 0 ? 0 : ORIGIN(ram) + LENGTH(ram);
-		PROVIDE( mee_segment_heap_target_end = . );
+		PROVIDE( metal_segment_heap_target_end = . );
 		PROVIDE( _heap_end = . );
 	} >ram AT>ram :ram