From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web12.43820.1585542647151744423 for ; Sun, 29 Mar 2020 21:30:47 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: heng.luo@intel.com) IronPort-SDR: +H25Piw2Ep6RPZjW6BQhyJ6L/bq1U4k1JWCWRO4tVgQf1xQPJejP61KrLLkPXGDAgS/OnZC3AY ALC0hYUufZiw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2020 21:30:46 -0700 IronPort-SDR: V9wyYtZ9Uq/OZKI+Qf3pIOxUWZhep60XvNtYaWVOUOclcYtP9DV30iezO0R/1TYFffce9zGwh3 nlOJPSRaQe5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="421806438" Received: from unknown (HELO hengluo-dev.ccr.corp.intel.com) ([10.239.153.154]) by orsmga005.jf.intel.com with ESMTP; 29 Mar 2020 21:30:44 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Dandan Bi , Liming Gao , Eric Dong , Ray Ni Subject: [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg Date: Mon, 30 Mar 2020 12:29:56 +0800 Message-Id: <20200330042957.2031-1-heng.luo@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2644 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 Cc: Dandan Bi Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildW= orkaround.dsc | 4 +++- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildW= orkaround.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(-) diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tem= poraryBuildWorkaround.dsc b/Features/Intel/AdvancedFeaturePkg/TemporaryBuil= dWorkaround/TemporaryBuildWorkaround.dsc index 227ae00908..c62f9ecc6e 100644 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.dsc +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.dsc @@ -13,7 +13,7 @@ # When the BaseTools update is complete, this file can entirely be removed= =0D # from this package.=0D #=0D -# Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -49,6 +49,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE=0D gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE=0D gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE=0D + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE=0D + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE=0D !endif=0D =0D #=0D diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tem= poraryBuildWorkaround.inf b/Features/Intel/AdvancedFeaturePkg/TemporaryBuil= dWorkaround/TemporaryBuildWorkaround.inf index 74176d1989..00818fbe0a 100644 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.inf +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.inf @@ -13,7 +13,7 @@ # When the BaseTools update is complete, this file can entirely be removed= =0D # from this package.=0D #=0D -# Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -40,6 +40,7 @@ PowerManagement/S3FeaturePkg/S3FeaturePkg.dec=0D SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec=0D UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec=0D + UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec=0D =0D [FeaturePcd]=0D gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable=0D @@ -49,6 +50,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable=0D gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable=0D gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable=0D + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable=0D + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable=0D =0D [Sources]=0D TemporaryBuildWorkaround.c=0D diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeatur= e.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!"=0D !endif=0D =0D -##########################################################################= ######=0D -#=0D -# Packages Section - Make sure PCD can be directly used in a conditional s= tatement=0D -# in a DSC which includes this DSC file.=0D -#=0D -##########################################################################= ######=0D -[Packages]=0D - LogoFeaturePkg/LogoFeaturePkg.dec=0D -=0D ##########################################################################= ######=0D #=0D # Library Class section - list of all Library Classes needed by this featu= re.=0D 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=0D #=0D ##=0D -!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE=0D +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE=0D INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf=0D !else=0D INF LogoFeaturePkg/LogoDxe/LogoDxe.inf=0D 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=0D # imported functions from board directory=0D #=0D -# Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D =0D @@ -120,6 +120,11 @@ def pre_build(build_config, build_type=3D"DEBUG", sile= nt=3DFalse, toolchain=3DNone): config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_SILICON"]= =0D config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_SILICON_BI= N"]=0D config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_FEATURES"]= =0D + # add all feature domains in WORKSPACE_FEATURES to package path=0D + for filename in os.listdir(config["WORKSPACE_FEATURES"]):=0D + filepath =3D os.path.join(config["WORKSPACE_FEATURES"], filename)= =0D + if os.path.isdir(filepath):=0D + config["PACKAGES_PATH"] +=3D os.pathsep + filepath=0D config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_DRIVERS"]= =0D config["PACKAGES_PATH"] +=3D os.pathsep + \=0D os.path.join(config["WORKSPACE"], "FSP")=0D --=20 2.24.0.windows.2