From 58ca525a7d35b2d4cd7045fd343fb6d85567f01d Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Sat, 22 Dec 2018 12:40:54 +0530 Subject: firmware: Don't depend on PLAT_HART_COUNT and PLAT_HART_STACK_SIZE The hart_count and hart_stack_size information is already available in "struct sbi_platform" so we use that instead of depending on PLAT_HART_COUNT and PLAT_HART_STACK_SIZE. Signed-off-by: Anup Patel --- firmware/fw_common.S | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/fw_common.S b/firmware/fw_common.S index 4c11e852..d426f15f 100644 --- a/firmware/fw_common.S +++ b/firmware/fw_common.S @@ -132,8 +132,9 @@ _start_warm: * s8 -> HART Stack Size */ csrr s6, mhartid - li s7, PLAT_HART_COUNT - li s8, PLAT_HART_STACK_SIZE + la a4, platform + lwu s7, RISCV_PLATFORM_HART_COUNT_OFFSET(a4) + lwu s8, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(a4) /* HART ID should be within expected limit */ csrr s6, mhartid @@ -202,8 +203,9 @@ _hartid_to_scratch: * s1 -> HART Stack End * s2 -> Temporary */ - li s0, PLAT_HART_STACK_SIZE - li s2, PLAT_HART_COUNT + la s2, platform + lwu s0, RISCV_PLATFORM_HART_STACK_SIZE_OFFSET(s2) + lwu s2, RISCV_PLATFORM_HART_COUNT_OFFSET(s2) mul s2, s2, s0 la s1, _fw_end add s1, s1, s2 -- cgit v1.3.1