* [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:46 ` Sun, Zailiang
2019-07-12 2:59 ` [edk2-devel] " rebecca
2019-07-10 19:04 ` [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Michael D Kinney
` (28 subsequent siblings)
29 siblings, 2 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index 4a11a1cba9..7063b7470d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -19,6 +19,8 @@ function Usage ( ) {
exit 0
}
+set -e
+
## Assign initial values
exitCode=0
Build_Flags=
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error
2019-07-10 19:04 ` [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Michael D Kinney
@ 2019-07-11 4:46 ` Sun, Zailiang
2019-07-12 2:59 ` [edk2-devel] " rebecca
1 sibling, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:46 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add
> "set -e" to exit on error
>
> From: Gary Lin <glin@suse.com>
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 4a11a1cba9..7063b7470d 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -19,6 +19,8 @@ function Usage ( ) {
> exit 0
> }
>
> +set -e
> +
> ## Assign initial values
> exitCode=0
> Build_Flags=
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error
2019-07-10 19:04 ` [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Michael D Kinney
2019-07-11 4:46 ` Sun, Zailiang
@ 2019-07-12 2:59 ` rebecca
1 sibling, 0 replies; 69+ messages in thread
From: rebecca @ 2019-07-12 2:59 UTC (permalink / raw)
To: devel, michael.d.kinney; +Cc: Gary Lin, Zailiang Sun, Yi Qian
On 2019-07-10 13:04, Michael D Kinney wrote:
> +set -e
> +
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
--
Rebecca Cran
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
2019-07-10 19:04 ` [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-12 3:03 ` [edk2-devel] " rebecca
2019-07-10 19:04 ` [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name Michael D Kinney
` (27 subsequent siblings)
29 siblings, 2 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Also make Build_IFWI.sh executable
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
old mode 100644
new mode 100755
index 7063b7470d..2a22309f5f
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -86,12 +86,12 @@ else
fi
## Go to root directory
-cd ..
+cd ../../..
## Build BIOS
echo "======================================================================"
echo "Build_IFWI: Calling BIOS build Script..."
-./$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
+./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
echo
echo Finished Building BIOS.
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
2019-07-10 19:04 ` [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Michael D Kinney
@ 2019-07-11 4:47 ` Sun, Zailiang
2019-07-12 3:03 ` [edk2-devel] " rebecca
1 sibling, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:47 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh:
> Change the root directory path
>
> From: Gary Lin <glin@suse.com>
>
> Also make Build_IFWI.sh executable
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755
> Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> old mode 100644
> new mode 100755
> index 7063b7470d..2a22309f5f
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -86,12 +86,12 @@ else
> fi
>
> ## Go to root directory
> -cd ..
> +cd ../../..
>
> ## Build BIOS
> echo
> "==========================================================
> ============"
> echo "Build_IFWI: Calling BIOS build Script..."
> -./$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type
> $Build_Target
> +./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags
> +$Platform_Type $Build_Target
>
> echo
> echo Finished Building BIOS.
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
2019-07-10 19:04 ` [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
@ 2019-07-12 3:03 ` rebecca
2019-07-12 16:23 ` Michael D Kinney
1 sibling, 1 reply; 69+ messages in thread
From: rebecca @ 2019-07-12 3:03 UTC (permalink / raw)
To: devel, michael.d.kinney
On 2019-07-10 13:04, Michael D Kinney wrote:
> echo "Build_IFWI: Calling BIOS build Script..."
> -./$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
> +./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
It looks like these changes are for getting ready to move the code into
master.
I've just started working on porting the BroxtonPlatformPkg over to
master too, and just wanted to check if you know if anyone's already
working on it? If so, I'll stop my work to avoid the duplication of effort.
--
Rebecca Cran
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
2019-07-12 3:03 ` [edk2-devel] " rebecca
@ 2019-07-12 16:23 ` Michael D Kinney
2019-07-12 16:32 ` rebecca
0 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-12 16:23 UTC (permalink / raw)
To: Rebecca Cran, devel@edk2.groups.io, Kinney, Michael D
Hi Rebecca,
Vlv2 is already in edk2-platforms/master. This patch series is fixing some
Linux/GCC build issues.
I have a few more queued up after this to make it even better by
removing the use of the FCE tool in the build script.
Mike
> -----Original Message-----
> From: Rebecca Cran [mailto:rebecca@bsdio.com]
> Sent: Thursday, July 11, 2019 8:03 PM
> To: devel@edk2.groups.io; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: Re: [edk2-devel] [edk2-platforms Patch 02/28]
> Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root
> directory path
>
> On 2019-07-10 13:04, Michael D Kinney wrote:
> > echo "Build_IFWI: Calling BIOS build Script..."
> > -./$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags
> $Platform_Type
> > $Build_Target
> > +./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh
> $Build_Flags
> > +$Platform_Type $Build_Target
>
>
> It looks like these changes are for getting ready to move
> the code into master.
>
> I've just started working on porting the
> BroxtonPlatformPkg over to master too, and just wanted to
> check if you know if anyone's already working on it? If
> so, I'll stop my work to avoid the duplication of effort.
>
>
> --
> Rebecca Cran
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
2019-07-12 16:23 ` Michael D Kinney
@ 2019-07-12 16:32 ` rebecca
0 siblings, 0 replies; 69+ messages in thread
From: rebecca @ 2019-07-12 16:32 UTC (permalink / raw)
To: devel, michael.d.kinney
On 2019-07-12 10:23, Michael D Kinney wrote:
> Hi Rebecca,
>
> Vlv2 is already in edk2-platforms/master. This patch series is fixing some
> Linux/GCC build issues.
>
> I have a few more queued up after this to make it even better by
> removing the use of the FCE tool in the build script.
Oh, thanks!
--
Rebecca Cran
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
2019-07-10 19:04 ` [edk2-platforms Patch 01/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error Michael D Kinney
2019-07-10 19:04 ` [edk2-platforms Patch 02/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection Michael D Kinney
` (26 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
old mode 100644
new mode 100755
index 1eefa5de73..bca112db2b
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -89,7 +89,7 @@ for (( i=1; i<=$#; ))
Build_Flags="$Build_Flags --quiet"
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
- Build_Flags="$Build_Flags -j EKD2.log"
+ Build_Flags="$Build_Flags -j EDK2.log"
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
echo Removing previous build files ...
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name
2019-07-10 19:04 ` [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name Michael D Kinney
@ 2019-07-11 4:47 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:47 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the
> log name
>
> From: Gary Lin <glin@suse.com>
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> old mode 100644
> new mode 100755
> index 1eefa5de73..bca112db2b
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -89,7 +89,7 @@ for (( i=1; i<=$#; ))
> Build_Flags="$Build_Flags --quiet"
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> - Build_Flags="$Build_Flags -j EKD2.log"
> + Build_Flags="$Build_Flags -j EDK2.log"
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
> echo Removing previous build files ...
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (2 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 03/28] Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely Michael D Kinney
` (25 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Borrow the logic from OvmfPkg/build.sh
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index bca112db2b..d312063428 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -170,12 +170,19 @@ sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt
gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
case $gcc_version in
- 4.9.*|4.1[0-9].*|5.*.*|6.*.*)
- TARGET_TOOLS=GCC49
- ;;
- *)
- TARGET_TOOLS=GCC48
- ;;
+ [1-3].*|4.[0-7].*)
+ echo MNW2 requires GCC4.8 or later
+ exit 1
+ ;;
+ 4.8.*)
+ TARGET_TOOLS=GCC48
+ ;;
+ 4.9.*|6.[0-2].*)
+ TARGET_TOOLS=GCC49
+ ;;
+ *)
+ TARGET_TOOLS=GCC5
+ ;;
esac
ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection
2019-07-10 19:04 ` [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection Michael D Kinney
@ 2019-07-11 4:47 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:47 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update
> the gcc version detection
>
> From: Gary Lin <glin@suse.com>
>
> Borrow the logic from OvmfPkg/build.sh
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index bca112db2b..d312063428 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -170,12 +170,19 @@ sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d'
> Conf/target.txt
>
> gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in
> - 4.9.*|4.1[0-9].*|5.*.*|6.*.*)
> - TARGET_TOOLS=GCC49
> - ;;
> - *)
> - TARGET_TOOLS=GCC48
> - ;;
> + [1-3].*|4.[0-7].*)
> + echo MNW2 requires GCC4.8 or later
> + exit 1
> + ;;
> + 4.8.*)
> + TARGET_TOOLS=GCC48
> + ;;
> + 4.9.*|6.[0-2].*)
> + TARGET_TOOLS=GCC49
> + ;;
> + *)
> + TARGET_TOOLS=GCC5
> + ;;
> esac
>
> ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (3 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 04/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:47 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Michael D Kinney
` (24 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index d312063428..27772f47de 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -67,9 +67,6 @@ PLATFORM_PACKAGE=Vlv2TbltDevicePkg
config_file=$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc
auto_config_inc=$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.txt
-## default ECP (override with /ECP flag)
-EDK_SOURCE=$WORKSPACE/EdkCompatibilityPkg
-
## create new AutoPlatformCFG.txt file
if [ -f "$auto_config_inc" ]; then
rm $auto_config_inc
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely
2019-07-10 19:04 ` [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely Michael D Kinney
@ 2019-07-11 4:47 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:47 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh:
> Remove ECP completely
>
> From: Gary Lin <glin@suse.com>
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index d312063428..27772f47de 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -67,9 +67,6 @@ PLATFORM_PACKAGE=Vlv2TbltDevicePkg
> config_file=$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc
>
> auto_config_inc=$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.tx
> t
>
> -## default ECP (override with /ECP flag) -
> EDK_SOURCE=$WORKSPACE/EdkCompatibilityPkg
> -
> ## create new AutoPlatformCFG.txt file
> if [ -f "$auto_config_inc" ]; then
> rm $auto_config_inc
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (4 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 05/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files Michael D Kinney
` (23 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
* Add "set -e" to exit immediately on error
* Update the paths to fit the directory changes
WORKSPACE
+------edk2 (CORE)
|
+------edk2-platforms
| |
| +---Platform
| | |
| | +---Intel
| | |
| | +---Vlv2TbltDevicePkg (PLATFORM)
| |
| +---Silicon
| |
| +---Intel
| |
| +---Vlv2DeviceRefCodePkg (SILICON)
|
+------edk2-non-osi
|
+---Silicon
|
+---Intel
|
+---Vlv2SocBinPkg (BINARY)
* Sync a part of bld_vlv.sh from the devel-MinnowBoardMax-UDK2017 branch
to enable capsule building
* Export TARGET and TOOL_CHAIN_TAG so that the GenerateCapsule scripts
can use those variables
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 57 ++++++++++++---------
1 file changed, 33 insertions(+), 24 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 27772f47de..0aa1edfb22 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -7,7 +7,7 @@ function Usage() {
echo "***************************************************************************"
echo "Build BIOS rom for VLV platforms."
echo
- echo "Usage: bld_vlv.bat PlatformType [Build Target]"
+ echo "Usage: bld_vlv.sh PlatformType [Build Target]"
echo
echo
echo " Platform Types: MNW2"
@@ -19,44 +19,52 @@ function Usage() {
exit 0
}
+set -e
+cd ..
echo -e $(date)
##**********************************************************************
## Initial Setup
##**********************************************************************
-#WORKSPACE=$(pwd)
+export WORKSPACE=$(pwd)
#build_threads=($NUMBER_OF_PROCESSORS)+1
Build_Flags=
exitCode=0
Arch=X64
SpiLock=0
+export CORE_PATH=$WORKSPACE/edk2
+export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
+export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
+export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
+export PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH
+cd ./edk2
+
## Clean up previous build files.
-if [ -e $(pwd)/EDK2.log ]; then
- rm $(pwd)/EDK2.log
+if [ -e $CORE_PATH/EDK2.log ]; then
+ rm $CORE_PATH/EDK2.log
fi
-if [ -e $(pwd)/Unitool.log ]; then
- rm $(pwd)/Unitool.log
+if [ -e $CORE_PATH/Unitool.log ]; then
+ rm $CORE_PATH/Unitool.log
fi
-if [ -e $(pwd)/Conf/target.txt ]; then
- rm $(pwd)/Conf/target.txt
+if [ -e $CORE_PATH/Conf/target.txt ]; then
+ rm $CORE_PATH/Conf/target.txt
fi
-if [ -e $(pwd)/Conf/BiosId.env ]; then
- rm $(pwd)/Conf/BiosId.env
+if [ -e $CORE_PATH/Conf/BiosId.env ]; then
+ rm $CORE_PATH/Conf/BiosId.env
fi
-if [ -e $(pwd)/Conf/tools_def.txt ]; then
- rm $(pwd)/Conf/tools_def.txt
+if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
+ rm $CORE_PATH/Conf/tools_def.txt
fi
-if [ -e $(pwd)/Conf/build_rule.txt ]; then
- rm $(pwd)/Conf/build_rule.txt
+if [ -e $CORE_PATH/Conf/build_rule.txt ]; then
+ rm $CORE_PATH/Conf/build_rule.txt
fi
-
## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
. edksetup.sh BaseTools
@@ -64,8 +72,9 @@ make -C BaseTools
## Define platform specific environment variables.
PLATFORM_PACKAGE=Vlv2TbltDevicePkg
-config_file=$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc
-auto_config_inc=$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.txt
+PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
+config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
+auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
## create new AutoPlatformCFG.txt file
if [ -f "$auto_config_inc" ]; then
@@ -112,10 +121,10 @@ fi
## Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf
if [ $Arch == "IA32" ]; then
- cp $PLATFORM_PACKAGE/BiosIdR.env Conf/BiosId.env
+ cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
else
- cp $PLATFORM_PACKAGE/BiosIdx64R.env Conf/BiosId.env
+ cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
fi
sed -i '/^BOARD_ID/d' Conf/BiosId.env
@@ -142,11 +151,11 @@ fi
Platform_Type=$1
if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
- TARGET=RELEASE
+ export TARGET=RELEASE
BUILD_TYPE=R
echo BUILD_TYPE = R >> Conf/BiosId.env
else
- TARGET=DEBUG
+ export TARGET=DEBUG
BUILD_TYPE=D
echo BUILD_TYPE = D >> Conf/BiosId.env
fi
@@ -157,7 +166,7 @@ fi
##**********************************************************************
echo "Ensuring correct build directory is present for GenBiosId..."
-echo Modifing Conf files for this build...
+echo Modifying Conf files for this build...
## Remove lines with these tags from target.txt
sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt
sed -i '/^TARGET /d' Conf/target.txt
@@ -182,8 +191,8 @@ case $gcc_version in
;;
esac
-ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc
-TOOL_CHAIN_TAG=$TARGET_TOOLS
+ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
+export TOOL_CHAIN_TAG=$TARGET_TOOLS
MAX_CONCURRENT_THREAD_NUMBER=1
echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> Conf/target.txt
echo TARGET = $TARGET >> Conf/target.txt
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms
2019-07-10 19:04 ` [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Michael D Kinney
@ 2019-07-11 4:48 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:48 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update
> the script to fit edk2-platforms
>
> From: Gary Lin <glin@suse.com>
>
> * Add "set -e" to exit immediately on error
>
> * Update the paths to fit the directory changes
>
> WORKSPACE
> +------edk2 (CORE)
> |
> +------edk2-platforms
> | |
> | +---Platform
> | | |
> | | +---Intel
> | | |
> | | +---Vlv2TbltDevicePkg (PLATFORM)
> | |
> | +---Silicon
> | |
> | +---Intel
> | |
> | +---Vlv2DeviceRefCodePkg (SILICON)
> |
> +------edk2-non-osi
> |
> +---Silicon
> |
> +---Intel
> |
> +---Vlv2SocBinPkg (BINARY)
>
> * Sync a part of bld_vlv.sh from the devel-MinnowBoardMax-UDK2017
> branch
> to enable capsule building
>
> * Export TARGET and TOOL_CHAIN_TAG so that the GenerateCapsule scripts
> can use those variables
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 57 ++++++++++++---------
> 1 file changed, 33 insertions(+), 24 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 27772f47de..0aa1edfb22 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -7,7 +7,7 @@ function Usage() {
> echo
> "**********************************************************
> *****************"
> echo "Build BIOS rom for VLV platforms."
> echo
> - echo "Usage: bld_vlv.bat PlatformType [Build Target]"
> + echo "Usage: bld_vlv.sh PlatformType [Build Target]"
> echo
> echo
> echo " Platform Types: MNW2"
> @@ -19,44 +19,52 @@ function Usage() {
> exit 0
> }
>
> +set -e
>
> +cd ..
> echo -e $(date)
>
> ##********************************************************
> **************
> ## Initial Setup
>
> ##********************************************************
> **************
> -#WORKSPACE=$(pwd)
> +export WORKSPACE=$(pwd)
> #build_threads=($NUMBER_OF_PROCESSORS)+1
> Build_Flags=
> exitCode=0
> Arch=X64
> SpiLock=0
>
> +export CORE_PATH=$WORKSPACE/edk2
> +export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
> +export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
> +export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
> +export
> +PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CO
> RE_PATH
> +cd ./edk2
> +
> ## Clean up previous build files.
> -if [ -e $(pwd)/EDK2.log ]; then
> - rm $(pwd)/EDK2.log
> +if [ -e $CORE_PATH/EDK2.log ]; then
> + rm $CORE_PATH/EDK2.log
> fi
>
> -if [ -e $(pwd)/Unitool.log ]; then
> - rm $(pwd)/Unitool.log
> +if [ -e $CORE_PATH/Unitool.log ]; then
> + rm $CORE_PATH/Unitool.log
> fi
>
> -if [ -e $(pwd)/Conf/target.txt ]; then
> - rm $(pwd)/Conf/target.txt
> +if [ -e $CORE_PATH/Conf/target.txt ]; then
> + rm $CORE_PATH/Conf/target.txt
> fi
>
> -if [ -e $(pwd)/Conf/BiosId.env ]; then
> - rm $(pwd)/Conf/BiosId.env
> +if [ -e $CORE_PATH/Conf/BiosId.env ]; then
> + rm $CORE_PATH/Conf/BiosId.env
> fi
>
> -if [ -e $(pwd)/Conf/tools_def.txt ]; then
> - rm $(pwd)/Conf/tools_def.txt
> +if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
> + rm $CORE_PATH/Conf/tools_def.txt
> fi
>
> -if [ -e $(pwd)/Conf/build_rule.txt ]; then
> - rm $(pwd)/Conf/build_rule.txt
> +if [ -e $CORE_PATH/Conf/build_rule.txt ]; then
> + rm $CORE_PATH/Conf/build_rule.txt
> fi
>
> -
> ## Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as
> soon as possible to avoid it from changing environment variables we're
> overriding . edksetup.sh BaseTools @@ -64,8 +72,9 @@ make -C BaseTools
>
> ## Define platform specific environment variables.
> PLATFORM_PACKAGE=Vlv2TbltDevicePkg
> -config_file=$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc
> -
> auto_config_inc=$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.tx
> t
> +PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
> +config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> +auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
>
> ## create new AutoPlatformCFG.txt file
> if [ -f "$auto_config_inc" ]; then
> @@ -112,10 +121,10 @@ fi
>
> ## Remove the values for Platform_Type and Build_Target from BiosIdX.env
> and stage in Conf if [ $Arch == "IA32" ]; then
> - cp $PLATFORM_PACKAGE/BiosIdR.env Conf/BiosId.env
> + cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
> echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
> else
> - cp $PLATFORM_PACKAGE/BiosIdx64R.env Conf/BiosId.env
> + cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
> echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
> fi
> sed -i '/^BOARD_ID/d' Conf/BiosId.env
> @@ -142,11 +151,11 @@ fi
> Platform_Type=$1
>
> if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
> - TARGET=RELEASE
> + export TARGET=RELEASE
> BUILD_TYPE=R
> echo BUILD_TYPE = R >> Conf/BiosId.env else
> - TARGET=DEBUG
> + export TARGET=DEBUG
> BUILD_TYPE=D
> echo BUILD_TYPE = D >> Conf/BiosId.env fi @@ -157,7 +166,7 @@ fi
>
> ##********************************************************
> **************
> echo "Ensuring correct build directory is present for GenBiosId..."
>
> -echo Modifing Conf files for this build...
> +echo Modifying Conf files for this build...
> ## Remove lines with these tags from target.txt sed -i
> '/^ACTIVE_PLATFORM/d' Conf/target.txt sed -i '/^TARGET /d'
> Conf/target.txt @@ -182,8 +191,8 @@ case $gcc_version in
> ;;
> esac
>
> -ACTIVE_PLATFORM=$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc
> -TOOL_CHAIN_TAG=$TARGET_TOOLS
> +ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
> +export TOOL_CHAIN_TAG=$TARGET_TOOLS
> MAX_CONCURRENT_THREAD_NUMBER=1
> echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >>
> Conf/target.txt
> echo TARGET = $TARGET >> Conf/target.txt
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (5 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Michael D Kinney
` (22 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Some headers files are not listed in the inf files.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 2 +-
.../Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf | 8 +++++---
.../Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
index 4ef48cc12b..4f5678594a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
@@ -26,7 +26,7 @@ [Defines]
[Sources]
FlashDeviceLib.c
-
+ SpiChipDefinitions.h
[Packages]
MdePkg/MdePkg.dec
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
index 9d4823d488..d2ca8f5b88 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
@@ -4,10 +4,12 @@
# ICH SMM Library that layers on top of the I/O Library to directly
# access SMM power management registers.
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
-#
+#
+
# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
+#
+
#
#
#
@@ -30,7 +32,7 @@ [Defines]
[Sources]
PchSmmLib.c
-
+ CommonHeader.h
[Packages]
MdePkg/MdePkg.dec
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
index d429310ac4..c5e3cf4d55 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
@@ -29,6 +29,7 @@ [sources.common]
PlatformStatusCode.c
PlatformStatusCode.h
PeiPostCode.c
+ EfiStatusCode.h
[Packages]
MdePkg/MdePkg.dec
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files
2019-07-10 19:04 ` [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files Michael D Kinney
@ 2019-07-11 4:48 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:48 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing
> headers to inf files
>
> From: Gary Lin <glin@suse.com>
>
> Some headers files are not listed in the inf files.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> .../Library/FlashDeviceLib/FlashDeviceLib.inf | 2 +-
> .../Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf | 8 +++++---
> .../Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf | 1 +
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.in
> f
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.i
> nf
> index 4ef48cc12b..4f5678594a 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.in
> f
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDevic
> +++ eLib.inf
> @@ -26,7 +26,7 @@ [Defines]
>
> [Sources]
> FlashDeviceLib.c
> -
> + SpiChipDefinitions.h
>
> [Packages]
> MdePkg/MdePkg.dec
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
> index 9d4823d488..d2ca8f5b88 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
> @@ -4,10 +4,12 @@
> # ICH SMM Library that layers on top of the I/O Library to directly # access
> SMM power management registers.
> # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
> -#
>
> +#
> +
> # SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -#
>
> +#
> +
> #
> #
> #
> @@ -30,7 +32,7 @@ [Defines]
>
> [Sources]
> PchSmmLib.c
> -
> + CommonHeader.h
>
> [Packages]
> MdePkg/MdePkg.dec
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> index d429310ac4..c5e3cf4d55 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> @@ -29,6 +29,7 @@ [sources.common]
> PlatformStatusCode.c
> PlatformStatusCode.h
> PeiPostCode.c
> + EfiStatusCode.h
>
> [Packages]
> MdePkg/MdePkg.dec
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (6 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 07/28] Vlv2TbltDevicePkg: Add the missing headers to inf files Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc Michael D Kinney
` (21 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 25 +++------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 0aa1edfb22..bceea99b2d 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then
rm $CORE_PATH/Conf/target.txt
fi
-if [ -e $CORE_PATH/Conf/BiosId.env ]; then
- rm $CORE_PATH/Conf/BiosId.env
-fi
-
if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
rm $CORE_PATH/Conf/tools_def.txt
fi
@@ -119,18 +115,11 @@ if [ "$2" == "" ]; then
Usage
fi
-## Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf
if [ $Arch == "IA32" ]; then
- cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
- echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
+ echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
else
- cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
- echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
+ echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
fi
-sed -i '/^BOARD_ID/d' Conf/BiosId.env
-sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
-
-
## -- Build flags settings for each Platform --
## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
@@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
echo "Setting $1 platform configuration and BIOS ID..."
if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
- echo BOARD_ID = MNW2MAX >> Conf/BiosId.env
- echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
+ echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
else
echo "Error - Unsupported PlatformType: $1"
Usage
fi
-Platform_Type=$1
-
if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
export TARGET=RELEASE
- BUILD_TYPE=R
- echo BUILD_TYPE = R >> Conf/BiosId.env
else
export TARGET=DEBUG
- BUILD_TYPE=D
- echo BUILD_TYPE = D >> Conf/BiosId.env
fi
-
##**********************************************************************
## Additional EDK Build Setup/Configuration
##**********************************************************************
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely
2019-07-10 19:04 ` [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Michael D Kinney
@ 2019-07-11 4:48 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:48 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh:
> Remove BiosId.env completely
>
> From: Gary Lin <glin@suse.com>
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 25 +++------------------
> 1 file changed, 3 insertions(+), 22 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 0aa1edfb22..bceea99b2d 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then
> rm $CORE_PATH/Conf/target.txt
> fi
>
> -if [ -e $CORE_PATH/Conf/BiosId.env ]; then
> - rm $CORE_PATH/Conf/BiosId.env
> -fi
> -
> if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
> rm $CORE_PATH/Conf/tools_def.txt
> fi
> @@ -119,18 +115,11 @@ if [ "$2" == "" ]; then
> Usage
> fi
>
> -## Remove the values for Platform_Type and Build_Target from BiosIdX.env
> and stage in Conf if [ $Arch == "IA32" ]; then
> - cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env
> - echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
> + echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
> else
> - cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env
> - echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
> + echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
> fi
> -sed -i '/^BOARD_ID/d' Conf/BiosId.env
> -sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
> -
> -
>
> ## -- Build flags settings for each Platform --
> ## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD =
> FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD =
> FALSE
> @@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env
> ## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE,
> TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> echo "Setting $1 platform configuration and BIOS ID..."
> if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
> - echo BOARD_ID = MNW2MAX >> Conf/BiosId.env
> - echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
> + echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
> else
> echo "Error - Unsupported PlatformType: $1"
> Usage
> fi
>
> -Platform_Type=$1
> -
> if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
> export TARGET=RELEASE
> - BUILD_TYPE=R
> - echo BUILD_TYPE = R >> Conf/BiosId.env else
> export TARGET=DEBUG
> - BUILD_TYPE=D
> - echo BUILD_TYPE = D >> Conf/BiosId.env fi
>
> -
>
> ##********************************************************
> **************
> ## Additional EDK Build Setup/Configuration
>
> ##********************************************************
> **************
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (7 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:48 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM Michael D Kinney
` (20 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
For the gcc build, we should use PlatformCapsuleGcc.dsc instead of
PlatformCapsule.dsc.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index bceea99b2d..7fd5f44264 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -199,7 +199,7 @@ echo Skip "Running fce..."
##**********************************************************************
## Build Capsules
##**********************************************************************
-build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
echo
echo -------------------- The EDKII BIOS build has successfully completed. --------------------
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc
2019-07-10 19:04 ` [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc Michael D Kinney
@ 2019-07-11 4:48 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:48 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct
> the path to PlatformCapsuleGcc.dsc
>
> From: Gary Lin <glin@suse.com>
>
> For the gcc build, we should use PlatformCapsuleGcc.dsc instead of
> PlatformCapsule.dsc.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index bceea99b2d..7fd5f44264 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -199,7 +199,7 @@ echo Skip "Running fce..."
>
> ##********************************************************
> **************
> ## Build Capsules
>
> ##********************************************************
> **************
> -build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
>
> echo
> echo -------------------- The EDKII BIOS build has successfully completed. ------
> --------------
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (8 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 09/28] Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to PlatformCapsuleGcc.dsc Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-11 4:52 ` Sun, Zailiang
2019-07-10 19:04 ` [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Michael D Kinney
` (19 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 7fd5f44264..c68e59398a 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -199,6 +199,8 @@ echo Skip "Running fce..."
##**********************************************************************
## Build Capsules
##**********************************************************************
+cp -f $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/VLV.fd \
+ $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
echo
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
2019-07-10 19:04 ` [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM Michael D Kinney
@ 2019-07-11 4:52 ` Sun, Zailiang
2019-07-11 6:08 ` [edk2-devel] " Gary Lin
0 siblings, 1 reply; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:52 UTC (permalink / raw)
To: Gary Lin, devel@edk2.groups.io; +Cc: Kinney, Michael D, Qian, Yi
Gary,
I suggest remove the first line "From: Gary Lin <glin@suse.com>" from the description section since you have appended the "signed-off-by" declaration.
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create
> Vlv.ROM
>
> From: Gary Lin <glin@suse.com>
>
> The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 7fd5f44264..c68e59398a 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -199,6 +199,8 @@ echo Skip "Running fce..."
>
> ##********************************************************
> **************
> ## Build Capsules
>
> ##********************************************************
> **************
> +cp -f
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> V/VLV.fd \
> +
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> V/Vlv.ROM
> build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
>
> echo
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
2019-07-11 4:52 ` Sun, Zailiang
@ 2019-07-11 6:08 ` Gary Lin
2019-07-12 23:42 ` Michael D Kinney
0 siblings, 1 reply; 69+ messages in thread
From: Gary Lin @ 2019-07-11 6:08 UTC (permalink / raw)
To: devel@edk2.groups.io, zailiang.sun@intel.com; +Cc: Michael D Kinney, Yi Qian
On Thu, Jul 11, 2019 at 04:52:10AM +0000, Sun, Zailiang wrote:
> Gary,
>
> I suggest remove the first line "From: Gary Lin <glin@suse.com>" from the description section since you have appended the "signed-off-by" declaration.
>
Hi Zailiang,
That is added by Mike. I'm totally fine if you remove it when pushing
the commits.
Thanks,
Gary Lin
> > -----Original Message-----
> > From: Kinney, Michael D
> > Sent: Thursday, July 11, 2019 3:05 AM
> > To: devel@edk2.groups.io
> > Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian,
> > Yi <yi.qian@intel.com>
> > Subject: [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create
> > Vlv.ROM
> >
> > From: Gary Lin <glin@suse.com>
> >
> > The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM.
> >
> > Cc: Zailiang Sun <zailiang.sun@intel.com>
> > Cc: Yi Qian <yi.qian@intel.com>
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Signed-off-by: Gary Lin <glin@suse.com>
> > ---
> > Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > index 7fd5f44264..c68e59398a 100755
> > --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > @@ -199,6 +199,8 @@ echo Skip "Running fce..."
> >
> > ##********************************************************
> > **************
> > ## Build Capsules
> >
> > ##********************************************************
> > **************
> > +cp -f
> > $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> > V/VLV.fd \
> > +
> > $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> > V/Vlv.ROM
> > build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> >
> > echo
> > --
> > 2.21.0.windows.1
>
>
>
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
2019-07-11 6:08 ` [edk2-devel] " Gary Lin
@ 2019-07-12 23:42 ` Michael D Kinney
2019-07-13 4:17 ` Sun, Zailiang
0 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-12 23:42 UTC (permalink / raw)
To: devel@edk2.groups.io, glin@suse.com, Sun, Zailiang,
Kinney, Michael D
Cc: Qian, Yi
Zailiang,
This appears to be the behavior of GIT when the Author of
a patch is not the same as the person who sends the patch
email. The "From:" line is shows the Author of the patch
and is used to fill in the Author field when the patch
email is applied to a git repo. So no edits to the commit
messages are required. It will be correct when I push.
It is correct in my local git repo/log.
Thanks,
Mike
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io]
> On Behalf Of Gary Lin
> Sent: Wednesday, July 10, 2019 11:09 PM
> To: devel@edk2.groups.io; Sun, Zailiang
> <zailiang.sun@intel.com>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: Re: [edk2-devel] [edk2-platforms Patch 10/28]
> Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
>
> On Thu, Jul 11, 2019 at 04:52:10AM +0000, Sun, Zailiang
> wrote:
> > Gary,
> >
> > I suggest remove the first line "From: Gary Lin
> <glin@suse.com>" from the description section since you
> have appended the "signed-off-by" declaration.
> >
> Hi Zailiang,
>
> That is added by Mike. I'm totally fine if you remove it
> when pushing the commits.
>
> Thanks,
>
> Gary Lin
>
> > > -----Original Message-----
> > > From: Kinney, Michael D
> > > Sent: Thursday, July 11, 2019 3:05 AM
> > > To: devel@edk2.groups.io
> > > Cc: Gary Lin <glin@suse.com>; Sun, Zailiang
> > > <zailiang.sun@intel.com>; Qian, Yi
> <yi.qian@intel.com>
> > > Subject: [edk2-platforms Patch 10/28]
> Vlv2TbltDevicePkg/bld_vlv.sh:
> > > Create Vlv.ROM
> > >
> > > From: Gary Lin <glin@suse.com>
> > >
> > > The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM.
> > >
> > > Cc: Zailiang Sun <zailiang.sun@intel.com>
> > > Cc: Yi Qian <yi.qian@intel.com>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Signed-off-by: Gary Lin <glin@suse.com>
> > > ---
> > > Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > index 7fd5f44264..c68e59398a 100755
> > > --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > @@ -199,6 +199,8 @@ echo Skip "Running fce..."
> > >
> > >
> ##*******************************************************
> *
> > > **************
> > > ## Build Capsules
> > >
> > >
> ##*******************************************************
> *
> > > **************
> > > +cp -f
> > >
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN
> _TAG}/F
> > > V/VLV.fd \
> > > +
> > >
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN
> _TAG}/F
> > > V/Vlv.ROM
> > > build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> > >
> > > echo
> > > --
> > > 2.21.0.windows.1
> >
> >
> >
> >
> >
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
2019-07-12 23:42 ` Michael D Kinney
@ 2019-07-13 4:17 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-13 4:17 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io, glin@suse.com; +Cc: Qian, Yi
Mike, That make sense for me. /Zailiang
-----Original Message-----
From: Kinney, Michael D
Sent: Saturday, July 13, 2019 7:42 AM
To: devel@edk2.groups.io; glin@suse.com; Sun, Zailiang <zailiang.sun@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: Qian, Yi <yi.qian@intel.com>
Subject: RE: [edk2-devel] [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
Zailiang,
This appears to be the behavior of GIT when the Author of
a patch is not the same as the person who sends the patch
email. The "From:" line is shows the Author of the patch
and is used to fill in the Author field when the patch
email is applied to a git repo. So no edits to the commit
messages are required. It will be correct when I push.
It is correct in my local git repo/log.
Thanks,
Mike
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io]
> On Behalf Of Gary Lin
> Sent: Wednesday, July 10, 2019 11:09 PM
> To: devel@edk2.groups.io; Sun, Zailiang
> <zailiang.sun@intel.com>
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Qian,
> Yi <yi.qian@intel.com>
> Subject: Re: [edk2-devel] [edk2-platforms Patch 10/28]
> Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
>
> On Thu, Jul 11, 2019 at 04:52:10AM +0000, Sun, Zailiang
> wrote:
> > Gary,
> >
> > I suggest remove the first line "From: Gary Lin
> <glin@suse.com>" from the description section since you
> have appended the "signed-off-by" declaration.
> >
> Hi Zailiang,
>
> That is added by Mike. I'm totally fine if you remove it
> when pushing the commits.
>
> Thanks,
>
> Gary Lin
>
> > > -----Original Message-----
> > > From: Kinney, Michael D
> > > Sent: Thursday, July 11, 2019 3:05 AM
> > > To: devel@edk2.groups.io
> > > Cc: Gary Lin <glin@suse.com>; Sun, Zailiang
> > > <zailiang.sun@intel.com>; Qian, Yi
> <yi.qian@intel.com>
> > > Subject: [edk2-platforms Patch 10/28]
> Vlv2TbltDevicePkg/bld_vlv.sh:
> > > Create Vlv.ROM
> > >
> > > From: Gary Lin <glin@suse.com>
> > >
> > > The scripts for PlatformCapsuleGcc.dsc need Vlv.ROM.
> > >
> > > Cc: Zailiang Sun <zailiang.sun@intel.com>
> > > Cc: Yi Qian <yi.qian@intel.com>
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Signed-off-by: Gary Lin <glin@suse.com>
> > > ---
> > > Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > index 7fd5f44264..c68e59398a 100755
> > > --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> > > @@ -199,6 +199,8 @@ echo Skip "Running fce..."
> > >
> > >
> ##*******************************************************
> *
> > > **************
> > > ## Build Capsules
> > >
> > >
> ##*******************************************************
> *
> > > **************
> > > +cp -f
> > >
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN
> _TAG}/F
> > > V/VLV.fd \
> > > +
> > >
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN
> _TAG}/F
> > > V/Vlv.ROM
> > > build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> > >
> > > echo
> > > --
> > > 2.21.0.windows.1
> >
> >
> >
> >
> >
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (9 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 10/28] Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM Michael D Kinney
@ 2019-07-10 19:04 ` Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable Michael D Kinney
` (18 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:04 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Adjust the paths to fit the current directory structure
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +++++++++++--------
.../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +++++-------
.../GenCapsuleMinnowMaxRelease.sh | 19 +++++-----
3 files changed, 39 insertions(+), 41 deletions(-)
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
old mode 100644
new mode 100755
index 040024553a..7b77b50c3f
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
@@ -9,20 +9,25 @@
cd $(dirname $0)
-rm -R $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleAppRelease.efi
+EFI_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/X64/
+CAP_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
+SCRIPT_DIR=$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule
-. GenCapsuleMinnowMax.sh
-. GenCapsuleMinnowMaxRelease.sh
-. GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6
-. GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
-. GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
+rm -rf $CAP_DIR
+mkdir -p $CAP_DIR/SampleDevelopment
+mkdir -p $CAP_DIR/NewCert
+mkdir -p $CAP_DIR/TestCert
+if [ "$TARGET" == "DEBUG" ]; then
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleApp.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMax.sh
+else
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh
+fi
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
index 4fb963c93c..114c4a3477 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,13 +52,8 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --signer-private-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestCert.pem \
- --other-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestSub.pub.pem \
- --trusted-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \
+ -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
-cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
-
-rm $FMP_CAPSULE_FILE
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
index 29d46dad1e..d2619786e8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,10 +52,10 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --signer-private-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestCert.pem \
- --other-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestSub.pub.pem \
- --trusted-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \
+ -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
2019-07-10 19:04 ` [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
From: Gary Lin <glin@suse.com>
Adjust the paths to fit the current directory structure
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +++++++++++--------
.../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +++++-------
.../GenCapsuleMinnowMaxRelease.sh | 19 +++++-----
3 files changed, 39 insertions(+), 41 deletions(-) mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
old mode 100644
new mode 100755
index 040024553a..7b77b50c3f
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G
+++ enCapsuleAll.sh
@@ -9,20 +9,25 @@
cd $(dirname $0)
-rm -R $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-mkdir $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/SampleDevelopment/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert/CapsuleAppRelease.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleApp.efi
-cp $WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/X64/CapsuleApp.efi $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert/CapsuleAppRelease.efi
+EFI_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/
+X64/ CAP_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules
+SCRIPT_DIR=$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/F
+eature/Capsule/GenerateCapsule
-. GenCapsuleMinnowMax.sh
-. GenCapsuleMinnowMaxRelease.sh
-. GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862EA1324BE6
-. GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
-. GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
+rm -rf $CAP_DIR
+mkdir -p $CAP_DIR/SampleDevelopment
+mkdir -p $CAP_DIR/NewCert
+mkdir -p $CAP_DIR/TestCert
+if [ "$TARGET" == "DEBUG" ]; then
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleApp.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleApp.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMax.sh
+else
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleAppRelease.efi
+ cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi
+ . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh
+fi
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue
+149DA854-7D19-4FAA-A91E-862EA1324BE6
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB8D968C18A
+. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075AD840F9D4
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
index 4fb963c93c..114c4a3477 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMax.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G
+++ enCapsuleMinnowMax.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CHA
+IN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,13 +52,8 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --signer-private-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestCert.pem \
- --other-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestSub.pub.pem \
- --trusted-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \ -o
+ $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
-cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
-
-rm $FMP_CAPSULE_FILE
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
index 29d46dad1e..d2619786e8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/G
+++ enCapsuleMinnowMaxRelease.sh
@@ -13,7 +13,10 @@ FMP_CAPSULE_VERSION=0x0000000C
FMP_CAPSULE_STRING=0.0.0.12
FMP_CAPSULE_NAME="Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING"
FMP_CAPSULE_LSV=0x00000000
-FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_GCC49/FV/Vlv.ROM
+FMP_CAPSULE_PAYLOAD=$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_C
+HAIN_TAG}/FV/Vlv.ROM
+FMP_CAPSULE_DIR=$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/
+
+PKCS7SIGN_DIR=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/
if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then
return
@@ -34,12 +37,8 @@ if [ -e NewCert.pem ]; then
--signer-private-cert=NewCert.pem \
--other-public-cert=NewSub.pub.pem \
--trusted-public-cert=NewRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
-
- cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCert
-
- rm $FMP_CAPSULE_FILE
fi
#
@@ -53,10 +52,10 @@ GenerateCapsule \
--lsv $FMP_CAPSULE_LSV \
--capflag PersistAcrossReset \
--capflag InitiateReset \
- --signer-private-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestCert.pem \
- --other-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestSub.pub.pem \
- --trusted-public-cert=$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestRoot.pub.pem \
- -o $FMP_CAPSULE_FILE \
+ --signer-private-cert=$PKCS7SIGN_DIR/TestCert.pem \
+ --other-public-cert=$PKCS7SIGN_DIR/TestSub.pub.pem \
+ --trusted-public-cert=$PKCS7SIGN_DIR/TestRoot.pub.pem \ -o
+ $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \
$FMP_CAPSULE_PAYLOAD
cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (10 preceding siblings ...)
2019-07-10 19:04 ` [edk2-platforms Patch 11/28] Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable Michael D Kinney
` (17 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
TableVersion in AcpiPlatformEntryPoint() is not used anymore.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 962baf561d..f3efc41e31 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -747,7 +747,6 @@ AcpiPlatformEntryPoint (
UINT32 FvStatus;
UINTN Size;
EFI_EVENT Event;
- EFI_ACPI_TABLE_VERSION TableVersion;
UINTN VarSize;
UINTN SysCfgSize;
EFI_HANDLE Handle;
@@ -759,7 +758,6 @@ AcpiPlatformEntryPoint (
mFirstNotify = FALSE;
- TableVersion = EFI_ACPI_TABLE_VERSION_2_0;
Instance = 0;
CurrentTable = NULL;
TableHandle = 0;
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable
2019-07-10 19:05 ` [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable
From: Gary Lin <glin@suse.com>
TableVersion in AcpiPlatformEntryPoint() is not used anymore.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 962baf561d..f3efc41e31 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -747,7 +747,6 @@ AcpiPlatformEntryPoint (
UINT32 FvStatus;
UINTN Size;
EFI_EVENT Event;
- EFI_ACPI_TABLE_VERSION TableVersion;
UINTN VarSize;
UINTN SysCfgSize;
EFI_HANDLE Handle;
@@ -759,7 +758,6 @@ AcpiPlatformEntryPoint (
mFirstNotify = FALSE;
- TableVersion = EFI_ACPI_TABLE_VERSION_2_0;
Instance = 0;
CurrentTable = NULL;
TableHandle = 0;
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (11 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 12/28] Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation Michael D Kinney
` (16 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
The firmware crashed when installing ACPI tables:
ASSERT_EFI_ERROR (Status = Invalid Parameter)
ASSERT [AcpiPlatform] edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c(1162): !EFI_ERROR (AcpiStatus)
The 'Size' from ReadSection() is not the size of the ACPI table so
InstallAcpiTable() returned EFI_INVALID_PARAMETER.
Use the 'Length' from the header to avoid the crash.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index f3efc41e31..72edc1bc1e 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1152,7 +1152,7 @@ AcpiPlatformEntryPoint (
AcpiStatus = AcpiTable->InstallAcpiTable (
AcpiTable,
CurrentTable,
- Size,
+ CurrentTable->Length,
&TableHandle
);
ASSERT_EFI_ERROR (AcpiStatus);
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable
2019-07-10 19:05 ` [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable
From: Gary Lin <glin@suse.com>
The firmware crashed when installing ACPI tables:
ASSERT_EFI_ERROR (Status = Invalid Parameter) ASSERT [AcpiPlatform] edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c(1162): !EFI_ERROR (AcpiStatus)
The 'Size' from ReadSection() is not the size of the ACPI table so
InstallAcpiTable() returned EFI_INVALID_PARAMETER.
Use the 'Length' from the header to avoid the crash.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index f3efc41e31..72edc1bc1e 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1152,7 +1152,7 @@ AcpiPlatformEntryPoint (
AcpiStatus = AcpiTable->InstallAcpiTable (
AcpiTable,
CurrentTable,
- Size,
+ CurrentTable->Length,
&TableHandle
);
ASSERT_EFI_ERROR (AcpiStatus);
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (12 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 13/28] Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers Michael D Kinney
` (15 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Fix the indentation of MiscSystemManufacturerFunction.c to improve the
readability.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../MiscSystemManufacturerFunction.c | 51 +++++++++----------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index f537e0db76..da660cb3a8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
@@ -52,14 +52,14 @@ AddSmbiosManuCallback (
UINTN PdNameStrLen;
UINTN SerialNumStrLen;
UINTN SkuNumberStrLen;
- UINTN FamilyNameStrLen;
+ UINTN FamilyNameStrLen;
EFI_STATUS Status;
EFI_STRING Manufacturer;
EFI_STRING ProductName;
EFI_STRING Version;
EFI_STRING SerialNumber;
EFI_STRING SkuNumber;
- EFI_STRING FamilyName;
+ EFI_STRING FamilyName;
STRING_REF TokenToGet;
EFI_SMBIOS_HANDLE SmbiosHandle;
SMBIOS_TABLE_TYPE1 *SmbiosRecord;
@@ -323,40 +323,37 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer)
{
EFI_STATUS Status;
static BOOLEAN CallbackIsInstalledManu = FALSE;
- VOID *AddSmbiosManuCallbackNotifyReg;
- EFI_EVENT AddSmbiosManuCallbackEvent;
+ VOID *AddSmbiosManuCallbackNotifyReg;
+ EFI_EVENT AddSmbiosManuCallbackEvent;
if (CallbackIsInstalledManu == FALSE) {
CallbackIsInstalledManu = TRUE; // Prevent more than 1 callback.
DEBUG ((EFI_D_INFO, "Create Smbios Manu callback.\n"));
- //
- // gEfiDxeSmmReadyToLockProtocolGuid is ready
- //
- Status = gBS->CreateEvent (
- EVT_NOTIFY_SIGNAL,
- TPL_CALLBACK,
- (EFI_EVENT_NOTIFY)AddSmbiosManuCallback,
- RecordData,
- &AddSmbiosManuCallbackEvent
- );
+ //
+ // gEfiDxeSmmReadyToLockProtocolGuid is ready
+ //
+ Status = gBS->CreateEvent (
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
+ (EFI_EVENT_NOTIFY)AddSmbiosManuCallback,
+ RecordData,
+ &AddSmbiosManuCallbackEvent
+ );
- ASSERT_EFI_ERROR (Status);
- if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ Status = gBS->RegisterProtocolNotify (
+ &gEfiDxeSmmReadyToLockProtocolGuid,
+ AddSmbiosManuCallbackEvent,
+ &AddSmbiosManuCallbackNotifyReg
+ );
return Status;
-
- }
-
- Status = gBS->RegisterProtocolNotify (
- &gEfiDxeSmmReadyToLockProtocolGuid,
- AddSmbiosManuCallbackEvent,
- &AddSmbiosManuCallbackNotifyReg
- );
-
- return Status;
}
return EFI_SUCCESS;
-
}
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation
2019-07-10 19:05 ` [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation
From: Gary Lin <glin@suse.com>
Fix the indentation of MiscSystemManufacturerFunction.c to improve the readability.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../MiscSystemManufacturerFunction.c | 51 +++++++++----------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index f537e0db76..da660cb3a8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
+++ rerFunction.c
@@ -52,14 +52,14 @@ AddSmbiosManuCallback (
UINTN PdNameStrLen;
UINTN SerialNumStrLen;
UINTN SkuNumberStrLen;
- UINTN FamilyNameStrLen;
+ UINTN FamilyNameStrLen;
EFI_STATUS Status;
EFI_STRING Manufacturer;
EFI_STRING ProductName;
EFI_STRING Version;
EFI_STRING SerialNumber;
EFI_STRING SkuNumber;
- EFI_STRING FamilyName;
+ EFI_STRING FamilyName;
STRING_REF TokenToGet;
EFI_SMBIOS_HANDLE SmbiosHandle;
SMBIOS_TABLE_TYPE1 *SmbiosRecord;
@@ -323,40 +323,37 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer)
{
EFI_STATUS Status;
static BOOLEAN CallbackIsInstalledManu = FALSE;
- VOID *AddSmbiosManuCallbackNotifyReg;
- EFI_EVENT AddSmbiosManuCallbackEvent;
+ VOID *AddSmbiosManuCallbackNotifyReg;
+ EFI_EVENT AddSmbiosManuCallbackEvent;
if (CallbackIsInstalledManu == FALSE) {
CallbackIsInstalledManu = TRUE; // Prevent more than 1 callback.
DEBUG ((EFI_D_INFO, "Create Smbios Manu callback.\n"));
- //
- // gEfiDxeSmmReadyToLockProtocolGuid is ready
- //
- Status = gBS->CreateEvent (
- EVT_NOTIFY_SIGNAL,
- TPL_CALLBACK,
- (EFI_EVENT_NOTIFY)AddSmbiosManuCallback,
- RecordData,
- &AddSmbiosManuCallbackEvent
- );
+ //
+ // gEfiDxeSmmReadyToLockProtocolGuid is ready
+ //
+ Status = gBS->CreateEvent (
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
+ (EFI_EVENT_NOTIFY)AddSmbiosManuCallback,
+ RecordData,
+ &AddSmbiosManuCallbackEvent
+ );
- ASSERT_EFI_ERROR (Status);
- if (EFI_ERROR (Status)) {
+ ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ Status = gBS->RegisterProtocolNotify (
+ &gEfiDxeSmmReadyToLockProtocolGuid,
+ AddSmbiosManuCallbackEvent,
+ &AddSmbiosManuCallbackNotifyReg
+ );
return Status;
-
- }
-
- Status = gBS->RegisterProtocolNotify (
- &gEfiDxeSmmReadyToLockProtocolGuid,
- AddSmbiosManuCallbackEvent,
- &AddSmbiosManuCallbackNotifyReg
- );
-
- return Status;
}
return EFI_SUCCESS;
-
}
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (13 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 14/28] Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:37 ` [edk2-devel] " Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Michael D Kinney
` (14 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Import the SD card/MMC drivers from MdeModulePkg
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 7 +++++++
5 files changed, 35 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 0661c778c1..c538fe4a06 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -529,6 +529,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
!endif
+#
+# eMMC/SD Card
+#
+INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 06bdebb10b..bd9d415939 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -478,6 +478,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
!endif
+#
+# eMMC/SD Card
+#
+INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index b558caa61f..6317bc1342 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1143,6 +1143,13 @@ [Components.X64]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 99ada0ef0a..8f69bb47dd 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1127,6 +1127,13 @@ [Components.IA32]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 87404d2d82..d146321750 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1142,6 +1142,13 @@ [Components.X64]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers
2019-07-10 19:05 ` [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Michael D Kinney
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-devel] [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers
From: Gary Lin <glin@suse.com>
Import the SD card/MMC drivers from MdeModulePkg
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 7 +++++++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 7 +++++++
5 files changed, 35 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 0661c778c1..c538fe4a06 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -529,6 +529,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
!endif
+#
+# eMMC/SD Card
+#
+INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 06bdebb10b..bd9d415939 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -478,6 +478,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
!endif
+#
+# eMMC/SD Card
+#
+INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index b558caa61f..6317bc1342 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1143,6 +1143,13 @@ [Components.X64]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 99ada0ef0a..8f69bb47dd 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1127,6 +1127,13 @@ [Components.IA32]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 87404d2d82..d146321750 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1142,6 +1142,13 @@ [Components.X64]
}
!endif
+#
+# eMMC/SD Card
+#
+ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+ MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
+ MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
+
#
# IDE/SCSI/AHCI
#
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (14 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 15/28] Vlv2TbltDevicePkg: Import SD/MMC drivers Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:55 ` [edk2-devel] " Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe Michael D Kinney
` (13 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
* Do not change WORKSPACE env var.
Assume it is set before running script.
* Access Conf dir relative to WORKSPACE
* Run Build_IFWI.sh from the Vlv2Tbl2DevicePkg dir
* run bld_vlv.sh from same dir as Build_IFWI.sh
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 5 +-
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 49 ++++++++++---------
2 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index 2a22309f5f..f8954cc9cd 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -85,13 +85,10 @@ else
IFWI_Suffix="/S $3"
fi
-## Go to root directory
-cd ../../..
-
## Build BIOS
echo "======================================================================"
echo "Build_IFWI: Calling BIOS build Script..."
-./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
+. bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
echo
echo Finished Building BIOS.
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index c68e59398a..aac8534677 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -26,7 +26,6 @@ echo -e $(date)
##**********************************************************************
## Initial Setup
##**********************************************************************
-export WORKSPACE=$(pwd)
#build_threads=($NUMBER_OF_PROCESSORS)+1
Build_Flags=
exitCode=0
@@ -38,31 +37,31 @@ export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
export PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH
-cd ./edk2
## Clean up previous build files.
-if [ -e $CORE_PATH/EDK2.log ]; then
- rm $CORE_PATH/EDK2.log
+if [ -e $WORKSPACE/EDK2.log ]; then
+ rm $WORKSPACE/EDK2.log
fi
-if [ -e $CORE_PATH/Unitool.log ]; then
- rm $CORE_PATH/Unitool.log
+if [ -e $WORKSPACE/Unitool.log ]; then
+ rm $WORKSPACE/Unitool.log
fi
-if [ -e $CORE_PATH/Conf/target.txt ]; then
- rm $CORE_PATH/Conf/target.txt
+if [ -e $WORKSPACE/Conf/target.txt ]; then
+ rm $WORKSPACE/Conf/target.txt
fi
-if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
- rm $CORE_PATH/Conf/tools_def.txt
+if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
+ rm $WORKSPACE/Conf/tools_def.txt
fi
-if [ -e $CORE_PATH/Conf/build_rule.txt ]; then
- rm $CORE_PATH/Conf/build_rule.txt
+if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
+ rm $WORKSPACE/Conf/build_rule.txt
fi
## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
+cd $CORE_PATH
. edksetup.sh BaseTools
make -C BaseTools
@@ -72,6 +71,8 @@ PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
+cd $PLATFORM_PKG_PATH
+
## create new AutoPlatformCFG.txt file
if [ -f "$auto_config_inc" ]; then
rm $auto_config_inc
@@ -149,11 +150,11 @@ echo "Ensuring correct build directory is present for GenBiosId..."
echo Modifying Conf files for this build...
## Remove lines with these tags from target.txt
-sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt
-sed -i '/^TARGET /d' Conf/target.txt
-sed -i '/^TARGET_ARCH/d' Conf/target.txt
-sed -i '/^TOOL_CHAIN_TAG/d' Conf/target.txt
-sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt
+sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt
+sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt
+sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt
+sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt
+sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
case $gcc_version in
@@ -174,15 +175,15 @@ esac
ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
export TOOL_CHAIN_TAG=$TARGET_TOOLS
-MAX_CONCURRENT_THREAD_NUMBER=1
-echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> Conf/target.txt
-echo TARGET = $TARGET >> Conf/target.txt
-echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >> Conf/target.txt
-echo MAX_CONCURRENT_THREAD_NUMBER = $MAX_CONCURRENT_THREAD_NUMBER >> Conf/target.txt
+MAX_CONCURRENT_THREAD_NUMBER=8
+echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> $WORKSPACE/Conf/target.txt
+echo TARGET = $TARGET >> $WORKSPACE/Conf/target.txt
+echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >> $WORKSPACE/Conf/target.txt
+echo MAX_CONCURRENT_THREAD_NUMBER = $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt
if [ $Arch == "IA32" ]; then
- echo TARGET_ARCH = IA32 >> Conf/target.txt
+ echo TARGET_ARCH = IA32 >> $WORKSPACE/Conf/target.txt
else
- echo TARGET_ARCH = IA32 X64 >> Conf/target.txt
+ echo TARGET_ARCH = IA32 X64 >> $WORKSPACE/Conf/target.txt
fi
##**********************************************************************
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts
2019-07-10 19:05 ` [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Michael D Kinney
@ 2019-07-11 4:55 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:55 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-devel] [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg:
> Update Linux build scripts
>
> * Do not change WORKSPACE env var.
> Assume it is set before running script.
> * Access Conf dir relative to WORKSPACE
> * Run Build_IFWI.sh from the Vlv2Tbl2DevicePkg dir
> * run bld_vlv.sh from same dir as Build_IFWI.sh
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 5 +-
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 49 ++++++++++---------
> 2 files changed, 26 insertions(+), 28 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 2a22309f5f..f8954cc9cd 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -85,13 +85,10 @@ else
> IFWI_Suffix="/S $3"
> fi
>
> -## Go to root directory
> -cd ../../..
> -
> ## Build BIOS
> echo
> "==========================================================
> ============"
> echo "Build_IFWI: Calling BIOS build Script..."
> -./Platform/Intel/$PLATFORM_PACKAGE/bld_vlv.sh $Build_Flags
> $Platform_Type $Build_Target
> +. bld_vlv.sh $Build_Flags $Platform_Type $Build_Target
>
> echo
> echo Finished Building BIOS.
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index c68e59398a..aac8534677 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -26,7 +26,6 @@ echo -e $(date)
>
> ##********************************************************
> **************
> ## Initial Setup
>
> ##********************************************************
> **************
> -export WORKSPACE=$(pwd)
> #build_threads=($NUMBER_OF_PROCESSORS)+1
> Build_Flags=
> exitCode=0
> @@ -38,31 +37,31 @@ export PLATFORM_PATH=$WORKSPACE/edk2-
> platforms/Platform/Intel/
> export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
> export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
> export
> PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$COR
> E_PATH
> -cd ./edk2
>
> ## Clean up previous build files.
> -if [ -e $CORE_PATH/EDK2.log ]; then
> - rm $CORE_PATH/EDK2.log
> +if [ -e $WORKSPACE/EDK2.log ]; then
> + rm $WORKSPACE/EDK2.log
> fi
>
> -if [ -e $CORE_PATH/Unitool.log ]; then
> - rm $CORE_PATH/Unitool.log
> +if [ -e $WORKSPACE/Unitool.log ]; then
> + rm $WORKSPACE/Unitool.log
> fi
>
> -if [ -e $CORE_PATH/Conf/target.txt ]; then
> - rm $CORE_PATH/Conf/target.txt
> +if [ -e $WORKSPACE/Conf/target.txt ]; then
> + rm $WORKSPACE/Conf/target.txt
> fi
>
> -if [ -e $CORE_PATH/Conf/tools_def.txt ]; then
> - rm $CORE_PATH/Conf/tools_def.txt
> +if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
> + rm $WORKSPACE/Conf/tools_def.txt
> fi
>
> -if [ -e $CORE_PATH/Conf/build_rule.txt ]; then
> - rm $CORE_PATH/Conf/build_rule.txt
> +if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
> + rm $WORKSPACE/Conf/build_rule.txt
> fi
>
> ## Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as
> soon as possible to avoid it from changing environment variables we're
> overriding
> +cd $CORE_PATH
> . edksetup.sh BaseTools
> make -C BaseTools
>
> @@ -72,6 +71,8 @@
> PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
> config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
>
> +cd $PLATFORM_PKG_PATH
> +
> ## create new AutoPlatformCFG.txt file
> if [ -f "$auto_config_inc" ]; then
> rm $auto_config_inc
> @@ -149,11 +150,11 @@ echo "Ensuring correct build directory is present for
> GenBiosId..."
>
> echo Modifying Conf files for this build...
> ## Remove lines with these tags from target.txt -sed -i
> '/^ACTIVE_PLATFORM/d' Conf/target.txt -sed -i '/^TARGET /d'
> Conf/target.txt -sed -i '/^TARGET_ARCH/d' Conf/target.txt -sed -i
> '/^TOOL_CHAIN_TAG/d' Conf/target.txt -sed -i
> '/^MAX_CONCURRENT_THREAD_NUMBER/d' Conf/target.txt
> +sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt sed -i
> +'/^TARGET /d' $WORKSPACE/Conf/target.txt sed -i '/^TARGET_ARCH/d'
> +$WORKSPACE/Conf/target.txt sed -i '/^TOOL_CHAIN_TAG/d'
> +$WORKSPACE/Conf/target.txt sed -i
> '/^MAX_CONCURRENT_THREAD_NUMBER/d'
> +$WORKSPACE/Conf/target.txt
>
> gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in
> @@ -174,15 +175,15 @@ esac
>
> ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
> export TOOL_CHAIN_TAG=$TARGET_TOOLS
> -MAX_CONCURRENT_THREAD_NUMBER=1
> -echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >>
> Conf/target.txt
> -echo TARGET = $TARGET >> Conf/target.txt
> -echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >>
> Conf/target.txt
> -echo MAX_CONCURRENT_THREAD_NUMBER =
> $MAX_CONCURRENT_THREAD_NUMBER >> Conf/target.txt
> +MAX_CONCURRENT_THREAD_NUMBER=8
> +echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >>
> $WORKSPACE/Conf/target.txt
> +echo TARGET = $TARGET >>
> $WORKSPACE/Conf/target.txt
> +echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >>
> $WORKSPACE/Conf/target.txt
> +echo MAX_CONCURRENT_THREAD_NUMBER =
> $MAX_CONCURRENT_THREAD_NUMBER >>
> +$WORKSPACE/Conf/target.txt
> if [ $Arch == "IA32" ]; then
> - echo TARGET_ARCH = IA32 >> Conf/target.txt
> + echo TARGET_ARCH = IA32 >>
> $WORKSPACE/Conf/target.txt
> else
> - echo TARGET_ARCH = IA32 X64 >> Conf/target.txt
> + echo TARGET_ARCH = IA32 X64 >>
> $WORKSPACE/Conf/target.txt
> fi
>
>
> ##********************************************************
> **************
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (15 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 16/28] Vlv2TbltDevicePkg: Update Linux build scripts Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable Michael D Kinney
` (12 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Handle case where no Simple Network Protocols are found.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../MiscBaseBoardManufacturerFunction.c | 14 +++++++++-----
.../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 14 +++++++++-----
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
index 4e02486853..8eddc5c2a6 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c
@@ -130,11 +130,15 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
//
//Get the MAC string
//
- Status = NetLibGetMacString (
- *Handles,
- NULL,
- &MacStr
- );
+ if (Handles == NULL) {
+ Status = EFI_NOT_FOUND;
+ } else {
+ Status = NetLibGetMacString (
+ *Handles,
+ NULL,
+ &MacStr
+ );
+ }
if (EFI_ERROR (Status)) {
MacStr = L"000000000000";
}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index da660cb3a8..b18dbd6ae2 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
@@ -212,11 +212,15 @@ AddSmbiosManuCallback (
//
//Get the MAC string
//
- Status = NetLibGetMacString (
- *Handles,
- NULL,
- &MacStr
- );
+ if (Handles == NULL) {
+ Status = EFI_NOT_FOUND;
+ } else {
+ Status = NetLibGetMacString (
+ *Handles,
+ NULL,
+ &MacStr
+ );
+ }
if (EFI_ERROR (Status)) {
MacStr = L"000000000000";
}
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe
2019-07-10 19:05 ` [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe Michael D Kinney
@ 2019-07-11 4:53 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:53 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer
> access in SmbiosMiscDxe
>
> Handle case where no Simple Network Protocols are found.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../MiscBaseBoardManufacturerFunction.c | 14 +++++++++-----
> .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 14 +++++++++----
> -
> 2 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> index 4e02486853..8eddc5c2a6 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBaseBoardManufa
> cturerFunction.c
> @@ -130,11 +130,15 @@
> MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
> //
> //Get the MAC string
> //
> - Status = NetLibGetMacString (
> - *Handles,
> - NULL,
> - &MacStr
> - );
> + if (Handles == NULL) {
> + Status = EFI_NOT_FOUND;
> + } else {
> + Status = NetLibGetMacString (
> + *Handles,
> + NULL,
> + &MacStr
> + );
> + }
> if (EFI_ERROR (Status)) {
> MacStr = L"000000000000";
> }
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> index da660cb3a8..b18dbd6ae2 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscSystemManufactu
> rerFunction.c
> @@ -212,11 +212,15 @@ AddSmbiosManuCallback (
> //
> //Get the MAC string
> //
> - Status = NetLibGetMacString (
> - *Handles,
> - NULL,
> - &MacStr
> - );
> + if (Handles == NULL) {
> + Status = EFI_NOT_FOUND;
> + } else {
> + Status = NetLibGetMacString (
> + *Handles,
> + NULL,
> + &MacStr
> + );
> + }
> if (EFI_ERROR (Status)) {
> MacStr = L"000000000000";
> }
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (16 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 17/28] Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:37 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid Michael D Kinney
` (11 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
Check WORKSPACE before running the script and notify the user to export
the variable if the variable doesn't exist
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index f8954cc9cd..422e90ca6c 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,7 +6,7 @@ function Usage ( ) {
echo
echo "Script to build BIOS firmware and stitch the entire IFWI."
echo
- echo "Usage: Build_IFWI.bat [options] PlatformType BuildTarget "
+ echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
echo
echo
echo " /yL [option] : Enable SPI lock"
@@ -28,6 +28,18 @@ Stitch_Flags=
Arch=X64
PLATFORM_PACKAGE=Vlv2TbltDevicePkg
+## Check whether WORKSPACE is set or not
+if [[ -z "$WORKSPACE" ]]; then
+ echo "Please export WORKSPACE before running Build_IFWI.sh"
+ echo "See the details in Readme.md"
+ exit 1
+fi
+
+## Create $WORKSPACE/Conf if necessary
+if [ ! -d $WORKSPACE/Conf ]; then
+ mkdir $WORKSPACE/Conf
+fi
+
## Parse Optional arguments
if [ "$1" == "/?" ]; then
Usage
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable
2019-07-10 19:05 ` [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable Michael D Kinney
@ 2019-07-12 2:37 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:37 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable
From: Gary Lin <glin@suse.com>
Check WORKSPACE before running the script and notify the user to export the variable if the variable doesn't exist
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index f8954cc9cd..422e90ca6c 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,7 +6,7 @@ function Usage ( ) {
echo
echo "Script to build BIOS firmware and stitch the entire IFWI."
echo
- echo "Usage: Build_IFWI.bat [options] PlatformType BuildTarget "
+ echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
echo
echo
echo " /yL [option] : Enable SPI lock"
@@ -28,6 +28,18 @@ Stitch_Flags=
Arch=X64
PLATFORM_PACKAGE=Vlv2TbltDevicePkg
+## Check whether WORKSPACE is set or not if [[ -z "$WORKSPACE" ]]; then
+ echo "Please export WORKSPACE before running Build_IFWI.sh"
+ echo "See the details in Readme.md"
+ exit 1
+fi
+
+## Create $WORKSPACE/Conf if necessary
+if [ ! -d $WORKSPACE/Conf ]; then
+ mkdir $WORKSPACE/Conf
+fi
+
## Parse Optional arguments
if [ "$1" == "/?" ]; then
Usage
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (17 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 18/28] Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: " Michael D Kinney
` (10 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Remove redundant declaration of gEfiSpiProtocolGuid
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec | 1 -
1 file changed, 1 deletion(-)
diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec b/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
index 1af1ed757c..97af1d2f41 100644
--- a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
@@ -39,7 +39,6 @@ [Protocols]
gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, {0xb5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}}
gMemInfoProtocolGuid = { 0x6f20f7c8, 0xe5ef, 0x4f21, {0x8d, 0x19, 0xed, 0xc5, 0xf0, 0xc4, 0x96, 0xae}}
gEfiSdHostIoProtocolGuid = { 0xb63f8ec7, 0xa9c9, 0x4472, {0xa4, 0xc0, 0x4d, 0x8b, 0xf3, 0x65, 0xcc, 0x51}}
- gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, {0xb5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}}
gEfiSmmSpiProtocolGuid = { 0xD9072C35, 0xEB8F, 0x43AD, {0xA2, 0x20, 0x34, 0xD4, 0x0E, 0x2A, 0x82, 0x85}}
gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc}}
gEfiSmmIchnDispatchExProtocolGuid = { 0x3920405B, 0xC897, 0x44DA, {0x88, 0xF3, 0x4C, 0x49, 0x8A, 0x6F, 0xF7, 0x36}}
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid
2019-07-10 19:05 ` [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid Michael D Kinney
@ 2019-07-11 4:53 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:53 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove
> redundant gEfiSpiProtocolGuid
>
> Remove redundant declaration of gEfiSpiProtocolGuid
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> b/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> index 1af1ed757c..97af1d2f41 100644
> --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> @@ -39,7 +39,6 @@ [Protocols]
> gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, {0xb5, 0xd5,
> 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}}
> gMemInfoProtocolGuid = { 0x6f20f7c8, 0xe5ef, 0x4f21, {0x8d, 0x19,
> 0xed, 0xc5, 0xf0, 0xc4, 0x96, 0xae}}
> gEfiSdHostIoProtocolGuid = { 0xb63f8ec7, 0xa9c9, 0x4472, {0xa4, 0xc0,
> 0x4d, 0x8b, 0xf3, 0x65, 0xcc, 0x51}}
> - gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, {0xb5, 0xd5,
> 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13}}
> gEfiSmmSpiProtocolGuid = { 0xD9072C35, 0xEB8F, 0x43AD, {0xA2,
> 0x20, 0x34, 0xD4, 0x0E, 0x2A, 0x82, 0x85}}
> gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac,
> 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc}}
> gEfiSmmIchnDispatchExProtocolGuid = { 0x3920405B, 0xC897, 0x44DA,
> {0x88, 0xF3, 0x4C, 0x49, 0x8A, 0x6F, 0xF7, 0x36}}
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: Remove redundant gEfiSpiProtocolGuid
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (18 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 19/28] Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:53 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature Michael D Kinney
` (9 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Remove redundant declaration of gEfiSpiProtocolGuid.
This protocol is defined in Vlv2DeviceRefCodePkg.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 1 -
1 file changed, 1 deletion(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
index abe9d7e3a0..970d2db42a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
@@ -187,7 +187,6 @@ [Protocols]
# gEfiSpiBusProtocolGuid = { 0x137b3044, 0xf6d7, 0x473e, { 0xa6, 0x25, 0x9f, 0xb9, 0x25, 0x5, 0xc1, 0x80 } }
# gLpssDummyProtocolGuid = { 0xaf4cc162, 0xd41c, 0x455a, { 0xab, 0x45, 0x6d, 0xbc, 0xc1, 0xcd, 0x32, 0xf3 } }
- gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, { 0xb5, 0xd5, 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13 }}
gEfiGpioOperationProtocolGuid = { 0x38DDFE8F, 0x8991, 0x44AA, { 0x98, 0x89, 0x83, 0xF4, 0x91, 0x84, 0x65, 0xB0 }}
gEfiEsrtOperationProtocolGuid = { 0x4549AB47, 0x6E60, 0x4293, { 0xB9, 0x1D, 0x31, 0xB6, 0x10, 0xAD, 0x80, 0x56 }}
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: Remove redundant gEfiSpiProtocolGuid
2019-07-10 19:05 ` [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: " Michael D Kinney
@ 2019-07-11 4:53 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:53 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: Remove
> redundant gEfiSpiProtocolGuid
>
> Remove redundant declaration of gEfiSpiProtocolGuid.
> This protocol is defined in Vlv2DeviceRefCodePkg.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
> index abe9d7e3a0..970d2db42a 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
> @@ -187,7 +187,6 @@ [Protocols]
> # gEfiSpiBusProtocolGuid = { 0x137b3044, 0xf6d7, 0x473e, { 0xa6, 0x25, 0x9f,
> 0xb9, 0x25, 0x5, 0xc1, 0x80 } }
>
> # gLpssDummyProtocolGuid = { 0xaf4cc162, 0xd41c, 0x455a, { 0xab, 0x45,
> 0x6d, 0xbc, 0xc1, 0xcd, 0x32, 0xf3 } }
> - gEfiSpiProtocolGuid = { 0x1156efc6, 0xea32, 0x4396, { 0xb5, 0xd5,
> 0x26, 0x93, 0x2e, 0x83, 0xc3, 0x13 }}
> gEfiGpioOperationProtocolGuid = { 0x38DDFE8F, 0x8991, 0x44AA, { 0x98,
> 0x89, 0x83, 0xF4, 0x91, 0x84, 0x65, 0xB0 }}
> gEfiEsrtOperationProtocolGuid = { 0x4549AB47, 0x6E60, 0x4293, { 0xB9,
> 0x1D, 0x31, 0xB6, 0x10, 0xAD, 0x80, 0x56 }}
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (19 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 20/28] Vlv2TbltDevicePkg: " Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support Michael D Kinney
` (8 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Add back BIOSID feature using GenBiosId.py script and
BiosIdLib from the BoardModulePkg. Remove the VLV2
specific BiosIdLib implementation.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../Include/Library/BiosIdLib.h | 86 ----------------
.../Library/BiosIdLib/BiosIdLib.c | 98 -------------------
.../Library/BiosIdLib/BiosIdLib.inf | 33 -------
.../PlatformDxe/PlatformDxe.inf | 5 +-
.../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 ++
.../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 ++
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +-
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +-
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +-
.../PlatformSetupDxe/PlatformSetupDxe.inf | 3 +-
.../SmBiosMiscDxe/MiscBiosVendorFunction.c | 49 +---------
.../SmBiosMiscDxe/SmBiosMiscDxe.inf | 8 +-
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 27 +++++
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 46 +++++++++
14 files changed, 100 insertions(+), 275 deletions(-)
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
deleted file mode 100644
index bd08c9a80f..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*++
-
- Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-Module Name:
-
- BiosIdLib.h
-
-Abstract:
-
- BIOS ID library definitions.
-
- This library provides functions to get BIOS ID, VERSION, DATE and TIME
-
---*/
-
-#ifndef _BIOS_ID_LIB_H_
-#define _BIOS_ID_LIB_H_
-
-//
-// BIOS ID string format:
-//
-// $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM
-//
-// Example: "TRFTCRB1.86C.0008.D03.0506081529"
-//
-#pragma pack(1)
-
-typedef struct {
- CHAR16 BoardId[7]; // "TRFTCRB"
- CHAR16 BoardRev; // "1"
- CHAR16 Dot1; // "."
- CHAR16 OemId[3]; // "86C"
- CHAR16 Dot2; // "."
- CHAR16 VersionMajor[4]; // "0008"
- CHAR16 Dot3; // "."
- CHAR16 BuildType; // "D"
- CHAR16 VersionMinor[2]; // "03"
- CHAR16 Dot4; // "."
- CHAR16 TimeStamp[10]; // "YYMMDDHHMM"
- CHAR16 NullTerminator; // 0x0000
-} BIOS_ID_STRING;
-
-#define MEM_IFWIVER_START 0x7E0000
-#define MEM_IFWIVER_LENGTH 0x1000
-
-typedef struct _MANIFEST_OEM_DATA{
- UINT32 Signature;
- unsigned char FillNull[0x39];
- UINT32 IFWIVersionLen;
- unsigned char IFWIVersion[32];
-}MANIFEST_OEM_DATA;
-
-//
-// A signature precedes the BIOS ID string in the FV to enable search by external tools.
-//
-typedef struct {
- UINT8 Signature[8]; // "$IBIOSI$"
- BIOS_ID_STRING BiosIdString; // "TRFTCRB1.86C.0008.D03.0506081529"
-} BIOS_ID_IMAGE;
-
-#pragma pack()
-
-/**
- This function returns the Version & Release Date and Time by getting and converting
- BIOS ID.
-
- @param[in] BiosVersion The Bios Version out of the conversion.
- @param[in] BiosReleaseDate The Bios Release Date out of the conversion.
- @param[in] BiosReleaseTime The Bios Release Time out of the conversion.
-
- @retval EFI_SUCCESS BIOS Version & Release Date and Time have been got successfully.
- @retval EFI_NOT_FOUND BiosId image is not found, and no parameter will be modified.
- @retval EFI_INVALID_PARAMETER All the parameters are NULL.
-
-**/
-EFI_STATUS
-GetBiosVersionDateTime (
- OUT CHAR16 *BiosVersion, OPTIONAL
- OUT CHAR16 *BiosReleaseDate, OPTIONAL
- OUT CHAR16 *BiosReleaseTime OPTIONAL
- );
-
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
deleted file mode 100644
index f6ab37313c..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*++
-
-Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-Module Name:
-
- BiosIdLib.c
-
-Abstract:
-
- Boot service DXE BIOS ID library implementation.
-
- These functions in this file can be called during DXE and cannot be called during runtime
- or in SMM which should use a RT or SMM library.
-
---*/
-
-#include <PiDxe.h>
-#include <Library/BaseLib.h>
-
-#include <Library/BiosIdLib.h>
-
-/**
- This function returns the Version & Release Date and Time by getting and converting
- BIOS ID.
-
- @param BiosVersion The Bios Version out of the conversion.
- @param BiosReleaseDate The Bios Release Date out of the conversion.
- @param BiosReleaseTime - The Bios Release Time out of the conversion.
-
- @retval EFI_SUCCESS - BIOS Version & Release Date and Time have been got successfully.
- @retval EFI_NOT_FOUND - BiosId image is not found, and no parameter will be modified.
- @retval EFI_INVALID_PARAMETER - All the parameters are NULL.
-
-**/
-EFI_STATUS
-GetBiosVersionDateTime (
- OUT CHAR16 *BiosVersion, OPTIONAL
- OUT CHAR16 *BiosReleaseDate, OPTIONAL
- OUT CHAR16 *BiosReleaseTime OPTIONAL
- )
-{
- if ((BiosVersion == NULL) && (BiosReleaseDate == NULL) && (BiosReleaseTime == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (BiosVersion != NULL) {
- //
- // Fill the BiosVersion data from the BIOS ID.
- //
- StrCpy (BiosVersion, L"MNW2MAX1.X64.0084.D01");
- }
-
- if (BiosReleaseDate != NULL) {
- //
- // Fill the build timestamp date from the BIOS ID in the "MM/DD/YY" format.
- //
- BiosReleaseDate[0] = L'0';
- BiosReleaseDate[1] = L'1';
- BiosReleaseDate[2] = L'/';
-
- BiosReleaseDate[3] = L'0';
- BiosReleaseDate[4] = L'1';
- BiosReleaseDate[5] = L'/';
-
- //
- // Add 20 for SMBIOS table
- // Current Linux kernel will misjudge 09 as year 0, so using 2009 for SMBIOS table
- //
- BiosReleaseDate[6] = L'2';
- BiosReleaseDate[7] = L'0';
- BiosReleaseDate[8] = L'1';
- BiosReleaseDate[9] = L'9';
-
- BiosReleaseDate[10] = L'\0';
- }
-
- if (BiosReleaseTime != NULL) {
-
- //
- // Fill the build timestamp time from the BIOS ID in the "HH:MM" format.
- //
-
- BiosReleaseTime[0] = L'0';
- BiosReleaseTime[1] = L'0';
- BiosReleaseTime[2] = L':';
-
- BiosReleaseTime[3] = L'0';
- BiosReleaseTime[4] = L'0';
-
- BiosReleaseTime[5] = L'\0';
- }
-
- return EFI_SUCCESS;
-}
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
deleted file mode 100644
index 0d38d73ada..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+++ /dev/null
@@ -1,33 +0,0 @@
-#/*++
-#
-# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-# Module Name:
-#
-# BiosIdLib.inf
-#
-# Abstract:
-#
-# Component description file for BIOS ID library
-#
-#--*/
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = BiosIdLib
- FILE_GUID = 98546145-64F1-4d2e-814F-6BF963DB7930
- MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = BiosIdLib
- PI_SPECIFICATION_VERSION = 0x0001000A
-
-[Sources]
- BiosIdLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
index 9fee691365..88c9b36cb1 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
@@ -48,10 +48,11 @@ [sources.common]
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
SecurityPkg/SecurityPkg.dec
CryptoPkg/CryptoPkg.dec
+ BoardModulePkg/BoardModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
[LibraryClasses]
BaseLib
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index c538fe4a06..dd4550dd88 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -382,6 +382,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
}
+#
+# gBiosIdGuid
+#
+FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
+ SECTION RAW = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId.bin
+ }
+
#
# EDK II Related Platform codes
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index bd9d415939..b6e8e40582 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -331,6 +331,13 @@ [FV.FVMAIN]
INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
}
+#
+# gBiosIdGuid
+#
+FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
+ SECTION RAW = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId.bin
+ }
+
#
# EDK II Related Platform codes
#
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 6317bc1342..26c1caad94 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -221,7 +221,7 @@ [LibraryClasses.common]
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
!endif
- BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+ BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 8f69bb47dd..dc6d8b1b26 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -219,7 +219,7 @@ [LibraryClasses.common]
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
!endif
- BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+ BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index d146321750..cbc87aa9be 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -221,7 +221,7 @@ [LibraryClasses.common]
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
!endif
- BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+ BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
index 85e8b1e8d6..8ff246041d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
@@ -60,9 +60,10 @@ [Sources]
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ SecurityPkg/SecurityPkg.dec
+ BoardModulePkg/BoardModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h
- SecurityPkg/SecurityPkg.dec
[LibraryClasses]
BaseLib
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
index fb4fa820a5..0fbd5ac0bd 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
@@ -163,12 +163,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
SMBIOS_TABLE_TYPE0 *SmbiosRecord;
EFI_SMBIOS_HANDLE SmbiosHandle;
EFI_MISC_BIOS_VENDOR *ForType0InputData;
- UINT16 UVerStr[32];
- UINTN LoopIndex;
- UINTN CopyIndex;
- MANIFEST_OEM_DATA *IFWIVerStruct;
- UINT8 *Data8 = NULL;
- UINT16 SpaceVer[2]={0x0020,0x0000};
UINT16 BIOSVersionTemp[100];
ForType0InputData = (EFI_MISC_BIOS_VENDOR *)RecordData;
@@ -208,49 +202,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VERSION);
Version = SmbiosMiscGetString (TokenToGet);
- ZeroMem (UVerStr, 2*32);
- ZeroMem (BIOSVersionTemp, 2*100);
+ ZeroMem (BIOSVersionTemp, sizeof (BIOSVersionTemp));
StrCat (BIOSVersionTemp,Version);
- Data8 = AllocatePool (SECTOR_SIZE_4KB);
- ZeroMem (Data8, SECTOR_SIZE_4KB);
-
- Status = gBS->LocateProtocol (
- &gEfiSpiProtocolGuid,
- NULL,
- (VOID **)&mSpiProtocol
- );
- if (!EFI_ERROR(Status)) {
- //
- // Get data form SPI ROM.
- //
- Status = FlashRead (
- MEM_IFWIVER_START,
- Data8,
- SECTOR_SIZE_4KB,
- EnumSpiRegionAll
- );
- if (!EFI_ERROR(Status)) {
- for(LoopIndex = 0; LoopIndex <= SECTOR_SIZE_4KB; LoopIndex++) {
- IFWIVerStruct = (MANIFEST_OEM_DATA *)(Data8 + LoopIndex);
- if(IFWIVerStruct->Signature == SIGNATURE_32('$','F','U','D')) {
- DEBUG ((EFI_D_ERROR, "the IFWI Length is:%d\n", IFWIVerStruct->IFWIVersionLen));
- if(IFWIVerStruct->IFWIVersionLen < 32) {
- for(CopyIndex = 0; CopyIndex < IFWIVerStruct->IFWIVersionLen; CopyIndex++) {
- UVerStr[CopyIndex] = (UINT16)IFWIVerStruct->IFWIVersion[CopyIndex];
- }
- UVerStr[CopyIndex] = 0x0000;
- DEBUG ((EFI_D_ERROR, "The IFWI Version is :%s,the IFWI Length is:%d\n", UVerStr,IFWIVerStruct->IFWIVersionLen));
- StrCat(BIOSVersionTemp,SpaceVer);
- StrCat(BIOSVersionTemp,UVerStr);
- DEBUG ((EFI_D_ERROR, "The BIOS and IFWI Version is :%s\n", BIOSVersionTemp));
- }
- break;
- }
- }
- }
- }
- FreePool(Data8);
-
VerStrLen = StrLen(BIOSVersionTemp);
if (VerStrLen > SMBIOS_STRING_MAX_LENGTH) {
return EFI_UNSUPPORTED;
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
index 92b51b1743..016fb53b18 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
@@ -81,12 +81,13 @@ [Sources]
MiscMemoryDeviceFunction.c
[Packages]
- MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
MdePkg/MdePkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
NetworkPkg/NetworkPkg.dec
UefiCpuPkg/UefiCpuPkg.dec
+ BoardModulePkg/BoardModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
[LibraryClasses]
HiiLib
@@ -120,7 +121,6 @@ [Protocols]
gMemInfoProtocolGuid
gEfiTdtOperationProtocolGuid
gDxePchPlatformPolicyProtocolGuid
- gEfiSpiProtocolGuid
gEfiSimpleNetworkProtocolGuid
[Pcd]
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index 5cae78bb6d..ffd6722582 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -207,11 +207,15 @@ if defined VS140COMNTOOLS (
)
echo Ensuring correct build directory is present
+if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
if "%Arch%"=="IA32" (
+ if not exist %WORKSPACE%\Build\%PLATFORM_NAME%IA32 mkdir %WORKSPACE%\Build\%PLATFORM_NAME%IA32
set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%IA32\%TARGET%_%TOOL_CHAIN_TAG%
) else (
+ if not exist %WORKSPACE%\Build\%PLATFORM_NAME% mkdir %WORKSPACE%\Build\%PLATFORM_NAME%
set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%
)
+if not exist %BUILD_PATH% mkdir %BUILD_PATH%
echo Modifing Conf files for this build...
:: Remove lines with these tags from target.txt
@@ -234,6 +238,29 @@ echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WOR
move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
+::**********************************************************************
+:: Generate BIOS ID
+::**********************************************************************
+
+echo BOARD_ID = MNW2MAX > %BUILD_PATH%/BiosId.env
+echo BOARD_REV = 1 >> %BUILD_PATH%/BiosId.env
+if "%Arch%"=="IA32" (
+ echo BOARD_EXT = I32 >> %BUILD_PATH%/BiosId.env
+)
+if "%Arch%"=="X64" (
+ echo BOARD_EXT = X64 >> %BUILD_PATH%/BiosId.env
+)
+echo VERSION_MAJOR = 0090 >> %BUILD_PATH%/BiosId.env
+if "%TARGET%"=="DEBUG" (
+ echo BUILD_TYPE = D >> %BUILD_PATH%/BiosId.env
+)
+if "%TARGET%"=="RELEASE" (
+ echo BUILD_TYPE = R >> %BUILD_PATH%/BiosId.env
+)
+echo VERSION_MINOR = 01 >> %BUILD_PATH%/BiosId.env
+
+%WORKSPACE%\edk2-platforms\Platform\Intel\Tools\GenBiosId\GenBiosId.py -i %BUILD_PATH%/BiosId.env -o %BUILD_PATH%/BiosId.bin -ot %BUILD_PATH%/BiosId.txt
+
::**********************************************************************
:: Build BIOS
::**********************************************************************
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index aac8534677..03fa062310 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -66,6 +66,7 @@ cd $CORE_PATH
make -C BaseTools
## Define platform specific environment variables.
+PLATFORM_NAME=Vlv2TbltDevicePkg
PLATFORM_PACKAGE=Vlv2TbltDevicePkg
PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
@@ -186,6 +187,51 @@ else
echo TARGET_ARCH = IA32 X64 >> $WORKSPACE/Conf/target.txt
fi
+
+## Set and Create $BUILD_PATH if necessary
+if [ ! -d ${WORKSPACE}/Build ]; then
+ mkdir ${WORKSPACE}/Build
+fi
+
+if [ $Arch == "IA32" ]; then
+ if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME}IA32 ]; then
+ mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}IA32
+ fi
+ BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}IA32/${TARGET}_${TOOL_CHAIN_TAG}
+else
+ if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME} ]; then
+ mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}
+ fi
+ BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}/${TARGET}_${TOOL_CHAIN_TAG}
+fi
+
+if [ ! -d $BUILD_PATH ]; then
+ mkdir $BUILD_PATH
+fi
+
+##**********************************************************************
+## Generate BIOS ID
+##**********************************************************************
+
+echo BOARD_ID = MNW2MAX > $BUILD_PATH/BiosId.env
+echo BOARD_REV = 1 >> $BUILD_PATH/BiosId.env
+if [ $Arch == "IA32" ]; then
+ echo BOARD_EXT = I32 >> $BUILD_PATH/BiosId.env
+fi
+if [ $Arch == "X64" ]; then
+ echo BOARD_EXT = X64 >> $BUILD_PATH/BiosId.env
+fi
+echo VERSION_MAJOR = 0090 >> $BUILD_PATH/BiosId.env
+if [ $TARGET == "DEBUG" ]; then
+ echo BUILD_TYPE = D >> $BUILD_PATH/BiosId.env
+fi
+if [ $TARGET == "RELEASE" ]; then
+ echo BUILD_TYPE = R >> $BUILD_PATH/BiosId.env
+fi
+echo VERSION_MINOR = 01 >> $BUILD_PATH/BiosId.env
+
+python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i $BUILD_PATH/BiosId.env -o $BUILD_PATH/BiosId.bin -ot $BUILD_PATH/BiosId.txt
+
##**********************************************************************
## Build BIOS
##**********************************************************************
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature
2019-07-10 19:05 ` [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature Michael D Kinney
@ 2019-07-11 4:54 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:54 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID
> feature
>
> Add back BIOSID feature using GenBiosId.py script and BiosIdLib from the
> BoardModulePkg. Remove the VLV2 specific BiosIdLib implementation.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../Include/Library/BiosIdLib.h | 86 ----------------
> .../Library/BiosIdLib/BiosIdLib.c | 98 -------------------
> .../Library/BiosIdLib/BiosIdLib.inf | 33 -------
> .../PlatformDxe/PlatformDxe.inf | 5 +-
> .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 7 ++
> .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 ++
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +-
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +-
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +-
> .../PlatformSetupDxe/PlatformSetupDxe.inf | 3 +-
> .../SmBiosMiscDxe/MiscBiosVendorFunction.c | 49 +---------
> .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 8 +-
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 27 +++++
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 46 +++++++++
> 14 files changed, 100 insertions(+), 275 deletions(-) delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
> b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
> deleted file mode 100644
> index bd08c9a80f..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -/*++
> -
> - Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
> -
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -Module Name:
> -
> - BiosIdLib.h
> -
> -Abstract:
> -
> - BIOS ID library definitions.
> -
> - This library provides functions to get BIOS ID, VERSION, DATE and TIME
> -
> ---*/
> -
> -#ifndef _BIOS_ID_LIB_H_
> -#define _BIOS_ID_LIB_H_
> -
> -//
> -// BIOS ID string format:
> -//
> -//
> $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE
> )$(VERSION_MINOR).YYMMDDHHMM
> -//
> -// Example: "TRFTCRB1.86C.0008.D03.0506081529"
> -//
> -#pragma pack(1)
> -
> -typedef struct {
> - CHAR16 BoardId[7]; // "TRFTCRB"
> - CHAR16 BoardRev; // "1"
> - CHAR16 Dot1; // "."
> - CHAR16 OemId[3]; // "86C"
> - CHAR16 Dot2; // "."
> - CHAR16 VersionMajor[4]; // "0008"
> - CHAR16 Dot3; // "."
> - CHAR16 BuildType; // "D"
> - CHAR16 VersionMinor[2]; // "03"
> - CHAR16 Dot4; // "."
> - CHAR16 TimeStamp[10]; // "YYMMDDHHMM"
> - CHAR16 NullTerminator; // 0x0000
> -} BIOS_ID_STRING;
> -
> -#define MEM_IFWIVER_START 0x7E0000
> -#define MEM_IFWIVER_LENGTH 0x1000
> -
> -typedef struct _MANIFEST_OEM_DATA{
> - UINT32 Signature;
> - unsigned char FillNull[0x39];
> - UINT32 IFWIVersionLen;
> - unsigned char IFWIVersion[32];
> -}MANIFEST_OEM_DATA;
> -
> -//
> -// A signature precedes the BIOS ID string in the FV to enable search by
> external tools.
> -//
> -typedef struct {
> - UINT8 Signature[8]; // "$IBIOSI$"
> - BIOS_ID_STRING BiosIdString; // "TRFTCRB1.86C.0008.D03.0506081529"
> -} BIOS_ID_IMAGE;
> -
> -#pragma pack()
> -
> -/**
> - This function returns the Version & Release Date and Time by getting and
> converting
> - BIOS ID.
> -
> - @param[in] BiosVersion The Bios Version out of the conversion.
> - @param[in] BiosReleaseDate The Bios Release Date out of the
> conversion.
> - @param[in] BiosReleaseTime The Bios Release Time out of the
> conversion.
> -
> - @retval EFI_SUCCESS BIOS Version & Release Date and Time have
> been got successfully.
> - @retval EFI_NOT_FOUND BiosId image is not found, and no parameter
> will be modified.
> - @retval EFI_INVALID_PARAMETER All the parameters are NULL.
> -
> -**/
> -EFI_STATUS
> -GetBiosVersionDateTime (
> - OUT CHAR16 *BiosVersion, OPTIONAL
> - OUT CHAR16 *BiosReleaseDate, OPTIONAL
> - OUT CHAR16 *BiosReleaseTime OPTIONAL
> - );
> -
> -#endif
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
> deleted file mode 100644
> index f6ab37313c..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
> +++ /dev/null
> @@ -1,98 +0,0 @@
> -/*++
> -
> -Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved
> -
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -Module Name:
> -
> - BiosIdLib.c
> -
> -Abstract:
> -
> - Boot service DXE BIOS ID library implementation.
> -
> - These functions in this file can be called during DXE and cannot be called
> during runtime
> - or in SMM which should use a RT or SMM library.
> -
> ---*/
> -
> -#include <PiDxe.h>
> -#include <Library/BaseLib.h>
> -
> -#include <Library/BiosIdLib.h>
> -
> -/**
> - This function returns the Version & Release Date and Time by getting and
> converting
> - BIOS ID.
> -
> - @param BiosVersion The Bios Version out of the conversion.
> - @param BiosReleaseDate The Bios Release Date out of the conversion.
> - @param BiosReleaseTime - The Bios Release Time out of the conversion.
> -
> - @retval EFI_SUCCESS - BIOS Version & Release Date and Time have been
> got successfully.
> - @retval EFI_NOT_FOUND - BiosId image is not found, and no parameter
> will be modified.
> - @retval EFI_INVALID_PARAMETER - All the parameters are NULL.
> -
> -**/
> -EFI_STATUS
> -GetBiosVersionDateTime (
> - OUT CHAR16 *BiosVersion, OPTIONAL
> - OUT CHAR16 *BiosReleaseDate, OPTIONAL
> - OUT CHAR16 *BiosReleaseTime OPTIONAL
> - )
> -{
> - if ((BiosVersion == NULL) && (BiosReleaseDate == NULL) &&
> (BiosReleaseTime == NULL)) {
> - return EFI_INVALID_PARAMETER;
> - }
> -
> - if (BiosVersion != NULL) {
> - //
> - // Fill the BiosVersion data from the BIOS ID.
> - //
> - StrCpy (BiosVersion, L"MNW2MAX1.X64.0084.D01");
> - }
> -
> - if (BiosReleaseDate != NULL) {
> - //
> - // Fill the build timestamp date from the BIOS ID in the "MM/DD/YY"
> format.
> - //
> - BiosReleaseDate[0] = L'0';
> - BiosReleaseDate[1] = L'1';
> - BiosReleaseDate[2] = L'/';
> -
> - BiosReleaseDate[3] = L'0';
> - BiosReleaseDate[4] = L'1';
> - BiosReleaseDate[5] = L'/';
> -
> - //
> - // Add 20 for SMBIOS table
> - // Current Linux kernel will misjudge 09 as year 0, so using 2009 for
> SMBIOS table
> - //
> - BiosReleaseDate[6] = L'2';
> - BiosReleaseDate[7] = L'0';
> - BiosReleaseDate[8] = L'1';
> - BiosReleaseDate[9] = L'9';
> -
> - BiosReleaseDate[10] = L'\0';
> - }
> -
> - if (BiosReleaseTime != NULL) {
> -
> - //
> - // Fill the build timestamp time from the BIOS ID in the "HH:MM" format.
> - //
> -
> - BiosReleaseTime[0] = L'0';
> - BiosReleaseTime[1] = L'0';
> - BiosReleaseTime[2] = L':';
> -
> - BiosReleaseTime[3] = L'0';
> - BiosReleaseTime[4] = L'0';
> -
> - BiosReleaseTime[5] = L'\0';
> - }
> -
> - return EFI_SUCCESS;
> -}
> -
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> deleted file mode 100644
> index 0d38d73ada..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -#/*++
> -#
> -# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved -# -# SPDX-
> License-Identifier: BSD-2-Clause-Patent -# -# Module Name:
> -#
> -# BiosIdLib.inf
> -#
> -# Abstract:
> -#
> -# Component description file for BIOS ID library
> -#
> -#--*/
> -[Defines]
> - INF_VERSION = 0x00010005
> - BASE_NAME = BiosIdLib
> - FILE_GUID = 98546145-64F1-4d2e-814F-6BF963DB7930
> - MODULE_TYPE = BASE
> - VERSION_STRING = 1.0
> - LIBRARY_CLASS = BiosIdLib
> - PI_SPECIFICATION_VERSION = 0x0001000A
> -
> -[Sources]
> - BiosIdLib.c
> -
> -[Packages]
> - MdePkg/MdePkg.dec
> - MdePkg/MdePkg.dec
> - MdeModulePkg/MdeModulePkg.dec
> - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> - Vlv2TbltDevicePkg/PlatformPkg.dec
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
> index 9fee691365..88c9b36cb1 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
> @@ -48,10 +48,11 @@ [sources.common]
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - Vlv2TbltDevicePkg/PlatformPkg.dec
> - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> SecurityPkg/SecurityPkg.dec
> CryptoPkg/CryptoPkg.dec
> + BoardModulePkg/BoardModulePkg.dec
> + Vlv2TbltDevicePkg/PlatformPkg.dec
> + Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
>
> [LibraryClasses]
> BaseLib
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> index c538fe4a06..dd4550dd88 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
> @@ -382,6 +382,13 @@ [FV.FVMAIN]
> INF
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dlerRuntimeDxe.inf
> }
>
> +#
> +# gBiosIdGuid
> +#
> +FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
> + SECTION RAW =
> +$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId.bin
> + }
> +
> #
> # EDK II Related Platform codes
> #
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> index bd9d415939..b6e8e40582 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> @@ -331,6 +331,13 @@ [FV.FVMAIN]
> INF
> MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan
> dlerRuntimeDxe.inf
> }
>
> +#
> +# gBiosIdGuid
> +#
> +FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
> + SECTION RAW =
> +$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId.bin
> + }
> +
> #
> # EDK II Related Platform codes
> #
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 6317bc1342..26c1caad94 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -221,7 +221,7 @@ [LibraryClasses.common]
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> !endif
>
> - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 8f69bb47dd..dc6d8b1b26 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -219,7 +219,7 @@ [LibraryClasses.common]
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> !endif
>
> - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index d146321750..cbc87aa9be 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -221,7 +221,7 @@ [LibraryClasses.common]
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> !endif
>
> - BiosIdLib|Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
> + BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> index 85e8b1e8d6..8ff246041d 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe
> +++ .inf
> @@ -60,9 +60,10 @@ [Sources]
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> + SecurityPkg/SecurityPkg.dec
> + BoardModulePkg/BoardModulePkg.dec
> Vlv2TbltDevicePkg/PlatformPkg.dec
> Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h
> - SecurityPkg/SecurityPkg.dec
>
> [LibraryClasses]
> BaseLib
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunctio
> n.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFuncti
> on.c
> index fb4fa820a5..0fbd5ac0bd 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunctio
> n.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunct
> +++ ion.c
> @@ -163,12 +163,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
> SMBIOS_TABLE_TYPE0 *SmbiosRecord;
> EFI_SMBIOS_HANDLE SmbiosHandle;
> EFI_MISC_BIOS_VENDOR *ForType0InputData;
> - UINT16 UVerStr[32];
> - UINTN LoopIndex;
> - UINTN CopyIndex;
> - MANIFEST_OEM_DATA *IFWIVerStruct;
> - UINT8 *Data8 = NULL;
> - UINT16 SpaceVer[2]={0x0020,0x0000};
> UINT16 BIOSVersionTemp[100];
>
> ForType0InputData = (EFI_MISC_BIOS_VENDOR *)RecordData;
> @@ -208,49 +202,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
> TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VERSION);
> Version = SmbiosMiscGetString (TokenToGet);
>
> - ZeroMem (UVerStr, 2*32);
> - ZeroMem (BIOSVersionTemp, 2*100);
> + ZeroMem (BIOSVersionTemp, sizeof (BIOSVersionTemp));
> StrCat (BIOSVersionTemp,Version);
> - Data8 = AllocatePool (SECTOR_SIZE_4KB);
> - ZeroMem (Data8, SECTOR_SIZE_4KB);
> -
> - Status = gBS->LocateProtocol (
> - &gEfiSpiProtocolGuid,
> - NULL,
> - (VOID **)&mSpiProtocol
> - );
> - if (!EFI_ERROR(Status)) {
> - //
> - // Get data form SPI ROM.
> - //
> - Status = FlashRead (
> - MEM_IFWIVER_START,
> - Data8,
> - SECTOR_SIZE_4KB,
> - EnumSpiRegionAll
> - );
> - if (!EFI_ERROR(Status)) {
> - for(LoopIndex = 0; LoopIndex <= SECTOR_SIZE_4KB; LoopIndex++) {
> - IFWIVerStruct = (MANIFEST_OEM_DATA *)(Data8 + LoopIndex);
> - if(IFWIVerStruct->Signature == SIGNATURE_32('$','F','U','D')) {
> - DEBUG ((EFI_D_ERROR, "the IFWI Length is:%d\n", IFWIVerStruct-
> >IFWIVersionLen));
> - if(IFWIVerStruct->IFWIVersionLen < 32) {
> - for(CopyIndex = 0; CopyIndex < IFWIVerStruct->IFWIVersionLen;
> CopyIndex++) {
> - UVerStr[CopyIndex] = (UINT16)IFWIVerStruct-
> >IFWIVersion[CopyIndex];
> - }
> - UVerStr[CopyIndex] = 0x0000;
> - DEBUG ((EFI_D_ERROR, "The IFWI Version is :%s,the IFWI Length
> is:%d\n", UVerStr,IFWIVerStruct->IFWIVersionLen));
> - StrCat(BIOSVersionTemp,SpaceVer);
> - StrCat(BIOSVersionTemp,UVerStr);
> - DEBUG ((EFI_D_ERROR, "The BIOS and IFWI Version is :%s\n",
> BIOSVersionTemp));
> - }
> - break;
> - }
> - }
> - }
> - }
> - FreePool(Data8);
> -
> VerStrLen = StrLen(BIOSVersionTemp);
> if (VerStrLen > SMBIOS_STRING_MAX_LENGTH) {
> return EFI_UNSUPPORTED;
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> index 92b51b1743..016fb53b18 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> @@ -81,12 +81,13 @@ [Sources]
> MiscMemoryDeviceFunction.c
>
> [Packages]
> - MdeModulePkg/MdeModulePkg.dec
> - Vlv2TbltDevicePkg/PlatformPkg.dec
> MdePkg/MdePkg.dec
> - Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
> + MdeModulePkg/MdeModulePkg.dec
> NetworkPkg/NetworkPkg.dec
> UefiCpuPkg/UefiCpuPkg.dec
> + BoardModulePkg/BoardModulePkg.dec
> + Vlv2TbltDevicePkg/PlatformPkg.dec
> + Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
>
> [LibraryClasses]
> HiiLib
> @@ -120,7 +121,6 @@ [Protocols]
> gMemInfoProtocolGuid
> gEfiTdtOperationProtocolGuid
> gDxePchPlatformPolicyProtocolGuid
> - gEfiSpiProtocolGuid
> gEfiSimpleNetworkProtocolGuid
>
> [Pcd]
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index 5cae78bb6d..ffd6722582 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -207,11 +207,15 @@ if defined VS140COMNTOOLS (
> )
>
> echo Ensuring correct build directory is present
> +if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
> if "%Arch%"=="IA32" (
> + if not exist %WORKSPACE%\Build\%PLATFORM_NAME%IA32 mkdir
> + %WORKSPACE%\Build\%PLATFORM_NAME%IA32
> set
> BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%IA32\%TARGET%
> _%TOOL_CHAIN_TAG%
> ) else (
> + if not exist %WORKSPACE%\Build\%PLATFORM_NAME% mkdir
> + %WORKSPACE%\Build\%PLATFORM_NAME%
> set
> BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%T
> OOL_CHAIN_TAG%
> )
> +if not exist %BUILD_PATH% mkdir %BUILD_PATH%
>
> echo Modifing Conf files for this build...
> :: Remove lines with these tags from target.txt
> @@ -234,6 +238,29 @@ echo MAX_CONCURRENT_THREAD_NUMBER
> = %build_threads% >> %WOR
>
> move
> /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >n
> ul
>
> +::********************************************************
> *************
> +*
> +:: Generate BIOS ID
> +::********************************************************
> *************
> +*
> +
> +echo BOARD_ID = MNW2MAX > %BUILD_PATH%/BiosId.env
> +echo BOARD_REV = 1 >> %BUILD_PATH%/BiosId.env
> +if "%Arch%"=="IA32" (
> + echo BOARD_EXT = I32 >> %BUILD_PATH%/BiosId.env
> +)
> +if "%Arch%"=="X64" (
> + echo BOARD_EXT = X64 >> %BUILD_PATH%/BiosId.env
> +)
> +echo VERSION_MAJOR = 0090 >> %BUILD_PATH%/BiosId.env
> +if "%TARGET%"=="DEBUG" (
> + echo BUILD_TYPE = D >> %BUILD_PATH%/BiosId.env
> +)
> +if "%TARGET%"=="RELEASE" (
> + echo BUILD_TYPE = R >> %BUILD_PATH%/BiosId.env
> +)
> +echo VERSION_MINOR = 01 >> %BUILD_PATH%/BiosId.env
> +
> +%WORKSPACE%\edk2-
> platforms\Platform\Intel\Tools\GenBiosId\GenBiosId.py
> +-i %BUILD_PATH%/BiosId.env -o %BUILD_PATH%/BiosId.bin -ot
> +%BUILD_PATH%/BiosId.txt
> +
> ::*********************************************************
> *************
> :: Build BIOS
> ::*********************************************************
> *************
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index aac8534677..03fa062310 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -66,6 +66,7 @@ cd $CORE_PATH
> make -C BaseTools
>
> ## Define platform specific environment variables.
> +PLATFORM_NAME=Vlv2TbltDevicePkg
> PLATFORM_PACKAGE=Vlv2TbltDevicePkg
> PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
> config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> @@ -186,6 +187,51 @@ else
> echo TARGET_ARCH = IA32 X64 >>
> $WORKSPACE/Conf/target.txt
> fi
>
> +
> +## Set and Create $BUILD_PATH if necessary if [ ! -d ${WORKSPACE}/Build
> +]; then
> + mkdir ${WORKSPACE}/Build
> +fi
> +
> +if [ $Arch == "IA32" ]; then
> + if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME}IA32 ]; then
> + mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}IA32
> + fi
> +
> +BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}IA32/${TARGET}_
> ${TOOL_CHA
> +IN_TAG}
> +else
> + if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME} ]; then
> + mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}
> + fi
> +
> +BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}/${TARGET}_${T
> OOL_CHAIN_T
> +AG}
> +fi
> +
> +if [ ! -d $BUILD_PATH ]; then
> + mkdir $BUILD_PATH
> +fi
> +
> +##*******************************************************
> **************
> +*
> +## Generate BIOS ID
> +##*******************************************************
> **************
> +*
> +
> +echo BOARD_ID = MNW2MAX > $BUILD_PATH/BiosId.env
> +echo BOARD_REV = 1 >> $BUILD_PATH/BiosId.env
> +if [ $Arch == "IA32" ]; then
> + echo BOARD_EXT = I32 >> $BUILD_PATH/BiosId.env
> +fi
> +if [ $Arch == "X64" ]; then
> + echo BOARD_EXT = X64 >> $BUILD_PATH/BiosId.env
> +fi
> +echo VERSION_MAJOR = 0090 >> $BUILD_PATH/BiosId.env
> +if [ $TARGET == "DEBUG" ]; then
> + echo BUILD_TYPE = D >> $BUILD_PATH/BiosId.env
> +fi
> +if [ $TARGET == "RELEASE" ]; then
> + echo BUILD_TYPE = R >> $BUILD_PATH/BiosId.env
> +fi
> +echo VERSION_MINOR = 01 >> $BUILD_PATH/BiosId.env
> +
> +python
> +$WORKSPACE/edk2-
> platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py
> +-i $BUILD_PATH/BiosId.env -o $BUILD_PATH/BiosId.bin -ot
> +$BUILD_PATH/BiosId.txt
> +
>
> ##********************************************************
> **************
> ## Build BIOS
>
> ##********************************************************
> **************
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (20 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 21/28] Vlv2TbltDevicePkg: Re-enable BIOS ID feature Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Michael D Kinney
` (7 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
* Remove CpuIa32Lib that contains inline assembly
that is not compatible with GCC builds. Use BaseLib
functions for CPUID and MSR access and the CPUID and
MSR defintions from the UefiCpuPkg.
* Add PlatformPkgGccIa32.dsc
* Add /IA32 flag to Build_IFWI.sh
* Add /IA32 flag to bld_vlv.sh
* Remove unused references to gEfiPlatformCpuInfoGuid
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../AcpiPlatform/AcpiPlatform.c | 1 -
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 +
.../Include/Guid/PlatformCpuInfo.h | 16 +-
.../Include/Library/CpuIA32.h | 345 ------------------
.../Library/CpuIA32Lib/CpuIA32Lib.inf | 41 ---
.../Library/CpuIA32Lib/EfiCpuVersion.c | 70 ----
.../Library/CpuIA32Lib/IA32/CpuIA32.S | 223 -----------
.../Library/CpuIA32Lib/IA32/CpuIA32.asm | 206 -----------
.../Library/CpuIA32Lib/IA32/CpuIA32.c | 177 ---------
.../Library/CpuIA32Lib/X64/Cpu.S | 207 -----------
.../Library/CpuIA32Lib/X64/Cpu.asm | 222 -----------
.../MonoStatusCode/MonoStatusCode.inf | 1 -
.../PlatformInitPei/MemoryCallback.c | 11 +-
.../PlatformInitPei/PlatformEarlyInit.h | 4 +-
.../PlatformInitPei/PlatformInitPei.inf | 1 -
.../PlatformPei/PlatformPei.inf | 1 -
...formPkgIA32.dsc => PlatformPkgGccIA32.dsc} | 28 +-
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 -
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 -
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 -
.../PlatformSetupDxe/PlatformSetupDxe.h | 1 -
.../PlatformSetupDxe/PlatformSetupDxe.inf | 2 +-
.../PlatformSetupDxe/SetupInfoRecords.c | 42 ++-
.../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 12 +-
.../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 1 +
.../SmBiosMiscDxe/MiscOemType0x90Function.c | 37 +-
.../SmBiosMiscDxe/MiscOemType0x94Function.c | 10 +-
.../MiscProcessorInformationFunction.c | 3 +-
.../SmBiosMiscDxe/SmBiosMiscDxe.inf | 1 -
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 7 +-
30 files changed, 97 insertions(+), 1580 deletions(-)
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
copy Platform/Intel/Vlv2TbltDevicePkg/{PlatformPkgIA32.dsc => PlatformPkgGccIA32.dsc} (96%)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 72edc1bc1e..479ffa61a0 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -36,7 +36,6 @@ Abstract:
#include <Guid/PlatformInfo.h>
#include <Guid/BoardFeatures.h>
#include <Protocol/AcpiTable.h>
-#include <Library/CpuIA32.h>
#include <SetupMode.h>
#include <Guid/AcpiTableStorage.h>
#include <Guid/EfiVpdData.h>
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index 422e90ca6c..349f0c7ba7 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -63,6 +63,10 @@ for (( i=1; i<=$#; ))
Arch=X64
Build_Flags="$Build_Flags /x64"
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
+ Arch=IA32
+ Build_Flags="$Build_Flags /IA32"
+ shift
elif [ "$1" == "/nG" ]; then
Stitch_Flags="$Stitch_Flags /nG"
shift
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
index f1756662bd..eec167da3a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
@@ -1,12 +1,9 @@
/*++
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-
+ Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
+
SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
Module Name:
PlatformCpuInfo.h
@@ -21,7 +18,6 @@ Abstract:
#define _PLATFORM_CPU_INFO_GUID_H_
#include "CpuType.h"
-#include <Library/CpuIA32.h>
#define EFI_PLATFORM_CPU_INFO_GUID \
{\
@@ -95,6 +91,14 @@ typedef struct {
UINT8 HwCoordinationFeedback; // ECX [0]
} EFI_CPU_POWER_MANAGEMENT; // CPUID.6.EAX
+
+typedef struct {
+ UINT32 RegEax;
+ UINT32 RegEbx;
+ UINT32 RegEcx;
+ UINT32 RegEdx;
+} EFI_CPUID_REGISTER;
+
//
// IMPORTANT: Each CPU feature enabling entry is assumed a tri-state variable.
// - Keep the respective feature entry variable as default value (0x00)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
deleted file mode 100644
index 78c78319ce..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*++
-
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
-
-Module Name:
-
- CpuIA32.h
-
-Abstract:
-
---*/
-
-#ifndef _CPU_IA32_H
-#define _CPU_IA32_H
-
-typedef struct {
- UINT32 RegEax;
- UINT32 RegEbx;
- UINT32 RegEcx;
- UINT32 RegEdx;
-} EFI_CPUID_REGISTER;
-
-typedef struct {
- UINT32 HeaderVersion;
- UINT32 UpdateRevision;
- UINT32 Date;
- UINT32 ProcessorId;
- UINT32 Checksum;
- UINT32 LoaderRevision;
- UINT32 ProcessorFlags;
- UINT32 DataSize;
- UINT32 TotalSize;
- UINT8 Reserved[12];
-} EFI_CPU_MICROCODE_HEADER;
-
-typedef struct {
- UINT32 ExtendedSignatureCount;
- UINT32 ExtendedTableChecksum;
- UINT8 Reserved[12];
-} EFI_CPU_MICROCODE_EXTENDED_TABLE_HEADER;
-
-typedef struct {
- UINT32 ProcessorSignature;
- UINT32 ProcessorFlag;
- UINT32 ProcessorChecksum;
-} EFI_CPU_MICROCODE_EXTENDED_TABLE;
-
-typedef struct {
- UINT32 Stepping : 4;
- UINT32 Model : 4;
- UINT32 Family : 4;
- UINT32 Type : 2;
- UINT32 Reserved1 : 2;
- UINT32 ExtendedModel : 4;
- UINT32 ExtendedFamily : 8;
- UINT32 Reserved2 : 4;
-} EFI_CPU_VERSION;
-
-#define EFI_CPUID_SIGNATURE 0x0
-#define EFI_CPUID_VERSION_INFO 0x1
-#define EFI_CPUID_CACHE_INFO 0x2
-#define EFI_CPUID_SERIAL_NUMBER 0x3
-#define EFI_CPUID_EXTENDED_FUNCTION 0x80000000
-#define EFI_CPUID_EXTENDED_CPU_SIG 0x80000001
-#define EFI_CPUID_BRAND_STRING1 0x80000002
-#define EFI_CPUID_BRAND_STRING2 0x80000003
-#define EFI_CPUID_BRAND_STRING3 0x80000004
-
-#define EFI_MSR_IA32_PLATFORM_ID 0x17
-#define EFI_MSR_IA32_APIC_BASE 0x1B
-#define EFI_MSR_EBC_HARD_POWERON 0x2A
-#define EFI_MSR_EBC_SOFT_POWERON 0x2B
-#define BINIT_DRIVER_DISABLE 0x40
-#define INTERNAL_MCERR_DISABLE 0x20
-#define INITIATOR_MCERR_DISABLE 0x10
-#define EFI_MSR_EBC_FREQUENCY_ID 0x2C
-#define EFI_MSR_IA32_BIOS_UPDT_TRIG 0x79
-#define EFI_MSR_IA32_BIOS_SIGN_ID 0x8B
-#define EFI_MSR_PSB_CLOCK_STATUS 0xCD
-#define EFI_APIC_GLOBAL_ENABLE 0x800
-#define EFI_MSR_IA32_MISC_ENABLE 0x1A0
-#define LIMIT_CPUID_MAXVAL_ENABLE_BIT 0x00400000
-#define AUTOMATIC_THERMAL_CONTROL_ENABLE_BIT 0x00000008
-#define COMPATIBLE_FPU_OPCODE_ENABLE_BIT 0x00000004
-#define LOGICAL_PROCESSOR_PRIORITY_ENABLE_BIT 0x00000002
-#define FAST_STRING_ENABLE_BIT 0x00000001
-
-#define EFI_CACHE_VARIABLE_MTRR_BASE 0x200
-#define EFI_CACHE_VARIABLE_MTRR_END 0x20F
-#define EFI_CACHE_IA32_MTRR_DEF_TYPE 0x2FF
-#define EFI_CACHE_MTRR_VALID 0x800
-#define EFI_CACHE_FIXED_MTRR_VALID 0x400
-#define EFI_CACHE_VALID_ADDRESS 0xFFFFFF000
-#define EFI_MSR_VALID_MASK 0xFFFFFFFFF
-#define EFI_CACHE_VALID_EXTENDED_ADDRESS 0xFFFFFFFFFF000
-#define EFI_MSR_VALID_EXTENDED_MASK 0xFFFFFFFFFFFFF
-
-#define EFI_IA32_MTRR_FIX64K_00000 0x250
-#define EFI_IA32_MTRR_FIX16K_80000 0x258
-#define EFI_IA32_MTRR_FIX16K_A0000 0x259
-#define EFI_IA32_MTRR_FIX4K_C0000 0x268
-#define EFI_IA32_MTRR_FIX4K_C8000 0x269
-#define EFI_IA32_MTRR_FIX4K_D0000 0x26A
-#define EFI_IA32_MTRR_FIX4K_D8000 0x26B
-#define EFI_IA32_MTRR_FIX4K_E0000 0x26C
-#define EFI_IA32_MTRR_FIX4K_E8000 0x26D
-#define EFI_IA32_MTRR_FIX4K_F0000 0x26E
-#define EFI_IA32_MTRR_FIX4K_F8000 0x26F
-
-#define EFI_IA32_MCG_CAP 0x179
-#define EFI_IA32_MCG_CTL 0x17B
-#define EFI_IA32_MC0_CTL 0x400
-#define EFI_IA32_MC0_STATUS 0x401
-
-#define EFI_IA32_PERF_STATUS 0x198
-#define EFI_IA32_PERF_CTL 0x199
-
-#define EFI_CACHE_UNCACHEABLE 0
-#define EFI_CACHE_WRITECOMBINING 1
-#define EFI_CACHE_WRITETHROUGH 4
-#define EFI_CACHE_WRITEPROTECTED 5
-#define EFI_CACHE_WRITEBACK 6
-
-//
-// Combine f(FamilyId), m(Model), s(SteppingId) to a single 32 bit number
-//
-#define EfiMakeCpuVersion(f, m, s) \
- (((UINT32) (f) << 16) | ((UINT32) (m) << 8) | ((UINT32) (s)))
-
-/**
- Halt the Cpu
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiHalt (
- VOID
- );
-
-/**
- Write back and invalidate the Cpu cache
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiWbinvd (
- VOID
- );
-
-/**
- Invalidate the Cpu cache
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiInvd (
- VOID
- );
-
-/**
- Get the Cpu info by execute the CPUID instruction
-
- @param[in] RegisterInEax The input value to put into register EAX
- @param[in] Regs The Output value
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiCpuid (
- IN UINT32 RegisterInEax,
- OUT EFI_CPUID_REGISTER *Regs
- );
-
-/**
- When RegisterInEax != 4, the functionality is the same as EfiCpuid.
- When RegisterInEax == 4, the function return the deterministic cache
- parameters by excuting the CPUID instruction.
-
- @param[in] RegisterInEax The input value to put into register EAX.
- @param[in] CacheLevel The deterministic cache level.
- @param[in] Regs The Output value.
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiCpuidExt (
- IN UINT32 RegisterInEax,
- IN UINT32 CacheLevel,
- OUT EFI_CPUID_REGISTER *Regs
- );
-
-/**
- Read Cpu MSR
-
- @param[in] Index The index value to select the register
-
- @retval Return the read data
-
-**/
-UINT64
-EFIAPI
-EfiReadMsr (
- IN UINT32 Index
- );
-
-/**
- Write Cpu MSR
-
- @param[in] Index The index value to select the register
- @param[in] Value The value to write to the selected register
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiWriteMsr (
- IN UINT32 Index,
- IN UINT64 Value
- );
-
-/**
- Read Time stamp
-
- @param[in] None
-
- @retval Return the read data
-
-**/
-UINT64
-EFIAPI
-EfiReadTsc (
- VOID
- );
-
-/**
- Writing back and invalidate the cache,then diable it
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiDisableCache (
- VOID
- );
-
-/**
- Invalidate the cache,then Enable it
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiEnableCache (
- VOID
- );
-
-/**
- Get Eflags
-
- @param[in] None
-
- @retval Return the Eflags value
-
-**/
-UINT32
-EFIAPI
-EfiGetEflags (
- VOID
- );
-
-/**
- Disable Interrupts
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiDisableInterrupts (
- VOID
- );
-
-/**
- Enable Interrupts
-
- @param[in] None
-
- @retval None
-
-**/
-VOID
-EFIAPI
-EfiEnableInterrupts (
- VOID
- );
-
-/**
- Extract CPU detail version infomation
-
- @param[in] FamilyId FamilyId, including ExtendedFamilyId
- @param[in] Model Model, including ExtendedModel
- @param[in] SteppingId SteppingId
- @param[in] Processor Processor
-
-**/
-VOID
-EFIAPI
-EfiCpuVersion (
- IN UINT16 *FamilyId, OPTIONAL
- IN UINT8 *Model, OPTIONAL
- IN UINT8 *SteppingId, OPTIONAL
- IN UINT8 *Processor OPTIONAL
- );
-
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
deleted file mode 100644
index c9f0a434ac..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-
-#
-#
-#
-# Module Name:
-#
-# CpuIA32Lib.inf
-#
-# Abstract:
-#
-# Component description file for the Cpu IA32 library.
-#
-#--*/
-
-[defines]
- INF_VERSION = 0x00010005
- BASE_NAME = CpuIA32Lib
- FILE_GUID = 98546178-64F1-4d2e-814F-6BF963DB7930
- MODULE_TYPE = BASE
- VERSION_STRING = 1.0
- LIBRARY_CLASS = CpuIA32Lib
- PI_SPECIFICATION_VERSION = 0x0001000A
-
-[Sources]
- EfiCpuVersion.c
-
-[Sources.IA32]
- IA32/CpuIA32.c
-
-[Sources.X64]
- X64/Cpu.asm
- X64/Cpu.S
-
-[Packages]
- MdePkg/MdePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
deleted file mode 100644
index 935f11e871..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/** @file
-
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
-Module Name:
-
-
- EfiCpuVersion.c
-
-Abstract:
-
- Provide cpu version extract considering extended family & model ID.
---*/
-
-#include <Library/CpuIA32.h>
-
-/**
- Extract CPU detail version infomation
-
- @param FamilyId FamilyId, including ExtendedFamilyId
- @param Model Model, including ExtendedModel
- @param SteppingId SteppingId
- @param Processor Processor
-
-**/
-VOID
-EFIAPI
-EfiCpuVersion (
- IN OUT UINT16 *FamilyId, OPTIONAL
- IN OUT UINT8 *Model, OPTIONAL
- IN OUT UINT8 *SteppingId, OPTIONAL
- IN OUT UINT8 *Processor OPTIONAL
- )
-
-{
- EFI_CPUID_REGISTER Register;
- UINT8 TempFamilyId;
-
- EfiCpuid (EFI_CPUID_VERSION_INFO, &Register);
-
- if (SteppingId != NULL) {
- *SteppingId = (UINT8) (Register.RegEax & 0xF);
- }
-
- if (Processor != NULL) {
- *Processor = (UINT8) ((Register.RegEax >> 12) & 0x3);
- }
-
- if (Model != NULL || FamilyId != NULL) {
- TempFamilyId = (UINT8) ((Register.RegEax >> 8) & 0xF);
-
- if (Model != NULL) {
- *Model = (UINT8) ((Register.RegEax >> 4) & 0xF);
- if (TempFamilyId == 0x6 || TempFamilyId == 0xF) {
- *Model = (UINT8) (*Model | ((Register.RegEax >> 12) & 0xF0));
- }
- }
-
- if (FamilyId != NULL) {
- *FamilyId = TempFamilyId;
- if (TempFamilyId == 0xF) {
- *FamilyId = (UINT8 ) (*FamilyId + (UINT16) ((Register.RegEax >> 20) & 0xFF));
- }
- }
- }
-}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
deleted file mode 100644
index ba1bd448c0..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
+++ /dev/null
@@ -1,223 +0,0 @@
-#
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-
-#
-#
-#
-#Module Name:
-#
-# CpuIA32.c
-#
-#Abstract:
-#
-#--*/
-
-##include "CpuIA32.h"
-#include "EfiBind.h"
-
-#---------------------------------------------------------------------------
- .586p:
- #.MODEL flat,C
- .code:
-
-#---------------------------------------------------------------------------
-
-.globl ASM_PFX(EfiHalt)
-.globl ASM_PFX(EfiWbinvd)
-.globl ASM_PFX(EfiInvd)
-.globl ASM_PFX(EfiCpuid)
-.globl ASM_PFX(EfiReadMsr)
-.globl ASM_PFX(EfiWriteMsr)
-.globl ASM_PFX(EfiReadTsc)
-.globl ASM_PFX(EfiDisableCache)
-.globl ASM_PFX(EfiEnableCache)
-.globl ASM_PFX(EfiGetEflags)
-.globl ASM_PFX(EfiDisableInterrupts)
-.globl ASM_PFX(EfiEnableInterrupts)
-.globl ASM_PFX(EfiCpuidExt)
-
-
-#VOID
-#EfiHalt (
-# VOID
-#)
-ASM_PFX(EfiHalt):
- hlt
- ret
-#EfiHalt ENDP
-
-#VOID
-#EfiWbinvd (
-# VOID
-#)
-ASM_PFX(EfiWbinvd):
- wbinvd
- ret
-#EfiWbinvd ENDP
-
-#VOID
-#EfiInvd (
-# VOID
-#)
-ASM_PFX(EfiInvd):
- invd
- ret
-#EfiInvd ENDP
-
-#VOID
-#EfiCpuid (IN UINT32 RegisterInEax,
-# OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
-ASM_PFX(EfiCpuid):
- pushl %ebp
- movl %esp, %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
- pushal
-
- movl 8(%ebp), %eax #RegisterInEax
- cpuid
- cmpl $0, 0xC(%ebp) # Reg
- je L1
- movl 0xC(%ebp), %edi # Reg
-
- movl %eax, (%edi) # Reg->RegEax
- movl %ebx, 4(%edi) # Reg->RegEbx
- movl %ecx, 8(%edi) # Reg->RegEcx
- movl %edx, 0xC(%edi) # Reg->RegEdx
-
-L1:
- popal
- popl %edi
- popl %esi
- popl %ebx
- popl %ebp
-
- ret
-#EfiCpuid ENDP
-
-
-#UINT64
-#EfiReadMsr (
-# IN UINT32 Index
-# );
-ASM_PFX(EfiReadMsr):
- movl 4(%esp), %ecx # Index
- rdmsr
- ret
-#EfiReadMsr ENDP
-
-#VOID
-#EfiWriteMsr (
-# IN UINT32 Index,
-# IN UINT64 Value
-# );
-ASM_PFX(EfiWriteMsr):
- movl 4(%esp), %ecx # Index
- movl 8(%esp), %eax # DWORD PTR Value[0]
- movl 0xC(%esp), %edx # DWORD PTR Value[4]
- wrmsr
- ret
-#EfiWriteMsr ENDP
-
-#UINT64
-#EfiReadTsc (
-# VOID
-# )
-ASM_PFX(EfiReadTsc):
- rdtsc
- ret
-#EfiReadTsc ENDP
-
-#VOID
-#EfiDisableCache (
-# VOID
-#)
-ASM_PFX(EfiDisableCache):
- movl %cr0, %eax
- bswapl %eax
- andb $0x60, %al
- cmpb $0x60, %al
- je L2
- movl %cr0, %eax
- orl $0x60000000, %eax
- movl %eax, %cr0
- wbinvd
-L2:
- ret
-#EfiDisableCache ENDP
-
-#VOID
-#EfiEnableCache (
-# VOID
-# )
-ASM_PFX(EfiEnableCache):
- wbinvd
- movl %cr0, %eax
- andl $0x9fffffff, %eax
- movl %eax, %cr0
- ret
-#EfiEnableCache ENDP
-
-#UINT32
-#EfiGetEflags (
-# VOID
-# )
-ASM_PFX(EfiGetEflags):
- pushfl
- popl %eax
- ret
-#EfiGetEflags ENDP
-
-#VOID
-#EfiDisableInterrupts (
-# VOID
-# )
-ASM_PFX(EfiDisableInterrupts):
- cli
- ret
-#EfiDisableInterrupts ENDP
-
-#VOID
-#EfiEnableInterrupts (
-# VOID
-# )
-ASM_PFX(EfiEnableInterrupts):
- sti
- ret
-#EfiEnableInterrupts ENDP
-
-#VOID
-#EfiCpuidExt (
-# IN UINT32 RegisterInEax,
-# IN UINT32 CacheLevel,
-# OUT EFI_CPUID_REGISTER *Regs
-# )
-ASM_PFX(EfiCpuidExt):
- push %ebx
- push %edi
- push %esi
- pushal
-
- movl 0x30(%esp), %eax # RegisterInEax
- movl 0x34(%esp), %ecx # CacheLevel
- cpuid
- movl 0x38(%esp), %edi # DWORD PTR Regs
-
- movl %eax, (%edi) # Reg->RegEax
- movl %ebx, 4(%edi) # Reg->RegEbx
- movl %ecx, 8(%edi) # Reg->RegEcx
- movl %edx, 0xC(%edi) # Reg->RegEdx
-
- popal
- pop %esi
- pop %edi
- pop %ebx
- ret
-#EfiCpuidExt ENDP
-
-
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
deleted file mode 100644
index 3fdf16f8ee..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
+++ /dev/null
@@ -1,206 +0,0 @@
-;
-; This file contains an 'Intel Sample Driver' and is
-; licensed for Intel CPUs and chipsets under the terms of your
-; license agreement with Intel or your vendor. This file may
-; be modified by the user, subject to additional terms of the
-; license agreement
-;
-;
-; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-;
-; SPDX-License-Identifier: BSD-2-Clause-Patent
-
-;
-;
-
-;Module Name:
-;
-; CpuIA32.c
-;
-;Abstract:
-;
-;--*/
-
-;#include "CpuIA32.h"
-
-;---------------------------------------------------------------------------
- .586p
- .model flat,C
- .code
-
-;---------------------------------------------------------------------------
-;VOID
-;EfiHalt (
-; VOID
-;)
-EfiHalt PROC C PUBLIC
- hlt
- ret
-EfiHalt ENDP
-
-;VOID
-;EfiWbinvd (
-; VOID
-;)
-EfiWbinvd PROC C PUBLIC
- wbinvd
- ret
-EfiWbinvd ENDP
-
-;VOID
-;EfiInvd (
-; VOID
-;)
-EfiInvd PROC C PUBLIC
- invd
- ret
-EfiInvd ENDP
-
-;VOID
-;EfiCpuid (IN UINT32 RegisterInEax,
-; OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
-EfiCpuid PROC C PUBLIC
- push ebp
- mov ebp, esp
- push ebx
- push esi
- push edi
- pushad
-
- mov eax, dword ptr[ebp + 8] ;egisterInEax
- cpuid
- cmp dword ptr[ebp + 0Ch], 0 ; Reg
- je @F
- mov edi,dword ptr [ebp+0Ch] ; Reg
-
- mov dword ptr [edi],eax ; Reg->RegEax
- mov dword ptr [edi+4],ebx ; Reg->RegEbx
- mov dword ptr [edi+8],ecx ; Reg->RegEcx
- mov dword ptr [edi+0Ch],edx ; Reg->RegEdx
-
-@@:
- popad
- pop edi
- pop esi
- pop ebx
- pop ebp
-
- ret
-EfiCpuid ENDP
-
-
-;UINT64
-;EfiReadMsr (
-; IN UINT32 Index
-; );
-EfiReadMsr PROC C PUBLIC
- mov ecx, dword ptr [esp + 4]; Index
- rdmsr
- ret
-EfiReadMsr ENDP
-
-;VOID
-;EfiWriteMsr (
-; IN UINT32 Index,
-; IN UINT64 Value
-; );
-EfiWriteMsr PROC C PUBLIC
- mov ecx, dword ptr [esp+4]; Index
- mov eax, dword ptr [esp+8]; DWORD PTR Value[0]
- mov edx, dword ptr [esp+0Ch]; DWORD PTR Value[4]
- wrmsr
- ret
-EfiWriteMsr ENDP
-
-;UINT64
-;EfiReadTsc (
-; VOID
-; )
-EfiReadTsc PROC C PUBLIC
- rdtsc
- ret
-EfiReadTsc ENDP
-
-;VOID
-;EfiDisableCache (
-; VOID
-;)
-EfiDisableCache PROC C PUBLIC
- mov eax, cr0
- bswap eax
- and al, 60h
- cmp al, 60h
- je @F
- mov eax, cr0
- or eax, 060000000h
- mov cr0, eax
- wbinvd
-@@:
- ret
-EfiDisableCache ENDP
-
-;VOID
-;EfiEnableCache (
-; VOID
-; )
-EfiEnableCache PROC C PUBLIC
- wbinvd
- mov eax, cr0
- and eax, 09fffffffh
- mov cr0, eax
- ret
-EfiEnableCache ENDP
-
-;UINT32
-;EfiGetEflags (
-; VOID
-; )
-EfiGetEflags PROC C PUBLIC
- pushfd
- pop eax
- ret
-EfiGetEflags ENDP
-
-;VOID
-;EfiDisableInterrupts (
-; VOID
-; )
-EfiDisableInterrupts PROC C PUBLIC
- cli
- ret
-EfiDisableInterrupts ENDP
-
-;VOID
-;EfiEnableInterrupts (
-; VOID
-; )
-EfiEnableInterrupts PROC C PUBLIC
- sti
- ret
-EfiEnableInterrupts ENDP
-
-;VOID
-;EfiCpuidExt (
-; IN UINT32 RegisterInEax,
-; IN UINT32 CacheLevel,
-; OUT EFI_CPUID_REGISTER *Regs
-; )
-EfiCpuidExt PROC C PUBLIC USES ebx edi esi
- pushad
-
- mov eax, dword ptr [esp + 30h] ; RegisterInEax
- mov ecx, dword ptr [esp + 34h] ; CacheLevel
- cpuid
- mov edi, dword ptr [esp + 38h] ; DWORD PTR Regs
-
- mov dword ptr [edi], eax ; Reg->RegEax
- mov dword ptr [edi + 4], ebx ; Reg->RegEbx
- mov dword ptr [edi + 8], ecx ; Reg->RegEcx
- mov dword ptr [edi + 0Ch], edx ; Reg->RegEdx
-
- popad
- ret
-EfiCpuidExt ENDP
-
- END
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
deleted file mode 100644
index cb8de2f9c7..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/** @file
-
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
-Module Name:
-
-
- CpuIA32.c
-
-Abstract:
-
---*/
-
-#include <Library/CpuIA32.h>
-
-VOID
-EfiHalt (VOID)
-{
- __asm {
- hlt
- }
-}
-
-VOID
-EfiWbinvd (VOID)
-{
- __asm {
- wbinvd
- }
-}
-
-VOID
-EfiInvd (VOID)
-{
- __asm {
- invd
- }
-}
-
-VOID
-EfiCpuid (IN UINT32 RegisterInEax,
- OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
-{
- __asm {
- pushad
-
- mov eax, RegisterInEax
- cpuid
- cmp Reg, 0
- je _Exit
- mov edi, DWORD PTR Reg
-
- mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax
- mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx
- mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx
- mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx
-
-_Exit:
- popad
- }
-}
-
-UINT64
-EfiReadMsr (IN UINT32 Index)
-{
- __asm {
- mov ecx, Index
- rdmsr
- }
-}
-
-VOID
-EfiWriteMsr (
- IN UINT32 Index,
- IN UINT64 Value
- )
-{
- __asm {
- mov ecx, Index
- mov eax, DWORD PTR Value[0]
- mov edx, DWORD PTR Value[4]
- wrmsr
- }
-}
-
-UINT64
-EfiReadTsc (VOID)
-{
- __asm {
- rdtsc
- }
-}
-
-VOID
-EfiDisableCache (VOID)
-{
- __asm {
- mov eax, cr0
- bswap eax
- and al, 60h
- cmp al, 60h
- je Exit
- mov eax, cr0
- or eax, 060000000h
- mov cr0, eax
- wbinvd
-Exit:
- }
-}
-
-VOID
-EfiEnableCache (VOID)
-{
- __asm {
- wbinvd
- mov eax, cr0
- and eax, 09fffffffh
- mov cr0, eax
- }
-}
-
-UINT32
-EfiGetEflags (
- VOID
- )
-{
- __asm {
- pushfd
- pop eax
- }
-}
-
-VOID
-EfiDisableInterrupts (VOID)
-{
- __asm {
- cli
- }
-}
-
-VOID
-EfiEnableInterrupts (
- VOID
- )
-{
- __asm {
- sti
- }
-}
-
-VOID
-EfiCpuidExt (
- IN UINT32 RegisterInEax,
- IN UINT32 CacheLevel,
- OUT EFI_CPUID_REGISTER *Regs
- )
-{
- __asm {
- pushad
-
- mov eax, RegisterInEax
- mov ecx, CacheLevel
- cpuid
- mov edi, DWORD PTR Regs
-
- mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax
- mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx
- mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx
- mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx
-
- popad
- }
-}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
deleted file mode 100644
index 3a8d6e6bc5..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-
-#
-#
-#
-#* Module Name:
-#*
-#* Cpu.asm
-#*
-#* Abstract:
-#*
-#------------------------------------------------------------------------------
-##include <EfiBind.h>
-
-.globl ASM_PFX(EfiHalt)
-.globl ASM_PFX(EfiWbinvd)
-.globl ASM_PFX(EfiInvd)
-.globl ASM_PFX(EfiCpuid)
-.globl ASM_PFX(EfiReadTsc)
-.globl ASM_PFX(EfiDisableCache)
-.globl ASM_PFX(EfiEnableCache)
-.globl ASM_PFX(EfiReadMsr)
-.globl ASM_PFX(EfiWriteMsr)
-.globl ASM_PFX(EfiGetEflags)
-.globl ASM_PFX(EfiDisableInterrupts)
-.globl ASM_PFX(EfiEnableInterrupts)
-.globl ASM_PFX(EfiCpuidExt)
-
-.text
-
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiHalt (
-# VOID
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiHalt):
- hlt
- retq
-
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiWbinvd (
-# VOID
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiWbinvd):
- wbinvd
- retq
-
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiInvd (
-# VOID
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiInvd):
- invd
- retq
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiCpuid (
-# IN UINT32 RegisterInEax, // rcx
-# OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiCpuid):
- push %rbx
- mov %rdx,%r8
- mov %rcx,%rax
- cpuid
- cmp $0x0,%r8
- je _Exit
- mov %eax,(%r8)
- mov %ebx,0x4(%r8)
- mov %ecx,0x8(%r8)
- mov %edx,0xc(%r8)
-_Exit:
- pop %rbx
- retq
-
-#------------------------------------------------------------------------------
-# UINT64
-# EfiReadMsr (
-# IN UINT32 Index, // rcx
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiReadMsr):
- rdmsr
- shl $0x20,%rdx
- or %rdx,%rax
- retq
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiWriteMsr (
-# IN UINT32 Index, // rcx
-# IN UINT64 Value // rdx
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiWriteMsr):
- mov %rdx,%rax
- sar $0x20,%rdx
- wrmsr
- retq
-
-#------------------------------------------------------------------------------
-# UINT64
-# EfiReadTsc (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiReadTsc):
- rdtsc
- shl $0x20,%rax
- shrd $0x20,%rdx,%rax
- retq
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiDisableCache (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiDisableCache):
-# added a check to see if cache is already disabled. If it is, then skip.
- mov %cr0,%rax
- and $0x60000000,%rax
- cmp $0x0,%rax
- jne 1f
- mov %cr0,%rax
- or $0x60000000,%rax
- mov %rax,%cr0
- wbinvd
-1:
- retq
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiEnableCache (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiEnableCache):
- wbinvd
- mov %cr0,%rax
- and $0xffffffff9fffffff,%rax
- mov %rax,%cr0
- retq
-
-#------------------------------------------------------------------------------
-# UINTN
-# EfiGetEflags (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiGetEflags):
- pushfq
- pop %rax
- retq
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiDisableInterrupts (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiDisableInterrupts):
- cli
- ret
-
-#------------------------------------------------------------------------------
-# VOID
-# EfiEnableInterrupts (
-# VOID
-# );
-#------------------------------------------------------------------------------
-ASM_PFX(EfiEnableInterrupts):
- sti
- ret
-#------------------------------------------------------------------------------
-# VOID
-# EfiCpuidExt (
-# IN UINT32 RegisterInEax,
-# IN UINT32 CacheLevel,
-# OUT EFI_CPUID_REGISTER *Regs
-# )
-#------------------------------------------------------------------------------
-ASM_PFX(EfiCpuidExt):
- push %rbx
- mov %rcx,%rax
- mov %rdx,%rcx
- cpuid
- mov %eax,(%r8)
- mov %ebx,0x4(%r8)
- mov %ecx,0x8(%r8)
- mov %edx,0xc(%r8)
- pop %rbx
- retq
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
deleted file mode 100644
index 44aae7de64..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
+++ /dev/null
@@ -1,222 +0,0 @@
-
-TITLE Cpu.asm: Assembly code for the x64 resources
-
-;
-; This file contains an 'Intel Sample Driver' and is
-; licensed for Intel CPUs and chipsets under the terms of your
-; license agreement with Intel or your vendor. This file may
-; be modified by the user, subject to additional terms of the
-; license agreement
-;
-;
-; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-;
-; SPDX-License-Identifier: BSD-2-Clause-Patent
-
-;
-;
-;
-;
-;
-;* Module Name:
-;*
-;* Cpu.asm
-;*
-;* Abstract:
-;*
-;------------------------------------------------------------------------------
-
-text SEGMENT
-
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiHalt (
-; VOID
-; )
-;------------------------------------------------------------------------------
-EfiHalt PROC PUBLIC
- hlt
- ret
-EfiHalt ENDP
-
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiWbinvd (
-; VOID
-; )
-;------------------------------------------------------------------------------
-EfiWbinvd PROC PUBLIC
- wbinvd
- ret
-EfiWbinvd ENDP
-
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiInvd (
-; VOID
-; )
-;------------------------------------------------------------------------------
-EfiInvd PROC PUBLIC
- invd
- ret
-EfiInvd ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiCpuid (
-; IN UINT32 RegisterInEax, // rcx
-; OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx
-; )
-;------------------------------------------------------------------------------
-EfiCpuid PROC PUBLIC
- push rbx
-
- mov r8, rdx ; r8 = *Reg
- mov rax, rcx ; RegisterInEax
- cpuid
- cmp r8, 0
- je _Exit
- mov [r8 + 0], eax ; Reg->RegEax
- mov [r8 + 4], ebx ; Reg->RegEbx
- mov [r8 + 8], ecx ; Reg->RegEcx
- mov [r8 + 12], edx ; Reg->RegEdx
-
-_Exit:
- pop rbx
- ret
-EfiCpuid ENDP
-
-;------------------------------------------------------------------------------
-; UINT64
-; EfiReadMsr (
-; IN UINT32 Index, // rcx
-; )
-;------------------------------------------------------------------------------
-EfiReadMsr PROC PUBLIC
- rdmsr
- sal rdx, 32 ; edx:eax -> rax
- or rax, rdx ; rax = edx:eax
- ret
-EfiReadMsr ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiWriteMsr (
-; IN UINT32 Index, // rcx
-; IN UINT64 Value // rdx
-; )
-;------------------------------------------------------------------------------
-EfiWriteMsr PROC PUBLIC
- mov rax, rdx ; rdx = Value
- sar rdx, 32 ; convert rdx to edx upper 32-bits
- wrmsr ; wrmsr[ecx] result = edx:eax
- ret
-EfiWriteMsr ENDP
-
-
-;------------------------------------------------------------------------------
-; UINT64
-; EfiReadTsc (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiReadTsc PROC PUBLIC
- rdtsc
- shl rax, 32
- shrd rax, rdx, 32
- ret
-EfiReadTsc ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiDisableCache (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiDisableCache PROC PUBLIC
-; added a check to see if cache is already disabled. If it is, then skip.
- mov rax, cr0
- and rax, 060000000h
- cmp rax, 0
- jne @f
- mov rax, cr0
- or rax, 060000000h
- mov cr0, rax
- wbinvd
-@@:
- ret
-EfiDisableCache ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiEnableCache (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiEnableCache PROC PUBLIC
- wbinvd
- mov rax, cr0
- and rax, 09fffffffh
- mov cr0, rax
- ret
-EfiEnableCache ENDP
-
-;------------------------------------------------------------------------------
-; UINTN
-; EfiGetEflags (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiGetEflags PROC PUBLIC
- pushfq
- pop rax
- ret
-EfiGetEflags ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiDisableInterrupts (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiDisableInterrupts PROC PUBLIC
- cli
- ret
-EfiDisableInterrupts ENDP
-
-;------------------------------------------------------------------------------
-; VOID
-; EfiEnableInterrupts (
-; VOID
-; );
-;------------------------------------------------------------------------------
-EfiEnableInterrupts PROC PUBLIC
- sti
- ret
-EfiEnableInterrupts ENDP
-;------------------------------------------------------------------------------
-; VOID
-; EfiCpuidExt (
-; IN UINT32 RegisterInEax,
-; IN UINT32 CacheLevel,
-; OUT EFI_CPUID_REGISTER *Regs
-; )
-;------------------------------------------------------------------------------
-EfiCpuidExt PROC PUBLIC
- push rbx
- mov rax, rcx ; rax = RegisterInEax
- mov rcx, rdx ; rcx = CacheLevel
-
- cpuid
- mov [r8 + 0 ], eax ; Reg->RegEax
- mov [r8 + 4 ], ebx ; Reg->RegEbx
- mov [r8 + 8 ], ecx ; Reg->RegEcx
- mov [r8 + 12], edx ; Reg->RegEdx
-
- pop rbx
- ret
-EfiCpuidExt ENDP
-END
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
index c5e3cf4d55..f1e8c7f639 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
@@ -58,7 +58,6 @@ [Pcd]
gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam
[Guids]
- gEfiPlatformCpuInfoGuid
gEfiStatusCodeDataTypeStringGuid ## CONSUMES
[Depex]
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
index 074bf7debb..61ecc52cb5 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
@@ -124,7 +124,8 @@ MemoryDiscoveredPpiNotifyCallback (
{
EFI_STATUS Status;
EFI_BOOT_MODE BootMode;
- EFI_CPUID_REGISTER FeatureInfo;
+ UINT32 MaximumExtendedFunction;
+ CPUID_VIR_PHY_ADDRESS_SIZE_EAX Eax;
UINT8 CpuAddressWidth;
UINT16 Pm1Cnt;
EFI_PEI_HOB_POINTERS Hob;
@@ -279,10 +280,10 @@ MemoryDiscoveredPpiNotifyCallback (
// Create a CPU hand-off information
//
CpuAddressWidth = 32;
- AsmCpuid (EFI_CPUID_EXTENDED_FUNCTION, &FeatureInfo.RegEax, &FeatureInfo.RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx);
- if (FeatureInfo.RegEax >= EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE) {
- AsmCpuid (EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE, &FeatureInfo.RegEax, &FeatureInfo.RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx);
- CpuAddressWidth = (UINT8) (FeatureInfo.RegEax & 0xFF);
+ AsmCpuid (CPUID_EXTENDED_FUNCTION, &MaximumExtendedFunction, NULL, NULL, NULL);
+ if (MaximumExtendedFunction >= CPUID_VIR_PHY_ADDRESS_SIZE) {
+ AsmCpuid (CPUID_VIR_PHY_ADDRESS_SIZE, &Eax.Uint32, NULL, NULL, NULL);
+ CpuAddressWidth = (UINT8) (Eax.Bits.PhysicalAddressBits);
}
BuildCpuHob(CpuAddressWidth, 16);
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
index 6a2ecf8fb4..8c02adba64 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
@@ -53,7 +53,7 @@ Abstract:
#include <Library/BaseLib.h>
#include <Library/PeiServicesLib.h>
#include <Library/MtrrLib.h>
-#include <Library/CpuIA32.h>
+#include <Register/Cpuid.h>
#include <IndustryStandard/Pci22.h>
#include <Ppi/Speaker.h>
@@ -95,8 +95,6 @@ Abstract:
#define SMBIOS_WAKEUP_TYPE_PCI_PME 0x07
#define SMBIOS_WAKEUP_TYPE_AC_POWER_RESTORED 0x08
-#define EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE 0x80000008
-
//
// Defines for stall ppi
//
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
index eeb9a4a023..8350cf47b7 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
@@ -78,7 +78,6 @@ [Guids]
gEfiSetupVariableGuid
gEfiPlatformInfoGuid
gEfiPlatformBootModeGuid
- gEfiPlatformCpuInfoGuid
gEfiGlobalVariableGuid
gRecoveryOnFatFloppyDiskGuid
gRecoveryOnFatUsbDiskGuid
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
index d3969f2344..aac93b0b90 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
@@ -100,7 +100,6 @@ [Guids]
gEfiSetupVariableGuid
gEfiPlatformInfoGuid
gEfiPlatformBootModeGuid
- gEfiPlatformCpuInfoGuid
gEfiGlobalVariableGuid
gRecoveryOnFatFloppyDiskGuid
gRecoveryOnFatUsbDiskGuid
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
similarity index 96%
copy from Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
copy to Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index dc6d8b1b26..7993ee5758 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -42,7 +42,7 @@ [Defines]
DEFINE DXE_ARCHITECTURE = IA32
!endif
- FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
+ FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
!if $(LFMA_ENABLE) == TRUE
FIX_LOAD_TOP_MEMORY_ADDRESS = 0xFFFFFFFFFFFFFFFF
DEFINE TOP_MEMORY_ADDRESS = 0xFFFFFFFFFFFFFFFF
@@ -220,7 +220,6 @@ [LibraryClasses.common]
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
- CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
@@ -770,7 +769,7 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
<BuildOptions>
- *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
+ *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1245,14 +1244,14 @@ [BuildOptions]
DEFINE MINNOW2_FSP_OPTION =
!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
+ DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
!else
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
+ DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
!endif
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
- DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
+ DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
!else
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
!endif
@@ -1260,29 +1259,29 @@ [BuildOptions]
!if $(PCIESC_ENABLE) == TRUE
- DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
+ DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
+ DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
!else
DEFINE SATA_SUPPORT_BUILD_OPTION =
!endif
!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
+ DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
!else
DEFINE ENBDT_S3_SUPPORT_OPTIONS =
!endif
!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
+ DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
!else
DEFINE X64_BUILD_ENABLE =
!endif
!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
+ DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
!else
DEFINE DSC_TPM_BUILD_OPTIONS =
!endif
@@ -1293,13 +1292,12 @@ [BuildOptions]
DEFINE PDB_BUILD_OPTION = /Zi
!endif
+ GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
!if $(SOURCE_DEBUG_ENABLE) == TRUE
MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable
INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-!if $(TARGET) == DEBUG
- DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = /Od /Oy-
-!endif
+ DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
@@ -1322,7 +1320,7 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
+ *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 26c1caad94..ee0d055d64 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -222,7 +222,6 @@ [LibraryClasses.common]
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
- CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index dc6d8b1b26..62ca4f67cc 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -220,7 +220,6 @@ [LibraryClasses.common]
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
- CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index cbc87aa9be..282ff3c2e2 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -222,7 +222,6 @@ [LibraryClasses.common]
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
- CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
index b4a30511ac..1876977e4d 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
@@ -41,7 +41,6 @@
#include <Library/DxeServicesTableLib.h>
#include <Library/HiiLib.h>
#include <Library/BiosIdLib.h>
-#include <Library/CpuIA32.h>
#include <Library/HobLib.h>
#include <Guid/PlatformInfo.h>
#include <IndustryStandard/Pci22.h>
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
index 8ff246041d..ce92b9241a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
@@ -61,6 +61,7 @@ [Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
SecurityPkg/SecurityPkg.dec
+ UefiCpuPkg/UefiCpuPkg.dec
BoardModulePkg/BoardModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h
@@ -79,7 +80,6 @@ [LibraryClasses]
UefiRuntimeServicesTableLib
PrintLib
BiosIdLib
- CpuIA32Lib
IoLib
HobLib
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
index be99356d0f..1770d0de42 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
@@ -27,6 +27,8 @@ Revision History:
#include <IndustryStandard/SmBios.h>
#include <Library/IoLib.h>
#include <Guid/GlobalVariable.h>
+#include <Register/Cpuid.h>
+#include <Register/Msr.h>
#include "Valleyview.h"
#include "VlvAccess.h"
@@ -74,7 +76,6 @@ SB_REV SBRevisionTable[] = {
#define PREFIX_ZERO 0x20
#define ICH_REG_REV 0x08
-#define MSR_IA32_PLATFORM_ID 0x17
BOOLEAN mSetupInfoDone = FALSE;
@@ -495,7 +496,7 @@ UpdateAdditionalInformation (
GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type4Record + Type4Record->Hdr.Length), StrIndex, &ProcessorVersion);
HiiSetString (mHiiHandle, STR_PROCESSOR_VERSION_VALUE, ProcessorVersion, NULL);
- MicrocodeRevision = (UINT32) RShiftU64 (AsmReadMsr64 (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
+ MicrocodeRevision = (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIGN_ID), 32);
UnicodeSPrint (NewString, sizeof (NewString), L"%8x", MicrocodeRevision);
HiiSetString (mHiiHandle, STR_PROCESSOR_MICROCODE_VALUE, NewString, NULL);
}
@@ -590,22 +591,29 @@ VOID
UpdateCPUInformation ()
{
CHAR16 Buffer[40];
- UINT16 FamilyId;
- UINT8 Model;
- UINT8 SteppingId;
- UINT8 ProcessorType;
+ UINT32 FamilyId;
+ UINT32 Model;
+ UINT32 SteppingId;
EFI_STATUS Status;
EFI_MP_SERVICES_PROTOCOL *MpService;
UINTN MaximumNumberOfCPUs;
UINTN NumberOfEnabledCPUs;
UINT32 Buffer32 = 0xFFFFFFFF; // Keep buffer with unknown device
+ CPUID_VERSION_INFO_EAX Eax;
+ CPUID_VERSION_INFO_EBX Ebx;
+ CPUID_VERSION_INFO_ECX Ecx;
+ CPUID_VERSION_INFO_EDX Edx;
- EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType);
-
- //
- //we need raw Model data
- //
- Model = Model & 0xf;
+ AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx.Uint32);
+ FamilyId = Eax.Bits.FamilyId;
+ if (Eax.Bits.FamilyId == 0x0F) {
+ FamilyId |= (Eax.Bits.ExtendedFamilyId << 4);
+ }
+ Model = Eax.Bits.Model;
+ if (Eax.Bits.FamilyId == 0x06 || Eax.Bits.FamilyId == 0x0f) {
+ Model |= (Eax.Bits.ExtendedModelId << 4);
+ }
+ SteppingId = Eax.Bits.SteppingId;
//
//Family/Model/Step
@@ -633,7 +641,7 @@ UpdateCPUInformation ()
//
// Update Mobile / Desktop / Tablet SKU
//
- Buffer32 =(UINT32) RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07;
+ Buffer32 =(UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) & 0x07;
switch(Buffer32){
case 0x0:
@@ -903,7 +911,7 @@ UpdatePlatformInformation (
// VLV-QC Desktop 010
// VLV-QC Notebook 011
//
- CpuFlavor = RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07;
+ CpuFlavor = RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) & 0x07;
switch(CpuFlavor){
case 0x0:
@@ -1038,9 +1046,9 @@ UpdatePlatformInformation (
//
// Microcode Revision
//
- EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
- EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
- MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
+ AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
+ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
+ MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIGN_ID), 32);
UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
HiiSetString(mHiiHandle,STRING_TOKEN(STR_PROCESSOR_MICROCODE_VALUE), Buffer, NULL);
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
index 3583e324e6..4fd618a9a6 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
@@ -18,15 +18,12 @@ Abstract:
#include <Protocol/MpService.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
-#include <Library/CpuIA32.h>
+#include <Register/Cpuid.h>
+#include <Register/Msr.h>
#include <PchRegs.h>
#include <Library/PchPlatformLib.h>
-#define EFI_CPUID_FAMILY 0x0F00
-#define EFI_CPUID_MODEL 0x00F0
-#define EFI_CPUID_STEPPING 0x000F
-
EFI_STATUS
EFIAPI
PpmPolicyEntry(
@@ -36,7 +33,6 @@ PpmPolicyEntry(
{
EFI_BOOT_SERVICES *pBS;
EFI_MP_SERVICES_PROTOCOL *MpService;
- EFI_CPUID_REGISTER Cpuid01 = { 0, 0, 0, 0};
EFI_HANDLE Handle;
EFI_STATUS Status;
UINTN CpuCount;
@@ -70,13 +66,13 @@ PpmPolicyEntry(
//
// Store the CPUID for use by SETUP items.
//
- AsmCpuid (EFI_CPUID_VERSION_INFO, &Cpuid01.RegEax, &Cpuid01.RegEbx, &Cpuid01.RegEcx, &Cpuid01.RegEdx);
+ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
mDxePlatformPpmPolicy.Revision = PPM_PLATFORM_POLICY_PROTOCOL_REVISION_4;
//Read CPU Mobile feature from PLATFORM_ID_MSR MSR(0x17) NOTFB_I_AM_NOT_MOBILE_FUSE_CLIAMC00H Bit 28
//Bit Description: { Disables Mobile features 0 = I am NOT a mobile part 1 = I am a mobile part (default)"}
- CPUMobileFeature = ((RShiftU64 (AsmReadMsr64(EFI_MSR_IA32_PLATFORM_ID), 28)) & 0x1);
+ CPUMobileFeature = ((RShiftU64 (AsmReadMsr64(MSR_IA32_PLATFORM_ID), 28)) & 0x1);
if (!EFI_ERROR(Status)) {
if (CPUMobileFeature == 1){//CPU mobile feature
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
index 2c0a13f6af..5bcce02983 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
@@ -27,6 +27,7 @@ [Sources]
[Packages]
MdePkg/MdePkg.dec
+ UefiCpuPkg/UefiCpuPkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
index 684cda83ec..d5a4243624 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Function.c
@@ -23,8 +23,9 @@ Abstract:
#include "MiscSubclassDriver.h"
#include <Library/PrintLib.h>
-#include <Library/CpuIA32.h>
#include <Protocol/DxeSmmReadyToLock.h>
+#include <Register/Cpuid.h>
+#include <Register/Msr.h>
VOID
@@ -32,18 +33,24 @@ GetCPUStepping ( )
{
CHAR16 Buffer[40];
- UINT16 FamilyId;
- UINT8 Model;
- UINT8 SteppingId;
- UINT8 ProcessorType;
+ UINT32 FamilyId;
+ UINT32 Model;
+ UINT32 SteppingId;
+ CPUID_VERSION_INFO_EAX Eax;
+ CPUID_VERSION_INFO_EBX Ebx;
+ CPUID_VERSION_INFO_ECX Ecx;
+ CPUID_VERSION_INFO_EDX Edx;
-
- EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType);
-
- //
- //we need raw Model data
- //
- Model = Model & 0xf;
+ AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32, &Ecx.Uint32, &Edx.Uint32);
+ FamilyId = Eax.Bits.FamilyId;
+ if (Eax.Bits.FamilyId == 0x0F) {
+ FamilyId |= (Eax.Bits.ExtendedFamilyId << 4);
+ }
+ Model = Eax.Bits.Model;
+ if (Eax.Bits.FamilyId == 0x06 || Eax.Bits.FamilyId == 0x0f) {
+ Model |= (Eax.Bits.ExtendedModelId << 4);
+ }
+ SteppingId = Eax.Bits.SteppingId;
//
//Family/Model/Step
@@ -243,9 +250,9 @@ GetUcodeVersion()
//
// Microcode Revision
//
- EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
- EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
- MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
+ AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
+ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
+ MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIGN_ID), 32);
UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_UCODE_VERSION), Buffer, NULL);
}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
index 97a782e362..f1bb15ae6e 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Function.c
@@ -29,7 +29,6 @@ Abstract:
#include <Protocol/I2cBus.h>
#include <Library/IoLib.h>
-#include <Library/CpuIA32.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Guid/PlatformInfo.h>
#include <Guid/SetupVariable.h>
@@ -73,7 +72,6 @@ SB_REV SBRevisionTable[] = {
#define PREFIX_ZERO 0x20
#define ICH_REG_REV 0x08
-#define MSR_IA32_PLATFORM_ID 0x17
#define CHARACTER_NUMBER_FOR_VALUE 30
@@ -565,7 +563,7 @@ UpdatePlatformInformation (
//
//CPU flavor
//
- CpuFlavor = RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07;
+ CpuFlavor = RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) & 0x07;
switch(CpuFlavor){
case 0x0:
@@ -661,9 +659,9 @@ UpdatePlatformInformation (
//
// Microcode Revision
//
- EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
- EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
- MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
+ AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
+ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
+ MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64 (MSR_IA32_BIOS_SIGN_ID), 32);
UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_PROCESSOR_MICROCODE_VALUE), Buffer, NULL);
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
index e71a03ceac..8a52d017c1 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformationFunction.c
@@ -20,7 +20,6 @@ Abstract:
#include "MiscSubclassDriver.h"
#include <Protocol/MpService.h>
-#include <Library/CpuIA32.h>
#include <Library/TimerLib.h>
#include <Register/Cpuid.h>
@@ -102,7 +101,7 @@ DetermineiFsbFromMsr (
// Determine the processor core frequency
//
UINT64 Temp;
- Temp = (EfiReadMsr (BSEL_CR_OVERCLOCK_CONTROL)) & FUSE_BSEL_MASK;
+ Temp = (AsmReadMsr64 (BSEL_CR_OVERCLOCK_CONTROL)) & FUSE_BSEL_MASK;
return miFSBFrequencyTable[(UINT32)(Temp)];
}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
index 016fb53b18..94d9cd67e7 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
@@ -103,7 +103,6 @@ [LibraryClasses]
UefiLib
BiosIdLib
PrintLib
- CpuIA32Lib
PchPlatformLib
NetLib
HobLib
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 03fa062310..1705b1628b 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -104,6 +104,9 @@ for (( i=1; i<=$#; ))
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
Arch=X64
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
+ Arch=IA32
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
SpiLock=1
shift
@@ -243,11 +246,11 @@ build
##**********************************************************************
echo Skip "Running fce..."
+cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM
+
##**********************************************************************
## Build Capsules
##**********************************************************************
-cp -f $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/VLV.fd \
- $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/FV/Vlv.ROM
build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
echo
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support
2019-07-10 19:05 ` [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support Michael D Kinney
@ 2019-07-11 4:54 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:54 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build
> support
>
> * Remove CpuIa32Lib that contains inline assembly
> that is not compatible with GCC builds. Use BaseLib
> functions for CPUID and MSR access and the CPUID and
> MSR defintions from the UefiCpuPkg.
> * Add PlatformPkgGccIa32.dsc
> * Add /IA32 flag to Build_IFWI.sh
> * Add /IA32 flag to bld_vlv.sh
> * Remove unused references to gEfiPlatformCpuInfoGuid
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../AcpiPlatform/AcpiPlatform.c | 1 -
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 4 +
> .../Include/Guid/PlatformCpuInfo.h | 16 +-
> .../Include/Library/CpuIA32.h | 345 ------------------
> .../Library/CpuIA32Lib/CpuIA32Lib.inf | 41 ---
> .../Library/CpuIA32Lib/EfiCpuVersion.c | 70 ----
> .../Library/CpuIA32Lib/IA32/CpuIA32.S | 223 -----------
> .../Library/CpuIA32Lib/IA32/CpuIA32.asm | 206 -----------
> .../Library/CpuIA32Lib/IA32/CpuIA32.c | 177 ---------
> .../Library/CpuIA32Lib/X64/Cpu.S | 207 -----------
> .../Library/CpuIA32Lib/X64/Cpu.asm | 222 -----------
> .../MonoStatusCode/MonoStatusCode.inf | 1 -
> .../PlatformInitPei/MemoryCallback.c | 11 +-
> .../PlatformInitPei/PlatformEarlyInit.h | 4 +-
> .../PlatformInitPei/PlatformInitPei.inf | 1 -
> .../PlatformPei/PlatformPei.inf | 1 -
> ...formPkgIA32.dsc => PlatformPkgGccIA32.dsc} | 28 +-
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 -
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 -
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 -
> .../PlatformSetupDxe/PlatformSetupDxe.h | 1 -
> .../PlatformSetupDxe/PlatformSetupDxe.inf | 2 +-
> .../PlatformSetupDxe/SetupInfoRecords.c | 42 ++-
> .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 12 +-
> .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 1 +
> .../SmBiosMiscDxe/MiscOemType0x90Function.c | 37 +-
> .../SmBiosMiscDxe/MiscOemType0x94Function.c | 10 +-
> .../MiscProcessorInformationFunction.c | 3 +-
> .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 1 -
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 7 +-
> 30 files changed, 97 insertions(+), 1580 deletions(-)
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
> copy Platform/Intel/Vlv2TbltDevicePkg/{PlatformPkgIA32.dsc =>
> PlatformPkgGccIA32.dsc} (96%)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> index 72edc1bc1e..479ffa61a0 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> @@ -36,7 +36,6 @@ Abstract:
> #include <Guid/PlatformInfo.h>
> #include <Guid/BoardFeatures.h>
> #include <Protocol/AcpiTable.h>
> -#include <Library/CpuIA32.h>
> #include <SetupMode.h>
> #include <Guid/AcpiTableStorage.h>
> #include <Guid/EfiVpdData.h>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 422e90ca6c..349f0c7ba7 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -63,6 +63,10 @@ for (( i=1; i<=$#; ))
> Arch=X64
> Build_Flags="$Build_Flags /x64"
> shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> + Arch=IA32
> + Build_Flags="$Build_Flags /IA32"
> + shift
> elif [ "$1" == "/nG" ]; then
> Stitch_Flags="$Stitch_Flags /nG"
> shift
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
> b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
> index f1756662bd..eec167da3a 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/PlatformCpuInfo.h
> @@ -1,12 +1,9 @@
> /*++
>
> - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> -
>
> + Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
> +
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> -
>
> -
> -
> Module Name:
>
> PlatformCpuInfo.h
> @@ -21,7 +18,6 @@ Abstract:
> #define _PLATFORM_CPU_INFO_GUID_H_
>
> #include "CpuType.h"
> -#include <Library/CpuIA32.h>
>
> #define EFI_PLATFORM_CPU_INFO_GUID \
> {\
> @@ -95,6 +91,14 @@ typedef struct {
> UINT8 HwCoordinationFeedback; // ECX [0]
> } EFI_CPU_POWER_MANAGEMENT; // CPUID.6.EAX
>
> +
> +typedef struct {
> + UINT32 RegEax;
> + UINT32 RegEbx;
> + UINT32 RegEcx;
> + UINT32 RegEdx;
> +} EFI_CPUID_REGISTER;
> +
> //
> // IMPORTANT: Each CPU feature enabling entry is assumed a tri-state
> variable.
> // - Keep the respective feature entry variable as default value (0x00)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
> b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
> deleted file mode 100644
> index 78c78319ce..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
> +++ /dev/null
> @@ -1,345 +0,0 @@
> -/*++
> -
> - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> -
>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>
> -
> -
> -Module Name:
> -
> - CpuIA32.h
> -
> -Abstract:
> -
> ---*/
> -
> -#ifndef _CPU_IA32_H
> -#define _CPU_IA32_H
> -
> -typedef struct {
> - UINT32 RegEax;
> - UINT32 RegEbx;
> - UINT32 RegEcx;
> - UINT32 RegEdx;
> -} EFI_CPUID_REGISTER;
> -
> -typedef struct {
> - UINT32 HeaderVersion;
> - UINT32 UpdateRevision;
> - UINT32 Date;
> - UINT32 ProcessorId;
> - UINT32 Checksum;
> - UINT32 LoaderRevision;
> - UINT32 ProcessorFlags;
> - UINT32 DataSize;
> - UINT32 TotalSize;
> - UINT8 Reserved[12];
> -} EFI_CPU_MICROCODE_HEADER;
> -
> -typedef struct {
> - UINT32 ExtendedSignatureCount;
> - UINT32 ExtendedTableChecksum;
> - UINT8 Reserved[12];
> -} EFI_CPU_MICROCODE_EXTENDED_TABLE_HEADER;
> -
> -typedef struct {
> - UINT32 ProcessorSignature;
> - UINT32 ProcessorFlag;
> - UINT32 ProcessorChecksum;
> -} EFI_CPU_MICROCODE_EXTENDED_TABLE;
> -
> -typedef struct {
> - UINT32 Stepping : 4;
> - UINT32 Model : 4;
> - UINT32 Family : 4;
> - UINT32 Type : 2;
> - UINT32 Reserved1 : 2;
> - UINT32 ExtendedModel : 4;
> - UINT32 ExtendedFamily : 8;
> - UINT32 Reserved2 : 4;
> -} EFI_CPU_VERSION;
> -
> -#define EFI_CPUID_SIGNATURE 0x0
> -#define EFI_CPUID_VERSION_INFO 0x1
> -#define EFI_CPUID_CACHE_INFO 0x2
> -#define EFI_CPUID_SERIAL_NUMBER 0x3
> -#define EFI_CPUID_EXTENDED_FUNCTION 0x80000000
> -#define EFI_CPUID_EXTENDED_CPU_SIG 0x80000001
> -#define EFI_CPUID_BRAND_STRING1 0x80000002
> -#define EFI_CPUID_BRAND_STRING2 0x80000003
> -#define EFI_CPUID_BRAND_STRING3 0x80000004
> -
> -#define EFI_MSR_IA32_PLATFORM_ID 0x17
> -#define EFI_MSR_IA32_APIC_BASE 0x1B
> -#define EFI_MSR_EBC_HARD_POWERON 0x2A
> -#define EFI_MSR_EBC_SOFT_POWERON 0x2B
> -#define BINIT_DRIVER_DISABLE 0x40
> -#define INTERNAL_MCERR_DISABLE 0x20
> -#define INITIATOR_MCERR_DISABLE 0x10
> -#define EFI_MSR_EBC_FREQUENCY_ID 0x2C
> -#define EFI_MSR_IA32_BIOS_UPDT_TRIG 0x79
> -#define EFI_MSR_IA32_BIOS_SIGN_ID 0x8B
> -#define EFI_MSR_PSB_CLOCK_STATUS 0xCD
> -#define EFI_APIC_GLOBAL_ENABLE 0x800
> -#define EFI_MSR_IA32_MISC_ENABLE 0x1A0
> -#define LIMIT_CPUID_MAXVAL_ENABLE_BIT 0x00400000
> -#define AUTOMATIC_THERMAL_CONTROL_ENABLE_BIT 0x00000008
> -#define COMPATIBLE_FPU_OPCODE_ENABLE_BIT 0x00000004
> -#define LOGICAL_PROCESSOR_PRIORITY_ENABLE_BIT 0x00000002
> -#define FAST_STRING_ENABLE_BIT 0x00000001
> -
> -#define EFI_CACHE_VARIABLE_MTRR_BASE 0x200
> -#define EFI_CACHE_VARIABLE_MTRR_END 0x20F
> -#define EFI_CACHE_IA32_MTRR_DEF_TYPE 0x2FF
> -#define EFI_CACHE_MTRR_VALID 0x800
> -#define EFI_CACHE_FIXED_MTRR_VALID 0x400
> -#define EFI_CACHE_VALID_ADDRESS 0xFFFFFF000
> -#define EFI_MSR_VALID_MASK 0xFFFFFFFFF
> -#define EFI_CACHE_VALID_EXTENDED_ADDRESS 0xFFFFFFFFFF000
> -#define EFI_MSR_VALID_EXTENDED_MASK 0xFFFFFFFFFFFFF
> -
> -#define EFI_IA32_MTRR_FIX64K_00000 0x250
> -#define EFI_IA32_MTRR_FIX16K_80000 0x258
> -#define EFI_IA32_MTRR_FIX16K_A0000 0x259
> -#define EFI_IA32_MTRR_FIX4K_C0000 0x268
> -#define EFI_IA32_MTRR_FIX4K_C8000 0x269
> -#define EFI_IA32_MTRR_FIX4K_D0000 0x26A
> -#define EFI_IA32_MTRR_FIX4K_D8000 0x26B
> -#define EFI_IA32_MTRR_FIX4K_E0000 0x26C
> -#define EFI_IA32_MTRR_FIX4K_E8000 0x26D
> -#define EFI_IA32_MTRR_FIX4K_F0000 0x26E
> -#define EFI_IA32_MTRR_FIX4K_F8000 0x26F
> -
> -#define EFI_IA32_MCG_CAP 0x179
> -#define EFI_IA32_MCG_CTL 0x17B
> -#define EFI_IA32_MC0_CTL 0x400
> -#define EFI_IA32_MC0_STATUS 0x401
> -
> -#define EFI_IA32_PERF_STATUS 0x198
> -#define EFI_IA32_PERF_CTL 0x199
> -
> -#define EFI_CACHE_UNCACHEABLE 0
> -#define EFI_CACHE_WRITECOMBINING 1
> -#define EFI_CACHE_WRITETHROUGH 4
> -#define EFI_CACHE_WRITEPROTECTED 5
> -#define EFI_CACHE_WRITEBACK 6
> -
> -//
> -// Combine f(FamilyId), m(Model), s(SteppingId) to a single 32 bit number
> -//
> -#define EfiMakeCpuVersion(f, m, s) \
> - (((UINT32) (f) << 16) | ((UINT32) (m) << 8) | ((UINT32) (s)))
> -
> -/**
> - Halt the Cpu
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiHalt (
> - VOID
> - );
> -
> -/**
> - Write back and invalidate the Cpu cache
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiWbinvd (
> - VOID
> - );
> -
> -/**
> - Invalidate the Cpu cache
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiInvd (
> - VOID
> - );
> -
> -/**
> - Get the Cpu info by execute the CPUID instruction
> -
> - @param[in] RegisterInEax The input value to put into register EAX
> - @param[in] Regs The Output value
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiCpuid (
> - IN UINT32 RegisterInEax,
> - OUT EFI_CPUID_REGISTER *Regs
> - );
> -
> -/**
> - When RegisterInEax != 4, the functionality is the same as EfiCpuid.
> - When RegisterInEax == 4, the function return the deterministic cache
> - parameters by excuting the CPUID instruction.
> -
> - @param[in] RegisterInEax The input value to put into register EAX.
> - @param[in] CacheLevel The deterministic cache level.
> - @param[in] Regs The Output value.
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiCpuidExt (
> - IN UINT32 RegisterInEax,
> - IN UINT32 CacheLevel,
> - OUT EFI_CPUID_REGISTER *Regs
> - );
> -
> -/**
> - Read Cpu MSR
> -
> - @param[in] Index The index value to select the register
> -
> - @retval Return the read data
> -
> -**/
> -UINT64
> -EFIAPI
> -EfiReadMsr (
> - IN UINT32 Index
> - );
> -
> -/**
> - Write Cpu MSR
> -
> - @param[in] Index The index value to select the register
> - @param[in] Value The value to write to the selected register
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiWriteMsr (
> - IN UINT32 Index,
> - IN UINT64 Value
> - );
> -
> -/**
> - Read Time stamp
> -
> - @param[in] None
> -
> - @retval Return the read data
> -
> -**/
> -UINT64
> -EFIAPI
> -EfiReadTsc (
> - VOID
> - );
> -
> -/**
> - Writing back and invalidate the cache,then diable it
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiDisableCache (
> - VOID
> - );
> -
> -/**
> - Invalidate the cache,then Enable it
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiEnableCache (
> - VOID
> - );
> -
> -/**
> - Get Eflags
> -
> - @param[in] None
> -
> - @retval Return the Eflags value
> -
> -**/
> -UINT32
> -EFIAPI
> -EfiGetEflags (
> - VOID
> - );
> -
> -/**
> - Disable Interrupts
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiDisableInterrupts (
> - VOID
> - );
> -
> -/**
> - Enable Interrupts
> -
> - @param[in] None
> -
> - @retval None
> -
> -**/
> -VOID
> -EFIAPI
> -EfiEnableInterrupts (
> - VOID
> - );
> -
> -/**
> - Extract CPU detail version infomation
> -
> - @param[in] FamilyId FamilyId, including ExtendedFamilyId
> - @param[in] Model Model, including ExtendedModel
> - @param[in] SteppingId SteppingId
> - @param[in] Processor Processor
> -
> -**/
> -VOID
> -EFIAPI
> -EfiCpuVersion (
> - IN UINT16 *FamilyId, OPTIONAL
> - IN UINT8 *Model, OPTIONAL
> - IN UINT8 *SteppingId, OPTIONAL
> - IN UINT8 *Processor OPTIONAL
> - );
> -
> -#endif
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
> deleted file mode 100644
> index c9f0a434ac..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -#
> -#
> -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -#
>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -#
>
> -#
> -#
> -# Module Name:
> -#
> -# CpuIA32Lib.inf
> -#
> -# Abstract:
> -#
> -# Component description file for the Cpu IA32 library.
> -#
> -#--*/
> -
> -[defines]
> - INF_VERSION = 0x00010005
> - BASE_NAME = CpuIA32Lib
> - FILE_GUID = 98546178-64F1-4d2e-814F-6BF963DB7930
> - MODULE_TYPE = BASE
> - VERSION_STRING = 1.0
> - LIBRARY_CLASS = CpuIA32Lib
> - PI_SPECIFICATION_VERSION = 0x0001000A
> -
> -[Sources]
> - EfiCpuVersion.c
> -
> -[Sources.IA32]
> - IA32/CpuIA32.c
> -
> -[Sources.X64]
> - X64/Cpu.asm
> - X64/Cpu.S
> -
> -[Packages]
> - MdePkg/MdePkg.dec
> - Vlv2TbltDevicePkg/PlatformPkg.dec
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
> deleted file mode 100644
> index 935f11e871..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
> +++ /dev/null
> @@ -1,70 +0,0 @@
> -/** @file
> -
> - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> -
>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>
> -
> -Module Name:
> -
> -
> - EfiCpuVersion.c
> -
> -Abstract:
> -
> - Provide cpu version extract considering extended family & model ID.
> ---*/
> -
> -#include <Library/CpuIA32.h>
> -
> -/**
> - Extract CPU detail version infomation
> -
> - @param FamilyId FamilyId, including ExtendedFamilyId
> - @param Model Model, including ExtendedModel
> - @param SteppingId SteppingId
> - @param Processor Processor
> -
> -**/
> -VOID
> -EFIAPI
> -EfiCpuVersion (
> - IN OUT UINT16 *FamilyId, OPTIONAL
> - IN OUT UINT8 *Model, OPTIONAL
> - IN OUT UINT8 *SteppingId, OPTIONAL
> - IN OUT UINT8 *Processor OPTIONAL
> - )
> -
> -{
> - EFI_CPUID_REGISTER Register;
> - UINT8 TempFamilyId;
> -
> - EfiCpuid (EFI_CPUID_VERSION_INFO, &Register);
> -
> - if (SteppingId != NULL) {
> - *SteppingId = (UINT8) (Register.RegEax & 0xF);
> - }
> -
> - if (Processor != NULL) {
> - *Processor = (UINT8) ((Register.RegEax >> 12) & 0x3);
> - }
> -
> - if (Model != NULL || FamilyId != NULL) {
> - TempFamilyId = (UINT8) ((Register.RegEax >> 8) & 0xF);
> -
> - if (Model != NULL) {
> - *Model = (UINT8) ((Register.RegEax >> 4) & 0xF);
> - if (TempFamilyId == 0x6 || TempFamilyId == 0xF) {
> - *Model = (UINT8) (*Model | ((Register.RegEax >> 12) & 0xF0));
> - }
> - }
> -
> - if (FamilyId != NULL) {
> - *FamilyId = TempFamilyId;
> - if (TempFamilyId == 0xF) {
> - *FamilyId = (UINT8 ) (*FamilyId + (UINT16) ((Register.RegEax >> 20) &
> 0xFF));
> - }
> - }
> - }
> -}
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
> deleted file mode 100644
> index ba1bd448c0..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
> +++ /dev/null
> @@ -1,223 +0,0 @@
> -#
> -#
> -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -#
>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -#
>
> -#
> -#
> -#Module Name:
> -#
> -# CpuIA32.c
> -#
> -#Abstract:
> -#
> -#--*/
> -
> -##include "CpuIA32.h"
> -#include "EfiBind.h"
> -
> -#---------------------------------------------------------------------------
> - .586p:
> - #.MODEL flat,C
> - .code:
> -
> -#---------------------------------------------------------------------------
> -
> -.globl ASM_PFX(EfiHalt)
> -.globl ASM_PFX(EfiWbinvd)
> -.globl ASM_PFX(EfiInvd)
> -.globl ASM_PFX(EfiCpuid)
> -.globl ASM_PFX(EfiReadMsr)
> -.globl ASM_PFX(EfiWriteMsr)
> -.globl ASM_PFX(EfiReadTsc)
> -.globl ASM_PFX(EfiDisableCache)
> -.globl ASM_PFX(EfiEnableCache)
> -.globl ASM_PFX(EfiGetEflags)
> -.globl ASM_PFX(EfiDisableInterrupts)
> -.globl ASM_PFX(EfiEnableInterrupts)
> -.globl ASM_PFX(EfiCpuidExt)
> -
> -
> -#VOID
> -#EfiHalt (
> -# VOID
> -#)
> -ASM_PFX(EfiHalt):
> - hlt
> - ret
> -#EfiHalt ENDP
> -
> -#VOID
> -#EfiWbinvd (
> -# VOID
> -#)
> -ASM_PFX(EfiWbinvd):
> - wbinvd
> - ret
> -#EfiWbinvd ENDP
> -
> -#VOID
> -#EfiInvd (
> -# VOID
> -#)
> -ASM_PFX(EfiInvd):
> - invd
> - ret
> -#EfiInvd ENDP
> -
> -#VOID
> -#EfiCpuid (IN UINT32 RegisterInEax,
> -# OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
> -ASM_PFX(EfiCpuid):
> - pushl %ebp
> - movl %esp, %ebp
> - pushl %ebx
> - pushl %esi
> - pushl %edi
> - pushal
> -
> - movl 8(%ebp), %eax #RegisterInEax
> - cpuid
> - cmpl $0, 0xC(%ebp) # Reg
> - je L1
> - movl 0xC(%ebp), %edi # Reg
> -
> - movl %eax, (%edi) # Reg->RegEax
> - movl %ebx, 4(%edi) # Reg->RegEbx
> - movl %ecx, 8(%edi) # Reg->RegEcx
> - movl %edx, 0xC(%edi) # Reg->RegEdx
> -
> -L1:
> - popal
> - popl %edi
> - popl %esi
> - popl %ebx
> - popl %ebp
> -
> - ret
> -#EfiCpuid ENDP
> -
> -
> -#UINT64
> -#EfiReadMsr (
> -# IN UINT32 Index
> -# );
> -ASM_PFX(EfiReadMsr):
> - movl 4(%esp), %ecx # Index
> - rdmsr
> - ret
> -#EfiReadMsr ENDP
> -
> -#VOID
> -#EfiWriteMsr (
> -# IN UINT32 Index,
> -# IN UINT64 Value
> -# );
> -ASM_PFX(EfiWriteMsr):
> - movl 4(%esp), %ecx # Index
> - movl 8(%esp), %eax # DWORD PTR Value[0]
> - movl 0xC(%esp), %edx # DWORD PTR Value[4]
> - wrmsr
> - ret
> -#EfiWriteMsr ENDP
> -
> -#UINT64
> -#EfiReadTsc (
> -# VOID
> -# )
> -ASM_PFX(EfiReadTsc):
> - rdtsc
> - ret
> -#EfiReadTsc ENDP
> -
> -#VOID
> -#EfiDisableCache (
> -# VOID
> -#)
> -ASM_PFX(EfiDisableCache):
> - movl %cr0, %eax
> - bswapl %eax
> - andb $0x60, %al
> - cmpb $0x60, %al
> - je L2
> - movl %cr0, %eax
> - orl $0x60000000, %eax
> - movl %eax, %cr0
> - wbinvd
> -L2:
> - ret
> -#EfiDisableCache ENDP
> -
> -#VOID
> -#EfiEnableCache (
> -# VOID
> -# )
> -ASM_PFX(EfiEnableCache):
> - wbinvd
> - movl %cr0, %eax
> - andl $0x9fffffff, %eax
> - movl %eax, %cr0
> - ret
> -#EfiEnableCache ENDP
> -
> -#UINT32
> -#EfiGetEflags (
> -# VOID
> -# )
> -ASM_PFX(EfiGetEflags):
> - pushfl
> - popl %eax
> - ret
> -#EfiGetEflags ENDP
> -
> -#VOID
> -#EfiDisableInterrupts (
> -# VOID
> -# )
> -ASM_PFX(EfiDisableInterrupts):
> - cli
> - ret
> -#EfiDisableInterrupts ENDP
> -
> -#VOID
> -#EfiEnableInterrupts (
> -# VOID
> -# )
> -ASM_PFX(EfiEnableInterrupts):
> - sti
> - ret
> -#EfiEnableInterrupts ENDP
> -
> -#VOID
> -#EfiCpuidExt (
> -# IN UINT32 RegisterInEax,
> -# IN UINT32 CacheLevel,
> -# OUT EFI_CPUID_REGISTER *Regs
> -# )
> -ASM_PFX(EfiCpuidExt):
> - push %ebx
> - push %edi
> - push %esi
> - pushal
> -
> - movl 0x30(%esp), %eax # RegisterInEax
> - movl 0x34(%esp), %ecx # CacheLevel
> - cpuid
> - movl 0x38(%esp), %edi # DWORD PTR Regs
> -
> - movl %eax, (%edi) # Reg->RegEax
> - movl %ebx, 4(%edi) # Reg->RegEbx
> - movl %ecx, 8(%edi) # Reg->RegEcx
> - movl %edx, 0xC(%edi) # Reg->RegEdx
> -
> - popal
> - pop %esi
> - pop %edi
> - pop %ebx
> - ret
> -#EfiCpuidExt ENDP
> -
> -
> -
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
> deleted file mode 100644
> index 3fdf16f8ee..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
> +++ /dev/null
> @@ -1,206 +0,0 @@
> -;
> -; This file contains an 'Intel Sample Driver' and is
> -; licensed for Intel CPUs and chipsets under the terms of your
> -; license agreement with Intel or your vendor. This file may
> -; be modified by the user, subject to additional terms of the
> -; license agreement
> -;
> -;
> -; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -;
>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -;
>
> -;
> -
> -;Module Name:
> -;
> -; CpuIA32.c
> -;
> -;Abstract:
> -;
> -;--*/
> -
> -;#include "CpuIA32.h"
> -
> -;---------------------------------------------------------------------------
> - .586p
> - .model flat,C
> - .code
> -
> -;---------------------------------------------------------------------------
> -;VOID
> -;EfiHalt (
> -; VOID
> -;)
> -EfiHalt PROC C PUBLIC
> - hlt
> - ret
> -EfiHalt ENDP
> -
> -;VOID
> -;EfiWbinvd (
> -; VOID
> -;)
> -EfiWbinvd PROC C PUBLIC
> - wbinvd
> - ret
> -EfiWbinvd ENDP
> -
> -;VOID
> -;EfiInvd (
> -; VOID
> -;)
> -EfiInvd PROC C PUBLIC
> - invd
> - ret
> -EfiInvd ENDP
> -
> -;VOID
> -;EfiCpuid (IN UINT32 RegisterInEax,
> -; OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
> -EfiCpuid PROC C PUBLIC
> - push ebp
> - mov ebp, esp
> - push ebx
> - push esi
> - push edi
> - pushad
> -
> - mov eax, dword ptr[ebp + 8] ;egisterInEax
> - cpuid
> - cmp dword ptr[ebp + 0Ch], 0 ; Reg
> - je @F
> - mov edi,dword ptr [ebp+0Ch] ; Reg
> -
> - mov dword ptr [edi],eax ; Reg->RegEax
> - mov dword ptr [edi+4],ebx ; Reg->RegEbx
> - mov dword ptr [edi+8],ecx ; Reg->RegEcx
> - mov dword ptr [edi+0Ch],edx ; Reg->RegEdx
> -
> -@@:
> - popad
> - pop edi
> - pop esi
> - pop ebx
> - pop ebp
> -
> - ret
> -EfiCpuid ENDP
> -
> -
> -;UINT64
> -;EfiReadMsr (
> -; IN UINT32 Index
> -; );
> -EfiReadMsr PROC C PUBLIC
> - mov ecx, dword ptr [esp + 4]; Index
> - rdmsr
> - ret
> -EfiReadMsr ENDP
> -
> -;VOID
> -;EfiWriteMsr (
> -; IN UINT32 Index,
> -; IN UINT64 Value
> -; );
> -EfiWriteMsr PROC C PUBLIC
> - mov ecx, dword ptr [esp+4]; Index
> - mov eax, dword ptr [esp+8]; DWORD PTR Value[0]
> - mov edx, dword ptr [esp+0Ch]; DWORD PTR Value[4]
> - wrmsr
> - ret
> -EfiWriteMsr ENDP
> -
> -;UINT64
> -;EfiReadTsc (
> -; VOID
> -; )
> -EfiReadTsc PROC C PUBLIC
> - rdtsc
> - ret
> -EfiReadTsc ENDP
> -
> -;VOID
> -;EfiDisableCache (
> -; VOID
> -;)
> -EfiDisableCache PROC C PUBLIC
> - mov eax, cr0
> - bswap eax
> - and al, 60h
> - cmp al, 60h
> - je @F
> - mov eax, cr0
> - or eax, 060000000h
> - mov cr0, eax
> - wbinvd
> -@@:
> - ret
> -EfiDisableCache ENDP
> -
> -;VOID
> -;EfiEnableCache (
> -; VOID
> -; )
> -EfiEnableCache PROC C PUBLIC
> - wbinvd
> - mov eax, cr0
> - and eax, 09fffffffh
> - mov cr0, eax
> - ret
> -EfiEnableCache ENDP
> -
> -;UINT32
> -;EfiGetEflags (
> -; VOID
> -; )
> -EfiGetEflags PROC C PUBLIC
> - pushfd
> - pop eax
> - ret
> -EfiGetEflags ENDP
> -
> -;VOID
> -;EfiDisableInterrupts (
> -; VOID
> -; )
> -EfiDisableInterrupts PROC C PUBLIC
> - cli
> - ret
> -EfiDisableInterrupts ENDP
> -
> -;VOID
> -;EfiEnableInterrupts (
> -; VOID
> -; )
> -EfiEnableInterrupts PROC C PUBLIC
> - sti
> - ret
> -EfiEnableInterrupts ENDP
> -
> -;VOID
> -;EfiCpuidExt (
> -; IN UINT32 RegisterInEax,
> -; IN UINT32 CacheLevel,
> -; OUT EFI_CPUID_REGISTER *Regs
> -; )
> -EfiCpuidExt PROC C PUBLIC USES ebx edi esi
> - pushad
> -
> - mov eax, dword ptr [esp + 30h] ; RegisterInEax
> - mov ecx, dword ptr [esp + 34h] ; CacheLevel
> - cpuid
> - mov edi, dword ptr [esp + 38h] ; DWORD PTR Regs
> -
> - mov dword ptr [edi], eax ; Reg->RegEax
> - mov dword ptr [edi + 4], ebx ; Reg->RegEbx
> - mov dword ptr [edi + 8], ecx ; Reg->RegEcx
> - mov dword ptr [edi + 0Ch], edx ; Reg->RegEdx
> -
> - popad
> - ret
> -EfiCpuidExt ENDP
> -
> - END
> -
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
> deleted file mode 100644
> index cb8de2f9c7..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
> +++ /dev/null
> @@ -1,177 +0,0 @@
> -/** @file
> -
> - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
> -
>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>
> -
> -Module Name:
> -
> -
> - CpuIA32.c
> -
> -Abstract:
> -
> ---*/
> -
> -#include <Library/CpuIA32.h>
> -
> -VOID
> -EfiHalt (VOID)
> -{
> - __asm {
> - hlt
> - }
> -}
> -
> -VOID
> -EfiWbinvd (VOID)
> -{
> - __asm {
> - wbinvd
> - }
> -}
> -
> -VOID
> -EfiInvd (VOID)
> -{
> - __asm {
> - invd
> - }
> -}
> -
> -VOID
> -EfiCpuid (IN UINT32 RegisterInEax,
> - OUT EFI_CPUID_REGISTER *Reg OPTIONAL)
> -{
> - __asm {
> - pushad
> -
> - mov eax, RegisterInEax
> - cpuid
> - cmp Reg, 0
> - je _Exit
> - mov edi, DWORD PTR Reg
> -
> - mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax
> - mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx
> - mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx
> - mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx
> -
> -_Exit:
> - popad
> - }
> -}
> -
> -UINT64
> -EfiReadMsr (IN UINT32 Index)
> -{
> - __asm {
> - mov ecx, Index
> - rdmsr
> - }
> -}
> -
> -VOID
> -EfiWriteMsr (
> - IN UINT32 Index,
> - IN UINT64 Value
> - )
> -{
> - __asm {
> - mov ecx, Index
> - mov eax, DWORD PTR Value[0]
> - mov edx, DWORD PTR Value[4]
> - wrmsr
> - }
> -}
> -
> -UINT64
> -EfiReadTsc (VOID)
> -{
> - __asm {
> - rdtsc
> - }
> -}
> -
> -VOID
> -EfiDisableCache (VOID)
> -{
> - __asm {
> - mov eax, cr0
> - bswap eax
> - and al, 60h
> - cmp al, 60h
> - je Exit
> - mov eax, cr0
> - or eax, 060000000h
> - mov cr0, eax
> - wbinvd
> -Exit:
> - }
> -}
> -
> -VOID
> -EfiEnableCache (VOID)
> -{
> - __asm {
> - wbinvd
> - mov eax, cr0
> - and eax, 09fffffffh
> - mov cr0, eax
> - }
> -}
> -
> -UINT32
> -EfiGetEflags (
> - VOID
> - )
> -{
> - __asm {
> - pushfd
> - pop eax
> - }
> -}
> -
> -VOID
> -EfiDisableInterrupts (VOID)
> -{
> - __asm {
> - cli
> - }
> -}
> -
> -VOID
> -EfiEnableInterrupts (
> - VOID
> - )
> -{
> - __asm {
> - sti
> - }
> -}
> -
> -VOID
> -EfiCpuidExt (
> - IN UINT32 RegisterInEax,
> - IN UINT32 CacheLevel,
> - OUT EFI_CPUID_REGISTER *Regs
> - )
> -{
> - __asm {
> - pushad
> -
> - mov eax, RegisterInEax
> - mov ecx, CacheLevel
> - cpuid
> - mov edi, DWORD PTR Regs
> -
> - mov DWORD PTR [edi].RegEax, eax ; Reg->RegEax
> - mov DWORD PTR [edi].RegEbx, ebx ; Reg->RegEbx
> - mov DWORD PTR [edi].RegEcx, ecx ; Reg->RegEcx
> - mov DWORD PTR [edi].RegEdx, edx ; Reg->RegEdx
> -
> - popad
> - }
> -}
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
> deleted file mode 100644
> index 3a8d6e6bc5..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
> +++ /dev/null
> @@ -1,207 +0,0 @@
> -#
> -#
> -# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -#
>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -#
>
> -#
> -#
> -#* Module Name:
> -#*
> -#* Cpu.asm
> -#*
> -#* Abstract:
> -#*
> -#------------------------------------------------------------------------------
> -##include <EfiBind.h>
> -
> -.globl ASM_PFX(EfiHalt)
> -.globl ASM_PFX(EfiWbinvd)
> -.globl ASM_PFX(EfiInvd)
> -.globl ASM_PFX(EfiCpuid)
> -.globl ASM_PFX(EfiReadTsc)
> -.globl ASM_PFX(EfiDisableCache)
> -.globl ASM_PFX(EfiEnableCache)
> -.globl ASM_PFX(EfiReadMsr)
> -.globl ASM_PFX(EfiWriteMsr)
> -.globl ASM_PFX(EfiGetEflags)
> -.globl ASM_PFX(EfiDisableInterrupts)
> -.globl ASM_PFX(EfiEnableInterrupts)
> -.globl ASM_PFX(EfiCpuidExt)
> -
> -.text
> -
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiHalt (
> -# VOID
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiHalt):
> - hlt
> - retq
> -
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiWbinvd (
> -# VOID
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiWbinvd):
> - wbinvd
> - retq
> -
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiInvd (
> -# VOID
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiInvd):
> - invd
> - retq
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiCpuid (
> -# IN UINT32 RegisterInEax, // rcx
> -# OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiCpuid):
> - push %rbx
> - mov %rdx,%r8
> - mov %rcx,%rax
> - cpuid
> - cmp $0x0,%r8
> - je _Exit
> - mov %eax,(%r8)
> - mov %ebx,0x4(%r8)
> - mov %ecx,0x8(%r8)
> - mov %edx,0xc(%r8)
> -_Exit:
> - pop %rbx
> - retq
> -
> -#------------------------------------------------------------------------------
> -# UINT64
> -# EfiReadMsr (
> -# IN UINT32 Index, // rcx
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiReadMsr):
> - rdmsr
> - shl $0x20,%rdx
> - or %rdx,%rax
> - retq
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiWriteMsr (
> -# IN UINT32 Index, // rcx
> -# IN UINT64 Value // rdx
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiWriteMsr):
> - mov %rdx,%rax
> - sar $0x20,%rdx
> - wrmsr
> - retq
> -
> -#------------------------------------------------------------------------------
> -# UINT64
> -# EfiReadTsc (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiReadTsc):
> - rdtsc
> - shl $0x20,%rax
> - shrd $0x20,%rdx,%rax
> - retq
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiDisableCache (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiDisableCache):
> -# added a check to see if cache is already disabled. If it is, then skip.
> - mov %cr0,%rax
> - and $0x60000000,%rax
> - cmp $0x0,%rax
> - jne 1f
> - mov %cr0,%rax
> - or $0x60000000,%rax
> - mov %rax,%cr0
> - wbinvd
> -1:
> - retq
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiEnableCache (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiEnableCache):
> - wbinvd
> - mov %cr0,%rax
> - and $0xffffffff9fffffff,%rax
> - mov %rax,%cr0
> - retq
> -
> -#------------------------------------------------------------------------------
> -# UINTN
> -# EfiGetEflags (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiGetEflags):
> - pushfq
> - pop %rax
> - retq
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiDisableInterrupts (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiDisableInterrupts):
> - cli
> - ret
> -
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiEnableInterrupts (
> -# VOID
> -# );
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiEnableInterrupts):
> - sti
> - ret
> -#------------------------------------------------------------------------------
> -# VOID
> -# EfiCpuidExt (
> -# IN UINT32 RegisterInEax,
> -# IN UINT32 CacheLevel,
> -# OUT EFI_CPUID_REGISTER *Regs
> -# )
> -#------------------------------------------------------------------------------
> -ASM_PFX(EfiCpuidExt):
> - push %rbx
> - mov %rcx,%rax
> - mov %rdx,%rcx
> - cpuid
> - mov %eax,(%r8)
> - mov %ebx,0x4(%r8)
> - mov %ecx,0x8(%r8)
> - mov %edx,0xc(%r8)
> - pop %rbx
> - retq
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
> b/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
> deleted file mode 100644
> index 44aae7de64..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
> +++ /dev/null
> @@ -1,222 +0,0 @@
> -
> -TITLE Cpu.asm: Assembly code for the x64 resources
> -
> -;
> -; This file contains an 'Intel Sample Driver' and is
> -; licensed for Intel CPUs and chipsets under the terms of your
> -; license agreement with Intel or your vendor. This file may
> -; be modified by the user, subject to additional terms of the
> -; license agreement
> -;
> -;
> -; Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -;
>
> -; SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -;
>
> -;
> -;
> -;
> -;
> -;* Module Name:
> -;*
> -;* Cpu.asm
> -;*
> -;* Abstract:
> -;*
> -;------------------------------------------------------------------------------
> -
> -text SEGMENT
> -
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiHalt (
> -; VOID
> -; )
> -;------------------------------------------------------------------------------
> -EfiHalt PROC PUBLIC
> - hlt
> - ret
> -EfiHalt ENDP
> -
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiWbinvd (
> -; VOID
> -; )
> -;------------------------------------------------------------------------------
> -EfiWbinvd PROC PUBLIC
> - wbinvd
> - ret
> -EfiWbinvd ENDP
> -
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiInvd (
> -; VOID
> -; )
> -;------------------------------------------------------------------------------
> -EfiInvd PROC PUBLIC
> - invd
> - ret
> -EfiInvd ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiCpuid (
> -; IN UINT32 RegisterInEax, // rcx
> -; OUT EFI_CPUID_REGISTER *Reg OPTIONAL // rdx
> -; )
> -;------------------------------------------------------------------------------
> -EfiCpuid PROC PUBLIC
> - push rbx
> -
> - mov r8, rdx ; r8 = *Reg
> - mov rax, rcx ; RegisterInEax
> - cpuid
> - cmp r8, 0
> - je _Exit
> - mov [r8 + 0], eax ; Reg->RegEax
> - mov [r8 + 4], ebx ; Reg->RegEbx
> - mov [r8 + 8], ecx ; Reg->RegEcx
> - mov [r8 + 12], edx ; Reg->RegEdx
> -
> -_Exit:
> - pop rbx
> - ret
> -EfiCpuid ENDP
> -
> -;------------------------------------------------------------------------------
> -; UINT64
> -; EfiReadMsr (
> -; IN UINT32 Index, // rcx
> -; )
> -;------------------------------------------------------------------------------
> -EfiReadMsr PROC PUBLIC
> - rdmsr
> - sal rdx, 32 ; edx:eax -> rax
> - or rax, rdx ; rax = edx:eax
> - ret
> -EfiReadMsr ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiWriteMsr (
> -; IN UINT32 Index, // rcx
> -; IN UINT64 Value // rdx
> -; )
> -;------------------------------------------------------------------------------
> -EfiWriteMsr PROC PUBLIC
> - mov rax, rdx ; rdx = Value
> - sar rdx, 32 ; convert rdx to edx upper 32-bits
> - wrmsr ; wrmsr[ecx] result = edx:eax
> - ret
> -EfiWriteMsr ENDP
> -
> -
> -;------------------------------------------------------------------------------
> -; UINT64
> -; EfiReadTsc (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiReadTsc PROC PUBLIC
> - rdtsc
> - shl rax, 32
> - shrd rax, rdx, 32
> - ret
> -EfiReadTsc ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiDisableCache (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiDisableCache PROC PUBLIC
> -; added a check to see if cache is already disabled. If it is, then skip.
> - mov rax, cr0
> - and rax, 060000000h
> - cmp rax, 0
> - jne @f
> - mov rax, cr0
> - or rax, 060000000h
> - mov cr0, rax
> - wbinvd
> -@@:
> - ret
> -EfiDisableCache ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiEnableCache (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiEnableCache PROC PUBLIC
> - wbinvd
> - mov rax, cr0
> - and rax, 09fffffffh
> - mov cr0, rax
> - ret
> -EfiEnableCache ENDP
> -
> -;------------------------------------------------------------------------------
> -; UINTN
> -; EfiGetEflags (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiGetEflags PROC PUBLIC
> - pushfq
> - pop rax
> - ret
> -EfiGetEflags ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiDisableInterrupts (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiDisableInterrupts PROC PUBLIC
> - cli
> - ret
> -EfiDisableInterrupts ENDP
> -
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiEnableInterrupts (
> -; VOID
> -; );
> -;------------------------------------------------------------------------------
> -EfiEnableInterrupts PROC PUBLIC
> - sti
> - ret
> -EfiEnableInterrupts ENDP
> -;------------------------------------------------------------------------------
> -; VOID
> -; EfiCpuidExt (
> -; IN UINT32 RegisterInEax,
> -; IN UINT32 CacheLevel,
> -; OUT EFI_CPUID_REGISTER *Regs
> -; )
> -;------------------------------------------------------------------------------
> -EfiCpuidExt PROC PUBLIC
> - push rbx
> - mov rax, rcx ; rax = RegisterInEax
> - mov rcx, rdx ; rcx = CacheLevel
> -
> - cpuid
> - mov [r8 + 0 ], eax ; Reg->RegEax
> - mov [r8 + 4 ], ebx ; Reg->RegEbx
> - mov [r8 + 8 ], ecx ; Reg->RegEcx
> - mov [r8 + 12], edx ; Reg->RegEdx
> -
> - pop rbx
> - ret
> -EfiCpuidExt ENDP
> -END
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> index c5e3cf4d55..f1e8c7f639 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
> @@ -58,7 +58,6 @@ [Pcd]
> gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam
>
> [Guids]
> - gEfiPlatformCpuInfoGuid
> gEfiStatusCodeDataTypeStringGuid ## CONSUMES
>
> [Depex]
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
> index 074bf7debb..61ecc52cb5 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/MemoryCallback.c
> @@ -124,7 +124,8 @@ MemoryDiscoveredPpiNotifyCallback (
> {
> EFI_STATUS Status;
> EFI_BOOT_MODE BootMode;
> - EFI_CPUID_REGISTER FeatureInfo;
> + UINT32 MaximumExtendedFunction;
> + CPUID_VIR_PHY_ADDRESS_SIZE_EAX Eax;
> UINT8 CpuAddressWidth;
> UINT16 Pm1Cnt;
> EFI_PEI_HOB_POINTERS Hob;
> @@ -279,10 +280,10 @@ MemoryDiscoveredPpiNotifyCallback (
> // Create a CPU hand-off information
> //
> CpuAddressWidth = 32;
> - AsmCpuid (EFI_CPUID_EXTENDED_FUNCTION, &FeatureInfo.RegEax,
> &FeatureInfo.RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx);
> - if (FeatureInfo.RegEax >= EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE) {
> - AsmCpuid (EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE, &FeatureInfo.RegEax,
> &FeatureInfo.RegEbx, &FeatureInfo.RegEcx, &FeatureInfo.RegEdx);
> - CpuAddressWidth = (UINT8) (FeatureInfo.RegEax & 0xFF);
> + AsmCpuid (CPUID_EXTENDED_FUNCTION, &MaximumExtendedFunction,
> NULL, NULL, NULL);
> + if (MaximumExtendedFunction >= CPUID_VIR_PHY_ADDRESS_SIZE) {
> + AsmCpuid (CPUID_VIR_PHY_ADDRESS_SIZE, &Eax.Uint32, NULL, NULL,
> NULL);
> + CpuAddressWidth = (UINT8) (Eax.Bits.PhysicalAddressBits);
> }
>
> BuildCpuHob(CpuAddressWidth, 16);
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
> index 6a2ecf8fb4..8c02adba64 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
> @@ -53,7 +53,7 @@ Abstract:
> #include <Library/BaseLib.h>
> #include <Library/PeiServicesLib.h>
> #include <Library/MtrrLib.h>
> -#include <Library/CpuIA32.h>
> +#include <Register/Cpuid.h>
>
> #include <IndustryStandard/Pci22.h>
> #include <Ppi/Speaker.h>
> @@ -95,8 +95,6 @@ Abstract:
> #define SMBIOS_WAKEUP_TYPE_PCI_PME 0x07
> #define SMBIOS_WAKEUP_TYPE_AC_POWER_RESTORED 0x08
>
> -#define EFI_CPUID_VIRT_PHYS_ADDRESS_SIZE 0x80000008
> -
> //
> // Defines for stall ppi
> //
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
> index eeb9a4a023..8350cf47b7 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
> @@ -78,7 +78,6 @@ [Guids]
> gEfiSetupVariableGuid
> gEfiPlatformInfoGuid
> gEfiPlatformBootModeGuid
> - gEfiPlatformCpuInfoGuid
> gEfiGlobalVariableGuid
> gRecoveryOnFatFloppyDiskGuid
> gRecoveryOnFatUsbDiskGuid
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> index d3969f2344..aac93b0b90 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
> @@ -100,7 +100,6 @@ [Guids]
> gEfiSetupVariableGuid
> gEfiPlatformInfoGuid
> gEfiPlatformBootModeGuid
> - gEfiPlatformCpuInfoGuid
> gEfiGlobalVariableGuid
> gRecoveryOnFatFloppyDiskGuid
> gRecoveryOnFatUsbDiskGuid
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> similarity index 96%
> copy from Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> copy to Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> index dc6d8b1b26..7993ee5758 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> @@ -42,7 +42,7 @@ [Defines]
> DEFINE DXE_ARCHITECTURE = IA32
> !endif
>
> - FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
> + FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> !if $(LFMA_ENABLE) == TRUE
> FIX_LOAD_TOP_MEMORY_ADDRESS = 0xFFFFFFFFFFFFFFFF
> DEFINE TOP_MEMORY_ADDRESS = 0xFFFFFFFFFFFFFFFF
> @@ -220,7 +220,6 @@ [LibraryClasses.common]
> !endif
>
> BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
>
> @@ -770,7 +769,7 @@ [Components.IA32]
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> <BuildOptions>
> - *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
> + *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1245,14 +1244,14 @@ [BuildOptions]
> DEFINE MINNOW2_FSP_OPTION =
>
> !if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
> + DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
> !else
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
> + DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
> !endif
>
>
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> - DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> /DCLKGEN_CONFIG_EXTRA=1
> + DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -
> DCLKGEN_CONFIG_EXTRA=1
> !else
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> !endif
> @@ -1260,29 +1259,29 @@ [BuildOptions]
>
>
> !if $(PCIESC_ENABLE) == TRUE
> - DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
> + DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
> !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> !if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
> + DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
> !else
> DEFINE SATA_SUPPORT_BUILD_OPTION =
> !endif
> !if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
> + DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
> !else
> DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> !endif
>
> !if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
> + DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
> !else
> DEFINE X64_BUILD_ENABLE =
> !endif
>
> !if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
> + DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
> !else
> DEFINE DSC_TPM_BUILD_OPTIONS =
> !endif
> @@ -1293,13 +1292,12 @@ [BuildOptions]
> DEFINE PDB_BUILD_OPTION = /Zi
> !endif
>
> + GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
> GCC:*_*_X64_GENFW_FLAGS = --keepexceptiontable
> INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
> -!if $(TARGET) == DEBUG
> - DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = /Od /Oy-
> -!endif
> + DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
>
> @@ -1322,7 +1320,7 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h
> /DNOCS_S3_SUPPORT
> + *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -
> DNOCS_S3_SUPPORT
>
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 26c1caad94..ee0d055d64 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -222,7 +222,6 @@ [LibraryClasses.common]
> !endif
>
> BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index dc6d8b1b26..62ca4f67cc 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -220,7 +220,6 @@ [LibraryClasses.common]
> !endif
>
> BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index cbc87aa9be..282ff3c2e2 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -222,7 +222,6 @@ [LibraryClasses.common]
> !endif
>
> BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
> - CpuIA32Lib|Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
>
> StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
> index b4a30511ac..1876977e4d 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.h
> @@ -41,7 +41,6 @@
> #include <Library/DxeServicesTableLib.h>
> #include <Library/HiiLib.h>
> #include <Library/BiosIdLib.h>
> -#include <Library/CpuIA32.h>
> #include <Library/HobLib.h>
> #include <Guid/PlatformInfo.h>
> #include <IndustryStandard/Pci22.h>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> index 8ff246041d..ce92b9241a 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.i
> nf
> @@ -61,6 +61,7 @@ [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> SecurityPkg/SecurityPkg.dec
> + UefiCpuPkg/UefiCpuPkg.dec
> BoardModulePkg/BoardModulePkg.dec
> Vlv2TbltDevicePkg/PlatformPkg.dec
> Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec #for PchAccess.h
> @@ -79,7 +80,6 @@ [LibraryClasses]
> UefiRuntimeServicesTableLib
> PrintLib
> BiosIdLib
> - CpuIA32Lib
> IoLib
> HobLib
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
> index be99356d0f..1770d0de42 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
> @@ -27,6 +27,8 @@ Revision History:
> #include <IndustryStandard/SmBios.h>
> #include <Library/IoLib.h>
> #include <Guid/GlobalVariable.h>
> +#include <Register/Cpuid.h>
> +#include <Register/Msr.h>
>
> #include "Valleyview.h"
> #include "VlvAccess.h"
> @@ -74,7 +76,6 @@ SB_REV SBRevisionTable[] = {
> #define PREFIX_ZERO 0x20
>
> #define ICH_REG_REV 0x08
> -#define MSR_IA32_PLATFORM_ID 0x17
>
>
> BOOLEAN mSetupInfoDone = FALSE;
> @@ -495,7 +496,7 @@ UpdateAdditionalInformation (
> GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type4Record +
> Type4Record->Hdr.Length), StrIndex, &ProcessorVersion);
> HiiSetString (mHiiHandle, STR_PROCESSOR_VERSION_VALUE,
> ProcessorVersion, NULL);
>
> - MicrocodeRevision = (UINT32) RShiftU64 (AsmReadMsr64
> (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
> + MicrocodeRevision = (UINT32) RShiftU64 (AsmReadMsr64
> (MSR_IA32_BIOS_SIGN_ID), 32);
> UnicodeSPrint (NewString, sizeof (NewString), L"%8x",
> MicrocodeRevision);
> HiiSetString (mHiiHandle, STR_PROCESSOR_MICROCODE_VALUE,
> NewString, NULL);
> }
> @@ -590,22 +591,29 @@ VOID
> UpdateCPUInformation ()
> {
> CHAR16
> Buffer[40];
> - UINT16 FamilyId;
> - UINT8 Model;
> - UINT8 SteppingId;
> - UINT8 ProcessorType;
> + UINT32 FamilyId;
> + UINT32 Model;
> + UINT32 SteppingId;
> EFI_STATUS Status;
> EFI_MP_SERVICES_PROTOCOL *MpService;
> UINTN MaximumNumberOfCPUs;
> UINTN NumberOfEnabledCPUs;
> UINT32
> Buffer32 = 0xFFFFFFFF; // Keep buffer with unknown device
> + CPUID_VERSION_INFO_EAX Eax;
> + CPUID_VERSION_INFO_EBX Ebx;
> + CPUID_VERSION_INFO_ECX Ecx;
> + CPUID_VERSION_INFO_EDX Edx;
>
> - EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType);
> -
> - //
> - //we need raw Model data
> - //
> - Model = Model & 0xf;
> + AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32,
> &Ecx.Uint32, &Edx.Uint32);
> + FamilyId = Eax.Bits.FamilyId;
> + if (Eax.Bits.FamilyId == 0x0F) {
> + FamilyId |= (Eax.Bits.ExtendedFamilyId << 4);
> + }
> + Model = Eax.Bits.Model;
> + if (Eax.Bits.FamilyId == 0x06 || Eax.Bits.FamilyId == 0x0f) {
> + Model |= (Eax.Bits.ExtendedModelId << 4);
> + }
> + SteppingId = Eax.Bits.SteppingId;
>
> //
> //Family/Model/Step
> @@ -633,7 +641,7 @@ UpdateCPUInformation ()
> //
> // Update Mobile / Desktop / Tablet SKU
> //
> - Buffer32 =(UINT32) RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50)
> & 0x07;
> + Buffer32 =(UINT32) RShiftU64 (AsmReadMsr64
> (MSR_IA32_PLATFORM_ID), 50) & 0x07;
>
> switch(Buffer32){
> case 0x0:
> @@ -903,7 +911,7 @@ UpdatePlatformInformation (
> // VLV-QC Desktop 010
> // VLV-QC Notebook 011
> //
> - CpuFlavor = RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07;
> + CpuFlavor = RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) &
> 0x07;
>
> switch(CpuFlavor){
> case 0x0:
> @@ -1038,9 +1046,9 @@ UpdatePlatformInformation (
> //
> // Microcode Revision
> //
> - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
> - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
> - MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr
> (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
> + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
> + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
> + MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64
> (MSR_IA32_BIOS_SIGN_ID), 32);
> UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
>
> HiiSetString(mHiiHandle,STRING_TOKEN(STR_PROCESSOR_MICROCODE_VAL
> UE), Buffer, NULL);
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
> b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
> index 3583e324e6..4fd618a9a6 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c
> @@ -18,15 +18,12 @@ Abstract:
> #include <Protocol/MpService.h>
> #include <Library/BaseLib.h>
> #include <Library/DebugLib.h>
> -#include <Library/CpuIA32.h>
> +#include <Register/Cpuid.h>
> +#include <Register/Msr.h>
>
> #include <PchRegs.h>
> #include <Library/PchPlatformLib.h>
>
> -#define EFI_CPUID_FAMILY 0x0F00
> -#define EFI_CPUID_MODEL 0x00F0
> -#define EFI_CPUID_STEPPING 0x000F
> -
> EFI_STATUS
> EFIAPI
> PpmPolicyEntry(
> @@ -36,7 +33,6 @@ PpmPolicyEntry(
> {
> EFI_BOOT_SERVICES *pBS;
> EFI_MP_SERVICES_PROTOCOL *MpService;
> - EFI_CPUID_REGISTER Cpuid01 = { 0, 0, 0, 0};
> EFI_HANDLE Handle;
> EFI_STATUS Status;
> UINTN CpuCount;
> @@ -70,13 +66,13 @@ PpmPolicyEntry(
> //
> // Store the CPUID for use by SETUP items.
> //
> - AsmCpuid (EFI_CPUID_VERSION_INFO, &Cpuid01.RegEax,
> &Cpuid01.RegEbx, &Cpuid01.RegEcx, &Cpuid01.RegEdx);
> + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
>
> mDxePlatformPpmPolicy.Revision =
> PPM_PLATFORM_POLICY_PROTOCOL_REVISION_4;
>
> //Read CPU Mobile feature from PLATFORM_ID_MSR MSR(0x17)
> NOTFB_I_AM_NOT_MOBILE_FUSE_CLIAMC00H Bit 28
> //Bit Description: { Disables Mobile features 0 = I am NOT a mobile part 1 = I
> am a mobile part (default)"}
> - CPUMobileFeature = ((RShiftU64
> (AsmReadMsr64(EFI_MSR_IA32_PLATFORM_ID), 28)) & 0x1);
> + CPUMobileFeature = ((RShiftU64
> (AsmReadMsr64(MSR_IA32_PLATFORM_ID), 28)) & 0x1);
>
> if (!EFI_ERROR(Status)) {
> if (CPUMobileFeature == 1){//CPU mobile feature
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
> index 2c0a13f6af..5bcce02983 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
> @@ -27,6 +27,7 @@ [Sources]
>
> [Packages]
> MdePkg/MdePkg.dec
> + UefiCpuPkg/UefiCpuPkg.dec
> Vlv2TbltDevicePkg/PlatformPkg.dec
> Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Fun
> ction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Fun
> ction.c
> index 684cda83ec..d5a4243624 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Fun
> ction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x90Fun
> ction.c
> @@ -23,8 +23,9 @@ Abstract:
>
> #include "MiscSubclassDriver.h"
> #include <Library/PrintLib.h>
> -#include <Library/CpuIA32.h>
> #include <Protocol/DxeSmmReadyToLock.h>
> +#include <Register/Cpuid.h>
> +#include <Register/Msr.h>
>
>
> VOID
> @@ -32,18 +33,24 @@ GetCPUStepping ( )
> {
> CHAR16 Buffer[40];
>
> - UINT16 FamilyId;
> - UINT8 Model;
> - UINT8 SteppingId;
> - UINT8 ProcessorType;
> + UINT32 FamilyId;
> + UINT32 Model;
> + UINT32 SteppingId;
> + CPUID_VERSION_INFO_EAX Eax;
> + CPUID_VERSION_INFO_EBX Ebx;
> + CPUID_VERSION_INFO_ECX Ecx;
> + CPUID_VERSION_INFO_EDX Edx;
>
> -
> - EfiCpuVersion (&FamilyId, &Model, &SteppingId, &ProcessorType);
> -
> - //
> - //we need raw Model data
> - //
> - Model = Model & 0xf;
> + AsmCpuid (CPUID_VERSION_INFO, &Eax.Uint32, &Ebx.Uint32,
> &Ecx.Uint32, &Edx.Uint32);
> + FamilyId = Eax.Bits.FamilyId;
> + if (Eax.Bits.FamilyId == 0x0F) {
> + FamilyId |= (Eax.Bits.ExtendedFamilyId << 4);
> + }
> + Model = Eax.Bits.Model;
> + if (Eax.Bits.FamilyId == 0x06 || Eax.Bits.FamilyId == 0x0f) {
> + Model |= (Eax.Bits.ExtendedModelId << 4);
> + }
> + SteppingId = Eax.Bits.SteppingId;
>
> //
> //Family/Model/Step
> @@ -243,9 +250,9 @@ GetUcodeVersion()
> //
> // Microcode Revision
> //
> - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
> - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
> - MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr
> (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
> + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
> + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
> + MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64
> (MSR_IA32_BIOS_SIGN_ID), 32);
> UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
> HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_UCODE_VERSION),
> Buffer, NULL);
> }
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Fun
> ction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Fun
> ction.c
> index 97a782e362..f1bb15ae6e 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Fun
> ction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscOemType0x94Fun
> ction.c
> @@ -29,7 +29,6 @@ Abstract:
> #include <Protocol/I2cBus.h>
>
> #include <Library/IoLib.h>
> -#include <Library/CpuIA32.h>
> #include <Library/UefiRuntimeServicesTableLib.h>
> #include <Guid/PlatformInfo.h>
> #include <Guid/SetupVariable.h>
> @@ -73,7 +72,6 @@ SB_REV SBRevisionTable[] = {
> #define PREFIX_ZERO 0x20
>
> #define ICH_REG_REV 0x08
> -#define MSR_IA32_PLATFORM_ID 0x17
> #define CHARACTER_NUMBER_FOR_VALUE 30
>
>
> @@ -565,7 +563,7 @@ UpdatePlatformInformation (
> //
> //CPU flavor
> //
> - CpuFlavor = RShiftU64 (EfiReadMsr (MSR_IA32_PLATFORM_ID), 50) & 0x07;
> + CpuFlavor = RShiftU64 (AsmReadMsr64 (MSR_IA32_PLATFORM_ID), 50) &
> 0x07;
>
> switch(CpuFlavor){
> case 0x0:
> @@ -661,9 +659,9 @@ UpdatePlatformInformation (
> //
> // Microcode Revision
> //
> - EfiWriteMsr (EFI_MSR_IA32_BIOS_SIGN_ID, 0);
> - EfiCpuid (EFI_CPUID_VERSION_INFO, NULL);
> - MicroCodeVersion = (UINT32) RShiftU64 (EfiReadMsr
> (EFI_MSR_IA32_BIOS_SIGN_ID), 32);
> + AsmWriteMsr64 (MSR_IA32_BIOS_SIGN_ID, 0);
> + AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, NULL);
> + MicroCodeVersion = (UINT32) RShiftU64 (AsmReadMsr64
> (MSR_IA32_BIOS_SIGN_ID), 32);
> UnicodeSPrint (Buffer, sizeof (Buffer), L"%x", MicroCodeVersion);
>
> HiiSetString(mHiiHandle,STRING_TOKEN(STR_MISC_PROCESSOR_MICROCO
> DE_VALUE), Buffer, NULL);
>
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformat
> ionFunction.c
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformat
> ionFunction.c
> index e71a03ceac..8a52d017c1 100644
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformat
> ionFunction.c
> +++
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscProcessorInformat
> ionFunction.c
> @@ -20,7 +20,6 @@ Abstract:
> #include "MiscSubclassDriver.h"
>
> #include <Protocol/MpService.h>
> -#include <Library/CpuIA32.h>
> #include <Library/TimerLib.h>
> #include <Register/Cpuid.h>
>
> @@ -102,7 +101,7 @@ DetermineiFsbFromMsr (
> // Determine the processor core frequency
> //
> UINT64 Temp;
> - Temp = (EfiReadMsr (BSEL_CR_OVERCLOCK_CONTROL)) &
> FUSE_BSEL_MASK;
> + Temp = (AsmReadMsr64 (BSEL_CR_OVERCLOCK_CONTROL)) &
> FUSE_BSEL_MASK;
> return miFSBFrequencyTable[(UINT32)(Temp)];
>
> }
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> index 016fb53b18..94d9cd67e7 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
> @@ -103,7 +103,6 @@ [LibraryClasses]
> UefiLib
> BiosIdLib
> PrintLib
> - CpuIA32Lib
> PchPlatformLib
> NetLib
> HobLib
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 03fa062310..1705b1628b 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -104,6 +104,9 @@ for (( i=1; i<=$#; ))
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
> Arch=X64
> shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> + Arch=IA32
> + shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
> SpiLock=1
> shift
> @@ -243,11 +246,11 @@ build
>
> ##********************************************************
> **************
> echo Skip "Running fce..."
>
> +cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM
> +
>
> ##********************************************************
> **************
> ## Build Capsules
>
> ##********************************************************
> **************
> -cp -f
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> V/VLV.fd \
> -
> $WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}/F
> V/Vlv.ROM
> build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
>
> echo
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (21 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 22/28] Vlv2TbltDevicePkg: Add GCC IA32 build support Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:38 ` [edk2-devel] " Sun, Zailiang
2019-07-12 3:34 ` rebecca
2019-07-10 19:05 ` [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries Michael D Kinney
` (6 subsequent siblings)
29 siblings, 2 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
When setting NETWORK_TLS_ENABLE to TRUE, we need TlsLib.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 3 +++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +++
4 files changed, 12 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index 7993ee5758..e4e86cbb07 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -242,6 +242,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index ee0d055d64..bc986eae78 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -244,6 +244,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 62ca4f67cc..f2f02e5f76 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -242,6 +242,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 282ff3c2e2..4184c946a6 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -244,6 +244,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
2019-07-10 19:05 ` [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Michael D Kinney
@ 2019-07-12 2:38 ` Sun, Zailiang
2019-07-12 3:34 ` rebecca
1 sibling, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:38 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Michael D Kinney
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-devel] [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
From: Gary Lin <glin@suse.com>
When setting NETWORK_TLS_ENABLE to TRUE, we need TlsLib.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 3 +++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +++
Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +++
4 files changed, 12 insertions(+)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index 7993ee5758..e4e86cbb07 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -242,6 +242,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index ee0d055d64..bc986eae78 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -244,6 +244,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 62ca4f67cc..f2f02e5f76 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -242,6 +242,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 282ff3c2e2..4184c946a6 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -244,6 +244,9 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+!endif
+!if $(NETWORK_TLS_ENABLE) == TRUE
+ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
2019-07-10 19:05 ` [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Michael D Kinney
2019-07-12 2:38 ` [edk2-devel] " Sun, Zailiang
@ 2019-07-12 3:34 ` rebecca
1 sibling, 0 replies; 69+ messages in thread
From: rebecca @ 2019-07-12 3:34 UTC (permalink / raw)
To: devel, michael.d.kinney; +Cc: Gary Lin, Zailiang Sun, Yi Qian
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
On 7/10/19 1:05 PM, Michael D Kinney wrote:
> From: Gary Lin <glin@suse.com>
>
> When setting NETWORK_TLS_ENABLE to TRUE, we need TlsLib.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 3 +++
> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +++
> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +++
> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +++
> 4 files changed, 12 insertions(+)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> index 7993ee5758..e4e86cbb07 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> @@ -242,6 +242,9 @@ [LibraryClasses.common]
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> +!endif
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> !endif
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index ee0d055d64..bc986eae78 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -244,6 +244,9 @@ [LibraryClasses.common]
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> +!endif
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> !endif
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 62ca4f67cc..f2f02e5f76 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -242,6 +242,9 @@ [LibraryClasses.common]
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> +!endif
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> !endif
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 282ff3c2e2..4184c946a6 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -244,6 +244,9 @@ [LibraryClasses.common]
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> +!endif
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> !endif
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (22 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 23/28] Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-12 2:38 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error Michael D Kinney
` (5 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Gary Lin, Zailiang Sun, Yi Qian
From: Gary Lin <glin@suse.com>
* Simplify the logic of importing TpmMeasurementLib
* Import BaseCryptLib, OpensslLib, and IntrinsicLib unconditionally
since FmpDxe needs them
* Import FileExplorerLib unconditionally since UiApp needs it
* Update the import of TPM/TCG libraries
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 45 +++++++----------
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 48 +++++++------------
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 45 +++++++----------
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 47 +++++++-----------
4 files changed, 66 insertions(+), 119 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index e4e86cbb07..eb7ae46505 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -197,7 +197,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -215,8 +214,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+!else
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -224,34 +224,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -305,18 +299,13 @@ [LibraryClasses.IA32]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.IA32.DXE_DRIVER]
@@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+ TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+!endif
+
[LibraryClasses.IA32.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE]
[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -794,8 +784,6 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -925,7 +913,6 @@ [Components.IA32]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf {
@@ -1019,9 +1006,9 @@ [Components.IA32]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index bc986eae78..69f2b22aff 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -199,7 +199,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -217,8 +216,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+!else
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -226,35 +226,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -308,18 +301,13 @@ [LibraryClasses.X64]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.X64.DXE_DRIVER]
@@ -373,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+ TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+!endif
+
[LibraryClasses.X64.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -392,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE]
[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -797,10 +786,8 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
+ }
!endif
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {
@@ -941,7 +928,6 @@ [Components.X64]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf {
@@ -1035,9 +1021,9 @@ [Components.X64]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index f2f02e5f76..7092ab6e6b 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -197,7 +197,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -215,8 +214,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+!else
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -224,34 +224,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -305,18 +299,13 @@ [LibraryClasses.IA32]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.IA32.DXE_DRIVER]
@@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+ TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+!endif
+
[LibraryClasses.IA32.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE]
[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -794,8 +784,6 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -925,7 +913,6 @@ [Components.IA32]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf {
@@ -1019,9 +1006,9 @@ [Components.IA32]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 4184c946a6..238561191f 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -199,7 +199,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -217,8 +216,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+!else
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -226,34 +226,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -307,18 +301,13 @@ [LibraryClasses.X64]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.X64.DXE_DRIVER]
@@ -372,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+ TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
+!endif
+
[LibraryClasses.X64.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -391,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE]
[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -796,10 +786,8 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
+ }
!endif
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {
@@ -940,7 +928,6 @@ [Components.X64]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf {
@@ -1034,9 +1021,9 @@ [Components.X64]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries
2019-07-10 19:05 ` [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries Michael D Kinney
@ 2019-07-12 2:38 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:38 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Gary Lin, Qian, Yi
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Gary Lin <glin@suse.com>; Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>
Subject: [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries
From: Gary Lin <glin@suse.com>
* Simplify the logic of importing TpmMeasurementLib
* Import BaseCryptLib, OpensslLib, and IntrinsicLib unconditionally
since FmpDxe needs them
* Import FileExplorerLib unconditionally since UiApp needs it
* Update the import of TPM/TCG libraries
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
---
.../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 45 +++++++----------
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 48 +++++++------------
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 45 +++++++----------
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 47 +++++++-----------
4 files changed, 66 insertions(+), 119 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index e4e86cbb07..eb7ae46505 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -197,7 +197,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -215,8 +214,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+
+TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasur
+ementLib.inf
+!else
+
+TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasure
+mentLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -224,34 +224,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i
+ nf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -305,18 +299,13 @@ [LibraryClasses.IA32]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+
+Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.i
+nf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.IA32.DXE_DRIVER]
@@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+
+TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNul
+l.inf
+!endif
+
[LibraryClasses.IA32.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE]
[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -794,8 +784,6 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -925,7 +913,6 @@ [Components.IA32]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1019,9 +1006,9 @@ [Components.IA32]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index bc986eae78..69f2b22aff 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -199,7 +199,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -217,8 +216,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+
+TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasur
+ementLib.inf
+!else
+
+TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasure
+mentLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -226,35 +226,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i
+ nf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -308,18 +301,13 @@ [LibraryClasses.X64]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+
+Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.i
+nf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.X64.DXE_DRIVER]
@@ -373,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+
+TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNul
+l.inf
+!endif
+
[LibraryClasses.X64.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -392,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE]
[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -797,10 +786,8 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
+ }
!endif
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { @@ -941,7 +928,6 @@ [Components.X64]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1035,9 +1021,9 @@ [Components.X64]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index f2f02e5f76..7092ab6e6b 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -197,7 +197,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -215,8 +214,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+
+TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasur
+ementLib.inf
+!else
+
+TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasure
+mentLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -224,34 +224,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i
+ nf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -305,18 +299,13 @@ [LibraryClasses.IA32]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+
+Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.i
+nf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.IA32.DXE_DRIVER]
@@ -370,6 +359,10 @@ [LibraryClasses.IA32.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+
+TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNul
+l.inf
+!endif
+
[LibraryClasses.IA32.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -389,10 +382,7 @@ [LibraryClasses.IA32.SMM_CORE]
[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -794,8 +784,6 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
}
!endif
@@ -925,7 +913,6 @@ [Components.IA32]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1019,9 +1006,9 @@ [Components.IA32]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf { diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 4184c946a6..238561191f 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -199,7 +199,6 @@ [LibraryClasses.common]
TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-
!endif
PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -217,8 +216,9 @@ [LibraryClasses.common]
# CryptLib
#
!if $(TPM_ENABLED) == TRUE
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+
+TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasur
+ementLib.inf
+!else
+
+TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasure
+mentLibNull.inf
!endif
BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
@@ -226,34 +226,28 @@ [LibraryClasses.common]
StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
!if $(SECURE_BOOT_ENABLE) == TRUE
- OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
- IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
- FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
!else
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
!endif
+
+
+ FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.i
+ nf
+
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-!if $(NETWORK_ISCSI_ENABLE) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!endif
!if $(NETWORK_TLS_ENABLE) == TRUE
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
!endif
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
[LibraryClasses.IA32.SEC]
@@ -307,18 +301,13 @@ [LibraryClasses.X64]
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+
+Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.i
+nf
+!if $(TPM_ENABLED) == TRUE
TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!if $(TPM_ENABLED) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-!endif
-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
[LibraryClasses.X64.DXE_DRIVER]
@@ -372,6 +361,10 @@ [LibraryClasses.X64.DXE_SMM_DRIVER]
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+!if $(TPM_ENABLED) == TRUE
+
+TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNul
+l.inf
+!endif
+
[LibraryClasses.X64.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -391,10 +384,7 @@ [LibraryClasses.X64.SMM_CORE]
[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-!if $(TPM_ENABLED) == TRUE
+!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
!endif
@@ -796,10 +786,8 @@ [Components.IA32]
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
SecurityPkg/Tcg/TcgPei/TcgPei.inf {
<LibraryClasses>
- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-}
+ }
!endif
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf { @@ -940,7 +928,6 @@ [Components.X64]
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
<LibraryClasses>
PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
}
MdeModulePkg/Logo/LogoDxe.inf
MdeModulePkg/Application/UiApp/UiApp.inf { @@ -1034,9 +1021,9 @@ [Components.X64]
Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
!if $(TPM_ENABLED) == TRUE
- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
<LibraryClasses>
- PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+ PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}
SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (23 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 24/28] Vlv2TbltDevicePkg: Reorganize the libraries Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:54 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Michael D Kinney
` (4 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Remove use of a method to read a register from a BAR
and instead access the register directly. Resolves the
following error from the latest iasl compiler.
Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)), 21),PARM, PARM)
Error 6163 - Object is created temporarily in another method
and cannot be accessed ^ (\_SB.PCI0.GFX0.MCHK.DCFE)
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../AcpiTablesPCAT/IgdOGBDA.ASL | 14 ++++++++++++--
.../AcpiTablesPCAT/IgdOpRn.ASL | 18 +-----------------
2 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
index 4482db6906..379fca7379 100644
--- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
+++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
@@ -1,6 +1,6 @@
/*++
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -125,7 +125,17 @@ Method (GBDA, 0, Serialized)
// Report the graphics frequency based on DISPLAY_CLOCK_FREQUENCY_ENCODING [MMADR+0x20C8]
- Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)), 21),PARM, PARM)
+ If (LNotEqual (MADR, 0xFFFFFFFF))
+ {
+ OperationRegion(IGMM,SystemMemory,MADR,0x3000)
+ Field(IGMM,AnyAcc, NoLock, Preserve)
+ {
+ Offset(0X20C8),
+ , 4,
+ DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCODING
+ }
+ Or(ShiftLeft(Derefof(Index(CDCT, DCFE)), 21),PARM, PARM)
+ }
Store(1, GESF) // Set the modified settings flag
Return(SUCC)
diff --git a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
index 8575fbfe6c..386ad3e65e 100644
--- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
+++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
@@ -1,6 +1,6 @@
/*++
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -70,22 +70,6 @@ Field(IGDP, AnyAcc, NoLock, Preserve)
ASLS, 32, // Reg 0xFC, Address of the IGD OpRegion
}
-Method (MCHK, 0, Serialized)
-{
-
- If (LNotEqual (MADR, 0xFFFFFFFF))
- {
- OperationRegion(IGMM,SystemMemory,MADR,0x3000)
- Field(IGMM,AnyAcc, NoLock, Preserve)
- {
- Offset(0X20C8),
- , 4,
- DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCODING
- }
- }
-}
-
-
// Define an OperationRegion to cover the IGD OpRegion layout.
OperationRegion(IGDM, SystemMemory, ASLB, 0x2000)
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error
2019-07-10 19:05 ` [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error Michael D Kinney
@ 2019-07-11 4:54 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:54 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 25/28]
> Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error
>
> Remove use of a method to read a register from a BAR and instead access
> the register directly. Resolves the following error from the latest iasl
> compiler.
>
> Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)), 21),PARM,
> PARM)
>
> Error 6163 - Object is created temporarily in another method
> and cannot be accessed ^ (\_SB.PCI0.GFX0.MCHK.DCFE)
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../AcpiTablesPCAT/IgdOGBDA.ASL | 14 ++++++++++++--
> .../AcpiTablesPCAT/IgdOpRn.ASL | 18 +-----------------
> 2 files changed, 13 insertions(+), 19 deletions(-)
>
> diff --git
> a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
> b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
> index 4482db6906..379fca7379 100644
> --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
> +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOGBDA.ASL
> @@ -1,6 +1,6 @@
> /*++
>
> -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -125,7 +125,17 @@ Method (GBDA, 0, Serialized)
>
> // Report the graphics frequency based on
> DISPLAY_CLOCK_FREQUENCY_ENCODING [MMADR+0x20C8]
>
> - Or(ShiftLeft(Derefof(Index(CDCT, \_SB.PCI0.GFX0.MCHK.DCFE)),
> 21),PARM, PARM)
> + If (LNotEqual (MADR, 0xFFFFFFFF))
> + {
> + OperationRegion(IGMM,SystemMemory,MADR,0x3000)
> + Field(IGMM,AnyAcc, NoLock, Preserve)
> + {
> + Offset(0X20C8),
> + , 4,
> + DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCODING
> + }
> + Or(ShiftLeft(Derefof(Index(CDCT, DCFE)), 21),PARM, PARM)
> + }
>
> Store(1, GESF) // Set the modified settings flag
> Return(SUCC)
> diff --git
> a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
> b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
> index 8575fbfe6c..386ad3e65e 100644
> --- a/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
> +++ b/Silicon/Intel/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/IgdOpRn.ASL
> @@ -1,6 +1,6 @@
> /*++
>
> -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> +Copyright (c) 1999 - 2019, Intel Corporation. All rights reserved
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -70,22 +70,6 @@ Field(IGDP, AnyAcc, NoLock, Preserve)
> ASLS, 32, // Reg 0xFC, Address of the IGD OpRegion
> }
>
> -Method (MCHK, 0, Serialized)
> -{
> -
> - If (LNotEqual (MADR, 0xFFFFFFFF))
> - {
> - OperationRegion(IGMM,SystemMemory,MADR,0x3000)
> - Field(IGMM,AnyAcc, NoLock, Preserve)
> - {
> - Offset(0X20C8),
> - , 4,
> - DCFE, 4, // DISPLAY_CLOCK_FREQUENCY_ENCODING
> - }
> - }
> -}
> -
> -
> // Define an OperationRegion to cover the IGD OpRegion layout.
>
> OperationRegion(IGDM, SystemMemory, ASLB, 0x2000)
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (24 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 25/28] Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-12 3:39 ` [edk2-devel] " rebecca
2019-07-10 19:05 ` [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64 Michael D Kinney
` (3 subsequent siblings)
29 siblings, 2 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
* Remove cln.sh
* Remove unused PlatformDefintions.h file
* Remove unused defines from DSC files
* Make Windows and Linux script more consistent
* Remove unused options from Windows/Linux scripts
* Remove unused defines from Windows/Linux scripts
* Do not modify Target.txt in Conf directory. Instead,
pass all build flags on the command line
* Generate build report in the build output directory
* Generate build logs in the build output directory
* Do not delete files from Conf directory
* Update clean operation to only clean one platform target
* Do not generate AutoPlatformCFG.txt file anymore
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 ++-------
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 57 +++----
.../Include/PlatformDefinitions.h | 43 -----
.../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
.../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 55 +-----
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 53 +-----
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 53 +-----
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 55 +-----
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 120 ++++++-------
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 159 ++++++++----------
Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 -------
12 files changed, 156 insertions(+), 583 deletions(-)
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/.gitignore
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore b/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
deleted file mode 100644
index c7698262ad..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-AutoPlatformCFG.txt
-Stitch/Stitching.log
-Stitch/MNW*.bin
-Stitch/MNW*.rom
-Stitch/MNW*.rom.orig
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
index 44759c617f..f65aa61f4a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -9,15 +9,9 @@
SetLocal EnableDelayedExpansion EnableExtensions
-@REM Go to work space directory.
-cd ..
-cd ..
-
:: Assign initial values
set exitCode=0
set "Build_Flags= "
-set "Stitch_Flags= "
-set Arch=X64
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
set PLATFORM_PATH=%WORKSPACE%
@@ -42,11 +36,6 @@ if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (
:OptLoop
if /i "%~1"=="/?" goto Usage
-if /i "%~1"=="/q" (
- set Build_Flags=%Build_Flags% /q
- shift
- goto OptLoop
-)
if /i "%~1"=="/l" (
set Build_Flags=%Build_Flags% /l
shift
@@ -67,53 +56,17 @@ if /i "%~1" == "/c" (
shift
goto OptLoop
)
-if /i "%~1" == "/ECP" (
- set Build_Flags=%Build_Flags% /ecp
- shift
- goto OptLoop
-)
-
-if /i "%~1"=="/s" (
- set Build_Flags=%Build_Flags% /s
- shift
- goto OptLoop
-)
-
if /i "%~1"=="/x64" (
- set Arch=X64
set Build_Flags=%Build_Flags% /x64
shift
goto OptLoop
)
-
if /i "%~1"=="/IA32" (
- set Arch=IA32
set Build_Flags=%Build_Flags% /IA32
shift
goto OptLoop
)
-if /i "%~1"=="/nG" (
- set Stitch_Flags=%Stitch_Flags% /nG
- shift
- goto OptLoop
-)
-if /i "%~1"=="/nM" (
- set Stitch_Flags=%Stitch_Flags% /nM
- shift
- goto OptLoop
-)
-if /i "%~1"=="/nB" (
- set Stitch_Flags=%Stitch_Flags% /nB
- shift
- goto OptLoop
-)
-if /i "%~1"=="/yL" (
- set Stitch_Flags=%Stitch_Flags% /yL
- shift
- goto OptLoop
-)
-
:: Require 2 input parameters
if "%~2"=="" goto Usage
@@ -125,7 +78,7 @@ set Build_Target=%~2
echo ======================================================================
echo Build_IFWI: Calling BIOS build Script...
-call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
+call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
if %ERRORLEVEL% NEQ 0 (
echo echo -- Error Building BIOS & echo.
@@ -139,23 +92,21 @@ goto Exit
:Usage
echo Script to build BIOS firmware and stitch the entire IFWI.
echo.
-echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget [IFWI Suffix]
+echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget
echo.
-echo /c CleanAll before building
-echo /x64 Set Arch to X64 (default: X64)
-echo /IA32 Set Arch to IA32 (default: X64)
-echo /yL Enable SPI lock
-echo.
-echo Platform Types: MNW2
-echo Build Targets: Release, Debug
-echo IFWI Suffix: Suffix to append to end of IFWI filename (default: MM_DD_YYYY)
+echo /c CleanAll
+echo /l Generate build log file
+echo /y Generate build report file
+echo /m Enable multi-processor build
+echo /IA32 Set Arch to IA32 (default: X64)
+echo /X64 Set Arch to X64 (default: X64)
echo.
-echo See Stitch/Stitch_Config.txt for additional stitching settings.
+echo Platform Types: MNW2
+echo Build Targets: Debug, Release (default: Debug)
echo.
-echo If capsule update is needed, please update CAPSULE_ENABLE = TRUE in Config.dsc.
-echo If recovery is needed, please update RECOVERY_ENABLE = TRUE in Config.dsc.
-echo If either of above is TRUE, please set OPENSSL_PATH in windows evironment
-echo and put openssl.exe there, to generate final capsule image.
+echo Examples:
+echo Build_IFWI.bat MNW2 debug : X64 Debug build for MinnowMax
+echo Build_IFWI.bat /IA32 MNW2 release : IA32 Release build for MinnowMax
echo.
set exitCode=1
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index 349f0c7ba7..153c8c5fae 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,15 +6,21 @@ function Usage ( ) {
echo
echo "Script to build BIOS firmware and stitch the entire IFWI."
echo
- echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
+ echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget"
echo
- echo
- echo " /yL [option] : Enable SPI lock"
- echo " Platform Types: MNW2"
- echo " Build Targets: Release, Debug"
+ echo " /c CleanAll"
+ echo " /l Generate build log file"
+ echo " /y Generate build report file"
+ echo " /m Enable multi-processor build"
+ echo " /IA32 Set Arch to IA32 (default: X64)"
+ echo " /X64 Set Arch to X64 (default: X64)"
echo
- echo " See Stitch/Stitch_Config.txt for additional stitching settings."
+ echo " Platform Types: MNW2"
+ echo " Build Targets: Debug, Release (default: Debug)"
echo
+ echo "Examples:"
+ echo " Build_IFWI.sh MNW2 debug : X64 Debug build for MinnowMax"
+ echo " Build_IFWI.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
echo
exit 0
}
@@ -24,9 +30,6 @@ set -e
## Assign initial values
exitCode=0
Build_Flags=
-Stitch_Flags=
-Arch=X64
-PLATFORM_PACKAGE=Vlv2TbltDevicePkg
## Check whether WORKSPACE is set or not
if [[ -z "$WORKSPACE" ]]; then
@@ -47,41 +50,24 @@ fi
for (( i=1; i<=$#; ))
do
- if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
- Build_Flags="$Build_Flags /q"
- shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
+ if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
Build_Flags="$Build_Flags /l"
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
+ Build_Flags="$Build_Flags /y"
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
+ Build_Flags="$Build_Flags /m"
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
Build_Flags="$Build_Flags /c"
shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/ECP" ]; then
- Build_Flags="$Build_Flags /ecp"
- shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
- Arch=X64
Build_Flags="$Build_Flags /x64"
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
- Arch=IA32
Build_Flags="$Build_Flags /IA32"
shift
- elif [ "$1" == "/nG" ]; then
- Stitch_Flags="$Stitch_Flags /nG"
- shift
- elif [ "$1" == "/nM" ]; then
- Stitch_Flags="$Stitch_Flags /nM"
- shift
- elif [ "$1" == "/nB" ]; then
- Stitch_Flags="$Stitch_Flags /nB"
- shift
- elif [ "$1" == "/nV" ]; then
- Stitch_Flags="$Stitch_Flags /nV"
- shift
- elif [ "$1" == "/yL" ]; then
- Build_Flags="$Build_Flags /yL"
- shift
else
break
fi
@@ -95,11 +81,6 @@ fi
## Assign required arguments
Platform_Type=$1
Build_Target=$2
-if [ "$3" == "" ]; then
- IFWI_Suffix=
-else
- IFWI_Suffix="/S $3"
-fi
## Build BIOS
echo "======================================================================"
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
deleted file mode 100644
index a64cda0799..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*++
-
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
-
-Module Name:
-
- PlatformDefinitions.h
-
-Abstract:
-
- This header file provides platform specific definitions used by other modules
- for platform specific initialization.
-
- THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY NON-C MODULES
- (ASL and VFR)
-
- This file should not contain addition or other operations that an ASL compiler or
- VFR compiler does not understand.
-
---*/
-
-#ifndef _PLATFORM_DEFINITIONS_H_
-#define _PLATFORM_DEFINITIONS_H_
-
-
-//
-// Platform Base Address definitions
-//
-#define PCIEX_BASE_ADDRESS EDKII_GLUE_PciExpressBaseAddress // Pci Express Configuration Space Base Address
-
-#define PCIEX_LENGTH PLATFORM_PCIEXPRESS_LENGTH
-
-#define THERMAL_BASE_ADDRESS 0xFED08000
-
-#ifndef MCH_BASE_ADDRESS
-#define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base Address
-#endif
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 7b48d7b44e..43db3e28ab 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -54,8 +54,6 @@
DEFINE USB_SERIAL_STATUS_CODE_ENABLE = FALSE
DEFINE RAM_SERIAL_STATUS_CODE_ENABLE = FALSE
-DEFINE ENBDT_S3_SUPPORT = TRUE
-
DEFINE LZMA_ENABLE = TRUE
DEFINE S4_ENABLE = TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index eb7ae46505..0f9651cfba 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -27,20 +27,9 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-!if $(X64_CONFIG) == TRUE
- DEFINE DXE_ARCHITECTURE = X64
-!else
DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -761,8 +750,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1231,56 +1218,19 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
!else
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
!endif
-
-
!if $(PCIESC_ENABLE) == TRUE
DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
!if $(SOURCE_DEBUG_ENABLE) == TRUE
@@ -1290,7 +1240,6 @@ [BuildOptions]
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 69f2b22aff..257bba7485 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -27,22 +27,11 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
DEFINE PLATFORMX64_ENABLE = TRUE
-!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
-!else
- DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -763,8 +752,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1246,15 +1233,6 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
!else
@@ -1268,34 +1246,8 @@ [BuildOptions]
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
!if $(SOURCE_DEBUG_ENABLE) == TRUE
@@ -1305,7 +1257,6 @@ [BuildOptions]
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 7092ab6e6b..23e296d432 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -27,20 +27,9 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-!if $(X64_CONFIG) == TRUE
- DEFINE DXE_ARCHITECTURE = X64
-!else
DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -761,8 +750,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1231,15 +1218,6 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
!else
@@ -1253,34 +1231,8 @@ [BuildOptions]
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
!if $(SOURCE_DEBUG_ENABLE) == TRUE
MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
@@ -1291,7 +1243,6 @@ [BuildOptions]
!endif
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 238561191f..e0fd767dea 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -27,22 +27,11 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
DEFINE PLATFORMX64_ENABLE = TRUE
-!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
-!else
- DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -763,8 +752,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1246,56 +1233,19 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
!else
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
!endif
-
-
!if $(PCIESC_ENABLE) == TRUE
DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
!if $(SOURCE_DEBUG_ENABLE) == TRUE
MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
@@ -1306,7 +1256,6 @@ [BuildOptions]
!endif
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index ffd6722582..c39b8ccd62 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -11,7 +11,6 @@ echo.
echo %date% %time%
echo.
-
::**********************************************************************
:: Initial Setup
::**********************************************************************
@@ -20,9 +19,14 @@ set /a build_threads=1
set "Build_Flags= "
set exitCode=0
set Arch=X64
-set Source=0
+set GenLog=FALSE
+set GenReport=FALSE
+set Clean=FALSE
set PLATFORM_NAME=Vlv2TbltDevicePkg
+::**********************************************************************
+:: Detect full path to the edk2 repo
+::**********************************************************************
set CORE_PATH=%WORKSPACE%
if not exist %CORE_PATH%\edksetup.bat (
if defined PACKAGES_PATH (
@@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat (
)
:CorePathFound
+::**********************************************************************
+:: Detect full path to the Vlv2TbltDevicePkg
+::**********************************************************************
set PLATFORM_PACKAGE=%WORKSPACE%\%PLATFORM_NAME%
if not exist %PLATFORM_PACKAGE% (
if defined PACKAGES_PATH (
@@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% (
cd %CORE_PATH%
-:: Clean up previous build files.
-if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
-if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
-if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
-if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
-if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
-if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
+::**********************************************************************
+:: Run edksetup.bat and make sure tools are up to date
+::**********************************************************************
-:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
-:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
call %CORE_PATH%\edksetup.bat Rebuild
@echo off
-:: Define platform specific environment variables.
-set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
-set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
-
-
-
-::create new AutoPlatformCFG.txt file
-copy /y nul %auto_config_inc% >nul
-
::**********************************************************************
:: Parse command line arguments
::**********************************************************************
@@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul
if /i "%~1"=="/?" goto Usage
if /i "%~1"=="/l" (
- set Build_Flags=%Build_Flags% -j EDK2.log
+ set GenLog=TRUE
shift
goto OptLoop
)
if /i "%~1"=="/y" (
- set Build_Flags=%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
+ set GenReport=TRUE
shift
goto OptLoop
)
@@ -109,16 +101,7 @@ if /i "%~1"=="/m" (
goto OptLoop
)
if /i "%~1" == "/c" (
- echo Removing previous build files ...
- if exist build (
- del /f/s/q build > nul
- rmdir /s/q build
- )
- if exist %WORKSPACE%\Conf\.cache (
- del /f/s/q %WORKSPACE%\Conf\.cache > nul
- rmdir /s/q %WORKSPACE%\Conf\.cache
- )
- echo.
+ set Clean=TRUE
shift
goto OptLoop
)
@@ -137,23 +120,6 @@ if /i "%~1"=="/IA32" (
:: Required argument(s)
if "%~1"=="" goto Usage
-if "%Arch%"=="IA32" (
- echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
-) else if "%Arch%"=="X64" (
- echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
-)
-
-:: -- Build flags settings for each Platform --
-echo Setting %1 platform configuration...
-if /i "%~1" == "MNW2" (
- echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
-
-) else (
- echo Error - Unsupported PlatformType: %1
- goto Usage
-)
-set Platform_Type=%~1
-
if /i "%~2" == "RELEASE" (
set target=RELEASE
) else (
@@ -161,8 +127,9 @@ if /i "%~2" == "RELEASE" (
)
::**********************************************************************
-:: Additional EDK Build Setup/Configuration
+:: Detect TOOL_CHAIN_TAG
::**********************************************************************
+
echo.
echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008...
if defined VS140COMNTOOLS (
@@ -206,6 +173,10 @@ if defined VS140COMNTOOLS (
goto :BldFail
)
+::**********************************************************************
+:: Generate BUILD_PATH and make sure the directory exists
+::**********************************************************************
+
echo Ensuring correct build directory is present
if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
if "%Arch%"=="IA32" (
@@ -217,26 +188,41 @@ if "%Arch%"=="IA32" (
)
if not exist %BUILD_PATH% mkdir %BUILD_PATH%
-echo Modifing Conf files for this build...
-:: Remove lines with these tags from target.txt
-findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp
+::**********************************************************************
+:: Check for clean operation
+::**********************************************************************
-echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp
+if "%Clean%"=="TRUE" (
+ echo Removing previous build files ...
+ if exist %BUILD_PATH% (
+ rmdir /s/q %BUILD_PATH%
+ )
+ if exist %WORKSPACE%\Conf\.cache (
+ rmdir /s/q %WORKSPACE%\Conf\.cache
+ )
+ echo.
+ goto :Exit
+)
+
+::**********************************************************************
+:: Generate Build_Flags
+::**********************************************************************
+
+set Build_Flags=%Build_Flags% -b %TARGET%
if "%Arch%"=="IA32" (
- echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp
+ set Build_Flags=%Build_Flags% -a IA32
) else if "%Arch%"=="X64" (
- echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp
+ set Build_Flags=%Build_Flags% -a IA32 -a X64
)
-echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp
-echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
-if %Source% == 0 (
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp
-) else (
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp
+set Build_Flags=%Build_Flags% -t %TOOL_CHAIN_TAG%
+set Build_Flags=%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
+set Build_Flags=%Build_Flags% -n %build_threads%
+if "%GenLog%"=="TRUE" (
+ set Build_Flags=%Build_Flags% -j %BUILD_PATH%\%PLATFORM_NAME%.log
+)
+if "%GenReport%"=="TRUE" (
+ set Build_Flags=%Build_Flags% -y %BUILD_PATH%\%PLATFORM_NAME%.report
)
-echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp
-
-move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
::**********************************************************************
:: Generate BIOS ID
@@ -267,6 +253,8 @@ echo VERSION_MINOR = 01 >> %BUILD_PATH%/BiosId.env
echo.
echo Invoking EDK2 build...
+echo build %Build_Flags%
+
call build %Build_Flags%
if %ERRORLEVEL% NEQ 0 goto BldFail
@@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms.
echo.
echo Usage: bld_vlv.bat [options] PlatformType [Build Target]
echo.
-echo /c CleanAll before building
+echo /c CleanAll
echo /l Generate build log file
echo /y Generate build report file
echo /m Enable multi-processor build
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 1705b1628b..d32beb6a45 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -7,15 +7,22 @@ function Usage() {
echo "***************************************************************************"
echo "Build BIOS rom for VLV platforms."
echo
- echo "Usage: bld_vlv.sh PlatformType [Build Target]"
+ echo "Usage: bld_vlv.sh [options] PlatformType [Build Target]"
echo
+ echo " /c CleanAll"
+ echo " /l Generate build log file"
+ echo " /y Generate build report file"
+ echo " /m Enable multi-processor build"
+ echo " /IA32 Set Arch to IA32 (default: X64)"
+ echo " /X64 Set Arch to X64 (default: X64)"
echo
echo " Platform Types: MNW2"
echo " Build Targets: Debug, Release (default: Debug)"
echo
+ echo "Examples:"
+ echo " bld_vlv.sh MNW2 : X64 Debug build for MinnowMax"
+ echo " bld_vlv.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
echo "***************************************************************************"
- echo "Press any key......"
- read
exit 0
}
@@ -29,8 +36,12 @@ echo -e $(date)
#build_threads=($NUMBER_OF_PROCESSORS)+1
Build_Flags=
exitCode=0
+build_threads=1
Arch=X64
-SpiLock=0
+GenLog=FALSE
+GenReport=FALSE
+Clean=FALSE
+
export CORE_PATH=$WORKSPACE/edk2
export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
@@ -38,27 +49,6 @@ export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
export PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH
-## Clean up previous build files.
-if [ -e $WORKSPACE/EDK2.log ]; then
- rm $WORKSPACE/EDK2.log
-fi
-
-if [ -e $WORKSPACE/Unitool.log ]; then
- rm $WORKSPACE/Unitool.log
-fi
-
-if [ -e $WORKSPACE/Conf/target.txt ]; then
- rm $WORKSPACE/Conf/target.txt
-fi
-
-if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
- rm $WORKSPACE/Conf/tools_def.txt
-fi
-
-if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
- rm $WORKSPACE/Conf/build_rule.txt
-fi
-
## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
cd $CORE_PATH
@@ -69,17 +59,9 @@ make -C BaseTools
PLATFORM_NAME=Vlv2TbltDevicePkg
PLATFORM_PACKAGE=Vlv2TbltDevicePkg
PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
cd $PLATFORM_PKG_PATH
-## create new AutoPlatformCFG.txt file
-if [ -f "$auto_config_inc" ]; then
- rm $auto_config_inc
-fi
-touch $auto_config_inc
-
##**********************************************************************
## Parse command line arguments
##**********************************************************************
@@ -89,17 +71,17 @@ for (( i=1; i<=$#; ))
do
if [ "$1" == "/?" ]; then
Usage
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
- Build_Flags="$Build_Flags --quiet"
- shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
- Build_Flags="$Build_Flags -j EDK2.log"
+ GenLog=TRUE
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
+ GenReport=TRUE
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
+ build_threads=8
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
- echo Removing previous build files ...
- if [ -d "Build" ]; then
- rm -r Build
- fi
+ Clean=TRUE
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
Arch=X64
@@ -107,9 +89,6 @@ for (( i=1; i<=$#; ))
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
Arch=IA32
shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
- SpiLock=1
- shift
else
break
fi
@@ -120,26 +99,7 @@ if [ "$2" == "" ]; then
Usage
fi
-if [ $Arch == "IA32" ]; then
- echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
-else
- echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
-fi
-
-## -- Build flags settings for each Platform --
-## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## BayleyBay (BBAY): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = TRUE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## BayLake (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## Bakersport (BYTI): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = FALSE
-## Crestview Hills (CVHS): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = TRUE
-## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
echo "Setting $1 platform configuration and BIOS ID..."
-if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
- echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
-else
- echo "Error - Unsupported PlatformType: $1"
- Usage
-fi
if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
export TARGET=RELEASE
@@ -148,18 +108,8 @@ else
fi
##**********************************************************************
-## Additional EDK Build Setup/Configuration
+## Detect TOOL_CHAIN_TAG
##**********************************************************************
-echo "Ensuring correct build directory is present for GenBiosId..."
-
-echo Modifying Conf files for this build...
-## Remove lines with these tags from target.txt
-sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt
-sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt
-sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt
-sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt
-sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
-
gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
case $gcc_version in
[1-3].*|4.[0-7].*)
@@ -167,31 +117,19 @@ case $gcc_version in
exit 1
;;
4.8.*)
- TARGET_TOOLS=GCC48
+ export TOOL_CHAIN_TAG=GCC48
;;
4.9.*|6.[0-2].*)
- TARGET_TOOLS=GCC49
+ export TOOL_CHAIN_TAG=GCC49
;;
*)
- TARGET_TOOLS=GCC5
+ export TOOL_CHAIN_TAG=GCC5
;;
esac
-ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
-export TOOL_CHAIN_TAG=$TARGET_TOOLS
-MAX_CONCURRENT_THREAD_NUMBER=8
-echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> $WORKSPACE/Conf/target.txt
-echo TARGET = $TARGET >> $WORKSPACE/Conf/target.txt
-echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >> $WORKSPACE/Conf/target.txt
-echo MAX_CONCURRENT_THREAD_NUMBER = $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt
-if [ $Arch == "IA32" ]; then
- echo TARGET_ARCH = IA32 >> $WORKSPACE/Conf/target.txt
-else
- echo TARGET_ARCH = IA32 X64 >> $WORKSPACE/Conf/target.txt
-fi
-
-
-## Set and Create $BUILD_PATH if necessary
+##**********************************************************************
+## Generate $BUILD_PATH and make sure the directory exists
+##**********************************************************************
if [ ! -d ${WORKSPACE}/Build ]; then
mkdir ${WORKSPACE}/Build
fi
@@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then
mkdir $BUILD_PATH
fi
+##**********************************************************************
+## Check for clean operation
+##**********************************************************************
+if [ $Clean == "TRUE" ]; then
+ echo Removing previous build files ...
+ if [ -d ${BUILD_PATH} ]; then
+ rm -r ${BUILD_PATH}
+ fi
+ if [ -d ${WORKSPACE}/Conf/.cache ]; then
+ rm -r ${WORKSPACE}/Conf/.cache
+ fi
+ exit 0
+fi
+
+##**********************************************************************
+## Generate Build_Flags
+##**********************************************************************
+
+Build_Flags="$Build_Flags -b $TARGET"
+if [ $Arch == "IA32" ]; then
+ Build_Flags="$Build_Flags -a IA32"
+else
+ Build_Flags="$Build_Flags -a IA32 -a X64"
+fi
+Build_Flags="$Build_Flags -t $TOOL_CHAIN_TAG"
+Build_Flags="$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
+Build_Flags="$Build_Flags -n $build_threads"
+if [ $GenLog == "TRUE" ]; then
+ Build_Flags="$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
+fi
+if [ $GenReport == "TRUE" ]; then
+ Build_Flags="$Build_Flags -y ${BUILD_PATH}/${PLATFORM_NAME}.report"
+fi
+
##**********************************************************************
## Generate BIOS ID
##**********************************************************************
@@ -239,7 +211,8 @@ python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i
## Build BIOS
##**********************************************************************
echo "Invoking EDK2 build..."
-build
+echo build $Build_Flags
+build $Build_Flags
##**********************************************************************
## Post Build processing and cleanup
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh b/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
deleted file mode 100644
index 3511695f6f..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-echo
-echo Run build cleanall...
-echo
-
-echo
-echo Directories to clean...
-echo
-
-cd ..
-
-if [ -d "Build" ]; then
- rm -r Build
-fi
-
-if [ -d "Conf/.cache" ]; then
- rm -r Conf/.cache
-fi
-
-if [ -d "RomImages" ]; then
- rm -r RomImages
-fi
-
-echo
-echo Files to clean...
-echo
-
-if [ -e $(pwd)/EDK2.log ]; then
- rm $(pwd)/EDK2.log
-fi
-
-if [ -e $(pwd)/Unitool.log ]; then
- rm $(pwd)/Unitool.log
-fi
-
-if [ -e $(pwd)/Conf/target.txt ]; then
- rm $(pwd)/Conf/target.txt
-fi
-
-if [ -e $(pwd)/Conf/BiosId.env ]; then
- rm $(pwd)/Conf/BiosId.env
-fi
-
-if [ -e $(pwd)/Conf/tools_def.txt ]; then
- rm $(pwd)/Conf/tools_def.txt
-fi
-
-if [ -e $(pwd)/Conf/build_rule.txt ]; then
- rm $(pwd)/Conf/build_rule.txt
-fi
-
-if [ -e $(pwd)/Conf/BuildEnv.sh ]; then
- rm $(pwd)/Conf/BuildEnv.sh
-fi
-
-if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then
- rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt
-fi
-
-echo
-echo All done...
-echo
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
2019-07-10 19:05 ` [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Michael D Kinney
@ 2019-07-11 4:55 ` Sun, Zailiang
2019-07-12 3:39 ` [edk2-devel] " rebecca
1 sibling, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:55 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build
> scripts
>
> * Remove cln.sh
> * Remove unused PlatformDefintions.h file
> * Remove unused defines from DSC files
> * Make Windows and Linux script more consistent
> * Remove unused options from Windows/Linux scripts
> * Remove unused defines from Windows/Linux scripts
> * Do not modify Target.txt in Conf directory. Instead,
> pass all build flags on the command line
> * Generate build report in the build output directory
> * Generate build logs in the build output directory
> * Do not delete files from Conf directory
> * Update clean operation to only clean one platform target
> * Do not generate AutoPlatformCFG.txt file anymore
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 ++-------
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 57 +++----
> .../Include/PlatformDefinitions.h | 43 -----
> .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
> .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 55 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 53 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 53 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 55 +-----
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 120 ++++++-------
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 159 ++++++++----------
> Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 -------
> 12 files changed, 156 insertions(+), 583 deletions(-) delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> b/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> deleted file mode 100644
> index c7698262ad..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -AutoPlatformCFG.txt
> -Stitch/Stitching.log
> -Stitch/MNW*.bin
> -Stitch/MNW*.rom
> -Stitch/MNW*.rom.orig
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> index 44759c617f..f65aa61f4a 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> @@ -9,15 +9,9 @@
>
> SetLocal EnableDelayedExpansion EnableExtensions
>
> -@REM Go to work space directory.
> -cd ..
> -cd ..
> -
> :: Assign initial values
> set exitCode=0
> set "Build_Flags= "
> -set "Stitch_Flags= "
> -set Arch=X64
> set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
>
> set PLATFORM_PATH=%WORKSPACE%
> @@ -42,11 +36,6 @@ if not
> exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% ( :OptLoop if /i
> "%~1"=="/?" goto Usage
>
> -if /i "%~1"=="/q" (
> - set Build_Flags=%Build_Flags% /q
> - shift
> - goto OptLoop
> -)
> if /i "%~1"=="/l" (
> set Build_Flags=%Build_Flags% /l
> shift
> @@ -67,53 +56,17 @@ if /i "%~1" == "/c" (
> shift
> goto OptLoop
> )
> -if /i "%~1" == "/ECP" (
> - set Build_Flags=%Build_Flags% /ecp
> - shift
> - goto OptLoop
> -)
> -
> -if /i "%~1"=="/s" (
> - set Build_Flags=%Build_Flags% /s
> - shift
> - goto OptLoop
> -)
> -
> if /i "%~1"=="/x64" (
> - set Arch=X64
> set Build_Flags=%Build_Flags% /x64
> shift
> goto OptLoop
> )
> -
> if /i "%~1"=="/IA32" (
> - set Arch=IA32
> set Build_Flags=%Build_Flags% /IA32
> shift
> goto OptLoop
> )
>
> -if /i "%~1"=="/nG" (
> - set Stitch_Flags=%Stitch_Flags% /nG
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/nM" (
> - set Stitch_Flags=%Stitch_Flags% /nM
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/nB" (
> - set Stitch_Flags=%Stitch_Flags% /nB
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/yL" (
> - set Stitch_Flags=%Stitch_Flags% /yL
> - shift
> - goto OptLoop
> -)
> -
> :: Require 2 input parameters
> if "%~2"=="" goto Usage
>
> @@ -125,7 +78,7 @@ set Build_Target=%~2
> echo
> ==========================================================
> ============
> echo Build_IFWI: Calling BIOS build Script...
>
> -
> call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flag
> s% %Platform_Type% %Build_Target%
> +call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Fla
> gs%
> +%Platform_Type% %Build_Target%
>
> if %ERRORLEVEL% NEQ 0 (
> echo echo -- Error Building BIOS & echo.
> @@ -139,23 +92,21 @@ goto Exit
> :Usage
> echo Script to build BIOS firmware and stitch the entire IFWI.
> echo.
> -echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget [IFWI
> Suffix]
> +echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget
> echo.
> -echo /c CleanAll before building
> -echo /x64 Set Arch to X64 (default: X64)
> -echo /IA32 Set Arch to IA32 (default: X64)
> -echo /yL Enable SPI lock
> -echo.
> -echo Platform Types: MNW2
> -echo Build Targets: Release, Debug
> -echo IFWI Suffix: Suffix to append to end of IFWI filename (default:
> MM_DD_YYYY)
> +echo /c CleanAll
> +echo /l Generate build log file
> +echo /y Generate build report file
> +echo /m Enable multi-processor build
> +echo /IA32 Set Arch to IA32 (default: X64)
> +echo /X64 Set Arch to X64 (default: X64)
> echo.
> -echo See Stitch/Stitch_Config.txt for additional stitching settings.
> +echo Platform Types: MNW2
> +echo Build Targets: Debug, Release (default: Debug)
> echo.
> -echo If capsule update is needed, please update CAPSULE_ENABLE =
> TRUE in Config.dsc.
> -echo If recovery is needed, please update RECOVERY_ENABLE = TRUE in
> Config.dsc.
> -echo If either of above is TRUE, please set OPENSSL_PATH in windows
> evironment
> -echo and put openssl.exe there, to generate final capsule image.
> +echo Examples:
> +echo Build_IFWI.bat MNW2 debug : X64 Debug build for MinnowMax
> +echo Build_IFWI.bat /IA32 MNW2 release : IA32 Release build for
> MinnowMax
> echo.
> set exitCode=1
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 349f0c7ba7..153c8c5fae 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -6,15 +6,21 @@ function Usage ( ) {
> echo
> echo "Script to build BIOS firmware and stitch the entire IFWI."
> echo
> - echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
> + echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget"
> echo
> - echo
> - echo " /yL [option] : Enable SPI lock"
> - echo " Platform Types: MNW2"
> - echo " Build Targets: Release, Debug"
> + echo " /c CleanAll"
> + echo " /l Generate build log file"
> + echo " /y Generate build report file"
> + echo " /m Enable multi-processor build"
> + echo " /IA32 Set Arch to IA32 (default: X64)"
> + echo " /X64 Set Arch to X64 (default: X64)"
> echo
> - echo " See Stitch/Stitch_Config.txt for additional stitching settings."
> + echo " Platform Types: MNW2"
> + echo " Build Targets: Debug, Release (default: Debug)"
> echo
> + echo "Examples:"
> + echo " Build_IFWI.sh MNW2 debug : X64 Debug build for
> MinnowMax"
> + echo " Build_IFWI.sh /IA32 MNW2 release : IA32 Release build for
> MinnowMax"
> echo
> exit 0
> }
> @@ -24,9 +30,6 @@ set -e
> ## Assign initial values
> exitCode=0
> Build_Flags=
> -Stitch_Flags=
> -Arch=X64
> -PLATFORM_PACKAGE=Vlv2TbltDevicePkg
>
> ## Check whether WORKSPACE is set or not if [[ -z "$WORKSPACE" ]]; then
> @@ -47,41 +50,24 @@ fi
>
> for (( i=1; i<=$#; ))
> do
> - if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
> - Build_Flags="$Build_Flags /q"
> - shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> + if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> Build_Flags="$Build_Flags /l"
> shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
> + Build_Flags="$Build_Flags /y"
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
> + Build_Flags="$Build_Flags /m"
> + shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
> Build_Flags="$Build_Flags /c"
> shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/ECP" ]; then
> - Build_Flags="$Build_Flags /ecp"
> - shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
> - Arch=X64
> Build_Flags="$Build_Flags /x64"
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> - Arch=IA32
> Build_Flags="$Build_Flags /IA32"
> shift
> - elif [ "$1" == "/nG" ]; then
> - Stitch_Flags="$Stitch_Flags /nG"
> - shift
> - elif [ "$1" == "/nM" ]; then
> - Stitch_Flags="$Stitch_Flags /nM"
> - shift
> - elif [ "$1" == "/nB" ]; then
> - Stitch_Flags="$Stitch_Flags /nB"
> - shift
> - elif [ "$1" == "/nV" ]; then
> - Stitch_Flags="$Stitch_Flags /nV"
> - shift
> - elif [ "$1" == "/yL" ]; then
> - Build_Flags="$Build_Flags /yL"
> - shift
> else
> break
> fi
> @@ -95,11 +81,6 @@ fi
> ## Assign required arguments
> Platform_Type=$1
> Build_Target=$2
> -if [ "$3" == "" ]; then
> - IFWI_Suffix=
> -else
> - IFWI_Suffix="/S $3"
> -fi
>
> ## Build BIOS
> echo
> "==========================================================
> ============"
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> deleted file mode 100644
> index a64cda0799..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -/*++
> -
> -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -
>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>
> -
> -
> -Module Name:
> -
> - PlatformDefinitions.h
> -
> -Abstract:
> -
> - This header file provides platform specific definitions used by other
> modules
> - for platform specific initialization.
> -
> - THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY
> NON-C MODULES
> - (ASL and VFR)
> -
> - This file should not contain addition or other operations that an ASL
> compiler or
> - VFR compiler does not understand.
> -
> ---*/
> -
> -#ifndef _PLATFORM_DEFINITIONS_H_
> -#define _PLATFORM_DEFINITIONS_H_
> -
> -
> -//
> -// Platform Base Address definitions
> -//
> -#define PCIEX_BASE_ADDRESS EDKII_GLUE_PciExpressBaseAddress //
> Pci Express Configuration Space Base Address
> -
> -#define PCIEX_LENGTH PLATFORM_PCIEXPRESS_LENGTH
> -
> -#define THERMAL_BASE_ADDRESS 0xFED08000
> -
> -#ifndef MCH_BASE_ADDRESS
> -#define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base
> Address
> -#endif
> -#endif
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> index 7b48d7b44e..43db3e28ab 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> @@ -54,8 +54,6 @@
> DEFINE USB_SERIAL_STATUS_CODE_ENABLE = FALSE DEFINE
> RAM_SERIAL_STATUS_CODE_ENABLE = FALSE
>
> -DEFINE ENBDT_S3_SUPPORT = TRUE
> -
> DEFINE LZMA_ENABLE = TRUE
> DEFINE S4_ENABLE = TRUE
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> index eb7ae46505..0f9651cfba 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE DXE_ARCHITECTURE = X64
> -!else
> DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,56 +1218,19 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1 -!else
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0 -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -
> DCLKGEN_CONFIG_EXTRA=1 !else
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = !endif
>
> -
> -
> !if $(PCIESC_ENABLE) == TRUE
> DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1 !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1 -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1 -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>
> GCC:*_*_*_CC_FLAGS = -Wno-missing-braces !if
> $(SOURCE_DEBUG_ENABLE) == TRUE @@ -1290,7 +1240,6 @@ [BuildOptions]
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -
> DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 69f2b22aff..257bba7485 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> DEFINE PLATFORMX64_ENABLE = TRUE
>
> -!if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> -!else
> - DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,15 +1233,6 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1 -!else
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0 -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -
> DCLKGEN_CONFIG_EXTRA=1 !else @@ -1268,34 +1246,8 @@
> [BuildOptions] !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1 -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1 -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>
> GCC:*_*_*_CC_FLAGS = -Wno-missing-braces !if
> $(SOURCE_DEBUG_ENABLE) == TRUE @@ -1305,7 +1257,6 @@ [BuildOptions]
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -
> DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 7092ab6e6b..23e296d432 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE DXE_ARCHITECTURE = X64
> -!else
> DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,15 +1218,6 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1 -!else
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0 -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> /DCLKGEN_CONFIG_EXTRA=1 !else @@ -1253,34 +1231,8 @@
> [BuildOptions] !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1 -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1 -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable @@ -1291,7
> +1243,6 @@ [BuildOptions] !endif !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h
> /DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 238561191f..e0fd767dea 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> DEFINE PLATFORMX64_ENABLE = TRUE
>
> -!if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> -!else
> - DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,56 +1233,19 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1 -!else
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0 -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> /DCLKGEN_CONFIG_EXTRA=1 !else
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = !endif
>
> -
> -
> !if $(PCIESC_ENABLE) == TRUE
> DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1 !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1 -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1 -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable @@ -1306,7
> +1256,6 @@ [BuildOptions] !endif !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D
> EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h
> /DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index ffd6722582..c39b8ccd62 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -11,7 +11,6 @@ echo.
> echo %date% %time%
> echo.
>
> -
> ::*********************************************************
> *************
> :: Initial Setup
> ::*********************************************************
> *************
> @@ -20,9 +19,14 @@ set /a build_threads=1 set "Build_Flags= "
> set exitCode=0
> set Arch=X64
> -set Source=0
> +set GenLog=FALSE
> +set GenReport=FALSE
> +set Clean=FALSE
> set PLATFORM_NAME=Vlv2TbltDevicePkg
>
> +::********************************************************
> *************
> +*
> +:: Detect full path to the edk2 repo
> +::********************************************************
> *************
> +*
> set CORE_PATH=%WORKSPACE%
> if not exist %CORE_PATH%\edksetup.bat (
> if defined PACKAGES_PATH (
> @@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat (
> )
> :CorePathFound
>
> +::********************************************************
> *************
> +*
> +:: Detect full path to the Vlv2TbltDevicePkg
> +::********************************************************
> *************
> +*
> set PLATFORM_PACKAGE=%WORKSPACE%\%PLATFORM_NAME%
> if not exist %PLATFORM_PACKAGE% (
> if defined PACKAGES_PATH (
> @@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% (
>
> cd %CORE_PATH%
>
> -:: Clean up previous build files.
> -if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log -if
> exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log -if
> exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt -
> if exist %WORKSPACE%\Conf\tools_def.txt
> del %WORKSPACE%\Conf\tools_def.txt -if
> exist %WORKSPACE%\Conf\build_rule.txt
> del %WORKSPACE%\Conf\build_rule.txt -if
> exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
> +::********************************************************
> *************
> +*
> +:: Run edksetup.bat and make sure tools are up to date
> +::********************************************************
> *************
> +*
>
> -:: Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf
> -:: Also run edksetup as soon as possible to avoid it from changing
> environment variables we're overriding call %CORE_PATH%\edksetup.bat
> Rebuild @echo off
>
> -:: Define platform specific environment variables.
> -set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
> -set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
> -
> -
> -
> -::create new AutoPlatformCFG.txt file
> -copy /y nul %auto_config_inc% >nul
> -
> ::*********************************************************
> *************
> :: Parse command line arguments
> ::*********************************************************
> *************
> @@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul if /i "%~1"=="/?"
> goto Usage
>
> if /i "%~1"=="/l" (
> - set Build_Flags=%Build_Flags% -j EDK2.log
> + set GenLog=TRUE
> shift
> goto OptLoop
> )
> if /i "%~1"=="/y" (
> - set Build_Flags=%Build_Flags% -
> y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
> + set GenReport=TRUE
> shift
> goto OptLoop
> )
> @@ -109,16 +101,7 @@ if /i "%~1"=="/m" (
> goto OptLoop
> )
> if /i "%~1" == "/c" (
> - echo Removing previous build files ...
> - if exist build (
> - del /f/s/q build > nul
> - rmdir /s/q build
> - )
> - if exist %WORKSPACE%\Conf\.cache (
> - del /f/s/q %WORKSPACE%\Conf\.cache > nul
> - rmdir /s/q %WORKSPACE%\Conf\.cache
> - )
> - echo.
> + set Clean=TRUE
> shift
> goto OptLoop
> )
> @@ -137,23 +120,6 @@ if /i "%~1"=="/IA32" (
> :: Required argument(s)
> if "%~1"=="" goto Usage
>
> -if "%Arch%"=="IA32" (
> - echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
> -) else if "%Arch%"=="X64" (
> - echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
> -)
> -
> -:: -- Build flags settings for each Platform -- -echo Setting %1 platform
> configuration...
> -if /i "%~1" == "MNW2" (
> - echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
> -
> -) else (
> - echo Error - Unsupported PlatformType: %1
> - goto Usage
> -)
> -set Platform_Type=%~1
> -
> if /i "%~2" == "RELEASE" (
> set target=RELEASE
> ) else (
> @@ -161,8 +127,9 @@ if /i "%~2" == "RELEASE" (
> )
>
> ::*********************************************************
> *************
> -:: Additional EDK Build Setup/Configuration
> +:: Detect TOOL_CHAIN_TAG
> ::*********************************************************
> *************
> +
> echo.
> echo Setting the Build environment for
> VS2015/VS2013/VS2012/VS2010/VS2008...
> if defined VS140COMNTOOLS (
> @@ -206,6 +173,10 @@ if defined VS140COMNTOOLS (
> goto :BldFail
> )
>
> +::********************************************************
> *************
> +*
> +:: Generate BUILD_PATH and make sure the directory exists
> +::********************************************************
> *************
> +*
> +
> echo Ensuring correct build directory is present if not
> exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build if
> "%Arch%"=="IA32" ( @@ -217,26 +188,41 @@ if "%Arch%"=="IA32" (
> )
> if not exist %BUILD_PATH% mkdir %BUILD_PATH%
>
> -echo Modifing Conf files for this build...
> -:: Remove lines with these tags from target.txt -findstr /V "TARGET
> TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM
> MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt >
> %WORKSPACE%\Conf\target.txt.tmp
> +::********************************************************
> *************
> +*
> +:: Check for clean operation
> +::********************************************************
> *************
> +*
>
> -echo TARGET
> = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp
> +if "%Clean%"=="TRUE" (
> + echo Removing previous build files ...
> + if exist %BUILD_PATH% (
> + rmdir /s/q %BUILD_PATH%
> + )
> + if exist %WORKSPACE%\Conf\.cache (
> + rmdir /s/q %WORKSPACE%\Conf\.cache
> + )
> + echo.
> + goto :Exit
> +)
> +
> +::********************************************************
> *************
> +*
> +:: Generate Build_Flags
> +::********************************************************
> *************
> +*
> +
> +set Build_Flags=%Build_Flags% -b %TARGET%
> if "%Arch%"=="IA32" (
> - echo TARGET_ARCH =
> IA32 >> %WORKSPACE%\Conf\target.txt.tmp
> + set Build_Flags=%Build_Flags% -a IA32
> ) else if "%Arch%"=="X64" (
> - echo TARGET_ARCH = IA32
> X64 >> %WORKSPACE%\Conf\target.txt.tmp
> + set Build_Flags=%Build_Flags% -a IA32 -a X64
> )
> -echo TOOL_CHAIN_TAG
> = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt
> .tmp
> -echo BUILD_RULE_CONF =
> Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
> -if %Source% == 0 (
> - echo ACTIVE_PLATFORM
> = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%
> \Conf\target.txt.tmp
> -) else (
> - echo ACTIVE_PLATFORM
> = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPA
> CE%\Conf\target.txt.tmp
> +set Build_Flags=%Build_Flags% -t %TOOL_CHAIN_TAG% set
> +Build_Flags=%Build_Flags% -
> p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
> +set Build_Flags=%Build_Flags% -n %build_threads% if
> "%GenLog%"=="TRUE"
> +(
> + set Build_Flags=%Build_Flags% -
> j %BUILD_PATH%\%PLATFORM_NAME%.log
> +)
> +if "%GenReport%"=="TRUE" (
> + set Build_Flags=%Build_Flags% -
> y %BUILD_PATH%\%PLATFORM_NAME%.report
> )
> -echo MAX_CONCURRENT_THREAD_NUMBER
> = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp
> -
> -move
> /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >n
> ul
>
> ::*********************************************************
> *************
> :: Generate BIOS ID
> @@ -267,6 +253,8 @@ echo VERSION_MINOR =
> 01 >> %BUILD_PATH%/BiosId.env
>
> echo.
> echo Invoking EDK2 build...
> +echo build %Build_Flags%
> +
> call build %Build_Flags%
>
> if %ERRORLEVEL% NEQ 0 goto BldFail
> @@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms.
> echo.
> echo Usage: bld_vlv.bat [options] PlatformType [Build Target] echo.
> -echo /c CleanAll before building
> +echo /c CleanAll
> echo /l Generate build log file
> echo /y Generate build report file
> echo /m Enable multi-processor build
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 1705b1628b..d32beb6a45 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -7,15 +7,22 @@ function Usage() {
> echo
> "**********************************************************
> *****************"
> echo "Build BIOS rom for VLV platforms."
> echo
> - echo "Usage: bld_vlv.sh PlatformType [Build Target]"
> + echo "Usage: bld_vlv.sh [options] PlatformType [Build Target]"
> echo
> + echo " /c CleanAll"
> + echo " /l Generate build log file"
> + echo " /y Generate build report file"
> + echo " /m Enable multi-processor build"
> + echo " /IA32 Set Arch to IA32 (default: X64)"
> + echo " /X64 Set Arch to X64 (default: X64)"
> echo
> echo " Platform Types: MNW2"
> echo " Build Targets: Debug, Release (default: Debug)"
> echo
> + echo "Examples:"
> + echo " bld_vlv.sh MNW2 : X64 Debug build for MinnowMax"
> + echo " bld_vlv.sh /IA32 MNW2 release : IA32 Release build for
> MinnowMax"
> echo
> "**********************************************************
> *****************"
> - echo "Press any key......"
> - read
> exit 0
> }
>
> @@ -29,8 +36,12 @@ echo -e $(date)
> #build_threads=($NUMBER_OF_PROCESSORS)+1
> Build_Flags=
> exitCode=0
> +build_threads=1
> Arch=X64
> -SpiLock=0
> +GenLog=FALSE
> +GenReport=FALSE
> +Clean=FALSE
> +
>
> export CORE_PATH=$WORKSPACE/edk2
> export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
> @@ -38,27 +49,6 @@ export SILICON_PATH=$WORKSPACE/edk2-
> platforms/Silicon/Intel/
> export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
> export
> PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$COR
> E_PATH
>
> -## Clean up previous build files.
> -if [ -e $WORKSPACE/EDK2.log ]; then
> - rm $WORKSPACE/EDK2.log
> -fi
> -
> -if [ -e $WORKSPACE/Unitool.log ]; then
> - rm $WORKSPACE/Unitool.log
> -fi
> -
> -if [ -e $WORKSPACE/Conf/target.txt ]; then
> - rm $WORKSPACE/Conf/target.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
> - rm $WORKSPACE/Conf/tools_def.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
> - rm $WORKSPACE/Conf/build_rule.txt
> -fi
> -
> ## Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as
> soon as possible to avoid it from changing environment variables we're
> overriding cd $CORE_PATH @@ -69,17 +59,9 @@ make -C BaseTools
> PLATFORM_NAME=Vlv2TbltDevicePkg
> PLATFORM_PACKAGE=Vlv2TbltDevicePkg
> PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
> -config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> -auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
>
> cd $PLATFORM_PKG_PATH
>
> -## create new AutoPlatformCFG.txt file
> -if [ -f "$auto_config_inc" ]; then
> - rm $auto_config_inc
> -fi
> -touch $auto_config_inc
> -
>
> ##********************************************************
> **************
> ## Parse command line arguments
>
> ##********************************************************
> **************
> @@ -89,17 +71,17 @@ for (( i=1; i<=$#; ))
> do
> if [ "$1" == "/?" ]; then
> Usage
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
> - Build_Flags="$Build_Flags --quiet"
> - shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> - Build_Flags="$Build_Flags -j EDK2.log"
> + GenLog=TRUE
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
> + GenReport=TRUE
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
> + build_threads=8
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
> - echo Removing previous build files ...
> - if [ -d "Build" ]; then
> - rm -r Build
> - fi
> + Clean=TRUE
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
> Arch=X64
> @@ -107,9 +89,6 @@ for (( i=1; i<=$#; ))
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> Arch=IA32
> shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
> - SpiLock=1
> - shift
> else
> break
> fi
> @@ -120,26 +99,7 @@ if [ "$2" == "" ]; then
> Usage
> fi
>
> -if [ $Arch == "IA32" ]; then
> - echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc -else
> - echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc -fi
> -
> -## -- Build flags settings for each Platform --
> -## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD =
> FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD =
> FALSE
> -## BayleyBay (BBAY): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = TRUE,
> TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> -## BayLake (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE,
> TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> -## Bakersport (BYTI): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE,
> TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = FALSE
> -## Crestview Hills (CVHS): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD =
> FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD =
> TRUE
> -## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE,
> TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> echo "Setting $1 platform configuration and BIOS ID..."
> -if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
> - echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc -else
> - echo "Error - Unsupported PlatformType: $1"
> - Usage
> -fi
>
> if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
> export TARGET=RELEASE
> @@ -148,18 +108,8 @@ else
> fi
>
>
> ##********************************************************
> **************
> -## Additional EDK Build Setup/Configuration
> +## Detect TOOL_CHAIN_TAG
>
> ##********************************************************
> **************
> -echo "Ensuring correct build directory is present for GenBiosId..."
> -
> -echo Modifying Conf files for this build...
> -## Remove lines with these tags from target.txt -sed -i
> '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt -sed -i '/^TARGET /d'
> $WORKSPACE/Conf/target.txt -sed -i '/^TARGET_ARCH/d'
> $WORKSPACE/Conf/target.txt -sed -i '/^TOOL_CHAIN_TAG/d'
> $WORKSPACE/Conf/target.txt -sed -i
> '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
> -
> gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}') case $gcc_version in
> [1-3].*|4.[0-7].*)
> @@ -167,31 +117,19 @@ case $gcc_version in
> exit 1
> ;;
> 4.8.*)
> - TARGET_TOOLS=GCC48
> + export TOOL_CHAIN_TAG=GCC48
> ;;
> 4.9.*|6.[0-2].*)
> - TARGET_TOOLS=GCC49
> + export TOOL_CHAIN_TAG=GCC49
> ;;
> *)
> - TARGET_TOOLS=GCC5
> + export TOOL_CHAIN_TAG=GCC5
> ;;
> esac
>
> -ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
> -export TOOL_CHAIN_TAG=$TARGET_TOOLS
> -MAX_CONCURRENT_THREAD_NUMBER=8
> -echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >>
> $WORKSPACE/Conf/target.txt
> -echo TARGET = $TARGET >>
> $WORKSPACE/Conf/target.txt
> -echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >>
> $WORKSPACE/Conf/target.txt
> -echo MAX_CONCURRENT_THREAD_NUMBER =
> $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt -
> if [ $Arch == "IA32" ]; then
> - echo TARGET_ARCH = IA32 >>
> $WORKSPACE/Conf/target.txt
> -else
> - echo TARGET_ARCH = IA32 X64 >>
> $WORKSPACE/Conf/target.txt
> -fi
> -
> -
> -## Set and Create $BUILD_PATH if necessary
> +##*******************************************************
> **************
> +* ## Generate $BUILD_PATH and make sure the directory exists
> +##*******************************************************
> **************
> +*
> if [ ! -d ${WORKSPACE}/Build ]; then
> mkdir ${WORKSPACE}/Build
> fi
> @@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then
> mkdir $BUILD_PATH
> fi
>
> +##*******************************************************
> **************
> +*
> +## Check for clean operation
> +##*******************************************************
> **************
> +*
> +if [ $Clean == "TRUE" ]; then
> + echo Removing previous build files ...
> + if [ -d ${BUILD_PATH} ]; then
> + rm -r ${BUILD_PATH}
> + fi
> + if [ -d ${WORKSPACE}/Conf/.cache ]; then
> + rm -r ${WORKSPACE}/Conf/.cache
> + fi
> + exit 0
> +fi
> +
> +##*******************************************************
> **************
> +*
> +## Generate Build_Flags
> +##*******************************************************
> **************
> +*
> +
> +Build_Flags="$Build_Flags -b $TARGET"
> +if [ $Arch == "IA32" ]; then
> + Build_Flags="$Build_Flags -a IA32"
> +else
> + Build_Flags="$Build_Flags -a IA32 -a X64"
> +fi
> +Build_Flags="$Build_Flags -t $TOOL_CHAIN_TAG"
> +Build_Flags="$Build_Flags -p
> ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
> +Build_Flags="$Build_Flags -n $build_threads"
> +if [ $GenLog == "TRUE" ]; then
> + Build_Flags="$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
> +fi
> +if [ $GenReport == "TRUE" ]; then
> + Build_Flags="$Build_Flags -y
> ${BUILD_PATH}/${PLATFORM_NAME}.report"
> +fi
> +
>
> ##********************************************************
> **************
> ## Generate BIOS ID
>
> ##********************************************************
> **************
> @@ -239,7 +211,8 @@ python $WORKSPACE/edk2-
> platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i ## Build BIOS
>
> ##********************************************************
> **************
> echo "Invoking EDK2 build..."
> -build
> +echo build $Build_Flags
> +build $Build_Flags
>
>
> ##********************************************************
> **************
> ## Post Build processing and cleanup
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> deleted file mode 100644
> index 3511695f6f..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -#!/usr/bin/env bash
> -echo
> -echo Run build cleanall...
> -echo
> -
> -echo
> -echo Directories to clean...
> -echo
> -
> -cd ..
> -
> -if [ -d "Build" ]; then
> - rm -r Build
> -fi
> -
> -if [ -d "Conf/.cache" ]; then
> - rm -r Conf/.cache
> -fi
> -
> -if [ -d "RomImages" ]; then
> - rm -r RomImages
> -fi
> -
> -echo
> -echo Files to clean...
> -echo
> -
> -if [ -e $(pwd)/EDK2.log ]; then
> - rm $(pwd)/EDK2.log
> -fi
> -
> -if [ -e $(pwd)/Unitool.log ]; then
> - rm $(pwd)/Unitool.log
> -fi
> -
> -if [ -e $(pwd)/Conf/target.txt ]; then
> - rm $(pwd)/Conf/target.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BiosId.env ]; then
> - rm $(pwd)/Conf/BiosId.env
> -fi
> -
> -if [ -e $(pwd)/Conf/tools_def.txt ]; then
> - rm $(pwd)/Conf/tools_def.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/build_rule.txt ]; then
> - rm $(pwd)/Conf/build_rule.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BuildEnv.sh ]; then
> - rm $(pwd)/Conf/BuildEnv.sh
> -fi
> -
> -if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then
> - rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> -fi
> -
> -echo
> -echo All done...
> -echo
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
2019-07-10 19:05 ` [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
@ 2019-07-12 3:39 ` rebecca
2019-07-12 18:16 ` Michael D Kinney
1 sibling, 1 reply; 69+ messages in thread
From: rebecca @ 2019-07-12 3:39 UTC (permalink / raw)
To: devel, michael.d.kinney; +Cc: Zailiang Sun, Yi Qian, Gary Lin
[-- Attachment #1: Type: text/plain, Size: 48433 bytes --]
bld_vlv.sh should probably have "set -e" at the top, like the change to
Build_IFWI.sh
See https://bugzilla.tianocore.org/show_bug.cgi?id=1599 ("bld_vlv.sh
isn't `set -e` and doesn't check if commands completed successfully").
--
Rebecca Cran
On 7/10/19 1:05 PM, Michael D Kinney wrote:
> * Remove cln.sh
> * Remove unused PlatformDefintions.h file
> * Remove unused defines from DSC files
> * Make Windows and Linux script more consistent
> * Remove unused options from Windows/Linux scripts
> * Remove unused defines from Windows/Linux scripts
> * Do not modify Target.txt in Conf directory. Instead,
> pass all build flags on the command line
> * Generate build report in the build output directory
> * Generate build logs in the build output directory
> * Do not delete files from Conf directory
> * Update clean operation to only clean one platform target
> * Do not generate AutoPlatformCFG.txt file anymore
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 ++-------
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 57 +++----
> .../Include/PlatformDefinitions.h | 43 -----
> .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
> .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 55 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 53 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 53 +-----
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 55 +-----
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 120 ++++++-------
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 159 ++++++++----------
> Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 -------
> 12 files changed, 156 insertions(+), 583 deletions(-)
> delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore b/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> deleted file mode 100644
> index c7698262ad..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -AutoPlatformCFG.txt
> -Stitch/Stitching.log
> -Stitch/MNW*.bin
> -Stitch/MNW*.rom
> -Stitch/MNW*.rom.orig
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> index 44759c617f..f65aa61f4a 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> @@ -9,15 +9,9 @@
>
> SetLocal EnableDelayedExpansion EnableExtensions
>
> -@REM Go to work space directory.
> -cd ..
> -cd ..
> -
> :: Assign initial values
> set exitCode=0
> set "Build_Flags= "
> -set "Stitch_Flags= "
> -set Arch=X64
> set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
>
> set PLATFORM_PATH=%WORKSPACE%
> @@ -42,11 +36,6 @@ if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (
> :OptLoop
> if /i "%~1"=="/?" goto Usage
>
> -if /i "%~1"=="/q" (
> - set Build_Flags=%Build_Flags% /q
> - shift
> - goto OptLoop
> -)
> if /i "%~1"=="/l" (
> set Build_Flags=%Build_Flags% /l
> shift
> @@ -67,53 +56,17 @@ if /i "%~1" == "/c" (
> shift
> goto OptLoop
> )
> -if /i "%~1" == "/ECP" (
> - set Build_Flags=%Build_Flags% /ecp
> - shift
> - goto OptLoop
> -)
> -
> -if /i "%~1"=="/s" (
> - set Build_Flags=%Build_Flags% /s
> - shift
> - goto OptLoop
> -)
> -
> if /i "%~1"=="/x64" (
> - set Arch=X64
> set Build_Flags=%Build_Flags% /x64
> shift
> goto OptLoop
> )
> -
> if /i "%~1"=="/IA32" (
> - set Arch=IA32
> set Build_Flags=%Build_Flags% /IA32
> shift
> goto OptLoop
> )
>
> -if /i "%~1"=="/nG" (
> - set Stitch_Flags=%Stitch_Flags% /nG
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/nM" (
> - set Stitch_Flags=%Stitch_Flags% /nM
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/nB" (
> - set Stitch_Flags=%Stitch_Flags% /nB
> - shift
> - goto OptLoop
> -)
> -if /i "%~1"=="/yL" (
> - set Stitch_Flags=%Stitch_Flags% /yL
> - shift
> - goto OptLoop
> -)
> -
> :: Require 2 input parameters
> if "%~2"=="" goto Usage
>
> @@ -125,7 +78,7 @@ set Build_Target=%~2
> echo ======================================================================
> echo Build_IFWI: Calling BIOS build Script...
>
> -call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
> +call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
>
> if %ERRORLEVEL% NEQ 0 (
> echo echo -- Error Building BIOS & echo.
> @@ -139,23 +92,21 @@ goto Exit
> :Usage
> echo Script to build BIOS firmware and stitch the entire IFWI.
> echo.
> -echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget [IFWI Suffix]
> +echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget
> echo.
> -echo /c CleanAll before building
> -echo /x64 Set Arch to X64 (default: X64)
> -echo /IA32 Set Arch to IA32 (default: X64)
> -echo /yL Enable SPI lock
> -echo.
> -echo Platform Types: MNW2
> -echo Build Targets: Release, Debug
> -echo IFWI Suffix: Suffix to append to end of IFWI filename (default: MM_DD_YYYY)
> +echo /c CleanAll
> +echo /l Generate build log file
> +echo /y Generate build report file
> +echo /m Enable multi-processor build
> +echo /IA32 Set Arch to IA32 (default: X64)
> +echo /X64 Set Arch to X64 (default: X64)
> echo.
> -echo See Stitch/Stitch_Config.txt for additional stitching settings.
> +echo Platform Types: MNW2
> +echo Build Targets: Debug, Release (default: Debug)
> echo.
> -echo If capsule update is needed, please update CAPSULE_ENABLE = TRUE in Config.dsc.
> -echo If recovery is needed, please update RECOVERY_ENABLE = TRUE in Config.dsc.
> -echo If either of above is TRUE, please set OPENSSL_PATH in windows evironment
> -echo and put openssl.exe there, to generate final capsule image.
> +echo Examples:
> +echo Build_IFWI.bat MNW2 debug : X64 Debug build for MinnowMax
> +echo Build_IFWI.bat /IA32 MNW2 release : IA32 Release build for MinnowMax
> echo.
> set exitCode=1
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 349f0c7ba7..153c8c5fae 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -6,15 +6,21 @@ function Usage ( ) {
> echo
> echo "Script to build BIOS firmware and stitch the entire IFWI."
> echo
> - echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
> + echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget"
> echo
> - echo
> - echo " /yL [option] : Enable SPI lock"
> - echo " Platform Types: MNW2"
> - echo " Build Targets: Release, Debug"
> + echo " /c CleanAll"
> + echo " /l Generate build log file"
> + echo " /y Generate build report file"
> + echo " /m Enable multi-processor build"
> + echo " /IA32 Set Arch to IA32 (default: X64)"
> + echo " /X64 Set Arch to X64 (default: X64)"
> echo
> - echo " See Stitch/Stitch_Config.txt for additional stitching settings."
> + echo " Platform Types: MNW2"
> + echo " Build Targets: Debug, Release (default: Debug)"
> echo
> + echo "Examples:"
> + echo " Build_IFWI.sh MNW2 debug : X64 Debug build for MinnowMax"
> + echo " Build_IFWI.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
> echo
> exit 0
> }
> @@ -24,9 +30,6 @@ set -e
> ## Assign initial values
> exitCode=0
> Build_Flags=
> -Stitch_Flags=
> -Arch=X64
> -PLATFORM_PACKAGE=Vlv2TbltDevicePkg
>
> ## Check whether WORKSPACE is set or not
> if [[ -z "$WORKSPACE" ]]; then
> @@ -47,41 +50,24 @@ fi
>
> for (( i=1; i<=$#; ))
> do
> - if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
> - Build_Flags="$Build_Flags /q"
> - shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> + if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> Build_Flags="$Build_Flags /l"
> shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
> + Build_Flags="$Build_Flags /y"
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
> + Build_Flags="$Build_Flags /m"
> + shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
> Build_Flags="$Build_Flags /c"
> shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/ECP" ]; then
> - Build_Flags="$Build_Flags /ecp"
> - shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
> - Arch=X64
> Build_Flags="$Build_Flags /x64"
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> - Arch=IA32
> Build_Flags="$Build_Flags /IA32"
> shift
> - elif [ "$1" == "/nG" ]; then
> - Stitch_Flags="$Stitch_Flags /nG"
> - shift
> - elif [ "$1" == "/nM" ]; then
> - Stitch_Flags="$Stitch_Flags /nM"
> - shift
> - elif [ "$1" == "/nB" ]; then
> - Stitch_Flags="$Stitch_Flags /nB"
> - shift
> - elif [ "$1" == "/nV" ]; then
> - Stitch_Flags="$Stitch_Flags /nV"
> - shift
> - elif [ "$1" == "/yL" ]; then
> - Build_Flags="$Build_Flags /yL"
> - shift
> else
> break
> fi
> @@ -95,11 +81,6 @@ fi
> ## Assign required arguments
> Platform_Type=$1
> Build_Target=$2
> -if [ "$3" == "" ]; then
> - IFWI_Suffix=
> -else
> - IFWI_Suffix="/S $3"
> -fi
>
> ## Build BIOS
> echo "======================================================================"
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> deleted file mode 100644
> index a64cda0799..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -/*++
> -
> -Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
> -
>
> - SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>
> -
> -
> -Module Name:
> -
> - PlatformDefinitions.h
> -
> -Abstract:
> -
> - This header file provides platform specific definitions used by other modules
> - for platform specific initialization.
> -
> - THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY NON-C MODULES
> - (ASL and VFR)
> -
> - This file should not contain addition or other operations that an ASL compiler or
> - VFR compiler does not understand.
> -
> ---*/
> -
> -#ifndef _PLATFORM_DEFINITIONS_H_
> -#define _PLATFORM_DEFINITIONS_H_
> -
> -
> -//
> -// Platform Base Address definitions
> -//
> -#define PCIEX_BASE_ADDRESS EDKII_GLUE_PciExpressBaseAddress // Pci Express Configuration Space Base Address
> -
> -#define PCIEX_LENGTH PLATFORM_PCIEXPRESS_LENGTH
> -
> -#define THERMAL_BASE_ADDRESS 0xFED08000
> -
> -#ifndef MCH_BASE_ADDRESS
> -#define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base Address
> -#endif
> -#endif
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> index 7b48d7b44e..43db3e28ab 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> @@ -54,8 +54,6 @@
> DEFINE USB_SERIAL_STATUS_CODE_ENABLE = FALSE
> DEFINE RAM_SERIAL_STATUS_CODE_ENABLE = FALSE
>
> -DEFINE ENBDT_S3_SUPPORT = TRUE
> -
> DEFINE LZMA_ENABLE = TRUE
> DEFINE S4_ENABLE = TRUE
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> index eb7ae46505..0f9651cfba 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE DXE_ARCHITECTURE = X64
> -!else
> DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,56 +1218,19 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
> -!else
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
> -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
> !else
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> !endif
>
> -
> -
> !if $(PCIESC_ENABLE) == TRUE
> DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
> !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
> -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
> -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
> -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
> -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
>
> GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> @@ -1290,7 +1240,6 @@ [BuildOptions]
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 69f2b22aff..257bba7485 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> DEFINE PLATFORMX64_ENABLE = TRUE
>
> -!if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> -!else
> - DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,15 +1233,6 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
> -!else
> - DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
> -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
> !else
> @@ -1268,34 +1246,8 @@ [BuildOptions]
> !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
> -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
> -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
> -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
> -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
>
> GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> @@ -1305,7 +1257,6 @@ [BuildOptions]
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 7092ab6e6b..23e296d432 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE DXE_ARCHITECTURE = X64
> -!else
> DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,15 +1218,6 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
> -!else
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
> -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
> !else
> @@ -1253,34 +1231,8 @@ [BuildOptions]
> !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
> -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
> -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
> -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
> -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
>
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
> @@ -1291,7 +1243,6 @@ [BuildOptions]
> !endif
> !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 238561191f..e0fd767dea 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
> #
> # Platform On/Off features are defined here
> #
> - #
> - # Platform Support:: Set only one token except Crestview Hills
> - #
> - # 3.BayleyBay
> - # ENBDT_PF_ENABLE = TRUE
> - #
> - !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>
> DEFINE PLATFORMX64_ENABLE = TRUE
>
> -!if $(X64_CONFIG) == TRUE
> DEFINE DXE_ARCHITECTURE = X64
> -!else
> - DEFINE DXE_ARCHITECTURE = IA32
> -!endif
>
> FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
> !if $(LFMA_ENABLE) == TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>
> !if $(RC_BINARY_RELEASE) == TRUE
> Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> - <BuildOptions>
> - *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
> !if $(TARGET) == DEBUG
> <PcdsFixedAtBuild>
> gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,56 +1233,19 @@ [BuildOptions]
> #
> # Define token for different Platform
> #
> - DEFINE MINNOW2_FSP_OPTION =
> -
> -!if $(ENBDT_PF_BUILD) == TRUE
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
> -!else
> - DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
> -!endif
> -
> -
> !if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
> !else
> DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
> !endif
>
> -
> -
> !if $(PCIESC_ENABLE) == TRUE
> DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
> !else
> DEFINE PCIESC_SUPPORT_BUILD_OPTION =
> !endif
> -!if $(SATA_ENABLE) == TRUE
> - DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
> -!else
> - DEFINE SATA_SUPPORT_BUILD_OPTION =
> -!endif
> -!if $(ENBDT_S3_SUPPORT) == TRUE
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
> -!else
> - DEFINE ENBDT_S3_SUPPORT_OPTIONS =
> -!endif
>
> -!if $(X64_CONFIG) == TRUE
> - DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
> -!else
> - DEFINE X64_BUILD_ENABLE =
> -!endif
> -
> -!if $(TPM_ENABLED) == TRUE
> - DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
> -!else
> - DEFINE DSC_TPM_BUILD_OPTIONS =
> -!endif
> -
> -
> - DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) == TRUE
> - DEFINE PDB_BUILD_OPTION = /Zi
> -!endif
> + DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
>
> !if $(SOURCE_DEBUG_ENABLE) == TRUE
> MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
> @@ -1306,7 +1256,6 @@ [BuildOptions]
> !endif
> !else
> DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
> -
> !endif
>
> #
> @@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> [BuildOptions.Common.EDKII]
> - *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
> -
> *_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> *_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index ffd6722582..c39b8ccd62 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -11,7 +11,6 @@ echo.
> echo %date% %time%
> echo.
>
> -
> ::**********************************************************************
> :: Initial Setup
> ::**********************************************************************
> @@ -20,9 +19,14 @@ set /a build_threads=1
> set "Build_Flags= "
> set exitCode=0
> set Arch=X64
> -set Source=0
> +set GenLog=FALSE
> +set GenReport=FALSE
> +set Clean=FALSE
> set PLATFORM_NAME=Vlv2TbltDevicePkg
>
> +::**********************************************************************
> +:: Detect full path to the edk2 repo
> +::**********************************************************************
> set CORE_PATH=%WORKSPACE%
> if not exist %CORE_PATH%\edksetup.bat (
> if defined PACKAGES_PATH (
> @@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat (
> )
> :CorePathFound
>
> +::**********************************************************************
> +:: Detect full path to the Vlv2TbltDevicePkg
> +::**********************************************************************
> set PLATFORM_PACKAGE=%WORKSPACE%\%PLATFORM_NAME%
> if not exist %PLATFORM_PACKAGE% (
> if defined PACKAGES_PATH (
> @@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% (
>
> cd %CORE_PATH%
>
> -:: Clean up previous build files.
> -if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
> -if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
> -if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
> -if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
> -if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
> -if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
> +::**********************************************************************
> +:: Run edksetup.bat and make sure tools are up to date
> +::**********************************************************************
>
> -:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
> -:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
> call %CORE_PATH%\edksetup.bat Rebuild
> @echo off
>
> -:: Define platform specific environment variables.
> -set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
> -set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
> -
> -
> -
> -::create new AutoPlatformCFG.txt file
> -copy /y nul %auto_config_inc% >nul
> -
> ::**********************************************************************
> :: Parse command line arguments
> ::**********************************************************************
> @@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul
> if /i "%~1"=="/?" goto Usage
>
> if /i "%~1"=="/l" (
> - set Build_Flags=%Build_Flags% -j EDK2.log
> + set GenLog=TRUE
> shift
> goto OptLoop
> )
> if /i "%~1"=="/y" (
> - set Build_Flags=%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
> + set GenReport=TRUE
> shift
> goto OptLoop
> )
> @@ -109,16 +101,7 @@ if /i "%~1"=="/m" (
> goto OptLoop
> )
> if /i "%~1" == "/c" (
> - echo Removing previous build files ...
> - if exist build (
> - del /f/s/q build > nul
> - rmdir /s/q build
> - )
> - if exist %WORKSPACE%\Conf\.cache (
> - del /f/s/q %WORKSPACE%\Conf\.cache > nul
> - rmdir /s/q %WORKSPACE%\Conf\.cache
> - )
> - echo.
> + set Clean=TRUE
> shift
> goto OptLoop
> )
> @@ -137,23 +120,6 @@ if /i "%~1"=="/IA32" (
> :: Required argument(s)
> if "%~1"=="" goto Usage
>
> -if "%Arch%"=="IA32" (
> - echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
> -) else if "%Arch%"=="X64" (
> - echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
> -)
> -
> -:: -- Build flags settings for each Platform --
> -echo Setting %1 platform configuration...
> -if /i "%~1" == "MNW2" (
> - echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
> -
> -) else (
> - echo Error - Unsupported PlatformType: %1
> - goto Usage
> -)
> -set Platform_Type=%~1
> -
> if /i "%~2" == "RELEASE" (
> set target=RELEASE
> ) else (
> @@ -161,8 +127,9 @@ if /i "%~2" == "RELEASE" (
> )
>
> ::**********************************************************************
> -:: Additional EDK Build Setup/Configuration
> +:: Detect TOOL_CHAIN_TAG
> ::**********************************************************************
> +
> echo.
> echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008...
> if defined VS140COMNTOOLS (
> @@ -206,6 +173,10 @@ if defined VS140COMNTOOLS (
> goto :BldFail
> )
>
> +::**********************************************************************
> +:: Generate BUILD_PATH and make sure the directory exists
> +::**********************************************************************
> +
> echo Ensuring correct build directory is present
> if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
> if "%Arch%"=="IA32" (
> @@ -217,26 +188,41 @@ if "%Arch%"=="IA32" (
> )
> if not exist %BUILD_PATH% mkdir %BUILD_PATH%
>
> -echo Modifing Conf files for this build...
> -:: Remove lines with these tags from target.txt
> -findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp
> +::**********************************************************************
> +:: Check for clean operation
> +::**********************************************************************
>
> -echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp
> +if "%Clean%"=="TRUE" (
> + echo Removing previous build files ...
> + if exist %BUILD_PATH% (
> + rmdir /s/q %BUILD_PATH%
> + )
> + if exist %WORKSPACE%\Conf\.cache (
> + rmdir /s/q %WORKSPACE%\Conf\.cache
> + )
> + echo.
> + goto :Exit
> +)
> +
> +::**********************************************************************
> +:: Generate Build_Flags
> +::**********************************************************************
> +
> +set Build_Flags=%Build_Flags% -b %TARGET%
> if "%Arch%"=="IA32" (
> - echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp
> + set Build_Flags=%Build_Flags% -a IA32
> ) else if "%Arch%"=="X64" (
> - echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp
> + set Build_Flags=%Build_Flags% -a IA32 -a X64
> )
> -echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp
> -echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
> -if %Source% == 0 (
> - echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp
> -) else (
> - echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp
> +set Build_Flags=%Build_Flags% -t %TOOL_CHAIN_TAG%
> +set Build_Flags=%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
> +set Build_Flags=%Build_Flags% -n %build_threads%
> +if "%GenLog%"=="TRUE" (
> + set Build_Flags=%Build_Flags% -j %BUILD_PATH%\%PLATFORM_NAME%.log
> +)
> +if "%GenReport%"=="TRUE" (
> + set Build_Flags=%Build_Flags% -y %BUILD_PATH%\%PLATFORM_NAME%.report
> )
> -echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp
> -
> -move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
>
> ::**********************************************************************
> :: Generate BIOS ID
> @@ -267,6 +253,8 @@ echo VERSION_MINOR = 01 >> %BUILD_PATH%/BiosId.env
>
> echo.
> echo Invoking EDK2 build...
> +echo build %Build_Flags%
> +
> call build %Build_Flags%
>
> if %ERRORLEVEL% NEQ 0 goto BldFail
> @@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms.
> echo.
> echo Usage: bld_vlv.bat [options] PlatformType [Build Target]
> echo.
> -echo /c CleanAll before building
> +echo /c CleanAll
> echo /l Generate build log file
> echo /y Generate build report file
> echo /m Enable multi-processor build
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 1705b1628b..d32beb6a45 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -7,15 +7,22 @@ function Usage() {
> echo "***************************************************************************"
> echo "Build BIOS rom for VLV platforms."
> echo
> - echo "Usage: bld_vlv.sh PlatformType [Build Target]"
> + echo "Usage: bld_vlv.sh [options] PlatformType [Build Target]"
> echo
> + echo " /c CleanAll"
> + echo " /l Generate build log file"
> + echo " /y Generate build report file"
> + echo " /m Enable multi-processor build"
> + echo " /IA32 Set Arch to IA32 (default: X64)"
> + echo " /X64 Set Arch to X64 (default: X64)"
> echo
> echo " Platform Types: MNW2"
> echo " Build Targets: Debug, Release (default: Debug)"
> echo
> + echo "Examples:"
> + echo " bld_vlv.sh MNW2 : X64 Debug build for MinnowMax"
> + echo " bld_vlv.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
> echo "***************************************************************************"
> - echo "Press any key......"
> - read
> exit 0
> }
>
> @@ -29,8 +36,12 @@ echo -e $(date)
> #build_threads=($NUMBER_OF_PROCESSORS)+1
> Build_Flags=
> exitCode=0
> +build_threads=1
> Arch=X64
> -SpiLock=0
> +GenLog=FALSE
> +GenReport=FALSE
> +Clean=FALSE
> +
>
> export CORE_PATH=$WORKSPACE/edk2
> export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/
> @@ -38,27 +49,6 @@ export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/
> export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/
> export PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH
>
> -## Clean up previous build files.
> -if [ -e $WORKSPACE/EDK2.log ]; then
> - rm $WORKSPACE/EDK2.log
> -fi
> -
> -if [ -e $WORKSPACE/Unitool.log ]; then
> - rm $WORKSPACE/Unitool.log
> -fi
> -
> -if [ -e $WORKSPACE/Conf/target.txt ]; then
> - rm $WORKSPACE/Conf/target.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
> - rm $WORKSPACE/Conf/tools_def.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
> - rm $WORKSPACE/Conf/build_rule.txt
> -fi
> -
> ## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
> ## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
> cd $CORE_PATH
> @@ -69,17 +59,9 @@ make -C BaseTools
> PLATFORM_NAME=Vlv2TbltDevicePkg
> PLATFORM_PACKAGE=Vlv2TbltDevicePkg
> PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE
> -config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> -auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
>
> cd $PLATFORM_PKG_PATH
>
> -## create new AutoPlatformCFG.txt file
> -if [ -f "$auto_config_inc" ]; then
> - rm $auto_config_inc
> -fi
> -touch $auto_config_inc
> -
> ##**********************************************************************
> ## Parse command line arguments
> ##**********************************************************************
> @@ -89,17 +71,17 @@ for (( i=1; i<=$#; ))
> do
> if [ "$1" == "/?" ]; then
> Usage
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
> - Build_Flags="$Build_Flags --quiet"
> - shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
> - Build_Flags="$Build_Flags -j EDK2.log"
> + GenLog=TRUE
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
> + GenReport=TRUE
> + shift
> + elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
> + build_threads=8
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
> - echo Removing previous build files ...
> - if [ -d "Build" ]; then
> - rm -r Build
> - fi
> + Clean=TRUE
> shift
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
> Arch=X64
> @@ -107,9 +89,6 @@ for (( i=1; i<=$#; ))
> elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
> Arch=IA32
> shift
> - elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
> - SpiLock=1
> - shift
> else
> break
> fi
> @@ -120,26 +99,7 @@ if [ "$2" == "" ]; then
> Usage
> fi
>
> -if [ $Arch == "IA32" ]; then
> - echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
> -else
> - echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
> -fi
> -
> -## -- Build flags settings for each Platform --
> -## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> -## BayleyBay (BBAY): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = TRUE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> -## BayLake (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> -## Bakersport (BYTI): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = FALSE
> -## Crestview Hills (CVHS): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = TRUE
> -## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
> echo "Setting $1 platform configuration and BIOS ID..."
> -if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
> - echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
> -else
> - echo "Error - Unsupported PlatformType: $1"
> - Usage
> -fi
>
> if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
> export TARGET=RELEASE
> @@ -148,18 +108,8 @@ else
> fi
>
> ##**********************************************************************
> -## Additional EDK Build Setup/Configuration
> +## Detect TOOL_CHAIN_TAG
> ##**********************************************************************
> -echo "Ensuring correct build directory is present for GenBiosId..."
> -
> -echo Modifying Conf files for this build...
> -## Remove lines with these tags from target.txt
> -sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt
> -sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt
> -sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt
> -sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt
> -sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
> -
> gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
> case $gcc_version in
> [1-3].*|4.[0-7].*)
> @@ -167,31 +117,19 @@ case $gcc_version in
> exit 1
> ;;
> 4.8.*)
> - TARGET_TOOLS=GCC48
> + export TOOL_CHAIN_TAG=GCC48
> ;;
> 4.9.*|6.[0-2].*)
> - TARGET_TOOLS=GCC49
> + export TOOL_CHAIN_TAG=GCC49
> ;;
> *)
> - TARGET_TOOLS=GCC5
> + export TOOL_CHAIN_TAG=GCC5
> ;;
> esac
>
> -ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
> -export TOOL_CHAIN_TAG=$TARGET_TOOLS
> -MAX_CONCURRENT_THREAD_NUMBER=8
> -echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> $WORKSPACE/Conf/target.txt
> -echo TARGET = $TARGET >> $WORKSPACE/Conf/target.txt
> -echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >> $WORKSPACE/Conf/target.txt
> -echo MAX_CONCURRENT_THREAD_NUMBER = $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt
> -if [ $Arch == "IA32" ]; then
> - echo TARGET_ARCH = IA32 >> $WORKSPACE/Conf/target.txt
> -else
> - echo TARGET_ARCH = IA32 X64 >> $WORKSPACE/Conf/target.txt
> -fi
> -
> -
> -## Set and Create $BUILD_PATH if necessary
> +##**********************************************************************
> +## Generate $BUILD_PATH and make sure the directory exists
> +##**********************************************************************
> if [ ! -d ${WORKSPACE}/Build ]; then
> mkdir ${WORKSPACE}/Build
> fi
> @@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then
> mkdir $BUILD_PATH
> fi
>
> +##**********************************************************************
> +## Check for clean operation
> +##**********************************************************************
> +if [ $Clean == "TRUE" ]; then
> + echo Removing previous build files ...
> + if [ -d ${BUILD_PATH} ]; then
> + rm -r ${BUILD_PATH}
> + fi
> + if [ -d ${WORKSPACE}/Conf/.cache ]; then
> + rm -r ${WORKSPACE}/Conf/.cache
> + fi
> + exit 0
> +fi
> +
> +##**********************************************************************
> +## Generate Build_Flags
> +##**********************************************************************
> +
> +Build_Flags="$Build_Flags -b $TARGET"
> +if [ $Arch == "IA32" ]; then
> + Build_Flags="$Build_Flags -a IA32"
> +else
> + Build_Flags="$Build_Flags -a IA32 -a X64"
> +fi
> +Build_Flags="$Build_Flags -t $TOOL_CHAIN_TAG"
> +Build_Flags="$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
> +Build_Flags="$Build_Flags -n $build_threads"
> +if [ $GenLog == "TRUE" ]; then
> + Build_Flags="$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
> +fi
> +if [ $GenReport == "TRUE" ]; then
> + Build_Flags="$Build_Flags -y ${BUILD_PATH}/${PLATFORM_NAME}.report"
> +fi
> +
> ##**********************************************************************
> ## Generate BIOS ID
> ##**********************************************************************
> @@ -239,7 +211,8 @@ python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i
> ## Build BIOS
> ##**********************************************************************
> echo "Invoking EDK2 build..."
> -build
> +echo build $Build_Flags
> +build $Build_Flags
>
> ##**********************************************************************
> ## Post Build processing and cleanup
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh b/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> deleted file mode 100644
> index 3511695f6f..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -#!/usr/bin/env bash
> -echo
> -echo Run build cleanall...
> -echo
> -
> -echo
> -echo Directories to clean...
> -echo
> -
> -cd ..
> -
> -if [ -d "Build" ]; then
> - rm -r Build
> -fi
> -
> -if [ -d "Conf/.cache" ]; then
> - rm -r Conf/.cache
> -fi
> -
> -if [ -d "RomImages" ]; then
> - rm -r RomImages
> -fi
> -
> -echo
> -echo Files to clean...
> -echo
> -
> -if [ -e $(pwd)/EDK2.log ]; then
> - rm $(pwd)/EDK2.log
> -fi
> -
> -if [ -e $(pwd)/Unitool.log ]; then
> - rm $(pwd)/Unitool.log
> -fi
> -
> -if [ -e $(pwd)/Conf/target.txt ]; then
> - rm $(pwd)/Conf/target.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BiosId.env ]; then
> - rm $(pwd)/Conf/BiosId.env
> -fi
> -
> -if [ -e $(pwd)/Conf/tools_def.txt ]; then
> - rm $(pwd)/Conf/tools_def.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/build_rule.txt ]; then
> - rm $(pwd)/Conf/build_rule.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BuildEnv.sh ]; then
> - rm $(pwd)/Conf/BuildEnv.sh
> -fi
> -
> -if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then
> - rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> -fi
> -
> -echo
> -echo All done...
> -echo
[-- Attachment #2: Type: text/html, Size: 48305 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
2019-07-12 3:39 ` [edk2-devel] " rebecca
@ 2019-07-12 18:16 ` Michael D Kinney
0 siblings, 0 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-12 18:16 UTC (permalink / raw)
To: Rebecca Cran, devel@edk2.groups.io, Kinney, Michael D
Cc: Sun, Zailiang, Qian, Yi, Gary Lin
[-- Attachment #1: Type: text/plain, Size: 129502 bytes --]
Rebecca,
Thanks. I agree. I will make sure set –e is at top for both .sh files before committing this series.
Thanks,
Mike
From: Rebecca Cran [mailto:rebecca@bsdio.com]
Sent: Thursday, July 11, 2019 8:39 PM
To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>; Gary Lin <glin@suse.com>
Subject: Re: [edk2-devel] [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
bld_vlv.sh should probably have "set -e" at the top, like the change to Build_IFWI.sh
See https://bugzilla.tianocore.org/show_bug.cgi?id=1599 ("bld_vlv.sh isn't `set -e` and doesn't check if commands completed successfully").
--
Rebecca Cran
On 7/10/19 1:05 PM, Michael D Kinney wrote:
* Remove cln.sh
* Remove unused PlatformDefintions.h file
* Remove unused defines from DSC files
* Make Windows and Linux script more consistent
* Remove unused options from Windows/Linux scripts
* Remove unused defines from Windows/Linux scripts
* Do not modify Target.txt in Conf directory. Instead,
pass all build flags on the command line
* Generate build report in the build output directory
* Generate build logs in the build output directory
* Do not delete files from Conf directory
* Update clean operation to only clean one platform target
* Do not generate AutoPlatformCFG.txt file anymore
Cc: Zailiang Sun <zailiang.sun@intel.com><mailto:zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com><mailto:yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com><mailto:glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com><mailto:michael.d.kinney@intel.com>
---
Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 ++-------
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 57 +++----
.../Include/PlatformDefinitions.h | 43 -----
.../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
.../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc | 55 +-----
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 53 +-----
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 53 +-----
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 55 +-----
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 120 ++++++-------
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 159 ++++++++----------
Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 -------
12 files changed, 156 insertions(+), 583 deletions(-)
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/.gitignore
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore b/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
deleted file mode 100644
index c7698262ad..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-AutoPlatformCFG.txt
-Stitch/Stitching.log
-Stitch/MNW*.bin
-Stitch/MNW*.rom
-Stitch/MNW*.rom.orig
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
index 44759c617f..f65aa61f4a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -9,15 +9,9 @@
SetLocal EnableDelayedExpansion EnableExtensions
-@REM Go to work space directory.
-cd ..
-cd ..
-
:: Assign initial values
set exitCode=0
set "Build_Flags= "
-set "Stitch_Flags= "
-set Arch=X64
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
set PLATFORM_PATH=%WORKSPACE%
@@ -42,11 +36,6 @@ if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (
:OptLoop
if /i "%~1"=="/?" goto Usage
-if /i "%~1"=="/q" (
- set Build_Flags=%Build_Flags% /q
- shift
- goto OptLoop
-)
if /i "%~1"=="/l" (
set Build_Flags=%Build_Flags% /l
shift
@@ -67,53 +56,17 @@ if /i "%~1" == "/c" (
shift
goto OptLoop
)
-if /i "%~1" == "/ECP" (
- set Build_Flags=%Build_Flags% /ecp
- shift
- goto OptLoop
-)
-
-if /i "%~1"=="/s" (
- set Build_Flags=%Build_Flags% /s
- shift
- goto OptLoop
-)
-
if /i "%~1"=="/x64" (
- set Arch=X64
set Build_Flags=%Build_Flags% /x64
shift
goto OptLoop
)
-
if /i "%~1"=="/IA32" (
- set Arch=IA32
set Build_Flags=%Build_Flags% /IA32
shift
goto OptLoop
)
-if /i "%~1"=="/nG" (
- set Stitch_Flags=%Stitch_Flags% /nG
- shift
- goto OptLoop
-)
-if /i "%~1"=="/nM" (
- set Stitch_Flags=%Stitch_Flags% /nM
- shift
- goto OptLoop
-)
-if /i "%~1"=="/nB" (
- set Stitch_Flags=%Stitch_Flags% /nB
- shift
- goto OptLoop
-)
-if /i "%~1"=="/yL" (
- set Stitch_Flags=%Stitch_Flags% /yL
- shift
- goto OptLoop
-)
-
:: Require 2 input parameters
if "%~2"=="" goto Usage
@@ -125,7 +78,7 @@ set Build_Target=%~2
echo ======================================================================
echo Build_IFWI: Calling BIOS build Script...
-call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
+call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
if %ERRORLEVEL% NEQ 0 (
echo echo -- Error Building BIOS & echo.
@@ -139,23 +92,21 @@ goto Exit
:Usage
echo Script to build BIOS firmware and stitch the entire IFWI.
echo.
-echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget [IFWI Suffix]
+echo Usage: Build_IFWI.bat [options] PlatformType BuildTarget
echo.
-echo /c CleanAll before building
-echo /x64 Set Arch to X64 (default: X64)
-echo /IA32 Set Arch to IA32 (default: X64)
-echo /yL Enable SPI lock
-echo.
-echo Platform Types: MNW2
-echo Build Targets: Release, Debug
-echo IFWI Suffix: Suffix to append to end of IFWI filename (default: MM_DD_YYYY)
+echo /c CleanAll
+echo /l Generate build log file
+echo /y Generate build report file
+echo /m Enable multi-processor build
+echo /IA32 Set Arch to IA32 (default: X64)
+echo /X64 Set Arch to X64 (default: X64)
echo.
-echo See Stitch/Stitch_Config.txt for additional stitching settings.
+echo Platform Types: MNW2
+echo Build Targets: Debug, Release (default: Debug)
echo.
-echo If capsule update is needed, please update CAPSULE_ENABLE = TRUE in Config.dsc.
-echo If recovery is needed, please update RECOVERY_ENABLE = TRUE in Config.dsc.
-echo If either of above is TRUE, please set OPENSSL_PATH in windows evironment
-echo and put openssl.exe there, to generate final capsule image.
+echo Examples:
+echo Build_IFWI.bat MNW2 debug : X64 Debug build for MinnowMax
+echo Build_IFWI.bat /IA32 MNW2 release : IA32 Release build for MinnowMax
echo.
set exitCode=1
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
index 349f0c7ba7..153c8c5fae 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
@@ -6,15 +6,21 @@ function Usage ( ) {
echo
echo "Script to build BIOS firmware and stitch the entire IFWI."
echo
- echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget "
+ echo "Usage: Build_IFWI.sh [options] PlatformType BuildTarget"
echo
- echo
- echo " /yL [option] : Enable SPI lock"
- echo " Platform Types: MNW2"
- echo " Build Targets: Release, Debug"
+ echo " /c CleanAll"
+ echo " /l Generate build log file"
+ echo " /y Generate build report file"
+ echo " /m Enable multi-processor build"
+ echo " /IA32 Set Arch to IA32 (default: X64)"
+ echo " /X64 Set Arch to X64 (default: X64)"
echo
- echo " See Stitch/Stitch_Config.txt for additional stitching settings."
+ echo " Platform Types: MNW2"
+ echo " Build Targets: Debug, Release (default: Debug)"
echo
+ echo "Examples:"
+ echo " Build_IFWI.sh MNW2 debug : X64 Debug build for MinnowMax"
+ echo " Build_IFWI.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
echo
exit 0
}
@@ -24,9 +30,6 @@ set -e
## Assign initial values
exitCode=0
Build_Flags=
-Stitch_Flags=
-Arch=X64
-PLATFORM_PACKAGE=Vlv2TbltDevicePkg
## Check whether WORKSPACE is set or not
if [[ -z "$WORKSPACE" ]]; then
@@ -47,41 +50,24 @@ fi
for (( i=1; i<=$#; ))
do
- if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
- Build_Flags="$Build_Flags /q"
- shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
+ if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
Build_Flags="$Build_Flags /l"
shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
+ Build_Flags="$Build_Flags /y"
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
+ Build_Flags="$Build_Flags /m"
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
Build_Flags="$Build_Flags /c"
shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/ECP" ]; then
- Build_Flags="$Build_Flags /ecp"
- shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
- Arch=X64
Build_Flags="$Build_Flags /x64"
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
- Arch=IA32
Build_Flags="$Build_Flags /IA32"
shift
- elif [ "$1" == "/nG" ]; then
- Stitch_Flags="$Stitch_Flags /nG"
- shift
- elif [ "$1" == "/nM" ]; then
- Stitch_Flags="$Stitch_Flags /nM"
- shift
- elif [ "$1" == "/nB" ]; then
- Stitch_Flags="$Stitch_Flags /nB"
- shift
- elif [ "$1" == "/nV" ]; then
- Stitch_Flags="$Stitch_Flags /nV"
- shift
- elif [ "$1" == "/yL" ]; then
- Build_Flags="$Build_Flags /yL"
- shift
else
break
fi
@@ -95,11 +81,6 @@ fi
## Assign required arguments
Platform_Type=$1
Build_Target=$2
-if [ "$3" == "" ]; then
- IFWI_Suffix=
-else
- IFWI_Suffix="/S $3"
-fi
## Build BIOS
echo "======================================================================"
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
deleted file mode 100644
index a64cda0799..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*++
-
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-
- SPDX-License-Identifier: BSD-2-Clause-Patent
-
-
-
-
-Module Name:
-
- PlatformDefinitions.h
-
-Abstract:
-
- This header file provides platform specific definitions used by other modules
- for platform specific initialization.
-
- THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY NON-C MODULES
- (ASL and VFR)
-
- This file should not contain addition or other operations that an ASL compiler or
- VFR compiler does not understand.
-
---*/
-
-#ifndef _PLATFORM_DEFINITIONS_H_
-#define _PLATFORM_DEFINITIONS_H_
-
-
-//
-// Platform Base Address definitions
-//
-#define PCIEX_BASE_ADDRESS EDKII_GLUE_PciExpressBaseAddress // Pci Express Configuration Space Base Address
-
-#define PCIEX_LENGTH PLATFORM_PCIEXPRESS_LENGTH
-
-#define THERMAL_BASE_ADDRESS 0xFED08000
-
-#ifndef MCH_BASE_ADDRESS
-#define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base Address
-#endif
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index 7b48d7b44e..43db3e28ab 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -54,8 +54,6 @@
DEFINE USB_SERIAL_STATUS_CODE_ENABLE = FALSE
DEFINE RAM_SERIAL_STATUS_CODE_ENABLE = FALSE
-DEFINE ENBDT_S3_SUPPORT = TRUE
-
DEFINE LZMA_ENABLE = TRUE
DEFINE S4_ENABLE = TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
index eb7ae46505..0f9651cfba 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
@@ -27,20 +27,9 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-!if $(X64_CONFIG) == TRUE
- DEFINE DXE_ARCHITECTURE = X64
-!else
DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -761,8 +750,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1231,56 +1218,19 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
!else
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
!endif
-
-
!if $(PCIESC_ENABLE) == TRUE
DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
!if $(SOURCE_DEBUG_ENABLE) == TRUE
@@ -1290,7 +1240,6 @@ [BuildOptions]
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 69f2b22aff..257bba7485 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -27,22 +27,11 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
DEFINE PLATFORMX64_ENABLE = TRUE
-!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
-!else
- DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -763,8 +752,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = -DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1246,15 +1233,6 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = -DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
!else
@@ -1268,34 +1246,8 @@ [BuildOptions]
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = -DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = -DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = -DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = -DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
!if $(SOURCE_DEBUG_ENABLE) == TRUE
@@ -1305,7 +1257,6 @@ [BuildOptions]
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) -D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h -DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 7092ab6e6b..23e296d432 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -27,20 +27,9 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-!if $(X64_CONFIG) == TRUE
- DEFINE DXE_ARCHITECTURE = X64
-!else
DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -761,8 +750,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1231,15 +1218,6 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
!else
@@ -1253,34 +1231,8 @@ [BuildOptions]
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
!if $(SOURCE_DEBUG_ENABLE) == TRUE
MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
@@ -1291,7 +1243,6 @@ [BuildOptions]
!endif
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 238561191f..e0fd767dea 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -27,22 +27,11 @@ [Defines]
#
# Platform On/Off features are defined here
#
- #
- # Platform Support:: Set only one token except Crestview Hills
- #
- # 3.BayleyBay
- # ENBDT_PF_ENABLE = TRUE
- #
- !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
!include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
DEFINE PLATFORMX64_ENABLE = TRUE
-!if $(X64_CONFIG) == TRUE
DEFINE DXE_ARCHITECTURE = X64
-!else
- DEFINE DXE_ARCHITECTURE = IA32
-!endif
FLASH_DEFINITION = Vlv2TbltDevicePkg/PlatformPkg.fdf
!if $(LFMA_ENABLE) == TRUE
@@ -763,8 +752,6 @@ [Components.IA32]
!if $(RC_BINARY_RELEASE) == TRUE
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
- <BuildOptions>
- *_*_IA32_CC_FLAGS = /DRC_BINARY_RELEASE
!if $(TARGET) == DEBUG
<PcdsFixedAtBuild>
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
@@ -1246,56 +1233,19 @@ [BuildOptions]
#
# Define token for different Platform
#
- DEFINE MINNOW2_FSP_OPTION =
-
-!if $(ENBDT_PF_BUILD) == TRUE
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=1
-!else
- DEFINE ENBDT_PF_ENABLE = /DENBDT_PF_ENABLE=0
-!endif
-
-
!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
!else
DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
!endif
-
-
!if $(PCIESC_ENABLE) == TRUE
DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
!else
DEFINE PCIESC_SUPPORT_BUILD_OPTION =
!endif
-!if $(SATA_ENABLE) == TRUE
- DEFINE SATA_SUPPORT_BUILD_OPTION = /DSATA_SUPPORT=1
-!else
- DEFINE SATA_SUPPORT_BUILD_OPTION =
-!endif
-!if $(ENBDT_S3_SUPPORT) == TRUE
- DEFINE ENBDT_S3_SUPPORT_OPTIONS = /DNOCS_S3_SUPPORT
-!else
- DEFINE ENBDT_S3_SUPPORT_OPTIONS =
-!endif
-!if $(X64_CONFIG) == TRUE
- DEFINE X64_BUILD_ENABLE = /DX64_BUILD_ENABLE=1
-!else
- DEFINE X64_BUILD_ENABLE =
-!endif
-
-!if $(TPM_ENABLED) == TRUE
- DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
-!else
- DEFINE DSC_TPM_BUILD_OPTIONS =
-!endif
-
-
- DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
-!if $(PERFORMANCE_ENABLE) == TRUE
- DEFINE PDB_BUILD_OPTION = /Zi
-!endif
+ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
!if $(SOURCE_DEBUG_ENABLE) == TRUE
MSFT:*_*_X64_GENFW_FLAGS = --keepexceptiontable
@@ -1306,7 +1256,6 @@ [BuildOptions]
!endif
!else
DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-
!endif
#
@@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
[BuildOptions.Common.EDKII]
- *_*_IA32_ASM_FLAGS = $(VP_BUILD_OPTIONS) /D EDKII_GLUE_PciExpressBaseAddress=$(PLATFORM_PCIEXPRESS_BASE)h /DNOCS_S3_SUPPORT
-
*_*_IA32_CC_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_VFRPP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
*_*_IA32_APP_FLAGS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index ffd6722582..c39b8ccd62 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -11,7 +11,6 @@ echo.
echo %date% %time%
echo.
-
::**********************************************************************
:: Initial Setup
::**********************************************************************
@@ -20,9 +19,14 @@ set /a build_threads=1
set "Build_Flags= "
set exitCode=0
set Arch=X64
-set Source=0
+set GenLog=FALSE
+set GenReport=FALSE
+set Clean=FALSE
set PLATFORM_NAME=Vlv2TbltDevicePkg
+::**********************************************************************
+:: Detect full path to the edk2 repo
+::**********************************************************************
set CORE_PATH=%WORKSPACE%
if not exist %CORE_PATH%\edksetup.bat (
if defined PACKAGES_PATH (
@@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat (
)
:CorePathFound
+::**********************************************************************
+:: Detect full path to the Vlv2TbltDevicePkg
+::**********************************************************************
set PLATFORM_PACKAGE=%WORKSPACE%\%PLATFORM_NAME%
if not exist %PLATFORM_PACKAGE% (
if defined PACKAGES_PATH (
@@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% (
cd %CORE_PATH%
-:: Clean up previous build files.
-if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log
-if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
-if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
-if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
-if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
-if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
+::**********************************************************************
+:: Run edksetup.bat and make sure tools are up to date
+::**********************************************************************
-:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
-:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
call %CORE_PATH%\edksetup.bat Rebuild
@echo off
-:: Define platform specific environment variables.
-set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
-set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
-
-
-
-::create new AutoPlatformCFG.txt file
-copy /y nul %auto_config_inc% >nul
-
::**********************************************************************
:: Parse command line arguments
::**********************************************************************
@@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul
if /i "%~1"=="/?" goto Usage
if /i "%~1"=="/l" (
- set Build_Flags=%Build_Flags% -j EDK2.log
+ set GenLog=TRUE
shift
goto OptLoop
)
if /i "%~1"=="/y" (
- set Build_Flags=%Build_Flags% -y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
+ set GenReport=TRUE
shift
goto OptLoop
)
@@ -109,16 +101,7 @@ if /i "%~1"=="/m" (
goto OptLoop
)
if /i "%~1" == "/c" (
- echo Removing previous build files ...
- if exist build (
- del /f/s/q build > nul
- rmdir /s/q build
- )
- if exist %WORKSPACE%\Conf\.cache (
- del /f/s/q %WORKSPACE%\Conf\.cache > nul
- rmdir /s/q %WORKSPACE%\Conf\.cache
- )
- echo.
+ set Clean=TRUE
shift
goto OptLoop
)
@@ -137,23 +120,6 @@ if /i "%~1"=="/IA32" (
:: Required argument(s)
if "%~1"=="" goto Usage
-if "%Arch%"=="IA32" (
- echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
-) else if "%Arch%"=="X64" (
- echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
-)
-
-:: -- Build flags settings for each Platform --
-echo Setting %1 platform configuration...
-if /i "%~1" == "MNW2" (
- echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
-
-) else (
- echo Error - Unsupported PlatformType: %1
- goto Usage
-)
-set Platform_Type=%~1
-
if /i "%~2" == "RELEASE" (
set target=RELEASE
) else (
@@ -161,8 +127,9 @@ if /i "%~2" == "RELEASE" (
)
::**********************************************************************
-:: Additional EDK Build Setup/Configuration
+:: Detect TOOL_CHAIN_TAG
::**********************************************************************
+
echo.
echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008...
if defined VS140COMNTOOLS (
@@ -206,6 +173,10 @@ if defined VS140COMNTOOLS (
goto :BldFail
)
+::**********************************************************************
+:: Generate BUILD_PATH and make sure the directory exists
+::**********************************************************************
+
echo Ensuring correct build directory is present
if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
if "%Arch%"=="IA32" (
@@ -217,26 +188,41 @@ if "%Arch%"=="IA32" (
)
if not exist %BUILD_PATH% mkdir %BUILD_PATH%
-echo Modifing Conf files for this build...
-:: Remove lines with these tags from target.txt
-findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp
+::**********************************************************************
+:: Check for clean operation
+::**********************************************************************
-echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp
+if "%Clean%"=="TRUE" (
+ echo Removing previous build files ...
+ if exist %BUILD_PATH% (
+ rmdir /s/q %BUILD_PATH%
+ )
+ if exist %WORKSPACE%\Conf\.cache (
+ rmdir /s/q %WORKSPACE%\Conf\.cache
+ )
+ echo.
+ goto :Exit
+)
+
+::**********************************************************************
+:: Generate Build_Flags
+::**********************************************************************
+
+set Build_Flags=%Build_Flags% -b %TARGET%
if "%Arch%"=="IA32" (
- echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp
+ set Build_Flags=%Build_Flags% -a IA32
) else if "%Arch%"=="X64" (
- echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp
+ set Build_Flags=%Build_Flags% -a IA32 -a X64
)
-echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp
-echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
-if %Source% == 0 (
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp
-) else (
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp
+set Build_Flags=%Build_Flags% -t %TOOL_CHAIN_TAG%
+set Build_Flags=%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
+set Build_Flags=%Build_Flags% -n %build_threads%
+if "%GenLog%"=="TRUE" (
+ set Build_Flags=%Build_Flags% -j %BUILD_PATH%\%PLATFORM_NAME%.log
+)
+if "%GenReport%"=="TRUE" (
+ set Build_Flags=%Build_Flags% -y %BUILD_PATH%\%PLATFORM_NAME%.report
)
-echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp
-
-move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
::**********************************************************************
:: Generate BIOS ID
@@ -267,6 +253,8 @@ echo VERSION_MINOR = 01 >> %BUILD_PATH%/BiosId.env
echo.
echo Invoking EDK2 build...
+echo build %Build_Flags%
+
call build %Build_Flags%
if %ERRORLEVEL% NEQ 0 goto BldFail
@@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms.
echo.
echo Usage: bld_vlv.bat [options] PlatformType [Build Target]
echo.
-echo /c CleanAll before building
+echo /c CleanAll
echo /l Generate build log file
echo /y Generate build report file
echo /m Enable multi-processor build
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 1705b1628b..d32beb6a45 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -7,15 +7,22 @@ function Usage() {
echo "***************************************************************************"
echo "Build BIOS rom for VLV platforms."
echo
- echo "Usage: bld_vlv.sh PlatformType [Build Target]"
+ echo "Usage: bld_vlv.sh [options] PlatformType [Build Target]"
echo
+ echo " /c CleanAll"
+ echo " /l Generate build log file"
+ echo " /y Generate build report file"
+ echo " /m Enable multi-processor build"
+ echo " /IA32 Set Arch to IA32 (default: X64)"
+ echo " /X64 Set Arch to X64 (default: X64)"
echo
echo " Platform Types: MNW2"
echo " Build Targets: Debug, Release (default: Debug)"
echo
+ echo "Examples:"
+ echo " bld_vlv.sh MNW2 : X64 Debug build for MinnowMax"
+ echo " bld_vlv.sh /IA32 MNW2 release : IA32 Release build for MinnowMax"
echo "***************************************************************************"
- echo "Press any key......"<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- read<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
exit 0<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
}<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
@@ -29,8 +36,12 @@ echo -e $(date)<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
#build_threads=($NUMBER_OF_PROCESSORS)+1<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
Build_Flags=<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
exitCode=0<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
+build_threads=1<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
Arch=X64<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-SpiLock=0<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
+GenLog=FALSE<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
+GenReport=FALSE<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
+Clean=FALSE<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
+<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
export CORE_PATH=$WORKSPACE/edk2<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
export PLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
@@ -38,27 +49,6 @@ export SILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
export BINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
export PACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-## Clean up previous build files.<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -e $WORKSPACE/EDK2.log ]; then<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- rm $WORKSPACE/EDK2.log<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-fi<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -e $WORKSPACE/Unitool.log ]; then<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- rm $WORKSPACE/Unitool.log<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-fi<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -e $WORKSPACE/Conf/target.txt ]; then<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- rm $WORKSPACE/Conf/target.txt<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-fi<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -e $WORKSPACE/Conf/tools_def.txt ]; then<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- rm $WORKSPACE/Conf/tools_def.txt<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-fi<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -e $WORKSPACE/Conf/build_rule.txt ]; then<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
- rm $WORKSPACE/Conf/build_rule.txt<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-fi<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
## Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
## Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
cd $CORE_PATH<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
@@ -69,17 +59,9 @@ make -C BaseTools<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
PLATFORM_NAME=Vlv2TbltDevicePkg<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
PLATFORM_PACKAGE=Vlv2TbltDevicePkg<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
PLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txt<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
cd $PLATFORM_PKG_PATH<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-## create new AutoPlatformCFG.txt file<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>
-if [ -f "<mailto:-readexit0%7d@@-29,8+36,12@@echo-e$(date)#build_threads=($NUMBER_OF_PROCESSORS)+1Build_Flags=exitCode=0+build_threads=1Arch=X64-SpiLock=0+GenLog=FALSE+GenReport=FALSE+Clean=FALSE+exportCORE_PATH=$WORKSPACE/edk2exportPLATFORM_PATH=$WORKSPACE/edk2-platforms/Platform/Intel/@@-38,27+49,6@@exportSILICON_PATH=$WORKSPACE/edk2-platforms/Silicon/Intel/exportBINARY_PATH=$WORKSPACE/edk2-non-osi/Silicon/Intel/exportPACKAGES_PATH=$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$CORE_PATH-##Cleanuppreviousbuildfiles.-if[-e$WORKSPACE/EDK2.log];then-rm$WORKSPACE/EDK2.log-fi--if[-e$WORKSPACE/Unitool.log];then-rm$WORKSPACE/Unitool.log-fi--if[-e$WORKSPACE/Conf/target.txt];then-rm$WORKSPACE/Conf/target.txt-fi--if[-e$WORKSPACE/Conf/tools_def.txt];then-rm$WORKSPACE/Conf/tools_def.txt-fi--if[-e$WORKSPACE/Conf/build_rule.txt];then-rm$WORKSPACE/Conf/build_rule.txt-fi-##SetupEDKenvironment.Edksetupputsnewcopiesoftarget.txt,tools_def.txt,build_rule.txtinWorkSpace\Conf##Alsorunedksetupassoonaspossibletoavoiditfromchangingenvironmentvariableswe'reoverridingcd$CORE_PATH@@-69,17+59,9@@make-CBaseToolsPLATFORM_NAME=Vlv2TbltDevicePkgPLATFORM_PACKAGE=Vlv2TbltDevicePkgPLATFORM_PKG_PATH=$PLATFORM_PATH/$PLATFORM_PACKAGE-config_file=$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc-auto_config_inc=$PLATFORM_PKG_PATH/AutoPlatformCFG.txtcd$PLATFORM_PKG_PATH-##createnewAutoPlatformCFG.txtfile-if[-f>$auto_config_inc" ]; then
- rm $auto_config_inc
-fi
-touch $auto_config_inc
-
##**********************************************************************
## Parse command line arguments
##**********************************************************************
@@ -89,17 +71,17 @@ for (( i=1; i<=$#; ))
do
if [ "$1" == "/?" ]; then
Usage
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Q" ]; then
- Build_Flags="$Build_Flags --quiet"
- shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/L" ]; then
- Build_Flags="$Build_Flags -j EDK2.log"
+ GenLog=TRUE
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/Y" ]; then
+ GenReport=TRUE
+ shift
+ elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/M" ]; then
+ build_threads=8
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
- echo Removing previous build files ...
- if [ -d "Build" ]; then
- rm -r Build
- fi
+ Clean=TRUE
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
Arch=X64
@@ -107,9 +89,6 @@ for (( i=1; i<=$#; ))
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/IA32" ]; then
Arch=IA32
shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/YL" ]; then
- SpiLock=1
- shift
else
break
fi
@@ -120,26 +99,7 @@ if [ "$2" == "" ]; then
Usage
fi
-if [ $Arch == "IA32" ]; then
- echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc
-else
- echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc
-fi
-
-## -- Build flags settings for each Platform --
-## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## BayleyBay (BBAY): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = TRUE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## BayLake (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
-## Bakersport (BYTI): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = FALSE
-## Crestview Hills (CVHS): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = TRUE, IVI_PF_BUILD = TRUE
-## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE
echo "Setting $1 platform configuration and BIOS ID..."
-if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then
- echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc
-else
- echo "Error - Unsupported PlatformType: $1"
- Usage
-fi
if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then
export TARGET=RELEASE
@@ -148,18 +108,8 @@ else
fi
##**********************************************************************
-## Additional EDK Build Setup/Configuration
+## Detect TOOL_CHAIN_TAG
##**********************************************************************
-echo "Ensuring correct build directory is present for GenBiosId..."
-
-echo Modifying Conf files for this build...
-## Remove lines with these tags from target.txt
-sed -i '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt
-sed -i '/^TARGET /d' $WORKSPACE/Conf/target.txt
-sed -i '/^TARGET_ARCH/d' $WORKSPACE/Conf/target.txt
-sed -i '/^TOOL_CHAIN_TAG/d' $WORKSPACE/Conf/target.txt
-sed -i '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
-
gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
case $gcc_version in
[1-3].*|4.[0-7].*)
@@ -167,31 +117,19 @@ case $gcc_version in
exit 1
;;
4.8.*)
- TARGET_TOOLS=GCC48
+ export TOOL_CHAIN_TAG=GCC48
;;
4.9.*|6.[0-2].*)
- TARGET_TOOLS=GCC49
+ export TOOL_CHAIN_TAG=GCC49
;;
*)
- TARGET_TOOLS=GCC5
+ export TOOL_CHAIN_TAG=GCC5
;;
esac
-ACTIVE_PLATFORM=$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
-export TOOL_CHAIN_TAG=$TARGET_TOOLS
-MAX_CONCURRENT_THREAD_NUMBER=8
-echo ACTIVE_PLATFORM = $ACTIVE_PLATFORM >> $WORKSPACE/Conf/target.txt
-echo TARGET = $TARGET >> $WORKSPACE/Conf/target.txt
-echo TOOL_CHAIN_TAG = $TOOL_CHAIN_TAG >> $WORKSPACE/Conf/target.txt
-echo MAX_CONCURRENT_THREAD_NUMBER = $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt
-if [ $Arch == "IA32" ]; then
- echo TARGET_ARCH = IA32 >> $WORKSPACE/Conf/target.txt
-else
- echo TARGET_ARCH = IA32 X64 >> $WORKSPACE/Conf/target.txt
-fi
-
-
-## Set and Create $BUILD_PATH if necessary
+##**********************************************************************
+## Generate $BUILD_PATH and make sure the directory exists
+##**********************************************************************
if [ ! -d ${WORKSPACE}/Build ]; then
mkdir ${WORKSPACE}/Build
fi
@@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then
mkdir $BUILD_PATH
fi
+##**********************************************************************
+## Check for clean operation
+##**********************************************************************
+if [ $Clean == "TRUE" ]; then
+ echo Removing previous build files ...
+ if [ -d ${BUILD_PATH} ]; then
+ rm -r ${BUILD_PATH}
+ fi
+ if [ -d ${WORKSPACE}/Conf/.cache ]; then
+ rm -r ${WORKSPACE}/Conf/.cache
+ fi
+ exit 0
+fi
+
+##**********************************************************************
+## Generate Build_Flags
+##**********************************************************************
+
+Build_Flags="$Build_Flags -b $TARGET"
+if [ $Arch == "IA32" ]; then
+ Build_Flags="$Build_Flags -a IA32"
+else
+ Build_Flags="$Build_Flags -a IA32 -a X64"
+fi
+Build_Flags="$Build_Flags -t $TOOL_CHAIN_TAG"
+Build_Flags="$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
+Build_Flags="$Build_Flags -n $build_threads"
+if [ $GenLog == "TRUE" ]; then
+ Build_Flags="$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
+fi
+if [ $GenReport == "TRUE" ]; then
+ Build_Flags="$Build_Flags -y ${BUILD_PATH}/${PLATFORM_NAME}.report"
+fi
+
##**********************************************************************
## Generate BIOS ID
##**********************************************************************
@@ -239,7 +211,8 @@ python $WORKSPACE/edk2-platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i
## Build BIOS
##**********************************************************************
echo "Invoking EDK2 build..."
-build
+echo build $Build_Flags
+build $Build_Flags
##**********************************************************************
## Post Build processing and cleanup
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh b/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
deleted file mode 100644
index 3511695f6f..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-echo
-echo Run build cleanall...
-echo
-
-echo
-echo Directories to clean...
-echo
-
-cd ..
-
-if [ -d "Build" ]; then
- rm -r Build
-fi
-
-if [ -d "Conf/.cache" ]; then
- rm -r Conf/.cache
-fi
-
-if [ -d "RomImages" ]; then
- rm -r RomImages
-fi
-
-echo
-echo Files to clean...
-echo
-
-if [ -e $(pwd)/EDK2.log ]; then
- rm $(pwd)/EDK2.log
-fi
-
-if [ -e $(pwd)/Unitool.log ]; then
- rm $(pwd)/Unitool.log
-fi
-
-if [ -e $(pwd)/Conf/target.txt ]; then
- rm $(pwd)/Conf/target.txt
-fi
-
-if [ -e $(pwd)/Conf/BiosId.env ]; then
- rm $(pwd)/Conf/BiosId.env
-fi
-
-if [ -e $(pwd)/Conf/tools_def.txt ]; then
- rm $(pwd)/Conf/tools_def.txt
-fi
-
-if [ -e $(pwd)/Conf/build_rule.txt ]; then
- rm $(pwd)/Conf/build_rule.txt
-fi
-
-if [ -e $(pwd)/Conf/BuildEnv.sh ]; then
- rm $(pwd)/Conf/BuildEnv.sh
-fi
-
-if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then
- rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt
-fi
-
-echo
-echo All done...
-echo
[-- Attachment #2: Type: text/html, Size: 247399 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (25 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-10 19:05 ` [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos Michael D Kinney
` (2 subsequent siblings)
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Only build capsules for X64 builds. More changes are
required to build IA32 capsules.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 6 +++++-
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index c39b8ccd62..99c1068663 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -277,7 +277,11 @@ if %ERRORLEVEL% NEQ 0 goto BldFail
::echo FD successfully updated with default Hii values.
@REM build capsule here
-call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+if "%Arch%"=="X64" (
+ echo Invoking EDK2 build for capsules...
+ echo build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+ call build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
+)
goto Exit
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index d32beb6a45..0d1ea60ac6 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -224,7 +224,11 @@ cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM
##**********************************************************************
## Build Capsules
##**********************************************************************
-build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+if [ $Arch == "X64" ]; then
+ echo "Invoking EDK2 build for capsules..."
+ echo build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+ build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
+fi
echo
echo -------------------- The EDKII BIOS build has successfully completed. --------------------
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64
2019-07-10 19:05 ` [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64 Michael D Kinney
@ 2019-07-11 4:55 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:55 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules
> for X64
>
> Only build capsules for X64 builds. More changes are required to build IA32
> capsules.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 6 +++++-
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 6 +++++-
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index c39b8ccd62..99c1068663 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -277,7 +277,11 @@ if %ERRORLEVEL% NEQ 0 goto BldFail ::echo FD
> successfully updated with default Hii values.
>
> @REM build capsule here
> -call build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +if "%Arch%"=="X64" (
> + echo Invoking EDK2 build for capsules...
> + echo build -t %TOOL_CHAIN_TAG% -p
> +%PLATFORM_PACKAGE%\PlatformCapsule.dsc
> + call build -t %TOOL_CHAIN_TAG% -p
> +%PLATFORM_PACKAGE%\PlatformCapsule.dsc
> +)
>
> goto Exit
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index d32beb6a45..0d1ea60ac6 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -224,7 +224,11 @@ cp -f $BUILD_PATH/FV/VLV.fd
> $BUILD_PATH/FV/Vlv.ROM
>
> ##********************************************************
> **************
> ## Build Capsules
>
> ##********************************************************
> **************
> -build -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> +if [ $Arch == "X64" ]; then
> + echo "Invoking EDK2 build for capsules..."
> + echo build -t $TOOL_CHAIN_TAG -p
> +$PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> + build -t $TOOL_CHAIN_TAG -p
> $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
> +fi
>
> echo
> echo -------------------- The EDKII BIOS build has successfully completed. ------
> --------------
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (26 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 27/28] Vlv2TbltDevicePkg: Only build capsules for X64 Michael D Kinney
@ 2019-07-10 19:05 ` Michael D Kinney
2019-07-11 4:55 ` Sun, Zailiang
2019-07-12 2:38 ` [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Sun, Zailiang
2019-07-13 0:18 ` [edk2-devel] " Michael D Kinney
29 siblings, 1 reply; 69+ messages in thread
From: Michael D Kinney @ 2019-07-10 19:05 UTC (permalink / raw)
To: devel; +Cc: Zailiang Sun, Yi Qian, Gary Lin
Update Readme.md with instructions to clone content from
the edk2, edk2-platforms, and edk2-non-osi repositories
and build Vlv2TbltDevicePkg for Windows and Linux.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 145 ++++++++++-----------
1 file changed, 69 insertions(+), 76 deletions(-)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md b/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
index cbbb465b69..97180ef7af 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
@@ -42,39 +42,27 @@ the MinnowBoard MAX firmware and generates UEFI Capsules that can be used to
update the MinnowBoard MAX firmware and three sample devices.
```
-git clone --recurse-submodules https://github.com/tianocore/edk2.git
+git clone https://github.com/tianocore/edk2.git
+cd edk2
+git submodule update --init
+cd ..
+git clone https://github.com/tianocore/edk2-platforms.git
+git clone https://github.com/tianocore/edk2-non-osi.git
powershell "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri "https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip -OutFile openssl-1.0.2r-x64_86-win64.zip"}"
powershell Expand-Archive openssl-1.0.2r-x64_86-win64.zip
-powershell "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri "https://firmware.intel.com/sites/default/files/MinnowBoardMax-Development190216.zip -OutFile MinnowBoardMax-Development190216.zip"}"
-powershell Expand-Archive MinnowBoardMax-Development190216.zip
-sleep 1
-rename MinnowBoardMax-Development190216 Vlv2Binaries
-cd Vlv2Binaries
-powershell Expand-Archive Vlv2SocBinPkg.zip .
-sleep 1
-cd ..
-
powershell "& {[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri "https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-win64.zip -OutFile nasm-2.13.03-win64.zip"}"
powershell Expand-Archive nasm-2.13.03-win64.zip .
-mkdir Conf
-
set WORKSPACE=%CD%
-set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools
-set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\BinWrappers\WindowsLike
-set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries
-path=%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
+set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Silicon\Intel;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-non-osi\Silicon\Intel
+path=%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
set NASM_PREFIX=%WORKSPACE%\nasm-2.13.03\
-cd %WORKSPACE%\edk2
+cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
-call edkSetup.bat Rebuild
-
-cd Vlv2TbltDevicePkg
-
-Build_IFWI.bat /m /y MNW2 Debug
+Build_IFWI.bat /m MNW2 Debug
```
Once all the code and tools are downloaded and installed, only the following
@@ -83,48 +71,50 @@ directory used to install the source and binaries.
```
set WORKSPACE=%CD%
-set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools
-set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\BinWrappers\WindowsLike
-set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries
-path=%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
+set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-platforms\Silicon\Intel;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-non-osi\Silicon\Intel
+path=%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
set NASM_PREFIX=%WORKSPACE%\nasm-2.13.03\
-
-cd %WORKSPACE%\edk2
-
-call edkSetup.bat Rebuild
```
Once the environment is setup, the MinnowBoard MAX firmware and capsules can be
rebuilt using the following commands.
-* Build Debug Image
+* Build X64 Debug Image with report file
```
-cd Vlv2TbltDevicePkg
+cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
Build_IFWI.bat /m /y MNW2 Debug
```
-* Build Release Image
+* Build X64 Release Image with build log
```
-cd Vlv2TbltDevicePkg
-Build_IFWI.bat /m /y MNW2 Release
+cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
+Build_IFWI.bat /m /l MNW2 Release
```
-The generated firmware image is the newest `.bin` file in `edk2/Vlv2TbltDevicePkg/Stitch`.
-The file is in the form `MNW2MAX1.X64.0084.D01.<DATE>.bin`.
+* Build IA32 Debug Image
-The CapsuleApp and generated UEFI Capsules are in `Build/Vlv2TbltDevicePkg/Capsules`
+```
+cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
+Build_IFWI.bat /m /IA32 MNW2 Debug
+```
+
+The generated firmware image is the build output directory below WORKSPACE. For
+exampple, the X64 Debug Image is at:
+
+`Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\FV\Vlv.ROM`
+
+And the IA32 Release image is at:
+
+`Build\Vlv2TbltDevicePkgIA32\RELEASE_VS2015x86\FV\Vlv.ROM`
+
+The X64 CapsuleApp and generated UEFI Capsules are in the directory
+
+`Build\Vlv2TbltDevicePkg\Capsules`
# Linux Pre-requisites
-* The tool GenBiosId has a dependency on libc.so.6. Make sure it is installed.
- Here are a few example installation commands:
-
- sudo dnf install libc.so.6
-
- apt-get install libc:i386
-
# Download and Build MinnowMax using Linux/GCC
Run the script below from an empty directory. The script clones the EDK II
@@ -134,24 +124,18 @@ the MinnowBoard MAX firmware and generates UEFI Capsules that can be used to
update the MinnowBoard MAX firmware and three sample devices.
```
-git clone --recurse-submodules https://github.com/tianocore/edk2.git
-
-mkdir Vlv2Binaries
-cd Vlv2Binaries
-wget https://firmware.intel.com/sites/default/files/MinnowBoardMax-Development190216.zip
-unzip MinnowBoardMax-Development190216.zip
-unzip Vlv2SocBinPkg.zip
-
-cd ..
-mkdir Conf
-
-export WORKSPACE=$PWD/edk2
-export PACKAGES_PATH=$PWD/Vlv2Binaries
-export EDK_TOOLS_PATH=$WORKSPACE/BaseTools
-
+git clone https://github.com/tianocore/edk2.git
cd edk2
-cd Vlv2TbltDevicePkg
-. Build_IFWI.sh MNW2 Debug
+git submodule update --init
+cd ..
+git clone https://github.com/tianocore/edk2-platforms.git
+git clone https://github.com/tianocore/edk2-non-osi.git
+
+export WORKSPACE=$PWD
+
+cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
+
+./Build_IFWI.sh /m MNW2 Debug
```
Once all the code is downloaded and installed, only the following commands are
@@ -160,35 +144,44 @@ install the source and binaries.
```
export WORKSPACE=$PWD/edk2
-export PACKAGES_PATH=$PWD/Vlv2Binaries
-export EDK_TOOLS_PATH=$WORKSPACE/BaseTools
-
-cd edk2
-cd Vlv2TbltDevicePkg
```
Once the environment is setup, the MinnowBoard MAX firmware and capsules can be
rebuilt using the following commands.
+* Build X64 Debug Image with report file
-* Build Debug Image
+```
+cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
+./Build_IFWI.sh /m /y MNW2 Debug
+```
+
+* Build X64 Release Image with build log
```
-cd Vlv2TbltDevicePkg
-./Build_IFWI.sh MNW2 Debug
+cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
+./Build_IFWI.sh /m /l MNW2 Release
```
-* Build Release Image
+* Build IA32 Debug Image
```
-cd Vlv2TbltDevicePkg
-./Build_IFWI.sh MNW2 Release
+cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
+./Build_IFWI.sh /m /IA32 MNW2 Debug
```
-The generated firmware image is the `MNW2MAX_X64_D_0084_01_GCC.bin` file in
-`edk2\Vlv2TbltDevicePkg\Stitch`
+The generated firmware image is the build output directory below WORKSPACE. For
+exampple, the X64 Debug Image is at:
+
+`Build/Vlv2TbltDevicePkg/DEBUG_GCC5/FV/Vlv.ROM`
+
+And the IA32 Release image is at:
+
+`Build/Vlv2TbltDevicePkgIA32/RELEASE_GCC5/FV/Vlv.ROM`
+
+The X64 CapsuleApp and generated UEFI Capsules are in the directory
-The CapsuleApp and generated UEFI Capsules are in `Build\Vlv2TbltDevicePkg\Capsules`
+`Build/Vlv2TbltDevicePkg/Capsules`
# Use DediProg to update FLASH image on a MinnowBoard MAX Target
--
2.21.0.windows.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos
2019-07-10 19:05 ` [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos Michael D Kinney
@ 2019-07-11 4:55 ` Sun, Zailiang
0 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-11 4:55 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>;
> Gary Lin <glin@suse.com>
> Subject: [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update
> Readme.md for multiple repos
>
> Update Readme.md with instructions to clone content from the edk2, edk2-
> platforms, and edk2-non-osi repositories and build Vlv2TbltDevicePkg for
> Windows and Linux.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 145 ++++++++++-----------
> 1 file changed, 69 insertions(+), 76 deletions(-)
>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
> b/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
> index cbbb465b69..97180ef7af 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Readme.md
> @@ -42,39 +42,27 @@ the MinnowBoard MAX firmware and generates UEFI
> Capsules that can be used to update the MinnowBoard MAX firmware and
> three sample devices.
>
> ```
> -git clone --recurse-submodules https://github.com/tianocore/edk2.git
> +git clone https://github.com/tianocore/edk2.git
> +cd edk2
> +git submodule update --init
> +cd ..
> +git clone https://github.com/tianocore/edk2-platforms.git
> +git clone https://github.com/tianocore/edk2-non-osi.git
>
> powershell "& {[Net.ServicePointManager]::SecurityProtocol =
> [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri
> "https://indy.fulgan.com/SSL/openssl-1.0.2r-x64_86-win64.zip -OutFile
> openssl-1.0.2r-x64_86-win64.zip"}"
> powershell Expand-Archive openssl-1.0.2r-x64_86-win64.zip
>
> -powershell "& {[Net.ServicePointManager]::SecurityProtocol =
> [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri
> "https://firmware.intel.com/sites/default/files/MinnowBoardMax-
> Development190216.zip -OutFile MinnowBoardMax-
> Development190216.zip"}"
> -powershell Expand-Archive MinnowBoardMax-Development190216.zip
> -sleep 1
> -rename MinnowBoardMax-Development190216 Vlv2Binaries -cd
> Vlv2Binaries -powershell Expand-Archive Vlv2SocBinPkg.zip .
> -sleep 1
> -cd ..
> -
> powershell "& {[Net.ServicePointManager]::SecurityProtocol =
> [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri
> "https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-
> 2.13.03-win64.zip -OutFile nasm-2.13.03-win64.zip"}"
> powershell Expand-Archive nasm-2.13.03-win64.zip .
>
> -mkdir Conf
> -
> set WORKSPACE=%CD%
> -set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools
> -set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\BinWrappers\WindowsLike
> -set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries
> -path=%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-
> 1.0.2r-x64_86-win64
> +set
> +PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-
> platforms\Silicon\Intel
> +;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-
> non-osi\Sil
> +icon\Intel
> +path=%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
> set NASM_PREFIX=%WORKSPACE%\nasm-2.13.03\
>
> -cd %WORKSPACE%\edk2
> +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
>
> -call edkSetup.bat Rebuild
> -
> -cd Vlv2TbltDevicePkg
> -
> -Build_IFWI.bat /m /y MNW2 Debug
> +Build_IFWI.bat /m MNW2 Debug
> ```
>
> Once all the code and tools are downloaded and installed, only the following
> @@ -83,48 +71,50 @@ directory used to install the source and binaries.
>
> ```
> set WORKSPACE=%CD%
> -set EDK_TOOLS_PATH=%WORKSPACE%\edk2\BaseTools
> -set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\BinWrappers\WindowsLike
> -set PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\Vlv2Binaries
> -path=%path%;%EDK_TOOLS_PATH%\Bin\Win32;%WORKSPACE%\openssl-
> 1.0.2r-x64_86-win64
> +set
> +PACKAGES_PATH=%WORKSPACE%\edk2;%WORKSPACE%\edk2-
> platforms\Silicon\Intel
> +;%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-
> non-osi\Sil
> +icon\Intel
> +path=%path%;%WORKSPACE%\openssl-1.0.2r-x64_86-win64
> set NASM_PREFIX=%WORKSPACE%\nasm-2.13.03\
> -
> -cd %WORKSPACE%\edk2
> -
> -call edkSetup.bat Rebuild
> ```
>
> Once the environment is setup, the MinnowBoard MAX firmware and
> capsules can be rebuilt using the following commands.
>
> -* Build Debug Image
> +* Build X64 Debug Image with report file
>
> ```
> -cd Vlv2TbltDevicePkg
> +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
> Build_IFWI.bat /m /y MNW2 Debug
> ```
>
> -* Build Release Image
> +* Build X64 Release Image with build log
>
> ```
> -cd Vlv2TbltDevicePkg
> -Build_IFWI.bat /m /y MNW2 Release
> +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
> +Build_IFWI.bat /m /l MNW2 Release
> ```
>
> -The generated firmware image is the newest `.bin` file in
> `edk2/Vlv2TbltDevicePkg/Stitch`.
> -The file is in the form `MNW2MAX1.X64.0084.D01.<DATE>.bin`.
> +* Build IA32 Debug Image
>
> -The CapsuleApp and generated UEFI Capsules are in
> `Build/Vlv2TbltDevicePkg/Capsules`
> +```
> +cd edk2-platforms\Platform\Intel\Vlv2TbltDevicePkg
> +Build_IFWI.bat /m /IA32 MNW2 Debug
> +```
> +
> +The generated firmware image is the build output directory below
> +WORKSPACE. For exampple, the X64 Debug Image is at:
> +
> +`Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\FV\Vlv.ROM`
> +
> +And the IA32 Release image is at:
> +
> +`Build\Vlv2TbltDevicePkgIA32\RELEASE_VS2015x86\FV\Vlv.ROM`
> +
> +The X64 CapsuleApp and generated UEFI Capsules are in the directory
> +
> +`Build\Vlv2TbltDevicePkg\Capsules`
>
> # Linux Pre-requisites
>
> -* The tool GenBiosId has a dependency on libc.so.6. Make sure it is installed.
> - Here are a few example installation commands:
> -
> - sudo dnf install libc.so.6
> -
> - apt-get install libc:i386
> -
> # Download and Build MinnowMax using Linux/GCC
>
> Run the script below from an empty directory. The script clones the EDK II
> @@ -134,24 +124,18 @@ the MinnowBoard MAX firmware and generates
> UEFI Capsules that can be used to update the MinnowBoard MAX firmware
> and three sample devices.
>
> ```
> -git clone --recurse-submodules https://github.com/tianocore/edk2.git
> -
> -mkdir Vlv2Binaries
> -cd Vlv2Binaries
> -wget https://firmware.intel.com/sites/default/files/MinnowBoardMax-
> Development190216.zip
> -unzip MinnowBoardMax-Development190216.zip
> -unzip Vlv2SocBinPkg.zip
> -
> -cd ..
> -mkdir Conf
> -
> -export WORKSPACE=$PWD/edk2
> -export PACKAGES_PATH=$PWD/Vlv2Binaries
> -export EDK_TOOLS_PATH=$WORKSPACE/BaseTools
> -
> +git clone https://github.com/tianocore/edk2.git
> cd edk2
> -cd Vlv2TbltDevicePkg
> -. Build_IFWI.sh MNW2 Debug
> +git submodule update --init
> +cd ..
> +git clone https://github.com/tianocore/edk2-platforms.git
> +git clone https://github.com/tianocore/edk2-non-osi.git
> +
> +export WORKSPACE=$PWD
> +
> +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
> +
> +./Build_IFWI.sh /m MNW2 Debug
> ```
>
> Once all the code is downloaded and installed, only the following commands
> are @@ -160,35 +144,44 @@ install the source and binaries.
>
> ```
> export WORKSPACE=$PWD/edk2
> -export PACKAGES_PATH=$PWD/Vlv2Binaries
> -export EDK_TOOLS_PATH=$WORKSPACE/BaseTools
> -
> -cd edk2
> -cd Vlv2TbltDevicePkg
> ```
>
> Once the environment is setup, the MinnowBoard MAX firmware and
> capsules can be rebuilt using the following commands.
>
> +* Build X64 Debug Image with report file
>
> -* Build Debug Image
> +```
> +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
> +./Build_IFWI.sh /m /y MNW2 Debug
> +```
> +
> +* Build X64 Release Image with build log
>
> ```
> -cd Vlv2TbltDevicePkg
> -./Build_IFWI.sh MNW2 Debug
> +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
> +./Build_IFWI.sh /m /l MNW2 Release
> ```
>
> -* Build Release Image
> +* Build IA32 Debug Image
>
> ```
> -cd Vlv2TbltDevicePkg
> -./Build_IFWI.sh MNW2 Release
> +cd edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg
> +./Build_IFWI.sh /m /IA32 MNW2 Debug
> ```
>
> -The generated firmware image is the
> `MNW2MAX_X64_D_0084_01_GCC.bin` file in -
> `edk2\Vlv2TbltDevicePkg\Stitch`
> +The generated firmware image is the build output directory below
> +WORKSPACE. For exampple, the X64 Debug Image is at:
> +
> +`Build/Vlv2TbltDevicePkg/DEBUG_GCC5/FV/Vlv.ROM`
> +
> +And the IA32 Release image is at:
> +
> +`Build/Vlv2TbltDevicePkgIA32/RELEASE_GCC5/FV/Vlv.ROM`
> +
> +The X64 CapsuleApp and generated UEFI Capsules are in the directory
>
> -The CapsuleApp and generated UEFI Capsules are in
> `Build\Vlv2TbltDevicePkg\Capsules`
> +`Build/Vlv2TbltDevicePkg/Capsules`
>
> # Use DediProg to update FLASH image on a MinnowBoard MAX Target
>
> --
> 2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (27 preceding siblings ...)
2019-07-10 19:05 ` [edk2-platforms Patch 28/28] Vlv2TbltDevicePkg: Update Readme.md for multiple repos Michael D Kinney
@ 2019-07-12 2:38 ` Sun, Zailiang
2019-07-13 0:18 ` [edk2-devel] " Michael D Kinney
29 siblings, 0 replies; 69+ messages in thread
From: Sun, Zailiang @ 2019-07-12 2:38 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Qian, Yi, Gary Lin
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>
-----Original Message-----
From: Kinney, Michael D
Sent: Thursday, July 11, 2019 3:05 AM
To: devel@edk2.groups.io
Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>; Gary Lin <glin@suse.com>
Subject: [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues
* Update Readme.md for multiple repos
* Clean up all build scripts and make Linux and Windows support consistent
* Add IA32 GCC build support and only build capsules for X64
* Clean up library mappings, add TlsLib for HTTPS Boot, and add SD/MMC drivers.
* Re-enable BIOS ID feature using new GenBiosId.py tool
* Remove redundant declarations from DEC file and remove unused content
* Add missing header files in [Sources] sections of INF files.
* Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL build error using newer iasl.
* Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe
* Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable and
remove unused local variable.
Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Gary Lin (18):
Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit on error
Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root directory path
Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name
Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version detection
Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely
Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms
Vlv2TbltDevicePkg: Add the missing headers to inf files
Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely
Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to
PlatformCapsuleGcc.dsc
Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused variable
Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from InstallAcpiTable
Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation
Vlv2TbltDevicePkg: Import SD/MMC drivers
Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE env variable
Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
Vlv2TbltDevicePkg: Reorganize the libraries
Michael D Kinney (10):
Vlv2TbltDevicePkg: Update Linux build scripts
Vlvt2TbltDevicePkg: Fix NULL pointer access in SmbiosMiscDxe
Vlv2DeviceRefCodePkg: Remove redundant gEfiSpiProtocolGuid
Vlv2TbltDevicePkg: Remove redundant gEfiSpiProtocolGuid
Vlv2TbltDevicePkg: Re-enable BIOS ID feature
Vlv2TbltDevicePkg: Add GCC IA32 build support
Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error
Vlv2TbltDevicePkg: Clean up all build scripts
Vlv2TbltDevicePkg: Only build capsules for X64
Vlv2TbltDevicePkg: Update Readme.md for multiple repos
Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
.../AcpiPlatform/AcpiPlatform.c | 5 +-
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 +---
.../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 76 ++--
.../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +-
.../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +-
.../GenCapsuleMinnowMaxRelease.sh | 19 +-
.../Include/Guid/PlatformCpuInfo.h | 16 +-
.../Include/Library/BiosIdLib.h | 86 -----
.../Include/Library/CpuIA32.h | 345 ------------------
.../Include/PlatformDefinitions.h | 43 ---
.../Library/BiosIdLib/BiosIdLib.c | 98 -----
.../Library/BiosIdLib/BiosIdLib.inf | 33 --
.../Library/CpuIA32Lib/CpuIA32Lib.inf | 41 ---
.../Library/CpuIA32Lib/EfiCpuVersion.c | 70 ----
.../Library/CpuIA32Lib/IA32/CpuIA32.S | 223 -----------
.../Library/CpuIA32Lib/IA32/CpuIA32.asm | 206 -----------
.../Library/CpuIA32Lib/IA32/CpuIA32.c | 177 ---------
.../Library/CpuIA32Lib/X64/Cpu.S | 207 -----------
.../Library/CpuIA32Lib/X64/Cpu.asm | 222 -----------
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 2 +-
.../Library/PchSmmLib/PchSmmLib.inf | 8 +-
.../MonoStatusCode/MonoStatusCode.inf | 2 +-
.../PlatformDxe/PlatformDxe.inf | 5 +-
.../PlatformInitPei/MemoryCallback.c | 11 +-
.../PlatformInitPei/PlatformEarlyInit.h | 4 +-
.../PlatformInitPei/PlatformInitPei.inf | 1 -
.../PlatformPei/PlatformPei.inf | 1 -
.../Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 1 -
.../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +
.../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
.../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +
...formPkgIA32.dsc => PlatformPkgGccIA32.dsc} | 122 ++-----
.../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 112 ++----
.../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 109 ++----
.../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 113 ++----
.../PlatformSetupDxe/PlatformSetupDxe.h | 1 -
.../PlatformSetupDxe/PlatformSetupDxe.inf | 5 +-
.../PlatformSetupDxe/SetupInfoRecords.c | 42 ++-
.../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 12 +-
.../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 1 +
Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 145 ++++----
.../MiscBaseBoardManufacturerFunction.c | 14 +-
.../SmBiosMiscDxe/MiscBiosVendorFunction.c | 49 +--
.../SmBiosMiscDxe/MiscOemType0x90Function.c | 37 +-
.../SmBiosMiscDxe/MiscOemType0x94Function.c | 10 +-
.../MiscProcessorInformationFunction.c | 3 +-
.../MiscSystemManufacturerFunction.c | 65 ++--
.../SmBiosMiscDxe/SmBiosMiscDxe.inf | 9 +-
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 151 ++++----
Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 251 +++++++------
Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 ----
.../AcpiTablesPCAT/IgdOGBDA.ASL | 14 +-
.../AcpiTablesPCAT/IgdOpRn.ASL | 18 +-
.../Vlv2DeviceRefCodePkg.dec | 1 -
55 files changed, 670 insertions(+), 2749 deletions(-) delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/.gitignore
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.sh
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA32Lib.inf
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCpuVersion.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.S
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.asm
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/CpuIA32.c
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.S
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/Cpu.asm
copy Platform/Intel/Vlv2TbltDevicePkg/{PlatformPkgIA32.dsc => PlatformPkgGccIA32.dsc} (91%) mode change 100644 => 100755 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
--
2.21.0.windows.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* Re: [edk2-devel] [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues
2019-07-10 19:04 [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Michael D Kinney
` (28 preceding siblings ...)
2019-07-12 2:38 ` [edk2-platforms Patch 00/28] Vlv2TbltDevicePkg: Fix Linux build issues Sun, Zailiang
@ 2019-07-13 0:18 ` Michael D Kinney
29 siblings, 0 replies; 69+ messages in thread
From: Michael D Kinney @ 2019-07-13 0:18 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D, Kinney, Michael D
Cc: Sun, Zailiang, Qian, Yi, Gary Lin
For all patches in this series authored by Gary Lin
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Mike
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io]
> On Behalf Of Michael D Kinney
> Sent: Wednesday, July 10, 2019 12:05 PM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi
> <yi.qian@intel.com>; Gary Lin <glin@suse.com>
> Subject: [edk2-devel] [edk2-platforms Patch 00/28]
> Vlv2TbltDevicePkg: Fix Linux build issues
>
> * Update Readme.md for multiple repos
> * Clean up all build scripts and make Linux and Windows
> support consistent
> * Add IA32 GCC build support and only build capsules for
> X64
> * Clean up library mappings, add TlsLib for HTTPS Boot,
> and add SD/MMC drivers.
> * Re-enable BIOS ID feature using new GenBiosId.py tool
> * Remove redundant declarations from DEC file and remove
> unused content
> * Add missing header files in [Sources] sections of INF
> files.
> * Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL build
> error using newer iasl.
> * Vlvt2TbltDevicePkg: Fix NULL pointer access in
> SmbiosMiscDxe
> * Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from
> InstallAcpiTable and
> remove unused local variable.
>
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Signed-off-by: Michael D Kinney
> <michael.d.kinney@intel.com>
> Signed-off-by: Gary Lin <glin@suse.com>
>
> Gary Lin (18):
> Vlv2TbltDevicePkg/Build_IFWI.sh: Add "set -e" to exit
> on error
> Vlv2TbltDevicePkg/Build_IFWI.sh: Change the root
> directory path
> Vlv2TbltDevicePkg/bld_vlv.sh: Fix the log name
> Vlv2TbltDevicePkg/bld_vlv.sh: Update the gcc version
> detection
> Vlv2TbltDevicePkg/bld_vlv.sh: Remove ECP completely
> Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit
> edk2-platforms
> Vlv2TbltDevicePkg: Add the missing headers to inf files
> Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env
> completely
> Vlv2TbltDevicePkg/bld_vlv.sh: Correct the path to
> PlatformCapsuleGcc.dsc
> Vlv2TbltDevicePkg/bld_vlv.sh: Create Vlv.ROM
> Vlv2TbltDevicePkg/GenerateCapsule: Fix the bash scripts
> Vlv2TbltDevicePkg/AcpiPlatform: Remove a unused
> variable
> Vlv2TbltDevicePkg/AcpiPlatform: Fix the error from
> InstallAcpiTable
> Vlv2TbltDevicePkg/SmBiosMiscDxe: Fix the indentation
> Vlv2TbltDevicePkg: Import SD/MMC drivers
> Vlv2TbltDevicePkg/Build_IFWI.sh: Check the WORKSPACE
> env variable
> Vlv2TbltDevicePkg: Import TlsLib for HTTPS Boot
> Vlv2TbltDevicePkg: Reorganize the libraries
>
> Michael D Kinney (10):
> Vlv2TbltDevicePkg: Update Linux build scripts
> Vlvt2TbltDevicePkg: Fix NULL pointer access in
> SmbiosMiscDxe
> Vlv2DeviceRefCodePkg: Remove redundant
> gEfiSpiProtocolGuid
> Vlv2TbltDevicePkg: Remove redundant gEfiSpiProtocolGuid
> Vlv2TbltDevicePkg: Re-enable BIOS ID feature
> Vlv2TbltDevicePkg: Add GCC IA32 build support
> Vlv2DeviceRefCodePlg/AcpiTablesPCAT: Fix ASL error
> Vlv2TbltDevicePkg: Clean up all build scripts
> Vlv2TbltDevicePkg: Only build capsules for X64
> Vlv2TbltDevicePkg: Update Readme.md for multiple repos
>
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore | 5 -
> .../AcpiPlatform/AcpiPlatform.c | 5 +-
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat | 75 +---
> .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh | 76 ++--
> .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 37 +-
> .../GenerateCapsule/GenCapsuleMinnowMax.sh | 24 +-
> .../GenCapsuleMinnowMaxRelease.sh | 19 +-
> .../Include/Guid/PlatformCpuInfo.h | 16 +-
> .../Include/Library/BiosIdLib.h | 86 ----
> -
> .../Include/Library/CpuIA32.h | 345 ----
> --------------
> .../Include/PlatformDefinitions.h | 43 ---
> .../Library/BiosIdLib/BiosIdLib.c | 98 ----
> -
> .../Library/BiosIdLib/BiosIdLib.inf | 33 --
> .../Library/CpuIA32Lib/CpuIA32Lib.inf | 41 ---
> .../Library/CpuIA32Lib/EfiCpuVersion.c | 70 ----
> .../Library/CpuIA32Lib/IA32/CpuIA32.S | 223 ----
> -------
> .../Library/CpuIA32Lib/IA32/CpuIA32.asm | 206 ----
> -------
> .../Library/CpuIA32Lib/IA32/CpuIA32.c | 177 ----
> -----
> .../Library/CpuIA32Lib/X64/Cpu.S | 207 ----
> -------
> .../Library/CpuIA32Lib/X64/Cpu.asm | 222 ----
> -------
> .../Library/FlashDeviceLib/FlashDeviceLib.inf | 2 +-
> .../Library/PchSmmLib/PchSmmLib.inf | 8 +-
> .../MonoStatusCode/MonoStatusCode.inf | 2 +-
> .../PlatformDxe/PlatformDxe.inf | 5 +-
> .../PlatformInitPei/MemoryCallback.c | 11 +-
> .../PlatformInitPei/PlatformEarlyInit.h | 4 +-
> .../PlatformInitPei/PlatformInitPei.inf | 1 -
> .../PlatformPei/PlatformPei.inf | 1 -
> .../Intel/Vlv2TbltDevicePkg/PlatformPkg.dec | 1 -
> .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +
> .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 2 -
> .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +
> ...formPkgIA32.dsc => PlatformPkgGccIA32.dsc} | 122 ++--
> ---
> .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 112 ++--
> --
> .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 109 ++--
> --
> .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 113 ++--
> --
> .../PlatformSetupDxe/PlatformSetupDxe.h | 1 -
> .../PlatformSetupDxe/PlatformSetupDxe.inf | 5 +-
> .../PlatformSetupDxe/SetupInfoRecords.c | 42 ++-
> .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.c | 12 +-
> .../Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 1 +
> Platform/Intel/Vlv2TbltDevicePkg/Readme.md | 145
> ++++----
> .../MiscBaseBoardManufacturerFunction.c | 14 +-
> .../SmBiosMiscDxe/MiscBiosVendorFunction.c | 49 +--
> .../SmBiosMiscDxe/MiscOemType0x90Function.c | 37 +-
> .../SmBiosMiscDxe/MiscOemType0x94Function.c | 10 +-
> .../MiscProcessorInformationFunction.c | 3 +-
> .../MiscSystemManufacturerFunction.c | 65 ++--
> .../SmBiosMiscDxe/SmBiosMiscDxe.inf | 9 +-
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat | 151
> ++++----
> Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 251
> +++++++------
> Platform/Intel/Vlv2TbltDevicePkg/cln.sh | 62 ----
> .../AcpiTablesPCAT/IgdOGBDA.ASL | 14 +-
> .../AcpiTablesPCAT/IgdOpRn.ASL | 18 +-
> .../Vlv2DeviceRefCodePkg.dec | 1 -
> 55 files changed, 670 insertions(+), 2749 deletions(-)
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> mode change 100644 => 100755
> Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> mode change 100644 => 100755
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Generate
> Capsule/GenCapsuleAll.sh
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLi
> b.h
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/Library/CpuIA32.
> h
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefiniti
> ons.h
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosId
> Lib.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosId
> Lib.inf
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/CpuIA
> 32Lib.inf
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/EfiCp
> uVersion.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/
> CpuIA32.S
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/
> CpuIA32.asm
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/IA32/
> CpuIA32.c
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/C
> pu.S
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Library/CpuIA32Lib/X64/C
> pu.asm
> copy
> Platform/Intel/Vlv2TbltDevicePkg/{PlatformPkgIA32.dsc =>
> PlatformPkgGccIA32.dsc} (91%) mode change 100644 =>
> 100755 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/cln.sh
>
> --
> 2.21.0.windows.1
>
>
>
^ permalink raw reply [flat|nested] 69+ messages in thread