diff options
| author | Tom Rini <[email protected]> | 2023-11-17 13:15:33 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-11-17 13:15:33 -0500 |
| commit | cc7bc8237abd4beed458d8957a55b2ef46431886 (patch) | |
| tree | d3a20d0d2c1d336f2591190205af48a69c274cd8 /boot | |
| parent | 169c3cc49e40758956ee6c310f7f59a6443826a1 (diff) | |
| parent | 0585c28fda1007e4a90dea5f70723cff0b63dd98 (diff) | |
Merge branch '2023-11-17-assorted-important-fixes'
- Revert HAFDBS changes, correct spl_imx_romapi for eMMC, fix the virtio
rng in one case, fix bootstd in one case, and correct a Kconfig
description.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootflow.c | 3 | ||||
| -rw-r--r-- | boot/bootmeth_efi.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/boot/bootflow.c b/boot/bootflow.c index 6922e7e0c4e..1ea2966ae9a 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -467,7 +467,8 @@ void bootflow_free(struct bootflow *bflow) free(bflow->name); free(bflow->subdir); free(bflow->fname); - free(bflow->buf); + if (!(bflow->flags & BOOTFLOWF_STATIC_BUF)) + free(bflow->buf); free(bflow->os_name); free(bflow->fdt_fname); free(bflow->bootmeth_priv); diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index ae936c8daa1..9ba7734911e 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -160,6 +160,7 @@ static int efiload_read_file(struct bootflow *bflow, ulong addr) if (ret) return log_msg_ret("read", ret); bflow->buf = map_sysmem(addr, bflow->size); + bflow->flags |= BOOTFLOWF_STATIC_BUF; set_efi_bootdev(desc, bflow); |