diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-21 08:25:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-21 08:25:53 -0500 |
| commit | f0fcab6f8e11cee6d6b81a08fbfc641f6fcce0ec (patch) | |
| tree | 93c09653555ff696eb7705a74475a711cea8b316 /arch | |
| parent | ad38de2093035e07a09d6995a90a0d28fac75a95 (diff) | |
| parent | a09fea1d28fe3c69a64bee092f5a764274d26ca2 (diff) | |
Merge branch '2019-11-20-env-migration'
- Migrate a number of common environment related options to Kconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index f0df88c565..adfa51b6be 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -844,7 +844,7 @@ int board_late_init(void) * check if gd->env_addr is default_environment; then setenv bootcmd * and mcinitcmd. */ -#if !defined(CONFIG_ENV_ADDR) || defined(ENV_IS_EMBEDDED) +#ifdef CONFIG_SYS_RELOC_GD_ENV_ADDR if (gd->env_addr == (ulong)&default_environment[0]) { #else if (gd->env_addr + gd->reloc_off == (ulong)&default_environment[0]) { |