From 513474cd1b6f3481ee72ec71df916880d7bc0232 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Fri, 21 Dec 2018 10:03:56 +0900 Subject: Fix FDT relocation Or rather, disable it if FW_PAYLOAD_FDT_ADDR is not defined. This correspond to cases where the underlying FW that loaded and started opensbi did not provide any FDT. In such case, the platform code will need to prepare one. Signed-off-by: Damien Le Moal --- firmware/fw_common.S | 2 ++ 1 file changed, 2 insertions(+) (limited to 'firmware') diff --git a/firmware/fw_common.S b/firmware/fw_common.S index a2685cf..9963fdd 100644 --- a/firmware/fw_common.S +++ b/firmware/fw_common.S @@ -41,6 +41,7 @@ _bss_zero: add a1, t1, zero _prev_arg1_override_done: +#ifdef FW_PAYLOAD_FDT_ADDR /* * Relocate Flatened Device Tree (FDT) * source FDT address = previous arg1 @@ -99,6 +100,7 @@ _fdt_reloc_again: add t1, t1, __SIZEOF_POINTER__ blt t1, t2, _fdt_reloc_again _fdt_reloc_done: +#endif /* Update boot hart flag */ la a4, _boot_hart_done -- cgit v1.2.3