LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-18333-1 spl: nor: add fit image support 

Extend spl_nor to support FIT image loading.
CONFIG_SYS_UBOOT_BASE is the Uboot location in NOR memmap address.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 60e943cd1a7c248eccc8892073efdada588a208d)
This commit is contained in:
Peng Fan 2018-05-17 15:13:24 +08:00 committed by Ye Li
parent 168b25bee5
commit 288c8eedb0
1 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
common/spl/spl_nor.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2012 Stefan Roese <sr@denx.de> * Copyright (C) 2012 Stefan Roese <sr@denx.de>
* Copyright 2018 NXP
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -7,9 +8,39 @@
#include <common.h> #include <common.h>
#include <spl.h> #include <spl.h>
static ulong spl_nor_fit_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf)
{
memcpy(buf, (void *)sector, count);
return count;
}
static int nor_load_legacy(struct spl_image_info *spl_image)
{
int ret;
/*
* Load real U-Boot from its location in NOR flash to its
* defined location in SDRAM
*/
ret = spl_parse_image_header(spl_image,
(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
if (ret)
return ret;
memcpy((void *)(unsigned long)spl_image->load_addr,
(void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
spl_image->size);
return 0;
}
static int spl_nor_load_image(struct spl_image_info *spl_image, static int spl_nor_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
const struct image_header *header;
int ret; int ret;
/* /*
* Loading of the payload to SDRAM is done with skipping of * Loading of the payload to SDRAM is done with skipping of
@ -19,7 +50,6 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT
if (!spl_start_uboot()) { if (!spl_start_uboot()) {
const struct image_header *header;
/* /*
* Load Linux from its location in NOR flash to its defined * Load Linux from its location in NOR flash to its defined
@ -50,19 +80,28 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
} }
#endif #endif
/* header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
* Load real U-Boot from its location in NOR flash to its sizeof(struct image_header));
* defined location in SDRAM
*/
ret = spl_parse_image_header(spl_image,
(const struct image_header *)CONFIG_SYS_UBOOT_BASE);
if (ret)
return ret;
memcpy((void *)(unsigned long)spl_image->load_addr, memcpy((void *)header, (void *)CONFIG_SYS_UBOOT_BASE, 0x40);
(void *)(CONFIG_SYS_UBOOT_BASE + sizeof(struct image_header)),
spl_image->size);
return 0; if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
image_get_magic(header) == FDT_MAGIC) {
struct spl_load_info load;
debug("Found FIT\n");
load.dev = NULL;
load.priv = NULL;
load.filename = NULL;
load.bl_len = 1;
load.read = spl_nor_fit_read;
ret = spl_load_simple_fit(spl_image, &load,
CONFIG_SYS_UBOOT_BASE,
(void *)header);
} else {
ret = nor_load_legacy(spl_image);
}
return ret;
} }
SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image); SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image);