diff options
Diffstat (limited to 'lib/efi_selftest')
| -rw-r--r-- | lib/efi_selftest/efi_selftest_controllers.c | 1 | ||||
| -rw-r--r-- | lib/efi_selftest/efi_selftest_ecpt.c | 1 | ||||
| -rw-r--r-- | lib/efi_selftest/efi_selftest_fdt.c | 7 | ||||
| -rw-r--r-- | lib/efi_selftest/efi_selftest_load_file.c | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c index 02f19574f83..9f23117449c 100644 --- a/lib/efi_selftest/efi_selftest_controllers.c +++ b/lib/efi_selftest/efi_selftest_controllers.c @@ -447,7 +447,6 @@ static int execute(void) return EFI_ST_FAILURE; } - return EFI_ST_SUCCESS; } diff --git a/lib/efi_selftest/efi_selftest_ecpt.c b/lib/efi_selftest/efi_selftest_ecpt.c index 09c5e96c5e1..47316598e61 100644 --- a/lib/efi_selftest/efi_selftest_ecpt.c +++ b/lib/efi_selftest/efi_selftest_ecpt.c @@ -68,7 +68,6 @@ static int execute(void) return EFI_ST_SUCCESS; } - EFI_UNIT_TEST(ecpt) = { .name = "conformance profile table", .phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT, diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c index aa3b13ae3ab..a4b0cef20e4 100644 --- a/lib/efi_selftest/efi_selftest_fdt.c +++ b/lib/efi_selftest/efi_selftest_fdt.c @@ -227,6 +227,13 @@ static int execute(void) return EFI_ST_FAILURE; } } + if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB)) { + str = get_property(u"kaslr-seed", u"chosen"); + if (str) { + efi_st_error("kaslr-seed with measured fdt\n"); + return EFI_ST_FAILURE; + } + } if (IS_ENABLED(CONFIG_RISCV)) { u32 fdt_hartid; diff --git a/lib/efi_selftest/efi_selftest_load_file.c b/lib/efi_selftest/efi_selftest_load_file.c index 14df7611727..4e77a7cbac2 100644 --- a/lib/efi_selftest/efi_selftest_load_file.c +++ b/lib/efi_selftest/efi_selftest_load_file.c @@ -233,7 +233,6 @@ static efi_status_t EFIAPI load_file(struct efi_load_file_protocol *this, return EFI_SUCCESS; } - /* * load_file2() - LoadFile() service of a EFI_LOAD_FILE2_PROTOCOL * |