dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

net: guard call to tftp_start() with IS_ENABLED(CONFIG_CMD_TFTPBOOT)

Browse Source 
net_auto_load() cannot call tftp_start() if CONFIG_CMD_TFTPBOOT is
disabled.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
This commit is contained in:
Jerome Forissier
2024-09-02 15:25:11 +02:00
committed by Tom Rini
parent ca55cf8104
commit 278e9ac8aa
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
net/net.c
View File

@@ -334,17 +334,22 @@ void net_auto_load(void)
net_set_state(NETLOOP_SUCCESS); net_set_state(NETLOOP_SUCCESS);
return; return;
} }
if (net_check_prereq(TFTPGET)) { if (IS_ENABLED(CONFIG_CMD_TFTPBOOT)) {
/* We aren't expecting to get a serverip, so just accept the assigned IP */ if (net_check_prereq(TFTPGET)) {
if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) { /*
net_set_state(NETLOOP_SUCCESS); * We aren't expecting to get a serverip, so just
} else { * accept the assigned IP
printf("Cannot autoload with TFTPGET\n"); */
net_set_state(NETLOOP_FAIL); if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) {
net_set_state(NETLOOP_SUCCESS);
} else {
printf("Cannot autoload with TFTPGET\n");
net_set_state(NETLOOP_FAIL);
}
return;
} }
return; tftp_start(TFTPGET);
} }
tftp_start(TFTPGET);
} }
static int net_init_loop(void) static int net_init_loop(void)