From b555941a3d06c31e03ecf51eef608c7356bdb3b9 Mon Sep 17 00:00:00 2001 From: Nathaniel Graff Date: Mon, 29 Apr 2019 14:50:24 -0700 Subject: Update BSPs for platform header Signed-off-by: Nathaniel Graff --- bsp/coreip-s54-arty/metal.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'bsp/coreip-s54-arty/metal.h') diff --git a/bsp/coreip-s54-arty/metal.h b/bsp/coreip-s54-arty/metal.h index 546c3c6..6a6dbb7 100644 --- a/bsp/coreip-s54-arty/metal.h +++ b/bsp/coreip-s54-arty/metal.h @@ -3,6 +3,8 @@ #ifndef COREIP_S54_ARTY__METAL_H #define COREIP_S54_ARTY__METAL_H +#include + #ifdef __METAL_MACHINE_MACROS #define __METAL_CLINT_NUM_PARENTS 2 @@ -180,7 +182,7 @@ struct __metal_driver_sifive_uart0 __metal_dt_serial_20000000; struct __metal_driver_fixed_clock __metal_dt_clock_0 = { .vtable = &__metal_driver_vtable_fixed_clock, .clock.vtable = &__metal_driver_vtable_fixed_clock.clock, - .rate = 32500000UL, + .rate = METAL_FIXED_CLOCK_0_CLOCK_FREQUENCY, }; struct metal_memory __metal_dt_mem_dtim_80000000 = { @@ -220,8 +222,8 @@ struct metal_memory __metal_dt_mem_spi_20004000 = { 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, + .control_base = METAL_RISCV_CLINT0_2000000_BASE_ADDRESS, + .control_size = METAL_RISCV_CLINT0_2000000_SIZE, .init_done = 0, .num_interrupts = METAL_MAX_CLINT_INTERRUPTS, .interrupt_parents[0] = &__metal_dt_cpu_0_interrupt_controller.controller, @@ -253,16 +255,16 @@ struct __metal_driver_riscv_plic0 __metal_dt_interrupt_controller_c000000 = { .init_done = 0, .interrupt_parents[0] = &__metal_dt_cpu_0_interrupt_controller.controller, .interrupt_lines[0] = 11, - .control_base = 201326592UL, - .control_size = 67108864UL, - .max_priority = 7UL, - .num_interrupts = 27UL, + .control_base = METAL_RISCV_PLIC0_C000000_BASE_ADDRESS, + .control_size = METAL_RISCV_PLIC0_C000000_SIZE, + .max_priority = METAL_RISCV_PLIC0_C000000_RISCV_MAX_PRIORITY, + .num_interrupts = METAL_RISCV_PLIC0_C000000_RISCV_NDEV, .interrupt_controller = 1, }; /* From pmp@0 */ struct metal_pmp __metal_dt_pmp_0 = { - .num_regions = 8UL, + .num_regions = METAL_RISCV_PMP_0_NUM_REGIONS, }; /* From local_external_interrupts_0 */ @@ -308,8 +310,8 @@ struct __metal_driver_sifive_global_external_interrupts0 __metal_dt_global_exter struct __metal_driver_sifive_gpio0 __metal_dt_gpio_20002000 = { .vtable = &__metal_driver_vtable_sifive_gpio0, .gpio.vtable = &__metal_driver_vtable_sifive_gpio0.gpio, - .base = 536879104UL, - .size = 4096UL, + .base = METAL_SIFIVE_GPIO0_20002000_BASE_ADDRESS, + .size = METAL_SIFIVE_GPIO0_20002000_SIZE, /* From interrupt_controller@c000000 */ .interrupt_parent = &__metal_dt_interrupt_controller_c000000.controller, .num_interrupts = METAL_MAX_GPIO_INTERRUPTS, @@ -465,8 +467,8 @@ struct __metal_driver_sifive_gpio_switch __metal_dt_switch_3 = { 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, + .control_base = METAL_SIFIVE_SPI0_20004000_BASE_ADDRESS, + .control_size = METAL_SIFIVE_SPI0_20004000_SIZE, .clock = NULL, .pinmux = NULL, }; @@ -483,8 +485,8 @@ struct __metal_driver_sifive_test0 __metal_dt_teststatus_4000 = { 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, + .control_base = METAL_SIFIVE_UART0_20000000_BASE_ADDRESS, + .control_size = METAL_SIFIVE_UART0_20000000_SIZE, /* From clock@0 */ .clock = &__metal_dt_clock_0.clock, .pinmux = NULL, -- cgit v1.2.1-18-gbd029