diff options
| author | Xiang W <[email protected]> | 2024-01-17 18:41:58 +0800 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2024-02-06 12:29:31 +0530 |
| commit | 4c6b7cb76bfc82db71484c6695cfd5d3a93880e8 (patch) | |
| tree | fe382fca40eb0727edcd3c80c6454c31933f9c68 | |
| parent | 92e8affb31b21ddc5d1193cf754ce644db7b460a (diff) | |
firmware: fw_base.S: Improve loading u32
lwu exists under the current rv64 and should also exist under the rv128
in the future, so I modified the conditions of conditional compilation
so that it can adapt to the future situation
Signed-off-by: Xiang W <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
| -rw-r--r-- | firmware/fw_base.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/fw_base.S b/firmware/fw_base.S index 856bccdb..3425fe55 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -358,7 +358,7 @@ _scratch_init: /* t0 = source FDT start address */ add t0, a1, zero /* t2 = source FDT size in big-endian */ -#if __riscv_xlen == 64 +#if __riscv_xlen > 32 lwu t2, 4(t0) #else lw t2, 4(t0) @@ -424,7 +424,7 @@ _start_warm: /* Find HART count and HART stack size */ lla a4, platform -#if __riscv_xlen == 64 +#if __riscv_xlen > 32 lwu s7, SBI_PLATFORM_HART_COUNT_OFFSET(a4) lwu s8, SBI_PLATFORM_HART_STACK_SIZE_OFFSET(a4) #else @@ -440,7 +440,7 @@ _start_warm: beqz s9, 3f li a4, 0 1: -#if __riscv_xlen == 64 +#if __riscv_xlen > 32 lwu a5, (s9) #else lw a5, (s9) @@ -527,7 +527,7 @@ _hartid_to_scratch: * t2 -> Temporary */ lla t2, platform -#if __riscv_xlen == 64 +#if __riscv_xlen > 32 lwu t0, SBI_PLATFORM_HART_STACK_SIZE_OFFSET(t2) lwu t2, SBI_PLATFORM_HART_COUNT_OFFSET(t2) #else |