Browse Source

PlatformPayloadPkg: Rename to match other feature conventions

Rename PlatformPayloadPkg to PlatformPayloadFeaturePkg.
Rename Package DEC, DSC, FDF and py scripts to match.
Search and replace PlatformPayloadPkg with PlatformPayloadFeaturePkg.

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Isaac Oram 1 year ago
parent
commit
2430726366
34 changed files with 26 additions and 29 deletions
  1. 1 1
      Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc
  2. 1 1
      Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc
  3. 1 1
      Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf
  4. 1 1
      Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf
  5. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbInfo.c
  6. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.c
  7. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.h
  8. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbServiceSmm.c
  9. 1 1
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf
  10. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmmCommon.h
  11. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableInfoGuid.h
  12. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInfoGuid.h
  13. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDeviceLib.h
  14. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Include/Library/SpiFlashLib.h
  15. 7 7
      Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc
  16. 2 2
      Features/Intel/PlatformPayloadFeaturePkg/Include/PostMemory.fdf
  17. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Include/PreMemory.fdf
  18. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.c
  19. 1 2
      Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
  20. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c
  21. 1 2
      Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf
  22. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/PchSpi.c
  23. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/RegsSpi.h
  24. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiCommon.h
  25. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.c
  26. 1 1
      Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf
  27. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c
  28. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h
  29. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf
  30. 1 1
      Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
  31. 2 2
      Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc
  32. 0 0
      Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf
  33. 2 2
      Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py
  34. 4 5
      Features/Intel/PlatformPayloadFeaturePkg/Readme.md

+ 1 - 1
Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc

@@ -80,5 +80,5 @@
 # Individual features
 #
 !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE
-  !include PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc
+  !include PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc
 !endif

+ 1 - 1
Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc

@@ -56,7 +56,7 @@
   #
   # Individual features
   #
-  PlatformPayloadPkg/PlatformPayloadPkg.dec
+  PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
 
 #
 # The section below sets all PCDs to FALSE in this DSC file so the feature is not enabled by default.

+ 1 - 1
Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf

@@ -81,5 +81,5 @@
 # Individual features
 #
 !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE
-  !include PlatformPayloadPkg/Include/PostMemory.fdf
+  !include PlatformPayloadFeaturePkg/Include/PostMemory.fdf
 !endif

+ 1 - 1
Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf

@@ -81,5 +81,5 @@
 # Individual features
 #
 !if gPlatformPayloadPkgTokenSpaceGuid.PcdPayloadPackageFeatureEnable == TRUE
-  !include PlatformPayloadPkg/Include/PreMemory.fdf
+  !include PlatformPayloadFeaturePkg/Include/PreMemory.fdf
 !endif

+ 0 - 0
Features/Intel/PlatformPayloadPkg/Fvb/FvbInfo.c → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbInfo.c


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Fvb/FvbService.c → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.c


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Fvb/FvbService.h → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbService.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Fvb/FvbServiceSmm.c → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbServiceSmm.c


+ 1 - 1
Features/Intel/PlatformPayloadPkg/Fvb/FvbSmm.inf → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf

@@ -28,7 +28,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
-  PlatformPayloadPkg/PlatformPayloadPkg.dec
+  PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
 
 [LibraryClasses]
   FlashDeviceLib

+ 0 - 0
Features/Intel/PlatformPayloadPkg/Fvb/FvbSmmCommon.h → Features/Intel/PlatformPayloadFeaturePkg/Fvb/FvbSmmCommon.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Include/Guid/NvVariableInfoGuid.h → Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/NvVariableInfoGuid.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Include/Guid/SpiFlashInfoGuid.h → Features/Intel/PlatformPayloadFeaturePkg/Include/Guid/SpiFlashInfoGuid.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Include/Library/FlashDeviceLib.h → Features/Intel/PlatformPayloadFeaturePkg/Include/Library/FlashDeviceLib.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Include/Library/SpiFlashLib.h → Features/Intel/PlatformPayloadFeaturePkg/Include/Library/SpiFlashLib.h


+ 7 - 7
Features/Intel/PlatformPayloadPkg/Include/PlatformPayloadFeature.dsc → Features/Intel/PlatformPayloadFeaturePkg/Include/PlatformPayloadFeature.dsc

