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.web12.206.1571247145313761387 for ; Wed, 16 Oct 2019 10:32:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=qV8y5mhO; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 10:32:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,304,1566889200"; d="scan'208";a="395969461" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga005.fm.intel.com with ESMTP; 16 Oct 2019 10:32:25 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX103.amr.corp.intel.com (10.22.225.130) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 16 Oct 2019 10:32:24 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) 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.1713.5; Wed, 16 Oct 2019 10:32:24 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 16 Oct 2019 10:32:24 -0700 Received: from NAM04-CO1-obe.outbound.protection.outlook.com (104.47.45.59) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 16 Oct 2019 10:32:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eHMdn4wVo7aNZVWf314aEihJfHpW9UIu2TLey6nE+TK38YHL2XAhgQ3uyETuLEfHgaJH7A6Kn9UH43IeCVprBZy6GzTIFMqLmXej8yeF10epfF+dWJR1rrbhnfLvw0z0XeIZP92KykOjB2VkCpc4QZI4Ilg/ZENZD9/CmWrGffPMqofKq/+uc4eDpJ7OW8zXwDjYQ9shfXoicvCeFzGI5zukTJtbkFnyflVMkzRijlxI1I4l9ZaocM+k7HO/kg0dztGYMRtKS5j/LViWlmnkcsi70bnUQrs71XpxOXBg/2565dsPURdXtIiB6DM6EFOCpbTk4JzaX1A7Di8QUcCxAA== 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=Kb9+Y+cNeNYFCg7tYfFq6iKZ4kOLaE3pRXf45QChDkI=; b=dd+AaPe+VogoPLIr3JGw4s+5SLYQ6BkrAzwcDzx+/aK0oSdmUZlSlJI/KkHsYZx84EIXxjnXwW7AlaAwrpROVDkwRlhC8Br2LsoM8ieeMBLr7eLmO7hU65bIW7tbuOzqGl6qK8fcoxs2wnq8T/9RAbB6Sxrw+5L9CGAlaPVLdNTIMr7mWPYyjit4K9oJ1xHw0PM4WW9OxdufK5v66kKYAxT5MdDWBQ4lG4AChoWpYmvTsnVTqEYFH3lujguZugR4TD8t3mpqXULC5bdTQGMK/nzFtJ/RiEtbYU64YkQ8M1rmZg1zbxpJmROER/ZgNH8pZ3ZsXNamWUS+6pYz6ZXudQ== 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=Kb9+Y+cNeNYFCg7tYfFq6iKZ4kOLaE3pRXf45QChDkI=; b=qV8y5mhOh3xE9eWmTzpow0guM1LEk1slwvwi/GIepUfzsdW/bIuv8xfJlbbso36L4rmuwgcwv4ar7fzxqUutmqFARzEQd9caWU/GVxwzXSXacwHhTlEFhv40XUIkYQkb4IQpnmcDM9X/PoQ/9CEnhI1t4ZPOLCT801kyAHfzImo= Received: from DM6PR11MB3834.namprd11.prod.outlook.com (20.179.17.87) by DM6PR11MB4219.namprd11.prod.outlook.com (52.132.248.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.16; Wed, 16 Oct 2019 17:32:16 +0000 Received: from DM6PR11MB3834.namprd11.prod.outlook.com ([fe80::21f7:6d8d:919b:d755]) by DM6PR11MB3834.namprd11.prod.outlook.com ([fe80::21f7:6d8d:919b:d755%6]) with mapi id 15.20.2347.023; Wed, 16 Oct 2019 17:32:16 +0000 From: "Kubacki, Michael A" To: "Agyeman, Prince" , "devel@edk2.groups.io" CC: "Sinha, Ankit" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms] [PATCH v2 4/4] Platform/Intel: Add FIT generation tool Thread-Topic: [edk2-platforms] [PATCH v2 4/4] Platform/Intel: Add FIT generation tool Thread-Index: AQHVg6sZC3s6G8UJgUKGtx1ARVXMPaddhPzA Date: Wed, 16 Oct 2019 17:32:16 +0000 Message-ID: References: <20191015225109.18992-1-prince.agyeman@intel.com> <20191015225109.18992-5-prince.agyeman@intel.com> In-Reply-To: <20191015225109.18992-5-prince.agyeman@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZjIxMjljODUtNTc0NS00M2Y0LWE1ZDYtZDlkMTNiNjM3MmJhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVHdFREwrb0E4U3FleWVES29OZEVOak9QWkhIblBKNUZFR0ZlWEdDYU5iT0t1ZWJVQlo3a2oyU2dHYWx5eTY4cyJ9 dlp-reaction: no-action dlp-version: 11.2.0.6 authentication-results: spf=none (sender IP is ) smtp.mailfrom=michael.a.kubacki@intel.com; x-originating-ip: [134.134.136.217] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3ea5b17e-e7eb-4772-b30d-08d7525eca19 x-ms-traffictypediagnostic: DM6PR11MB4219: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 0192E812EC x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(136003)(39860400002)(376002)(366004)(396003)(13464003)(199004)(189003)(76176011)(316002)(53546011)(6506007)(478600001)(14454004)(446003)(11346002)(99286004)(25786009)(26005)(74316002)(186003)(71190400001)(71200400001)(7696005)(7736002)(305945005)(2906002)(52536014)(5660300002)(102836004)(2501003)(110136005)(54906003)(4326008)(55016002)(33656002)(6436002)(3846002)(229853002)(14444005)(107886003)(6246003)(81156014)(256004)(66946007)(476003)(86362001)(66066001)(486006)(81166006)(76116006)(66476007)(66556008)(64756008)(66446008)(8936002)(8676002)(6116002)(9686003);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR11MB4219;H:DM6PR11MB3834.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XokeRzZDEJdToHpIvKqdhjRlaPpgAVvNaiF4DyJSrNmkrk6X0vvwlAe21moqkU077H4tMh/CmSHv30gZBnJp7H5PEZ83bgYpWGIHz3dGQamenTKojVJ61hbYrCxZXC8hbPFjb9xynA7ek2MqXnmT7T8MN9LS68PHTXF+zg1fgg7gwg9TKDU028ADNJ+FBIUhBspBWQRNaOFv4vcGHgwaTsMCa8DoxrXAmFsRRySTb63HIO4V+bjRekOa2es9mC4mfiHZuNnf5WcuyagJ8ZHyrGB2uCuJy33sEtOLjfgTENNarm+ZYhmFxkaGITy34gwBJDVT92nQeDAmHIBMDV6yUEPA7+xR9OWHpiLJv07PMDLc2XHrZKOnF4zTFF9R6nde9oAx438yf+fXe8/Brjw5bEhnz001okPBo0oRacj2JX0= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 3ea5b17e-e7eb-4772-b30d-08d7525eca19 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2019 17:32:16.6790 (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: F9+yozrQX4Xu4JuvIMOdr/zonLURl7Coylrvp+njy2Ai6Zhmx3q4xW/xJ7TYeO8qdSraXyHIl0Ey+bes4Oj0MK8n1NoUBGTqLzMa1FNarQE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4219 Return-Path: michael.a.kubacki@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Kubacki > -----Original Message----- > From: Agyeman, Prince > Sent: Tuesday, October 15, 2019 3:51 PM > To: devel@edk2.groups.io > Cc: Sinha, Ankit ; Desimone, Nathaniel L > ; Kubacki, Michael A > > Subject: [edk2-platforms] [PATCH v2 4/4] Platform/Intel: Add FIT generati= on > tool >=20 > Added FitGen tool build and FIT generation to the BIOS build process. >=20 > What was done: >=20 > - Build the FIT generation tool > - Added default/empty BIOS_INFO_GUID to the build.cfg > - Added BIOS_INFO_GUID to GalagoPro3,KabylakeRvp3 and > WhiskeylakeURvp's build_config.cfg This allows a board to specify the GUI= D > associated with the BIOS Info PEIM to be used in the board's FIT generati= on. >=20 > BIOS_INFO_GUID is passed as an argument to FitGen tool which allow the > tool to locate the BIOS Info module to be used in FIT generation. >=20 > Cc: Ankit Sinha > Cc: Nate DeSimone > Cc: Michael Kubacki >=20 > Signed-off-by: Prince Agyeman > --- > .../GalagoPro3/build_config.cfg | 1 + > .../KabylakeRvp3/build_config.cfg | 1 + > .../WhiskeylakeURvp/build_config.cfg | 1 + > Platform/Intel/build.cfg | 1 + > Platform/Intel/build_bios.py | 57 +++++++++++++++++++ > 5 files changed, 61 insertions(+) >=20 > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/build_config.cfg > b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/build_config.cfg > index 8c6c51abb4..458fe3d35d 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/build_config.cfg > +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/build_config.cfg > @@ -31,3 +31,4 @@ FSP_PKG_NAME =3D KabylakeFspPkg FSP_BINARY_BUILD > =3D FALSE FSP_TEST_RELEASE =3D FALSE SECURE_BOOT_ENABLE =3D FALSE > +BIOS_INFO_GUID =3D C83BCE0E-6F16-4D3C-8D9F-4D6F5A032929 > diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg > index 78f808bfaf..f6ae4b342a 100644 > --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg > +++ > b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/build_config.cfg > @@ -33,3 +33,4 @@ FSP_PKG_NAME =3D AmberLakeFspPkg > FSP_BINARY_BUILD =3D FALSE FSP_TEST_RELEASE =3D FALSE > SECURE_BOOT_ENABLE =3D FALSE > +BIOS_INFO_GUID =3D C83BCE0E-6F16-4D3C-8D9F-4D6F5A032929 > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/build_confi > g.cfg > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/build_confi > g.cfg > index 1b0619bc1c..1dfe5ffd10 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/build_confi > g.cfg > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/build_confi > +++ g.cfg > @@ -31,3 +31,4 @@ FSP_PKG_NAME =3D CoffeelakeSiliconPkg > FSP_BINARY_BUILD =3D FALSE FSP_TEST_RELEASE =3D FALSE > SECURE_BOOT_ENABLE =3D FALSE > +BIOS_INFO_GUID =3D A842B2D2-5C88-44E9-A9E2-4830F26662B7 > diff --git a/Platform/Intel/build.cfg b/Platform/Intel/build.cfg index > 2040774d1b..6aee96694c 100644 > --- a/Platform/Intel/build.cfg > +++ b/Platform/Intel/build.cfg > @@ -48,6 +48,7 @@ SECURE_BOOT_ENABLE =3D FALSE REBUILD_MODE =3D > BUILD_ROM_ONLY =3D NUMBER_OF_PROCESSORS =3D 0 > +BIOS_INFO_GUID =3D >=20 >=20 > [PLATFORMS] > diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py = index > 46285df19a..ea098de705 100644 > --- a/Platform/Intel/build_bios.py > +++ b/Platform/Intel/build_bios.py > @@ -196,6 +196,31 @@ def pre_build(build_config, build_type=3D"DEBUG", > silent=3DFalse, toolchain=3DNone): > if return_code !=3D 0: > build_failed(config) >=20 > + # > + # build platform silicon tools > + # > + # save the current workspace > + saved_work_directory =3D config["WORKSPACE"] > + # change the workspace to silicon tools directory > + config["WORKSPACE"] =3D os.path.join(config["WORKSPACE_SILICON"], > + "Tools") > + > + command =3D ["nmake"] > + if os.name =3D=3D "posix": # linux > + command =3D ["make"] > + # add path to generated FitGen binary to > + # environment path variable > + config["PATH"] +=3D os.pathsep + \ > + os.path.join(config["BASE_TOOLS_PATH"], > + "Source", "C", "bin") > + > + # build the silicon tools > + _, _, result, return_code =3D execute_script(command, config, shell= =3Dshell) > + if return_code !=3D 0: > + build_failed(config) > + > + # restore WORKSPACE environment variable > + config["WORKSPACE"] =3D saved_work_directory > + > config["SILENT_MODE"] =3D 'TRUE' if silent else 'FALSE' >=20 > print("=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D") > @@ -404,6 +429,35 @@ def post_build(config): > :returns: nothing > """ > print("Running post_build to complete the build process.") > + board_fd =3D config["BOARD"].upper() > + final_fd =3D os.path.join(config["BUILD_DIR_PATH"], "FV", > + "{}.fd".format(board_fd)) > + > + if config["BIOS_INFO_GUID"]: > + # Generate the fit table > + print("Generating FIT ...") > + if os.path.isfile(final_fd): > + temp_fd =3D os.path.join(config["BUILD_DIR_PATH"], "FV", > + "{}_.fd".format(board_fd)) > + shell =3D True > + command =3D ["FitGen", "-D", > + final_fd, temp_fd, "-NA", > + "-I", config["BIOS_INFO_GUID"]] > + > + if os.name =3D=3D "posix": # linux > + shell =3D False > + > + _, _, result, return_code =3D execute_script(command, config= , > shell=3Dshell) > + if return_code !=3D 0: > + print("Error while generating fit") > + else: > + # copy output to final binary > + shutil.copyfile(temp_fd, final_fd) > + # remove temp file > + os.remove(temp_fd) > + else: > + print("{} does not exist".format(final_fd)) > + # remove temp file >=20 > # Additional build scripts for this platform > result =3D post_build_ex(config) > @@ -426,6 +480,9 @@ def post_build(config): > except OSError: > pass >=20 > + print("Done") > + if os.path.isfile(final_fd): > + print("Fd file can be found at {}".format(final_fd)) >=20 > def build_failed(config): > """Displays results when build fails > -- > 2.19.1.windows.1