diff options
| author | Tom Rini <[email protected]> | 2021-01-14 08:50:23 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-01-14 08:50:23 -0500 |
| commit | 35772ff4f63a302e0b873096372c70292fb0af79 (patch) | |
| tree | ffa00f958cf61d12a9348b27699e3980f9d9f15d /common | |
| parent | ab1a425524a79eeca61e7b67fdf382c7a499346f (diff) | |
| parent | 8e70f1cb3f2c18d574b087d4fc1d79e68ce98fa9 (diff) | |
Merge tag 'efi-2021-04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc1
In the UEFI sub-system:
* implement non-blocking file services
* print boot device and file path in helloworld.efi
* improve detection of boot device
* correct argument handling in efivar.py
* implement EFI_DT_FIXUP_PROTOCOL
Bug fixes:
* adjust conitrace command for low baud rates
* check that FIT images are valid FDTs
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index 6a8787ca0aa..21c44bdf691 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1553,6 +1553,12 @@ int fit_image_check_comp(const void *fit, int noffset, uint8_t comp) */ int fit_check_format(const void *fit) { + /* A FIT image must be a valid FDT */ + if (fdt_check_header(fit)) { + debug("Wrong FIT format: not a flattened device tree\n"); + return 0; + } + /* mandatory / node 'description' property */ if (fdt_getprop(fit, 0, FIT_DESC_PROP, NULL) == NULL) { debug("Wrong FIT format: no description\n"); |