| Message ID | 20210510082006.44049-1-takahiro.akashi@linaro.org |
|---|---|
| State | Accepted |
| Commit | ef890f6331f77911a911714bf289f9e290138d4b |
| Headers | show |
| Series | efi_loader: capsule: remove unused guid | expand |
On 5/10/21 10:20 AM, AKASHI Takahiro wrote: > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID is never used. > Just remove it. > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > lib/efi_loader/efi_capsule.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c > index 84ddaf50d13f..b0dffd3ac9ce 100644 > --- a/lib/efi_loader/efi_capsule.c > +++ b/lib/efi_loader/efi_capsule.c > @@ -208,9 +208,6 @@ skip: > > #if defined(CONFIG_EFI_CAPSULE_AUTHENTICATE) > > -const efi_guid_t efi_guid_capsule_root_cert_guid = > - EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > - I see multiple usages in origin/master. What am I missing? $ git grep -n -B1 EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID include/efi_api.h-228- include/efi_api.h:229:#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID \ -- lib/efi_loader/efi_capsule.c-22-static const efi_guid_t efi_guid_firmware_management_capsule_id = lib/efi_loader/efi_capsule.c:23: EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; -- lib/efi_loader/efi_capsule.c-208-const efi_guid_t efi_guid_capsule_root_cert_guid = lib/efi_loader/efi_capsule.c:209: EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; -- tools/mkeficapsule.c-43- tools/mkeficapsule.c:44:efi_guid_t efi_guid_fm_capsule = EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; Best regards Heinrich > #if defined(CONFIG_EFI_PKEY_DTB_EMBED) > int efi_get_public_key_data(void **pkey, efi_uintn_t *pkey_len) > { >
On Tue, May 18, 2021 at 10:32:28PM +0200, Heinrich Schuchardt wrote: > On 5/10/21 10:20 AM, AKASHI Takahiro wrote: > > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID is never used. > > Just remove it. > > > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > > --- > > lib/efi_loader/efi_capsule.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c > > index 84ddaf50d13f..b0dffd3ac9ce 100644 > > --- a/lib/efi_loader/efi_capsule.c > > +++ b/lib/efi_loader/efi_capsule.c > > @@ -208,9 +208,6 @@ skip: > > > > #if defined(CONFIG_EFI_CAPSULE_AUTHENTICATE) > > > > -const efi_guid_t efi_guid_capsule_root_cert_guid = > > - EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > > - > > I see multiple usages in origin/master. What am I missing? What I intended to do is to "remove efi_guid_capsule_root_cert_guid," not EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID. I will update the commit message. -Takahiro Akashi > $ git grep -n -B1 EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID > include/efi_api.h-228- > include/efi_api.h:229:#define EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID \ > -- > lib/efi_loader/efi_capsule.c-22-static const efi_guid_t > efi_guid_firmware_management_capsule_id = > lib/efi_loader/efi_capsule.c:23: > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > -- > lib/efi_loader/efi_capsule.c-208-const efi_guid_t > efi_guid_capsule_root_cert_guid = > lib/efi_loader/efi_capsule.c:209: > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > -- > tools/mkeficapsule.c-43- > tools/mkeficapsule.c:44:efi_guid_t efi_guid_fm_capsule = > EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; > > Best regards > > Heinrich > > > #if defined(CONFIG_EFI_PKEY_DTB_EMBED) > > int efi_get_public_key_data(void **pkey, efi_uintn_t *pkey_len) > > { > > >
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 84ddaf50d13f..b0dffd3ac9ce 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -208,9 +208,6 @@ skip: #if defined(CONFIG_EFI_CAPSULE_AUTHENTICATE) -const efi_guid_t efi_guid_capsule_root_cert_guid = - EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID; - #if defined(CONFIG_EFI_PKEY_DTB_EMBED) int efi_get_public_key_data(void **pkey, efi_uintn_t *pkey_len) {
EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID is never used. Just remove it. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- lib/efi_loader/efi_capsule.c | 3 --- 1 file changed, 3 deletions(-) -- 2.31.0