| Message ID | 20220324123901.429472-6-sughosh.ganu@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | efi: capsule: Image GUID usage cleanup | expand |
On Thu, 24 Mar 2022 at 14:39, Sughosh Ganu <sughosh.ganu@linaro.org> wrote: > > The capsule update code has been modified for getting the image GUID > values from the platform code. With this, each image now has a unique > GUID value. With this change, there is no longer a need for defining > GUIDs for FIT and raw images. Remove these GUID values. > > Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> > --- > include/efi_api.h | 8 -------- > lib/efi_loader/efi_firmware.c | 4 ---- > 2 files changed, 12 deletions(-) > > diff --git a/include/efi_api.h b/include/efi_api.h > index 982c200172..c7f7873b5d 100644 > --- a/include/efi_api.h > +++ b/include/efi_api.h > @@ -1967,14 +1967,6 @@ struct efi_signature_list { > EFI_GUID(0x86c77a67, 0x0b97, 0x4633, 0xa1, 0x87, \ > 0x49, 0x10, 0x4d, 0x06, 0x85, 0xc7) > > -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID \ > - EFI_GUID(0xae13ff2d, 0x9ad4, 0x4e25, 0x9a, 0xc8, \ > - 0x6d, 0x80, 0xb3, 0xb2, 0x21, 0x47) > - > -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID \ > - EFI_GUID(0xe2bb9c06, 0x70e9, 0x4b14, 0x97, 0xa3, \ > - 0x5a, 0x79, 0x13, 0x17, 0x6e, 0x3f) > - > #define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001 > #define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 > #define IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 > diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c > index 13cb492092..9fbedaf023 100644 > --- a/lib/efi_loader/efi_firmware.c > +++ b/lib/efi_loader/efi_firmware.c > @@ -185,8 +185,6 @@ static efi_status_t efi_fill_image_desc_array( > * - versioning of firmware image > * - package information > */ > -const efi_guid_t efi_firmware_image_type_uboot_fit = > - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID; > > /** > * efi_firmware_fit_get_image_info - return information about the current > @@ -293,8 +291,6 @@ const struct efi_firmware_management_protocol efi_fmp_fit = { > * This FIRMWARE_MANAGEMENT_PROTOCOL driver provides a firmware update > * method with raw data. > */ > -const efi_guid_t efi_firmware_image_type_uboot_raw = > - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID; > > /** > * efi_firmware_raw_get_image_info - return information about the current > -- > 2.25.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/include/efi_api.h b/include/efi_api.h index 982c200172..c7f7873b5d 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -1967,14 +1967,6 @@ struct efi_signature_list { EFI_GUID(0x86c77a67, 0x0b97, 0x4633, 0xa1, 0x87, \ 0x49, 0x10, 0x4d, 0x06, 0x85, 0xc7) -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID \ - EFI_GUID(0xae13ff2d, 0x9ad4, 0x4e25, 0x9a, 0xc8, \ - 0x6d, 0x80, 0xb3, 0xb2, 0x21, 0x47) - -#define EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID \ - EFI_GUID(0xe2bb9c06, 0x70e9, 0x4b14, 0x97, 0xa3, \ - 0x5a, 0x79, 0x13, 0x17, 0x6e, 0x3f) - #define IMAGE_ATTRIBUTE_IMAGE_UPDATABLE 0x0000000000000001 #define IMAGE_ATTRIBUTE_RESET_REQUIRED 0x0000000000000002 #define IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED 0x0000000000000004 diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c index 13cb492092..9fbedaf023 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -185,8 +185,6 @@ static efi_status_t efi_fill_image_desc_array( * - versioning of firmware image * - package information */ -const efi_guid_t efi_firmware_image_type_uboot_fit = - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID; /** * efi_firmware_fit_get_image_info - return information about the current @@ -293,8 +291,6 @@ const struct efi_firmware_management_protocol efi_fmp_fit = { * This FIRMWARE_MANAGEMENT_PROTOCOL driver provides a firmware update * method with raw data. */ -const efi_guid_t efi_firmware_image_type_uboot_raw = - EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID; /** * efi_firmware_raw_get_image_info - return information about the current
The capsule update code has been modified for getting the image GUID values from the platform code. With this, each image now has a unique GUID value. With this change, there is no longer a need for defining GUIDs for FIT and raw images. Remove these GUID values. Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> --- include/efi_api.h | 8 -------- lib/efi_loader/efi_firmware.c | 4 ---- 2 files changed, 12 deletions(-)