mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-26 13:44:29 +08:00
36afd45136
Make spl_*_load_image() functions return a value instead of hanging if a problem is encountered. This enables main spl code to make the decision whether to hang or not, thus preparing it to support alternative boot devices. Some boot devices (namely nand and spi) do not hang on error. Instead, they return normally and SPL proceeds to boot the contents of the load address. This is considered a bug and is rectified by hanging on error for these devices as well. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Ian Campbell <ijc@hellion.org.uk> Cc: Hans De Goede <hdegoede@redhat.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Jagan Teki <jteki@openedev.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
56 lines
1.0 KiB
C
56 lines
1.0 KiB
C
/*
|
|
* (C) Copyright 2013
|
|
* Texas Instruments, <www.ti.com>
|
|
*
|
|
* Dan Murphy <dmurphy@ti.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*
|
|
* Derived work from spl_usb.c
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
#include <asm/u-boot.h>
|
|
#include <sata.h>
|
|
#include <scsi.h>
|
|
#include <errno.h>
|
|
#include <fat.h>
|
|
#include <image.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int spl_sata_load_image(void)
|
|
{
|
|
int err;
|
|
block_dev_desc_t *stor_dev;
|
|
|
|
err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
|
|
if (err) {
|
|
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
|
|
printf("spl: sata init failed: err - %d\n", err);
|
|
#endif
|
|
return err;
|
|
} else {
|
|
/* try to recognize storage devices immediately */
|
|
scsi_scan(0);
|
|
stor_dev = scsi_get_dev(0);
|
|
if (!stor_dev)
|
|
return -ENODEV;
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
|
|
#endif
|
|
err = spl_load_image_fat(stor_dev,
|
|
CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
|
|
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
|
|
if (err) {
|
|
puts("Error loading sata device\n");
|
|
return err;
|
|
}
|
|
|
|
return 0;
|
|
}
|