From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.1452.1571366754890315090 for ; Thu, 17 Oct 2019 19:45:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=DsuOmbdx; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: michael.a.kubacki@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Oct 2019 19:45:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,310,1566889200"; d="scan'208";a="190234479" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by orsmga008.jf.intel.com with ESMTP; 17 Oct 2019 19:45:54 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 19:45:53 -0700 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (104.47.32.56) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 17 Oct 2019 19:45:53 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OtU9MymrYSb7rfl/pX1561Jr4DEsBOydRr1ltZS43Pj9vGzDQNvWwtNlMRS5OKPEqZQnwrMOboUln3hL7GMLQlqQwzs82f3x8Ree/84/6BLrX8ohMB42o2KtPt3msMwMq+3KeKB1JsKpzhXn18G1BDLyTUUzJAJPhp3bTh7IHuMX0eLmIXr6mjMqZgGPCuuuBp7ZFehWQPhBGExn1YBbZrcnofJRMA5PRektNbymo7yHMg5U/6B59uLizW9i8Y/X8OwIlrBlC+kp7nD6rQP6R3XhIqAlzs+etYqH8rPk40EWmjriPP8f8gZxyLeMpzZBdIXD6LtaBmM9yesdquQtvg== 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=qWPVtimKm2XY/hJ72ldC0yk36N6NNgQygGoo1F55I48=; b=XaEs8eU6BYS+VOAyCie5VZl64wnLxea1JoV7hldYBtPB8wDFhpGAHA2DjefFmN0t4CuCmdTgQwG7H7K1X0JnRtsdf0wn+Xjg3pgM+sDHoZx2+vrgk7q3UQhvvDhIlUcDsb6iXx0p7tqWyosWgnx1JVZKA1p86vIurUQ5zKLMaxnEvwrNWPBveTdFFC+5iHo53pH2loUc9haXrGRnuQNQBaBIOu1hmbpTrHrEkNv5fALkkCTtdxQkZLPKBAppRiUwp8wkrtUfu3vduNXl2Usix3+ICdsdfRIcFiuH56pKFCDzTXeHTs9prxatwscuUcNlgmE8PqbIqcprWuMrdqZjGg== 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=qWPVtimKm2XY/hJ72ldC0yk36N6NNgQygGoo1F55I48=; b=DsuOmbdxTtT/2ZncB+ITJtyAADKZ9NBeSj4t8tIYX58BHg62+gjB+iGLn9DnYv48hloE+RgIHcUuNKqIv6ZYjloLmdnWJpjGQtlP61m16b7IPeRWMT+04EXZ99Fd7RoMFnoDmhAMoMzDaBaYxqUr5E5EhGEmNHdBt9LNSCzJOd8= Received: from DM6PR11MB3834.namprd11.prod.outlook.com (20.179.17.87) by DM6PR11MB4025.namprd11.prod.outlook.com (20.176.125.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.16; Fri, 18 Oct 2019 02:45:51 +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; Fri, 18 Oct 2019 02:45:51 +0000 From: "Kubacki, Michael A" To: "Agyeman, Prince" , "devel@edk2.groups.io" CC: "Sinha, Ankit" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms] [PATCH v3 4/4] Platform/Intel: Add FIT generation tool Thread-Topic: [edk2-platforms] [PATCH v3 4/4] Platform/Intel: Add FIT generation tool Thread-Index: AQHVhUdg//MdWX8PnkGA/u8ATXD7MKdfsbZA Date: Fri, 18 Oct 2019 02:45:51 +0000 Message-ID: References: <20191018000145.3140-1-prince.agyeman@intel.com> <20191018000145.3140-5-prince.agyeman@intel.com> In-Reply-To: <20191018000145.3140-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDgyNTgwZDctMDVjMy00MjY1LWJlODgtOGZkMGI0NzAxYTU5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiK2R1dmVtcEFGTVwveTJGQ0tuTU82WEpcL1ZDVUc1WWJvV1JHbjNGMVlSNlwvVGdXQUVYS1p2bmdNcGR1cWFFN2FDUiJ9 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: 9fd226b5-77cb-4f7f-dd95-08d753754a42 x-ms-traffictypediagnostic: DM6PR11MB4025: 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: 01949FE337 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39850400004)(136003)(376002)(366004)(346002)(396003)(189003)(199004)(13464003)(11346002)(25786009)(76176011)(229853002)(6436002)(6246003)(2501003)(99286004)(8936002)(2906002)(5660300002)(33656002)(86362001)(55016002)(9686003)(66946007)(6306002)(76116006)(81156014)(71190400001)(7696005)(66446008)(64756008)(66556008)(8676002)(66476007)(71200400001)(81166006)(107886003)(6116002)(3846002)(446003)(102836004)(305945005)(256004)(14444005)(26005)(186003)(478600001)(316002)(66066001)(14454004)(74316002)(7736002)(110136005)(4326008)(54906003)(486006)(52536014)(6506007)(53546011)(476003);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR11MB4025;H:DM6PR11MB3834.namprd11.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:3;A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xmEdfgOugibdnQLrzla2orpciDj9LXva5yd0kMQMtWEHWriWI4ZskDTivk+3GZ1dDAhB8r8vVZnUDP4ZuFSZE6IybZWh2V7qFBCCiZXumRDPR/MKNu8UYuFxA3yShu86gf7BDdmcW0RM14lE2rSiLuXwX5H+UsROzotWq08LAqdTIUUd6TbaTApoR4cKxALvJtJsMpZ3C5pTAOjXfesIZ6mtFgcJz+SywM6MZbAuaWf3FXDJS/MUcsdELc8S58q3FttbTs/mwtmZWilnza8LpbFgOhm8GNs73TPJDQ0KAedbgLeTzF+XWXs66S/mYYfS9XHl6oR1I5R6n9hhAsA/OUJaAmuZg+6cDLQGnUw2mljv+5TmjR1IRSBPgWpUeUMHZckEKkcCqUA+K/NMuiVkzWpIJQWsdNPs08Y1tN6kS6U= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 9fd226b5-77cb-4f7f-dd95-08d753754a42 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Oct 2019 02:45:51.6300 (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: kVBmtXMPU+WAYzP+cHgmWSZtRJwiLbDmPFmJTEzh2Xoc2N8/tEuVNO3RP8YGCqNebdzUYexnGZcP3/NZjvMpkOEHcvdQFonUnq+xPPMFvTo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4025 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: Thursday, October 17, 2019 5:02 PM > To: devel@edk2.groups.io > Cc: Sinha, Ankit ; Desimone, Nathaniel L > ; Kubacki, Michael A > > Subject: [edk2-platforms] [PATCH v3 4/4] Platform/Intel: Add FIT generati= on > tool >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2210 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2211 >=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