[PATCH 0/2] Switch to FSP Dispatch mode.

[PATCH 0/2] Switch to FSP Dispatch mode.

[Chiu, Chasel]

KabylakeOpenBoardPkg is switched to build Dispatch mode
as default.
For building API mode:
"py -2 build_bios.py --platform KabylakeRvp3 --fspapi"

0001-Platform/Intel: Separate FspBinPkg support.
0002-KabylakeOpenBoardPkg: Switch to dispatch mode.

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>

Chasel Chiu (2):
  Platform/Intel: Switch to FSP Dispatch mode.
  KabylakeOpenBoardPkg: Switch to FSP Dispatch mode.

 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc |  2 +-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg    |  5 +++--
 Platform/Intel/build_bios.py                                         | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

-- 
2.13.3.windows.1

[PATCH 1/2] Platform/Intel: Switch to FSP Dispatch mode.

[Chiu, Chasel]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1874

Build configuration is updated to support different
*FspBinPkg between FSP wrapper API and Dispatch modes.

Default will be Dispatch mode and to build FSP wrapper
for API mode:
"py -2 build_bios.py --platform KabylakeRvp3 --fspapi"

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Platform/Intel/build_bios.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py
index 9f8d78f6e8..09eceddeff 100644
--- a/Platform/Intel/build_bios.py
+++ b/Platform/Intel/build_bios.py
@@ -125,6 +125,16 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None):
     config["BASE_TOOLS_PATH"] = config["EDK_TOOLS_PATH"]
     config["EDK_TOOLS_BIN"] = os.path.join(config["WORKSPACE"],
                                            config["EDK_TOOLS_BIN"])
+
+    #
+    # Board may have different FSP binary between API and Dispatch modes.
+    # In API mode if FSP_BIN_PKG_FOR_API_MODE is assigned, it should
+    # override FSP_BIN_PKG.
+    #
+    if config.get("API_MODE_FSP_WRAPPER_BUILD", "FALSE") == "TRUE":
+        if config.get("FSP_BIN_PKG_FOR_API_MODE") is not None:
+            config['FSP_BIN_PKG'] = config['FSP_BIN_PKG_FOR_API_MODE']
+
     config["PLATFORM_FSP_BIN_PACKAGE"] = \
         os.path.join(config['WORKSPACE_FSP_BIN'], config['FSP_BIN_PKG'])
     config['PROJECT_DSC'] = os.path.join(config["WORKSPACE_PLATFORM"],
-- 
2.13.3.windows.1

Re: [PATCH 1/2] Platform/Intel: Switch to FSP Dispatch mode.

[Nate DeSimone]

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Chiu, Chasel 
Sent: Monday, June 3, 2019 8:04 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH 1/2] Platform/Intel: Switch to FSP Dispatch mode.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1874

Build configuration is updated to support different *FspBinPkg between FSP wrapper API and Dispatch modes.

Default will be Dispatch mode and to build FSP wrapper for API mode:
"py -2 build_bios.py --platform KabylakeRvp3 --fspapi"

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Platform/Intel/build_bios.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 9f8d78f6e8..09eceddeff 100644
--- a/Platform/Intel/build_bios.py
+++ b/Platform/Intel/build_bios.py
@@ -125,6 +125,16 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None):
     config["BASE_TOOLS_PATH"] = config["EDK_TOOLS_PATH"]
     config["EDK_TOOLS_BIN"] = os.path.join(config["WORKSPACE"],
                                            config["EDK_TOOLS_BIN"])
+
+    #
+    # Board may have different FSP binary between API and Dispatch modes.
+    # In API mode if FSP_BIN_PKG_FOR_API_MODE is assigned, it should
+    # override FSP_BIN_PKG.
+    #
+    if config.get("API_MODE_FSP_WRAPPER_BUILD", "FALSE") == "TRUE":
+        if config.get("FSP_BIN_PKG_FOR_API_MODE") is not None:
+            config['FSP_BIN_PKG'] = config['FSP_BIN_PKG_FOR_API_MODE']
+
     config["PLATFORM_FSP_BIN_PACKAGE"] = \
         os.path.join(config['WORKSPACE_FSP_BIN'], config['FSP_BIN_PKG'])
     config['PROJECT_DSC'] = os.path.join(config["WORKSPACE_PLATFORM"],
--
2.13.3.windows.1

[PATCH 2/2] KabylakeOpenBoardPkg: Switch to FSP Dispatch mode.

[Chiu, Chasel]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1874

Now KabylakeOpenBoardPkg is building in FSP Dispatch
mode as default.

Test: Both FSP API and Dispatch mode can boot to
      Windows.

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 2 +-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
index 63d0c4c2e6..81244d7216 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
@@ -32,7 +32,7 @@
   # 0: FSP Wrapper is running in Dispatch mode.
   # 1: FSP Wrapper is running in API mode.
   #
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|1
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0
 
 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
index 64e02f7f48..bf89ea399c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
@@ -27,8 +27,9 @@ TARGET = DEBUG
 TARGET_SHORT = D
 PERFORMANCE_BUILD = FALSE
 FSP_WRAPPER_BUILD = TRUE
-FSP_BIN_PKG = KabylakeFspBinPkg
-FSP_PKG_NAME = KabylakeFspPkg
+FSP_BIN_PKG = AmberLakeFspBinPkg
+FSP_BIN_PKG_FOR_API_MODE = KabylakeFspBinPkg
+FSP_PKG_NAME = AmberLakeFspPkg
 FSP_BINARY_BUILD = FALSE
 FSP_TEST_RELEASE = FALSE
 SECURE_BOOT_ENABLE = FALSE
-- 
2.13.3.windows.1

Re: [PATCH 2/2] KabylakeOpenBoardPkg: Switch to FSP Dispatch mode.

[Nate DeSimone]

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

-----Original Message-----
From: Chiu, Chasel 
Sent: Monday, June 3, 2019 8:04 PM
To: devel@edk2.groups.io
Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH 2/2] KabylakeOpenBoardPkg: Switch to FSP Dispatch mode.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1874

Now KabylakeOpenBoardPkg is building in FSP Dispatch mode as default.

Test: Both FSP API and Dispatch mode can boot to
      Windows.

Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc | 2 +-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
index 63d0c4c2e6..81244d7216 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
+++ sc
@@ -32,7 +32,7 @@
   # 0: FSP Wrapper is running in Dispatch mode.
   # 1: FSP Wrapper is running in API mode.
   #
-  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|1
+  gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0
 
 !if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
   gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
index 64e02f7f48..bf89ea399c 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg
@@ -27,8 +27,9 @@ TARGET = DEBUG
 TARGET_SHORT = D
 PERFORMANCE_BUILD = FALSE
 FSP_WRAPPER_BUILD = TRUE
-FSP_BIN_PKG = KabylakeFspBinPkg
-FSP_PKG_NAME = KabylakeFspPkg
+FSP_BIN_PKG = AmberLakeFspBinPkg
+FSP_BIN_PKG_FOR_API_MODE = KabylakeFspBinPkg FSP_PKG_NAME = 
+AmberLakeFspPkg
 FSP_BINARY_BUILD = FALSE
 FSP_TEST_RELEASE = FALSE
 SECURE_BOOT_ENABLE = FALSE
--
2.13.3.windows.1