From nobody Sat May 4 16:41:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+80023+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80023+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1630433150; cv=none; d=zohomail.com; s=zohoarc; b=iD/2L60cgsHlQPbIZLAipBE707cRcHzjnfdq0luzJpF7eVrMOjfjUpb2InE3MPD2aHsqNeGrP7ioQWwNwcB882r29JIo/F0FC5S13g7nIToZ9YbBhUbc5b19GgkQoD2xrPR21FC0BYuWP3wnKFui6j3dnVGRWmJMc13OqM0807c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1630433150; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=hgHbvcqv33kWKppqS2B0Xz4663I2woKtHD26pTmSj4I=; b=ZBd0kY7E6umq+bKDPlsRtYklRrBXu3P9NfliL7GPyoT92Hjn6VLx8odWN3ESYV4nt5BdxBF7745wnUlYE7kDv7OLcQZf/A/8X2cJDajvUL0CFK8DjPFc/0gm1MwFt+R/UIPgQclB7SDVVOKtzCz62SMkjdYMRjhi3nUd1cv7Gog= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80023+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1630433150255644.9687958753963; Tue, 31 Aug 2021 11:05:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oT6fYY1788612xG4inOLRbml; Tue, 31 Aug 2021 11:05:49 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.9947.1630433148627716381 for ; Tue, 31 Aug 2021 11:05:49 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="215400459" X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="215400459" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 10:27:31 -0700 X-IronPort-AV: E=Sophos;i="5.84,366,1620716400"; d="scan'208";a="428259136" X-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:27:31 -0700 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Isaac Oram , Chasel Chiu Subject: [edk2-devel] [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg: Add support for IFWI stitching Date: Tue, 31 Aug 2021 10:27:24 -0700 Message-Id: <20210831172724.3659-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,nathaniel.l.desimone@intel.com X-Gm-Message-State: TgCyrxeQXzXu52VSKhivJxOVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630433149; bh=Swb7ao9LLT52/+ZHfJ/gD5C8kgzhn+k98ePEYiUCdwY=; h=Cc:Date:From:Reply-To:Subject:To; b=VMsxoa7xmBwv5BoVo29UCkDHa3QC7zGJiJCQ98Uvn5rdSpppIyH09YLK9nAufU1Ecrl iquRQxZeL5PZs77/98+CGnIiRESgcl0LPT78EOm3etLxxU0SVWyNhuk/muDaV+PBOBwni a6SgSCcvecbFZnysKkoqMfTJXDrhSl/YHKs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630433152087100001 Content-Type: text/plain; charset="utf-8" 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.p= y 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 =3D os.path.join(config["BUILD_DIR_PATH"], "FV") + board_fd =3D config["BOARD"].upper() + final_fd =3D os.path.join(fv_path, "{}.fd".format(board_fd)) + final_ifwi =3D os.path.join(fv_path, "{}.bin".format(board_fd)) + + ifwi_ingredients_path =3D os.path.join(config["WORKSPACE_PLATFORM_BIN"= ], "Ifwi", config["BOARD"]) + flash_descriptor =3D os.path.join(ifwi_ingredients_path, "FlashDescrip= tor.bin") + intel_me =3D 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 =20 =20 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 @@ =20 =20 [CONFIG] -WORKSPACE_PLATFORM_BIN =3D +WORKSPACE_PLATFORM_BIN =3D edk2-non-osi/Platform/Intel/WhitleyOpenBoardBin= Pkg EDK_SETUP_OPTION =3D openssl_path =3D PLATFORM_BOARD_PACKAGE =3D WhitleyOpenBoardPkg diff --git a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.p= y 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 =3D os.path.join(config["BUILD_DIR_PATH"], "FV") + board_fd =3D config["BOARD"].upper() + final_fd =3D os.path.join(fv_path, "{}.fd".format(board_fd)) + final_ifwi =3D os.path.join(fv_path, "{}.bin".format(board_fd)) + + ifwi_ingredients_path =3D os.path.join(config["WORKSPACE_PLATFORM_BIN"= ], "Ifwi", config["BOARD"]) + flash_descriptor =3D os.path.join(ifwi_ingredients_path, "FlashDescrip= tor.bin") + intel_me =3D 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 =20 =20 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 @@ =20 =20 [CONFIG] -WORKSPACE_PLATFORM_BIN =3D +WORKSPACE_PLATFORM_BIN =3D edk2-non-osi/Platform/Intel/WhitleyOpenBoardBin= Pkg EDK_SETUP_OPTION =3D openssl_path =3D PLATFORM_BOARD_PACKAGE =3D WhitleyOpenBoardPkg --=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80023): https://edk2.groups.io/g/devel/message/80023 Mute This Topic: https://groups.io/mt/85282238/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-