summaryrefslogtreecommitdiff
path: root/bsp/coreip-e31
diff options
context:
space:
mode:
authorNathaniel Graff <nathaniel.graff@sifive.com>2019-02-05 17:22:44 +0000
committerGitHub <noreply@github.com>2019-02-05 17:22:44 +0000
commit4c20f5158e506f3c13cf66d5259a6399a6b4b2a3 (patch)
tree266e712fcfd3fd45d98fff92e1f3d6ca8935599a /bsp/coreip-e31
parentd9a6c0abd5e98697aae8273342961895512890bf (diff)
parent934c94798e4897c84a412ad96603691b5129e0ff (diff)
Merge pull request #167 from sifive/rename-metal
Rename everything to metal
Diffstat (limited to 'bsp/coreip-e31')
-rw-r--r--bsp/coreip-e31/metal.h (renamed from bsp/coreip-e31/mee.h)192
-rw-r--r--bsp/coreip-e31/metal.lds (renamed from bsp/coreip-e31/mee.lds)26
2 files changed, 109 insertions, 109 deletions
diff --git a/bsp/coreip-e31/mee.h b/bsp/coreip-e31/metal.h
index 5c59432..cf0fb4f 100644
--- a/bsp/coreip-e31/mee.h
+++ b/bsp/coreip-e31/metal.h
@@ -1,118 +1,118 @@
#ifndef ASSEMBLY
-#ifndef COREIP_E31__MEE_H
-#define COREIP_E31__MEE_H
+#ifndef COREIP_E31__METAL_H
+#define COREIP_E31__METAL_H
-#ifdef __MEE_MACHINE_MACROS
+#ifdef __METAL_MACHINE_MACROS
/* To Satisfy libmetal build */
-#ifndef __MEE_CLIC_SUBINTERRUPTS
-#define __MEE_CLIC_SUBINTERRUPTS 0
+#ifndef __METAL_CLIC_SUBINTERRUPTS
+#define __METAL_CLIC_SUBINTERRUPTS 0
#endif
#endif
-#ifndef __MEE_MACHINE_MACROS
-#define __MEE_CLINT_2000000_INTERRUPTS 2
-#define MEE_MAX_CLINT_INTERRUPTS __MEE_CLINT_2000000_INTERRUPTS
+#ifndef __METAL_MACHINE_MACROS
+#define __METAL_CLINT_2000000_INTERRUPTS 2
+#define METAL_MAX_CLINT_INTERRUPTS __METAL_CLINT_2000000_INTERRUPTS
-#define __MEE_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
-#define MEE_MAX_PLIC_INTERRUPTS __MEE_INTERRUPT_CONTROLLER_C000000_INTERRUPTS
+#define __METAL_INTERRUPT_CONTROLLER_C000000_INTERRUPTS 1
+#define METAL_MAX_PLIC_INTERRUPTS __METAL_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 __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS 16
+#define METAL_MAX_LOCAL_EXT_INTERRUPTS __METAL_LOCAL_EXTERNAL_INTERRUPTS_0_INTERRUPTS
-#define __MEE_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 127
-#define MEE_MAX_GLOBAL_EXT_INTERRUPTS __MEE_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
+#define __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS 127
+#define METAL_MAX_GLOBAL_EXT_INTERRUPTS __METAL_GLOBAL_EXTERNAL_INTERRUPTS_INTERRUPTS
-#include <mee/drivers/riscv,cpu.h>
-#include <mee/drivers/riscv,clint0.h>
-#include <mee/drivers/riscv,plic0.h>
-#include <mee/pmp.h>
-#include <mee/drivers/sifive,local-external-interrupts0.h>
-#include <mee/drivers/sifive,global-external-interrupts0.h>
-#include <mee/drivers/sifive,test0.h>
+#include <metal/drivers/riscv,cpu.h>
+#include <metal/drivers/riscv,clint0.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 __mee_dt_cpu_0");
-struct __mee_driver_cpu __mee_dt_cpu_0;
+asm (".weak __metal_dt_cpu_0");
+struct __metal_driver_cpu __metal_dt_cpu_0;
/* From clint@2000000 */
-asm (".weak __mee_dt_clint_2000000");
-struct __mee_driver_riscv_clint0 __mee_dt_clint_2000000;
+asm (".weak __metal_dt_clint_2000000");
+struct __metal_driver_riscv_clint0 __metal_dt_clint_2000000;
/* From interrupt_controller@c000000 */
-asm (".weak __mee_dt_interrupt_controller_c000000");
-struct __mee_driver_riscv_plic0 __mee_dt_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 __mee_dt_interrupt_controller");
-struct __mee_driver_riscv_cpu_intc __mee_dt_interrupt_controller;
+asm (".weak __metal_dt_interrupt_controller");
+struct __metal_driver_riscv_cpu_intc __metal_dt_interrupt_controller;
/* 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;
+asm (".weak __metal_dt_local_external_interrupts_0");
+struct __metal_driver_sifive_local_external_interrupts0 __metal_dt_local_external_interrupts_0;
/* From global_external_interrupts */
-asm (".weak __mee_dt_global_external_interrupts");
-struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts;
+asm (".weak __metal_dt_global_external_interrupts");
+struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts;
-asm (".weak __mee_dt_pmp_0");
-struct mee_pmp __mee_dt_pmp_0;
+asm (".weak __metal_dt_pmp_0");
+struct metal_pmp __metal_dt_pmp_0;
/* From teststatus@4000 */
-asm (".weak __mee_dt_teststatus_4000");
-struct __mee_driver_sifive_test0 __mee_dt_teststatus_4000;
+asm (".weak __metal_dt_teststatus_4000");
+struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000;
/* From cpu@0 */
-struct __mee_driver_cpu __mee_dt_cpu_0 = {
- .vtable = &__mee_driver_vtable_cpu,
- .cpu.vtable = &__mee_driver_vtable_cpu.cpu_vtable,
+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 = &__mee_dt_interrupt_controller.controller,
+ .interrupt_controller = &__metal_dt_interrupt_controller.controller,
};
/* From cpu@0 */
-#define __MEE_DT_RISCV_CPU_HANDLE (&__mee_dt_cpu_0.cpu)
+#define __METAL_DT_RISCV_CPU_HANDLE (&__metal_dt_cpu_0.cpu)
-#define __MEE_DT_CPU_0_HANDLE (&__mee_dt_cpu_0.cpu)
+#define __METAL_DT_CPU_0_HANDLE (&__metal_dt_cpu_0.cpu)
/* 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,
+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 __MEE_DT_RISCV_CPU_INTC_HANDLE (&__mee_dt_interrupt_controller.controller)
+#define __METAL_DT_RISCV_CPU_INTC_HANDLE (&__metal_dt_interrupt_controller.controller)
-#define __MEE_DT_INTERRUPT_CONTROLLER_HANDLE (&__mee_dt_interrupt_controller.controller)
+#define __METAL_DT_INTERRUPT_CONTROLLER_HANDLE (&__metal_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,
+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 = MEE_MAX_CLINT_INTERRUPTS,
- .interrupt_parent = &__mee_dt_interrupt_controller.controller,
+ .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 __MEE_DT_RISCV_CLINT0_HANDLE (&__mee_dt_clint_2000000.controller)
+#define __METAL_DT_RISCV_CLINT0_HANDLE (&__metal_dt_clint_2000000.controller)
-#define __MEE_DT_CLINT_2000000_HANDLE (&__mee_dt_clint_2000000.controller)
+#define __METAL_DT_CLINT_2000000_HANDLE (&__metal_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,
+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 = &__mee_dt_interrupt_controller.controller,
- .num_interrupts = MEE_MAX_LOCAL_EXT_INTERRUPTS,
+ .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,
@@ -132,17 +132,17 @@ struct __mee_driver_sifive_local_external_interrupts0 __mee_dt_local_external_in
};
/* From local_external_interrupts_0 */
-#define __MEE_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__mee_dt_local_external_interrupts_0.irc)
+#define __METAL_DT_SIFIVE_LOCAL_EXINTR0_HANDLE (&__metal_dt_local_external_interrupts_0.irc)
-#define __MEE_DT_LOCAL_EXTERNAL_INTERRUPTS_0_HANDLE (&__mee_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 __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
- .vtable = &__mee_driver_vtable_riscv_plic0,
- .controller.vtable = &__mee_driver_vtable_riscv_plic0.plic_vtable,
+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 = &__mee_dt_interrupt_controller.controller,
+ .interrupt_parent = &__metal_dt_interrupt_controller.controller,
.interrupt_line = 11UL,
.control_base = 201326592UL,
.control_size = 67108864UL,
@@ -152,18 +152,18 @@ struct __mee_driver_riscv_plic0 __mee_dt_interrupt_controller_c000000 = {
};
/* From interrupt_controller@c000000 */
-#define __MEE_DT_RISCV_PLIC0_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
+#define __METAL_DT_RISCV_PLIC0_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
-#define __MEE_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__mee_dt_interrupt_controller_c000000.controller)
+#define __METAL_DT_INTERRUPT_CONTROLLER_C000000_HANDLE (&__metal_dt_interrupt_controller_c000000.controller)
/* From global_external_interrupts */
-struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_interrupts = {
- .vtable = &__mee_driver_vtable_sifive_global_external_interrupts0,
- .irc.vtable = &__mee_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
+struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_external_interrupts = {
+ .vtable = &__metal_driver_vtable_sifive_global_external_interrupts0,
+ .irc.vtable = &__metal_driver_vtable_sifive_global_external_interrupts0.global0_vtable,
.init_done = 0,
/* From interrupt_controller@c000000 */
- .interrupt_parent = &__mee_dt_interrupt_controller_c000000.controller,
- .num_interrupts = MEE_MAX_GLOBAL_EXT_INTERRUPTS,
+ .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller,
+ .num_interrupts = METAL_MAX_GLOBAL_EXT_INTERRUPTS,
.interrupt_lines[0] = 1,
.interrupt_lines[1] = 2,
.interrupt_lines[2] = 3,
@@ -294,53 +294,53 @@ struct __mee_driver_sifive_global_external_interrupts0 __mee_dt_global_external_
};
/* From global_external_interrupts */
-#define __MEE_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__mee_dt_global_external_interrupts.irc)
+#define __METAL_DT_SIFIVE_GLOBAL_EXINTR0_HANDLE (&__metal_dt_global_external_interrupts.irc)
-#define __MEE_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__mee_dt_global_external_interrupts.irc)
+#define __METAL_DT_GLOBAL_EXTERNAL_INTERRUPTS_HANDLE (&__metal_dt_global_external_interrupts.irc)
/* From pmp@0 */
-struct mee_pmp __mee_dt_pmp_0 = {
+struct metal_pmp __metal_dt_pmp_0 = {
.num_regions = 8UL,
};
-#define __MEE_DT_PMP_HANDLE (&__mee_dt_pmp_0)
+#define __METAL_DT_PMP_HANDLE (&__metal_dt_pmp_0)
/* From teststatus@4000 */
-struct __mee_driver_sifive_test0 __mee_dt_teststatus_4000 = {
- .vtable = &__mee_driver_vtable_sifive_test0,
- .shutdown.vtable = &__mee_driver_vtable_sifive_test0.shutdown,
+struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = {
+ .vtable = &__metal_driver_vtable_sifive_test0,
+ .shutdown.vtable = &__metal_driver_vtable_sifive_test0.shutdown,
.base = 16384UL,
.size = 4096UL,
};
/* From teststatus@4000 */
-#define __MEE_DT_SHUTDOWN_HANDLE (&__mee_dt_teststatus_4000.shutdown)
+#define __METAL_DT_SHUTDOWN_HANDLE (&__metal_dt_teststatus_4000.shutdown)
-#define __MEE_DT_TESTSTATUS_4000_HANDLE (&__mee_dt_teststatus_4000.shutdown)
+#define __METAL_DT_TESTSTATUS_4000_HANDLE (&__metal_dt_teststatus_4000.shutdown)
-#define __MEE_DT_MAX_HARTS 1
+#define __METAL_DT_MAX_HARTS 1
-asm (".weak __mee_cpu_table");
-struct __mee_driver_cpu *__mee_cpu_table[] = {
- &__mee_dt_cpu_0};
+asm (".weak __metal_cpu_table");
+struct __metal_driver_cpu *__metal_cpu_table[] = {
+ &__metal_dt_cpu_0};
-#define __MEE_DT_MAX_LEDS 0
+#define __METAL_DT_MAX_LEDS 0
-asm (".weak __mee_led_table");
-struct __mee_driver_sifive_gpio_led *__mee_led_table[] = {
+asm (".weak __metal_led_table");
+struct __metal_driver_sifive_gpio_led *__metal_led_table[] = {
NULL };
-#define __MEE_DT_MAX_BUTTONS 0
+#define __METAL_DT_MAX_BUTTONS 0
-asm (".weak __mee_button_table");
-struct __mee_driver_sifive_gpio_button *__mee_button_table[] = {
+asm (".weak __metal_button_table");
+struct __metal_driver_sifive_gpio_button *__metal_button_table[] = {
NULL };
-#define __MEE_DT_MAX_SWITCHES 0
+#define __METAL_DT_MAX_SWITCHES 0
-asm (".weak __mee_switch_table");
-struct __mee_driver_sifive_gpio_switch *__mee_switch_table[] = {
+asm (".weak __metal_switch_table");
+struct __metal_driver_sifive_gpio_switch *__metal_switch_table[] = {
NULL };
#endif
-#endif /*MEE__MACHINE__COREIP_E31__MEE_H*/
+#endif /*METAL__MACHINE__COREIP_E31__METAL_H*/
#endif/*ASSEMBLY*/
diff --git a/bsp/coreip-e31/mee.lds b/bsp/coreip-e31/metal.lds
index 08c0ccf..11c32e0 100644
--- a/bsp/coreip-e31/mee.lds
+++ b/bsp/coreip-e31/metal.lds
@@ -25,7 +25,7 @@ SECTIONS
.init :
{
- KEEP (*(.text.mee.init.enter))
+ KEEP (*(.text.metal.init.enter))
KEEP (*(SORT_NONE(.init)))
} >ram AT>ram :ram
@@ -123,14 +123,14 @@ SECTIONS
.litimalign :
{
. = ALIGN(4);
- PROVIDE( mee_segment_itim_source_start = . );
+ PROVIDE( metal_segment_itim_source_start = . );
} >ram AT>ram :ram
.ditimalign :
{
. = ALIGN(4);
- PROVIDE( mee_segment_itim_target_start = . );
+ PROVIDE( metal_segment_itim_target_start = . );
} >itim AT>ram :itim_init
@@ -141,21 +141,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 = . );
} >ram AT>ram :ram
.dalign :
{
. = ALIGN(4);
- PROVIDE( mee_segment_data_target_start = . );
+ PROVIDE( metal_segment_data_target_start = . );
} >ram AT>ram :ram_init
@@ -179,10 +179,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 :
@@ -199,23 +199,23 @@ 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;
- PROVIDE( mee_segment_heap_target_end = . );
+ PROVIDE( metal_segment_heap_target_end = . );
PROVIDE( _heap_end = . );
} >ram AT>ram :ram