From nobody Fri May 3 08:11:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56594+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56594+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585542648; cv=none; d=zohomail.com; s=zohoarc; b=Nn12oSLjbQETCciKZPrhXpnXT2j3Yh3n0SeWnNT/z6thZZ2Iu+l2VKZZqc26OZ3Bqffb/3eyhtW7urZq81kPS/xlKjN5/XJvPZfWrEusBc/q+7GJLiX32XI88i8koEBcxU5jNp8ZV/0Yved2zI14aaqBCMfBTRwMMbVmXQS0jlY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585542648; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=B0yUXiVSvqfPt6xYLYTSan62ul3t15I12Ad+d4OzLcE=; b=dlnz28hh79wKJ9qVuO3p1M7ORVK/NbjOltNlZhKteeWK5KUoQJZUMCymtd1ghlJyl0cMwchrsEW7+C1pfcrTuM1XIfbjy+JPTA6VXjuIpra/AC8CbR4S/XOJMLC9ZGsTt08QWgUQ7U59lFJv8EzXTld0tJmUv7TGGmEHCfipmo8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56594+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158554264821030.328646209054227; Sun, 29 Mar 2020 21:30:48 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MlOXYY1788612xATVaaElIwY; Sun, 29 Mar 2020 21:30:47 -0700 X-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 IronPort-SDR: +H25Piw2Ep6RPZjW6BQhyJ6L/bq1U4k1JWCWRO4tVgQf1xQPJejP61KrLLkPXGDAgS/OnZC3AY ALC0hYUufZiw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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" X-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: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,heng.luo@intel.com X-Gm-Message-State: ihUSpCBqTma3RVQY02907Ajsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585542647; bh=S+FuFX91O0Vtsn1apk3vVxllGcILBnbWEB3aPehQvrQ=; h=Cc:Date:From:Reply-To:Subject:To; b=dh5edXye5F7vkHOSwgN6cS8GFsj6Rm2qp/2wJg74C3uKXnz8UeIFm5xP4tIJeKFWVQI lzBWJ8flGdue0SNsT1HKA3okDo84jlm9LklpdADQCfoU5XBMKfCqBV5imyUjgFpBER9D/ 9VTJquqs+ouVmgWx2HXQN28oh/w0cO6reuU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 # from this package. # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -49,6 +49,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE !endif =20 # 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 # from this package. # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -40,6 +40,7 @@ PowerManagement/S3FeaturePkg/S3FeaturePkg.dec SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec =20 [FeaturePcd] gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable @@ -49,6 +50,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =20 [Sources] TemporaryBuildWorkaround.c 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!" !endif =20 -##########################################################################= ###### -# -# Packages Section - Make sure PCD can be directly used in a conditional s= tatement -# in a DSC which includes this DSC file. -# -##########################################################################= ###### -[Packages] - LogoFeaturePkg/LogoFeaturePkg.dec - ##########################################################################= ###### # # Library Class section - list of all Library Classes needed by this featu= re. 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 # ## -!if gSmbiosFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf !else INF LogoFeaturePkg/LogoDxe/LogoDxe.inf 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 # imported functions from board directory # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 @@ -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"] config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_SILICON_BI= N"] config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_FEATURES"] + # add all feature domains in WORKSPACE_FEATURES to package path + for filename in os.listdir(config["WORKSPACE_FEATURES"]): + filepath =3D os.path.join(config["WORKSPACE_FEATURES"], filename) + if os.path.isdir(filepath): + config["PACKAGES_PATH"] +=3D os.pathsep + filepath config["PACKAGES_PATH"] +=3D os.pathsep + config["WORKSPACE_DRIVERS"] config["PACKAGES_PATH"] +=3D os.pathsep + \ os.path.join(config["WORKSPACE"], "FSP") --=20 2.24.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56594): https://edk2.groups.io/g/devel/message/56594 Mute This Topic: https://groups.io/mt/72645910/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-