From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.10174.1630434150231278798 for ; Tue, 31 Aug 2021 11:22:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=K7P9T8AI; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: isaac.w.oram@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="218260414" X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="218260414" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 11:22:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="460242912" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga007.fm.intel.com with ESMTP; 31 Aug 2021 11:22:29 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Tue, 31 Aug 2021 11:22:28 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Tue, 31 Aug 2021 11:22:28 -0700 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.172) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Tue, 31 Aug 2021 11:22:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BsNNLWBJ6tDlIemKNFVhONANES8VRBKRjX1068pw8+n/AFRIHII6iHmi1zuda0OEkFsKZrmILH1EdTje0Gt+FzGdOouf6qieHFUaOv6VimBZ9L302Y+AnZEcRQpUnzjZvi+EzxBigkzI4G2nIRzH2HdBEDZGLj//gFFnMA0QWwcUUTgcApxz7fTrn0nYa5V5mpkdjpACYNCQ/Hx8uBitSwtbF6JGUWQycGJngXLqfcwyoo7AU0ecdIsW7U21ZIAuFP7JEHsOlDcdCqsB9oDYtcrhhC2sQ0V1VJI6VInGzbclaG4UbiFJWy2JqDEqsN/p5ohGHXna7qymQA84gvc+Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6PdJy5LB6PEO6sOJottnSKIxGA8eVPuXiEX/UaQhIm4=; b=S3Pm7RsxZ4rmNyEE/6zNzA8/+K31xlHkGxh4TIhSmTmdK//w6TSQEO8tsKYQ3rhS6S7ApVjQvrOdDhz/7qOq5j3ErwgiBsDhSb9E/XJFi9kU/0JmKjxstQiE25M4b/oQ6bjwpNc45zHPRScsRz93PPDjO4C2/eS50mEt5BGto2rRd0M+je41AIkYEvVf1ZapmwHF4hp65l7Yg/bjsc2CQ/MB30xYvmMrna1f8fgaqYPKlATOHMFyhbNtiIYqcpDqPk9q0vZacek/1uCMqaSxg0RPABXGFKmPGk61kztoIhltU/cYpzq0RZM+eHY9ZFkff5mXnTgUKoNYs6PbTlF1Ag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6PdJy5LB6PEO6sOJottnSKIxGA8eVPuXiEX/UaQhIm4=; b=K7P9T8AINMNvyIj6ObMtrtBJbmNik9PHHjkXKqPmlqIhugaQ2htP0eSYznmwu3QD+v9gGNdDvYeHX7HhGI5PkFfsavUpFVTMen5l3aGSPYNe0y3cuT6vGQT7JYGY99CtKO0l/Kgy9QPUVtF7UF3gC390Zf3ekJN406DsOHa9u24= Received: from MW3PR11MB4747.namprd11.prod.outlook.com (2603:10b6:303:2f::11) by MW3PR11MB4636.namprd11.prod.outlook.com (2603:10b6:303:5a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Tue, 31 Aug 2021 18:22:27 +0000 Received: from MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::6d8b:efd8:62d1:8743]) by MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::6d8b:efd8:62d1:8743%8]) with mapi id 15.20.4457.024; Tue, 31 Aug 2021 18:22:27 +0000 From: "Oram, Isaac W" To: "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Chiu, Chasel" Subject: Re: [edk2-devel] [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg: Add support for IFWI stitching Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg: Add support for IFWI stitching Thread-Index: AQHXnpHKhHSNdSd4ok2h1wlfT4D1KKuN7REw Date: Tue, 31 Aug 2021 18:22:27 +0000 Message-ID: References: <20210831174017.3792-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20210831174017.3792-1-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.5.1.3 dlp-reaction: no-action authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 746662d7-8ebb-4650-89eb-08d96cac49e1 x-ms-traffictypediagnostic: MW3PR11MB4636: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YGxr839+gPjwzvuFPoyPvcfy0kGOG+fygeV18fTlKxoOOapRFN+Op/ZO5CSCsa4ER/9IlFFyVkuHjT1uYw7mbZcyvtkNaypCrjYJ2RB33iIuzB4/6DPsZgqbIO+RqWCLyvkMOwdIzg+5F4KD9XvvO/CY/KquDmdUd0VnsDc6Ox5x3YTwLAPWj/IbHAvmPDhBCGGV9rArgcFfOIYWXK7S1y9bCY1kKMXxUiqytUr9TB2uGoSCM41bXMBlew6tMf+boGjDQV6PN58mmWjmagYbDcAgedb9eCkCJaqinOa14WxyvsqR8hjxU2Q6h2ArwiIc8kRhPGfxr9p+VUB3n1DzqZah42TTnt3fodpnGOkpGo957A1sGuEOhUk9SlYADtl+bnS34F4ptOuaBE4jLHpAI58Xp/cgTEQ75rvOrrZU/T6M6SYNyO2H8G6YyoDLTs6FXjQ6ujG5ogD8oBEhFHXwZx1T9O29l5cJt7wWlKTzKTMMckH5mRKGfpCYMGYeuMd9PRHvqY2k+vK32StC3nNsRD8/R12cnTD/Ke6xdiarenNwEd7X4bJ9zqO5cwtOgQkAkZUMxzPQxf/8oRg6cmFKkgvspDLqf/waJ3cXgX1RExdaZ49b5KWxHAumbm6vKEPwzdXTCX76RIkw0nR4BrdH4XGQQK3UpyLU/7kZgKLlXd03ltlGX9qmbCYNSUuU0hHy2ebDTt6+jnv1auKWLZNN2WdtQXhybfrh7tlZM3SWSAYRQ8gLV1ZUByHJ7YMzjAGNECtpP7nv4PRSTqhzLtwbNKg90N/iyGYs6xdfKsLn0PNTSDkEjvPj7BGYFKENHFWuY55fKDsBy80Zz7gBWbuWtg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW3PR11MB4747.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(366004)(39850400004)(346002)(136003)(6636002)(83380400001)(33656002)(2906002)(110136005)(478600001)(5660300002)(316002)(38100700002)(26005)(122000001)(107886003)(4326008)(8936002)(71200400001)(966005)(8676002)(186003)(6506007)(53546011)(76116006)(38070700005)(64756008)(66446008)(66556008)(66476007)(55016002)(9686003)(66946007)(7696005)(52536014)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?amZdhq+RVQ4uYSW1tYen2z78ah6Ji2TJUt+r5i5uPxT5Jp/BEDbh84mIvU9h?= =?us-ascii?Q?onvnMpePHDKrU2opDTTScjVxWmr98vqyo6GJal/oS0nMArZTw1orj+AIkehO?= =?us-ascii?Q?GNTwCOPfvXUqPmMMwJWpBEhijtSE3ndfg6IQBwsmf9c/f7gvHqbw9wJbG5DX?= =?us-ascii?Q?ebQ4M3oaDpaVb54NQEceOnT8pcWdC+tc0hAiZtMRu1rnSmEIDcFAATMbL/g3?= =?us-ascii?Q?O/G5ZWGjpFZSbiX79GkKJm200aqDG47/e78ABRpuZtRFzD3irzDK/tyjvwPy?= =?us-ascii?Q?ezzmzWJhnd9oRbheC3ybs0tLvlTH6XfflGHyO4Ijah7OKrCjEvgOaYVpG1hv?= =?us-ascii?Q?GsdOyi4/vhjs5FCN4WL5fqYsbhOWx2ed5LoNxbKPVqwOqTX0Pu3c61Myx/TS?= =?us-ascii?Q?DgTFN/49rH8I0tbxT3iIata1PocjIp8c1m8fQog/GXgfLglhsfclIw8Ta0Mo?= =?us-ascii?Q?yeBweL2svU/5kpSnSYuKr4jnQI3H614H14WdCWJIFPnecajELVrMzhLV6z3/?= =?us-ascii?Q?YbPwqseanuKNOgTXiqfeatWpbhem/4jQ+c1+KQmFIg8HEC4r/qqHQp1DxHq6?= =?us-ascii?Q?NEgfcR6iVv5xZbOSiA9NdaNGRIv+VezoVdlkjuofIJeK3cIIMM/P5blmzJ64?= =?us-ascii?Q?V0OUxuF6tzsSDle1ghSgVzYSq3JnNIfr9Uhqg7aCSpq4fOnejymvuAFwtkIu?= =?us-ascii?Q?HKSfxLosPUYIEwCR4l7uFru6VcheUpFBqNYTBuS/XKzm6JBxmrwvwxbtLbwI?= =?us-ascii?Q?54BICZoS+lBghK1mif0gE3JNQp24lhWv+C5g0lOhEcUhHxL7K0g9nr5eu5JM?= =?us-ascii?Q?aCf5kk6VWLNPYDWLBt6qyp+v3762JYLQnujFihZw7+JescdvVm7oV/ij3rfC?= =?us-ascii?Q?1ZruKyx8MCUd7G22MtmVsIs1zPXUR70HA/Tqgtxd5RhQ4VdKNQcpGLVVzVyc?= =?us-ascii?Q?bNNQuJl9Rac++l74PnkVbQ+sYBpsnb8EOkbuvynAZ0gqefLa+LDpXF6WHcmv?= =?us-ascii?Q?CPP7okIuLxS1P5wvsPpN/ahXy+G/B2bQPVijx7zmt9o4m6JtZhU9KNSUFIHd?= =?us-ascii?Q?eftVrzROCJWLyvwj9xK20sYTpEiyVAOyAIZXtRGnXKC0ByDMlzHRxPf+94kb?= =?us-ascii?Q?/GOYGM8OEf/lKokcV+8l29tjNJ+/d2moRsgmiJzSoGfuWozMEMBPdJ4TbcVR?= =?us-ascii?Q?1sD+iTk2tTX7YyTJhVhsTvh8LZk46RGcxkg6iHz3ghfuSisDAH5LdPrsPNle?= =?us-ascii?Q?lJf+FcaghheA8QK04/Ju2HJV9H7lBb7odhUGmqeM57iUboxF5tBeKYv3jOoa?= =?us-ascii?Q?jS8N1iYPLiZd83TMmISehXvX?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW3PR11MB4747.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 746662d7-8ebb-4650-89eb-08d96cac49e1 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Aug 2021 18:22:27.7974 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lOhisLAjg4sL9AChZYEUt5EF2GskaSIrhIvLon82hRA5nQfCnMisLz3kQ7c+HuRBCK9tGNQmA/MfD9sb+r669g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4636 Return-Path: isaac.w.oram@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Isaac Oram -----Original Message----- From: devel@edk2.groups.io On Behalf Of Nate DeSimon= e Sent: Tuesday, August 31, 2021 10:40 AM To: devel@edk2.groups.io Cc: Oram, Isaac W ; Chiu, Chasel Subject: [edk2-devel] [edk2-platforms] [PATCH V1] WhitleyOpenBoardPkg: Add = support for IFWI stitching 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=20 +edk2-non-osi/Platform/Intel/WhitleyOpenBoardBinPkg EDK_SETUP_OPTION =3D openssl_path =3D PLATFORM_BOARD_PACKAGE =3D WhitleyOpenBoardPkg diff --git a/Platform/Intel= /WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py b/Platform/Intel/WhitleyO= penBoardPkg/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=20 +edk2-non-osi/Platform/Intel/WhitleyOpenBoardBinPkg EDK_SETUP_OPTION =3D openssl_path =3D PLATFORM_BOARD_PACKAGE =3D WhitleyOpenBoardPkg -- 2.27.0.windows.1