u-boot.git/cmd/pxe_utils.c, branch master

pxe: Move pxe_utils files

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

Move the header file into the main include/ directory so we can use it
from the bootmethod code. Move the C file into boot/ since it relates to
booting.

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

pxe: Tidy up the is_pxe global

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

Move this into the context to avoid a global variable. Also rename it
since the current name does not explain what it actually affects.

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

pxe: Add a userdata field to the context

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

Allow the caller to provide some info which is passed back to the
readfile() method.

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

pxe: Move do_getfile() into the context

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

Rather than having a global variable, pass the function as part of the
context.

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

pxe: Use a context pointer

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

At present the PXE functions pass around a pointer to command-table entry
which is very strange. It is only needed in a few places and it is odd to
pass around a data structure from another module in this way.

For bootmethod we will need to provide some context information when
reading files.

Create a PXE context struct to hold the command-table-entry pointer and
pass that around instead. We can then add more things to the context as
needed.

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

pxe: Move API comments to the header files

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

Put the function comments in the header file so that the full API can we
examined in one place.

Expand the comments to cover parameters and return values.

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

pxe_utils: Clean up {bootm,zboot}_argv generation

2021-11-01T01:50:55+00:00

Signed-off-by: Zhaofeng Li 
Cc: Simon Glass 
Cc: Bin Meng 
Reviewed-by: Simon Glass

pxe_utils: Fix arguments to x86 zboot

2021-11-01T01:50:55+00:00

bootm and zboot accept different arguments:

> bootm [addr [arg ...]]
>    - boot application image stored in memory
>        passing arguments 'arg ...'; when booting a Linux kernel,
>        'arg' can be the address of an initrd image

> zboot [addr] [size] [initrd addr] [initrd size] [setup] [cmdline]
>       addr -        The optional starting address of the bzimage.
>                     If not set it defaults to the environment
>                     variable "fileaddr".
>       size -        The optional size of the bzimage. Defaults to
>                     zero.
>       initrd addr - The address of the initrd image to use, if any.
>       initrd size - The size of the initrd image to use, if any.

In the zboot flow, the current code will reuse the bootm args and attempt
to pass the initrd arg (argv[2]) as the kernel size (should be argv[3]).
zboot also expects the initrd address and size to be separate arguments.

Let's untangle them and have separate argv/argc locals.

Signed-off-by: Zhaofeng Li 
Cc: Simon Glass 
Cc: Bin Meng 
Reviewed-by: Simon Glass

global: Convert simple_strtoul() with hex to hextoul()

2021-08-02T17:32:14+00:00

It is a pain to have to specify the value 16 in each call. Add a new
hextoul() function and update the code to use it.

Add a proper comment to simple_strtoul() while we are here.

Signed-off-by: Simon Glass

cmd: pxe_utils: sysboot: fix crash if either board or soc are not set.

2021-06-18T08:29:17+00:00

If the environment does not have "soc" or "board" set, and fdtdir
option is specified in extlinux.conf, the bootloader will crash whilst
dereferencing a null pointer. Add a guard against null soc or
board. Fixes a crash of qemu-riscv64_smode configuration, which does
not have CONFIG_SYS_SOC defined.

Signed-off-by: Dimitri John Ledkov 
Reviewed-by: Ramon Fried