[edk2-devel] [PATCH 2/2] Platform/Intel: Cleanup temporary build workaround related code
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2688 Use AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc instead of AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc Cc: Michael Kubacki Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc | 2 +- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 2 +- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 2 +- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc| 2 +- Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc| 2 +- Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc index 14e82ba34d..8e04ca8a4f 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc index bf63d53bef..7bb8cd5279 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc @@ -38,7 +38,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc index 044688ba4e..ef82f8b716 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc @@ -37,7 +37,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 350a75a313..3bafc1ff0a 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -42,7 +42,7 @@ DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include $(PROJECT)/OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc index 2ab9cb03ea..07cf311210 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc index 1a9e608bd6..1dace5ee22 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc -- 2.24.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57920): https://edk2.groups.io/g/devel/message/57920 Mute This Topic: https://groups.io/mt/73214616
Re: [edk2-devel] [PATCH] Platform/Intel/Tools: Add scripts to set PACKAGES_PATH environment
Attach the patch.
Thank Bob and Eric.
Best Regards
Heng
> -Original Message-
> From: Dong, Eric
> Sent: Wednesday, April 15, 2020 9:07 AM
> To: Feng, Bob C ; Luo, Heng ;
> devel@edk2.groups.io
> Cc: Ni, Ray ; Gao, Liming ; Chan,
> Amy
> Subject: RE: [PATCH] Platform/Intel/Tools: Add scripts to set
> PACKAGES_PATH environment
>
> Thanks bob.
>
>
> Heng,
>
> Please help to update the patch and send it to me, I will help to push it.
>
> Thanks,
> Eric
>
> > -Original Message-
> > From: Feng, Bob C
> > Sent: Wednesday, April 15, 2020 9:05 AM
> > To: Luo, Heng ; devel@edk2.groups.io
> > Cc: Ni, Ray ; Dong, Eric ; Gao,
> > Liming ; Chan, Amy
> > Subject: RE: [PATCH] Platform/Intel/Tools: Add scripts to set
> > PACKAGES_PATH environment
> >
> > A typo in the Readme.md. Others are fine for me.
> > **:+The old PACKAGES_PATH will be replaced by new one.s
> >
> > After fix that typo,
> > Reviewed-by: Bob Feng
> >
> > -Original Message-
> > From: Luo, Heng
> > Sent: Friday, April 10, 2020 9:06 AM
> > To: devel@edk2.groups.io
> > Cc: Ni, Ray ; Dong, Eric ; Gao,
> > Liming ; Feng, Bob C ;
> > Chan, Amy
> > Subject: [PATCH] Platform/Intel/Tools: Add scripts to set
> > PACKAGES_PATH environment
> >
> > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2656
> >
> > 1. Add GetPackagesPath.py, it will be used to get package pathes from
> > special directories. A sub directory is a qualified package path
> > when an EDKII Package can be found under it.
> > 2. Add AppendPackagesPath.bat and AppendPackagesPath.sh, these scripts
> > call GetPackagesPath.py to collect all package paths under specified
> > directories and append them to PACKAGES_PATH environment variable.
> >
> > Cc: Ray Ni
> > Cc: Eric Dong
> > Cc: Liming Gao
> > Cc: Bob Feng
> > Cc: Amy Chan
> > Signed-off-by: Heng Luo
> > ---
> > Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat | 33
> > +
> > Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh | 42
> > ++
> > Platform/Intel/Tools/AppendPackagesPath/GetPackagesPath.py | 98
> > ++
> >
> > Platform/Intel/Tools/AppendPackagesPath/Readme.md | 28
> >
> > 4 files changed, 201 insertions(+)
> >
> > diff --git
> > a/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
> > b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
> > new file mode 100644
> > index 00..da15d9c451
> > --- /dev/null
> > +++
> b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
> > @@ -0,0 +1,33 @@
> > +@REM @file+@REM Windows batch file to set PACKAGES_PATH
> > environment+@REM+@REM Copyright (c) 2020, Intel Corporation. All
> > environment+rights
> > reserved.+@REM SPDX-License-Identifier: BSD-2-Clause-
> > Patent+@REM+@REM This script calls GetPackagesPath.py to collect all
> > package paths under+@REM specified directories and appends them to
> > PACKAGES_PATH environment+@REM variable. A sub directory is a
> > qualified package path when an EDKII+@REM Package can be found under
> > it.++@echo off+@if /I "%1"=="" @goto Usage+@if /I "%1"=="-h" @goto
> > Usage+@if /I "%1"=="--help" @goto Usage+@if /I "%1"=="/?" @goto
> > Usage++for /f %%i in ('python %~dp0\GetPackagesPath.py %*') do (+if
> > defined PACKAGES_PATH (+set
> > "PACKAGES_PATH=%PACKAGES_PATH%;%%i"+) else (+set
> > "PACKAGES_PATH=%%i"+)+)+@goto End++:Usage+@echo Usage:
> > AppendPackagesPath.bat directory [directory ...]+@echo Copyright(c) 2020,
> > Intel Corporation. All rights reserved.+@echo Options:+@echo --help, -h
> > Print this help screen and exit++:Enddiff --git
> > a/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
> > b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
> > new file mode 100644
> > index 00..599c8d073b
> > --- /dev/null
> > +++ b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
> > @@ -0,0 +1,42 @@
> > +#!/bin/bash
> > +
> > +#
> > +# Copyright (c) 2020, Intel Corporation. All rights reserved. #
> > +SPDX-License-Identifier: BSD-2-Clause-Patent # # T
[edk2-devel] [PATCH] Platform/Intel/Tools: Add scripts to set PACKAGES_PATH environment
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2656
1. Add GetPackagesPath.py, it will be used to get package pathes from
special directories. A sub directory is a qualified package path
when an EDKII Package can be found under it.
2. Add AppendPackagesPath.bat and AppendPackagesPath.sh, these scripts
call GetPackagesPath.py to collect all package paths under specified
directories and append them to PACKAGES_PATH environment variable.
Cc: Ray Ni
Cc: Eric Dong
Cc: Liming Gao
Cc: Bob Feng
Cc: Amy Chan
Signed-off-by: Heng Luo
---
Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat | 33
+
Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh | 42
++
Platform/Intel/Tools/AppendPackagesPath/GetPackagesPath.py | 98
++
Platform/Intel/Tools/AppendPackagesPath/Readme.md | 28
4 files changed, 201 insertions(+)
diff --git a/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
new file mode 100644
index 00..da15d9c451
--- /dev/null
+++ b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.bat
@@ -0,0 +1,33 @@
+@REM @file
+@REM Windows batch file to set PACKAGES_PATH environment
+@REM
+@REM Copyright (c) 2020, Intel Corporation. All rights reserved.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
+@REM
+@REM This script calls GetPackagesPath.py to collect all package paths under
+@REM specified directories and appends them to PACKAGES_PATH environment
+@REM variable. A sub directory is a qualified package path when an EDKII
+@REM Package can be found under it.
+
+@echo off
+@if /I "%1"=="" @goto Usage
+@if /I "%1"=="-h" @goto Usage
+@if /I "%1"=="--help" @goto Usage
+@if /I "%1"=="/?" @goto Usage
+
+for /f %%i in ('python %~dp0\GetPackagesPath.py %*') do (
+if defined PACKAGES_PATH (
+set "PACKAGES_PATH=%PACKAGES_PATH%;%%i"
+) else (
+set "PACKAGES_PATH=%%i"
+)
+)
+@goto End
+
+:Usage
+@echo Usage: AppendPackagesPath.bat directory [directory ...]
+@echo Copyright(c) 2020, Intel Corporation. All rights reserved.
+@echo Options:
+@echo --help, -h Print this help screen and exit
+
+:End
diff --git a/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
new file mode 100644
index 00..599c8d073b
--- /dev/null
+++ b/Platform/Intel/Tools/AppendPackagesPath/AppendPackagesPath.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+#
+# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+# This script calls GetPackagesPath.py to collect all package paths under
+# specified directories and appends them to PACKAGES_PATH environment
+# variable. A sub directory is a qualified package path when an EDKII
+# Package can be found under it.
+#
+# Note: This script must be \'sourced\' so the environment can be changed:
+# source SetPackagesPath.sh
+# . AppendPackagesPath.sh
+
+function Usage()
+{
+echo "Usage: source AppendPackagesPath.sh directory [directory ...]"
+echo "Copyright(c) 2020, Intel Corporation. All rights reserved."
+echo "Options:"
+echo " --help, -h Print this help screen and exit"
+echo "Please note: This script must be \'sourced\' so the environment can
be changed."
+echo ". AppendPackagesPath.sh"
+echo "source AppendPackagesPath.sh"
+}
+
+function SetEnv()
+{
+local tool_path=$(dirname "$BASH_SOURCE")
+local paths=$(python $tool_path/GetPackagesPath.py $@)
+if [ "$PACKAGES_PATH" ]; then
+PACKAGES_PATH=$PACKAGES_PATH:$paths
+else
+PACKAGES_PATH=$paths
+fi
+}
+
+if [ $# -eq 0 -o "$1" == "-h" -o "$1" == "--help" -o "$1" == "/?" ]; then
+Usage
+else
+SetEnv $@
+fi
diff --git a/Platform/Intel/Tools/AppendPackagesPath/GetPackagesPath.py
b/Platform/Intel/Tools/AppendPackagesPath/GetPackagesPath.py
new file mode 100644
index 00..31ed44cfa3
--- /dev/null
+++ b/Platform/Intel/Tools/AppendPackagesPath/GetPackagesPath.py
@@ -0,0 +1,98 @@
+## @file
+# Get all recursive package paths from special directories.
+#
+# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+
+import os
+import glob
+import argparse
+
+#
+# Globals for help information
+#
+__prog__ = 'GetPackagesPath.py'
+__copyright__ = 'Copyright (c) 2020, Intel Corporation. All rights reserved.'
+__description__ = 'Gets all recursive package paths in specified directory.\n'
[edk2-devel] [PATCH] BaseTools/Scripts: Add scripts to set PACKAGES_PATH environment
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2656
1. Add GetPackagesPath.py, it will be used to get package pathes from
special directories. A sub directory is a qualified package path
when an EDKII Package can be found under it.
2. Add SetPackagesPath.bat and SetPackagesPath.sh, these scripts call
GetPackagesPath.py to collect all package paths under specified
directories and append them to PACKAGES_PATH environment variable.
Cc: Ray Ni
Cc: Eric Dong
Cc: Liming Gao
Cc: Bob Feng
Cc: Amy Chan
Signed-off-by: Heng Luo
---
BaseTools/Scripts/GetPackagesPath.py | 94
++
BaseTools/Scripts/SetPackagesPath.bat | 33 +
BaseTools/Scripts/SetPackagesPath.sh | 40
3 files changed, 167 insertions(+)
diff --git a/BaseTools/Scripts/GetPackagesPath.py
b/BaseTools/Scripts/GetPackagesPath.py
new file mode 100644
index 00..82d66a6106
--- /dev/null
+++ b/BaseTools/Scripts/GetPackagesPath.py
@@ -0,0 +1,94 @@
+## @file
+# Get all recursive package paths from special directories.
+#
+# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+
+import os
+import glob
+import argparse
+
+#
+# Globals for help information
+#
+__prog__ = 'GetPackagesPath.py'
+__copyright__ = 'Copyright (c) 2020, Intel Corporation. All rights reserved.'
+__description__ = 'Gets all recursive package paths in specified directory.\n'
+
+def list_packages_path(root):
+""" Gets all recursive package paths in specified directory.
+A directory is a package path if it satisfies conditions below:
+1. it is a directory
+2. it is not an EDK II Package. An EDK II Package (directory) is
+ a directory that contains an EDK II package declaration (DEC) file.
+3. it contains at least one first level EDK II Package.
+Note: A directory is not package path but its subdirectory could be.
+Example: edk2-platforms/Features is not package path
+but edk2-platforms/Features/Intel is.
+
+:param root: The specified directory to find package paths in it
+:type root: String
+:returns: Return all recursive package paths
+:rtype: String list
+"""
+
+if (not os.path.exists(root)) or (not os.path.isdir(root)):
+ return []
+
+if glob.glob(os.path.join(root, '*.dec')):
+# it is an EDK II Package
+return []
+
+paths = []
+contain_package = False
+for filename in os.listdir(root):
+filepath = os.path.join(root, filename)
+if os.path.isdir(filepath):
+if glob.glob(os.path.join(filepath, '*.dec')):
+# it is an EDK II Package
+contain_package = True
+else:
+# gets package paths for subdirectory if it is not package
+paths = paths + list_packages_path(filepath)
+
+if contain_package:
+# root is a package path because it contains EDK II Package
+# in first level folder, inset it to head of list
+paths.insert(0, root)
+
+# return package paths
+return paths
+
+def get_packages_path(directories):
+""" For each direcory in directories, gets all recursive package paths
+in this directory and joins them into one string.
+
+:param directories: the list of directory
+:type directories: String list
+:returns: Return string of package paths
+:rtype: String
+"""
+
+packages_path = ''
+for directory in directories:
+directory = os.path.abspath(directory)
+paths = list_packages_path(directory)
+for path in paths:
+if packages_path == '':
+packages_path = path
+else:
+packages_path += os.pathsep + path
+return packages_path
+
+if __name__ == '__main__':
+# Create command line argument parser object
+parser = argparse.ArgumentParser(
+prog=__prog__,
+description=__description__ + __copyright__,
+conflict_handler='resolve'
+)
+parser.add_argument('directory', nargs='+',
+help='Specified directory where package packages are got from')
+args = parser.parse_args()
+print(get_packages_path(args.directory))
diff --git a/BaseTools/Scripts/SetPackagesPath.bat
b/BaseTools/Scripts/SetPackagesPath.bat
new file mode 100644
index 00..a8c45612c9
--- /dev/null
+++ b/BaseTools/Scripts/SetPackagesPath.bat
@@ -0,0 +1,33 @@
+@REM @file
+@REM Windows batch file to set PACKAGES_PATH environment
+@REM
+@REM Copyright (c) 2020, Intel Corporation. All rights reserved.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
+@REM
+@REM This script calls GetPackagesPath.py to collect all package paths under
+@REM specif
[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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56715): https://edk2.groups.io/g/devel/message/56715 Mute This Topic: https://groups.io/mt/72670480/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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. +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. # 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56716): https://edk2.groups.io/g/devel/message/56716 Mute This Topic: https://groups.io/mt/72670486/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56718): https://edk2.groups.io/g/devel/message/56718 Mute This Topic: https://groups.io/mt/72670490/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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. +# 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 # 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. +# 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 [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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56717): https://edk2.groups.io/g/devel/message/56717 Mute This Topic: https://groups.io/mt/72670488/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path
OK, it means we just need to check dec file Best Regards Heng > -Original Message- > From: Gao, Liming > Sent: Tuesday, March 31, 2020 10:52 AM > To: Luo, Heng ; Ni, Ray ; > devel@edk2.groups.io > Cc: Bi, Dandan ; Dong, Eric > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to > package path > > Ray: > Package has dec file in its root directory. Package DSC file is optional. > > Thanks > Liming > -Original Message- > From: Luo, Heng > Sent: 2020年3月31日 9:25 > To: Ni, Ray ; devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to > package path > > Hi Liming, > I will apply the change below if you agree to we treat a folder that contains > ".dec" and "dsc" files as a package directory: > > diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index > b9ad980510..bb25699ed8 100644 > --- a/Platform/Intel/build_bios.py > +++ b/Platform/Intel/build_bios.py > @@ -16,6 +16,7 @@ imported functions from board directory import os > import re import sys > +import glob > import signal > import shutil > import argparse > @@ -123,7 +124,10 @@ def pre_build(build_config, build_type="DEBUG", > silent=False, toolchain=None): > # 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): > +# feature domains folder does not contain dec or dsc file > +if os.path.isdir(filepath) and \ > + not glob.glob(os.path.join(filepath, "*.dec")) and \ > + not glob.glob(os.path.join(filepath, "*.dsc")): > config["PACKAGES_PATH"] += os.pathsep + filepath > config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"] > config["PACKAGES_PATH"] += os.pathsep + \ > > Best Regards > Heng > > > -Original Message- > > From: Ni, Ray > > Sent: Monday, March 30, 2020 5:01 PM > > To: Luo, Heng ; devel@edk2.groups.io > > Cc: Bi, Dandan ; Gao, Liming > > ; Dong, Eric > > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature > > domains to package path > > > > > +# 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 > > > > Will this change include "AdvancedFeaturePkg" and "TemplateFeaturePkg" > > folder as well? > > > > Can you please revise the patch to skip adding folders that contains > > package contents to the PACKAGES_PATH? > > > > Liming, > > What's the criteria of a package? Can we treat a folder that contains ".dec" > > and "dsc" files as a package directory? > > > > Thanks, > > Ray -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56713): https://edk2.groups.io/g/devel/message/56713 Mute This Topic: https://groups.io/mt/72646657/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to package path
Hi Liming, I will apply the change below if you agree to we treat a folder that contains ".dec" and "dsc" files as a package directory: diff --git a/Platform/Intel/build_bios.py b/Platform/Intel/build_bios.py index b9ad980510..bb25699ed8 100644 --- a/Platform/Intel/build_bios.py +++ b/Platform/Intel/build_bios.py @@ -16,6 +16,7 @@ imported functions from board directory import os import re import sys +import glob import signal import shutil import argparse @@ -123,7 +124,10 @@ def pre_build(build_config, build_type="DEBUG", silent=False, toolchain=None): # 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): +# feature domains folder does not contain dec or dsc file +if os.path.isdir(filepath) and \ + not glob.glob(os.path.join(filepath, "*.dec")) and \ + not glob.glob(os.path.join(filepath, "*.dsc")): config["PACKAGES_PATH"] += os.pathsep + filepath config["PACKAGES_PATH"] += os.pathsep + config["WORKSPACE_DRIVERS"] config["PACKAGES_PATH"] += os.pathsep + \ Best Regards Heng > -Original Message- > From: Ni, Ray > Sent: Monday, March 30, 2020 5:01 PM > To: Luo, Heng ; devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric > Subject: RE: [PATCH 1/3] Platform/Intel: Add all pathes of feature domains to > package path > > > +# 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 > > Will this change include "AdvancedFeaturePkg" and "TemplateFeaturePkg" > folder as well? > > Can you please revise the patch to skip adding folders that contains package > contents to the PACKAGES_PATH? > > Liming, > What's the criteria of a package? Can we treat a folder that contains ".dec" > and "dsc" files as a package directory? > > Thanks, > Ray -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56700): https://edk2.groups.io/g/devel/message/56700 Mute This Topic: https://groups.io/mt/72646657/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH 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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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. +# 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 # 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. +# 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 [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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56599): https://edk2.groups.io/g/devel/message/56599 Mute This Topic: https://groups.io/mt/72646658/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH 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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- Platform/Intel/build_bios.py | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 # @@ -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 (#56598): https://edk2.groups.io/g/devel/message/56598 Mute This Topic: https://groups.io/mt/72646657/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH 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 | 7 ++- 5 files changed, 14 insertions(+), 13 deletions(-) -- 2.24.0.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56597): https://edk2.groups.io/g/devel/message/56597 Mute This Topic: https://groups.io/mt/72646656/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH 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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56600): https://edk2.groups.io/g/devel/message/56600 Mute This Topic: https://groups.io/mt/72646659/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] Fix build error of OpenBoard caused by change of AdvancedFeaturePkg
OK, I will send the separated patches. Best Regards Heng > -Original Message- > From: Ni, Ray > Sent: Monday, March 30, 2020 12:38 PM > 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 > > 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 > > 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 > > > > 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 > > Cc: Liming Gao > > Cc: Eric Dong > > Cc: Ray Ni > > Signed-off-by: Heng Luo > > --- > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > yB > > uildWorkaround.dsc | 4 +++- > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > yB > > 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/Tempor > ary > > BuildWorkaround.dsc > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.dsc > > index 227ae00908..c62f9ecc6e 100644 > > --- > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.dsc > > +++ > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > 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. > > > > +# 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 > > > > > > > > # > > > > diff --git > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.inf > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.inf > > index 74176d1989..00818fbe0a 100644 > > --- > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > BuildWorkaround.inf > > +++ > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > ary > > 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. > > > > +# 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 > > > >UserInterfa
[edk2-devel] [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 Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- 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 | 7 ++- 5 files changed, 14 insertions(+), 13 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. +# 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 # 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. +# 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 [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 LogoFeatureP
[edk2-devel] [Patch V3] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 1. LogoDxe.inf includes a BMP logo in the EFI file, the driver decodes the BMP file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. Cc: Dandan Bi Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo --- Notes: v3: - Remove the feature-domain prefix "UserInterface" from all paths inside DSC/FDF/INF. [Ray Ni] - Pass build with VS2015/Clang in Windows and GCC in Ubuntu. v2: - Add Cc and remove Change-Id in commit message. [Liming Gao] Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| 4 +++- Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc | 6 +- Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf| 6 +- Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 6 +- Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 107 +++ Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 13 + Features/Intel/UserInterface/LogoFeaturePkg/Include/PreMemory.fdf | 8 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf| 10 ++ Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf | 52 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.bmp| Bin 0 -> 183366 bytes Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c | 153 + Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf| 10 ++ Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg| Bin 0 -> 11944 bytes Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf | 52 Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec | 31 +++ Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc | 37 + Features/Intel/UserInterface/LogoFeaturePkg/Readme.md | 129 + 17 files changed, 620 insertions(+), 4 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 23e7c6474a..ea879680ba 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -7,7 +7,7 @@ # 1. Present a consolidated and simplified view of all available advanced features to board packages. # 2. Provide a simple, single package build for all available advanced features. # -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -46,6 +46,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |TRUE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable|TRUE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable|TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE # # This package builds all advanced features. diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 649774edf7..ac9ab80e8e 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -4,7 +4,7 @@ # This file is intended to be included into another package so advanced features # can be conditionally built by enabling the respective feature via its FeaturePCD. # -# Copyright (c) 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -54,3 +54,7 @@ !if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable == TRUE !include UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc !endif + +!if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE + !include LogoFeaturePkg/Include/LogoFeature.dsc +!endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/P
Re: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
Hi Ray, Pass build with GCC in ubuntu after adding "~/code/edk2-platforms/Features/Intel/UserInterface" in PACKAGES_PATH. Best Regards Heng > -Original Message- > From: Ni, Ray > Sent: Wednesday, March 25, 2020 3:17 PM > To: Luo, Heng ; devel@edk2.groups.io > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric > Subject: RE: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > What is PACKAGES_PATH env variable set to? > > > -Original Message- > > From: Luo, Heng > > Sent: Wednesday, March 25, 2020 3:01 PM > > To: Ni, Ray ; devel@edk2.groups.io > > Cc: Bi, Dandan ; Gao, Liming > ; Dong, Eric > > Subject: RE: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > > > Hi Ray， > > It fails to build with GCC in ubuntu if removing the prefix > from all paths insideDSC/FDF/INF. > > No problem in windows > > > > Active Platform = /home/ilabuser/code/hengluo/edk2- > > > platforms/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc > > > > > > build.py... > > /home/ilabuser/code/hengluo/edk2- > platforms/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc > (36): error > > 000E: File/directory not found in workspace > > LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf is not found in packages > path: > > /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Platform/Intel > > /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Silicon/Intel > > /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Features/Intel > > > > > > - Failed - > > Build end time: 14:57:21, Mar.25 2020 > > Build total time: 00:00:00 > > > > Best Regards > > Heng > > > > > -Original Message- > > > From: Ni, Ray > > > Sent: Wednesday, March 25, 2020 11:53 AM > > > To: devel@edk2.groups.io; Luo, Heng > > > Cc: Bi, Dandan ; Gao, Liming > ; > > > Dong, Eric > > > Subject: RE: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg > to > > > provide logo images and drivers > > > > > > Heng, > > > Can you please remove the prefix from all paths inside > > > DSC/FDF/INF? > > > > > > We expect PACKAGES_PATH is set to include "edk2- > platforms/Features/Intel" > > > and all sub folders inside "edk2-platforms/Features/Intel/". > > > > > > Thanks, > > > Ray > > > > > > > > > > -Original Message- > > > > From: devel@edk2.groups.io On Behalf Of > Heng > > > Luo > > > > Sent: Wednesday, March 25, 2020 10:44 AM > > > > To: devel@edk2.groups.io > > > > Cc: Bi, Dandan ; Gao, Liming > > > ; Dong, Eric > > > > Subject: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to > > > provide logo images and drivers > > > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 > > > > > > > > 1. LogoDxe.inf includes a BMP logo in the EFI file, > > > > the driver decodes the BMP file and provide the image > > > > via EDKII_PLATFORM_LOGO_PROTOCOL. > > > > 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, > > > > the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg > > > > file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. > > > > > > > > Cc: Dandan Bi > > > > Cc: Liming Gao > > > > Cc: Eric Dong > > > > Signed-off-by: Heng Luo > > > > --- > > > > > > > > Notes: > > > > v2: > > > > - Add Cc and Remove Change-Id in commit message > > > > > > > > Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| > 4 > > > +++- > > > > Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc > | > > > 6 +- > > > > Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf| > 6 > > > +- > > > > Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | > 6 > > > +- > > > > Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > | > > > 107 > > > > > > > > > > > +++ > > > > > > > > Features/Intel/UserInte
Re: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
Hi Ray， It fails to build with GCC in ubuntu if removing the prefix from all paths insideDSC/FDF/INF. No problem in windows Active Platform = /home/ilabuser/code/hengluo/edk2-platforms/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc build.py... /home/ilabuser/code/hengluo/edk2-platforms/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc(36): error 000E: File/directory not found in workspace LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf is not found in packages path: /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Platform/Intel /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Silicon/Intel /home/ilabuser/code/hengluo/edk2/../edk2-platforms/Features/Intel - Failed - Build end time: 14:57:21, Mar.25 2020 Build total time: 00:00:00 Best Regards Heng > -Original Message- > From: Ni, Ray > Sent: Wednesday, March 25, 2020 11:53 AM > To: devel@edk2.groups.io; Luo, Heng > Cc: Bi, Dandan ; Gao, Liming ; > Dong, Eric > Subject: RE: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > Heng, > Can you please remove the prefix from all paths inside > DSC/FDF/INF? > > We expect PACKAGES_PATH is set to include "edk2-platforms/Features/Intel" > and all sub folders inside "edk2-platforms/Features/Intel/". > > Thanks, > Ray > > > > -Original Message- > > From: devel@edk2.groups.io On Behalf Of Heng > Luo > > Sent: Wednesday, March 25, 2020 10:44 AM > > To: devel@edk2.groups.io > > Cc: Bi, Dandan ; Gao, Liming > ; Dong, Eric > > Subject: [edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 > > > > 1. LogoDxe.inf includes a BMP logo in the EFI file, > > the driver decodes the BMP file and provide the image > > via EDKII_PLATFORM_LOGO_PROTOCOL. > > 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, > > the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg > > file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. > > > > Cc: Dandan Bi > > Cc: Liming Gao > > Cc: Eric Dong > > Signed-off-by: Heng Luo > > --- > > > > Notes: > > v2: > > - Add Cc and Remove Change-Id in commit message > > > > Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| 4 > +++- > > Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc | > 6 +- > > Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf| 6 > +- > > Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 6 > +- > > Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | > 107 > > > > +++ > > > > Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | > 13 + > > Features/Intel/UserInterface/LogoFeaturePkg/Include/PreMemory.fdf | > 8 > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf| > 10 ++ > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf | > 52 > > > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.bmp| > Bin 0 -> 183366 bytes > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c | 153 > > > > +++ > > ++ > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf| 10 > ++ > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg| Bin > 0 -> 11944 bytes > > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf | > 52 > > > > Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec | 31 > +++ > > Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc | 37 > + > > Features/Intel/UserInterface/LogoFeaturePkg/Readme.md | 129 > > > > +++ > > ++ > > 17 files changed, 620 insertions(+), 4 deletions(-) > > > > diff --git a/Features/Intel/AdvancedFeatureP
[edk2-devel] [Patch V2] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 1. LogoDxe.inf includes a BMP logo in the EFI file, the driver decodes the BMP file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. Cc: Dandan Bi Cc: Liming Gao Cc: Eric Dong Signed-off-by: Heng Luo --- Notes: v2: - Add Cc and Remove Change-Id in commit message Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc| 4 +++- Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc | 6 +- Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf| 6 +- Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 6 +- Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 107 +++ Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf | 13 + Features/Intel/UserInterface/LogoFeaturePkg/Include/PreMemory.fdf | 8 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf| 10 ++ Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf | 52 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.bmp| Bin 0 -> 183366 bytes Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c | 153 + Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf| 10 ++ Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg| Bin 0 -> 11944 bytes Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf | 52 Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec | 31 +++ Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc | 37 + Features/Intel/UserInterface/LogoFeaturePkg/Readme.md | 129 + 17 files changed, 620 insertions(+), 4 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 23e7c6474a..ea879680ba 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -7,7 +7,7 @@ # 1. Present a consolidated and simplified view of all available advanced features to board packages. # 2. Provide a simple, single package build for all available advanced features. # -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -46,6 +46,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |TRUE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable|TRUE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable|TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE # # This package builds all advanced features. diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 649774edf7..c1bd791525 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -4,7 +4,7 @@ # This file is intended to be included into another package so advanced features # can be conditionally built by enabling the respective feature via its FeaturePCD. # -# Copyright (c) 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -54,3 +54,7 @@ !if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable == TRUE !include UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc !endif + +!if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE + !include UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc +!endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf index 57b29a42b9..56f6143650 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/AdvancedFeat
Re: [edk2-devel] [PATCH] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
Hi Liming, I have passed build with VS2015, do I have to pass build with GCC5? I have no Ubuntu environment so far, is there a easy way to verify the build with GCC5? Best Regards Heng > -Original Message- > From: Gao, Liming > Sent: Tuesday, March 24, 2020 11:13 PM > To: devel@edk2.groups.io; Luo, Heng > Subject: RE: [edk2-devel] [PATCH] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > Heng: > Please remove Change-Id from the commit message. > > And, what test have been done for new packages? Do you pass build with > VS2015 & GCC5? > > Thanks > Liming > > -Original Message----- > > From: devel@edk2.groups.io On Behalf Of Heng > Luo > > Sent: Thursday, March 19, 2020 11:04 AM > > To: devel@edk2.groups.io > > Subject: [edk2-devel] [PATCH] Features/Intel: Add LogoFeaturePkg to > provide logo images and drivers > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 > > > > 1. LogoDxe.inf includes a BMP logo in the EFI file, > > the driver decodes the BMP file and provide the image > > via EDKII_PLATFORM_LOGO_PROTOCOL. > > 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, > > the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg > > file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. > > > > Change-Id: Ie7b91d34c31b09a86f02634d3a1aa4d39637bb54 > > Signed-off-by: Heng Luo > > --- > > .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 4 +- > > .../Include/AdvancedFeatures.dsc | 6 +- > > .../AdvancedFeaturePkg/Include/PostMemory.fdf | 6 +- > > .../AdvancedFeaturePkg/Include/PreMemory.fdf | 6 +- > > .../LogoFeaturePkg/Include/LogoFeature.dsc| 107 > > .../LogoFeaturePkg/Include/PostMemory.fdf | 13 ++ > > .../LogoFeaturePkg/Include/PreMemory.fdf | 8 + > > .../LogoFeaturePkg/LogoDxe/JpegLogo.idf | 10 ++ > > .../LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf| 52 ++ > > .../LogoFeaturePkg/LogoDxe/Logo.bmp | Bin 0 -> 183366 bytes > > .../LogoFeaturePkg/LogoDxe/Logo.c | 153 ++ > > .../LogoFeaturePkg/LogoDxe/Logo.idf | 10 ++ > > .../LogoFeaturePkg/LogoDxe/Logo.jpg | Bin 0 -> 11944 bytes > > .../LogoFeaturePkg/LogoDxe/LogoDxe.inf| 52 ++ > > .../LogoFeaturePkg/LogoFeaturePkg.dec | 31 > > .../LogoFeaturePkg/LogoFeaturePkg.dsc | 37 + > > .../UserInterface/LogoFeaturePkg/Readme.md| 129 +++ > > 17 files changed, 620 insertions(+), 4 deletions(-) > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/Include/PreMemory.fdf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.bmp > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc > > create mode 100644 > Features/Intel/UserInterface/LogoFeaturePkg/Readme.md > > > > diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > > b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > > index 23e7c647..ea879680 100644 > > --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > > +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > > @@ -7,7 +7,7 @@ > > # 1. Present a consolidated and simplified view of all available advanced > features to board packages. > > > > # 2. Provide a simple, single package build for all available advanced > features. > > > > # > > > > -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. > > > > +# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved. > > > > # > > > > # SPDX-License-Identifier: BSD-2-Clause-Patent > >
[edk2-devel] [PATCH] Features/Intel: Add LogoFeaturePkg to provide logo images and drivers
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2584 1. LogoDxe.inf includes a BMP logo in the EFI file, the driver decodes the BMP file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. 2. JpegLogoDxe.inf includes a JPEG logo in the EFI file, the driver use EFI_HII_IMAGE_DECODER_PROTOCOL to decode the Jpeg file and provide the image via EDKII_PLATFORM_LOGO_PROTOCOL. Change-Id: Ie7b91d34c31b09a86f02634d3a1aa4d39637bb54 Signed-off-by: Heng Luo --- .../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 4 +- .../Include/AdvancedFeatures.dsc | 6 +- .../AdvancedFeaturePkg/Include/PostMemory.fdf | 6 +- .../AdvancedFeaturePkg/Include/PreMemory.fdf | 6 +- .../LogoFeaturePkg/Include/LogoFeature.dsc| 107 .../LogoFeaturePkg/Include/PostMemory.fdf | 13 ++ .../LogoFeaturePkg/Include/PreMemory.fdf | 8 + .../LogoFeaturePkg/LogoDxe/JpegLogo.idf | 10 ++ .../LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf| 52 ++ .../LogoFeaturePkg/LogoDxe/Logo.bmp | Bin 0 -> 183366 bytes .../LogoFeaturePkg/LogoDxe/Logo.c | 153 ++ .../LogoFeaturePkg/LogoDxe/Logo.idf | 10 ++ .../LogoFeaturePkg/LogoDxe/Logo.jpg | Bin 0 -> 11944 bytes .../LogoFeaturePkg/LogoDxe/LogoDxe.inf| 52 ++ .../LogoFeaturePkg/LogoFeaturePkg.dec | 31 .../LogoFeaturePkg/LogoFeaturePkg.dsc | 37 + .../UserInterface/LogoFeaturePkg/Readme.md| 129 +++ 17 files changed, 620 insertions(+), 4 deletions(-) create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/Include/PostMemory.fdf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/Include/PreMemory.fdf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogo.idf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.bmp create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.c create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.idf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/Logo.jpg create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoDxe/LogoDxe.inf create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc create mode 100644 Features/Intel/UserInterface/LogoFeaturePkg/Readme.md diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 23e7c647..ea879680 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -7,7 +7,7 @@ # 1. Present a consolidated and simplified view of all available advanced features to board packages. # 2. Provide a simple, single package build for all available advanced features. # -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2017 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -46,6 +46,8 @@ gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable |TRUE gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable|TRUE gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable|TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable |TRUE + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE # # This package builds all advanced features. diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 649774ed..c1bd7915 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -4,7 +4,7 @@ # This file is intended to be included into another package so advanced features # can be conditionally built by enabling the respective feature via its FeaturePCD. # -# Copyright (c) 2019, Intel Corporation. All rights reserved. +# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -54,3 +54,7 @@ !if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable == TRUE !include UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc !endif + +!if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE + !include UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc +!endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf index 57b29a42..56f61436 100644 --- a/Features
[edk2-devel] [PATCH] MdeModulePkg: Perform test only if not ignore memory test
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2463
Perform Data and Address line test only if not ignore memory test.
Signed-off-by: Heng Luo
---
.../MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
index ce9e5e659b..fe24e490d4 100644
--- a/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
+++ b/MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/LightMemoryTest.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -677,10 +677,12 @@ GenMemoryTestFinished (
Private = GENERIC_MEMORY_TEST_PRIVATE_FROM_THIS (This);
//
- // Perform Data and Address line test
+ // Perform Data and Address line test only if not ignore memory test
//
- Status = PerformAddressDataLineTest (Private);
- ASSERT_EFI_ERROR (Status);
+ if (Private->CoverLevel != IGNORE) {
+Status = PerformAddressDataLineTest (Private);
+ASSERT_EFI_ERROR (Status);
+ }
//
// Add the non tested memory range to system memory map through GCD service
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#53222): https://edk2.groups.io/g/devel/message/53222
Mute This Topic: https://groups.io/mt/69692450/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
