diff options
| author | Pali Rohár <pali@kernel.org> | 2022-07-10 13:42:55 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-21 09:23:00 -0500 |
| commit | 2827c2f07d6a5c498262cee7fe78aacfbf44f174 (patch) | |
| tree | f42641fdf3688dfbd6d518fb882beb9e6911e39b /boot/Kconfig | |
| parent | bebb393b340295edb9ba50a996fc0510cd1b6ac0 (diff) | |
| download | u-boot-2827c2f07d6a5c498262cee7fe78aacfbf44f174.tar.gz u-boot-2827c2f07d6a5c498262cee7fe78aacfbf44f174.tar.bz2 u-boot-2827c2f07d6a5c498262cee7fe78aacfbf44f174.zip | |
Fix usage of CONFIG_PREBOOT
Due to usage of PREBOOT in Kconfig, macro CONFIG_PREBOOT is always defined
when CONFIG_USE_PREBOOT is enabled. In case CONFIG_PREBOOT is not
explicitly enabled it is set to empty C string and therefore
'#ifdef CONFIG_PREBOOT' guard does not work. Fix this issue by introducing
a new Kconfig symbol PREBOOT_DEFINED which cause to define new C macro
CONFIG_PREBOOT_DEFINED only when CONFIG_PREBOOT is really defined.
Change usage of '#ifdef CONFIG_PREBOOT' by '#ifdef CONFIG_USE_PREBOOT' for
code which checks if preboot code would be called and by
'#ifdef CONFIG_PREBOOT_DEFINED' for defining preboot code.
Signed-off-by: Pali Rohár <pali@kernel.org>
Diffstat (limited to 'boot/Kconfig')
| -rw-r--r-- | boot/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index d5c582ebe8..4a001bcee8 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1492,6 +1492,10 @@ config PREBOOT help This is the default of "preboot" environment variable. +config PREBOOT_DEFINED + bool + default y if PREBOOT != "" + config DEFAULT_FDT_FILE string "Default fdt file" help |