u-boot.git/env/env.c, branch v2024.01

env: Remove unused NEEDS_MANUAL_RELOC code bits

2023-09-14T14:42:24+00:00

The last user of the NEEDS_MANUAL_RELOC has been removed in commit
26af162ac8f8 ("arch: m68k: Implement relocation")
Remove now unused NEEDS_MANUAL_RELOC code.

Signed-off-by: Marek Vasut

env: Remove misuse of env is nowhere leftover

2023-05-16T20:12:21+00:00

When using a list of writeable variables, the initial values come from
the built-in default environment since commit 5ab81058364b
("env: Complete generic support for writable list"). Remove leftover of
misuse of the env is nowhere driver as default environment.

Signed-off-by: Stefan Herbrechtsmeier

env: Complete generic support for writable list

2023-02-10T16:24:08+00:00

This completes what 890feecaab72 started by selecting ENV_APPEND and
loading the default env before any other sources. This ensures that load
operations pick up all non-writable vars from the default env and only
permitted parts from other locations according to the regular
priorities.

With this change, boards only need to define the list of writable
variables but no longer have to provide a custom env_get_location
implementation.

CC: Joe Hershberger 
CC: Marek Vasut 
CC: Stefan Herbrechtsmeier 
Signed-off-by: Jan Kiszka 
Reviewed-by: Marek Vasut

env: Drop ENV_IS_IN_SATA

2023-02-07T19:33:48+00:00

This is not used anywhere, so drop it.

Signed-off-by: Simon Glass

env: add failing trace in env_erase

2023-01-11T20:02:24+00:00

Add trace in env save to indicate any errors to end user and avoid
silent output when the command 'env erase' is not executed as it is
done in env_save with commit 8968288cb477 ("env: add failing trace in
env_save")

Signed-off-by: Patrick Delaunay 
Signed-off-by: Patrick Delaunay 
Reviewed-by: Patrice Chotard 
Reviewed-by: Heiko Schocher

env: Implement lower priority arch_env_get_location()

2022-04-21T13:08:40+00:00

Currently there is only one way to override desired environment location,
by implementing env_get_location(). This is increasingly being conflated
both on board level and architecture level, which leads to a problem on
boards where this function is already implemented on architecture level,
since those boards have no way to override this environment location on
board level anymore.

Implement arch_env_get_location() function which is architecture specific
and should only ever be implemented in architecture code. This function
has lower priority than env_get_location(), which should only ever be
implemented in board code, and which overrides the arch_env_get_location()
architecture environment selection.

This way, architecture can define its default environment chooser, while
board can now override it as needed at all times.

There is no functional change, since env_get_location() simply returns
arch_env_get_location(), and arch_env_get_location() implements the
current env_get_location() default content.

Signed-off-by: Marek Vasut 
Cc: Adam Ford 
Cc: Fabio Estevam 
Cc: Marek Behún 
Cc: Peng Fan 
Cc: Simon Glass 
Cc: Stefano Babic 
Cc: Tim Harvey 
Cc: Tom Rini 
Cc: Tommaso Merciai 
Cc: Vladimir Oltean

Revert "env: Load env when ENV_IS_NOWHERE is only location selected"

2022-04-10T15:20:16+00:00

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 
Cc: Felix.Vietmeyer@jila.colorado.edu 
Cc: Tom Rini

env: Load env when ENV_IS_NOWHERE is only location selected

2022-04-07T17:52:36+00:00

This patch prevent u-boot from hanging on a UltraZed EG board (zynqmp).

Without the patch,
(drv = env_driver_lookup(ENVOP_INIT, prio))
evaluates to 0, causing prio = 0
Then, (!prio) is hit, returning -ENODEV causing a stall.

With the patch,
instead of returning -ENODEV and causing a stall, we
set gd->env_addr (is this really needed?)
and then
mark gd->env_valid = ENV_INVALID to use the default env.

env: Inline env_get_char() into its only user

2021-10-21T18:50:48+00:00

This function is a relic from the past when environment was read from
underlying device one character at a time.

It is used only in the case when getting an environemnt variable prior
relocation, and the function is simple enough to be inlined there.

Since env_get_char() is being changed to simple access to an array, we
can drop the failing cases and simplify the code (this could have been
done before, since env_get_char() did not fail even before).

Signed-off-by: Marek Behún 
Reviewed-by: Simon Glass

env: Drop env_get_char_spec() and old, unused .get_char() implementations

2021-10-21T18:50:48+00:00

Commit b2cdef4861be ("env: restore old env_get_char() behaviour")
dropped the .get_char() method from struct env_driver, but left the two
existing implementations (eeprom and nvram) in case someone would use
them by overwriting weak function env_get_char_spec().

Since this was never done in the 3.5 years, let's drop these methods and
simplify the code.

Signed-off-by: Marek Behún 
Reviewed-by: Simon Glass