public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Yao, Jiewen" <jiewen.yao@intel.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Tian, Feng" <feng.tian@intel.com>,
	"Gao, Liming" <liming.gao@intel.com>,
	 "Zeng, Star" <star.zeng@intel.com>,
	"Zhang, Chao B" <chao.b.zhang@intel.com>
Subject: Re: [PATCH V4 7/8] QuarkPlatformPkg/dsc/fdf: Add capsule/recovery support.
Date: Thu, 27 Oct 2016 01:08:20 +0000	[thread overview]
Message-ID: <74D8A39837DF1E4DA445A8C0B3885C50386B8162@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <E92EE9817A31E24EB0585FDF735412F56483B9A7@ORSMSX113.amr.corp.intel.com>

Agree and updated.

From: Kinney, Michael D
Sent: Thursday, October 27, 2016 8:41 AM
To: Yao, Jiewen <jiewen.yao@intel.com>; edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: Tian, Feng <feng.tian@intel.com>; Gao, Liming <liming.gao@intel.com>; Zeng, Star <star.zeng@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>
Subject: RE: [edk2] [PATCH V4 7/8] QuarkPlatformPkg/dsc/fdf: Add capsule/recovery support.

Jiewen,

A couple comments inline below.

Mike

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Jiewen Yao
> Sent: Saturday, October 22, 2016 7:32 PM
> To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Cc: Tian, Feng <feng.tian@intel.com<mailto:feng.tian@intel.com>>; Gao, Liming <liming.gao@intel.com<mailto:liming.gao@intel.com>>; Zeng, Star
> <star.zeng@intel.com<mailto:star.zeng@intel.com>>; Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; Zhang, Chao B
> <chao.b.zhang@intel.com<mailto:chao.b.zhang@intel.com>>
> Subject: [edk2] [PATCH V4 7/8] QuarkPlatformPkg/dsc/fdf: Add capsule/recovery support.
>
> Add capsule and recovery support module in platform dsc and fdf.
>
> Cc: Michael D Kinney <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>
> Cc: Kelly Steele <kelly.steele@intel.com<mailto:kelly.steele@intel.com>>
> Cc: Feng Tian <feng.tian@intel.com<mailto:feng.tian@intel.com>>
> Cc: Star Zeng <star.zeng@intel.com<mailto:star.zeng@intel.com>>
> Cc: Liming Gao <liming.gao@intel.com<mailto:liming.gao@intel.com>>
> Cc: Chao Zhang <chao.b.zhang@intel.com<mailto:chao.b.zhang@intel.com>>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiewen Yao <jiewen.yao@intel.com<mailto:jiewen.yao@intel.com>>
> ---
>  QuarkPlatformPkg/Quark.dsc    |  72 ++++++++--
>  QuarkPlatformPkg/Quark.fdf    | 141 ++++++++++++++++++++
>  QuarkPlatformPkg/QuarkMin.dsc |   7 +-
>  3 files changed, 205 insertions(+), 15 deletions(-)
>
> diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc
> index d5988da..153f6e7 100644
> --- a/QuarkPlatformPkg/Quark.dsc
> +++ b/QuarkPlatformPkg/Quark.dsc
> @@ -39,6 +39,8 @@
>    DEFINE SOURCE_DEBUG_ENABLE  = FALSE
>    DEFINE PERFORMANCE_ENABLE   = FALSE
>    DEFINE LOGGING              = FALSE
> +  DEFINE CAPSULE_ENABLE       = TRUE
> +  DEFINE RECOVERY_ENABLE      = TRUE
>
>    #
>    # Galileo board.  Options are [GEN1, GEN2]
> @@ -160,11 +162,9 @@
>    PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
>  !endif
>
> -!if $(SECURE_BOOT_ENABLE) || $(MEASURED_BOOT_ENABLE)
>    OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
>    IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> -!endif
>
>  !if $(SECURE_BOOT_ENABLE)
>    PlatformSecureLib|QuarkPlatformPkg/Library/PlatformSecureLib/PlatformSecureLib.inf
> @@ -225,6 +225,17 @@
>
> PlatformPcieHelperLib|QuarkPlatformPkg/Library/PlatformPcieHelperLib/PlatformPcieHelper
> Lib.inf
>
> PlatformHelperLib|QuarkPlatformPkg/Library/PlatformHelperLib/DxePlatformHelperLib.inf
>
> +!if $(CAPSULE_ENABLE)
> +  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
> +!else
> +  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> +!endif
> +
> +
> EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsule
> Lib.inf
> +
> FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLib
> Null.inf
> +  IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
> +
> PlatformFlashAccessLib|QuarkPlatformPkg/Feature/Capsule/Library/PlatformFlashAccessLib/
> PlatformFlashAccessLibDxe.inf
> +
>  [LibraryClasses.common.SEC]
>    #
>    # SEC specific phase
> @@ -250,9 +261,7 @@
>
> PlatformHelperLib|QuarkPlatformPkg/Library/PlatformHelperLib/PeiPlatformHelperLib.inf
>
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHand
> lerLib.inf
>    MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
> -!if $(SECURE_BOOT_ENABLE) || $(MEASURED_BOOT_ENABLE)
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> -!endif
>  !if $(PERFORMANCE_ENABLE)
>    PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
>  !endif
> @@ -273,9 +282,7 @@
>    PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
>
> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandler
> Lib.inf
>    SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
> -!if $(SECURE_BOOT_ENABLE) || $(MEASURED_BOOT_ENABLE)
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
> -!endif
>  !if $(PERFORMANCE_ENABLE)
>    PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
>  !endif
> @@ -301,6 +308,10 @@
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>  !endif
>
> +!if $(CAPSULE_ENABLE)
> +  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
> +!endif
> +
>  [LibraryClasses.IA32.UEFI_DRIVER,LibraryClasses.IA32.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>
> @@ -431,6 +442,10 @@
>
>    gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand|FALSE
>
> +!if $(RECOVERY_ENABLE)
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"QUARKREC.Cap"
> +!endif
> +
>  [PcdsPatchableInModule]
>    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803000C7
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0
> @@ -449,6 +464,11 @@
>    gQuarkPlatformTokenSpaceGuid.PcdUserIsPhysicallyPresent|FALSE
>    gQuarkPlatformTokenSpaceGuid.PcdSpiFlashDeviceSize|0
>
> +!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)
> +
> gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x
> 100
> +  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0xc0, 0x20, 0xaf,
> 0x62, 0x16, 0x70, 0x4a, 0x42, 0x9b, 0xf8, 0x9c, 0xcc, 0x86, 0x58, 0x40, 0x90}
> +!endif
> +
>  !if $(MEASURED_BOOT_ENABLE)
>    #
>    # TPM1.2      { 0x8b01e5b6, 0x4f19, 0x46e8, { 0xab, 0x93, 0x1c, 0x53, 0x67, 0x1b,
> 0x90, 0xcc } }
> @@ -540,6 +560,11 @@
>      !endif
>    }
>
> +!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)
> +  # FMP image decriptor
> +
> QuarkPlatformPkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +!endif
> +
>    #
>    # PEI Core
>    #
> @@ -594,6 +619,7 @@
>    #
>    # Recovery
>    #
> +!if $(RECOVERY_ENABLE)
>    QuarkSocPkg/QuarkSouthCluster/Usb/Common/Pei/UsbPei.inf
>    MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
>    QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Pei/OhciPei.inf
> @@ -601,6 +627,11 @@
>    MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
>    FatPkg/FatPei/FatPei.inf
>    MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
> +  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf {
> +    <LibraryClasses>
> +
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthentic
> ationLibRsa2048Sha256.inf
> +  }
> +!endif
>
>  [Components.IA32]
>    #
> @@ -645,11 +676,7 @@
>        NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
>    }
>
> -  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
> -    <LibraryClasses>
> -      GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
> -      CapsuleLib|IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.inf
> -  }
> +  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>    MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> @@ -675,6 +702,11 @@
>      <LibraryClasses>
>
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>
> PlatformBootManagerLib|QuarkPlatformPkg/Library/PlatformBootManagerLib/PlatformBootMana
> gerLib.inf
> +!if $(CAPSULE_ENABLE)
> +
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLib
> Pkcs7.inf
> +!else
> +
> FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLib
> Null.inf
> +!endif
>    }
>    MdeModulePkg/Application/UiApp/UiApp.inf {
>      <LibraryClasses>
> @@ -889,5 +921,23 @@
>        gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
>    }
>
> +!if $(CAPSULE_ENABLE)
> +  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
> +
> +  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {
> +    <LibraryClasses>
> +
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLib
> Pkcs7.inf
> +  }
> +  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {
> +    <LibraryClasses>
> +
> FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLib
> Pkcs7.inf
> +  }
> +
> +  MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf {
> +    <LibraryClasses>
> +      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> +  }
> +!endif
> +
>  [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
>    MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
> diff --git a/QuarkPlatformPkg/Quark.fdf b/QuarkPlatformPkg/Quark.fdf
> index 9f51eb3..a9d828d 100644
> --- a/QuarkPlatformPkg/Quark.fdf
> +++ b/QuarkPlatformPkg/Quark.fdf
> @@ -317,6 +317,11 @@ APRIORI PEI {
>  ##
>  INF  UefiCpuPkg/SecCore/SecCore.inf
>
> +!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)
> +  # FMP image decriptor
> +INF RuleOverride = FMP_IMAGE_DESC
> QuarkPlatformPkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
> +!endif
> +
>  INF  MdeModulePkg/Core/Pei/PeiMain.inf
>
>  ##
> @@ -347,12 +352,16 @@ INF  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf
>  INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf
>  !endif
>
> +!if $(RECOVERY_ENABLE)
>  FILE FV_IMAGE = 1E9D7604-EF45-46a0-BD8A-71AC78C17AC1 {
>    SECTION PEI_DEPEX_EXP = {gEfiPeiMemoryDiscoveredPpiGuid AND
> gEfiPeiBootInRecoveryModePpiGuid}
>    SECTION GUIDED A31280AD-481E-41B6-95E8-127F4C984779 {    # TIANO COMPRESS GUID
>      SECTION FV_IMAGE = FVRECOVERY_COMPONENTS
>    }
>  }
> +!endif
> +
> +!if $(RECOVERY_ENABLE)
>
>  ################################################################################
>  #
> @@ -390,6 +399,9 @@ INF  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
>  INF  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
>  INF  FatPkg/FatPei/FatPei.inf
>  INF  MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
> +INF  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
> +
> +!endif
>
>  ################################################################################
>  #
> @@ -579,6 +591,25 @@ INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
>  INF  RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
>  !endif
>
> +!if $(CAPSULE_ENABLE)
> +INF  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
> +INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
> +!endif
> +
> +!if $(RECOVERY_ENABLE)
> +FILE FREEFORM =
> PCD(gQuarkPlatformTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid) {
> +     SECTION RAW = BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigningPublicKey.bin
> +     SECTION UI = "Rsa2048Sha256TestSigningPublicKey"
> +     }
> +!endif
> +
> +!if $(CAPSULE_ENABLE)
> +FILE FREEFORM = PCD(gQuarkPlatformTokenSpaceGuid.PcdEdkiiPkcs7TestPublicKeyFileGuid) {
> +     SECTION RAW = BaseTools/Source/Python/Pkcs7Sign/TestRoot.cer
> +     SECTION UI = "Pkcs7TestRoot"
> +     }
> +!endif
> +
>  ################################################################################
>  #
>  # FV Section
> @@ -650,6 +681,106 @@ INF  RuleOverride = TIANOCOMPRESSED
> ShellPkg/Application/Shell/Shell.inf
>  INF  RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf
>  !endif
>
> +!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)
> +
> +[FV.CapsuleDispatchFv]
> +FvAlignment        = 16
> +ERASE_POLARITY     = 1
> +MEMORY_MAPPED      = TRUE
> +STICKY_WRITE       = TRUE
> +LOCK_CAP           = TRUE
> +LOCK_STATUS        = TRUE
> +WRITE_DISABLED_CAP = TRUE
> +WRITE_ENABLED_CAP  = TRUE
> +WRITE_STATUS       = TRUE
> +WRITE_LOCK_CAP     = TRUE
> +WRITE_LOCK_STATUS  = TRUE
> +READ_DISABLED_CAP  = TRUE
> +READ_ENABLED_CAP   = TRUE
> +READ_STATUS        = TRUE
> +READ_LOCK_CAP      = TRUE
> +READ_LOCK_STATUS   = TRUE
> +
> +!if $(CAPSULE_ENABLE)
> +INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
> +!endif
> +
> +[FV.SystemFirmwareUpdateCargo]
> +FvAlignment        = 16
> +ERASE_POLARITY     = 1
> +MEMORY_MAPPED      = TRUE
> +STICKY_WRITE       = TRUE
> +LOCK_CAP           = TRUE
> +LOCK_STATUS        = TRUE
> +WRITE_DISABLED_CAP = TRUE
> +WRITE_ENABLED_CAP  = TRUE
> +WRITE_STATUS       = TRUE
> +WRITE_LOCK_CAP     = TRUE
> +WRITE_LOCK_STATUS  = TRUE
> +READ_DISABLED_CAP  = TRUE
> +READ_ENABLED_CAP   = TRUE
> +READ_STATUS        = TRUE
> +READ_LOCK_CAP      = TRUE
> +READ_LOCK_STATUS   = TRUE
> +
> +FILE RAW = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215 { # PcdEdkiiSystemFirmwareFileGuid
> +    FD = Quark
> +  }
> +
> +FILE RAW = ce57b167-b0e4-41e8-a897-5f4feb781d40 { #
> gEdkiiSystemFmpCapsuleDriverFvFileGuid
> +    FV = CapsuleDispatchFv
> +  }
> +
> +FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { #
> gEdkiiSystemFmpCapsuleConfigFileGuid
> +
> QuarkPlatformPkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.
> ini
> +  }
> +

