u-boot.git/boot, branch v2022.01

Revert "image: Remove #ifdefs from select_ramdisk()"

2021-12-20T14:36:32+00:00

This reverts commit f33a2c1bd0fb371511a485cac1f182ba50db51be.

This causes a crash on some platforms as seen here:
https://lore.kernel.org/r/f153017b-c41a-0d32-67b9-f288e695f900@baylibre.com/

Reported-by: Neil Armstrong 
Signed-off-by: Tom Rini

image: Explicitly declare do_bdinfo()

2021-11-15T19:33:33+00:00

Compiler is not happy:

common/image-board.c: In function ‘boot_get_kbd’:
common/image-board.c:902:17: warning: implicit declaration of function ‘do_bdinfo’ [-Wimplicit-function-declaration]
  902 |                 do_bdinfo(NULL, 0, 0, NULL);
      |                 ^~~~~~~~~

Move the forward declaration to a header.

Signed-off-by: Andy Shevchenko 
Reviewed-by: Simon Glass

bootstage: Differentiate boot progress kconfig entries

2021-11-13T15:17:22+00:00

Both U-Boot proper and SPL entries were using the same description.

Fixes: b55881dd ("bootstage: Add SPL support")
Signed-off-by: Jan Kiszka 
Reviewed-by: Simon Glass

Remove LYNX KDI remainders

2021-11-12T00:02:44+00:00

The last board that used to set CONFIG_LYNXKDI has been removed in
commit 242836a893ae ("powerpc: ppc4xx: remove pcs440ep support"),
doc/README.lynxkdi only talks about a MPC8260 board being supported,
and the mpc8260 support has been removed four years ago in commit
2eb48ff7a210d ("powerpc, 8260: remove support for mpc8260") already,
and common/lynxkdi.c only consists of an "#error" statement these
days, so it seems like the LYNX KDI code is dead code nowadays.
Let's remove it now.

Signed-off-by: Thomas Huth

pxe: Return the file size from the getfile() function

2021-11-12T00:02:36+00:00

It is pretty strange that the pxe code uses the 'filesize' environment
variable find the size of a file it has just read.

Partly this is because it uses the command-line interpreter to parse its
request to load the file.

As a first step towards unwinding this, return it directly from the
getfile() function. This makes the code a bit longer, for now, but will be
cleaned up in future patches.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried

pxe: Drop get_bootfile_path()

2021-11-12T00:02:30+00:00

This function no longer makes sense, since it is pretty easy to prepend
the boot directory to the filename. Drop it and update its only caller.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried

pxe: Clean up the use of bootfile

2021-11-12T00:02:28+00:00

The 'bootfile' environment variable is read in the bowels of pxe_util to
provide a directory to which all loaded files are relative.

This is not obvious from the API to PXE and it is strange to make the
caller set an environment variable rather than pass this as a parameter.

The code is also convoluted, which this feature implemented by
get_bootfile_path().

Update the API to improve this. Unfortunately this means that
pxe_setup_ctx() can fail, so add error checking.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried

pxe: Move common parsing coding into pxe_util

2021-11-12T00:02:27+00:00

Both the syslinux and pxe commands use essentially the same code to parse
and run extlinux.conf files. Move this into a common function.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried

pxe: Tidy up code style a little in pxe_utils

2021-11-12T00:02:26+00:00

There are a few more blank lines than makes sense for readability. Also
free() handles a NULL pointer so drop the pointless checks.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried

pxe: Tidy up some comments in pxe_utils

2021-11-12T00:02:25+00:00

Some of these functions are a big vague in the comments. Tidy them up a
bit.

Signed-off-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Tested-by: Artem Lapkin 
Reviewed-by: Ramon Fried