From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.317.1630449159154388304 for ; Tue, 31 Aug 2021 15:32:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=d94aIlUZ; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10093"; a="240845166" X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="240845166" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2021 15:19:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,367,1620716400"; d="scan'208";a="690187171" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by fmsmga005.fm.intel.com with ESMTP; 31 Aug 2021 15:19:41 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 31 Aug 2021 15:19:41 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 31 Aug 2021 15:19:40 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) 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 15:19:40 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.176) by edgegateway.intel.com (134.134.137.100) 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 15:19:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WMJ6VpOkKaXiu+x+sgvSoc9mS+k47aJ7mgUj+edMcFZY4KDVDLQRVWZHXlsKzMBmwbd+E9Rqv8dFvJCJKDhaudI6zAe0vQycd/nbmTuO5+RyExH1I9ZYUgTOsjqqjnR2z0VIuE57vjwj/SVgA8OjXAh/fm6dwM8UNWW9FpmWSzHJkS0rFPPwQEx+Ecuci6LjvSZGnzuJ6A88jM1fHAGLGeSFGsDhk+EhWf/EbWcTTRsy1QmhGN5SJ8LZx1AVqI9myvOaupGawBcEXuzBpP4Dt4m2aK3PstIdfS5becs3P/iYAus1faPqwGDj6kQL8yC45rchV2oZJkOxKKEt49T5EA== 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:X-MS-Exchange-SenderADCheck; bh=giag4bZEX71nKv8a6wGOqre5mGftZiydOA0QApW3IAA=; b=Y2vxZYEOWrfId5tbjnhsNEuOT/X49m2Y/vBAmRB7ldwOpSYAiRXvng88GDqlz8bztcRKhhcvckLt4KFJAFDadnemCFaFgzYXy9sLdNIg1hp+oajnRo5ey3cK9FKRoPqdG5+jqn9F/yndFhsOKWCK3H1nlISwLYRcq5rpT4XYvPnPHgANcmIMotV4EMA/dksLL6jzQ2/Bg7fIEcTd+mrFGw4wt4LCe0SZZACgrrKPw8r1AlgYQtt7+sCesxS+Rb8H2tgTuv4QWNwYxLnCxJ/dA8dqQ3j4picFrnW7h2lNntLkbb9XIdL3UUxUQFLOAJaiM40Q1cp7u63QgvGfTrO/mg== 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=giag4bZEX71nKv8a6wGOqre5mGftZiydOA0QApW3IAA=; b=d94aIlUZ2yNaCMjJpO4IuF6+FAUQmtTzwuJ0t2u3HTPYkjJ+U4kMXCsNWt+j4IsGp8PD71yJbYBMU0NfvSxic3v3D/025Rtb/6Qj8wXe7SjT1KyuD6ou6TMs3xoLc/TpxIzM9yvvVy5XjlXLCK/zkDuD/0vi63jLWZTkoKk6278= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by MWHPR11MB1456.namprd11.prod.outlook.com (2603:10b6:301:b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Tue, 31 Aug 2021 22:19:37 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::f07d:7a97:3b68:92ed]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::f07d:7a97:3b68:92ed%11]) with mapi id 15.20.4457.024; Tue, 31 Aug 2021 22:19:37 +0000 From: "Nate DeSimone" To: "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Oram, Isaac W" , "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: AQHXnpYP7WORzywbUU2BtFC51OTLF6uOLzmg Date: Tue, 31 Aug 2021 22:19:37 +0000 Message-ID: References: <16A0764FA40E3D45.31997@groups.io> In-Reply-To: <16A0764FA40E3D45.31997@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows 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: 38153097-8e79-4054-5927-08d96ccd6b61 x-ms-traffictypediagnostic: MWHPR11MB1456: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:196; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: s54nOkmnwVYgv/AA8vJ0aJ1K8yDW/WziCAe688xucHVICPlCeAjvxUodjubKSgb22UApeBOyIvKUMzfOpWiNMBNtJNKQ8/1jlaHqDImjG+kAzLqIGT4f3wmDbevAkoQgc/czPD0SqJAUGQLpDA/jmVBYh1BpGbd2Q6Gd+9ccU0A/+tQtgigVCJabw3EK+A0p/ojcRZ3Xbu0bxI/ZlX5/eCRCZu+jzLKtB6LrAj4HZyeeVXYW1rHKavv/fmBUt+j/+lfB7I222LDYdukYwTdhc4lvTRdofQxoFJsV6gxD82ik3VSqSjh/33ikcHFcp1tJXSigJaMyD8bRQcutFTUnDGhbaAnFic1wK/AvPRVcWnOr5J91JRdffw2H5Fm+9pSPmx5nyZOyQrSAuHGscZAy84PSi5tyvykMxbX93+6s1XRyZhCjLIICVaF3pePa9IulkLYqPvaXx1NDbKWOUoxVK/2c0a8+vzfTPXAHunkcjkDmtZKNdjcbz9AvHUOLl7DpdNF6Z+IuDICiyaYXK8Mue4OVq5pmxGMG6r2G6DEYena1SBPwW12GleriLBDtRQ9z8oGWtjweoR7CcGBEmkILBnIQ1/PkEL3jehWgbTt3tIWRsJynMDx8ln/IlI8XPvZLdI2b8IYo3n4PG7Dm7W+fnpWweW0YfHlPWHUP5SzrpvvtWTBsZnAfqNXtMmhHWI6LkXkyCfCt7+rRer1knZwbZON8s8t6MC238m0rGtzyi0e2aLExU3aAI+E1BjBTejHFWjBAIc/p6qM+x5cxwKPb72OGHXr046Hse7DHH9bp2X/24CvoiC1lX4TX69U+eEqjEc8so68KUoqC8NkzNd3h2Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(39860400002)(396003)(366004)(376002)(26005)(66556008)(107886003)(66446008)(55016002)(64756008)(76116006)(186003)(71200400001)(66946007)(66476007)(966005)(38070700005)(9686003)(478600001)(7696005)(86362001)(5660300002)(110136005)(6506007)(83380400001)(33656002)(4326008)(8936002)(52536014)(2906002)(8676002)(122000001)(316002)(54906003)(53546011)(38100700002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?fQzFOTMiJshIceGuuMAbnV2eqssj3DE3BCHvybMuei2bikrP9qsVT4zuj31T?= =?us-ascii?Q?Y8fkaXZ9YGaUuVxPNMTu+tbnP2Yne6qW7BYQTYAsjpVCZd7Dc+W5a6qaINGt?= =?us-ascii?Q?32HFDmLcxeEqqs/aXBG4R5COT/qjx4nYJEKSFxNmryJ8da0jC6A4QDkrbgSl?= =?us-ascii?Q?r7RNQtq0e3Og928VCSuw6rxqSeuZsmRbaVpW6Xbr0+v2P51peLDdJXmgOJGu?= =?us-ascii?Q?yfNQzt3orKPDcQkec0IOPcpaQUeR6LUWHKFt5k7fgCj+CY5lAsLXnKvM8HFb?= =?us-ascii?Q?zoILiG4uaFFmQs+d92Cp4xscp5DmJLRSyfQKSOzKAFJ4YbvyTsguEimUtKHO?= =?us-ascii?Q?G8MNs4W2TezlRRUDCYM62LDZn+HljEYlYLlJi8nQtb+hOy8Uq4sXyI4/Psy/?= =?us-ascii?Q?8RMjBVNLtzPsbp45GHZ+K92PakLdwxibUuTI9JmXw8twvpr5H0uYX0sHm305?= =?us-ascii?Q?/LDnKBEFjVR3X1MUYdCOPHdNC2QkkPK9g5f3jM3UZL73pWU6hvtdel45CwyJ?= =?us-ascii?Q?50v/CWg0ydabdt93lFP3aYGDNCsFGwZIARDy8Edy0XNhKPa6B1If6ISyR6y7?= =?us-ascii?Q?3gccnVKpgWcVW0R5Jwmqw7mmj9CxzOmpSjn5B+2PFFCD1nby5ySh0/NOANIO?= =?us-ascii?Q?16ss51BgVuQ/tbBKyZiubnUyFKFcZK48b1JjJXMTcwz4L9XZJfn5ObXRUiHU?= =?us-ascii?Q?Ho+OVB5zlhG4Obawa2HcHEq6oMhJkrPQw+rWs2wCbxHj3ZBYCGTjcg0lv2Kl?= =?us-ascii?Q?QiK8qedv7o05EOB3B8/5ZrXZn1J+TPwl9bqA2UKOI0BCE9TdEm2gtYTo0u3i?= =?us-ascii?Q?YfgeCee7pdHOnpPnVJmDwj7zxA4mjKXnCYO6vpKdzX6Ug6B2N2zvauj0E8Eo?= =?us-ascii?Q?5/yXHCE2SSDGy9Sm69GV+9Gk6hobm8aVX5YKZBBWJzFB/pXu9Q2CtbHWoLMn?= =?us-ascii?Q?IZeAFk9T80WsIaBSb5d/DydiuWeIgB5JCOVVXe+lr0n67hFbjyfBoIIxJVfg?= =?us-ascii?Q?LXIVReZ9l01VogfFJdQvQdTmqi+aoyszlw1LORlniHSFO62B2QJDAKlmtKw+?= =?us-ascii?Q?w+Q335I+7getu2fYFByrWTyj4/27eO/ISRcjqPB3T2VeWsrvt+emb7P14yji?= =?us-ascii?Q?ZQJoMCK2aJNj4M39cuk8aq/8tiEA9taS+nGYu8hbiU0LMmFw7YDJwIy95073?= =?us-ascii?Q?osu/WZCTATFnM+i6dFypDBwQF5y8yG70zZLCg8S7KfgxednvGl+urwObRNzv?= =?us-ascii?Q?yFrGRQrIsoHB+Nlz2Gvh88co8vnJg0oaxM1vw1sll2FCbqQa8te2n9G4a8WR?= =?us-ascii?Q?yt2v3hyo46vOG1SwDTHjY/pm?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38153097-8e79-4054-5927-08d96ccd6b61 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Aug 2021 22:19:37.3404 (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: E7hOAl+oOPBlYERMyz0CHU68FnXKNtI88d5yu0NU7BJKNEZji7r51XfFSVia7Weg1Gyw4rFh+0XxMEiygE22ac+uP6bIUr/SfDNwn7n1oYA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1456 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: https://github.com/tianocore/edk2-platforms/commit/5f67c57 -----Original Message----- From: devel@edk2.groups.io On Behalf Of Nate DeSimon= e Sent: Tuesday, August 31, 2021 10:27 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