* [Patch V2 0/3] Fix build error of OpenBoard
@ 2020-03-31 3:49 Heng Luo
2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Heng Luo @ 2020-03-31 3:49 UTC (permalink / raw)
To: devel
*** BLURB HERE ***
Heng Luo (3):
Platform/Intel: Add all pathes of feature domains to package path
Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround
Features/Intel: Correct wrong codes and remove unnecessary codes
Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++-
Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++-
Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 ---------
Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 2 +-
Platform/Intel/build_bios.py | 10 +++++++++-
5 files changed, 17 insertions(+), 13 deletions(-)
--
2.24.0.windows.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path 2020-03-31 3:49 [Patch V2 0/3] Fix build error of OpenBoard Heng Luo @ 2020-03-31 3:49 ` Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-04-01 6:04 ` Ni, Ray 2020-03-31 3:49 ` [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Heng Luo ` (2 subsequent siblings) 3 siblings, 2 replies; 9+ messages in thread From: Heng Luo @ 2020-03-31 3:49 UTC (permalink / raw) To: devel; +Cc: Dandan Bi, Liming Gao, Eric Dong, Ray Ni Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 Add all pathes of feature domains to package path in build_bios.py. Cc: Dandan Bi <dandan.bi@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Eric Dong <eric.dong@intel.com> Cc: Ray Ni <ray.ni@intel.com> Signed-off-by: Heng Luo <heng.luo@intel.com> --- Notes: v2: - Skip adding folders that contains package contents to the PACKAGES_PATH. [Ray Ni] Platform/Intel/build_bios.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index 1ef35aca0a..8f855f63eb 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.<BR> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -16,6 +16,7 @@ imported functions from board directory import os import re import sys +import glob import signal import shutil import argparse @@ -120,6 +121,13 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"] config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"] + # add all feature domains in WORKSPACE_FEATURES to package path + for filename in os.listdir(config["WORKSPACE_FEATURES"]): + filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) + # feature domains folder does not contain dec file + if os.path.isdir(filepath) and \ + not glob.glob(os.path.join(filepath, "*.dec")): + config["PACKAGES_PATH"] += os.pathsep + filepath config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"] config["PACKAGES_PATH"] += os.pathsep + \ os.path.join(config["WORKSPACE"], "FSP") -- 2.24.0.windows.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path 2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo @ 2020-04-01 4:36 ` Dong, Eric 2020-04-01 6:04 ` Ni, Ray 1 sibling, 0 replies; 9+ messages in thread From: Dong, Eric @ 2020-04-01 4:36 UTC (permalink / raw) To: Luo, Heng, devel@edk2.groups.io; +Cc: Bi, Dandan, Gao, Liming, Ni, Ray Reviewed-by: Eric Dong <eric.dong@intel.com> > -----Original Message----- > From: Luo, Heng > Sent: Tuesday, March 31, 2020 11:49 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; > Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com> > Subject: [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to > package path > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 > > Add all pathes of feature domains to package path in build_bios.py. > > Cc: Dandan Bi <dandan.bi@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Eric Dong <eric.dong@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Heng Luo <heng.luo@intel.com> > --- > > Notes: > v2: > - Skip adding folders that contains package contents to the > PACKAGES_PATH. [Ray Ni] > > Platform/Intel/build_bios.py | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index > 1ef35aca0a..8f855f63eb 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.<BR> > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights > +reserved.<BR> > # SPDX-License-Identifier: BSD-2-Clause-Patent # > > @@ -16,6 +16,7 @@ imported functions from board directory import os > import re import sys > +import glob > import signal > import shutil > import argparse > @@ -120,6 +121,13 @@ def pre_build(build_config, build_type="DEBUG", > silent=False, toolchain=None): > config["PACKAGES_PATH"] += os.pathsep + > config["WORKSPACE_SILICON"] > config["PACKAGES_PATH"] += os.pathsep + > config["WORKSPACE_SILICON_BIN"] > config["PACKAGES_PATH"] += os.pathsep + > config["WORKSPACE_FEATURES"] > + # add all feature domains in WORKSPACE_FEATURES to package path > + for filename in os.listdir(config["WORKSPACE_FEATURES"]): > + filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) > + # feature domains folder does not contain dec file > + if os.path.isdir(filepath) and \ > + not glob.glob(os.path.join(filepath, "*.dec")): > + config["PACKAGES_PATH"] += os.pathsep + filepath > config["PACKAGES_PATH"] += os.pathsep + > config["WORKSPACE_DRIVERS"] > config["PACKAGES_PATH"] += os.pathsep + \ > os.path.join(config["WORKSPACE"], "FSP") > -- > 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path 2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo 2020-04-01 4:36 ` Dong, Eric @ 2020-04-01 6:04 ` Ni, Ray 1 sibling, 0 replies; 9+ messages in thread From: Ni, Ray @ 2020-04-01 6:04 UTC (permalink / raw) To: Luo, Heng, devel@edk2.groups.io; +Cc: Bi, Dandan, Gao, Liming, Dong, Eric Reviewed-by: Ray Ni <ray.ni@intel.com> > -----Original Message----- > From: Luo, Heng <heng.luo@intel.com> > Sent: Tuesday, March 31, 2020 11:49 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; Dong, Eric <eric.dong@intel.com>; Ni, Ray > <ray.ni@intel.com> > Subject: [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 > > Add all pathes of feature domains to package path in build_bios.py. > > Cc: Dandan Bi <dandan.bi@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Eric Dong <eric.dong@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Heng Luo <heng.luo@intel.com> > --- > > Notes: > v2: > - Skip adding folders that contains package contents to the PACKAGES_PATH. [Ray Ni] > > Platform/Intel/build_bios.py | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py > index 1ef35aca0a..8f855f63eb 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.<BR> > +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR> > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > > @@ -16,6 +16,7 @@ imported functions from board directory > import os > import re > import sys > +import glob > import signal > import shutil > import argparse > @@ -120,6 +121,13 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): > config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON"] > config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_SILICON_BIN"] > config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_FEATURES"] > + # add all feature domains in WORKSPACE_FEATURES to package path > + for filename in os.listdir(config["WORKSPACE_FEATURES"]): > + filepath = os.path.join(config["WORKSPACE_FEATURES"], filename) > + # feature domains folder does not contain dec file > + if os.path.isdir(filepath) and \ > + not glob.glob(os.path.join(filepath, "*.dec")): > + config["PACKAGES_PATH"] += os.pathsep + filepath > config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"] > config["PACKAGES_PATH"] += os.pathsep + \ > os.path.join(config["WORKSPACE"], "FSP") > -- > 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround 2020-03-31 3:49 [Patch V2 0/3] Fix build error of OpenBoard Heng Luo 2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo @ 2020-03-31 3:49 ` Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-03-31 3:49 ` [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes Heng Luo 2020-03-31 5:18 ` [edk2-devel] [Patch V2 0/3] Fix build error of OpenBoard Liming Gao 3 siblings, 1 reply; 9+ messages in thread From: Heng Luo @ 2020-03-31 3:49 UTC (permalink / raw) To: devel; +Cc: Dandan Bi, Liming Gao, Eric Dong, Ray Ni Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 Need to add LogoFeaturePkg to TemporaryBuildWorkaround because OpenBoard still includes TemporaryBuildWorkaround for building BIOS. Cc: Dandan Bi <dandan.bi@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Eric Dong <eric.dong@intel.com> Cc: Ray Ni <ray.ni@intel.com> Signed-off-by: Heng Luo <heng.luo@intel.com> --- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc index 227ae00908..c62f9ecc6e 100644 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.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.<BR> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR> # # 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 # diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf index 74176d1989..00818fbe0a 100644 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf +++ b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.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.<BR> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR> # # 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 [FeaturePcd] gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable @@ -49,6 +50,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable [Sources] TemporaryBuildWorkaround.c -- 2.24.0.windows.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround 2020-03-31 3:49 ` [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Heng Luo @ 2020-04-01 4:36 ` Dong, Eric 0 siblings, 0 replies; 9+ messages in thread From: Dong, Eric @ 2020-04-01 4:36 UTC (permalink / raw) To: Luo, Heng, devel@edk2.groups.io; +Cc: Bi, Dandan, Gao, Liming, Ni, Ray Reviewed-by: Eric Dong <eric.dong@intel.com> > -----Original Message----- > From: Luo, Heng > Sent: Tuesday, March 31, 2020 11:49 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; > Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com> > Subject: [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to > TemporaryBuildWorkaround > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 > > Need to add LogoFeaturePkg to TemporaryBuildWorkaround because > OpenBoard still includes TemporaryBuildWorkaround for building BIOS. > > Cc: Dandan Bi <dandan.bi@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Eric Dong <eric.dong@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Heng Luo <heng.luo@intel.com> > --- > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempora > ryBuildWorkaround.dsc | 4 +++- > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempora > ryBuildWorkaround.inf | 5 ++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.dsc > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.dsc > index 227ae00908..c62f9ecc6e 100644 > --- > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.dsc > +++ > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > ra > +++ ryBuildWorkaround.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.<BR>+# Copyright (c) 2019 - 2020, Intel Corporation. All rights > reserved.<BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent #@@ -49,6 > +49,8 @@ > gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable > |FALSE > gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > |FALSE > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnabl > e |FALSE+ gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable > |FALSE+ gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable > |FALSE !endif #diff --git > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.inf > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.inf > index 74176d1989..00818fbe0a 100644 > --- > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > raryBuildWorkaround.inf > +++ > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempo > ra > +++ ryBuildWorkaround.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.<BR>+# Copyright (c) 2019 - 2020, Intel Corporation. All rights > reserved.<BR> # # 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 [FeaturePcd] > gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable@@ - > 49,6 +50,8 @@ > gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable > gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnabl > e+ gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable+ > gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable [Sources] > TemporaryBuildWorkaround.c-- > 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes 2020-03-31 3:49 [Patch V2 0/3] Fix build error of OpenBoard Heng Luo 2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo 2020-03-31 3:49 ` [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Heng Luo @ 2020-03-31 3:49 ` Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-03-31 5:18 ` [edk2-devel] [Patch V2 0/3] Fix build error of OpenBoard Liming Gao 3 siblings, 1 reply; 9+ messages in thread From: Heng Luo @ 2020-03-31 3:49 UTC (permalink / raw) To: devel; +Cc: Dandan Bi, Liming Gao, Eric Dong, Ray Ni Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 Correct wrong codes and remove unnecessary codes in LogoFeaturePkg. Cc: Dandan Bi <dandan.bi@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Eric Dong <eric.dong@intel.com> Cc: Ray Ni <ray.ni@intel.com> Signed-off-by: Heng Luo <heng.luo@intel.com> --- Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 --------- Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) 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!" !endif -################################################################################ -# -# Packages Section - Make sure PCD can be directly used in a conditional statement -# in a DSC which includes this DSC file. -# -################################################################################ -[Packages] - LogoFeaturePkg/LogoFeaturePkg.dec - ################################################################################ # # Library Class section - list of all Library Classes needed by this feature. 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 == TRUE +!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE INF LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf !else INF LogoFeaturePkg/LogoDxe/LogoDxe.inf -- 2.24.0.windows.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes 2020-03-31 3:49 ` [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes Heng Luo @ 2020-04-01 4:36 ` Dong, Eric 0 siblings, 0 replies; 9+ messages in thread From: Dong, Eric @ 2020-04-01 4:36 UTC (permalink / raw) To: Luo, Heng, devel@edk2.groups.io; +Cc: Bi, Dandan, Gao, Liming, Ni, Ray Reviewed-by: Eric Dong <eric.dong@intel.com> > -----Original Message----- > From: Luo, Heng > Sent: Tuesday, March 31, 2020 11:49 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan.bi@intel.com>; Gao, Liming <liming.gao@intel.com>; > Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com> > Subject: [Patch V2 3/3] Features/Intel: Correct wrong codes and remove > unnecessary codes > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644 > > Correct wrong codes and remove unnecessary codes in LogoFeaturePkg. > > Cc: Dandan Bi <dandan.bi@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Eric Dong <eric.dong@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Heng Luo <heng.luo@intel.com> > --- > Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 > --------- > Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 2 > +- > 2 files changed, 1 insertion(+), 10 deletions(-) > > 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.ds > +++ c > @@ -25,15 +25,6 @@ > !error "DXE_ARCH must be specified to build this feature!" !endif - > ########################################################## > ######################-#-# Packages Section - Make sure PCD can be > directly used in a conditional statement-# in a DSC which includes this DSC > file.-#- > ########################################################## > ######################-[Packages]- > LogoFeaturePkg/LogoFeaturePkg.dec- > ########################################################## > ###################### # # Library Class section - list of all Library > Classes needed by this feature.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 == TRUE+!if > gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable == TRUE INF > LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf !else INF > LogoFeaturePkg/LogoDxe/LogoDxe.inf-- > 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [edk2-devel] [Patch V2 0/3] Fix build error of OpenBoard 2020-03-31 3:49 [Patch V2 0/3] Fix build error of OpenBoard Heng Luo ` (2 preceding siblings ...) 2020-03-31 3:49 ` [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes Heng Luo @ 2020-03-31 5:18 ` Liming Gao 3 siblings, 0 replies; 9+ messages in thread From: Liming Gao @ 2020-03-31 5:18 UTC (permalink / raw) To: devel@edk2.groups.io, Luo, Heng Reviewed-by: Liming Gao <liming.gao@intel.com> -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Heng Luo Sent: 2020年3月31日 11:49 To: devel@edk2.groups.io Subject: [edk2-devel] [Patch V2 0/3] Fix build error of OpenBoard *** BLURB HERE *** Heng Luo (3): Platform/Intel: Add all pathes of feature domains to package path Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Features/Intel: Correct wrong codes and remove unnecessary codes Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc | 4 +++- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf | 5 ++++- Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 9 --------- Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 2 +- Platform/Intel/build_bios.py | 10 +++++++++- 5 files changed, 17 insertions(+), 13 deletions(-) -- 2.24.0.windows.2 ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-01 6:04 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-03-31 3:49 [Patch V2 0/3] Fix build error of OpenBoard Heng Luo 2020-03-31 3:49 ` [Patch V2 1/3] Platform/Intel: Add all pathes of feature domains to package path Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-04-01 6:04 ` Ni, Ray 2020-03-31 3:49 ` [Patch V2 2/3] Features/Intel: Add LogoFeaturePkg to TemporaryBuildWorkaround Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-03-31 3:49 ` [Patch V2 3/3] Features/Intel: Correct wrong codes and remove unnecessary codes Heng Luo 2020-04-01 4:36 ` Dong, Eric 2020-03-31 5:18 ` [edk2-devel] [Patch V2 0/3] Fix build error of OpenBoard Liming Gao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox