Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bios: add option to skip json netboot #2205

Merged
merged 2 commits into from
Mar 17, 2025
Merged

bios: add option to skip json netboot #2205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76e194e
bios: add ETH_NETBOOT_SKIP_JSON
maass-hamburg Feb 20, 2025
ebc10fd
bios: tftp: add error message
maass-hamburg Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions litex/soc/software/bios/boot.c
View file
Original file line number Diff line number Diff line change
@@ -558,9 +558,11 @@ void netboot(int nb_params, char **params)
printf("Booting from %s (JSON)...\n", filename);
netboot_from_json(filename, ip, TFTP_SERVER_PORT);
} else {
#ifndef ETH_NETBOOT_SKIP_JSON
/* Boot from boot.json */
printf("Booting from boot.json...\n");
netboot_from_json("boot.json", ip, TFTP_SERVER_PORT);
#endif /* ETH_NETBOOT_SKIP_JSON */

#ifdef MAIN_RAM_BASE
/* Boot from boot.bin */
4 changes: 3 additions & 1 deletion litex/soc/software/libliteeth/tftp.c
View file
Original file line number Diff line number Diff line change
@@ -142,8 +142,10 @@ int tftp_get(uint32_t ip, uint16_t server_port, const char *filename,
int i;
int length_before;

if(!udp_arp_resolve(ip))
if(!udp_arp_resolve(ip)) {
printf("ARP failed\n");
return -1;
}

udp_set_callback((udp_callback) rx_callback);