mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 09:48:16 +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>
33 lines
848 B
C
33 lines
848 B
C
/*
|
|
* Copyright (C) 2013
|
|
* ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com>
|
|
*
|
|
* Based on common/spl/spl_nand.c
|
|
* Copyright (C) 2011
|
|
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#include <common.h>
|
|
#include <config.h>
|
|
#include <spl.h>
|
|
#include <asm/io.h>
|
|
#include <onenand_uboot.h>
|
|
|
|
int spl_onenand_load_image(void)
|
|
{
|
|
struct image_header *header;
|
|
|
|
debug("spl: onenand\n");
|
|
|
|
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
|
|
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
|
|
/* Load u-boot */
|
|
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
|
|
CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
|
|
spl_parse_image_header(header);
|
|
onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
|
|
spl_image.size, (void *)spl_image.load_addr);
|
|
|
|
return 0;
|
|
}
|