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 /include | |
| 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 'include')
| -rw-r--r-- | include/bootflow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/bootflow.h b/include/bootflow.h index 44d3741eaca..fede8f22a2b 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -43,9 +43,12 @@ enum bootflow_state_t { * and it is using the prior-stage FDT, which is the U-Boot control FDT. * This is only possible with the EFI bootmeth (distro-efi) and only when * CONFIG_OF_HAS_PRIOR_STAGE is enabled + * @BOOTFLOWF_STATIC_BUF: Indicates that @bflow->buf is statically set, rather + * than being allocated by malloc(). */ enum bootflow_flags_t { BOOTFLOWF_USE_PRIOR_FDT = 1 << 0, + BOOTFLOWF_STATIC_BUF = 1 << 1, }; /** @@ -72,7 +75,7 @@ enum bootflow_flags_t { * @fname: Filename of bootflow file (allocated) * @logo: Logo to display for this bootflow (BMP format) * @logo_size: Size of the logo in bytes - * @buf: Bootflow file contents (allocated) + * @buf: Bootflow file contents (allocated unless @flags & BOOTFLOWF_STATIC_BUF) * @size: Size of bootflow file in bytes * @err: Error number received (0 if OK) * @os_name: Name of the OS / distro being booted, or NULL if not known |