Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

riscv: fix FDT loads during work area init

Browse Source 
Fixes #5139
This commit is contained in:
Gedare Bloom
2024-10-28 14:13:37 -06:00
committed by Amar Takhar
parent a1eb04be66
commit c6ad57b102
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bsps/riscv/shared/start/bspgetworkarea.c
View File

@@ -60,11 +60,6 @@ static void* get_end_of_memory_from_fdt(void)
int ac;
int sc;
int len;
/* start64, size64, start32, and size32 help to avoid unaligned access */
uint64_t start64;
uint64_t size64;
uint64_t start32;
uint64_t size32;
uintptr_t start;
uintptr_t size;
@@ -105,22 +100,16 @@ static void* get_end_of_memory_from_fdt(void)
}
if (ac == 1) {
start32 = fdt32_ld(&((fdt32_t *)val)[0]);
start = fdt32_to_cpu(start32);
size32 = fdt32_ld(&((fdt32_t *)val)[1]);
size = fdt32_to_cpu(size32);
start = fdt32_ld(&((fdt32_t *)val)[0]);
size = fdt32_ld(&((fdt32_t *)val)[1]);
}
if (ac == 2) {
start64 = fdt64_ld(&((fdt64_t *)val)[0]);
start = fdt64_to_cpu(start64);
start = fdt64_ld(&((fdt64_t *)val)[0]);
if (sc == 1) {
size32 = fdt32_ld(&((fdt32_t *)(val+8))[0]);
size = fdt32_to_cpu(size32);
}
else {
size64 = fdt64_ld(&((fdt64_t *)val)[1]);
size = fdt64_to_cpu(size64);
size = fdt32_ld(&((fdt32_t *)(val+8))[0]);
} else {
size = fdt64_ld(&((fdt64_t *)val)[1]);
}
}