From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.104.1660171621665418620 for ; Wed, 10 Aug 2022 15:47:01 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=YuBngnRY; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660171621; x=1691707621; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xV1mWQE37lUv1OISUEbsQiCIJMSbxIreRcbLjJKf79w=; b=YuBngnRYiCE9NYMwwtVKG9vlTggnRhrQJoHUVlCxCsFlzcXmDTtFzvV8 Q6E9Od5ECKJOrT2w6Fk2FiJ7hg9xyd5L2zaW/3Qmmj26P98J52nEmjiVj M83IcgoNxQn5xiaNDmXDRXyyJu9xqLuTh/98yRl/wGAxl1d9KxthuNahW PTNufEE7o4TaifwADYFDebuzELtCtmjbAkqKQiuw1ALQ1Ac8q37+gKT1p U+gazY32e0jjdnpYoh9zxBXU7uxE71YCau1PjZHT7wdE0uGzBCOClzS+m edXrFtEXPw1WLEkE/+NDgKbXl7+xTgVQKqyNyOkU1rARgLJkJPl9VVanN w==; X-IronPort-AV: E=McAfee;i="6400,9594,10435"; a="291211812" X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="291211812" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 15:47:00 -0700 X-IronPort-AV: E=Sophos;i="5.93,228,1654585200"; d="scan'208";a="694690088" Received: from iworam-desk.amr.corp.intel.com ([10.24.80.243]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 15:46:59 -0700 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Nate DeSimone , Liming Gao , Ray Ni , Guo Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 0/3] Update PlatformPayloadPkg to match feature conventions Date: Wed, 10 Aug 2022 15:46:46 -0700 Message-Id: X-Mailer: git-send-email 2.36.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The integration of the PlatformPayloadPkg breaks the AdvancedFeaturePkg build. The first patch fixes the build issue with executing build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc The PlatformPayloadPkg doesn't match advanced feature build and naming conventions. The second patch simply renames the files and does exact search and replace on the changes. The third patch fixes token space guid name, feature enable name, and the like to match the conventions of other features. Cc: Sai Chaganty Cc: Nate DeSimone Cc: Liming Gao Cc: Ray Ni Cc: Guo Dong Signed-off-by: Isaac Oram Isaac Oram (3): PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue PlatformPayloadPkg: Rename to match other feature conventions PlatformPayloadFeaturePkg: Update contents to match feature conventions .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 2 +- .../Include/AdvancedFeatures.dsc | 4 +- .../Include/AdvancedFeaturesPcd.dsc | 4 +- .../AdvancedFeaturePkg/Include/PostMemory.fdf | 4 +- .../AdvancedFeaturePkg/Include/PreMemory.fdf | 4 +- .../Fvb/FvbInfo.c | 0 .../Fvb/FvbService.c | 0 .../Fvb/FvbService.h | 0 .../Fvb/FvbServiceSmm.c | 0 .../Fvb/FvbSmm.inf | 4 +- .../Fvb/FvbSmmCommon.h | 0 .../Include/Guid/NvVariableInfoGuid.h | 0 .../Include/Guid/SpiFlashInfoGuid.h | 0 .../Include/Library/FlashDeviceLib.h | 0 .../Include/Library/SpiFlashLib.h | 0 .../Include/PlatformPayloadFeature.dsc | 50 +++++------ .../Include/PostMemory.fdf | 4 +- .../Include/PreMemory.fdf | 0 .../Library/FlashDeviceLib/FlashDeviceLib.c | 0 .../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +- .../Library/PcdInitLib/PcdInitLib.c | 0 .../Library/PcdInitLib/PcdInitLib.inf | 3 +- .../Library/SpiFlashLib/PchSpi.c | 0 .../Library/SpiFlashLib/RegsSpi.h | 0 .../Library/SpiFlashLib/SpiCommon.h | 0 .../Library/SpiFlashLib/SpiFlashLib.c | 0 .../Library/SpiFlashLib/SpiFlashLib.inf | 2 +- .../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0 .../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0 .../PchSmiDispatchSmm/PchSmiDispatchSmm.inf | 0 .../PlatformPayloadFeaturePkg.dec} | 8 +- .../PlatformPayloadFeaturePkg.dsc} | 30 ++++++- .../PlatformPayloadFeaturePkg.fdf} | 0 .../PlatformPayloadFeaturePkg.py} | 4 +- .../Readme.md | 82 ++++++++++--------- 35 files changed, 117 insertions(+), 91 deletions(-) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf (89%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (72%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.inf (92%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/PchSpi.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/RegsSpi.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiCommon.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.inf (90%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.c (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.h (100%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.inf (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dec => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec} (73%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dsc => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc} (77%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.fdf => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf} (100%) rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.py => PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py} (93%) rename Features/Intel/{PlatformPayloadPkg => PlatformPayloadFeaturePkg}/Readme.md (50%) -- 2.36.1.windows.1