From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=XzfXeQan; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: michael.a.kubacki@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Mon, 07 Oct 2019 18:37:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2019 18:37:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,269,1566889200"; d="scan'208";a="223093792" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 07 Oct 2019 18:37:19 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 7 Oct 2019 18:37:19 -0700 Received: from NAM01-BN3-obe.outbound.protection.outlook.com (104.47.33.51) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 7 Oct 2019 18:37:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHOOpWsY2bslmv/bcec+L8gYzNwjGIbCPq3FzP2qk9njNVqvt3pO/L6604OJBwCWlj9EZ2rL8bQkU5SLI4C9cAGhHd9IKnPXlqR+D3gngxOzytmhz1yUBpoo1tpAWWmZ1YbG97dOvUZmMHQdnWpeLFQ5ARcl6xCMgEucswciT7C2mgpg2psEZ4XbpfvZIWWIMqLRQfw19Nvv+rhj361/U7fzdAlrASsM2mBQ8aEsroxct/QH4p+WyQ+X+N5VsC4oXeckufQF45S9zpsvvwvH03WLjkiAipLESZYsnmoDbyMQuPMVWFZWkPjGwc4ZuJNGi0YxBgEj6Wcffz17+RcNGA== 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=Za0cOZXr3cimmuJyrY3llolLtr42Xbj5dgOrlHqA/RE=; b=a/0Kt4Q4VEKotNiSQfWGSG5Hln94RsMObfYmJq39RYzArUnAxYP6st/hN3WYtlQeWMVKM0EOLiK9tKisB2RqUr8mK5xd6zZDo50ybAlo3pKoGiq08FdvXssJToLfySFhuNwURC7aAZPao7064xJrv6n+gnZqGQSZIjAn6fvt12PE4By+9vG+WK1n3iLzzlYtw2j742n4XPKIV9NyB+NI/AbcFm1zA2sHETo0jr/Fwy1r8bZSLfmqQSHL5rEK0zqGa49un+PtlHx6BAeaJsrJWE5JztYmSAsSibpcbKZOHg8ObmqQ4KSOzEFyqHOWn7bx208gYu0cY8NCes2iwHzpMg== 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=Za0cOZXr3cimmuJyrY3llolLtr42Xbj5dgOrlHqA/RE=; b=XzfXeQanhbJFeSDxgtsNTsFdjANZT8sRUM6q2JRcy1tPZIP+D50rFIpp/4HeqPTNN+go5a6M7ilwV6DYHzxxE7b1R9759MTiHY3/6+T7PXXCYlfJv3fhw6EXsIQTFi7oT0ourYbwjHTuJjdABznJQ4GYz+fg75o/ckItMUD8CoY= Received: from DM6PR11MB3834.namprd11.prod.outlook.com (20.179.17.87) by DM6PR11MB2716.namprd11.prod.outlook.com (20.176.99.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2327.24; Tue, 8 Oct 2019 01:37:16 +0000 Received: from DM6PR11MB3834.namprd11.prod.outlook.com ([fe80::59cc:8a30:6b9e:584e]) by DM6PR11MB3834.namprd11.prod.outlook.com ([fe80::59cc:8a30:6b9e:584e%3]) with mapi id 15.20.2327.025; Tue, 8 Oct 2019 01:37:16 +0000 From: "Kubacki, Michael A" To: "Agyeman, Prince" , "devel@edk2.groups.io" CC: "Sinha, Ankit" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms] [PATCH 5/5] Platform/Intel: Add FIT generation tool Thread-Topic: [edk2-platforms] [PATCH 5/5] Platform/Intel: Add FIT generation tool Thread-Index: AQHVei9m6V5Y2+/j30KIXHEAURFLyKdP/V/Q Date: Tue, 8 Oct 2019 01:37:16 +0000 Message-ID: References: <20191003211259.49664-1-prince.agyeman@intel.com> <20191003211259.49664-6-prince.agyeman@intel.com> In-Reply-To: <20191003211259.49664-6-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzVkZGY0M2MtNGUyYy00M2FkLWI4ZjMtMGMzYTAyNjNiYThmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVVR5T05rK3BOVzBJdHFVNnVaSmw4aHFVNldSZlwvdWZVd1NnNUt6OHNcL3FCMnBNc0owTlY0U0Y3ZjJrSnFwaXdyIn0= 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: 0ce212d0-afff-46c2-f102-08d74b900d6e x-ms-traffictypediagnostic: DM6PR11MB2716: 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: 01842C458A x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(396003)(376002)(346002)(366004)(136003)(13464003)(199004)(189003)(53546011)(55016002)(305945005)(74316002)(229853002)(6436002)(486006)(9686003)(14444005)(256004)(71200400001)(71190400001)(186003)(478600001)(8936002)(26005)(6116002)(3846002)(86362001)(110136005)(8676002)(476003)(316002)(446003)(81156014)(76176011)(14454004)(6506007)(81166006)(102836004)(52536014)(11346002)(64756008)(66556008)(66476007)(5660300002)(76116006)(99286004)(66446008)(2906002)(25786009)(54906003)(4326008)(66066001)(33656002)(66946007)(7696005)(7736002)(2501003)(107886003)(6246003);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR11MB2716;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: razhnNqEwEZt75NAbQkDzdGgh6NQY74FbPsSncvCPx6zmd6Z9v4FMURauWLE0rN+opFGY0x0kls1O9Zrfr5/xVJyDtB0NF9+W5RWh4Mj2nXWcQBH0tj6un3c9RkFCQvLwmVag4TaYX8QMBoSvRN5xzTXwkuSKyi4m3WNbqbRbS6ugFksM/mmWsZCe2im3iTcAeHhu4oL+gR3My0UJAkXfVDJ3u1ghUCqQjQO2U/VXSz2waqO9XxjX+9x5EQ8Qq6Fo/XFu+lqIL+mVBTRbq5dj0gJOnMDRgKaH8Fh0d9/tQOtLTnludtx+viWAmfvQbyAc5wtPYGteb7u3vN8Rg3R5YZoVM6hqTfir/uuuwZvIkaYqIghsMgjj/79cR2HiVSEHbTTgTRVL8M3sRVGMzH+2q37pSkVuPjkxfmzESXKJ80= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 0ce212d0-afff-46c2-f102-08d74b900d6e X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Oct 2019 01:37:16.7313 (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: rWBi6TEhc+s4NXAYsXKdTyJY4+I1hTd0dNu6hMAXDCfzb6wqPC1fdkwpDQQPcRX6BAj7atnXym8rIeuKO62qKl6o7/MTvdJTU8ZGVH95NZQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2716 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 3, 2019 2:13 PM > To: devel@edk2.groups.io > Cc: Sinha, Ankit ; Desimone, Nathaniel L > ; Kubacki, Michael A > > Subject: [edk2-platforms] [PATCH 5/5] Platform/Intel: Add FIT generation > tool >=20 > Added fit generation tool to the build > process. >=20 > What was done: >=20 > Added BIOS_INFO_GUID to the build.cfg >=20 > Added BIOS_INFO_GUID to GalagoPro3, > KabylakeRvp3 and WhiskeylakeURvp build_config.cfg This allows the boards > to specify the GUID associated with the its Bios Info PEIM >=20 > BIOS_INFO_GUID is passed as an argument to FitGen in the FIT table > generation process >=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..3f64239a29 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 3132E669-D16B-4AA7-B09B-BC0EB5F40E1F > 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