[edk2-devel] [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest

Nate DeSimone posted 1 patch 4 years ago
Failed in applying to current master (apply log)
.../IntelMinPlatformManifest.xml              | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
[edk2-devel] [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest
Posted by Nate DeSimone 4 years ago
From: Nate DeSimone <nathaniel.l.desimone@intel.com>

Update MinPlatform manifest for newly added packages and branches

Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 .../IntelMinPlatformManifest.xml              | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
index 71d0353f3e..fa78924606 100644
--- a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
+++ b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
@@ -2,12 +2,10 @@
   <ProjectInfo>
     <CodeName>Intel-MinPlatform</CodeName>
     <Description>Intel Minimum Platform</Description>
-    <DevLead>michael.a.kubacki@intel.com</DevLead>
+    <DevLead>nathaniel.l.desimone@intel.com</DevLead>
     <LeadReviewers>
-      <Reviewer>michael.a.kubacki@intel.com</Reviewer>
       <Reviewer>chasel.chiu@intel.com</Reviewer>
       <Reviewer>nathaniel.l.desimone@intel.com</Reviewer>
-      <Reviewer>ankit.sinha@intel.com</Reviewer>
       <Reviewer>liming.gao@intel.com</Reviewer>
       <Reviewer>ray.ni@intel.com</Reviewer>
       <Reviewer>rangasai.v.chaganty@intel.com</Reviewer>
@@ -37,18 +35,22 @@
       <AlwaysInclude>ShellPkg|SourceLevelDebugPkg|UefiCpuPkg|FmpDevicePkg|CryptoPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2PlatformsRepo">
+      <AlwaysInclude>Features/Intel</AlwaysInclude>
       <AlwaysInclude>Platform/Intel/AdvancedFeaturePkg|Platform/Intel/MinPlatformPkg|Platform/Intel/BoardModulePkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg|Platform/Intel/ClevoOpenBoardPkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/PurleyOpenBoardPkg|Platform/Intel/Readme.md</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/build.cfg|Platform/Intel/build_bios.py</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/LewisburgPkg</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/PurleyRcPkg|Silicon/Intel/PurleySktPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/CometlakeOpenBoardPkg|Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/SimicsOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/WhiskeylakeOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/Readme.md|Platform/Intel/build.cfg|Platform/Intel/build_bios.py|Platform/Intel/Tools</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/CoffeelakeSiliconPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/SimicsIch10Pkg|Silicon/Intel/SimicsX58SktPkg|Silicon/Intel/Tools</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2NonOsiRepo">
-      <AlwaysInclude>Silicon/Intel/KabylakeSiliconBinPkg|Silicon/Intel/PurleySiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/CoffeelakeSiliconBinPkg|Silicon/Intel/KabylakeSiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/PurleySiliconBinPkg|Silicon/Intel/SimicsIch10BinPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="FspRepo">
-      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
+      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|CometLakeFspBinPkg|IceLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
     </SparseData>
   </SparseCheckout>
 
@@ -70,10 +72,10 @@
   </SubmoduleAlternateRemotes>
 
   <CombinationList>
-    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, devel-MinPlatform branch from edk2-non-osi repo, master branch from FSP repo">
+    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, master branch from edk2-non-osi repo, master branch from FSP repo">
       <Source localRoot="edk2" remote="Edk2Repo" branch="master" sparseCheckout="true" enableSubmodule="true" />
       <Source localRoot="edk2-platforms" remote="Edk2PlatformsRepo" branch="master" sparseCheckout="true" />
-      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="devel-MinPlatform" sparseCheckout="true" />
+      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="master" sparseCheckout="true" />
       <Source localRoot="FSP" remote="FspRepo" branch="master" sparseCheckout="true" />
     </Combination>
   </CombinationList>
-- 
2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55953): https://edk2.groups.io/g/devel/message/55953
Mute This Topic: https://groups.io/mt/72044585/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest
Posted by Ni, Ray 4 years ago
Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 18, 2020 4:14 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Desimone, Ashley E <ashley.e.desimone@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Oram, Isaac W
> <isaac.w.oram@intel.com>; Gao, Liming <liming.gao@intel.com>; Ni, Ray <ray.ni@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>
> Subject: [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest
> 
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
> 
> Update MinPlatform manifest for newly added packages and branches
> 
> Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Isaac Oram <isaac.w.oram@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Puja Pandya <puja.pandya@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
>  .../IntelMinPlatformManifest.xml              | 26 ++++++++++---------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml b/edk2-platforms/Intel-
> MinPlatform/IntelMinPlatformManifest.xml
> index 71d0353f3e..fa78924606 100644
> --- a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
> +++ b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
> @@ -2,12 +2,10 @@
>    <ProjectInfo>
>      <CodeName>Intel-MinPlatform</CodeName>
>      <Description>Intel Minimum Platform</Description>
> -    <DevLead>michael.a.kubacki@intel.com</DevLead>
> +    <DevLead>nathaniel.l.desimone@intel.com</DevLead>
>      <LeadReviewers>
> -      <Reviewer>michael.a.kubacki@intel.com</Reviewer>
>        <Reviewer>chasel.chiu@intel.com</Reviewer>
>        <Reviewer>nathaniel.l.desimone@intel.com</Reviewer>
> -      <Reviewer>ankit.sinha@intel.com</Reviewer>
>        <Reviewer>liming.gao@intel.com</Reviewer>
>        <Reviewer>ray.ni@intel.com</Reviewer>
>        <Reviewer>rangasai.v.chaganty@intel.com</Reviewer>
> @@ -37,18 +35,22 @@
>        <AlwaysInclude>ShellPkg|SourceLevelDebugPkg|UefiCpuPkg|FmpDevicePkg|CryptoPkg</AlwaysInclude>
>      </SparseData>
>      <SparseData remote="Edk2PlatformsRepo">
> +      <AlwaysInclude>Features/Intel</AlwaysInclude>
> 
> <AlwaysInclude>Platform/Intel/AdvancedFeaturePkg|Platform/Intel/MinPlatformPkg|Platform/Intel/BoardModulePkg</Al
> waysInclude>
> -
> <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg|Platform/Intel/ClevoOpenBoard
> Pkg</AlwaysInclude>
> -
> <AlwaysInclude>Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/PurleyOpenBoardPkg|Platform/Intel/Readme.md</
> AlwaysInclude>
> -      <AlwaysInclude>Platform/Intel/build.cfg|Platform/Intel/build_bios.py</AlwaysInclude>
> -
> <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/LewisburgPkg</AlwaysInclude>
> -      <AlwaysInclude>Silicon/Intel/PurleyRcPkg|Silicon/Intel/PurleySktPkg</AlwaysInclude>
> +      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg</AlwaysInclude>
> +
> <AlwaysInclude>Platform/Intel/CometlakeOpenBoardPkg|Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/SimicsOpe
> nBoardPkg</AlwaysInclude>
> +      <AlwaysInclude>Platform/Intel/WhiskeylakeOpenBoardPkg</AlwaysInclude>
> +
> <AlwaysInclude>Platform/Intel/Readme.md|Platform/Intel/build.cfg|Platform/Intel/build_bios.py|Platform/Intel/Tools</A
> lwaysInclude>
> +
> <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/CoffeelakeSiliconPkg</AlwaysInc
> lude>
> +      <AlwaysInclude>Silicon/Intel/SimicsIch10Pkg|Silicon/Intel/SimicsX58SktPkg|Silicon/Intel/Tools</AlwaysInclude>
>      </SparseData>
>      <SparseData remote="Edk2NonOsiRepo">
> -      <AlwaysInclude>Silicon/Intel/KabylakeSiliconBinPkg|Silicon/Intel/PurleySiliconBinPkg</AlwaysInclude>
> +      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardBinPkg</AlwaysInclude>
> +      <AlwaysInclude>Silicon/Intel/CoffeelakeSiliconBinPkg|Silicon/Intel/KabylakeSiliconBinPkg</AlwaysInclude>
> +      <AlwaysInclude>Silicon/Intel/PurleySiliconBinPkg|Silicon/Intel/SimicsIch10BinPkg</AlwaysInclude>
>      </SparseData>
>      <SparseData remote="FspRepo">
> -      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
> +
> <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|CometLakeFspBinPkg|IceLakeFspBinPkg|KabylakeFspBinPkg</A
> lwaysInclude>
>      </SparseData>
>    </SparseCheckout>
> 
> @@ -70,10 +72,10 @@
>    </SubmoduleAlternateRemotes>
> 
>    <CombinationList>
> -    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms
> repo, devel-MinPlatform branch from edk2-non-osi repo, master branch from FSP repo">
> +    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms
> repo, master branch from edk2-non-osi repo, master branch from FSP repo">
>        <Source localRoot="edk2" remote="Edk2Repo" branch="master" sparseCheckout="true" enableSubmodule="true" />
>        <Source localRoot="edk2-platforms" remote="Edk2PlatformsRepo" branch="master" sparseCheckout="true" />
> -      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="devel-MinPlatform" sparseCheckout="true" />
> +      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="master" sparseCheckout="true" />
>        <Source localRoot="FSP" remote="FspRepo" branch="master" sparseCheckout="true" />
>      </Combination>
>    </CombinationList>
> --
> 2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55954): https://edk2.groups.io/g/devel/message/55954
Mute This Topic: https://groups.io/mt/72044585/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest
Posted by Chaganty, Rangasai V 4 years ago
Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>

-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com> 
Sent: Wednesday, March 18, 2020 1:14 AM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Desimone, Ashley E <ashley.e.desimone@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Gao, Liming <liming.gao@intel.com>; Ni, Ray <ray.ni@intel.com>; Pandya, Puja <puja.pandya@intel.com>
Subject: [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest

From: Nate DeSimone <nathaniel.l.desimone@intel.com>

Update MinPlatform manifest for newly added packages and branches

Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 .../IntelMinPlatformManifest.xml              | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
index 71d0353f3e..fa78924606 100644
--- a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
+++ b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
@@ -2,12 +2,10 @@
   <ProjectInfo>
     <CodeName>Intel-MinPlatform</CodeName>
     <Description>Intel Minimum Platform</Description>
-    <DevLead>michael.a.kubacki@intel.com</DevLead>
+    <DevLead>nathaniel.l.desimone@intel.com</DevLead>
     <LeadReviewers>
-      <Reviewer>michael.a.kubacki@intel.com</Reviewer>
       <Reviewer>chasel.chiu@intel.com</Reviewer>
       <Reviewer>nathaniel.l.desimone@intel.com</Reviewer>
-      <Reviewer>ankit.sinha@intel.com</Reviewer>
       <Reviewer>liming.gao@intel.com</Reviewer>
       <Reviewer>ray.ni@intel.com</Reviewer>
       <Reviewer>rangasai.v.chaganty@intel.com</Reviewer>
@@ -37,18 +35,22 @@
       <AlwaysInclude>ShellPkg|SourceLevelDebugPkg|UefiCpuPkg|FmpDevicePkg|CryptoPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2PlatformsRepo">
+      <AlwaysInclude>Features/Intel</AlwaysInclude>
       <AlwaysInclude>Platform/Intel/AdvancedFeaturePkg|Platform/Intel/MinPlatformPkg|Platform/Intel/BoardModulePkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg|Platform/Intel/ClevoOpenBoardPkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/PurleyOpenBoardPkg|Platform/Intel/Readme.md</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/build.cfg|Platform/Intel/build_bios.py</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/LewisburgPkg</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/PurleyRcPkg|Silicon/Intel/PurleySktPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/CometlakeOpenBoardPkg|Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/SimicsOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/WhiskeylakeOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/Readme.md|Platform/Intel/build.cfg|Platform/Intel/build_bios.py|Platform/Intel/Tools</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/CoffeelakeSiliconPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/SimicsIch10Pkg|Silicon/Intel/SimicsX58SktPkg|Silicon/Intel/Tools</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2NonOsiRepo">
-      <AlwaysInclude>Silicon/Intel/KabylakeSiliconBinPkg|Silicon/Intel/PurleySiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/CoffeelakeSiliconBinPkg|Silicon/Intel/KabylakeSiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/PurleySiliconBinPkg|Silicon/Intel/SimicsIch10BinPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="FspRepo">
-      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
+      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|CometLakeFspBinPkg|IceLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
     </SparseData>
   </SparseCheckout>
 
@@ -70,10 +72,10 @@
   </SubmoduleAlternateRemotes>
 
   <CombinationList>
-    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, devel-MinPlatform branch from edk2-non-osi repo, master branch from FSP repo">
+    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, master branch from edk2-non-osi repo, master branch from FSP repo">
       <Source localRoot="edk2" remote="Edk2Repo" branch="master" sparseCheckout="true" enableSubmodule="true" />
       <Source localRoot="edk2-platforms" remote="Edk2PlatformsRepo" branch="master" sparseCheckout="true" />
-      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="devel-MinPlatform" sparseCheckout="true" />
+      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="master" sparseCheckout="true" />
       <Source localRoot="FSP" remote="FspRepo" branch="master" sparseCheckout="true" />
     </Combination>
   </CombinationList>
-- 
2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55956): https://edk2.groups.io/g/devel/message/55956
Mute This Topic: https://groups.io/mt/72044585/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest
Posted by Desimone, Ashley E 4 years ago
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>

-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com> 
Sent: Wednesday, March 18, 2020 1:14 AM
To: devel@edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Desimone, Ashley E <ashley.e.desimone@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Gao, Liming <liming.gao@intel.com>; Ni, Ray <ray.ni@intel.com>; Pandya, Puja <puja.pandya@intel.com>
Subject: [edk2-staging/EdkRepo-Manifest] [PATCH] Edkrepo-Manifest: Update MinPlatform manifest

From: Nate DeSimone <nathaniel.l.desimone@intel.com>

Update MinPlatform manifest for newly added packages and branches

Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
 .../IntelMinPlatformManifest.xml              | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
index 71d0353f3e..fa78924606 100644
--- a/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
+++ b/edk2-platforms/Intel-MinPlatform/IntelMinPlatformManifest.xml
@@ -2,12 +2,10 @@
   <ProjectInfo>
     <CodeName>Intel-MinPlatform</CodeName>
     <Description>Intel Minimum Platform</Description>
-    <DevLead>michael.a.kubacki@intel.com</DevLead>
+    <DevLead>nathaniel.l.desimone@intel.com</DevLead>
     <LeadReviewers>
-      <Reviewer>michael.a.kubacki@intel.com</Reviewer>
       <Reviewer>chasel.chiu@intel.com</Reviewer>
       <Reviewer>nathaniel.l.desimone@intel.com</Reviewer>
-      <Reviewer>ankit.sinha@intel.com</Reviewer>
       <Reviewer>liming.gao@intel.com</Reviewer>
       <Reviewer>ray.ni@intel.com</Reviewer>
       <Reviewer>rangasai.v.chaganty@intel.com</Reviewer>
@@ -37,18 +35,22 @@
       <AlwaysInclude>ShellPkg|SourceLevelDebugPkg|UefiCpuPkg|FmpDevicePkg|CryptoPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2PlatformsRepo">
+      <AlwaysInclude>Features/Intel</AlwaysInclude>
       <AlwaysInclude>Platform/Intel/AdvancedFeaturePkg|Platform/Intel/MinPlatformPkg|Platform/Intel/BoardModulePkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg|Platform/Intel/ClevoOpenBoardPkg</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/PurleyOpenBoardPkg|Platform/Intel/Readme.md</AlwaysInclude>
-      <AlwaysInclude>Platform/Intel/build.cfg|Platform/Intel/build_bios.py</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/LewisburgPkg</AlwaysInclude>
-      <AlwaysInclude>Silicon/Intel/PurleyRcPkg|Silicon/Intel/PurleySktPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/DebugFeaturePkg|Platform/Intel/UserInterfaceFeaturePkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/CometlakeOpenBoardPkg|Platform/Intel/KabylakeOpenBoardPkg|Platform/Intel/SimicsOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/WhiskeylakeOpenBoardPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/Readme.md|Platform/Intel/build.cfg|Platform/Intel/build_bios.py|Platform/Intel/Tools</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/IntelSiliconPkg|Silicon/Intel/KabylakeSiliconPkg|Silicon/Intel/CoffeelakeSiliconPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/SimicsIch10Pkg|Silicon/Intel/SimicsX58SktPkg|Silicon/Intel/Tools</AlwaysInclude>
     </SparseData>
     <SparseData remote="Edk2NonOsiRepo">
-      <AlwaysInclude>Silicon/Intel/KabylakeSiliconBinPkg|Silicon/Intel/PurleySiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Platform/Intel/KabylakeOpenBoardBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/CoffeelakeSiliconBinPkg|Silicon/Intel/KabylakeSiliconBinPkg</AlwaysInclude>
+      <AlwaysInclude>Silicon/Intel/PurleySiliconBinPkg|Silicon/Intel/SimicsIch10BinPkg</AlwaysInclude>
     </SparseData>
     <SparseData remote="FspRepo">
-      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
+      <AlwaysInclude>AmberLakeFspBinPkg|CoffeeLakeFspBinPkg|CometLakeFspBinPkg|IceLakeFspBinPkg|KabylakeFspBinPkg</AlwaysInclude>
     </SparseData>
   </SparseCheckout>
 
@@ -70,10 +72,10 @@
   </SubmoduleAlternateRemotes>
 
   <CombinationList>
-    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, devel-MinPlatform branch from edk2-non-osi repo, master branch from FSP repo">
+    <Combination name="master" description="the master branch from edk2 Repo, master branch from edk2-platforms repo, master branch from edk2-non-osi repo, master branch from FSP repo">
       <Source localRoot="edk2" remote="Edk2Repo" branch="master" sparseCheckout="true" enableSubmodule="true" />
       <Source localRoot="edk2-platforms" remote="Edk2PlatformsRepo" branch="master" sparseCheckout="true" />
-      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="devel-MinPlatform" sparseCheckout="true" />
+      <Source localRoot="edk2-non-osi" remote="Edk2NonOsiRepo" branch="master" sparseCheckout="true" />
       <Source localRoot="FSP" remote="FspRepo" branch="master" sparseCheckout="true" />
     </Combination>
   </CombinationList>
-- 
2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#55959): https://edk2.groups.io/g/devel/message/55959
Mute This Topic: https://groups.io/mt/72044585/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-