diff options
Diffstat (limited to 'libcpu/aarch64/common/setup.c')
| -rw-r--r-- | libcpu/aarch64/common/setup.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/libcpu/aarch64/common/setup.c b/libcpu/aarch64/common/setup.c index 6a91f131f6..3ecddbc523 100644 --- a/libcpu/aarch64/common/setup.c +++ b/libcpu/aarch64/common/setup.c @@ -22,10 +22,7 @@ #include <setup.h> #include <stdlib.h> #include <ioremap.h> -#include <drivers/ofw.h> -#include <drivers/ofw_fdt.h> -#include <drivers/ofw_raw.h> -#include <drivers/core/dm.h> +#include <rtdevice.h> #define rt_sysreg_write(sysreg, val) \ __asm__ volatile ("msr "RT_STRINGIFY(sysreg)", %0"::"r"((rt_uint64_t)(val))) @@ -166,6 +163,8 @@ void rt_hw_common_setup(void) static struct mem_desc platform_mem_desc; void *kernel_start, *kernel_end, *memheap_start = RT_NULL, *memheap_end = RT_NULL; + system_vectors_init(); + #ifdef RT_USING_SMART rt_hw_mmu_map_init(&rt_kernel_space, (void*)0xfffffffff0000000, 0x10000000, MMUTable, PV_OFFSET); #else @@ -336,6 +335,10 @@ void rt_hw_common_setup(void) cpu_info_init(); +#ifdef RT_USING_PIC + rt_pic_init(); + rt_pic_irq_init(); +#else /* initialize hardware interrupt */ rt_hw_interrupt_init(); @@ -344,8 +347,9 @@ void rt_hw_common_setup(void) /* initialize timer for os tick */ rt_hw_gtimer_init(); +#endif - #ifdef RT_USING_COMPONENTS_INIT +#ifdef RT_USING_COMPONENTS_INIT rt_components_board_init(); #endif @@ -421,9 +425,14 @@ rt_weak void rt_hw_secondary_cpu_bsp_start(void) rt_hw_mmu_ktbl_set((unsigned long)MMUTable); +#ifdef RT_USING_PIC + rt_pic_irq_init(); +#else rt_hw_interrupt_init(); +#endif rt_dm_secondary_cpu_init(); + rt_hw_interrupt_umask(RT_SCHEDULE_IPI); rt_hw_interrupt_umask(RT_STOP_IPI); |