From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.43835.1585543095469778015 for ; Sun, 29 Mar 2020 21:38:15 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: ray.ni@intel.com) IronPort-SDR: DcF5AGn2v7WZ2RLein14gsxtLi9t6sdKVydR9tE/DMxbovZx6w4hkrX2ETDO2uTXAH+MyeVFIK KpefcXakSvRg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2020 21:38:15 -0700 IronPort-SDR: 7QSsLmMgnzTdKDO4IyJoS1TrY+FB14wuhn6dYc0/qbBdGj2y1/2A81VCV0JbeTdTv0F12OnyCq CXgQH/h1Np+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="395002572" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga004.jf.intel.com with ESMTP; 29 Mar 2020 21:38:14 -0700 Received: from fmsmsx163.amr.corp.intel.com (10.18.125.72) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Mar 2020 21:38:14 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx163.amr.corp.intel.com (10.18.125.72) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Mar 2020 21:38:13 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.225]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.209]) with mapi id 14.03.0439.000; Mon, 30 Mar 2020 12:38:11 +0800 From: "Ni, Ray" To: "Luo, Heng" , "devel@edk2.groups.io" CC: "Bi, Dandan" , "Gao, Liming" , "Dong, Eric" Subject: Re: [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg Thread-Topic: [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg Thread-Index: AQHWBkwDSaVzpTsl3EOss5M9AEaVgqhgi/Kg Date: Mon, 30 Mar 2020 04:38:11 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C4C9168@SHSMSX104.ccr.corp.intel.com> References: <20200330042957.2031-1-heng.luo@intel.com> In-Reply-To: <20200330042957.2031-1-heng.luo@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Heng, Can you please separate the patch to 3 so each patch fixes one issue specif= ically? I am fine with one Bugzilla to cover the 3 issues. Thanks, Ray > -----Original Message----- > From: Luo, Heng > Sent: Monday, March 30, 2020 12:30 PM > To: devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric ; Ni, Ray > Subject: [PATCH] Fix build error of OpenBoard caused by change of > AdvancedFeaturePkg >=20 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2644 >=20 > 1. Add all pathes of feature domains to package path. > 2. Add LogoFeaturePkg to TemporaryBuildWorkaround. > 3. Correct wrong codes and remove unnecessary codes in LogoFeaturePkg >=20 > Cc: Dandan Bi > Cc: Liming Gao > Cc: Eric Dong > Cc: Ray Ni > Signed-off-by: Heng Luo > --- >=20 > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB > uildWorkaround.dsc | 4 +++- >=20 > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB > uildWorkaround.inf | 5 ++++- > Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > | 9 --------- > Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > | 2 +- > Platform/Intel/build_bios.py = | 7 ++++++- > 5 files changed, 14 insertions(+), 13 deletions(-) >=20 > diff --git > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.dsc > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.dsc > index 227ae00908..c62f9ecc6e 100644 > --- > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.dsc > +++ > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.dsc > @@ -13,7 +13,7 @@ > # When the BaseTools update is complete, this file can entirely be remov= ed >=20 > # from this package. >=20 > # >=20 > -# Copyright (c) 2019, Intel Corporation. All rights reserved.
>=20 > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
>=20 > # >=20 > # SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > # >=20 > @@ -49,6 +49,8 @@ > gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable > |FALSE >=20 > gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > |FALSE >=20 > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable > |FALSE >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable > |FALSE >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE >=20 > !endif >=20 >=20 >=20 > # >=20 > diff --git > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.inf > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.inf > index 74176d1989..00818fbe0a 100644 > --- > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.inf > +++ > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporary > BuildWorkaround.inf > @@ -13,7 +13,7 @@ > # When the BaseTools update is complete, this file can entirely be remov= ed >=20 > # from this package. >=20 > # >=20 > -# Copyright (c) 2019, Intel Corporation. All rights reserved.
>=20 > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
>=20 > # >=20 > # SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > # >=20 > @@ -40,6 +40,7 @@ > PowerManagement/S3FeaturePkg/S3FeaturePkg.dec >=20 > SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec >=20 > UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec >=20 > + UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec >=20 >=20 >=20 > [FeaturePcd] >=20 > gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable >=20 > @@ -49,6 +50,8 @@ > gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable >=20 > gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable >=20 > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable >=20 >=20 >=20 > [Sources] >=20 > TemporaryBuildWorkaround.c >=20 > diff --git > a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > index fca0bfd540..d2dcdeb36a 100644 > --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > @@ -25,15 +25,6 @@ > !error "DXE_ARCH must be specified to build this feature!" >=20 > !endif >=20 >=20 >=20 > - > ################################################################ > ################ >=20 > -# >=20 > -# Packages Section - Make sure PCD can be directly used in a conditional > statement >=20 > -# in a DSC which includes this DSC file. >=20 > -# >=20 > - > ################################################################ > ################ >=20 > -[Packages] >=20 > - LogoFeaturePkg/LogoFeaturePkg.dec >=20 > - >=20 >=20 > ################################################################ > ################ >=20 > # >=20 > # Library Class section - list of all Library Classes needed by this fea= ture. >=20 > diff --git > a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > index 080c87223c..fead9f3b02 100644 > --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > @@ -6,7 +6,7 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > # >=20 > ## >=20 > -!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE >=20 > +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE >=20 > INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf >=20 > !else >=20 > INF LogoFeaturePkg/LogoDxe/LogoDxe.inf >=20 > diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py > index 1ef35aca0a..b9ad980510 100644 > --- a/Platform/Intel/build_bios.py > +++ b/Platform/Intel/build_bios.py > @@ -3,7 +3,7 @@ > # Builds BIOS using configuration files and dynamically >=20 > # imported functions from board directory >=20 > # >=20 > -# Copyright (c) 2019, Intel Corporation. All rights reserved.
>=20 > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
>=20 > # SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > # >=20 >=20 >=20 > @@ -120,6 +120,11 @@ def pre_build(build_config, build_type=3D"DEBUG", > silent=3DFalse, toolchain=3DNone): > config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_SILICON"= ] >=20 > config["PACKAGES_PATH"] +=3D os.pathsep + > config["WORKSPACE_SILICON_BIN"] >=20 > config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_FEATURES= "] >=20 > + # add all feature domains in WORKSPACE_FEATURES to package path >=20 > + for filename in os.listdir(config["WORKSPACE_FEATURES"]): >=20 > + filepath =3D os.path.join(config["WORKSPACE_FEATURES"], filename= ) >=20 > + if os.path.isdir(filepath): >=20 > + config["PACKAGES_PATH"] +=3D os.pathsep + filepath >=20 > config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_DRIVERS"= ] >=20 > config["PACKAGES_PATH"] +=3D os.pathsep + \ >=20 > os.path.join(config["WORKSPACE"], "FSP") >=20 > -- > 2.24.0.windows.2