mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-08 07:21:27 +02:00
d678a59d2d
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
92 lines
2.1 KiB
C
92 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2023
|
|
* Ventana Micro Systems Inc.
|
|
*
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
#include <spl_load.h>
|
|
#include <image.h>
|
|
#include <fs.h>
|
|
#include <asm/cache.h>
|
|
#include <asm/io.h>
|
|
|
|
struct blk_dev {
|
|
const char *ifname;
|
|
const char *filename;
|
|
char dev_part_str[8];
|
|
};
|
|
|
|
static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
|
|
ulong size, void *buf)
|
|
{
|
|
loff_t actlen;
|
|
int ret;
|
|
struct blk_dev *dev = (struct blk_dev *)load->priv;
|
|
|
|
ret = fs_set_blk_dev(dev->ifname, dev->dev_part_str, FS_TYPE_ANY);
|
|
if (ret) {
|
|
printf("spl: unable to set blk_dev %s %s. Err - %d\n",
|
|
dev->ifname, dev->dev_part_str, ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = fs_read(dev->filename, virt_to_phys(buf), file_offset, size,
|
|
&actlen);
|
|
if (ret < 0) {
|
|
printf("spl: error reading image %s. Err - %d\n",
|
|
dev->filename, ret);
|
|
return ret;
|
|
}
|
|
|
|
return actlen;
|
|
}
|
|
|
|
int spl_blk_load_image(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
enum uclass_id uclass_id, int devnum, int partnum)
|
|
{
|
|
const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
|
|
struct blk_desc *blk_desc;
|
|
loff_t filesize;
|
|
struct blk_dev dev;
|
|
struct spl_load_info load;
|
|
int ret;
|
|
|
|
blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum);
|
|
if (!blk_desc) {
|
|
printf("blk desc for %d %d not found\n", uclass_id, devnum);
|
|
return -ENODEV;
|
|
}
|
|
|
|
blk_show_device(uclass_id, devnum);
|
|
|
|
dev.filename = filename;
|
|
dev.ifname = blk_get_uclass_name(uclass_id);
|
|
snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x",
|
|
devnum, partnum);
|
|
ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY);
|
|
if (ret) {
|
|
printf("spl: unable to set blk_dev %s %s. Err - %d\n",
|
|
dev.ifname, dev.dev_part_str, ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = fs_size(filename, &filesize);
|
|
if (ret) {
|
|
printf("spl: unable to get file size: %s. Err - %d\n",
|
|
filename, ret);
|
|
return ret;
|
|
}
|
|
|
|
load.read = spl_fit_read;
|
|
if (IS_ENABLED(CONFIG_SPL_FS_FAT_DMA_ALIGN))
|
|
spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
|
|
else
|
|
spl_set_bl_len(&load, 1);
|
|
load.priv = &dev;
|
|
return spl_load(spl_image, bootdev, &load, filesize, 0);
|
|
}
|