diff options
| author | Nathaniel Graff <nathaniel.graff@sifive.com> | 2019-05-02 20:04:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 20:04:34 +0000 |
| commit | 139149a670354a74cb2a5693c270bb24ea39dc05 (patch) | |
| tree | 01ff5eda110417a43bcbff9c6b76fb62a6a5191d /bsp/coreip-e24-rtl | |
| parent | b178ea51465fdaf68e848dc8f55be03bd140013a (diff) | |
| parent | b555941a3d06c31e03ecf51eef608c7356bdb3b9 (diff) | |
Merge pull request #239 from sifive/bare-header
Update to use metal-platform.h (bare header)
Diffstat (limited to 'bsp/coreip-e24-rtl')
| -rw-r--r-- | bsp/coreip-e24-rtl/metal-platform.h | 36 | ||||
| -rw-r--r-- | bsp/coreip-e24-rtl/metal.h | 14 |
2 files changed, 44 insertions, 6 deletions
diff --git a/bsp/coreip-e24-rtl/metal-platform.h b/bsp/coreip-e24-rtl/metal-platform.h new file mode 100644 index 0000000..c83d491 --- /dev/null +++ b/bsp/coreip-e24-rtl/metal-platform.h @@ -0,0 +1,36 @@ +#ifndef COREIP_E24_RTL__METAL_PLATFORM_H +#define COREIP_E24_RTL__METAL_PLATFORM_H + +/* From pmp@0 */ +#define METAL_RISCV_PMP_0_NUM_REGIONS 8UL + +#define METAL_RISCV_PMP + +/* From interrupt_controller@2000000 */ +#define METAL_SIFIVE_CLIC0_2000000_BASE_ADDRESS 33554432UL +#define METAL_SIFIVE_CLIC0_2000000_SIZE 16777216UL +#define METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMINTS 143UL +#define METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMLEVELS 16UL +#define METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMINTBITS 4UL + +#define METAL_SIFIVE_CLIC0 +#define METAL_SIFIVE_CLIC0_MSIP_BASE 0UL +#define METAL_SIFIVE_CLIC0_MTIMECMP_BASE 16384UL +#define METAL_SIFIVE_CLIC0_MTIME 49144UL +#define METAL_SIFIVE_CLIC0_CLICINTIP_BASE 0UL +#define METAL_SIFIVE_CLIC0_CLICINTIE_BASE 1024UL +#define METAL_SIFIVE_CLIC0_CLICINTCTL_BASE 2048UL +#define METAL_SIFIVE_CLIC0_CLICCFG 3072UL +#define METAL_SIFIVE_CLIC0_MMODE_APERTURE 8388608UL +#define METAL_SIFIVE_CLIC0_HSMODE_APERTURE 10485760UL +#define METAL_SIFIVE_CLIC0_SMODE_APERTURE 12582912UL +#define METAL_SIFIVE_CLIC0_UMODE_APERTURE 14680064UL + +/* From teststatus@4000 */ +#define METAL_SIFIVE_TEST0_4000_BASE_ADDRESS 16384UL +#define METAL_SIFIVE_TEST0_4000_SIZE 4096UL + +#define METAL_SIFIVE_TEST0 +#define METAL_SIFIVE_TEST0_FINISHER_OFFSET 0UL + +#endif /* COREIP_E24_RTL__METAL_PLATFORM_H*/ diff --git a/bsp/coreip-e24-rtl/metal.h b/bsp/coreip-e24-rtl/metal.h index bada746..5c8776b 100644 --- a/bsp/coreip-e24-rtl/metal.h +++ b/bsp/coreip-e24-rtl/metal.h @@ -3,6 +3,8 @@ #ifndef COREIP_E24_RTL__METAL_H #define COREIP_E24_RTL__METAL_H +#include <metal/machine/platform.h> + #ifdef __METAL_MACHINE_MACROS #ifndef __METAL_CLINT_NUM_PARENTS @@ -139,24 +141,24 @@ struct __metal_driver_riscv_cpu_intc __metal_dt_cpu_0_interrupt_controller = { /* From pmp@0 */ struct metal_pmp __metal_dt_pmp_0 = { - .num_regions = 8UL, + .num_regions = METAL_RISCV_PMP_0_NUM_REGIONS, }; /* From interrupt_controller@2000000 */ struct __metal_driver_sifive_clic0 __metal_dt_interrupt_controller_2000000 = { .vtable = &__metal_driver_vtable_sifive_clic0, .controller.vtable = &__metal_driver_vtable_sifive_clic0.clic_vtable, - .control_base = 33554432UL, - .control_size = 16777216UL, + .control_base = METAL_SIFIVE_CLIC0_2000000_BASE_ADDRESS, + .control_size = METAL_SIFIVE_CLIC0_2000000_SIZE, .init_done = 0, .num_interrupts = METAL_MAX_CLIC_INTERRUPTS, .interrupt_parent = &__metal_dt_cpu_0_interrupt_controller.controller, .interrupt_lines[0] = 3, .interrupt_lines[1] = 7, .interrupt_lines[2] = 11, - .num_subinterrupts = 143UL, - .num_intbits = 4UL, - .max_levels = 16UL, + .num_subinterrupts = METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMINTS, + .num_intbits = METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMINTBITS, + .max_levels = METAL_SIFIVE_CLIC0_2000000_SIFIVE_NUMLEVELS, .interrupt_controller = 1, }; |