GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: fit: allocate a temporary buffer to load the overlays

Browse source 
If the node describing an overlay does not specify a load address, it will
be loaded at the address previously used.
Fixing it by allocating a temporary buffer that will be used as a
default load address. By default, the size of the buffer is 64kB which
should be plenty for most use cases.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Jean-Jacques Hiblot 2019-10-22 16:39:13 +02:00 • committed by Tom Rini
parent 99329be2c5
commit ea376ebc9b
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Kconfig
View file

@ -453,6 +453,15 @@ config SPL_LOAD_FIT_APPLY_OVERLAY
also load device-tree overlays from the FIT image an apply them also load device-tree overlays from the FIT image an apply them
over the device tree. over the device tree.
config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
depends on SPL_LOAD_FIT_APPLY_OVERLAY
default 0x10000
hex "size of temporary buffer used to load the overlays"
help
The size of the area where the overlays will be loaded and
uncompress. Must be at least as large as biggest overlay
(uncompressed)
config SPL_LOAD_FIT_FULL config SPL_LOAD_FIT_FULL
bool "Enable SPL loading U-Boot as a FIT (full fitImage features)" bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
select SPL_FIT select SPL_FIT

34
common/spl/spl_fit.c
View file

@ -9,11 +9,16 @@
#include <fpga.h> #include <fpga.h>
#include <gzip.h> #include <gzip.h>
#include <image.h> #include <image.h>
#include <linux/libfdt.h> #include <malloc.h>
#include <spl.h> #include <spl.h>
#include <linux/libfdt.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
#define CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ (64 * 1024)
#endif
#ifndef CONFIG_SYS_BOOTM_LEN #ifndef CONFIG_SYS_BOOTM_LEN
#define CONFIG_SYS_BOOTM_LEN (64 << 20) #define CONFIG_SYS_BOOTM_LEN (64 << 20)
#endif #endif
@ -314,33 +319,52 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
spl_image->fdt_addr = (void *)image_info.load_addr; spl_image->fdt_addr = (void *)image_info.load_addr;
#if !CONFIG_IS_ENABLED(FIT_IMAGE_TINY) #if !CONFIG_IS_ENABLED(FIT_IMAGE_TINY)
if (CONFIG_IS_ENABLED(LOAD_FIT_APPLY_OVERLAY)) { if (CONFIG_IS_ENABLED(LOAD_FIT_APPLY_OVERLAY)) {
void *tmpbuffer = NULL;
for (; ; index++) { for (; ; index++) {
node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP,
index); index);
if (node < 0) { if (node < 0) {
debug("%s: No additional FDT node\n", __func__); debug("%s: No additional FDT node\n", __func__);
return 0; break;
} }
if (!tmpbuffer) {
/*
* allocate memory to store the DT overlay
* before it is applied. It may not be used
* depending on how the overlay is stored, so
* don't fail yet if the allocation failed.
*/
tmpbuffer = malloc(CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ);
if (!tmpbuffer)
debug("%s: unable to allocate space for overlays\n",
__func__);
}
image_info.load_addr = (ulong)tmpbuffer;
ret = spl_load_fit_image(info, sector, fit, base_offset, ret = spl_load_fit_image(info, sector, fit, base_offset,
node, &image_info); node, &image_info);
if (ret < 0) if (ret < 0)
return ret; break;
/* Make room in FDT for changes from the overlay */ /* Make room in FDT for changes from the overlay */
ret = fdt_increase_size(spl_image->fdt_addr, ret = fdt_increase_size(spl_image->fdt_addr,
image_info.size); image_info.size);
if (ret < 0) if (ret < 0)
return ret; break;
ret = fdt_overlay_apply_verbose(spl_image->fdt_addr, ret = fdt_overlay_apply_verbose(spl_image->fdt_addr,
(void *)image_info.load_addr); (void *)image_info.load_addr);
if (ret) if (ret)
return ret; break;
debug("%s: DT overlay %s applied\n", __func__, debug("%s: DT overlay %s applied\n", __func__,
fit_get_name(fit, node, NULL)); fit_get_name(fit, node, NULL));
} }
if (tmpbuffer)
free(tmpbuffer);
if (ret)
return ret;
} }
/* Try to make space, so we can inject details on the loadables */ /* Try to make space, so we can inject details on the loadables */
ret = fdt_shrink_to_minimum(spl_image->fdt_addr, 8192); ret = fdt_shrink_to_minimum(spl_image->fdt_addr, 8192);