Add !endif here.  Non need to nest !if.

> +!if $(CAPSULE_ENABLE)
> +[FmpPayload.FmpPayloadSystemFirmwarePkcs7]
> +IMAGE_HEADER_INIT_VERSION = 0x02
> +IMAGE_TYPE_ID             = 62af20c0-7016-424a-9bf8-9ccc86584090 #
> PcdSystemFmpCapsuleImageTypeIdGuid
> +IMAGE_INDEX               = 0x1
> +HARDWARE_INSTANCE         = 0x0
> +MONOTONIC_COUNT           = 0x2
> +CERTIFICATE_GUID          = 4AAFD29D-68DF-49EE-8AA9-347D375665A7 # PKCS7
> +
> +FV = SystemFirmwareUpdateCargo
> +!endif
> +

Move the following section down with the other RECOVERY_ENABLE section so there
is only one !if (CAPSULE_ENABLE) with 2 sections and one !if (RECOVERY_ENABLE)
with 2 sections,

> +!if $(RECOVERY_ENABLE)
> +[FmpPayload.FmpPayloadSystemFirmwareRsa2048]
> +IMAGE_HEADER_INIT_VERSION = 0x02
> +IMAGE_TYPE_ID             = 62af20c0-7016-424a-9bf8-9ccc86584090 #
> PcdSystemFmpCapsuleImageTypeIdGuid
> +IMAGE_INDEX               = 0x1
> +HARDWARE_INSTANCE         = 0x0
> +MONOTONIC_COUNT           = 0x2
> +CERTIFICATE_GUID          = A7717414-C616-4977-9420-844712A735BF # RSA2048SHA256
> +
> +FV = SystemFirmwareUpdateCargo
> +!endif
> +
> +!if $(CAPSULE_ENABLE)
> +[Capsule.QuarkFirmwareUpdateCapsuleFmpPkcs7]
> +CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a #
> gEfiFmpCapsuleGuid
> +CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset
> +CAPSULE_HEADER_SIZE         = 0x20
> +CAPSULE_HEADER_INIT_VERSION = 0x1
> +
> +FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7
> +!endif
> +
> +!if $(RECOVERY_ENABLE)
> +[Capsule.QuarkRec]
> +CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a #
> gEfiFmpCapsuleGuid
> +CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset
> +CAPSULE_HEADER_SIZE         = 0x20
> +CAPSULE_HEADER_INIT_VERSION = 0x1
> +
> +FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048
> +!endif
> +
> +!endif
> +
>  ################################################################################
>  #
>  # Rules are use with the [FV] section's module INF type to define
> @@ -771,3 +902,13 @@ INF  RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf
>      RAW ACPI               |.acpi
>      RAW ASL                |.aml
>    }
> +
> +[Rule.Common.PEIM.FMP_IMAGE_DESC]
> +  FILE PEIM = $(NAMED_GUID) {
> +     RAW BIN                  |.acpi
> +     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
> +     PE32      PE32    Align=4K          $(INF_OUTPUT)/$(MODULE_NAME).efi
> +     UI       STRING="$(MODULE_NAME)" Optional
> +     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
> +  }
> +
> diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc
> index 1a4bd30..be85e3f 100644
> --- a/QuarkPlatformPkg/QuarkMin.dsc
> +++ b/QuarkPlatformPkg/QuarkMin.dsc
> @@ -161,6 +161,8 @@
>    AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
>  !endif
>
> +  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> +
>    #
>    # CPU
>    #
> @@ -547,10 +549,7 @@
>    MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>    MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
>    MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
> -  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
> -    <LibraryClasses>
> -      CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> -  }
> +  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
>    MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>    PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
> --
> 2.7.4.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> https://lists.01.org/mailman/listinfo/edk2-devel


  reply	other threads:[~2016-10-27  1:08 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-23  2:31 [PATCH V4 0/8] Add capsule support for Quark Jiewen Yao
2016-10-23  2:31 ` [PATCH V4 1/8] QuarkPlatformPkg/dec: Add test key file guid Jiewen Yao
2016-10-27  1:27   ` Kinney, Michael D
2016-10-27  1:31     ` Yao, Jiewen
2016-10-23  2:31 ` [PATCH V4 2/8] QuarkPlatformPkg/PlatformFlashAccessLib: Add instance for capsule update Jiewen Yao
2016-10-23  2:31 ` [PATCH V4 3/8] QuarkPlatformPkg/SystemFirmwareDescriptor: Add Descriptor " Jiewen Yao
2016-10-27  0:30   ` Kinney, Michael D
2016-10-23  2:31 ` [PATCH V4 4/8] QuarkPlatformPkg/SystemFirmwareUpdateConfig: Add capsule config file Jiewen Yao
2016-10-23  2:31 ` [PATCH V4 5/8] QuarkPlatformPkg/PlatformInit: Remove recovery PPI installation Jiewen Yao
2016-10-23  2:31 ` [PATCH V4 6/8] QuarkPlatformPkg/PlatformBootManager: Add capsule/recovery handling Jiewen Yao
2016-10-26 23:36   ` Kinney, Michael D
2016-10-27  1:48     ` Yao, Jiewen
2016-10-27  2:14       ` Kinney, Michael D
2016-10-23  2:31 ` [PATCH V4 7/8] QuarkPlatformPkg/dsc/fdf: Add capsule/recovery support Jiewen Yao
2016-10-27  0:40   ` Kinney, Michael D
2016-10-27  1:08     ` Yao, Jiewen [this message]
2016-10-23  2:31 ` [PATCH V4 8/8] QuarkPlatformPkg/Readme: add capsule/recovery related content Jiewen Yao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=74D8A39837DF1E4DA445A8C0B3885C50386B8162@shsmsx102.ccr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox