On Sun, Apr 10, 2022 at 06:46:52AM +0200, Marek Vasut wrote: > This reverts commit 8d61237edbf6314a701cf78da2c5893a73ff5438. > > This commit broke environment on literally every board I have access > to, with this revert in place, environment works as it should again. > The problem I observe with this patch is that saved environment in > either SPI NOR or eMMC is never used, the system always falls back > to default environment. The 'saveenv' command does succeed, but then > after reset, the default env is again used. > > Furthermore, the commit introduced duplicate code in env_init(), this: > " > if (!prio) { > gd->env_addr = (ulong)&default_environment[0]; > gd->env_valid = ENV_INVALID; > > return 0; > } > > if (ret == -ENOENT) { > gd->env_addr = (ulong)&default_environment[0]; > gd->env_valid = ENV_INVALID; > > return 0; > } > " > > Furthermore, the commit is missing DCO SoB line. > > Also note that upstream does not support UltraZed EG board, so > this might have been a patch pulled from downstream which did > depend on some other downstream behavior. > > Signed-off-by: Marek Vasut <ma...@denx.de> > Cc: felix.vietme...@jila.colorado.edu <felix.vietme...@jila.colorado.edu> > Cc: Tom Rini <tr...@konsulko.com>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: PGP signature