diff options
| author | Tom Rini <[email protected]> | 2025-06-20 12:54:41 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-20 12:57:47 -0600 |
| commit | dbf7fd557a73ded3141db3c2cf5c572989378825 (patch) | |
| tree | 3ddc26559c485e357e1d0a72d8ec2551250831cf /common | |
| parent | 73fd2456231fe12db3bd5dbdab3f9f62bd8e643d (diff) | |
| parent | 224224c9fa287bed428d5c507b8926357191848a (diff) | |
Merge patch series "Consistent Kconfig environment options CONFIG_ENV_ prefix"
Marek Vasut <[email protected]> says:
Rename the environment related variables and add ENV_ prefix, so that
all configuration options which are related to environment would have
an CONFIG_ENV_ prefix. No functional change.
Link: https://lore.kernel.org/r/[email protected]
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_r.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index 46b5ded69d8..143d51d0633 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -144,7 +144,7 @@ static int initr_reloc_global_data(void) */ fixup_cpu(); #endif -#ifdef CONFIG_SYS_RELOC_GD_ENV_ADDR +#ifdef CONFIG_ENV_RELOC_GD_ENV_ADDR /* * Relocate the early env_addr pointer unless we know it is not inside * the binary. Some systems need this and for the rest, it doesn't hurt. @@ -442,9 +442,6 @@ static int should_load_env(void) if (IS_ENABLED(CONFIG_OF_CONTROL)) return ofnode_conf_read_int("load-environment", 1); - if (IS_ENABLED(CONFIG_DELAY_ENVIRONMENT)) - return 0; - return 1; } |