diff options
| author | Simon Glass <sjg@chromium.org> | 2021-09-25 19:43:35 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-08 15:53:27 -0400 |
| commit | 1df654a6af5b14731383039f868f12db7069a476 (patch) | |
| tree | e41a848c70265971a34f54b81ed9ee10f300a66c /include | |
| parent | 78740bcce87518d2c71c96e41429c4e65f516635 (diff) | |
| download | u-boot-1df654a6af5b14731383039f868f12db7069a476.tar.gz | |
image: Drop most #ifdefs in image-board.c
Remove ifdefs in this file, so far as possible without too much
refactoring.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/image.h b/include/image.h index 04eccb12a92..34d13ada84b 100644 --- a/include/image.h +++ b/include/image.h @@ -298,7 +298,11 @@ typedef struct bootm_headers { image_header_t legacy_hdr_os_copy; /* header copy */ ulong legacy_hdr_valid; -#if CONFIG_IS_ENABLED(FIT) + /* + * The fit_ members are only used with FIT, but it involves a lot of + * #ifdefs to avoid compiling that code. Since FIT is the standard + * format, even for SPL, this extra data size seems worth it. + */ const char *fit_uname_cfg; /* configuration node unit name */ void *fit_hdr_os; /* os FIT image header */ @@ -316,7 +320,6 @@ typedef struct bootm_headers { void *fit_hdr_setup; /* x86 setup FIT image header */ const char *fit_uname_setup; /* x86 setup subimage node name */ int fit_noffset_setup;/* x86 setup subimage node offset */ -#endif #ifndef USE_HOSTCC image_info_t os; /* os image info */ |