mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
483ab3dc80
Remove code duplication in spl_nand_load_image(). No functional changes. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Scott Wood <scottwood@freescale.com> Cc: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Heiko Schocher <hs@denx.de> [trini: Add back cast to unsigned long of spl_image.load_addr] Signed-off-by: Tom Rini <trini@konsulko.com>
98 lines
2.5 KiB
C
98 lines
2.5 KiB
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 <nand.h>
|
|
|
|
#if defined(CONFIG_SPL_NAND_RAW_ONLY)
|
|
void spl_nand_load_image(void)
|
|
{
|
|
nand_init();
|
|
|
|
nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
|
|
CONFIG_SYS_NAND_U_BOOT_SIZE,
|
|
(void *)CONFIG_SYS_NAND_U_BOOT_DST);
|
|
spl_set_header_raw_uboot();
|
|
nand_deselect();
|
|
}
|
|
#else
|
|
static int spl_nand_load_element(int offset, struct image_header *header)
|
|
{
|
|
int err;
|
|
|
|
err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
|
|
if (err)
|
|
return err;
|
|
|
|
spl_parse_image_header(header);
|
|
return nand_spl_load_image(offset, spl_image.size,
|
|
(void *)(unsigned long)spl_image.load_addr);
|
|
}
|
|
|
|
void spl_nand_load_image(void)
|
|
{
|
|
struct image_header *header;
|
|
int *src __attribute__((unused));
|
|
int *dst __attribute__((unused));
|
|
|
|
debug("spl: nand - using hw ecc\n");
|
|
nand_init();
|
|
|
|
/*use CONFIG_SYS_TEXT_BASE as temporary storage area */
|
|
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
if (!spl_start_uboot()) {
|
|
/*
|
|
* load parameter image
|
|
* load to temp position since nand_spl_load_image reads
|
|
* a whole block which is typically larger than
|
|
* CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite
|
|
* following sections like BSS
|
|
*/
|
|
nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
|
|
CONFIG_CMD_SPL_WRITE_SIZE,
|
|
(void *)CONFIG_SYS_TEXT_BASE);
|
|
/* copy to destintion */
|
|
for (dst = (int *)CONFIG_SYS_SPL_ARGS_ADDR,
|
|
src = (int *)CONFIG_SYS_TEXT_BASE;
|
|
src < (int *)(CONFIG_SYS_TEXT_BASE +
|
|
CONFIG_CMD_SPL_WRITE_SIZE);
|
|
src++, dst++) {
|
|
writel(readl(src), dst);
|
|
}
|
|
|
|
/* load linux */
|
|
nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
|
|
sizeof(*header), (void *)header);
|
|
spl_parse_image_header(header);
|
|
if (header->ih_os == IH_OS_LINUX) {
|
|
/* happy - was a linux */
|
|
nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
|
|
spl_image.size, (void *)spl_image.load_addr);
|
|
nand_deselect();
|
|
return;
|
|
} else {
|
|
puts("The Expected Linux image was not "
|
|
"found. Please check your NAND "
|
|
"configuration.\n");
|
|
puts("Trying to start u-boot now...\n");
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_NAND_ENV_DST
|
|
spl_nand_load_element(CONFIG_ENV_OFFSET, header);
|
|
#ifdef CONFIG_ENV_OFFSET_REDUND
|
|
spl_nand_load_element(CONFIG_ENV_OFFSET_REDUND, header);
|
|
#endif
|
|
#endif
|
|
/* Load u-boot */
|
|
spl_nand_load_element(CONFIG_SYS_NAND_U_BOOT_OFFS, header);
|
|
nand_deselect();
|
|
}
|
|
#endif
|