]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: tftp: remove explicit efi configuration dependency
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Wed, 17 Jan 2024 04:39:43 +0000 (13:39 +0900)
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Wed, 17 Jan 2024 07:40:25 +0000 (08:40 +0100)
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 <takahiro.akashi@linaro.org>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
net/tftp.c

index 88e71e67de3536bb1b8a50c54b6db5cad03846b8..2e335413492b714cdaaa594c2385553f0f19eca5 100644 (file)
@@ -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);
 }