diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-15 08:42:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-15 08:42:37 -0400 |
| commit | df13a44377b36f438d15de06b07ad4645b89cf4f (patch) | |
| tree | c25c837a617fa82826f15237b8f8ff6b81723af0 /lib | |
| parent | 6d0409f256127000a9b32f94d1b52a6ee83382bf (diff) | |
| parent | 16879cd25a4089cde2f3393fb09567df53402679 (diff) | |
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/Makefile | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index d2ce89713e..55c97c0476 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -22,5 +22,5 @@ obj-y += efi_watchdog.o obj-$(CONFIG_LCD) += efi_gop.o obj-$(CONFIG_DM_VIDEO) += efi_gop.o obj-$(CONFIG_PARTITIONS) += efi_disk.o -obj-$(CONFIG_CMD_NET) += efi_net.o +obj-$(CONFIG_NET) += efi_net.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index ab28b2fd25..e965f1d88e 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -747,7 +747,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part, return start; } -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET struct efi_device_path *efi_dp_from_eth(void) { #ifndef CONFIG_DM_ETH |