@@ -49,8 +49,8 @@
 
 [LibraryClasses.common.DXE_SMM_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER]
   !if $(SMM_VARIABLE) == TRUE
-    SpiFlashLib|PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf
-    FlashDeviceLib|PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf
+    SpiFlashLib|PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf
+    FlashDeviceLib|PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
     DxeHobListLib|UefiPayloadPkg/Library/DxeHobListLib/DxeHobListLib.inf
   !endif
 
@@ -79,15 +79,15 @@
   # SMM Variable Support
   #
   !if $(SMM_VARIABLE) == TRUE
-    PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf {
+    PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf {
       <LibraryClasses>
         PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
     }
 
-    PlatformPayloadPkg/Fvb/FvbSmm.inf {
+    PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf {
       <LibraryClasses>
         PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
-        NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
+        NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf
     }
 
     MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
@@ -97,13 +97,13 @@
         NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
         NULL|MdeModulePkg/Library/VarCheckPcdLib/VarCheckPcdLib.inf
         NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
-        NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
+        NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf
     }
 
     MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf {
       <LibraryClasses>
         PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
-        NULL|PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf
+        NULL|PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf
     }
     MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf {
       <LibraryClasses>

+ 2 - 2
Features/Intel/PlatformPayloadPkg/Include/PostMemory.fdf → Features/Intel/PlatformPayloadFeaturePkg/Include/PostMemory.fdf

@@ -11,8 +11,8 @@
 # SMM Support
 #
 !if $(SMM_VARIABLE) == TRUE
-  INF PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf
-  INF PlatformPayloadPkg/Fvb/FvbSmm.inf
+  INF PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf
+  INF PlatformPayloadFeaturePkg/Fvb/FvbSmm.inf
   INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
   INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf

+ 0 - 0
Features/Intel/PlatformPayloadPkg/Include/PreMemory.fdf → Features/Intel/PlatformPayloadFeaturePkg/Include/PreMemory.fdf


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.c → Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.c


+ 1 - 2
Features/Intel/PlatformPayloadPkg/Library/FlashDeviceLib/FlashDeviceLib.inf → Features/Intel/PlatformPayloadFeaturePkg/Library/FlashDeviceLib/FlashDeviceLib.inf

@@ -29,10 +29,9 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  PlatformPayloadPkg/PlatformPayloadPkg.dec
+  PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
 
 [LibraryClasses]
   DebugLib
   BaseMemoryLib
   SpiFlashLib
-

+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.c → Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.c


+ 1 - 2
Features/Intel/PlatformPayloadPkg/Library/PcdInitLib/PcdInitLib.inf → Features/Intel/PlatformPayloadFeaturePkg/Library/PcdInitLib/PcdInitLib.inf

@@ -27,7 +27,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  PlatformPayloadPkg/PlatformPayloadPkg.dec
+  PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
 
 [LibraryClasses]
   BaseLib
@@ -47,4 +47,3 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-

+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/PchSpi.c → Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/PchSpi.c


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/RegsSpi.h → Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/RegsSpi.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiCommon.h → Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiCommon.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.c → Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.c


+ 1 - 1
Features/Intel/PlatformPayloadPkg/Library/SpiFlashLib/SpiFlashLib.inf → Features/Intel/PlatformPayloadFeaturePkg/Library/SpiFlashLib/SpiFlashLib.inf

@@ -30,7 +30,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  PlatformPayloadPkg/PlatformPayloadPkg.dec
+  PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec
 
 [LibraryClasses]
   BaseLib

+ 0 - 0
Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c → Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.c


+ 0 - 0
Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h → Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.h


+ 0 - 0
Features/Intel/PlatformPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf → Features/Intel/PlatformPayloadFeaturePkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf


+ 1 - 1
Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dec → Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec

@@ -10,7 +10,7 @@
 
 [Defines]
   DEC_SPECIFICATION              = 0x00010005
-  PACKAGE_NAME                   = PlatformPayloadPkg
+  PACKAGE_NAME                   = PlatformPayloadFeaturePkg
   PACKAGE_GUID                   = 17F3ACAC-079D-4518-9EBF-E33289733E8C
   PACKAGE_VERSION                = 0.1
 

+ 2 - 2
Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.dsc → Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc

@@ -15,7 +15,7 @@
 #
 ################################################################################
 [Defines]
-  PLATFORM_NAME                       = PlatformPayloadPkg
+  PLATFORM_NAME                       = PlatformPayloadFeaturePkg
   PLATFORM_GUID                       = D3C551BE-9BC6-48F5-AA8A-F49425C28CA9
   PLATFORM_VERSION                    = 0.1
   DSC_SPECIFICATION                   = 0x00010005
@@ -23,7 +23,7 @@
   BUILD_TARGETS                       = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER                    = DEFAULT
   OUTPUT_DIRECTORY                    = Build/$(PLATFORM_NAME)
-  FLASH_DEFINITION                    = $(PLATFORM_NAME)/PlatformPayloadPkg.fdf
+  FLASH_DEFINITION                    = $(PLATFORM_NAME)/PlatformPayloadFeaturePkg.fdf
   PCD_DYNAMIC_AS_DYNAMICEX            = TRUE
   DXE_ARCH                            = X64
 

+ 0 - 0
Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.fdf → Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf


+ 2 - 2
Features/Intel/PlatformPayloadPkg/PlatformPayloadPkg.py → Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py

@@ -45,11 +45,11 @@ def BuildUniversalPayload(Args, MacroList):
     if not os.path.exists (Edk2PayloadBuildScript):
         raise Exception("Could not find universal UEFI payload build script UniversalPayloadBuild.py")
 
-    PlatformFvDscPath      = os.path.normpath("PlatformPayloadPkg/PlatformPayloadPkg.dsc")
+    PlatformFvDscPath      = os.path.normpath("PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc")
     BuildDir               = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64"))
     PlatformFvReportPath   = os.path.join(BuildDir, "PlatformPayloadReport.txt")
     UniversalUefiPld       = os.path.join(BuildDir, 'UniversalPayload.elf')
-    PlatformFv             = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadPkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PlatformPayload.Fv"))
+    PlatformFv             = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PlatformPayload.Fv"))
 
     if "CLANG_BIN" in os.environ:
         LlvmObjcopyPath = os.path.join(os.environ["CLANG_BIN"], "llvm-objcopy")

+ 4 - 5
Features/Intel/PlatformPayloadPkg/Readme.md → Features/Intel/PlatformPayloadFeaturePkg/Readme.md

@@ -15,7 +15,7 @@ or bootloader dependency (only for coreboot). These modules would be located in
 edk2-platform repo.
 
 The generic UEFI payload could be built from EDK2 UefiPayloadPkg in ELF format following
-universal payload specification. And a Platform Payload could be built from PlatformPayloadPkg
+universal payload specification. And a Platform Payload could be built from PlatformPayloadFeaturePkg
 to provide Intel platform specific features (e.g. SPI module, PCH SMM) in FV/FD format.
 This platform payload could be inserted into universal UEFI payload as an ELF section
 to generate a full-feature payload.
@@ -32,11 +32,10 @@ set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Features\Intel;
 edk2\edksetup.bat
 
 ** Build universal UEFI payload with platform Payload
-python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg.py -t VS2019
-  -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE -D SMM_VARIABLE=TRUE
+python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPayloadFeaturePkg.py -t VS2019 -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE -D SMM_VARIABLE=TRUE
 or
 python edk2\UefiPayloadPkg\UniversalPayloadBuild.py -t VS2019 -D SMM_SUPPORT=TRUE -DVARIABLE_SUPPORT=NONE
-python edk2-platforms\Features\Intel\PlatformPayloadPkg\PlatformPayloadPkg.py -t VS2019 -D SMM_VARIABLE=TRUE -s
+python edk2-platforms\Features\Intel\PlatformPayloadFeaturePkg\PlatformPayloadFeaturePkg.py -t VS2019 -D SMM_VARIABLE=TRUE -s
 
   If build success, the final UEFI payload is at Build\UefiPayloadPkgX64\UniversalPayload.elf.
 
@@ -55,7 +54,7 @@ Several build macros are used as below for SMM variable feature modules.
 
 2. Data Flows
 SMM variable:
-The interface with bootloader are defined in PlatformPayloadPkg\Include\Guid
+The interface with bootloader are defined in PlatformPayloadFeaturePkg\Include\Guid
 SpiFlashInfoGuid.h    -- SPI related information for SPI flash operation.
 NvVariableInfoGuid.h  -- Variable related information for SPI NV variables.