| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame^] | 1 | From c463798489e41725f8ba33debeedc7c4011cda38 Mon Sep 17 00:00:00 2001 |
| 2 | From: Vishnu Banavath <vishnu.banavath@arm.com> |
| 3 | Date: Sat, 11 Dec 2021 13:23:55 +0000 |
| 4 | Subject: [PATCH 17/27] efi_loader: corstone1000: remove guid check from |
| 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> |
| 12 | --- |
| 13 | lib/efi_loader/efi_capsule.c | 16 +--------------- |
| 14 | 1 file changed, 1 insertion(+), 15 deletions(-) |
| 15 | |
| 16 | diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c |
| 17 | index 17d769803b2a..939040d2755e 100644 |
| 18 | --- a/lib/efi_loader/efi_capsule.c |
| 19 | +++ b/lib/efi_loader/efi_capsule.c |
| 20 | @@ -654,12 +654,6 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( |
| 21 | i, &capsule->capsule_guid); |
| 22 | |
| 23 | #if CONFIG_IS_ENABLED(TARGET_CORSTONE1000) |
| 24 | - if (guidcmp(&corstone1000_capsule_guid, &capsule->capsule_guid)) { |
| 25 | - ret = EFI_INVALID_PARAMETER; |
| 26 | - log_err("Corstone1000: Invalid capsule GUID\n"); |
| 27 | - goto out; |
| 28 | - } |
| 29 | - |
| 30 | if (efi_size_in_pages(capsule->capsule_image_size) > |
| 31 | CORSTONE1000_CAPSULE_BUFFER_SIZE) { |
| 32 | log_err("Corstone1000: Capsule data size exceeds the shared buffer size\n"); |
| 33 | @@ -685,15 +679,7 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( |
| 34 | goto out; |
| 35 | #endif |
| 36 | |
| 37 | - if (!guidcmp(&capsule->capsule_guid, |
| 38 | - &efi_guid_firmware_management_capsule_id)) { |
| 39 | - ret = efi_capsule_update_firmware(capsule); |
| 40 | - } else { |
| 41 | - log_err("Unsupported capsule type: %pUs\n", |
| 42 | - &capsule->capsule_guid); |
| 43 | - ret = EFI_UNSUPPORTED; |
| 44 | - } |
| 45 | - |
| 46 | + ret = efi_capsule_update_firmware(capsule); |
| 47 | if (ret != EFI_SUCCESS) |
| 48 | goto out; |
| 49 | } |
| 50 | -- |
| 51 | 2.30.2 |
| 52 | |