mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 17:28:15 +00: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>
67 lines
1.5 KiB
C
67 lines
1.5 KiB
C
/*
|
|
* Copyright (C) 2012 Stefan Roese <sr@denx.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
|
|
int spl_nor_load_image(void)
|
|
{
|
|
/*
|
|
* Loading of the payload to SDRAM is done with skipping of
|
|
* the mkimage header in this SPL NOR driver
|
|
*/
|
|
spl_image.flags |= SPL_COPY_PAYLOAD_ONLY;
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
if (!spl_start_uboot()) {
|
|
const struct image_header *header;
|
|
|
|
/*
|
|
* Load Linux from its location in NOR flash to its defined
|
|
* location in SDRAM
|
|
*/
|
|
header = (const struct image_header *)CONFIG_SYS_OS_BASE;
|
|
|
|
if (image_get_os(header) == IH_OS_LINUX) {
|
|
/* happy - was a Linux */
|
|
|
|
spl_parse_image_header(header);
|
|
|
|
memcpy((void *)spl_image.load_addr,
|
|
(void *)(CONFIG_SYS_OS_BASE +
|
|
sizeof(struct image_header)),
|
|
spl_image.size);
|
|
|
|
/*
|
|
* Copy DT blob (fdt) to SDRAM. Passing pointer to
|
|
* flash doesn't work (16 KiB should be enough for DT)
|
|
*/
|
|
memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR,
|
|
(void *)(CONFIG_SYS_FDT_BASE),
|
|
(16 << 10));
|
|
|
|
return 0;
|
|
} else {
|
|
puts("The Expected Linux image was not found.\n"
|
|
"Please check your NOR configuration.\n"
|
|
"Trying to start u-boot now...\n");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Load real U-Boot from its location in NOR flash to its
|
|
* defined location in SDRAM
|
|
*/
|
|
spl_parse_image_header(
|
|
(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
|
|
|
|
memcpy((void *)spl_image.load_addr,
|
|
(void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
|
|
spl_image.size);
|
|
|
|
return 0;
|
|
}
|