mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-12-19 00:11:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootstd: make it possible to use tftp for netboot with standardboot

Browse Source 
Add the option to load the bootscript with the tftp command (static IP)
instead of the dhcp command (dynamic IP). For this a new function
tftpb_run similar to dhcp_run, is needed. The selection of which command
to use can be done with the ip_dyn environment variable, which can be
set to yes or no. The ip_dyn variable was chosen as it is already in use
on the imx platforms.
Also edit the bootstd doc.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Benjamin Hahn <B.Hahn@phytec.de>
This commit is contained in:
Benjamin Hahn 2025-10-21 16:34:17 +02:00 committed by Tom Rini
parent 8506cf58ff
commit fae6c54d23
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot/bootmeth_script.c
View File

@ -129,7 +129,11 @@ static int script_read_bootflow_net(struct bootflow *bflow)
if (!fname)
return log_msg_ret("dhc", -EINVAL);
ret = dhcp_run(addr, fname, true);
if (IS_ENABLED(CONFIG_CMD_TFTPBOOT) && env_get_yesno("ip_dyn") == 0)
ret = tftpb_run(addr, fname);
else
ret = dhcp_run(addr, fname, true);
if (ret)
return log_msg_ret("dhc", ret);

4
doc/develop/bootstd/overview.rst
View File

@ -262,6 +262,10 @@ fdt_addr_r
fdtoverlay_addr_r (needed if overlays are used)
Address at which to load the overlay for the FDT, e.g. 0x02000000
ip_dyn
Use dynamic IP (dhcp) or static IP (tftp) for loading the bootscript over
ethernet. Default is dhcp. e.g. no
kernel_addr_r
Address at which to load the kernel, e.g. 0x02080000

6
doc/develop/bootstd/script.rst
View File

@ -12,8 +12,10 @@ list of prefixes (``{"/", "/boot"}`` by default) and can be adjust with the
`filename-prefixes` property in the bootstd device.
For a network device, the filename is obtained from the `boot_script_dhcp`
environment variable and the file is read using tftp. It must be in the
top-level directory of the tftp server.
environment variable. By setting the `ip_dyn` environment variable it can be
decided if dynamic ip (dhcp command) or static ip (tftp command) is used for
reading the file. By default dhcp is used. The file must be in the top-level
directory of the tftp server.
In either case (file or network), the bootmeth searches for the file and creates
a bootflow if found. The bootmeth searches for "boot.scr.uimg" first, then

9
include/net-common.h
View File

@ -490,6 +490,15 @@ int dhcp_run(ulong addr, const char *fname, bool autoload);
*/
int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
/**
* tftpb_run() - Run TFTP on the current ethernet device
*
* @addr: Address to load the file into
* @fname: Filename of file to load (NULL to use the default filename)
* @return 0 if OK, -ENOENT if ant file was not found
*/
int tftpb_run(ulong addr, const char *fname);
/**
* do_ping - Run the ping command
*

21
net/net-common.c
View File

@ -83,3 +83,24 @@ int dhcp_run(ulong addr, const char *fname, bool autoload)
return 0;
}
#endif
#if defined(CONFIG_CMD_TFTPBOOT)
int tftpb_run(ulong addr, const char *fname)
{
char *tftp_argv[] = {"tftpboot", NULL, (char *)fname, NULL};
struct cmd_tbl cmdtp = {}; /* dummy */
char file_addr[17] = {0};
log_debug("addr=%lx, fname=%s\n", addr, fname);
sprintf(file_addr, "%lx", addr);
tftp_argv[1] = file_addr;
int result = do_tftpb(&cmdtp, 0, fname ? 3 : 2, tftp_argv);
if (result)
return log_msg_ret("res", -ENOENT);
return 0;
}
#endif