Adds support for stitching the IFWI (Integrated
Firmware Image) for Wilson City and Copper City
Cc: Isaac Oram <isaac.w.o...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com>
---
.../WhitleyOpenBoardPkg/CooperCityRvp/build_board.py | 11 +++++++++++
.../CooperCityRvp/build_config.cfg | 2 +-
.../WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py | 11 +++++++++++
.../WilsonCityRvp/build_config.cfg | 2 +-
4 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_board.py
b/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_board.py
index 87b49b32c8..27df1d0baa 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_board.py
+++ b/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_board.py
@@ -94,6 +94,17 @@ def post_build_ex(config, functions):
:rtype: Dictionary
"""
print("post_build_ex")
+ fv_path = os.path.join(config["BUILD_DIR_PATH"], "FV")
+ board_fd = config["BOARD"].upper()
+ final_fd = os.path.join(fv_path, "{}.fd".format(board_fd))
+ final_ifwi = os.path.join(fv_path, "{}.bin".format(board_fd))
+
+ ifwi_ingredients_path = os.path.join(config["WORKSPACE_PLATFORM_BIN"],
"Ifwi", config["BOARD"])
+ flash_descriptor = os.path.join(ifwi_ingredients_path,
"FlashDescriptor.bin")
+ intel_me = os.path.join(ifwi_ingredients_path, "Me.bin")
+ _merge_files((flash_descriptor, intel_me, final_fd), final_ifwi)
+ if os.path.isfile(final_fd):
+ print("IFWI image can be found at {}".format(final_ifwi))
return None
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_config.cfg
b/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_config.cfg
index 6399818e78..f4144cdbb8 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_config.cfg
+++ b/Platform/Intel/WhitleyOpenBoardPkg/CooperCityRvp/build_config.cfg
@@ -7,7 +7,7 @@
[CONFIG]
-WORKSPACE_PLATFORM_BIN =
+WORKSPACE_PLATFORM_BIN = edk2-non-osi/Platform/Intel/WhitleyOpenBoardBinPkg
EDK_SETUP_OPTION =
openssl_path =
PLATFORM_BOARD_PACKAGE = WhitleyOpenBoardPkg
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py
b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py
index 5e6224d98a..a0c31e4558 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py
+++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py
@@ -97,6 +97,17 @@ def post_build_ex(config, functions):
:rtype: Dictionary
"""
print("post_build_ex")
+ fv_path = os.path.join(config["BUILD_DIR_PATH"], "FV")
+ board_fd = config["BOARD"].upper()
+ final_fd = os.path.join(fv_path, "{}.fd".format(board_fd))
+ final_ifwi = os.path.join(fv_path, "{}.bin".format(board_fd))
+
+ ifwi_ingredients_path = os.path.join(config["WORKSPACE_PLATFORM_BIN"],
"Ifwi", config["BOARD"])
+ flash_descriptor = os.path.join(ifwi_ingredients_path,
"FlashDescriptor.bin")
+ intel_me = os.path.join(ifwi_ingredients_path, "Me.bin")
+ _merge_files((flash_descriptor, intel_me, final_fd), final_ifwi)
+ if os.path.isfile(final_fd):
+ print("IFWI image can be found at {}".format(final_ifwi))
return None
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg
b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg
index 42bbb852d5..1676c08813 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg
+++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg
@@ -7,7 +7,7 @@
[CONFIG]
-WORKSPACE_PLATFORM_BIN =
+WORKSPACE_PLATFORM_BIN = edk2-non-osi/Platform/Intel/WhitleyOpenBoardBinPkg
EDK_SETUP_OPTION =
openssl_path =
PLATFORM_BOARD_PACKAGE = WhitleyOpenBoardPkg
--
2.27.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80020): https://edk2.groups.io/g/devel/message/80020
Mute This Topic: https://groups.io/mt/85282238/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
