From c891acca172dfc60719419e19338508a83d97931 Mon Sep 17 00:00:00 2001 From: Alexandre Ghiti <alexandre.ghiti@canonical.com> Date: Wed, 27 Oct 2021 09:43:36 +0200 Subject: include: sbi_utils: Introduce an helper to get fdt base address This simply adds an helper to get fdt address which is more explicit than sbi_scratch_thishart_arg1_ptr. Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com> Reviewed-by: Xiang W <wxjstz@126.com> Reviewed-by: Anup Patel <anup.patel@wdc.com> --- platform/fpga/ariane/platform.c | 3 ++- platform/fpga/openpiton/platform.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'platform/fpga') diff --git a/platform/fpga/ariane/platform.c b/platform/fpga/ariane/platform.c index 5acc446..c6f0ffd 100644 --- a/platform/fpga/ariane/platform.c +++ b/platform/fpga/ariane/platform.c @@ -11,6 +11,7 @@ #include <sbi/sbi_const.h> #include <sbi/sbi_hart.h> #include <sbi/sbi_platform.h> +#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/irqchip/plic.h> @@ -76,7 +77,7 @@ static int ariane_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_fixups(fdt); return 0; diff --git a/platform/fpga/openpiton/platform.c b/platform/fpga/openpiton/platform.c index 924053e..59c6702 100644 --- a/platform/fpga/openpiton/platform.c +++ b/platform/fpga/openpiton/platform.c @@ -76,7 +76,7 @@ static int openpiton_early_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); rc = fdt_parse_uart8250(fdt, &uart_data, "ns16550"); if (!rc) @@ -112,7 +112,7 @@ static int openpiton_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_fixups(fdt); return 0; -- cgit v1.2.3