Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 1 | From caf6c4ec65fd0a5e945dd790f2369acd163d1daf Mon Sep 17 00:00:00 2001 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Vishnu Banavath <vishnu.banavath@arm.com> |
| 3 | Date: Sat, 11 Dec 2021 13:23:55 +0000 |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 15/25] efi_loader: corstone1000: remove guid check from |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 5 | corstone1000 config option |
| 6 | |
| 7 | Use generic fmp guid and no separte check is required for |
| 8 | CORSTONE1000 target. |
| 9 | |
| 10 | Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> |
| 11 | Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 12 | Upstream-Status: Pending [Not submitted to upstream yet] |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 13 | --- |
| 14 | lib/efi_loader/efi_capsule.c | 16 +--------------- |
| 15 | 1 file changed, 1 insertion(+), 15 deletions(-) |
| 16 | |
| 17 | diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame^] | 18 | index c22b9b5aa0..0eee3c2d4c 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 19 | --- a/lib/efi_loader/efi_capsule.c |
| 20 | +++ b/lib/efi_loader/efi_capsule.c |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 21 | @@ -646,12 +646,6 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 22 | i, &capsule->capsule_guid); |
| 23 | |
| 24 | #if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) |
| 25 | - if (guidcmp(&corstone1000_capsule_guid, &capsule->capsule_guid)) { |
| 26 | - ret = EFI_INVALID_PARAMETER; |
| 27 | - log_err("Corstone1000: Invalid capsule GUID\n"); |
| 28 | - goto out; |
| 29 | - } |
| 30 | - |
| 31 | if (efi_size_in_pages(capsule->capsule_image_size) > |
| 32 | CORSTONE1000_CAPSULE_BUFFER_SIZE) { |
| 33 | log_err("Corstone1000: Capsule data size exceeds the shared buffer size\n"); |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 34 | @@ -677,15 +671,7 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 35 | goto out; |
| 36 | #endif |
| 37 | |
| 38 | - if (!guidcmp(&capsule->capsule_guid, |
| 39 | - &efi_guid_firmware_management_capsule_id)) { |
| 40 | - ret = efi_capsule_update_firmware(capsule); |
| 41 | - } else { |
| 42 | - log_err("Unsupported capsule type: %pUs\n", |
| 43 | - &capsule->capsule_guid); |
| 44 | - ret = EFI_UNSUPPORTED; |
| 45 | - } |
| 46 | - |
| 47 | + ret = efi_capsule_update_firmware(capsule); |
| 48 | if (ret != EFI_SUCCESS) |
| 49 | goto out; |
| 50 | } |
| 51 | -- |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 52 | 2.17.1 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 53 | |