diff options
Diffstat (limited to 'bsps/aarch64/xilinx-versal/start')
-rw-r--r-- | bsps/aarch64/xilinx-versal/start/bspstart.c | 12 | ||||
-rw-r--r-- | bsps/aarch64/xilinx-versal/start/bspstarthooks.c | 3 | ||||
-rw-r--r-- | bsps/aarch64/xilinx-versal/start/bspstartmmu.c | 56 |
3 files changed, 69 insertions, 2 deletions
diff --git a/bsps/aarch64/xilinx-versal/start/bspstart.c b/bsps/aarch64/xilinx-versal/start/bspstart.c index 2f0048ddf3..89b06a0ff4 100644 --- a/bsps/aarch64/xilinx-versal/start/bspstart.c +++ b/bsps/aarch64/xilinx-versal/start/bspstart.c @@ -38,6 +38,18 @@ #include <bsp/irq-generic.h> #include <bsp/linker-symbols.h> +#include <rtems/score/basedefs.h> + +RTEMS_WEAK uint32_t versal_clock_i2c0(void) +{ + return VERSAL_CLOCK_I2C0; +} + +RTEMS_WEAK uint32_t versal_clock_i2c1(void) +{ + return VERSAL_CLOCK_I2C1; +} + void bsp_start( void ) { bsp_interrupt_initialize(); diff --git a/bsps/aarch64/xilinx-versal/start/bspstarthooks.c b/bsps/aarch64/xilinx-versal/start/bspstarthooks.c index be98675a24..71d161125b 100644 --- a/bsps/aarch64/xilinx-versal/start/bspstarthooks.c +++ b/bsps/aarch64/xilinx-versal/start/bspstarthooks.c @@ -35,11 +35,12 @@ */ #include <bsp.h> +#include <bsp/irq-generic.h> #include <bsp/start.h> BSP_START_TEXT_SECTION void bsp_start_hook_0(void) { - /* Do nothing */ + bsp_interrupt_facility_initialize(); } BSP_START_TEXT_SECTION void bsp_start_hook_1(void) diff --git a/bsps/aarch64/xilinx-versal/start/bspstartmmu.c b/bsps/aarch64/xilinx-versal/start/bspstartmmu.c index 8b622aec7d..ee87890293 100644 --- a/bsps/aarch64/xilinx-versal/start/bspstartmmu.c +++ b/bsps/aarch64/xilinx-versal/start/bspstartmmu.c @@ -36,11 +36,19 @@ #include <bsp.h> #include <bsp/start.h> #include <bsp/aarch64-mmu.h> +#include <libcpu/mmu-vmsav8-64.h> + +#include <rtems/malloc.h> +#include <rtems/sysinit.h> BSP_START_DATA_SECTION static const aarch64_mmu_config_entry versal_mmu_config_table[] = { AARCH64_MMU_DEFAULT_SECTIONS, - { /* APU GIC */ + { /* Devices */ + .begin = 0xf1000000U, + .end = 0xf2000000U, + .flags = AARCH64_MMU_DEVICE + }, { /* APU GIC */ .begin = 0xf9000000U, .end = 0xf90c0000U, .flags = AARCH64_MMU_DEVICE @@ -56,6 +64,29 @@ versal_mmu_config_table[] = { .begin = 0xff000000U, .end = 0xffc00000U, .flags = AARCH64_MMU_DEVICE + }, { /* DDRMC0_region1_mem, if not used size is 0 and ignored */ + .begin = (uintptr_t) bsp_r1_ram_base, + .end = (uintptr_t) bsp_r1_ram_end, + .flags = AARCH64_MMU_DATA_RW_CACHED + } +}; + +/* + * Create an MMU table to get the R1 base and end. This avoids + * relocation errors as the R1 addresses are in the upper A64 address + * space. + * + * The versal_mmu_config_table table cannot be used because the regions + * in that table have no identifiers to indicate which region is the + * the DDRMC0_region1_mem region. + */ +static const struct mem_region { + uintptr_t begin; + uintptr_t end; +} bsp_r1_region[] = { + { /* DDRMC0_region1_mem, if not used size is 0 and ignored */ + .begin = (uintptr_t) bsp_r1_ram_base, + .end = (uintptr_t) bsp_r1_ram_end, } }; @@ -77,3 +108,26 @@ versal_setup_mmu_and_cache( void ) aarch64_mmu_enable(); } + +void bsp_r1_heap_extend(void); +void bsp_r1_heap_extend(void) +{ + const struct mem_region* r1 = &bsp_r1_region[0]; + if (r1->begin != r1->end) { + rtems_status_code sc = + rtems_heap_extend((void*) r1->begin, r1->end - r1->begin); + if (sc != RTEMS_SUCCESSFUL) { + bsp_fatal(BSP_FATAL_HEAP_EXTEND_ERROR); + } + } +} + +/* + * Initialise after the IDLE thread exists so the protected heap + * extend call has a valid context. + */ +RTEMS_SYSINIT_ITEM( + bsp_r1_heap_extend, + RTEMS_SYSINIT_IDLE_THREADS, + RTEMS_SYSINIT_ORDER_LAST +); |