Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 22:14:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: fit: simplify logic for FDT loading for non-OS boots

Browse source 
To better support bootin through an ATF or OPTEE, we need to
streamline some of the logic for when the FDT is appended to an image:
depending on the image type, we'd like to append the FDT not at all
(the case for the OS boot), to the 'firmware' image (if it is a
U-Boot) or to one of the loadables (if the 'firmware' is an ATF, an
OPTEE, or some other image-type and U-Boot is listed in the
loadabled).

To achieve this goal, we drop the os_boot flag and track the type of
image loaded.  If it is of type IH_OS_U_BOOT, we append the FDT.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: York Sun <york.sun@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich 2017-09-13 21:29:32 +02:00
parent f2efe6786e
commit d879616e9e
1 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
common/spl/spl_fit.c
View file

@ -218,6 +218,30 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
return 0; return 0;
} }
static int spl_fit_append_fdt(struct spl_image_info *spl_image,
struct spl_load_info *info, ulong sector,
void *fit, int images, ulong base_offset)
{
struct spl_image_info image_info;
int node, ret;
/* Figure out which device tree the board wants to use */
node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, 0);
if (node < 0) {
debug("%s: cannot find FDT node\n", __func__);
return node;
}
/*
* Read the device tree and place it after the image.
* Align the destination address to ARCH_DMA_MINALIGN.
*/
image_info.load_addr = spl_image->load_addr + spl_image->size;
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
&image_info);
return ret;
}
int spl_load_simple_fit(struct spl_image_info *spl_image, int spl_load_simple_fit(struct spl_image_info *spl_image,
struct spl_load_info *info, ulong sector, void *fit) struct spl_load_info *info, ulong sector, void *fit)
{ {
@ -225,7 +249,6 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
ulong size; ulong size;
unsigned long count; unsigned long count;
struct spl_image_info image_info; struct spl_image_info image_info;
bool boot_os = false;
int node = -1; int node = -1;
int images, ret; int images, ret;
int base_offset, align_len = ARCH_DMA_MINALIGN - 1; int base_offset, align_len = ARCH_DMA_MINALIGN - 1;
@ -273,17 +296,18 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
return -1; return -1;
} }
#ifdef CONFIG_SPL_OS_BOOT /*
/* Find OS image first */ * Find the U-Boot image using the following search order:
node = spl_fit_get_image_node(fit, images, FIT_KERNEL_PROP, 0); * - start at 'firmware' (e.g. an ARM Trusted Firmware)
if (node < 0) * - fall back 'kernel' (e.g. a Falcon-mode OS boot
debug("No kernel image.\n"); * - fall back to using the first 'loadables' entry
else */
boot_os = true;
#endif
/* find the U-Boot image */
if (node < 0) if (node < 0)
node = spl_fit_get_image_node(fit, images, "firmware", 0); node = spl_fit_get_image_node(fit, images, "firmware", 0);
#ifdef CONFIG_SPL_OS_BOOT
if (node < 0)
node = spl_fit_get_image_node(fit, images, FIT_KERNEL_PROP, 0);
#endif
if (node < 0) { if (node < 0) {
debug("could not find firmware image, trying loadables...\n"); debug("could not find firmware image, trying loadables...\n");
node = spl_fit_get_image_node(fit, images, "loadables", 0); node = spl_fit_get_image_node(fit, images, "loadables", 0);
@ -305,34 +329,29 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_SPL_OS_BOOT /*
* For backward compatibility, we treat the first node that is
* as a U-Boot image, if no OS-type has been declared.
*/
if (!fit_image_get_os(fit, node, &spl_image->os)) if (!fit_image_get_os(fit, node, &spl_image->os))
debug("Image OS is %s\n", genimg_get_os_name(spl_image->os)); debug("Image OS is %s\n", genimg_get_os_name(spl_image->os));
#else #if !defined(CONFIG_SPL_OS_BOOT)
spl_image->os = IH_OS_U_BOOT; else
spl_image->os = IH_OS_U_BOOT;
#endif #endif
if (!boot_os) { /*
/* Figure out which device tree the board wants to use */ * Booting a next-stage U-Boot may require us to append the FDT.
node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, 0); * We allow this to fail, as the U-Boot image might embed its FDT.
if (node < 0) { */
debug("%s: cannot find FDT node\n", __func__); if (spl_image->os == IH_OS_U_BOOT)
return node; spl_fit_append_fdt(spl_image, info, sector, fit,
} images, base_offset);
/*
* Read the device tree and place it after the image.
* Align the destination address to ARCH_DMA_MINALIGN.
*/
image_info.load_addr = spl_image->load_addr + spl_image->size;
ret = spl_load_fit_image(info, sector, fit, base_offset, node,
&image_info);
if (ret < 0)
return ret;
}
/* Now check if there are more images for us to load */ /* Now check if there are more images for us to load */
for (; ; index++) { for (; ; index++) {
uint8_t os_type = IH_OS_INVALID;
node = spl_fit_get_image_node(fit, images, "loadables", index); node = spl_fit_get_image_node(fit, images, "loadables", index);
if (node < 0) if (node < 0)
break; break;
@ -342,6 +361,13 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
if (ret < 0) if (ret < 0)
continue; continue;
if (!fit_image_get_os(fit, node, &os_type))
debug("Loadable is %s\n", genimg_get_os_name(os_type));
if (spl_image->os == IH_OS_U_BOOT)
spl_fit_append_fdt(spl_image, info, sector,
fit, images, base_offset);
/* /*
* If the "firmware" image did not provide an entry point, * If the "firmware" image did not provide an entry point,
* use the first valid entry point from the loadables. * use the first valid entry point from the loadables.