summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/riscv/boot.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index 6a23b8a696..d3ae693376 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -38,20 +38,10 @@ static void do_arch_prog_run(struct arch_prog_run_args *args)
{
int hart_id;
struct prog *prog = args->prog;
- void *fdt = prog_entry_arg(prog);
-
- /*
- * Workaround selfboot putting the coreboot table into prog_entry_arg
- */
- if (prog_cbfs_type(prog) == CBFS_TYPE_SELF)
- fdt = HLS()->fdt;
-
- /*
- * If prog_entry_arg is not set (e.g. by fit_payload), use fdt from HLS
- * instead.
- */
- if (fdt == NULL)
- fdt = HLS()->fdt;
+ void *fdt = HLS()->fdt;
+
+ if (prog_cbfs_type(prog) == CBFS_TYPE_FIT)
+ fdt = prog_entry_arg(prog);
if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) {
if (CONFIG(RISCV_OPENSBI))