mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-05 05:51:34 +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>
152 lines
3.5 KiB
C
152 lines
3.5 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#include <common.h>
|
|
#include <env.h>
|
|
#include <part.h>
|
|
#include <spl.h>
|
|
#include <spl_load.h>
|
|
#include <asm/u-boot.h>
|
|
#include <ext4fs.h>
|
|
#include <errno.h>
|
|
#include <image.h>
|
|
|
|
static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
|
|
ulong size, void *buf)
|
|
{
|
|
int ret;
|
|
loff_t actlen;
|
|
|
|
ret = ext4fs_read(buf, file_offset, size, &actlen);
|
|
if (ret)
|
|
return ret;
|
|
return actlen;
|
|
}
|
|
|
|
int spl_load_image_ext(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition,
|
|
const char *filename)
|
|
{
|
|
s32 err;
|
|
loff_t filelen;
|
|
struct disk_partition part_info = {};
|
|
struct spl_load_info load;
|
|
|
|
if (part_get_info(block_dev, partition, &part_info)) {
|
|
printf("spl: no partition table found\n");
|
|
return -1;
|
|
}
|
|
|
|
ext4fs_set_blk_dev(block_dev, &part_info);
|
|
|
|
err = ext4fs_mount();
|
|
if (!err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
err = ext4fs_open(filename, &filelen);
|
|
if (err < 0) {
|
|
puts("spl: ext4fs_open failed\n");
|
|
goto end;
|
|
}
|
|
|
|
spl_set_bl_len(&load, 1);
|
|
load.read = spl_fit_read;
|
|
err = spl_load(spl_image, bootdev, &load, filelen, 0);
|
|
|
|
end:
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
if (err < 0)
|
|
printf("%s: error reading image %s, err - %d\n",
|
|
__func__, filename, err);
|
|
#endif
|
|
|
|
return err < 0;
|
|
}
|
|
|
|
#if CONFIG_IS_ENABLED(OS_BOOT)
|
|
int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition)
|
|
{
|
|
int err;
|
|
__maybe_unused loff_t filelen, actlen;
|
|
struct disk_partition part_info = {};
|
|
__maybe_unused char *file;
|
|
|
|
if (part_get_info(block_dev, partition, &part_info)) {
|
|
printf("spl: no partition table found\n");
|
|
return -1;
|
|
}
|
|
|
|
ext4fs_set_blk_dev(block_dev, &part_info);
|
|
|
|
err = ext4fs_mount();
|
|
if (!err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: ext4fs mount err - %d\n", __func__, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
#if defined(CONFIG_SPL_ENV_SUPPORT)
|
|
file = env_get("falcon_args_file");
|
|
if (file) {
|
|
err = ext4fs_open(file, &filelen);
|
|
if (err < 0) {
|
|
puts("spl: ext4fs_open failed\n");
|
|
goto defaults;
|
|
}
|
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
|
if (err < 0) {
|
|
printf("spl: error reading image %s, err - %d, falling back to default\n",
|
|
file, err);
|
|
goto defaults;
|
|
}
|
|
file = env_get("falcon_image_file");
|
|
if (file) {
|
|
err = spl_load_image_ext(spl_image, bootdev, block_dev,
|
|
partition, file);
|
|
if (err != 0) {
|
|
puts("spl: falling back to default\n");
|
|
goto defaults;
|
|
}
|
|
|
|
return 0;
|
|
} else {
|
|
puts("spl: falcon_image_file not set in environment, falling back to default\n");
|
|
}
|
|
} else {
|
|
puts("spl: falcon_args_file not set in environment, falling back to default\n");
|
|
}
|
|
|
|
defaults:
|
|
#endif
|
|
|
|
err = ext4fs_open(CONFIG_SPL_FS_LOAD_ARGS_NAME, &filelen);
|
|
if (err < 0)
|
|
puts("spl: ext4fs_open failed\n");
|
|
|
|
err = ext4fs_read((void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0, filelen, &actlen);
|
|
if (err < 0) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("%s: error reading image %s, err - %d\n",
|
|
__func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
|
|
#endif
|
|
return -1;
|
|
}
|
|
|
|
return spl_load_image_ext(spl_image, bootdev, block_dev, partition,
|
|
CONFIG_SPL_FS_LOAD_KERNEL_NAME);
|
|
}
|
|
#else
|
|
int spl_load_image_ext_os(struct spl_image_info *spl_image,
|
|
struct spl_boot_device *bootdev,
|
|
struct blk_desc *block_dev, int partition)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
#endif
|