[U-Boot] [PATCH 1/1] efi_selftest: don't hang on missing timer

[Heinrich Schuchardt]

qemu-riscv32_defconfig and qemu-riscv64_defconfig do not supply a timer.
This causes the EFI selftest to hang on tests which require a timer.

So let's disable CONFIG_TIMER for these boards and use this variable to
decide which tests have to be disabled.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
 configs/qemu-riscv32_defconfig | 1 +
 configs/qemu-riscv64_defconfig | 1 +
 lib/efi_selftest/Makefile      | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig
index ff1fb1f30ec..70da323bdc1 100644
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -3,4 +3,5 @@ CONFIG_TARGET_QEMU_VIRT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_TIMER is not set
 CONFIG_OF_BOARD=y
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index d6c1a5d646a..258f395b9d5 100644
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -4,4 +4,5 @@ CONFIG_CPU_RISCV_64=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
+# CONFIG_TIMER is not set
 CONFIG_OF_BOARD=y
diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile
index 743b4820449..8f2f09522e6 100644
--- a/lib/efi_selftest/Makefile
+++ b/lib/efi_selftest/Makefile
@@ -19,7 +19,6 @@ efi_selftest_console.o \
 efi_selftest_crc32.o \
 efi_selftest_devicepath.o \
 efi_selftest_devicepath_util.o \
-efi_selftest_events.o \
 efi_selftest_event_groups.o \
 efi_selftest_exception.o \
 efi_selftest_exitbootservices.o \
@@ -33,11 +32,15 @@ efi_selftest_snp.o \
 efi_selftest_textinput.o \
 efi_selftest_textinputex.o \
 efi_selftest_textoutput.o \
-efi_selftest_tpl.o \
 efi_selftest_unicode_collation.o \
 efi_selftest_util.o \
-efi_selftest_variables.o \
+efi_selftest_variables.o
+
+ifeq ($(CONFIG_TIMER),)
+efi_selftest_events.o \
+efi_selftest_tpl.o \
 efi_selftest_watchdog.o
+endif
 
 obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o
 
-- 
2.19.1