[edk2,edk2-platforms] Platform/AMD/OverdriveBoard: build capsule unconditionally

Message ID 20181219170614.12170-1-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • [edk2,edk2-platforms] Platform/AMD/OverdriveBoard: build capsule unconditionally
Related show

Commit Message

Ard Biesheuvel Dec. 19, 2018, 5:06 p.m.
Remove the DO_CAPSULE conditionals so that the capsules are
always built. This fixes a build issue that exists currently,
since the IPv6 enabled version of IScsiDxe that we now include
depends on a library class that can only be resolved if building
with DO_CAPSULE=TRUE.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ---------
 Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 ---------
 2 files changed, 18 deletions(-)

-- 
2.19.2

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

Comments

Leif Lindholm Dec. 19, 2018, 5:26 p.m. | #1
On Wed, Dec 19, 2018 at 06:06:14PM +0100, Ard Biesheuvel wrote:
> Remove the DO_CAPSULE conditionals so that the capsules are

> always built. This fixes a build issue that exists currently,

> since the IPv6 enabled version of IScsiDxe that we now include

> depends on a library class that can only be resolved if building

> with DO_CAPSULE=TRUE.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

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


Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>


> ---

>  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ---------

>  Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 ---------

>  2 files changed, 18 deletions(-)

> 

> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> index 3d0544cf74cd..49671eefbdea 100644

> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> @@ -19,7 +19,6 @@

>  

>  DEFINE NUM_CORES    = 8

>  DEFINE DO_FLASHER   = FALSE

> -DEFINE DO_CAPSULE   = FALSE

>  

>    PLATFORM_NAME                  = Overdrive

>    PLATFORM_GUID                  = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB

> @@ -124,14 +123,12 @@ DEFINE DO_CAPSULE   = FALSE

>  

>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf

>    DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf

> -!if $(DO_CAPSULE) == TRUE

>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

>    IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

>    EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf

>    FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf

>    IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf

>    PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf

> -!endif

>  

>    TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

>    OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

> @@ -492,8 +489,6 @@ DEFINE DO_CAPSULE   = FALSE

>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0

>    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0

>  

> -!if $(DO_CAPSULE) == TRUE

> -

>  [PcdsDynamicExDefault.common.DEFAULT]

>    gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100

>  

> @@ -503,8 +498,6 @@ DEFINE DO_CAPSULE   = FALSE

>    # d34b3d29-0085-4ab3-8be8-84188cc50489

>    gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x29, 0x3d, 0x4b, 0xd3, 0x85, 0x0, 0xb3, 0x4a, 0x8b, 0xe8, 0x84, 0x18, 0x8c, 0xc5, 0x04, 0x89}

>  

> -!endif

> -

>  [PcdsDynamicHii]

>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5

>  

> @@ -761,7 +754,6 @@ DEFINE DO_CAPSULE   = FALSE

>    }

>  !endif

>  

> -!if $(DO_CAPSULE) == TRUE

>    #

>    # Firmware update

>    #

> @@ -769,4 +761,3 @@ DEFINE DO_CAPSULE   = FALSE

>    SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf

>    SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf

>    Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf

> -!endif

> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> index 840b3d0313f3..4b6b808c1454 100644

> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> @@ -252,13 +252,11 @@ READ_LOCK_STATUS   = TRUE

>    #

>    INF Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf

>  

> -!if $(DO_CAPSULE) == TRUE

>    #

>    # Firmware update

>    #

>    INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf

>    INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf

> -!endif

>  

>  [FV.STYX_EFI]

>  FvAlignment        = 16

> @@ -288,10 +286,7 @@ READ_LOCK_STATUS   = TRUE

>    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

>    INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

>    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

> -

> -!if $(DO_CAPSULE) == TRUE

>    INF RuleOverride = FMP_IMAGE_DESC Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf

> -!endif

>  

>    FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {

>      SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {

> @@ -299,8 +294,6 @@ READ_LOCK_STATUS   = TRUE

>      }

>    }

>  

> -!if $(DO_CAPSULE) == TRUE

> -

>  [FV.CapsuleDispatchFv]

>  FvAlignment        = 16

>  ERASE_POLARITY     = 1

> @@ -369,8 +362,6 @@ CAPSULE_HEADER_INIT_VERSION = 0x1

>  

>    FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7

>  

> -!endif

> -

>  ################################################################################

>  #

>  # Rules are use with the [FV] section's module INF type to define

> -- 

> 2.19.2

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Dec. 19, 2018, 5:32 p.m. | #2
On Wed, 19 Dec 2018 at 18:26, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>

> On Wed, Dec 19, 2018 at 06:06:14PM +0100, Ard Biesheuvel wrote:

> > Remove the DO_CAPSULE conditionals so that the capsules are

> > always built. This fixes a build issue that exists currently,

> > since the IPv6 enabled version of IScsiDxe that we now include

> > depends on a library class that can only be resolved if building

> > with DO_CAPSULE=TRUE.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

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

>

> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>


Thanks!

Pushed as 54a0e7ae1289..c955b5129771

> > ---

> >  Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 9 ---------

> >  Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 9 ---------

> >  2 files changed, 18 deletions(-)

> >

> > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > index 3d0544cf74cd..49671eefbdea 100644

> > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc

> > @@ -19,7 +19,6 @@

> >

> >  DEFINE NUM_CORES    = 8

> >  DEFINE DO_FLASHER   = FALSE

> > -DEFINE DO_CAPSULE   = FALSE

> >

> >    PLATFORM_NAME                  = Overdrive

> >    PLATFORM_GUID                  = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB

> > @@ -124,14 +123,12 @@ DEFINE DO_CAPSULE   = FALSE

> >

> >    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf

> >    DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf

