mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-12 14:23:00 +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>
134 lines
2.7 KiB
C
134 lines
2.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2019 Western Digital Corporation or its affiliates.
|
|
*
|
|
* Authors:
|
|
* Anup Patel <anup.patel@wdc.com>
|
|
*/
|
|
|
|
#include <cpu_func.h>
|
|
#include <dm.h>
|
|
#include <env.h>
|
|
#include <init.h>
|
|
#include <log.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/bug.h>
|
|
#include <linux/delay.h>
|
|
#include <misc.h>
|
|
#include <spl.h>
|
|
#include <asm/sections.h>
|
|
|
|
/*
|
|
* This define is a value used for error/unknown serial.
|
|
* If we really care about distinguishing errors and 0 is
|
|
* valid, we'll need a different one.
|
|
*/
|
|
#define ERROR_READING_SERIAL_NUMBER 0
|
|
|
|
#ifdef CONFIG_MISC_INIT_R
|
|
|
|
#if CONFIG_IS_ENABLED(SIFIVE_OTP)
|
|
static u32 otp_read_serialnum(struct udevice *dev)
|
|
{
|
|
int ret;
|
|
u32 serial[2] = {0};
|
|
|
|
for (int i = 0xfe * 4; i > 0; i -= 8) {
|
|
ret = misc_read(dev, i, serial, sizeof(serial));
|
|
|
|
if (ret != sizeof(serial)) {
|
|
printf("%s: error reading serial from OTP\n", __func__);
|
|
break;
|
|
}
|
|
|
|
if (serial[0] == ~serial[1])
|
|
return serial[0];
|
|
}
|
|
|
|
return ERROR_READING_SERIAL_NUMBER;
|
|
}
|
|
#endif
|
|
|
|
static u32 fu540_read_serialnum(void)
|
|
{
|
|
u32 serial = ERROR_READING_SERIAL_NUMBER;
|
|
|
|
#if CONFIG_IS_ENABLED(SIFIVE_OTP)
|
|
struct udevice *dev;
|
|
int ret;
|
|
|
|
/* init OTP */
|
|
ret = uclass_get_device_by_driver(UCLASS_MISC,
|
|
DM_DRIVER_GET(sifive_otp), &dev);
|
|
|
|
if (ret) {
|
|
debug("%s: could not find otp device\n", __func__);
|
|
return serial;
|
|
}
|
|
|
|
/* read serial from OTP and set env var */
|
|
serial = otp_read_serialnum(dev);
|
|
#endif
|
|
|
|
return serial;
|
|
}
|
|
|
|
static void fu540_setup_macaddr(u32 serialnum)
|
|
{
|
|
/* Default MAC address */
|
|
unsigned char mac[6] = { 0x70, 0xb3, 0xd5, 0x92, 0xf0, 0x00 };
|
|
|
|
/*
|
|
* We derive our board MAC address by ORing last three bytes
|
|
* of board serial number to above default MAC address.
|
|
*
|
|
* This logic of deriving board MAC address is taken from
|
|
* SiFive FSBL and is kept unchanged.
|
|
*/
|
|
mac[5] |= (serialnum >> 0) & 0xff;
|
|
mac[4] |= (serialnum >> 8) & 0xff;
|
|
mac[3] |= (serialnum >> 16) & 0xff;
|
|
|
|
/* Update environment variable */
|
|
eth_env_set_enetaddr("ethaddr", mac);
|
|
}
|
|
|
|
int misc_init_r(void)
|
|
{
|
|
u32 serial_num;
|
|
char buf[9] = {0};
|
|
|
|
/* Set ethaddr environment variable from board serial number */
|
|
if (!env_get("serial#")) {
|
|
serial_num = fu540_read_serialnum();
|
|
if (!serial_num) {
|
|
WARN(true, "Board serial number should not be 0 !!\n");
|
|
return 0;
|
|
}
|
|
snprintf(buf, sizeof(buf), "%08x", serial_num);
|
|
env_set("serial#", buf);
|
|
fu540_setup_macaddr(serial_num);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
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;
|
|
}
|