libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复aarch64-qemu启动失败问题 (#7661)

This commit is contained in:
wangqinglin 2023-06-12 19:49:18 +08:00 committed by GitHub
parent edaa0d9c8a
commit 76d8416e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcpu/aarch64/common/mmu.c
View File

@ -771,19 +771,19 @@ void rt_hw_mem_setup_early(unsigned long *tbl0, unsigned long *tbl1,
unsigned long size, unsigned long pv_off) unsigned long size, unsigned long pv_off)
{ {
int ret; int ret;
unsigned long count = (size + ARCH_SECTION_MASK) >> ARCH_SECTION_SHIFT;
/* setup pv off */ unsigned long normal_attr = MMU_MAP_CUSTOM(MMU_AP_KAUN, NORMAL_MEM);
rt_kmem_pvoff_set(pv_off);
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
unsigned long va = KERNEL_VADDR_START; unsigned long va = KERNEL_VADDR_START;
#else #else
extern unsigned char __start; extern unsigned char __start;
unsigned long va = (unsigned long) &__start; unsigned long va = (unsigned long) &__start;
va = RT_ALIGN_DOWN(va, 0x200000);
#endif #endif
unsigned long count = (size + ARCH_SECTION_MASK) >> ARCH_SECTION_SHIFT; /* setup pv off */
unsigned long normal_attr = MMU_MAP_CUSTOM(MMU_AP_KAUN, NORMAL_MEM); rt_kmem_pvoff_set(pv_off);
/* clean the first two pages */ /* clean the first two pages */
rt_memset((char *)tbl0, 0, ARCH_PAGE_SIZE); rt_memset((char *)tbl0, 0, ARCH_PAGE_SIZE);

2
libcpu/aarch64/cortex-a/entry_point.S
View File

@ -134,7 +134,7 @@ __start:
mov x3,0 mov x3,0
#endif #endif
ldr x2, =0x01000000 /* map 16M memory for kernel space */ ldr x2, =0x10000000 /* map 256M memory for kernel space */
bl rt_hw_mem_setup_early bl rt_hw_mem_setup_early
ldr x30, =after_mmu_enable /* set LR to after_mmu_enable function, it's a v_addr */ ldr x30, =after_mmu_enable /* set LR to after_mmu_enable function, it's a v_addr */