diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-03 08:01:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-03 08:01:08 -0400 |
| commit | 4dc3ba568fd22ef6a5a061ba6675fcfd4c3ece70 (patch) | |
| tree | 927060fe33d69ee04c4cace328297ac92f151bc5 /lib/efi_selftest/Makefile | |
| parent | a2d051e7b6a8f87add1067d936bb0c805a47b0df (diff) | |
| parent | 5c2227e4956f3287165ef5aac55ee5e96a61a518 (diff) | |
Merge tag 'efi-2020-10-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-10-rc2
This series comprises error corrections for the UEFI subsystem:
* make the memory size reserved for the U-Boot stack customizable
and reduce it for the MAIX board
* correct build dependencies for UEFI unit test
* enable read-only UEFI variable are enabled with the TEE backend
* add 10 ms wait to sysreset to fix a problem with unit testing
Diffstat (limited to 'lib/efi_selftest/Makefile')
| -rw-r--r-- | lib/efi_selftest/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index e9baa64135..45ce6859b8 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -32,7 +32,6 @@ efi_selftest_memory.o \ efi_selftest_open_protocol.o \ efi_selftest_register_notify.o \ efi_selftest_set_virtual_address_map.o \ -efi_selftest_snp.o \ efi_selftest_textinput.o \ efi_selftest_textinputex.o \ efi_selftest_textoutput.o \ @@ -42,6 +41,8 @@ efi_selftest_variables.o \ efi_selftest_variables_runtime.o \ efi_selftest_watchdog.o +obj-$(CONFIG_NET) += efi_selftest_snp.o + obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += \ efi_selftest_unicode_collation.o @@ -56,7 +57,7 @@ ifeq ($(CONFIG_GENERATE_ACPI_TABLE),) obj-y += efi_selftest_fdt.o endif -ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) +ifeq ($(CONFIG_BLK)$(CONFIG_DOS_PARTITION),yy) obj-y += efi_selftest_block_device.o endif |