diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /include/env_callback.h | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'include/env_callback.h')
| -rw-r--r-- | include/env_callback.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/env_callback.h b/include/env_callback.h index 85e7fe25f8f..a9a14f2a84a 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -14,8 +14,8 @@ #define ENV_CALLBACK_VAR ".callbacks" /* Board configs can define additional static callback bindings */ -#ifndef CONFIG_ENV_CALLBACK_LIST_STATIC -#define CONFIG_ENV_CALLBACK_LIST_STATIC +#ifndef CFG_ENV_CALLBACK_LIST_STATIC +#define CFG_ENV_CALLBACK_LIST_STATIC #endif #ifdef CONFIG_SILENT_CONSOLE @@ -80,7 +80,7 @@ SILENT_CALLBACK \ "stdin:console,stdout:console,stderr:console," \ "serial#:serialno," \ - CONFIG_ENV_CALLBACK_LIST_STATIC + CFG_ENV_CALLBACK_LIST_STATIC #ifndef CONFIG_SPL_BUILD void env_callback_init(struct env_entry *var_entry); |