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

net: tftp: Remove tftp_init_load_addr error path

Browse Source 
tftp_init_load_addr() always returns 0 since commit af45c84871e4 ("tftp:
rework the logic to validate the load address"), so we don't need to
check if it failed and can remove the error handling.
Also change tftp_init_load_addr() to static void since the return value
is now unused.

Signed-off-by: Leonard Anderweit <l.anderweit@phytec.de>
Reviewed-by: Yannic Moog <y.moog@phytec.de>
This commit is contained in:
Leonard Anderweit 2025-11-20 09:38:55 +01:00 committed by Jerome Forissier
parent 14ece61178
commit c10e1c2ede
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/tftp.c
View File

@ -714,10 +714,9 @@ static void tftp_timeout_handler(void)
} }
} }
static int tftp_init_load_addr(void) static void tftp_init_load_addr(void)
{ {
tftp_load_addr = image_load_addr; tftp_load_addr = image_load_addr;
return 0;
} }
static int saved_tftp_block_size_option; static int saved_tftp_block_size_option;
@ -901,13 +900,7 @@ void tftp_start(enum proto_t protocol)
} else } else
#endif #endif
{ {
if (tftp_init_load_addr()) { tftp_init_load_addr();
eth_halt();
net_set_state(NETLOOP_FAIL);
puts("\nTFTP error: ");
puts("trying to overwrite reserved memory...\n");
return;
}
printf("Load address: 0x%lx\n", tftp_load_addr); printf("Load address: 0x%lx\n", tftp_load_addr);
puts("Loading: *\b"); puts("Loading: *\b");
tftp_state = STATE_SEND_RRQ; tftp_state = STATE_SEND_RRQ;
@ -953,12 +946,7 @@ void tftp_start_server(void)
{ {
tftp_filename[0] = 0; tftp_filename[0] = 0;
if (tftp_init_load_addr()) { tftp_init_load_addr();
eth_halt();
net_set_state(NETLOOP_FAIL);
puts("\nTFTP error: trying to overwrite reserved memory...\n");
return;
}
printf("Using %s device\n", eth_get_name()); printf("Using %s device\n", eth_get_name());
printf("Listening for TFTP transfer on %pI4\n", &net_ip); printf("Listening for TFTP transfer on %pI4\n", &net_ip);
printf("Load address: 0x%lx\n", tftp_load_addr); printf("Load address: 0x%lx\n", tftp_load_addr);