[edk2-devel] [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg
Ni, Ray
ray.ni at intel.com
Mon Mar 30 04:38:11 UTC 2020
Heng,
Can you please separate the patch to 3 so each patch fixes one issue specifically?
I am fine with one Bugzilla to cover the 3 issues.
Thanks,
Ray
> -----Original Message-----
> From: Luo, Heng <heng.luo at intel.com>
> Sent: Monday, March 30, 2020 12:30 PM
> To: devel at edk2.groups.io
> Cc: Bi, Dandan <dandan.bi at intel.com>; Gao, Liming <liming.gao at intel.com>;
> Dong, Eric <eric.dong at intel.com>; Ni, Ray <ray.ni at intel.com>
> Subject: [PATCH] Fix build error of OpenBoard caused by change of
> AdvancedFeaturePkg
>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2644
>
> 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 <dandan.bi at intel.com>
> Cc: Liming Gao <liming.gao at intel.com>
> Cc: Eric Dong <eric.dong at intel.com>
> Cc: Ray Ni <ray.ni at intel.com>
> Signed-off-by: Heng Luo <heng.luo at intel.com>
> ---
>
> Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB
> uildWorkaround.dsc | 4 +++-
>
> 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(-)
>
> 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 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/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 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
>
> 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
>
> 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.<BR>
>
> +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.<BR>
>
> # SPDX-License-Identifier: BSD-2-Clause-Patent
>
> #
>
>
>
> @@ -120,6 +120,11 @@ 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)
>
> + if os.path.isdir(filepath):
>
> + 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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#56595): https://edk2.groups.io/g/devel/message/56595
Mute This Topic: https://groups.io/mt/72645910/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list