> > -!if $(DO_CAPSULE) == TRUE

> >    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

> >    IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

> >    EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf

> >    FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf

> >    IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf

> >    PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf

> > -!endif

> >

> >    TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

> >    OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

> > @@ -492,8 +489,6 @@ DEFINE DO_CAPSULE   = FALSE

> >    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0

> >    gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0

> >

> > -!if $(DO_CAPSULE) == TRUE

> > -

> >  [PcdsDynamicExDefault.common.DEFAULT]

> >    gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100

> >

> > @@ -503,8 +498,6 @@ DEFINE DO_CAPSULE   = FALSE

> >    # d34b3d29-0085-4ab3-8be8-84188cc50489

> >    gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x29, 0x3d, 0x4b, 0xd3, 0x85, 0x0, 0xb3, 0x4a, 0x8b, 0xe8, 0x84, 0x18, 0x8c, 0xc5, 0x04, 0x89}

> >

> > -!endif

> > -

> >  [PcdsDynamicHii]

> >    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5

> >

> > @@ -761,7 +754,6 @@ DEFINE DO_CAPSULE   = FALSE

> >    }

> >  !endif

> >

> > -!if $(DO_CAPSULE) == TRUE

> >    #

> >    # Firmware update

> >    #

> > @@ -769,4 +761,3 @@ DEFINE DO_CAPSULE   = FALSE

> >    SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf

> >    SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf

> >    Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf

> > -!endif

> > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> > index 840b3d0313f3..4b6b808c1454 100644

> > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf

> > @@ -252,13 +252,11 @@ READ_LOCK_STATUS   = TRUE

> >    #

> >    INF Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf

> >

> > -!if $(DO_CAPSULE) == TRUE

> >    #

> >    # Firmware update

> >    #

> >    INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf

> >    INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf

> > -!endif

> >

> >  [FV.STYX_EFI]

> >  FvAlignment        = 16

> > @@ -288,10 +286,7 @@ READ_LOCK_STATUS   = TRUE

> >    INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

> >    INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

> >    INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

> > -

> > -!if $(DO_CAPSULE) == TRUE

> >    INF RuleOverride = FMP_IMAGE_DESC Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf

> > -!endif

> >

> >    FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {

> >      SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {

> > @@ -299,8 +294,6 @@ READ_LOCK_STATUS   = TRUE

> >      }

> >    }

> >

> > -!if $(DO_CAPSULE) == TRUE

> > -

> >  [FV.CapsuleDispatchFv]

> >  FvAlignment        = 16

> >  ERASE_POLARITY     = 1

> > @@ -369,8 +362,6 @@ CAPSULE_HEADER_INIT_VERSION = 0x1

> >

> >    FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7

> >

> > -!endif

> > -

> >  ################################################################################

> >  #

> >  # Rules are use with the [FV] section's module INF type to define

> > --

> > 2.19.2

> >

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

Patch

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 3d0544cf74cd..49671eefbdea 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -19,7 +19,6 @@ 
 
 DEFINE NUM_CORES    = 8
 DEFINE DO_FLASHER   = FALSE
-DEFINE DO_CAPSULE   = FALSE
 
   PLATFORM_NAME                  = Overdrive
   PLATFORM_GUID                  = B2296C02-9DA1-4CD1-BD48-4D4F0F1276EB
@@ -124,14 +123,12 @@  DEFINE DO_CAPSULE   = FALSE
 
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
   DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
-!if $(DO_CAPSULE) == TRUE
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
   EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf
   FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
   PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
-!endif
 
   TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -492,8 +489,6 @@  DEFINE DO_CAPSULE   = FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0
 
-!if $(DO_CAPSULE) == TRUE
-
 [PcdsDynamicExDefault.common.DEFAULT]
   gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100
 
@@ -503,8 +498,6 @@  DEFINE DO_CAPSULE   = FALSE
   # d34b3d29-0085-4ab3-8be8-84188cc50489
   gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x29, 0x3d, 0x4b, 0xd3, 0x85, 0x0, 0xb3, 0x4a, 0x8b, 0xe8, 0x84, 0x18, 0x8c, 0xc5, 0x04, 0x89}
 
-!endif
-
 [PcdsDynamicHii]
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5
 
@@ -761,7 +754,6 @@  DEFINE DO_CAPSULE   = FALSE
   }
 !endif
 
-!if $(DO_CAPSULE) == TRUE
   #
   # Firmware update
   #
@@ -769,4 +761,3 @@  DEFINE DO_CAPSULE   = FALSE
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
   Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
-!endif
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
index 840b3d0313f3..4b6b808c1454 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf
@@ -252,13 +252,11 @@  READ_LOCK_STATUS   = TRUE
   #
   INF Silicon/AMD/Styx/Drivers/StyxRngDxe/StyxRngDxe.inf
 
-!if $(DO_CAPSULE) == TRUE
   #
   # Firmware update
   #
   INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
   INF SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
-!endif
 
 [FV.STYX_EFI]
 FvAlignment        = 16
@@ -288,10 +286,7 @@  READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
   INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-
-!if $(DO_CAPSULE) == TRUE
   INF RuleOverride = FMP_IMAGE_DESC Platform/AMD/OverdriveBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
-!endif
 
   FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
@@ -299,8 +294,6 @@  READ_LOCK_STATUS   = TRUE
     }
   }
 
-!if $(DO_CAPSULE) == TRUE
-
 [FV.CapsuleDispatchFv]
 FvAlignment        = 16
 ERASE_POLARITY     = 1
@@ -369,8 +362,6 @@  CAPSULE_HEADER_INIT_VERSION = 0x1
 
   FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7
 
-!endif
-
 ################################################################################
 #
 # Rules are use with the [FV] section's module INF type to define