Platform/Hisilicon: fix D03/D05 capsule image names

[edk2] [PATCH edk2-platforms] Platform/Hisilicon: fix D03/D05 capsule image names

Posted by Leif Lindholm 6 years, 10 months ago

Due to copy-paste error, both d03 and d05 ended up with capsule sections
named Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7 in their .fdf files.
Change these to the actual platform names.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 Platform/Hisilicon/D03/D03.fdf | 2 +-
 Platform/Hisilicon/D05/D05.fdf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
index e6a4820256..09613fb8f6 100644
--- a/Platform/Hisilicon/D03/D03.fdf
+++ b/Platform/Hisilicon/D03/D03.fdf
@@ -400,7 +400,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
 
   FV = SystemFirmwareUpdateCargo
 
-[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
+[Capsule.D03FirmwareUpdateCapsuleFmpPkcs7]
 CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
 CAPSULE_HEADER_SIZE         = 0x20
 CAPSULE_HEADER_INIT_VERSION = 0x1
diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
index 22609bb588..17a43d8edb 100644
--- a/Platform/Hisilicon/D05/D05.fdf
+++ b/Platform/Hisilicon/D05/D05.fdf
@@ -425,7 +425,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
 
   FV = SystemFirmwareUpdateCargo
 
-[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
+[Capsule.D05FirmwareUpdateCapsuleFmpPkcs7]
 CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
 CAPSULE_HEADER_SIZE         = 0x20
 CAPSULE_HEADER_INIT_VERSION = 0x1
-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH edk2-platforms] Platform/Hisilicon: fix D03/D05 capsule image names

Posted by Ard Biesheuvel 6 years, 10 months ago

On 9 February 2018 at 13:16, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Due to copy-paste error, both d03 and d05 ended up with capsule sections
> named Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7 in their .fdf files.
> Change these to the actual platform names.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  Platform/Hisilicon/D03/D03.fdf | 2 +-
>  Platform/Hisilicon/D05/D05.fdf | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> index e6a4820256..09613fb8f6 100644
> --- a/Platform/Hisilicon/D03/D03.fdf
> +++ b/Platform/Hisilicon/D03/D03.fdf
> @@ -400,7 +400,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
>
>    FV = SystemFirmwareUpdateCargo
>
> -[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
> +[Capsule.D03FirmwareUpdateCapsuleFmpPkcs7]
>  CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
>  CAPSULE_HEADER_SIZE         = 0x20
>  CAPSULE_HEADER_INIT_VERSION = 0x1
> diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> index 22609bb588..17a43d8edb 100644
> --- a/Platform/Hisilicon/D05/D05.fdf
> +++ b/Platform/Hisilicon/D05/D05.fdf
> @@ -425,7 +425,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
>
>    FV = SystemFirmwareUpdateCargo
>
> -[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
> +[Capsule.D05FirmwareUpdateCapsuleFmpPkcs7]
>  CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
>  CAPSULE_HEADER_SIZE         = 0x20
>  CAPSULE_HEADER_INIT_VERSION = 0x1
> --
> 2.11.0
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH edk2-platforms] Platform/Hisilicon: fix D03/D05 capsule image names

Posted by Leif Lindholm 6 years, 10 months ago

On Fri, Feb 09, 2018 at 01:20:16PM +0000, Ard Biesheuvel wrote:
> On 9 February 2018 at 13:16, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > Due to copy-paste error, both d03 and d05 ended up with capsule sections
> > named Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7 in their .fdf files.
> > Change these to the actual platform names.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Thanks - pushed as a235eabe39.

> > ---
> >  Platform/Hisilicon/D03/D03.fdf | 2 +-
> >  Platform/Hisilicon/D05/D05.fdf | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf
> > index e6a4820256..09613fb8f6 100644
> > --- a/Platform/Hisilicon/D03/D03.fdf
> > +++ b/Platform/Hisilicon/D03/D03.fdf
> > @@ -400,7 +400,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
> >
> >    FV = SystemFirmwareUpdateCargo
> >
> > -[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
> > +[Capsule.D03FirmwareUpdateCapsuleFmpPkcs7]
> >  CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
> >  CAPSULE_HEADER_SIZE         = 0x20
> >  CAPSULE_HEADER_INIT_VERSION = 0x1
> > diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf
> > index 22609bb588..17a43d8edb 100644
> > --- a/Platform/Hisilicon/D05/D05.fdf
> > +++ b/Platform/Hisilicon/D05/D05.fdf
> > @@ -425,7 +425,7 @@ [FmpPayload.FmpPayloadSystemFirmwarePkcs7]
> >
> >    FV = SystemFirmwareUpdateCargo
> >
> > -[Capsule.StyxFirmwareUpdateCapsuleFmpPkcs7]
> > +[Capsule.D05FirmwareUpdateCapsuleFmpPkcs7]
> >  CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
> >  CAPSULE_HEADER_SIZE         = 0x20
> >  CAPSULE_HEADER_INIT_VERSION = 0x1
> > --
> > 2.11.0
> >
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel