u-boot.git/boot/pxe_utils.c, branch v2022.04

cmd: pxe_utils: sysboot: add kaslr-seed generation support

2022-02-11T14:00:47+00:00

this will add kaslrseed keyword to sysboot lable,
when it set, it will request to genarate random number
from hwrng as kaslr-seed.

with this patch exlinux.conf label looks like

label l0
        menu testing
        linux /boot/vmlinuz-5.15.16-arm
        initrd /boot/initramfs-5.15.16-arm.img
        fdtdir /boot/dtbs/5.15.16-arm/
        kaslrseed
        append root=UUID=92ae1e50-eeeb-4c5b-8939-7e1cd6cfb059 ro

Tested on Khadas VIM with kernel 5.16.0-rc5-arm64, Debian 11.

Signed-off-by: Zhang Ning

doc: replace @return by Return:

2022-01-19T17:11:34+00:00

Sphinx expects Return: and not @return to indicate a return value.

find . -name '*.c' -exec \
sed -i 's/^\(\s\)\*\(\s*\)@return\(\s\)/\1*\2Return:\3/' {} \;

find . -name '*.h' -exec \
sed -i 's/^\(\s\)\*\(\s*\)@return\(\s\)/\1*\2Return:\3/' {} \;

Signed-off-by: Heinrich Schuchardt

cmd: pxe_utils: sysboot: add label override support

2022-01-15T16:42:48+00:00

This will allow consumers to choose a pxe label at runtime instead of
having to prompt the user. One good use-case for this, is choosing
whether or not to apply a dtbo depending on the hardware configuration.
e.g: for TI's AM335x EVM, it would be convenient to apply a particular
dtbo only when the J9 jumper is on PRUSS mode. To achieve this, the
pxe menu should have 2 labels, one with the dtbo and the other without,
then the "pxe_label_override" env variable should point to the label with
the dtbo at runtime only when the jumper is on PRUSS mode.

This change can be used for different use-cases and bring more
flexibilty to consumers who use sysboot/pxe_utils.

if "pxe_label_override" is set but does not exist in the pxe menu,
the code should fallback to the default label if given, and no failure
is returned but rather a warning message.

Signed-off-by: Amjad Ouled-Ameur 
Reviewed-by: Simon Glass 
Reviewed-by: Artem Lapkin 
Reviewed-by: Ramon Fried

cmd: pxe_utils: Check fdtcontroladdr in label_boot

2021-11-23T07:57:56+00:00

If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure
U-Boot. When using PXE, if no fdt is defined in the menu file, and
there is no fdt at fdt_addr, add fall back on fdtcontroladdr too.

We are developing board support for the Armv8r64 FVP using
config_distro_bootcmd. We are also using OF_BOARD and would like the
PXE boot option to default to the fdt provided by board_fdt_blob_setup.

Signed-off-by: Peter Hoyes 
Reviewed-by: Simon Glass 
Signed-off-by: Ramon Fried

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