summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKASHI Takahiro <[email protected]>2024-01-17 13:39:43 +0900
committerHeinrich Schuchardt <[email protected]>2024-01-17 08:40:25 +0100
commit593607c5814e399057e044343248fdaa77ef2238 (patch)
tree763f0a9f18ddae57719ae1313581ec8e74b30bb3
parent279b03d979154cf6d4cd086f21daf478bd3d986c (diff)
net: tftp: remove explicit efi configuration dependency
Now it is clear that the feature actually depends on efi interfaces, not "bootefi" command. efi_set_bootdev() will automatically be nullified if necessary efi component is disabled. Signed-off-by: AKASHI Takahiro <[email protected]> Reviewed-by: Ramon Fried <[email protected]> Reviewed-by: Tom Rini <[email protected]>
-rw-r--r--net/tftp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/tftp.c b/net/tftp.c
index 88e71e67de3..2e335413492 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -302,12 +302,10 @@ static void tftp_complete(void)
time_start * 1000, "/s");
}
puts("\ndone\n");
- if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) {
- if (!tftp_put_active)
- efi_set_bootdev("Net", "", tftp_filename,
- map_sysmem(tftp_load_addr, 0),
- net_boot_file_size);
- }
+ if (!tftp_put_active)
+ efi_set_bootdev("Net", "", tftp_filename,
+ map_sysmem(tftp_load_addr, 0),
+ net_boot_file_size);
net_set_state(NETLOOP_SUCCESS);
}