From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web09.9228.1630431621904702650 for ; Tue, 31 Aug 2021 10:40:22 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="218580512" X-IronPort-AV: E=Sophos;i="5.84,366,1620716400"; d="scan'208";a="218580512" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 10:40:20 -0700 X-IronPort-AV: E=Sophos;i="5.84,366,1620716400"; d="scan'208";a="428262854" Received: from nldesimo-desk1.amr.corp.intel.com ([10.212.163.217]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 10:40:20 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Isaac Oram , Chasel Chiu Subject: [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg: Add support for IFWI stitching Date: Tue, 31 Aug 2021 10:40:17 -0700 Message-Id: <20210831174017.3792-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Adds support for stitching the IFWI (Integrated Firmware Image) for Wilson City and Copper City Cc: Isaac Oram Cc: Chasel Chiu Signed-off-by: Nate DeSimone --- .../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