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 /include/env_default.h | |
| parent | bebb393b340295edb9ba50a996fc0510cd1b6ac0 (diff) | |
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 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/env_default.h b/include/env_default.h index 4e461c815a..7c9c00a969 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -62,7 +62,7 @@ const char default_environment[] = { #ifdef CONFIG_SYS_DISABLE_AUTOLOAD "autoload=0\0" #endif -#ifdef CONFIG_PREBOOT +#ifdef CONFIG_PREBOOT_DEFINED "preboot=" CONFIG_PREBOOT "\0" #endif #ifdef CONFIG_ROOTPATH |