mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-17 16:53:06 +00:00
f77549fe74
When using QEMU to have a quick test of booting U-Boot S-mode payload directly without the needs of preparing the SPI flash or SD card images for SiFive Unleashed board, as per the instructions [1], it currently does not boot any more. This was caused by the OF_PRIOR_STAGE removal, as gd->fdt_blob no longer points to a valid DTB. OF_BOARD is supposed to replace OF_PRIOR_STAGE, hence we need to add the OF_BOARD logic in board_fdt_blob_setup(). [1] https://qemu.readthedocs.io/en/latest/system/riscv/sifive_u.html#running-u-boot Fixes:2e8d2f8843("riscv: Remove OF_PRIOR_STAGE from RISC-V boards") Fixes:d6f8ab30a2("treewide: Remove OF_PRIOR_STAGE") Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Simon Glass <sjg@chromium.org>
31 lines
559 B
C
31 lines
559 B
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2020-2021, SiFive Inc
|
|
*
|
|
* Authors:
|
|
* Pragnesh Patel <pragnesh.patel@sifive.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <cpu_func.h>
|
|
#include <dm.h>
|
|
#include <asm/sections.h>
|
|
|
|
void *board_fdt_blob_setup(int *err)
|
|
{
|
|
*err = 0;
|
|
if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) {
|
|
if (gd->arch.firmware_fdt_addr)
|
|
return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
|
|
}
|
|
|
|
return (ulong *)&_end;
|
|
}
|
|
|
|
int board_init(void)
|
|
{
|
|
/* enable all cache ways */
|
|
enable_caches();
|
|
|
|
return 0;
|
|
}
|