[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS Version
Change BIOS Minor Version Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 3a90693..fc9d10e 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D VERSION_MAJOR = 0068 -VERSION_MINOR = 02 +VERSION_MINOR = 03 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Binaries reorganize.
Change binaries from Common folder to Board folder. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BuildBxtBios.sh| 56 +++--- .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 36 +++--- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh index 74aa782..4ea22bb 100755 --- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh @@ -331,52 +331,52 @@ cp -f $BUILD_PATH/FV/FVIBBL.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Too if [ $BoardId == "BG" ]; then if [ $FabId == "B" ]; then -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch else -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch fi fi if [ $BoardId == "MN" ]; then if [ $FabId == "B" ]; then -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch +cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/GCC/NvStorage.Fv $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch else -cp -f $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_A/SpiChunk1.bin $WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch -cp -f $WORKSPACE/Pl
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script.
Add build script for E0 stepping LeafHill FAB D CRB board.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
BuildBIOS.bat | 4 ++-
BuildBIOS.sh | 12 -
Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 20 +++
Platform/BroxtonPlatformPkg/BuildBxtBios.sh| 29 +-
Platform/BroxtonPlatformPkg/BuildIFWI.bat | 13 ++
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 10
.../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 7 ++
.../Common/Tools/Stitch/IFWIStitch_Simple.bat | 11
.../BroxtonSiPkg/Include/Library/SteppingLib.h | 3 ++-
.../BroxtonSiPkg/Library/SteppingLib/SteppingLib.c | 6 -
10 files changed, 110 insertions(+), 5 deletions(-)
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 051c0a9..96c34f9 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -54,11 +54,13 @@ echo/m Set the build thread count to number of
processors
echo/vs13 Set Compiler to vs2013 build (default: vs2013)
echo/x64 Set Arch to X64 (default: X64)
echo/IA32 Set Arch to IA32 (default: X64)
-echo/A Set FabId to A (default: FAB_B)
+echo/A Set FabId to A
echo/B Set FabId to B (default: FAB_B)
+echo/D Set FabId to D
echo/MNMinnowBoard 3(default: MN)
echo/MXMinnowBoard 3 Module
echo/BGBenson Glacier Board
+echo/LHLeafHill CRB Board
echoPlatformName: Broxton
echoBuildTargets: Release, Debug
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index b8d21d7..91d6bd6 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -21,8 +21,10 @@ function Usage () {
echo " Build_Flags: /MNMinnowBoard3 (default: MN)"
echo " Build_Flags: /BGBenson Glacier Board"
echo " Build_Flags: /MXMinnowBoard3 Module"
- echo " Build_Flags: /A Set FabId to A (default:
FAB_B)"
+ echo " Build_Flags: /LHLeafHill CRB Board"
+ echo " Build_Flags: /A Set FabId to A "
echo " Build_Flags: /B Set FabId to B (default:
FAB_B)"
+ echo " Build_Flags: /D Set FabId to D "
echo " PlatformName [optional]: Broxton "
echo " Target_Flag: Release, Debug "
echo
@@ -64,6 +66,14 @@ for (( i=1; i<=$#; ))
BoardId=MX
Build_Flags="$Build_Flags /MX"
shift
+elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/LH" ]; then
+ BoardId=LH
+ Build_Flags="$Build_Flags /LH"
+ shift
+elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/D" ]; then
+ FabId=D
+ Build_Flags="$Build_Flags /D"
+ shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
FabId=B
Build_Flags="$Build_Flags /B"
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index 994bb3a..5aa545e 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -165,6 +165,12 @@ if /i "%~1"=="/B" (
shift
goto OptLoop
)
+if /i "%~1"=="/D" (
+set FabId=D
+echo.
+shift
+goto OptLoop
+)
if /i "%~1"=="/MN" (
set BoardId=MN
echo.
@@ -183,6 +189,12 @@ if /i "%~1"=="/MX" (
shift
goto OptLoop
)
+if /i "%~1"=="/LH" (
+set BoardId=LH
+echo.
+shift
+goto OptLoop
+)
if /i "%~1"=="/m" (
if defined NUMBER_OF_PROCESSORS (
set /a build_threads=%NUMBER_OF_PROCESSORS%
@@ -209,6 +221,8 @@ if /i "%~1" == "%Minnow_RVP%" (
set BOARD_ID=BENSONV
) else if %BoardId%==MX (
set BOARD_ID=M3MODUL
+ ) else if %BoardId%==LH (
+set BOARD_ID=LEAFHIL
)
set ENBDT_PF_BUILD=TRUE
set PLATFORM_NAME=BroxtonPlatformPkg
@@ -285,6 +299,12 @@ if %BoardId%==MX (
)
)
+if %BoardId%==LH (
+ if %FabId%==D (
+echo BOARD_REV = D >> Conf\BiosId.env
+ )
+)
+
:: Set the Build_Type, Version_Major, and Version_Minor environment variables
find /v "#" Conf\BiosId.env > ver_strings
for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index ef261e6..74aa782 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS Version
Change BIOS Minor Version Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 14ffbb0..3a90693 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D VERSION_MAJOR = 0068 -VERSION_MINOR = 01 +VERSION_MINOR = 02 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Board Name.
Change board name on Minnowboard 3 and Minnowboard 3 Module.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
BuildBIOS.bat | 2 +-
BuildBIOS.sh| 2 +-
.../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c | 6 +++---
.../Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c | 4 ++--
Platform/BroxtonPlatformPkg/BuildBxtBios.bat| 2 +-
Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 4 ++--
.../BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat| 2 ++
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 2cec70f..051c0a9 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -57,7 +57,7 @@ echo/IA32 Set Arch to IA32 (default: X64)
echo/A Set FabId to A (default: FAB_B)
echo/B Set FabId to B (default: FAB_B)
echo/MNMinnowBoard 3(default: MN)
-echo/MXMinnowBoard 3 Next
+echo/MXMinnowBoard 3 Module
echo/BGBenson Glacier Board
echoPlatformName: Broxton
echoBuildTargets: Release, Debug
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index d679d2e..b8d21d7 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -20,7 +20,7 @@ function Usage () {
echo
echo " Build_Flags: /MNMinnowBoard3 (default: MN)"
echo " Build_Flags: /BGBenson Glacier Board"
- echo " Build_Flags: /MXMinnowBoard3 Next"
+ echo " Build_Flags: /MXMinnowBoard3 Module"
echo " Build_Flags: /A Set FabId to A (default:
FAB_B)"
echo " Build_Flags: /B Set FabId to B (default:
FAB_B)"
echo " PlatformName [optional]: Broxton "
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
index 94c94a6..66962a8 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
@@ -2,7 +2,7 @@
Board specific functions in DXE phase to be set as dynamic PCD and consumed
by
commmon platform code.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -26,9 +26,9 @@ Mb3GetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard V3\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard 3\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard V3 ");
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 ");
if (BoardId != (UINT8) BOARD_ID_MINNOW) {
return NULL;
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
index a1c2c39..71deb43 100644
---
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
+++
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/BoardInitDxe/BoardInitDxe.c
@@ -26,9 +26,9 @@ Mb3NGetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Minnow Board v3 Next\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard 3 Module\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Minnow Board v3 Next
(0x%02X)", BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard 3 Module ");
if (BoardId != (UINT8) BOARD_ID_MINNOW_NEXT) {
return NULL;
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
index ede285e..994bb3a 100644
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.bat
@@ -208,7 +208,7 @@ if /i "%~1" == "%Minnow_RVP%" (
) else if %BoardId%==BG (
set BOARD_ID=BENSONV
) else if %BoardId%==MX (
-set BOARD_ID=MINNEXT
+set BOARD_ID=M3MODUL
)
set ENBDT_PF_BUILD=TRUE
set PLATFORM_NAME=BroxtonPlatformPkg
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index cf02ceb..ef261e6 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -136,8 +136,8 @@ if [ $BoardId == &
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS Version.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 656f130..14ffbb0 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -30,6 +30,6 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D -VERSION_MAJOR = 0067 -VERSION_MINOR = 06 +VERSION_MAJOR = 0068 +VERSION_MINOR = 01 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Set Speed.
Add a temporary platform workaround to downgrade eMMC host from HS400 to HS200 on MinnowBoard 3 FAB B and MinnowBoard 3 Next Pre-production board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../BensonGlacier/BoardInitPostMem/BoardInit.c | 9 -- .../BoardInitPostMem/BoardInitPostMem.inf | 1 + .../Board/LeafHill/BoardInitPostMem/BoardInit.c| 28 + .../LeafHill/BoardInitPostMem/BoardInitPostMem.inf | 1 + .../MinnowBoard3/BoardInitPostMem/BoardInit.c | 35 ++ .../MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 + .../BoardInitPostMem/BoardInitPostMem.inf | 1 + .../MinnowBoard3Next/BoardInitPostMem/BoardInit.c | 35 ++ .../BoardInitPostMem/BoardInitMiscs.h | 7 + .../BoardInitPostMem/BoardInitPostMem.inf | 1 + .../PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf| 1 + .../PeiFspPolicyInitLib/PeiFspScPolicyInitLib.c| 3 +- .../PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf | 1 + .../Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c | 2 +- Platform/BroxtonPlatformPkg/PlatformPkg.dec| 2 ++ 15 files changed, 130 insertions(+), 4 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c index 28fc529..74245de 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c @@ -58,13 +58,13 @@ BensonGlacierPostMemInitCallback ( VariableSize = sizeof (SYSTEM_CONFIGURATION); ZeroMem (, sizeof (SYSTEM_CONFIGURATION)); - (*PeiServices)->LocatePpi ( + (*PeiServices)->LocatePpi ( (CONST EFI_PEI_SERVICES **)PeiServices, , 0, NULL, (VOID **) - ); +); VariableServices->GetVariable ( VariableServices, @@ -129,6 +129,11 @@ BensonGlacierPostMemInitCallback ( // MaxPkgCState = MAX_PKG_CSTATE_C2; PcdSet8 (PcdMaxPkgCState, (UINT8) MaxPkgCState); + + // + // Set PcdeMMCHostMaxSpeed + // + PcdSet8 (PcdeMMCHostMaxSpeed, (UINT8) (SystemConfiguration.ScceMMCHostMaxSpeed)); // // Add init steps here diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf index e15e612..0f1d555 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf @@ -66,6 +66,7 @@ gPlatformModuleTokenSpaceGuid.PcdSueCreek gPlatformModuleTokenSpaceGuid.PcdMaxPkgCState gPlatformModuleTokenSpaceGuid.PcdTi3100AudioCodecEnable + gPlatformModuleTokenSpaceGuid.PcdeMMCHostMaxSpeed [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c index 8051b00..4bd93d1 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c @@ -59,6 +59,29 @@ LeafHillPostMemInitCallback ( UINT8ResetType; UINTNBufferSize; UINT8MaxPkgCState; + UINTNVariableSize; + EFI_PEI_READ_ONLY_VARIABLE2_PPI *VariableServices; + SYSTEM_CONFIGURATION SystemConfiguration; + + VariableSize = sizeof (SYSTEM_CONFIGURATION); + ZeroMem (, sizeof (SYSTEM_CONFIGURATION)); + + (*PeiServices)->LocatePpi ( +(CONST EFI_PEI_SERVICES **)PeiServices, +, +0, +NULL, +(VOID **) +); + + VariableServices->GetVariable ( + VariableServices, + PLATFORM_SETUP_VARIABLE_NAME, + , + NULL, + , + + ); Status = PeiServicesLocatePpi ( , @@ -106,6 +129,11 @@ LeafHillPostMemInitCallback ( // MaxPkgCState = MAX_PKG_CSTATE_C2; PcdSet8 (PcdMaxPkgCState, (UINT8) MaxPkgCState); + + // + // Set PcdeMMCHostMaxSpeed + // + PcdSet8 (PcdeMMCHostMaxSpeed, (UINT8) (SystemConfiguration.ScceMMCHostMaxSpeed)); // // Add init steps here diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf index 52
[edk2] [Patch][edk2-platforms] Toolchain
Add toolchain for VS2015 build.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../PlatformSetupDxe/SetupInfoRecords.c| 30 +++
.../SmBiosMiscDxe/MiscProcessorCacheFunction.c | 8 ++--
.../VlvPlatformInitDxe/VlvPlatformInit.c | 4 +-
Vlv2TbltDevicePkg/bld_vlv.bat | 45 +-
4 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
index 8979b41..6a17643 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SetupInfoRecords.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
@@ -1186,7 +1186,7 @@ UpdatePlatformInformation (
EFI_STATUS Status;
UINT8CpuFlavor=0;
EFI_PEI_HOB_POINTERS GuidHob;
- EFI_PLATFORM_INFO_HOB*mPlatformInfo=NULL;
+ EFI_PLATFORM_INFO_HOB*PlatformInfo=NULL;
UINTNNumHandles;
EFI_HANDLE*HandleBuffer;
UINTN Index;
@@ -1205,7 +1205,7 @@ UpdatePlatformInformation (
GuidHob.Raw = GetHobList ();
if (GuidHob.Raw != NULL) {
if ((GuidHob.Raw = GetNextGuidHob (, GuidHob.Raw)) !=
NULL) {
- mPlatformInfo = GET_GUID_HOB_DATA (GuidHob.Guid);
+ PlatformInfo = GET_GUID_HOB_DATA (GuidHob.Guid);
}
}
@@ -1274,41 +1274,41 @@ UpdatePlatformInformation (
}
HiiSetString(mHiiHandle,STRING_TOKEN(STR_CPU_FLAVOR_VALUE), Buffer, NULL);
- if ( NULL != mPlatformInfo) {
+ if ( NULL != PlatformInfo) {
//
//BoardId
//
-switch(mPlatformInfo->BoardId){
+switch(PlatformInfo->BoardId){
case 0x2:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE RVP(%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE RVP(%02x)",
PlatformInfo->BoardId);
break;
case 0x4:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE FFRD(%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE FFRD(%02x)",
PlatformInfo->BoardId);
break;
case 0x5:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY ROCK RVP DDR3L (%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY ROCK RVP DDR3L (%02x)",
PlatformInfo->BoardId);
break;
case 0x20:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAYLEY BAY (%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAYLEY BAY (%02x)",
PlatformInfo->BoardId);
break;
case 0x30:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAKER SPORT (%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAKER SPORT (%02x)",
PlatformInfo->BoardId);
break;
case 0x0:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"ALPINE VALLEY (%x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"ALPINE VALLEY (%x)",
PlatformInfo->BoardId);
break;
case 0x3:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE FFD8 (%x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"BAY LAKE FFD8 (%x)",
PlatformInfo->BoardId);
break;
default:
-UnicodeSPrint (Buffer, sizeof (Buffer), L"Unknown BOARD (%02x)",
mPlatformInfo->BoardId);
+UnicodeSPrint (Buffer, sizeof (Buffer), L"Unknown BOARD (%02x)",
PlatformInfo->BoardId);
break;
}
HiiSetString(mHiiHandle,STRING_TOKEN(STR_BOARD_ID_VALUE), Buffer, NULL);
@@ -1318,11 +1318,11 @@ UpdatePlatformInformation (
// Get Board FAB ID Info from protocol, update into the NVS area.
// bit0~bit3 are for Fab ID, 0x0F means unknow FAB.
//
-if(mPlatformInfo->BoardRev == 0x0F) {
+if(PlatformInfo->BoardRev == 0x0F) {
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", L"Unknown FAB");
HiiSetString(mHiiHandle,STRING_TOKEN(STR_FAB_ID_VALUE), Buffer, NULL);
} else {
- UnicodeSPrint (Buffer, sizeof (Buffer), L"%2x", mPlatformInfo->BoardRev);
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%2x", PlatformInfo-
[edk2] [Patch][edk2-platforms] Minor BIOS ID.
Update Minor version of BIOS ID. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 851c2d3..656f130 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D VERSION_MAJOR = 0067 -VERSION_MINOR = 05 +VERSION_MINOR = 06 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Minor BIOS ID.
Update Minor version of BIOS ID. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index d32d1d0..97510e5 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D VERSION_MAJOR = 0067 -VERSION_MINOR = 02 +VERSION_MINOR = 03 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Add I2C table.
Add I2C table for on-board WM8731 I2S audio.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../PlatformSsdt/Audio/AudioCodec_INT343A.asl | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
index a1756ec..b11793b 100644
---
a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
+++
b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
@@ -1,5 +1,5 @@
/** @file
- Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -14,13 +14,10 @@
External(\IOBF, IntObj) // ScHdAudioIoBufferOwnership
External(\IS3A, IntObj)
-Scope(\_SB.PCI0.I2C0) {
+ Scope(\_SB.PCI0.I2C7) {
//---
// HD Audio I2S Codec device
- // ALC 298
- // I2C1
- // GPIO_192:SOC_CODEC_PD_NNorth West Community number 5
- // GPIO_116:SOC_CODEC_IRQ North West Community, direct IRQ, IRQ number
0x5B.
+ // I2C7
//---
Device (HDAC)
{
@@ -35,14 +32,10 @@ Scope(\_SB.PCI0.I2C0) {
Method (_CRS, 0, Serialized) {
Name (SBFB, ResourceTemplate () {
-I2cSerialBus (0x1C, ControllerInitiated, 40, AddressingMode7Bit,
"\\_SB.PCI0.I2C0",,,)
+I2cSerialBus (0x1A, ControllerInitiated, 40, AddressingMode7Bit,
"\\_SB.PCI0.I2C7",0x00, ResourceConsumer,,)
})
- Name (SBFI, ResourceTemplate () {
-Interrupt (ResourceConsumer, Level, ActiveLow, ExclusiveAndWake,,,)
{0x5B}
- })
-
- Return (ConcatenateResTemplate(SBFB, SBFI))
+ Return (SBFB)
}
Method (_STA, 0, NotSerialized)
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Enable audio.
Enable on-board audio.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../PlatformSsdt/Audio/AudioCodec_INT343A.asl | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
index a1756ec..b11793b 100644
---
a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
+++
b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/PlatformSsdt/Audio/AudioCodec_INT343A.asl
@@ -1,5 +1,5 @@
/** @file
- Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -14,13 +14,10 @@
External(\IOBF, IntObj) // ScHdAudioIoBufferOwnership
External(\IS3A, IntObj)
-Scope(\_SB.PCI0.I2C0) {
+ Scope(\_SB.PCI0.I2C7) {
//---
// HD Audio I2S Codec device
- // ALC 298
- // I2C1
- // GPIO_192:SOC_CODEC_PD_NNorth West Community number 5
- // GPIO_116:SOC_CODEC_IRQ North West Community, direct IRQ, IRQ number
0x5B.
+ // I2C7
//---
Device (HDAC)
{
@@ -35,14 +32,10 @@ Scope(\_SB.PCI0.I2C0) {
Method (_CRS, 0, Serialized) {
Name (SBFB, ResourceTemplate () {
-I2cSerialBus (0x1C, ControllerInitiated, 40, AddressingMode7Bit,
"\\_SB.PCI0.I2C0",,,)
+I2cSerialBus (0x1A, ControllerInitiated, 40, AddressingMode7Bit,
"\\_SB.PCI0.I2C7",0x00, ResourceConsumer,,)
})
- Name (SBFI, ResourceTemplate () {
-Interrupt (ResourceConsumer, Level, ActiveLow, ExclusiveAndWake,,,)
{0x5B}
- })
-
- Return (ConcatenateResTemplate(SBFB, SBFI))
+ Return (SBFB)
}
Method (_STA, 0, NotSerialized)
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.
Enhance build script.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jarlstrom, Laurie <laurie.jarlst...@intel.com>
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
BuildBIOS.bat| 104 +
BuildBIOS.sh | 28 +-
Platform/BroxtonPlatformPkg/BuildBios.bat| 613 ---
Platform/BroxtonPlatformPkg/BuildBios.sh | 333 ---
Platform/BroxtonPlatformPkg/BuildBxtBios.bat | 612 ++
Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 333 +++
Platform/BroxtonPlatformPkg/BuildIFWI.bat| 12 +-
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 16 +-
8 files changed, 1003 insertions(+), 1048 deletions(-)
delete mode 100644 Platform/BroxtonPlatformPkg/BuildBios.bat
delete mode 100644 Platform/BroxtonPlatformPkg/BuildBios.sh
create mode 100644 Platform/BroxtonPlatformPkg/BuildBxtBios.bat
create mode 100644 Platform/BroxtonPlatformPkg/BuildBxtBios.sh
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index baf7cdd..7b2394f 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -1,18 +1,12 @@
@echo off
echo %date% %time%
echo.
+setlocal EnableDelayedExpansion EnableExtensions
set exitCode=0
-set WORKSPACE=%CD%
-set CORE_PATH=%CD%
set BuildFlags=
-set PlatformName=
-set BuildTarget=Debug
-set Compiler=/vs13
-set Arch=/x64
-set FabId=/B
-set BoardId=/MN
-set buildthread=
+
+set thisscript=%0
:: Optional arguments
:OptLoop
@@ -20,82 +14,15 @@ set buildthread=
if /i "%~1"=="" goto Usage
if /i "%~1"=="/?" goto Usage
-if /i "%~1"=="/IA32" (
-set Arch=/IA32
-shift
-goto OptLoop
-)
-
-if /i "%~1"=="/x64" (
-set Arch=/x64
-shift
-goto OptLoop
-)
-
-if /i "%~1"=="/vs08" (
-set Compiler=/vs08
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/vs10" (
-set Compiler=/vs10
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/vs12" (
-set Compiler=/vs12
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/vs13" (
-set Compiler=/vs13
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/vs15" (
-set Compiler=/vs15
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/A" (
-set FabId=/A
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/B" (
-set FabId=/B
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/MN" (
-set BoardId=/MN
-echo.
-shift
-goto OptLoop
-)
-if /i "%~1"=="/BG" (
-set BoardId=/BG
-echo.
-shift
-goto OptLoop
-)
-
-if /i "%~1"=="/m" (
-set buildthread=/m
-echo.
+set BuildOption=%~1
+if "!BuildOption:~0,1!"=="/" (
+set BuildFlags=%BuildFlags% %BuildOption%
shift
goto OptLoop
)
:: Required argument(s)
-:: Require 2 input parameters
+:: Require 2 input parameters , first parameter without a "/" is Platform Name
if "%~2"=="" goto Usage
:: Assign required arguments
@@ -104,17 +31,26 @@ set BuildTarget=%~2
:OptLoopEnd
echo Call Build Script of Broxton
-echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %buildthread%
%Compiler% %Arch% %BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget%
-call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %buildthread% %Compiler%
%Arch% %BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget%
+
+if not exist Platform\%PlatformName%PlatformPkg\BuildIFWI.bat (
+ echo Platform %PlatformName%PlatformPkg does not exist
+ echo. & echo Error - Unsupported Platform name: %1
+ echo.
+ goto Usage
+)
+
+echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %BuildFlags%
/fspw MINN %BuildTarget%
+call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %BuildFlags% /fspw
MINN %BuildTarget%
goto Exit
:Usage
-echo Usage: BuildBIOS.bat [options] ^<PlatformName^> ^<BuildTarget^>
+echo Usage: %thisscript% [options] ^<PlatformName^> ^<BuildTarget^>
echo.
echo Options:
echo. /?Display this help text
echo.
+echo/m Set the build thread count to number of processors
echo/vs13 Set Compiler to vs2013 build (default: vs2013)
echo/x64 Set Arch to X64 (default: X64)
echo/IA32 Set Arch to IA32 (default: X64)
@@ -126,7 +62,7 @@ echoPlatformName: Broxton
echoBuildTargets: Release, Debug
echo Examples:
-echoBuildBIOS.bat /vs13 /B /x64 Broxton Debug
+echo%thisscript% /vs13 /B /x64 Broxton Debug
set exitCode=1
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index aea8daa..5ea0dd8 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -16,7 +16,7 @@ function Usage () {
echo
echo "Script to
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device
Use Pcd to select blue tooth device. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 1 + .../Acpi/AcpiTablesPCAT/PlatformSsdt/Bluetooth/LBEE5KL1DX.asl | 5 - .../PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi | 2 ++ Platform/BroxtonPlatformPkg/PlatformPkg.dec| 4 +++- 8 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 69b7df9..f329b5f 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( UINT8BoardId; UINT8FabId; UINT8ResetType; + UINT8BtDevice; UINTNBufferSize; Status = PeiServicesLocatePpi ( @@ -92,6 +93,12 @@ MinnowBoard3PostMemInitCallback ( PcdSet8 (PcdResetType, (UINT8) ResetType); // + // Select bluetooth device. + // + BtDevice = SELECT_BLUE_TOOTH_BCM2E40; + PcdSet8 (PcdBtDevice, (UINT8) BtDevice); + + // // Board specific VBT table. // BufferSize = sizeof (EFI_GUID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h index 2c8c7eb..37faf87 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h @@ -23,6 +23,13 @@ // #define RES_MEM32_MIN_LEN 0x3800 +// +// Bluetooth device identifier. +// +#define SELECT_BLUE_TOOTH_DISABLE 0x00 +#define SELECT_BLUE_TOOTH_BCM2E40 0x01 +#define SELECT_BLUE_TOOTH_BCM2EA1 0x02 + #define RES_IO_BASE 0x0D00 #define RES_IO_LIMIT 0x diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index 1392cdd..665a557 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -60,7 +60,8 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek - gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c index f0a77d1..d0c668e 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c @@ -1456,7 +1456,7 @@ AcpiPlatformEntryPoint ( mGlobalNvsArea.Area->Rtd3Support = mSystemConfiguration.Rtd3Support; mGlobalNvsArea.Area->RTD3Config0 = mSystemConfiguration.RTD3ZPODD; mGlobalNvsArea.Area->EnableModernStandby = mSystemConfiguration.ConsolidatedPR; -mGlobalNvsArea.Area->SelectBtDevice = mSystemConfiguration.SelectBtDevice; +mGlobalNvsArea.Area->SelectBtDevice = (UINT8) PcdGet8 (PcdBtDevice); mGlobalNvsArea.Area->ScHdAudioIoBufferOwnership = mSystemConfiguration.ScHdAudioIoBufferOwnership; mGlobalNvsArea.Area->XdciEnable = mSystemConfiguration.ScUsbOtg; mGlobalNvsArea.Area->PciDelayOptimizationEcr = mSystemConfiguration.PciDelayOptimizationEcr; diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf index be047c1..9d451f5 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -87,6 +87,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Depex]
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device
Use Pcd to select blue tooth device. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 1 + .../Acpi/AcpiTablesPCAT/PlatformSsdt/Bluetooth/LBEE5KL1DX.asl | 5 - .../PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi | 2 ++ Platform/BroxtonPlatformPkg/PlatformPkg.dec| 4 +++- 8 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 69b7df9..f329b5f 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( UINT8BoardId; UINT8FabId; UINT8ResetType; + UINT8BtDevice; UINTNBufferSize; Status = PeiServicesLocatePpi ( @@ -92,6 +93,12 @@ MinnowBoard3PostMemInitCallback ( PcdSet8 (PcdResetType, (UINT8) ResetType); // + // Select bluetooth device. + // + BtDevice = SELECT_BLUE_TOOTH_BCM2E40; + PcdSet8 (PcdBtDevice, (UINT8) BtDevice); + + // // Board specific VBT table. // BufferSize = sizeof (EFI_GUID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h index 2c8c7eb..37faf87 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h @@ -23,6 +23,13 @@ // #define RES_MEM32_MIN_LEN 0x3800 +// +// Bluetooth device identifier. +// +#define SELECT_BLUE_TOOTH_DISABLE 0x00 +#define SELECT_BLUE_TOOTH_BCM2E40 0x01 +#define SELECT_BLUE_TOOTH_BCM2EA1 0x02 + #define RES_IO_BASE 0x0D00 #define RES_IO_LIMIT 0x diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index 1392cdd..665a557 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -60,7 +60,8 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek - gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + gPlatformModuleTokenSpaceGuid.PcdLogoDisplay + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c index f0a77d1..d0c668e 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c @@ -1456,7 +1456,7 @@ AcpiPlatformEntryPoint ( mGlobalNvsArea.Area->Rtd3Support = mSystemConfiguration.Rtd3Support; mGlobalNvsArea.Area->RTD3Config0 = mSystemConfiguration.RTD3ZPODD; mGlobalNvsArea.Area->EnableModernStandby = mSystemConfiguration.ConsolidatedPR; -mGlobalNvsArea.Area->SelectBtDevice = mSystemConfiguration.SelectBtDevice; +mGlobalNvsArea.Area->SelectBtDevice = (UINT8) PcdGet8 (PcdBtDevice); mGlobalNvsArea.Area->ScHdAudioIoBufferOwnership = mSystemConfiguration.ScHdAudioIoBufferOwnership; mGlobalNvsArea.Area->XdciEnable = mSystemConfiguration.ScUsbOtg; mGlobalNvsArea.Area->PciDelayOptimizationEcr = mSystemConfiguration.PciDelayOptimizationEcr; diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf index be047c1..9d451f5 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -87,6 +87,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Depex]
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device.
Use Pcd to select blue tooth device. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 1 + .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 1 + .../Acpi/AcpiTablesPCAT/PlatformSsdt/Bluetooth/LBEE5KL1DX.asl | 5 - .../PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi | 2 ++ Platform/BroxtonPlatformPkg/PlatformPkg.dec| 2 ++ 8 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 0aa9246..60a9d5b 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( UINT8BoardId; UINT8FabId; UINT8ResetType; + UINT8BtDevice; UINTNBufferSize; Status = PeiServicesLocatePpi ( @@ -92,6 +93,12 @@ MinnowBoard3PostMemInitCallback ( PcdSet8 (PcdResetType, (UINT8) ResetType); // + // Select bluetooth device. + // + BtDevice = SELECT_BLUE_TOOTH_BCM2E40; + PcdSet8 (PcdBtDevice, (UINT8) BtDevice); + + // // Board specific VBT table. // BufferSize = sizeof (EFI_GUID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h index 2c8c7eb..37faf87 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h @@ -23,6 +23,13 @@ // #define RES_MEM32_MIN_LEN 0x3800 +// +// Bluetooth device identifier. +// +#define SELECT_BLUE_TOOTH_DISABLE 0x00 +#define SELECT_BLUE_TOOTH_BCM2E40 0x01 +#define SELECT_BLUE_TOOTH_BCM2EA1 0x02 + #define RES_IO_BASE 0x0D00 #define RES_IO_LIMIT 0x diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index 8fa5ffa..9b42a9f 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -60,6 +60,7 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c index f0a77d1..d0c668e 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c @@ -1456,7 +1456,7 @@ AcpiPlatformEntryPoint ( mGlobalNvsArea.Area->Rtd3Support = mSystemConfiguration.Rtd3Support; mGlobalNvsArea.Area->RTD3Config0 = mSystemConfiguration.RTD3ZPODD; mGlobalNvsArea.Area->EnableModernStandby = mSystemConfiguration.ConsolidatedPR; -mGlobalNvsArea.Area->SelectBtDevice = mSystemConfiguration.SelectBtDevice; +mGlobalNvsArea.Area->SelectBtDevice = (UINT8) PcdGet8 (PcdBtDevice); mGlobalNvsArea.Area->ScHdAudioIoBufferOwnership = mSystemConfiguration.ScHdAudioIoBufferOwnership; mGlobalNvsArea.Area->XdciEnable = mSystemConfiguration.ScUsbOtg; mGlobalNvsArea.Area->PciDelayOptimizationEcr = mSystemConfiguration.PciDelayOptimizationEcr; diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf index be047c1..9d451f5 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -87,6 +87,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Depex] gEfiAcpiSupportProtocolGuidAND diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTab
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Blue tooth device.
Use Pcd to select blue tooth device. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h | 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 1 + .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 1 + .../PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi | 2 ++ Platform/BroxtonPlatformPkg/PlatformPkg.dec| 2 ++ 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index 0aa9246..60a9d5b 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( UINT8BoardId; UINT8FabId; UINT8ResetType; + UINT8BtDevice; UINTNBufferSize; Status = PeiServicesLocatePpi ( @@ -92,6 +93,12 @@ MinnowBoard3PostMemInitCallback ( PcdSet8 (PcdResetType, (UINT8) ResetType); // + // Select bluetooth device. + // + BtDevice = SELECT_BLUE_TOOTH_BCM2E40; + PcdSet8 (PcdBtDevice, (UINT8) BtDevice); + + // // Board specific VBT table. // BufferSize = sizeof (EFI_GUID); diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h index 2c8c7eb..37faf87 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitMiscs.h @@ -23,6 +23,13 @@ // #define RES_MEM32_MIN_LEN 0x3800 +// +// Bluetooth device identifier. +// +#define SELECT_BLUE_TOOTH_DISABLE 0x00 +#define SELECT_BLUE_TOOTH_BCM2E40 0x01 +#define SELECT_BLUE_TOOTH_BCM2EA1 0x02 + #define RES_IO_BASE 0x0D00 #define RES_IO_LIMIT 0x diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index 8fa5ffa..9b42a9f 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -60,6 +60,7 @@ gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c index f0a77d1..d0c668e 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c @@ -1456,7 +1456,7 @@ AcpiPlatformEntryPoint ( mGlobalNvsArea.Area->Rtd3Support = mSystemConfiguration.Rtd3Support; mGlobalNvsArea.Area->RTD3Config0 = mSystemConfiguration.RTD3ZPODD; mGlobalNvsArea.Area->EnableModernStandby = mSystemConfiguration.ConsolidatedPR; -mGlobalNvsArea.Area->SelectBtDevice = mSystemConfiguration.SelectBtDevice; +mGlobalNvsArea.Area->SelectBtDevice = (UINT8) PcdGet8 (PcdBtDevice); mGlobalNvsArea.Area->ScHdAudioIoBufferOwnership = mSystemConfiguration.ScHdAudioIoBufferOwnership; mGlobalNvsArea.Area->XdciEnable = mSystemConfiguration.ScUsbOtg; mGlobalNvsArea.Area->PciDelayOptimizationEcr = mSystemConfiguration.PciDelayOptimizationEcr; diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf index be047c1..9d451f5 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -87,6 +87,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gPlatformModuleTokenSpaceGuid.PcdResetType gPlatformModuleTokenSpaceGuid.PcdSueCreek + gPlatformModuleTokenSpaceGuid.PcdBtDevice [Depex] gEfiAcpiSupportProtocolGuidAND diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi b/Platform/BroxtonPlatformPkg/Common/Pla
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Minor BIOS ID.
Update Minor version of BIOS ID. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 13b7d3b..cfd7959 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D VERSION_MAJOR = 0066 -VERSION_MINOR = 03 +VERSION_MINOR = 04 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Board Name.
Correct board names according to different boards.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../BensonGlacier/BoardInitDxe/BoardInitDxe.c | 2 +-
.../Board/LeafHill/BoardInitDxe/BoardInitDxe.c | 2 +-
.../Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c | 4 ++--
.../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 27 +++---
.../Smbios/SmBiosMiscDxe/SmBiosMiscDxe.inf | 3 ++-
5 files changed, 30 insertions(+), 8 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
index c5a001e..d49d259 100644
---
a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
+++
b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitDxe/BoardInitDxe.c
@@ -28,7 +28,7 @@ BgGetBoardName (
DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Benson Glacier\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Benson Glacier (%02x)",
BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"Benson Glacier ");
if (BoardId != (UINT8) BOARD_ID_BENSON) {
return NULL;
diff --git
a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
index 5ce6349..dd70065 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitDxe/BoardInitDxe.c
@@ -27,7 +27,7 @@ LhGetBoardName (
STATIC CHAR16 BoardName[40];
DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Leaf Hill\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Leaf Hill CRB (%02x)",
BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"Leaf Hill CRB ");
if (BoardId != (UINT8) BOARD_ID_LFH_CRB) {
return NULL;
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
index 2248f10..94c94a6 100644
--- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
+++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitDxe/BoardInitDxe.c
@@ -26,9 +26,9 @@ Mb3GetBoardName (
{
STATIC CHAR16 BoardName[40];
- DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - Minnow Board v3\n"));
+ DEBUG ((EFI_D_INFO, "BoardInitDxe: GetBoardName - MinnowBoard V3\n"));
- UnicodeSPrint (BoardName, sizeof (BoardName), L"Minnow Board v3 (%02x)",
BoardId);
+ UnicodeSPrint (BoardName, sizeof (BoardName), L"MinnowBoard V3 ");
if (BoardId != (UINT8) BOARD_ID_MINNOW) {
return NULL;
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
index 225f424..bcb0c51 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscSystemManufacturerFunction.c
@@ -2,7 +2,7 @@
This driver parses the mMiscSubclassDataTable structure and reports
any generated data.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -19,7 +19,9 @@
#include "MiscSubclassDriver.h"
#include
#include
-
+#include
+#include
+#include
/**
@@ -59,6 +61,17 @@ AddSmbiosManuCallback (
EFI_SMBIOS_PROTOCOL *Smbios;
CHAR16Buffer[40];
CHAR16PlatformNameBuffer[40];
+ EFI_PEI_HOB_POINTERS GuidHob;
+ GET_BOARD_NAMEGetBoardNameFunc;
+ EFI_PLATFORM_INFO_HOB *PlatformInfo = NULL;
+
+
+ GuidHob.Raw = GetHobList ();
+ if (GuidHob.Raw != NULL) {
+if ((GuidHob.Raw = GetNextGuidHob (, GuidHob.Raw)) !=
NULL) {
+ PlatformInfo = GET_GUID_HOB_DATA (GuidHob.Guid);
+}
+ }
ForType1InputData = (EFI_MISC_SYSTEM_MANUFACTURER *) Context;
@@ -72,7 +85,15 @@ AddSmbiosManuCallback (
Status = gBS->LocateProtocol (, NULL, (VOID **)
);
ASSERT_EFI_ERROR (Status);
- UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer), L"%s",
L"MinnowBoard V3 ");
+ UnicodeSPrint (PlatformNameBuffer, sizeof (PlatformNameBuffer), L"%s",
L"Broxton ");
+
+ //
+ // Update Board Name from PCD
+ //
+ if (PlatformInfo != NULL) {
+GetBoardNameFunc = (GET_BOARD_NAME) (UINTN) PcdGet64 (PcdGetBoardNameFunc);
+UnicodeSPrint
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Change build rule.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformPkg.fdf| 1 + Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 1 + 2 files changed, 2 insertions(+) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index e767cb5..0b55c25 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -1123,6 +1123,7 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048 SMM_DEPEX SMM_DEPEX|.depex PE32 PE32 |.efi RAW BIN Optional|.aml +RAW ASL Optional|.aml UISTRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 5916503..b09b0a5 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -1082,6 +1082,7 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048 SMM_DEPEX SMM_DEPEX|.depex PE32 PE32 |.efi RAW BIN Optional|.aml +RAW ASL Optional|.aml UISTRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Correct Names.
Correct Boot Option Names.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Include/Library/GenericBdsLib.h| 5 ++-
.../Library/GenericBdsLib/BdsBoot.c| 51 +-
.../Library/GenericBdsLib/GenericBdsStrings.uni| 8 +++-
3 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/Core/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
b/Core/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
index c338c4d..fa59235 100644
--- a/Core/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
+++ b/Core/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
@@ -4,7 +4,7 @@
2) BDS boot device connect interface.
3) BDS Misc interfaces for mainting boot variable, ouput string.
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
The full text of the license may be found at
@@ -821,6 +821,9 @@ SetupResetReminder (
#define BDS_EFI_MESSAGE_USB_DEVICE_BOOT 0x0305 // Type 03; Sub-Type 05
#define BDS_EFI_MESSAGE_SATA_BOOT0x0312 // Type 03; Sub-Type 18
#define BDS_EFI_MESSAGE_MAC_BOOT 0x030b // Type 03; Sub-Type 11
+#define BDS_EFI_MESSAGE_NVME_BOOT0x0317 // Type 03; Sub-Type 17
+#define BDS_EFI_MESSAGE_SD_BOOT 0x031a // Type 03; Sub-Type 1a
+#define BDS_EFI_MESSAGE_EMMC_BOOT0x031d // Type 03; Sub-Type 1d
#define BDS_EFI_MESSAGE_MISC_BOOT0x03FF
///
diff --git a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index ce1dd4a..41611cf 100644
--- a/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/Core/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -3123,6 +3123,9 @@ BdsLibEnumerateAllBootOption (
UINT16UsbNumber;
UINT16MiscNumber;
UINT16ScsiNumber;
+ UINT16NvmeNumber;
+ UINT16SdNumber;
+ UINT16EmmcNumber;
UINT16NonBlockNumber;
UINTN NumberBlockIoHandles;
EFI_HANDLE*BlockIoHandles;
@@ -3157,6 +3160,9 @@ BdsLibEnumerateAllBootOption (
UsbNumber = 0;
MiscNumber = 0;
ScsiNumber = 0;
+ NvmeNumber = 0;
+ SdNumber= 0;
+ EmmcNumber = 0;
PlatLang= NULL;
LastLang= NULL;
ZeroMem (Buffer, sizeof (Buffer));
@@ -3299,6 +3305,36 @@ BdsLibEnumerateAllBootOption (
ScsiNumber++;
break;
+ case BDS_EFI_MESSAGE_NVME_BOOT:
+if (NvmeNumber != 0) {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d",
BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_NVME)), NvmeNumber);
+} else {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById
(STRING_TOKEN (STR_DESCRIPTION_NVME)));
+}
+BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList,
Buffer);
+NvmeNumber++;
+break;
+
+ case BDS_EFI_MESSAGE_SD_BOOT:
+if (SdNumber != 0) {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d",
BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_SD)), SdNumber);
+} else {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById
(STRING_TOKEN (STR_DESCRIPTION_SD)));
+}
+BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList,
Buffer);
+SdNumber++;
+break;
+
+ case BDS_EFI_MESSAGE_EMMC_BOOT:
+if (EmmcNumber != 0) {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d",
BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_EMMC)), EmmcNumber);
+} else {
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById
(STRING_TOKEN (STR_DESCRIPTION_EMMC)));
+}
+BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList,
Buffer);
+EmmcNumber++;
+break;
+
case BDS_EFI_MESSAGE_MISC_BOOT:
default:
if (MiscNumber != 0) {
@@ -3927,7 +3963,8 @@ BdsGetBootTypeFromDevicePath (
// Get the last device path node
//
LastDeviceNode = NextDevicePathNode (TempDevicePath);
-if (DevicePathSubType(LastDeviceNode) == MSG_DEVICE_LOGICAL_UNIT_DP) {
+if ((DevicePathSubType(LastDeviceNode) == MSG_DEVICE_LOGICAL_UNIT_DP)
||
+(DevicePathSubType(LastDeviceNode) == HW_CONTROLLER_DP)) {
//
// if the next node type is Device Logical Unit, which specify the
Lo
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script.
Change build script to generate different BIOS ID to differentiate Minnow3 and
Benson Glacier board.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
BuildBIOS.bat | 19 +-
BuildBIOS.sh | 8 ++-
Platform/BroxtonPlatformPkg/BuildBios.bat | 39 ++---
Platform/BroxtonPlatformPkg/BuildBios.sh | 67 +++---
Platform/BroxtonPlatformPkg/BuildIFWI.bat | 20 +--
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 5 ++
.../Common/Tools/Stitch/IFWIStitch_Simple.bat | 40 +
7 files changed, 151 insertions(+), 47 deletions(-)
diff --git a/BuildBIOS.bat b/BuildBIOS.bat
index 3bc68e5..4bb4b03 100644
--- a/BuildBIOS.bat
+++ b/BuildBIOS.bat
@@ -11,6 +11,7 @@ set BuildTarget=Debug
set Compiler=/vs13
set Arch=/x64
set FabId=/B
+set BoardId=/MN
:: Optional arguments
:OptLoop
@@ -72,6 +73,18 @@ if /i "%~1"=="/B" (
shift
goto OptLoop
)
+if /i "%~1"=="/MN" (
+set BoardId=/MN
+echo.
+shift
+goto OptLoop
+)
+if /i "%~1"=="/BG" (
+set BoardId=/BG
+echo.
+shift
+goto OptLoop
+)
:: Required argument(s)
:: Require 2 input parameters
@@ -83,8 +96,8 @@ set BuildTarget=%~2
:OptLoopEnd
echo Call Build Script of Broxton
-echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler%
%Arch% %FabId% /fspw %BuildFlags% MINN %BuildTarget%
-call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch%
%FabId% /fspw %BuildFlags% MINN %BuildTarget%
+echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler%
%Arch% %BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget%
+call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch%
%BoardId% %FabId% /fspw %BuildFlags% MINN %BuildTarget%
goto Exit
@@ -99,6 +112,8 @@ echo/x64 Set Arch to X64 (default: X64)
echo/IA32 Set Arch to IA32 (default: X64)
echo/A Set FabId to A (default: FAB_B)
echo/B Set FabId to B (default: FAB_B)
+echo/MNMinnow3 Board (default: MN)
+echo/BGBenson Glacier Board
echoPlatformName: Broxton
echoBuildTargets: Release, Debug
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index 552cf2d..aea8daa 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -18,6 +18,8 @@ function Usage () {
echo
echo "Usage: BuildBIOS.sh Build_Flags [PlatformName] Target_Flag"
echo
+ echo " Build_Flags: /MNMinnow3 Board (default: MN)"
+ echo " Build_Flags: /BGBenson Glacier Board"
echo " Build_Flags: /A Set FabId to A (default:
FAB_B)"
echo " Build_Flags: /B Set FabId to B (default:
FAB_B)"
echo " PlatformName [optional]: Broxton "
@@ -49,7 +51,11 @@ fi
## Build Flags
for (( i=1; i<=$#; ))
do
-if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
+if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/BG" ]; then
+ BoardId=BG
+ Build_Flags="$Build_Flags /BG"
+ shift
+elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
FabId=B
Build_Flags="$Build_Flags /B"
shift
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat
b/Platform/BroxtonPlatformPkg/BuildBios.bat
index 7aca176..3ac411e 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.bat
+++ b/Platform/BroxtonPlatformPkg/BuildBios.bat
@@ -25,6 +25,7 @@ set exitCode=0
set Arch=X64
set Compiler=VS2013
set FabId=B
+set BoardId=MN
if not defined BiosVersion set BiosVersion=DEV
@@ -165,6 +166,18 @@ if /i "%~1"=="/B" (
shift
goto OptLoop
)
+if /i "%~1"=="/MN" (
+set BoardId=MN
+echo.
+shift
+goto OptLoop
+)
+if /i "%~1"=="/BG" (
+set BoardId=BG
+echo.
+shift
+goto OptLoop
+)
:: Required argument(s)
if "%~2"=="" (
@@ -178,7 +191,11 @@ echo. & echo -- Setting compiler to %Compiler% -- & echo.
:: BOARD_ID needs to be exactly 7 characters (GenBiosId.exe limitation)
echo Setting %1 platform configuration and BIOS ID...
if /i "%~1" == "%Minnow_RVP%" (
-set BOARD_ID=MINNOWV
+ if %BoardId%==MN (
+set BOARD_ID=MINNOW3
+ ) else if %BoardId%==BG (
+set BOARD_ID=BENSONV
+ )
set ENBDT_PF_BUILD=TRUE
set PLATFORM_NAME=BroxtonPlatformPkg
set PLATFORM_PACKAGE=%PLATFORM_PATH%
@@ -216,9 +233,9 @@ if "%Arch%"=="IA32" (
::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target
values removed
if "%Arch%"=="X6
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change Reset Type
Change Reset Type according to different Board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/BensonGlacier/BoardInitPostMem/BoardInit.c | 7 +++ .../Board/BensonGlacier/BoardInitPostMem/BoardInit.h | 1 + .../Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf | 1 + .../BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c | 7 +++ .../BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h | 1 + .../Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.h| 1 + .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 2 ++ .../Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h | 3 ++- .../Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf | 2 ++ .../Common/Library/PeiFspPolicyInitLib/PeiFspScPolicyInitLib.c | 2 +- .../Common/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf | 1 + .../Common/Library/PeiPolicyUpdateLib/PeiScPolicyUpdate.c | 3 +-- .../Common/PlatformSettings/PlatformSetupDxe/SystemComponent.vfi | 2 ++ Platform/BroxtonPlatformPkg/PlatformPkg.dec| 1 + .../BroxtonSiPkg/SouthCluster/Reset/RuntimeDxe/ScReset.c | 6 +++--- 19 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c index 729a158..a4f3414 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c @@ -48,6 +48,7 @@ BensonGlacierPostMemInitCallback ( VOID *Instance; UINT8BoardId; UINT8FabId; + UINT8ResetType; Status = PeiServicesLocatePpi ( , @@ -76,6 +77,12 @@ BensonGlacierPostMemInitCallback ( PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) BensonMultiPlatformInfoInit); // + // Set Reset Type according to different Board + // + ResetType = V_RST_CNT_HARDRESET; + PcdSet8 (PcdResetType, (UINT8) ResetType); + + // // Add init steps here // // diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h index 870f9c3..c065ed2 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h @@ -33,6 +33,7 @@ #include #include "BoardInitMiscs.h" +#include VOID BensonGpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf index def40bf..4ce6ab2 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf @@ -61,6 +61,7 @@ gPlatformModuleTokenSpaceGuid.PcdBoardPostMemInitFunc gPlatformModuleTokenSpaceGuid.PcdBoardId gPlatformModuleTokenSpaceGuid.PcdFabId + gPlatformModuleTokenSpaceGuid.PcdResetType [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c index 501e810..e591b1d 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c @@ -56,6 +56,7 @@ LeafHillPostMemInitCallback ( VOID *Instance; UINT8BoardId; UINT8FabId; + UINT8ResetType; Status = PeiServicesLocatePpi ( , @@ -82,6 +83,12 @@ LeafHillPostMemInitCallback ( // Set init function PCD // PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) LeafHillMultiPlatformInfoInit); + + // + // Set Reset Type according to different Board + // + ResetType = V_RST_CNT_FULLRESET; + PcdSet8 (PcdResetType, (UINT8) ResetType); // // Add init steps here diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h index 298613a..5b92f75 100644 --- a/Platform/BroxtonPlatformPk
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change Reset Type
Change Reset Type according to different Board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Board/BensonGlacier/BoardInitPostMem/BoardInit.c | 7 +++ .../Board/BensonGlacier/BoardInitPostMem/BoardInit.h | 1 + .../Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf | 1 + .../BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c | 7 +++ .../BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h | 1 + .../Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.c| 7 +++ .../Board/MinnowBoard3/BoardInitPostMem/BoardInit.h| 1 + .../Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf | 3 ++- .../BroxtonPlatformPkg/Common/Acpi/AcpiPlatformDxe/AcpiPlatform.c | 2 +- .../Common/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf| 2 ++ .../Common/PlatformSettings/PlatformSetupDxe/SystemComponent.vfi | 2 ++ Silicon/BroxtonSoC/BroxtonSiPkg/BroxtonSiPkg.dec | 1 + .../BroxtonSiPkg/SouthCluster/Reset/RuntimeDxe/ScReset.c | 6 +++--- .../BroxtonSiPkg/SouthCluster/Reset/RuntimeDxe/ScReset.h | 3 ++- .../BroxtonSiPkg/SouthCluster/Reset/RuntimeDxe/ScReset.inf | 3 ++- 16 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c index 729a158..a4f3414 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c @@ -48,6 +48,7 @@ BensonGlacierPostMemInitCallback ( VOID *Instance; UINT8BoardId; UINT8FabId; + UINT8ResetType; Status = PeiServicesLocatePpi ( , @@ -76,6 +77,12 @@ BensonGlacierPostMemInitCallback ( PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) BensonMultiPlatformInfoInit); // + // Set Reset Type according to different Board + // + ResetType = V_RST_CNT_HARDRESET; + PcdSet8 (PcdResetType, (UINT8) ResetType); + + // // Add init steps here // // diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h index 870f9c3..c065ed2 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.h @@ -33,6 +33,7 @@ #include #include "BoardInitMiscs.h" +#include VOID BensonGpioTest (VOID); diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf index def40bf..32849c0 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf @@ -61,6 +61,7 @@ gPlatformModuleTokenSpaceGuid.PcdBoardPostMemInitFunc gPlatformModuleTokenSpaceGuid.PcdBoardId gPlatformModuleTokenSpaceGuid.PcdFabId + gSiPkgTokenSpaceGuid.PcdResetType [Guids] gEfiPlatformInfoGuid diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c index 501e810..e591b1d 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c @@ -56,6 +56,7 @@ LeafHillPostMemInitCallback ( VOID *Instance; UINT8BoardId; UINT8FabId; + UINT8ResetType; Status = PeiServicesLocatePpi ( , @@ -82,6 +83,12 @@ LeafHillPostMemInitCallback ( // Set init function PCD // PcdSet64 (PcdBoardPostMemInitFunc, (UINT64) (UINTN) LeafHillMultiPlatformInfoInit); + + // + // Set Reset Type according to different Board + // + ResetType = V_RST_CNT_FULLRESET; + PcdSet8 (PcdResetType, (UINT8) ResetType); // // Add init steps here diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h index 298613a..5b92f75 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.h @@ -22,6 +22,7 @@ #include #include #include +#include VOID LeafHillGpioTest (VOID); diff --git a/Platform/Br
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script.
GCC build script clean up.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Platform/BroxtonPlatformPkg/BuildBios.sh | 43 +
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 64 +---
2 files changed, 3 insertions(+), 104 deletions(-)
diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh
b/Platform/BroxtonPlatformPkg/BuildBios.sh
index 2195af6..40d873e 100644
--- a/Platform/BroxtonPlatformPkg/BuildBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBios.sh
@@ -94,40 +94,7 @@ EDK_SOURCE=$WORKSPACE
## Optional arguments
for (( i=1; i<=$#; ))
do
-if [ "$(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"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/C" ]; then
- echo "Removing previous Build files..."
- if [ -d "Build" ]; then
-rm -r Build
- fi
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/W" ]; then
- SrcDebug=TRUE
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/SV" ]; then
- SV_BIOS_ENABLE=TRUE
- SV_String=_SV_
- Arch=X64
- echo "-- Forcing to 64-bit for SV build --"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/PPV" ]; then
- PPV_BIOS_ENABLE=TRUE
- SV_String=_PPV_
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/RVVP" ]; then
- RVVP_BIOS_ENABLE=TRUE
- SV_String=_RVVP_
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/RVV" ]; then
- RVV_BIOS_ENABLE=TRUE
- SV_String=_RVV_
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
+if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
Arch=X64
shift
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then
@@ -136,12 +103,6 @@ for (( i=1; i<=$#; ))
elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/A" ]; then
FabId=A
shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/VP" ]; then
- VP_BIOS_ENABLE=TRUE
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/CSLE" ]; then
- CSLE_ENABLE=TRUE
- shift
else
break
fi
@@ -151,7 +112,7 @@ for (( i=1; i<=$#; ))
if [ "$2" == "" ]; then
echo
echo "Not Enough Arguments Provided"
- echo "Please review the Help screen "/?""
+ echo "Please review the Help screen"
ErrorExit
fi
diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
index a315e0b..82d5f45 100755
--- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
+++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
@@ -33,19 +33,9 @@ function Usage () {
## Assign initial values
exitCode=0
Build_Flags=
-Stitch_Flags=
Arch=IA32
FabId=B
-## Description of each Platform/Board_ID
-## APLK - Netbook/Desktop (PCCG)
-## BXTM - Phablet build (MCG)
-## BXTM1 - Phablet build for BXT Die1(E0) (MCG)
-## APLI - Embedded/IVI build (IOTG)
-eNB_RVP=APLK
-Phblt_RVP=BXTM
-Phblt_Die1_RVP=BXTM1
-Embd_RVP=APLI
## Parse Optional arguments
if [ "$1" == "/?" ]; then
@@ -61,31 +51,7 @@ fi
## Build Flags
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
- Build_Flags="$Build_Flags /l"
- 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')" == "/W" ]; then
- Build_Flags="$Build_Flags /w"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/SV" ]; then
- Build_Flags="$Build_Flags /sv"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/PPV" ]; then
- Build_Flags="$Build_Flags /ppv"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/RVVP" ]; then
- Build_Flags="$Build_Flags /rvvp"
- shift
- elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/RVV" ]; then
- Build_Flags="$Build_Flags /rvv"
- shift
-elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
+if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
Arch=X64
Build
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build Script.
Change GCC build script.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
BuildBIOS.sh | 28 ++-
Platform/BroxtonPlatformPkg/BuildIFWI.sh | 46 ++--
2 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/BuildBIOS.sh b/BuildBIOS.sh
index c241d87..552cf2d 100755
--- a/BuildBIOS.sh
+++ b/BuildBIOS.sh
@@ -10,6 +10,25 @@
#
##**
+## Function define
+##**
+function Usage () {
+ echo
+ echo "Script to build BIOS firmware and stitch the entire IFWI."
+ echo
+ echo "Usage: BuildBIOS.sh Build_Flags [PlatformName] Target_Flag"
+ echo
+ echo " Build_Flags: /A Set FabId to A (default:
FAB_B)"
+ echo " Build_Flags: /B Set FabId to B (default:
FAB_B)"
+ echo " PlatformName [optional]: Broxton "
+ echo " Target_Flag: Release, Debug "
+ echo
+ echo "Press any key.."
+ read
+ exit 0
+}
+
+##**
## Initial Setup
##**
@@ -20,6 +39,13 @@ if [ "$1" == "/?" ]; then
Usage
fi
+if [ "$1" == "" ]; then
+ echo "Not Enough Arguments Provided"
+ echo "Please review the Help screen"
+ Usage
+fi
+
+
## Build Flags
for (( i=1; i<=$#; ))
do
@@ -56,5 +82,5 @@ export
PACKAGES_PATH=$WORKSPACE:$WORKSPACE/Core:$WORKSPACE/Silicon/:$WORKSPACE/P
make -C BaseTools
-bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags APLI $Target_Flag
+bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags Broxton
$Target_Flag
diff --git a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
index 69ed67a..a315e0b 100755
--- a/Platform/BroxtonPlatformPkg/BuildIFWI.sh
+++ b/Platform/BroxtonPlatformPkg/BuildIFWI.sh
@@ -13,41 +13,16 @@
##**
## Function define
##**
-function Usage() {
+function Usage () {
echo
echo "Script to build BIOS firmware and stitch the entire IFWI."
echo
- echo "Usage: BuildIFWI.bat [options] ^<PlatformType^> ^<BuildTarget^> [IFWI
Suffix]"
+ echo "Usage: BuildIFWI.sh Build_Flags Platform_Type Build_Target"
echo
- echo " /?Display this help text
"
- echo " /qQuiet mode. Only display Fatal Errors (slightly faster)
"
- echo " /lLog a copy of the build output to EDK2.log
"
- echo " /cCleanAll before building
"
- echo " /wEnabled WinDbg module for build
"
- echo " /sv Build with SVBIOS flags enabled
"
- echo " /ppv Build with PPV flags enabled
"
- echo " /rvv Build with RVV BXTM flags enabled
"
- echo " /rvvp Build with RVVP BXTP flags enabled
"
- echo " /x64 Set Arch to X64 (default: IA32)
"
- echo " /sata Enable SATA Build
"
- echo " /pcie Enable PCIe Build
"
- echo " /nG Not update GOP driver per StitchConfig (override src
version)"
- echo " /uM Update Microcode per StitchConfig (override src version)
"
- echo
- echo " Set ONLY ONE of the following:
"
- echo " /vp Set special build flag for ALL Pre-Si
"
- echo " /csle Set special build flag for C-SLE
"
- echo
- echo " Platform Types: $eNB_RVP $Phblt_RVP $Phblt_Die1_RVP $Embd_RVP
"
- echo " APLK - Netbook/Desktop
"
- echo " BXTM - Phablet build for BXT-A
[edk2] [Patch][edk2-platforms] Change GCC build script.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/Build_IFWI.sh | 7 +--
Vlv2TbltDevicePkg/bld_vlv.sh| 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Build_IFWI.sh b/Vlv2TbltDevicePkg/Build_IFWI.sh
index 4a11a1c..0f7e155 100755
--- a/Vlv2TbltDevicePkg/Build_IFWI.sh
+++ b/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"
@@ -15,7 +15,8 @@ function Usage ( ) {
echo
echo " See Stitch/Stitch_Config.txt for additional stitching
settings."
echo
- echo
+ echo "Press any key.."
+ read
exit 0
}
@@ -71,6 +72,8 @@ for (( i=1; i<=$#; ))
## Require 2 input parameters
if [ "$2" == "" ]; then
+ echo "Not Enough Arguments Provided"
+ echo "Please review the Help screen"
Usage
fi
diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh
index 538b3ef..cba30c6 100755
--- a/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/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"
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Add SMBIOS Type 19.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../SmBiosMiscDxe/MiscMemoryArrayMappedAddress.uni | Bin 0 -> 1318 bytes
.../MiscMemoryArrayMappedAddressData.c | 29
.../MiscMemoryArrayMappedAddressFunction.c | 146 +
.../SmBiosMiscDxe/MiscSubclassDriverDataTable.c| 4 +-
Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf | 5 +-
5 files changed, 182 insertions(+), 2 deletions(-)
create mode 100644
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddress.uni
create mode 100644
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressData.c
create mode 100644
Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddress.uni
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddress.uni
new file mode 100644
index
..27d298a2d858de029b581553f069002872d0e8ea
GIT binary patch
literal 1318
zcmZvcU2oG+42FG;#D6#{H-NSlb~AwxqNN2Q*iyBb2AAo_x=8()k}}wzhdr;;G-*Lm
zj(u#O*YB~N{Qc9hjs@PAJi$KLjb*m9xjnTfSmhhqtvy(QeQGJbU>EpTwy_+0ur4yk
zBmDw-$1}H?duGU-UBT1FGA5#Dk;Q1iwwzIHu-Enmf0eV6!9J4Zj;NgM3wUgaeGZQo
z$TNGzxihrW{qEdO&?8$DId`r?$idK>V$IOj+!U>pkm?$agRv+57*n
zOJI}{9l+1QU3iWa`;;82z?KNzFNO1zh!v6YJ#cPKe83`B%9o)nL91_{V%6y-zA4(;
znF+VT*Xh|V!#%osm)e9?=YBd1Vb@H`Tq|c?p@^CIX8Zc+P8(*SKG
zc`c@_|K2u(jSy9hvR=wnu-C08@ND))RTcXi>}7|<`8P4goDS2bA*`43)Dj-JN
zMqM>WTRQR9CtMR&)>iSkSGvvZbNbUcs(pcF0`nO$}Mj_#i5Zgu`f1&*^o(!
z?K5kaFF}(!X6?I7utv<<l_kWg)>n3k9AFRFN`$%(5nsoEh_NHbX!;hlwvfUVdJEa}
zy>=%JPS^N_8hgfI*F=q+*(LS}RAI!PeZ)@OWmC?CSj8x78TE-+W@#Ee>{B
z%3BQV`yQu8kEq3v$x_aKqk{Ex>F?BW?y~89M*TIv3!i^Ys(N_JU4+{LNj~+cpf4>y
P6Yw-2;WYQhdX?)D9Tmic
literal 0
HcmV?d1
diff --git a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressData.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressData.c
new file mode 100644
index 000..f71b548
--- /dev/null
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressData.c
@@ -0,0 +1,29 @@
+/** @file
+ Static data of Physical Memory Array Mapped Address. SMBIOS Type 19.
+
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "CommonHeader.h"
+#include "MiscSubclassDriver.h"
+
+//
+// Static (possibly build generated) Physical Memory Array Mapped Address Data.
+//
+MISC_SMBIOS_TABLE_DATA(EFI_MEMORY_ARRAY_START_ADDRESS_DATA,
MiscMemoryArrayMappedAddress) =
+{
+0, //< StartingAddress
+0, //< EndingAddress
+0, //<
MemoryArrayHandle
+0x00//< Partition Width
+};
+
diff --git
a/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c
b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c
new file mode 100644
index 000..27d0ab7
--- /dev/null
+++ b/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscMemoryArrayMappedAddressFunction.c
@@ -0,0 +1,146 @@
+/** @file
+ Dynamic data of Physical Memory Array Mapped Address. SMBIOS Type 19.
+
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "CommonHeader.h"
+#include "MiscSubclassDriver.h"
+#include
+#include
+#include
+
+#define MAX_SOCKETS 2
+#define SMBIOS_TYPE19_USE_EXTENDED_ADDRESSES 0x
+
+
+VOID
+GetType16Handle (
+ IN EFI_SMBIOS_PROTOCOL *Smbios,
+ OUT EFI_SMBIOS_HANDLE *Handle
+ )
+{
+ EFI_STATUS Status;
+ EFI_SMBIOS_TYPERecordType;
+ EFI_SMBIOS_TABLE_HEADER*Buffer;
+
+ *Handle = 0;
+ RecordType = EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY;
+
+ Status = Smbios->GetNext (
+ Smbios,
+ Handle,
+ ,
+ ,
+ NULL
+ );
+ if (
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] BIOS version.
Change BIOS version. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 1e28313..f8dfb32 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -30,6 +30,6 @@ BOARD_ID = APLKRVP BOARD_REV = 3 BUILD_TYPE= D -VERSION_MAJOR = 0064 +VERSION_MAJOR = 0065 VERSION_MINOR = 01 BOARD_EXT = X64 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update BIOS ID to V0.96
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/BiosIdD.env| 2 +- Vlv2TbltDevicePkg/BiosIdR.env| 2 +- Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +- Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index da079c3..f47bf31 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0095 +VERSION_MAJOR = 0096 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index b03c6f2..7d322f3 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0095 +VERSION_MAJOR = 0096 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index 5845b51..c358f4c 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= D -VERSION_MAJOR = 0095 +VERSION_MAJOR = 0096 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index e1e5721..12fafe1 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= R -VERSION_MAJOR = 0095 +VERSION_MAJOR = 0096 VERSION_MINOR = 01 BOARD_ID = BBAYCRB -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Change BIOS ID.
Change BIOS ID to differentiate FAB A and FAB B Board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BuildBios.bat | 10 -- Platform/BroxtonPlatformPkg/BuildBios.sh | 8 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat index b59e8eb..f656876 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -216,9 +216,9 @@ if "%Arch%"=="IA32" ( ::Stage of copy of BiosId.env in Conf/ with Platform_Type and Build_Target values removed if "%Arch%"=="X64" ( -findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env +findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env ) else if "%Arch%"=="IA32" ( -findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env +findstr /b /v "BOARD_ID BUILD_TYPE VERSION_MINOR BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env echo BOARD_EXT = I32 >> Conf\BiosId.env ) @@ -230,6 +230,12 @@ if /i "%~2" == "RELEASE" ( echo BUILD_TYPE = D >> Conf\BiosId.env ) +if %FabId%==B ( +echo VERSION_MINOR = 0B >> Conf\BiosId.env +) else ( +echo VERSION_MINOR = 0A >> Conf\BiosId.env +) + :: Set the Build_Type, Version_Major, and Version_Minor environment variables find /v "#" Conf\BiosId.env > ver_strings for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j diff --git a/Platform/BroxtonPlatformPkg/BuildBios.sh b/Platform/BroxtonPlatformPkg/BuildBios.sh index 533993a..2195af6 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.sh +++ b/Platform/BroxtonPlatformPkg/BuildBios.sh @@ -159,6 +159,7 @@ fi cp $WORKSPACE/$PLATFORM_PACKAGE/BiosId.env $WORKSPACE/Conf/BiosId.env sed -i '/^BOARD_ID/d' $WORKSPACE/Conf/BiosId.env sed -i '/^BUILD_TYPE/d' $WORKSPACE/Conf/BiosId.env +sed -i '/^VERSION_MINOR/d' $WORKSPACE/Conf/BiosId.env BOARD_ID=MNW3 @@ -203,6 +204,13 @@ else echo BUILD_TYPE = D >> $WORKSPACE/Conf/BiosId.env fi +if [ $FabId == "B" ]; then + VERSION_MINOR=0B + echo VERSION_MINOR = 0B >> $WORKSPACE/Conf/BiosId.env +else + VERSION_MINOR=0A + echo VERSION_MINOR = 0A >> $WORKSPACE/Conf/BiosId.env +fi ##** ## Additional EDK Build Setup/Configuration -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.
Change build script. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env| 1 - Platform/BroxtonPlatformPkg/BuildBios.bat | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 18b4e01..1e28313 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -29,7 +29,6 @@ BOARD_ID = APLKRVP BOARD_REV = 3 -OEM_ID = X64 BUILD_TYPE= D VERSION_MAJOR = 0064 VERSION_MINOR = 01 diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat index 5e06a98..b59e8eb 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -218,8 +218,8 @@ if "%Arch%"=="IA32" ( if "%Arch%"=="X64" ( findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env ) else if "%Arch%"=="IA32" ( -findstr /b /v "BOARD_ID BUILD_TYPE OEM_ID" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env -echo OEM_ID = I32 >> Conf\BiosId.env +findstr /b /v "BOARD_ID BUILD_TYPE BOARD_EXT" %PLATFORM_PACKAGE%\BiosId.env > Conf\BiosId.env +echo BOARD_EXT = I32 >> Conf\BiosId.env ) if /i "%~2" == "RELEASE" ( -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Build script.
Change build script to differentiate FAB A and FAB B Board. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- BuildBIOS.bat | 14 +- BuildBIOS.sh | 31 +- Platform/BroxtonPlatformPkg/BuildBios.bat | 15 +++ Platform/BroxtonPlatformPkg/BuildBios.sh | 23 Platform/BroxtonPlatformPkg/BuildIFWI.bat | 10 +++ Platform/BroxtonPlatformPkg/BuildIFWI.sh | 9 +++ .../Common/Tools/Stitch/IFWIStitch_Simple.bat | 22 +++ 7 files changed, 83 insertions(+), 41 deletions(-) diff --git a/BuildBIOS.bat b/BuildBIOS.bat index 51ed30b..3bc68e5 100644 --- a/BuildBIOS.bat +++ b/BuildBIOS.bat @@ -10,7 +10,7 @@ set PlatformName= set BuildTarget=Debug set Compiler=/vs13 set Arch=/x64 -set Stepping=/B +set FabId=/B :: Optional arguments :OptLoop @@ -61,13 +61,13 @@ if /i "%~1"=="/vs15" ( goto OptLoop ) if /i "%~1"=="/A" ( -set Stepping=/A +set FabId=/A echo. shift goto OptLoop ) if /i "%~1"=="/B" ( -set Stepping=/B +set FabId=/B echo. shift goto OptLoop @@ -83,8 +83,8 @@ set BuildTarget=%~2 :OptLoopEnd echo Call Build Script of Broxton -echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% %Stepping% /fspw %BuildFlags% MINN %BuildTarget% -call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% %Stepping% /fspw %BuildFlags% MINN %BuildTarget% +echo calling : Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% %FabId% /fspw %BuildFlags% MINN %BuildTarget% +call Platform\%PlatformName%PlatformPkg\BuildIFWI.bat %Compiler% %Arch% %FabId% /fspw %BuildFlags% MINN %BuildTarget% goto Exit @@ -97,8 +97,8 @@ echo. echo/vs13 Set Compiler to vs2013 build (default: vs2013) echo/x64 Set Arch to X64 (default: X64) echo/IA32 Set Arch to IA32 (default: X64) -echo/A Set stepping to A (default: B stepping) -echo/B Set stepping to B (default: B stepping) +echo/A Set FabId to A (default: FAB_B) +echo/B Set FabId to B (default: FAB_B) echoPlatformName: Broxton echoBuildTargets: Release, Debug diff --git a/BuildBIOS.sh b/BuildBIOS.sh index fb67f04..c241d87 100755 --- a/BuildBIOS.sh +++ b/BuildBIOS.sh @@ -8,6 +8,34 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # + +##** +## Initial Setup +##** + +Build_Flags= + +## Parse Optional arguments +if [ "$1" == "/?" ]; then + Usage +fi + +## Build Flags +for (( i=1; i<=$#; )) + do +if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/B" ]; then + FabId=B + Build_Flags="$Build_Flags /B" + shift +elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/A" ]; then + FabId=A + Build_Flags="$Build_Flags /A" + shift +else + break +fi + done + Target_Flag=Release if [ "$1" == "Debug" ]; then Target_Flag=Debug @@ -18,6 +46,7 @@ if [ "$1" == "Release" ]; then shift fi +echo $Build_Flags echo $Target_Flag export WORKSPACE=`pwd` @@ -27,5 +56,5 @@ export PACKAGES_PATH=$WORKSPACE:$WORKSPACE/Core:$WORKSPACE/Silicon/:$WORKSPACE/P make -C BaseTools -bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh APLI $Target_Flag +bash ./Platform/BroxtonPlatformPkg/BuildIFWI.sh $Build_Flags APLI $Target_Flag diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat index 80de2f4..5e06a98 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -24,7 +24,7 @@ set "Build_Flags= " set exitCode=0 set Arch=X64 set Compiler=VS2013 -set Stepping=B +set FabId=B if not defined BiosVersion set BiosVersion=DEV @@ -154,13 +154,13 @@ if /i "%~1"=="/FspW" ( goto OptLoop ) if /i "%~1"=="/A" ( -set Stepping=A +set FabId=A echo. shift goto OptLoop ) if /i "%~1"=="/B" ( -set Stepping=B +set FabId=B echo. shift goto OptLoop @@ -409,7 +409,6 @@ copy /y/b %BUILD_PATH%\FV\FvOBBX.fv %Storage_Folder% >nul copy /y/b %BUILD_PATH%\FV\FvOBBY.fv %Storage_Folder% >nul if /i "%FSP_WRAPPER%" == "TRUE" ( - if %Stepping%==B ( :: 0xFEF7A000 = gIntelFsp2WrapperTokenSpaceGuid.PcdFlashFvFspBase = $(CAR_BASE_ADDRESS) + $(BLD_RAM_DATA_SIZE)
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Correct help information.
Correct help information for BIOS setup item.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | Bin 216048 -> 216036 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
index
3abdb51f0b3fb3b5b5bd8b0d791d297ae072e140..d2fdf940bef5959dc3dc523260a2e2aa483454f0
100644
GIT binary patch
delta 31
ncmew`o%hLf-i9rVCQGKPR5J=qSJ}cS)Sj}0aeK-Vrk>>hY+YOg6ZZ}-Qw0SuIzC{al
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fixed reconnect -r issue.
System will hang up when run reconnect -r with SD Card insert.
---
.../PlatformSettings/PlatformDxe/PciDevice.c | 33 +-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PciDevice.c
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PciDevice.c
index b8645a2..421ac10 100644
---
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PciDevice.c
+++
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformDxe/PciDevice.c
@@ -1,7 +1,7 @@
/** @file
Platform PCI Bus Initialization Driver.
- Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -405,6 +405,8 @@ PciBusEvent (
UINTN Index;
UINT8 mCacheLineSize = 0x10;
UINTN Seg, Bus, Dev, Fun;
+ UINT32AcpiIoPortBaseAddr;
+ UINT32CmdValue;
while (TRUE) {
BufferSize = sizeof (EFI_HANDLE);
@@ -448,6 +450,35 @@ PciBusEvent (
//
Status = PciIo->GetLocation (PciIo, , , , );
if ((Seg ==0) && (Bus == 0) && (Dev == 13) && (Fun == 1)) {
+//
+// Set PMC acpi io port address
+//
+AcpiIoPortBaseAddr = (UINT32) PcdGet16 (PcdScAcpiIoPortBaseAddress);
+PciIo->Pci.Write (
+ PciIo,
+ EfiPciIoWidthUint32,
+ 0x20,
+ 1,
+
+ );
+
+PciIo->Pci.Read (
+ PciIo,
+ EfiPciIoWidthUint8,
+ PCI_COMMAND_OFFSET,
+ 1,
+
+ );
+
+CmdValue |= BIT0;
+PciIo->Pci.Write (
+ PciIo,
+ EfiPciIoWidthUint8,
+ PCI_COMMAND_OFFSET,
+ 1,
+
+ );
+
Supports |= BIT0;
}
//
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update 4k header bin.
Update 4k Flash Descriptor bin. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin | Bin 4096 -> 4096 bytes .../Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin | Bin 4096 -> 4096 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin index aeb25b2af322ddc56e36e5caa14d0006a9352748..5604443dbe5ddfca667869d5517f1954d3ce997a 100644 GIT binary patch delta 14 VcmZorXi(T7#K^d0voPaZJ^
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Change BIOS version
Change BIOS version to 0.63 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BiosId.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/BroxtonPlatformPkg/BiosId.env b/Platform/BroxtonPlatformPkg/BiosId.env index 1e1992a..ea46b41 100644 --- a/Platform/BroxtonPlatformPkg/BiosId.env +++ b/Platform/BroxtonPlatformPkg/BiosId.env @@ -31,5 +31,5 @@ BOARD_ID = APLKRVP BOARD_REV = 3 OEM_ID = X64 BUILD_TYPE= D -VERSION_MAJOR = 0062 +VERSION_MAJOR = 0063 VERSION_MINOR = 01 -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Configure GPIO.
GPIO configuration for Low Speed Expander and System Feature Expander pins. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../MinnowBoard3/BoardInitPostMem/BoardGpios.h | 24 +++--- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h index 0928e16..692fbf7 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h @@ -96,8 +96,8 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] = BXT_GPIO_PAD_CONF(L"GPIO_31", M5 ,NA, NA, NA , NA , Wake_Disabled, P_20K_L,NA ,NA,IOS_Masked, SAME, GPIO_PADBAR+0x00F8, NORTH),//Feature: SUSCLK1 BXT_GPIO_PAD_CONF(L"GPIO_32", M5 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,IOS_Masked, SAME, GPIO_PADBAR+0x0100, NORTH),// Net in Sch: SUSCLK2 BXT_GPIO_PAD_CONF(L"GPIO_33", M5 ,NA, NA, NA , NA , Wake_Disabled, P_20K_L,NA ,NA,IOS_Masked, SAME, GPIO_PADBAR+0x0108, NORTH),//Feature: SUSCLK3 - BXT_GPIO_PAD_CONF(L"GPIO_34 PWM0", M1 ,NA , NA, NA , NA , Wake_Disabled, P_20K_L,NA ,NA, NA , NA, GPIO_PADBAR+0x0110, NORTH),//Feature: PWM - BXT_GPIO_PAD_CONF(L"GPIO_35 PWM1", M0 ,GPO , GPIO_D, HI , NA , Wake_Disabled, P_5K_H , NA,NA, NA , NA, GPIO_PADBAR+0x0118, NORTH),//Feature:Power Enable Net in Sch: TCH_PNL_PG + BXT_GPIO_PAD_CONF(L"GPIO_34 PWM0", M0 ,GPIO , NA, NA , NA , Wake_Disabled, P_20K_L,NA ,NA, NA , NA, GPIO_PADBAR+0x0110, NORTH), + BXT_GPIO_PAD_CONF(L"GPIO_35 PWM1", M0 ,GPIO , NA, NA , NA , Wake_Disabled, P_5K_H , NA,NA, NA , NA, GPIO_PADBAR+0x0118, NORTH), BXT_GPIO_PAD_CONF(L"GPIO_36 PWM2", M1 ,NA , NA, NA , NA , Wake_Disabled, P_20K_L,NA ,NA, NA , NA, GPIO_PADBAR+0x0120, NORTH),//Feature: PWM BXT_GPIO_PAD_CONF(L"GPIO_38 LPSS_UART0_RXD", M1 ,NA, NA , NA , NA , Wake_Disabled, P_20K_H, NA,NA, HizRx1I,DisPuPd, GPIO_PADBAR+0x0130, NORTH), BXT_GPIO_PAD_CONF(L"GPIO_39 LPSS_UART0_TXD", M1 ,NA, NA , NA , NA , Wake_Disabled, P_20K_H, NA,NA,Last_Value,DisPuPd, GPIO_PADBAR+0x0138, NORTH), @@ -214,15 +214,15 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_NW [] = BXT_GPIO_PAD_CONF(L"GPIO_109 GP_SSP_0_RXD",M1 ,NA, NA, NA , NA , Wake_Disabled, P_20K_H, NA,NA,HizRx0I , EnPd, GPIO_PADBAR+0x0200, NORTHWEST), BXT_GPIO_PAD_CONF(L"GPIO_110 GP_SSP_0_TXD",M1 ,NA, NA, NA , NA , Wake_Disabled, P_20K_H, NA,NA,HizRx0I , EnPd, GPIO_PADBAR+0x0208, NORTHWEST), BXT_GPIO_PAD_CONF(L"GPIO_111 GP_SSP_1_CLK",M0 ,GPI ,GPIO_D, NA , NA ,Wake_Disabled, P_20K_L,NA ,NA ,NA, NA, GPIO_PADBAR+0x0210, NORTHWEST),//Not used on RVP - BXT_GPIO_PAD_CONF(L"GPIO_112 GP_SSP_1_FS0",M2 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,NA,NA, GPIO_PADBAR+0x0218, NORTHWEST),//Feature: LPSS UART Hdr - BXT_GPIO_PAD_CONF(L"GPIO_113 GP_SSP_1_FS1",M0 ,GPI ,GPIO_D, NA , NA ,Wake_Disabled, P_20K_L,NA ,NA ,Last_Value, SAME, GPIO_PADBAR+0x0220, NORTHWEST),//Not used on RVP + BXT_GPIO_PAD_CONF(L"GPIO_112 GP_SSP_1_FS0",M1 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,NA,NA, GPIO_PADBAR+0x0218, NORTHWEST), + BXT_GPIO_PAD_CONF(L"GPIO_113 GP_SSP_1_FS1",M1 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,NA,NA, GPIO_PADBAR+0x0220, NORTHWEST), BXT_GPIO_PAD_CONF(L"GPIO_116 GP_SSP_1_RXD",M2 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,NA,NA, GPIO_PADBAR+0x0228, NORTHWEST),//Feature: LPSS UART Hdr BXT_GPIO_PAD_CONF(L"GPIO_117 GP_SSP_1_TXD",M2 ,NA, NA , NA , NA , Wake_Disabled, P_20K_L, NA,NA,NA,NA, GPIO_PADBAR+0x0230, NORTHWEST),//Feature: LPSS UART Hdr - BXT_GPIO_PAD_CONF(L"GPIO_118 GP_SSP_2_CLK",M1 ,
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] GPIO clean up.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../MinnowBoard3/BoardInitPostMem/BoardGpios.c | 12 +-
.../MinnowBoard3/BoardInitPostMem/BoardGpios.h | 216 +++--
2 files changed, 69 insertions(+), 159 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
index 5d27656..7e7c327 100644
---
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
+++
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.c
@@ -1,7 +1,7 @@
/** @file
Gpio setting for multiplatform.
- Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -188,10 +188,6 @@ MultiPlatformGpioProgram (
GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW) / sizeof
(mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
GpioPadConfigTable (sizeof (mBXT_GpioInitData_W) / sizeof
(mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW) / sizeof
(mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_N_LH) / sizeof
(mBXT_GpioInitData_N_LH[0]), mBXT_GpioInitData_N_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_SW_LH) / sizeof
(mBXT_GpioInitData_SW_LH[0]), mBXT_GpioInitData_SW_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_W_LH) / sizeof
(mBXT_GpioInitData_W_LH[0]), mBXT_GpioInitData_W_LH);
- GpioPadConfigTable (sizeof (mBXT_GpioInitData_NW_LH) / sizeof
(mBXT_GpioInitData_NW_LH[0]), mBXT_GpioInitData_NW_LH);
if (SystemConfiguration.ScIshEnabled == 0) {
DEBUG ((DEBUG_INFO, "Switch ISH_I2C0 & ISH_I2C1 to LPSS_I2C5 and LPSS
I2C6. \n" ));
@@ -262,9 +258,9 @@ MultiPlatformGpioProgram (
//
DEBUG ((DEBUG_INFO, "Dump Community pad registers, Board ID: 0x%X\n",
PlatformInfoHob->BoardId));
DumpGpioPadTable (sizeof (mBXT_GpioInitData_N) / sizeof
(mBXT_GpioInitData_N[0]), PlatformInfoHob->PlatformGpioSetting_N);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW_LH) / sizeof
(mBXT_GpioInitData_NW_LH[0]), PlatformInfoHob->PlatformGpioSetting_NW);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_W_LH) / sizeof
(mBXT_GpioInitData_W_LH[0]), PlatformInfoHob->PlatformGpioSetting_W);
- DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW_LH) / sizeof
(mBXT_GpioInitData_SW_LH[0]), PlatformInfoHob->PlatformGpioSetting_SW);
+ DumpGpioPadTable (sizeof (mBXT_GpioInitData_NW) / sizeof
(mBXT_GpioInitData_NW[0]), PlatformInfoHob->PlatformGpioSetting_NW);
+ DumpGpioPadTable (sizeof (mBXT_GpioInitData_W) / sizeof
(mBXT_GpioInitData_W[0]), PlatformInfoHob->PlatformGpioSetting_W);
+ DumpGpioPadTable (sizeof (mBXT_GpioInitData_SW) / sizeof
(mBXT_GpioInitData_SW[0]), PlatformInfoHob->PlatformGpioSetting_SW);
break;
default:
//
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
index 6bc1619..0928e16 100644
---
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
+++
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
@@ -1,7 +1,7 @@
/** @file
GPIO setting for Broxton.
- Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -72,16 +72,20 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_N[] =
BXT_GPIO_PAD_CONF(L"GPIO_6", M1 ,NA, NA , NA
, NA , Wake_Disabled, P_20K_L, NA,NA, HizRx0I, SAME,
GPIO_PADBAR+0x0030, NORTH),//Mux with DISP1_RST_N based on the SW3 switch
BXT_GPIO_PAD_CONF(L"GPIO_7", M1 ,NA, NA , NA
, NA , Wake_Disabled, P_20K_L, NA,NA, HizRx0I, SAME,
GPIO_PADBAR+0x0038, NORTH),//Mux with DISP1_TOUCH_INT_N based on the SW3 switch
BXT_GPIO_PAD_CONF(L"GPIO_8", M1 ,NA, NA , NA
, NA , Wake_Disabled, P_20K_L, NA,NA, HizRx0I, SAME,
GPIO_PADBAR+0x0040, NORTH),//Mux with DISP1_TOUCH_RST_N based on the SW3 switch
- BXT_GPIO_PAD_CONF(L"GPIO_9", M0 ,GPI , NA , NA
, Level, Wake_Disabled, P_20K_L, Inverted,IOAPIC, TxDRxE
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] GPIO clean up.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Board/LeafHill/BoardInitPostMem/BoardGpios.h | 8
.../Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h | 8
2 files changed, 16 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
index e0c0554..9777d75 100644
--- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
+++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardGpios.h
@@ -328,14 +328,6 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL", M0 , HI_Z ,GPIO_D, HI
, NA , Wake_Disabled, P_2K_H, NA,NA,NA, NA ,
GPIO_PADBAR+0x0028, NORTHWEST),//Feature: Codec Power Down PD Net in Sch:
SOC_CODEC_PD_N
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N_RVP2[] =
-{
- //
- // Group Pin#: pad_name,
PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled
,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
- //
- BXT_GPIO_PAD_CONF(L"GPIO_33", M0 ,GPI , NA , NA
, Edge , Wake_Disabled, P_20K_L, NA,IOAPIC,IOS_Masked, SAME,
GPIO_PADBAR+0x0108, NORTH),//Feature: Interrput Net in Sch:
PMIC_IRQ_R_N
-};
-
BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
{
//
diff --git
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
index f7e6d09..6bc1619 100644
---
a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
+++
b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardGpios.h
@@ -326,14 +326,6 @@ BXT_GPIO_PAD_INIT mBXT_GpioInitData_Audio_SSP6 []=
BXT_GPIO_PAD_CONF(L"GPIO_192 DBI_SCL", M0 , HI_Z ,GPIO_D, HI
, NA , Wake_Disabled, P_2K_H, NA,NA,NA, NA ,
GPIO_PADBAR+0x0028, NORTHWEST),//Feature: Codec Power Down PD Net in Sch:
SOC_CODEC_PD_N
};
-BXT_GPIO_PAD_INIT mBXT_GpioInitData_N_RVP2[] =
-{
- //
- // Group Pin#: pad_name,
PMode,GPIO_Config,HostSw,GPO_STATE,INT_Trigger, Wake_Enabled
,Term_H_L,Inverted, GPI_ROUT, IOSstae, IOSTerm, MMIO_Offset ,Community
- //
- BXT_GPIO_PAD_CONF(L"GPIO_33", M0 ,GPI , NA , NA
, Edge , Wake_Disabled, P_20K_L, NA,IOAPIC,IOS_Masked, SAME,
GPIO_PADBAR+0x0108, NORTH),//Feature: Interrput Net in Sch:
PMIC_IRQ_R_N
-};
-
BXT_GPIO_PAD_INIT mBXT_GpioInitData_FAB2[] =
{
//
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Fixed build error.
Fixed build error when fTPM is enabled. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 ++-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 4 ++-- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 25a7813..564f8e6 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1055,7 +1055,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8046 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf + NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } @@ -1297,7 +1297,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf } $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index c71f692..099aa48 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1051,7 +1051,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8046 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf + NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } @@ -1300,7 +1300,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf } $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index a8de866..53cdd3b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1052,7 +1052,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8046 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf - NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf + NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf } @@ -1301,7 +1301,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf - PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf + PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf } $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Add SATA initialization.
Add additional SATA initialization code.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInit.c | 3 +
.../BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScSata.c | 91 +-
2 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInit.c
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInit.c
index 9620dac..3fb37ea 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInit.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScInit.c
@@ -660,6 +660,9 @@ ScOnEndOfDxe (
gBS->CloseEvent (Event);
BxtSeries = GetBxtSeries ();
+ if (BxtSeries == BxtP) {
+ConfigureSataDxe (mScPolicy);
+ }
AcpiBaseAddr = (UINT16) PcdGet16 (PcdScAcpiIoPortBaseAddress);
PmcBase= PMC_BASE_ADDRESS;
FuncDisableReg = MmioRead32 (PmcBase + R_PMC_FUNC_DIS);
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScSata.c
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScSata.c
index 63c2b88..c6d83e9 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScSata.c
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScInit/Dxe/ScSata.c
@@ -1,7 +1,7 @@
/** @file
Perform related functions for SC Sata in DXE phase.
- Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -15,4 +15,93 @@
#include
+/**
+ Perform the remaining configuration on SC SATA to perform device detection
+ at end of Dxe, then set the SATA SPD and PxE corresponding, and set the
Register Lock
+
+ @param[in] ScPolicy The SC Policy instance
+
+ @retvalEFI_SUCCESSThe function completed successfully
+
+**/
+EFI_STATUS
+ConfigureSataDxe (
+ IN SC_POLICY_HOB *ScPolicy
+ )
+{
+ EFI_STATUS Status;
+ SC_SATA_CONFIG *SataConfig;
+ UINTN PciSataRegBase;
+ UINT16 SataPortsEnabled;
+ UINT32 DwordReg;
+ UINTN Index;
+
+ DEBUG ((DEBUG_INFO, "ConfigureSataDxe() Start\n"));
+ Status = GetConfigBlock ((VOID *) ScPolicy, , (VOID *)
);
+ ASSERT_EFI_ERROR (Status);
+
+ //
+ // SATA PCS: Enable the port in any of below condition:
+ // i.) Hot plug is enabled
+ // ii.) A device is attached
+ // iii.) Test mode is enabled
+ // iv.) Configured as eSATA port
+ //
+ PciSataRegBase = MmPciBase (
+ DEFAULT_PCI_BUS_NUMBER_SC,
+ PCI_DEVICE_NUMBER_SATA,
+ PCI_FUNCTION_NUMBER_SATA
+ );
+ SataPortsEnabled = 0;
+ DwordReg = MmioRead32 (PciSataRegBase + 0x94);
+ DEBUG ((DEBUG_INFO, "PCS = 0x%x\n", DwordReg));
+ for (Index = 0; Index < SC_MAX_SATA_PORTS; Index++) {
+if ((SataConfig->PortSettings[Index].HotPlug == TRUE) ||
+(DwordReg & (BIT16 << Index)) ||
+(SataConfig->TestMode == TRUE) ||
+(SataConfig->PortSettings[Index].External == TRUE)) {
+ SataPortsEnabled |= (SataConfig->PortSettings[Index].Enable << Index);
+}
+ }
+ DEBUG ((DEBUG_INFO, "SataPortsEnabled = 0x%x\n", SataPortsEnabled));
+
+ //
+ // MAP - Port Mapping Register
+ // PCI Offset: 90h - 93h
+ // Value [23:16] Port Disabled
+ // [7:0] Port Clock Disabled
+ //
+ MmioOr32 (PciSataRegBase + R_SATA_MAP, (UINT32) ((~SataPortsEnabled <<
N_SATA_MAP_SPD) & B_SATA_MAP_SPD));
+ DEBUG ((DEBUG_INFO, "MAP = 0x%x\n", MmioRead32 (PciSataRegBase +
R_SATA_MAP)));
+ S3BootScriptSaveMemWrite (
+S3BootScriptWidthUint32,
+(UINTN) (PciSataRegBase + R_SATA_MAP),
+1,
+(VOID *) (UINTN) (PciSataRegBase + R_SATA_MAP)
+);
+
+ MmioOr16 (PciSataRegBase + 0x94, SataPortsEnabled);
+ S3BootScriptSaveMemWrite (
+S3BootScriptWidthUint16,
+(UINTN) (PciSataRegBase + 0x94),
+1,
+(VOID *) (UINTN) (PciSataRegBase + 0x94)
+);
+
+ //
+ // Step 14
+ // Program SATA PCI offset 9Ch [31] to 1b
+ //
+ MmioOr32 ((UINTN) (PciSataRegBase + R_SATA_SATAGC), BIT31);
+ S3BootScriptSaveMemWrite (
+S3BootScriptWidthUint32,
+(UINTN) (PciSataRegBase + R_SATA_SATAGC),
+1,
+(VOID *) (UINTN) (PciSataRegBase + R_SATA_SATAGC)
+);
+ DEBUG ((DEBUG_INFO, "SATAGC = 0x%x\n", MmioRead32 (PciSataRegBase +
R_SATA_SATAGC)));
+ DEBUG ((DEBUG_INFO, "ConfigureSataDxe() End\n"));
+
+ return EFI_SUCCESS;
+}
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2DeviceRefCodePkg: Change Reset Type.
Change RESET_VALUE of FADT from 0x0E to 0x06.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Facp/Facp.aslc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Facp/Facp.aslc
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Facp/Facp.aslc
index 4407c56..d24d362 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Facp/Facp.aslc
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Facp/Facp.aslc
@@ -1,6 +1,6 @@
/*++
-Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
@@ -86,7 +86,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE FACP = {
0,
0xCF9
},
- 0x0E, // Hardware reset value
+ 0x06, // Hardware reset value
0, 0, 0, // Reserved
0,// XFirmwareCtrl
0,// XDsdt
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Add SSDT table tool.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Common/Application/SsdtUpdate/SsdtUpdate.asl | 29 +++
.../Common/Application/SsdtUpdate/SsdtUpdate.c | 199 +
.../Common/Application/SsdtUpdate/SsdtUpdate.h | 38
.../Common/Application/SsdtUpdate/SsdtUpdate.inf | 62 +++
4 files changed, 328 insertions(+)
create mode 100644
Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.asl
create mode 100644
Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.c
create mode 100644
Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.h
create mode 100644
Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.inf
diff --git
a/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.asl
b/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.asl
new file mode 100644
index 000..e5bd7e6
--- /dev/null
+++ b/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.asl
@@ -0,0 +1,29 @@
+/** @file
+ The definition block in ACPI table for Genernal device.
+
+ Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+DefinitionBlock (
+ "Gene.aml",
+ "SSDT",
+ 2,
+ "INTEL ",
+ "GeneTabl",
+ 0x1000
+ )
+{
+ Scope (\_SB)
+ {
+ }
+}
+
diff --git
a/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.c
b/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.c
new file mode 100644
index 000..f63df95
--- /dev/null
+++ b/Platform/BroxtonPlatformPkg/Common/Application/SsdtUpdate/SsdtUpdate.c
@@ -0,0 +1,199 @@
+/** @file
+ Update SSDT table to ACPI table.
+
+ Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "SsdtUpdate.h"
+
+FV_INPUT_DATA mInputData = {0};
+
+/**
+ Read file data from given file name.
+
+ @param[in] FileNamePointer the readed given file name.
+ @param[out] Buffer The buffer which read the given file name's data.
+ @param[out] BufferSize The buffer size which read the given file name's
data.
+
+ @retval EFI_SUCCESS The file data is successfully readed.
+ @retval EFI_ERROR The file data is unsuccessfully readed.
+
+**/
+STATIC
+EFI_STATUS
+ReadFileData (
+ IN CHAR16 *FileName,
+ OUT UINT8**Buffer,
+ OUT UINT32 *BufferSize
+ )
+{
+ EFI_STATUS Status;
+ SHELL_FILE_HANDLE FileHandle;
+ UINT64 Size;
+ VOID *NewBuffer;
+ UINTN ReadSize;
+
+ FileHandle = NULL;
+ NewBuffer = NULL;
+ Size = 0;
+
+ Status = ShellOpenFileByName (FileName, , EFI_FILE_MODE_READ, 0);
+ if (EFI_ERROR (Status)) {
+goto Done;
+ }
+
+ Status = FileHandleIsDirectory (FileHandle);
+ if (!EFI_ERROR (Status)) {
+Status = EFI_NOT_FOUND;
+goto Done;
+ }
+
+ Status = FileHandleGetSize (FileHandle, );
+ if (EFI_ERROR (Status)) {
+goto Done;
+ }
+
+ NewBuffer = AllocatePool ((UINTN) Size);
+
+ ReadSize = (UINTN) Size;
+ Status = FileHandleRead (FileHandle, , NewBuffer);
+ if (EFI_ERROR (Status)) {
+goto Done;
+ } else if (ReadSize != (UINTN) Size) {
+Status = EFI_INVALID_PARAMETER;
+goto Done;
+ }
+
+Done:
+ if (FileHandle != NULL) {
+ShellCloseFile ();
+ }
+
+ if (EFI_ERROR (Status)) {
+if (NewBuffer != NULL) {
+ FreePool (NewBuffer);
+}
+ } else {
+*Buffer = NewBuffer;
+*BufferSize = (UINT32) Size;
+ }
+
+ return Status;
+}
+
+
+/**
+ Initialize and publish device in ACPI table.
+
+ @param[in] Table The pointer to the ACPI table which will be
published.
+ @param[in] TableSize The size of ACPI table which will be published.
+
+ @retvalEFI_SUCCESS The ACPI table is published successfully.
+ @retvalOthers The ACPI table is not published.
+
+**/
+EFI_STATUS
+PublishAcpiTable (
+ IN UINT8 *Table,
+ IN UINT32 TableSize
+ )
+{
+ EFI_STATUS
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Disable LPC Serial IRQ.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformDxe/IchPlatformPolicy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformDxe/IchPlatformPolicy.c b/Vlv2TbltDevicePkg/PlatformDxe/IchPlatformPolicy.c index 753eb54..5644a8b 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/IchPlatformPolicy.c +++ b/Vlv2TbltDevicePkg/PlatformDxe/IchPlatformPolicy.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved. + Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under @@ -406,7 +406,7 @@ InitPchPlatformPolicy ( // // Enable / disable serial IRQ according to setup value. // - DxePlatformPchPolicy->SerialIrqConfig->SirqEnable = PCH_DEVICE_ENABLE; + DxePlatformPchPolicy->SerialIrqConfig->SirqEnable = PCH_DEVICE_DISABLE; // // Set Serial IRQ Mode Select according to setup value. -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Update BIOS ID to V0.95
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/BiosIdD.env| 4 ++-- Vlv2TbltDevicePkg/BiosIdR.env| 4 ++-- Vlv2TbltDevicePkg/BiosIdx64D.env | 4 ++-- Vlv2TbltDevicePkg/BiosIdx64R.env | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index d86f39c..da079c3 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -8,7 +8,7 @@ # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0094 +VERSION_MAJOR = 0095 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index 98cc02e..b03c6f2 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -8,7 +8,7 @@ # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0094 +VERSION_MAJOR = 0095 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index fa17997..5845b51 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -8,7 +8,7 @@ # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= D -VERSION_MAJOR = 0094 +VERSION_MAJOR = 0095 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index 53190e8..e1e5721 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -8,7 +8,7 @@ # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= R -VERSION_MAJOR = 0094 +VERSION_MAJOR = 0095 VERSION_MINOR = 01 BOARD_ID = BBAYCRB -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Add BGRT table.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 2 +-
Vlv2TbltDevicePkg/PlatformPkg.fdf | 12 +++-
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 12 +++-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc| 3 ++-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 ++-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 ++-
6 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 7f91777..73ad0bd 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1821,7 +1821,7 @@ PlatformBdsPolicyBehavior (
// console directly.
//
BdsLibConnectAllDefaultConsoles ();
-PlatformBdsDiagnostics (IGNORE, TRUE, BaseMemoryTest);
+PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
//
// Perform some platform specific connect sequence
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf
b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index cb5b6b7..e5c6525 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
@@ -447,6 +447,10 @@ APRIORI DXE {
FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
SECTION RAW =
$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin
}
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
+SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+ }
#
# EDK II Related Platform codes
@@ -461,6 +465,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
!if $(ACPI50_ENABLE) == TRUE
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+INF
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
@@ -1097,6 +1102,11 @@ INF
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
RAW ASL Optional|.aml
}
+[Rule.Common.USER_DEFINED.LOGO]
+ FILE FREEFORM = $(NAMED_GUID) {
+RAW BIN |.bmp
+ }
+
[Rule.Common.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RAW ACPI Optional|.acpi
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 4243b07..84e416e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
@@ -404,6 +404,10 @@ APRIORI DXE {
FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
SECTION RAW =
$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin
}
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
+SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+ }
#
# EDK II Related Platform codes
@@ -418,6 +422,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
!if $(ACPI50_ENABLE) == TRUE
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+INF
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
@@ -1058,6 +1063,11 @@ INF
SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
RAW ASL Optional|.aml
}
+[Rule.Common.USER_DEFINED.LOGO]
+ FILE FREEFORM = $(NAMED_GUID) {
+RAW BIN |.bmp
+ }
+
[Rule.Common.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RAW ACPI Optional|.acpi
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index cdde337..f27f294 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
-# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accomp
[edk2] [Patch][edk2-platforms] Vlv2TbltDevicePkg: Add BGRT table.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 4 ++--
Vlv2TbltDevicePkg/PlatformPkg.fdf | 12 +++-
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 12 +++-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc| 3 ++-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 ++-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 ++-
6 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 6e8364b..38eaeb2 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
@@ -1891,7 +1891,7 @@ PlatformBdsPolicyBehavior (
// console directly.
//
BdsLibConnectAllDefaultConsoles ();
-PlatformBdsDiagnostics (IGNORE, TRUE, BaseMemoryTest);
+PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);
//
// Perform some platform specific connect sequence
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf
b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index ae4ee2d..b795d60 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
@@ -404,6 +404,10 @@ APRIORI DXE {
FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
SECTION RAW =
$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin
}
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
+SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+ }
#
# EDK II Related Platform codes
@@ -418,6 +422,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
!if $(ACPI50_ENABLE) == TRUE
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+INF
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
@@ -1128,6 +1133,11 @@ FV = BiosUpdate
RAW ASL Optional|.aml
}
+[Rule.Common.USER_DEFINED.LOGO]
+ FILE FREEFORM = $(NAMED_GUID) {
+RAW BIN |.bmp
+ }
+
[Rule.Common.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RAW ACPI Optional|.acpi
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 43d20ee..334a5fc 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
@@ -357,6 +357,10 @@ APRIORI DXE {
FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
SECTION RAW =
$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin
}
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
+SECTION RAW = MdeModulePkg/Logo/Logo.bmp
+ }
#
# EDK II Related Platform codes
@@ -371,6 +375,7 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
!if $(ACPI50_ENABLE) == TRUE
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
+INF
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
@@ -1087,6 +1092,11 @@ FV = BiosUpdate
RAW ASL Optional|.aml
}
+[Rule.Common.USER_DEFINED.LOGO]
+ FILE FREEFORM = $(NAMED_GUID) {
+RAW BIN |.bmp
+ }
+
[Rule.Common.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RA
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Enable Secure Boot.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../PlatformSecureDefaultsLib.c| 952 -
.../PlatformSecureDefaultsLib.inf | 69 --
.../Common/PlatformSettings/PlatformDxe/Platform.c | 17 +-
.../PlatformSettings/PlatformDxe/PlatformDxe.inf | 3 +-
.../PlatformSetupDxe/PlatformSetupDxe.c| 39 +-
.../PlatformSetupDxe/PlatformSetupDxe.inf | 3 +-
.../PlatformSettings/PlatformSetupDxe/Security.vfi | 37 +-
.../PlatformSetupDxe/SetupInfoRecords.c| 89 +-
.../PlatformSetupDxe/VfrStrings.uni| Bin 315770 -> 311660 bytes
.../BroxtonPlatformPkg/PlatformDsc/Components.dsc | 18 +-
.../PlatformDsc/LibraryClasses.dsc | 2 -
Platform/BroxtonPlatformPkg/PlatformPkg.fdf| 11 +-
12 files changed, 69 insertions(+), 1171 deletions(-)
delete mode 100644
Platform/BroxtonPlatformPkg/Common/Library/PlatformSecureDefaultsLib/PlatformSecureDefaultsLib.c
delete mode 100644
Platform/BroxtonPlatformPkg/Common/Library/PlatformSecureDefaultsLib/PlatformSecureDefaultsLib.inf
diff --git
a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecureDefaultsLib/PlatformSecureDefaultsLib.c
b/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecureDefaultsLib/PlatformSecureDefaultsLib.c
deleted file mode 100644
index 2cdd01d..000
---
a/Platform/BroxtonPlatformPkg/Common/Library/PlatformSecureDefaultsLib/PlatformSecureDefaultsLib.c
+++ /dev/null
@@ -1,952 +0,0 @@
-/** @file
- IPC based PlatformFvbLib library instance.
-
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
-
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD
License
- which accompanies this distribution. The full text of the license may be
found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include "Library/PlatformSecureDefaultsLib.h"
-#include
-#include
-
-EFI_GUID mUefiImageSecurityDBGuid= EFI_IMAGE_SECURITY_DATABASE_GUID;
-EFI_GUID mUefiCertTypeRsa2048Guid= EFI_CERT_RSA2048_GUID;
-
-#define WIN_CERT_UEFI_RSA2048_SIZE256
-#define EFI_SECURE_BOOT_ENABLE_NAME L"SecureBootEnable"
-
-extern EFI_GUID mUefiCertTypeRsa2048Guid;
-extern EFI_GUID gEfiSecureBootEnableDisableGuid;
-
-EFI_GUID gOwnerSignatureGUID = {0x77fa9abd, 0x0359, 0x4d32, {0xbd,
0x60, 0x28, 0xf4, 0xe7, 0x8f, 0x78, 0x4b}};
-static EFI_GUID gDbxUpdateImageGuid = {0xa3d48bb3, 0x350f, 0x4bcd, 0xa4,
0xad, 0x44, 0x5b, 0x93, 0x9f, 0x6d, 0x9c };
-
-/**
- Create a time based data payload by concatenating the
EFI_VARIABLE_AUTHENTICATION_2
- descriptor with the input data. NO authentication is required in this
function.
-
- @param[in, out] DataSize On input, the size of Data buffer
in bytes.
- On output, the size of data
returned in Data
- buffer in bytes.
- @param[in, out] Data On input, Pointer to data buffer
to be wrapped or
- pointer to NULL to wrap an empty
payload.
- On output, Pointer to the new
payload date buffer allocated from pool,
- it's caller's responsibility to
free the memory when finish using it.
-
- @retval EFI_SUCCESS Create time based payload
successfully.
- @retval EFI_OUT_OF_RESOURCES There are not enough memory
resourses to create time based payload.
- @retval EFI_INVALID_PARAMETERThe parameter is invalid.
- @retval Others Unexpected error happens.
-
-**/
-EFI_STATUS
-CreateTimeBasedPayload (
- IN OUT UINTN*DataSize,
- IN OUT UINT8**Data
- )
-{
- EFI_STATUS Status;
- UINT8*NewData;
- UINT8*Payload;
- UINTNPayloadSize;
- EFI_VARIABLE_AUTHENTICATION_2*DescriptorData;
- UINTNDescriptorSize;
- EFI_TIME Time;
-
- if (Data == NULL || DataSize == NULL) {
-return EFI_INVALID_PARAMETER;
- }
-
- //
- // In Setup mode or Custom mode, the variable does not need to be signed but
the
- // parameters to the SetVariable() call still need to be prepared as
authenticated
- // variable. So we create EFI_VARIABLE_AUTHENTICATED_2 descriptor without
certificate
- // data in it.
- //
- Payload = *Data;
- PayloadSize = *DataSize;
-
- DescriptorSize= OFFSET_OF (EFI_VARIABLE_A
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Fixed Map-r issue.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../SouthCluster/Include/MediaDeviceDriver.h | 22 ++-
.../Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c | 4 +-
.../Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c | 219 ++---
3 files changed, 169 insertions(+), 76 deletions(-)
diff --git
a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h
index 243ee9a..1c9ad1c 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Include/MediaDeviceDriver.h
@@ -1,7 +1,7 @@
/** @file
Media Device Driver header.
- Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -172,6 +172,7 @@ MediaDeviceDriverEntryPoint (
/**
MediaDeviceDriverInstallBlockIo
+ @param[in] This
@param[in] CardData
@retval EFI_STATUS
@@ -179,23 +180,38 @@ MediaDeviceDriverEntryPoint (
**/
EFI_STATUS
MediaDeviceDriverInstallBlockIo (
- IN CARD_DATA*CardData
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
+ IN CARD_DATA*CardData
);
/**
MediaDeviceDriverUninstallBlockIo
+ @param[in] This
@param[in] CardData
+ @param[in] Handle
@retval EFI_STATUS
**/
EFI_STATUS
MediaDeviceDriverUninstallBlockIo (
- IN CARD_DATA*CardData
+ IN EFI_DRIVER_BINDING_PROTOCOL *This,
+ IN CARD_DATA*CardData,
+ IN EFI_HANDLE Handle
);
/**
+ MediaDeviceDriverAllPartitionNotPresent
+
+ @param[in] CardData
+
+**/
+BOOLEAN
+MediaDeviceDriverAllPartitionNotPresent (
+ IN CARD_DATA*CardData
+ );
+/**
MediaDeviceComponentNameGetDriverName
@param[in] This
diff --git
a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c
index a6280a5..d367326 100644
---
a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c
+++
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MMCSDTransfer.c
@@ -1,7 +1,7 @@
/** @file
SMMC transfer specific functions.
- Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -2268,7 +2268,7 @@ SetEmmcWpOnEvent(
//
// Enable the eMMC protection
//
- if (TRUE) {
+ if (FALSE) {
if (!WriteProtectDone) {
Status = MmcReadExtCsd (CardData);
if (EFI_ERROR (Status)) {
diff --git
a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c
index 36c6e13..7f5bd11 100644
---
a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c
+++
b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/Sdio/Dxe/MMC/MmcMediaDeviceDxe/MediaDeviceDriver.c
@@ -1,7 +1,7 @@
/** @file
UEFI Driver Entry and Binding support.
- Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -28,6 +28,7 @@ EFI_DRIVER_BINDING_PROTOCOL gMediaDeviceDriverBinding = {
NULL
};
+EFI_EMMC_CARD_INFO_PROTOCOL *gEfiEmmcCardInfo = NULL;
/**
Entry point for EFI drivers.
@@ -229,7 +230,7 @@ MediaDeviceDriverBindingStart (
}
- Status = MediaDeviceDriverInstallBlockIo (CardData);
+ Status = MediaDeviceDriverInstallBlockIo (This, CardData);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "MediaDeviceDriverBindingStart: Fail to install
gEfiBlockIoProtocolGuid \n"));
goto Exit;
@@ -246,7 +247,20 @@ MediaDeviceDriverBindingStart (
);
if (EFI_ERROR (Status)) {
Status = EFI_OUT_OF_RESOURCES;
-MediaDeviceDriverUninstallBlockIo (CardData);
+for (Loop = 0; Loop < MAX_NUMBER_OF_PARTITIONS; Loop++) {
+ if (!CardData->Partitions[Loop].Present) {
+continue;
+ }
+ gBS->UninstallMultipleProtocolInterfaces (
+ CardData->Partitions[Loop].Handle,
+ ,
+ >Partitions[Loop].BlockIo,
+ ,
+ CardData->Partitions[Loop].DevPath,
+ NULL
+ );
+}
+goto Exit;
[edk2] [Patch][edk2-platforms] Vlv2DeviceRefCodePkg: Fixed thermal issue.
Fixed System auto shutdown when it reached minus 20 degree.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
index e63f5bc..fecc040 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
@@ -5,7 +5,7 @@
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved *;
+;*Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
@@ -69,7 +69,12 @@ Scope(\_TZ)
{
Store(DTS1,Local0)
}
-Return(Add(2732,Multiply(Local0,10)))
+If (LEqual(And(Local0, 0x80), 0)) {
+ Return(Add(2732,Multiply(Local0,10)))
+} else {
+ Add(Subtract(255, Local0), 1, Local0)
+ Return(Subtract(2732,Multiply(Local0,10)))
+}
//
// Else return a static value if both EC and DTS are unavailable.
//
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Set TPM to Disabled.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- .../Common/PlatformSettings/PlatformSetupDxe/Security.vfi| 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi index da103b2..f79e81b 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi @@ -1,7 +1,7 @@ // /** @file // Security Setup formset. // -// Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved. +// Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved. // // This program and the accompanying materials // are licensed and made available under the terms and conditions of the BSD License @@ -148,17 +148,10 @@ form formid = SECURITY_CONFIGURATION_FORM_ID, oneof varid = Setup.TPM, prompt = STRING_TOKEN(STR_TPM_PROMPT), help= STRING_TOKEN(STR_TPM_HELP), -#if (X64_BUILD_ENABLE == FALSE) option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = RESET_REQUIRED; option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED; option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED; -#else -option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = RESET_REQUIRED; -option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED; -option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED; -option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED; -#endif endoneof; suppressif NOT ideqval Setup.TPM == 1; -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch][edk2-platforms/devel-MinnowBoard3] Enable Mor.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Common/Acpi/AcpiTablesPCAT/Platform.asl| 13 ++--
.../MemoryTest/NullMemoryTestDxe/NullMemoryTest.c | 72 -
.../MemoryTest/NullMemoryTestDxe/NullMemoryTest.h | 2 +-
.../NullMemoryTestDxe/NullMemoryTestDxe.inf| 4 +-
.../NullMemoryTestDxe/NullMemoryTestDxe.uni| Bin 2194 -> 2194 bytes
.../NullMemoryTestDxe/NullMemoryTestDxeExtra.uni | Bin 1372 -> 1372 bytes
.../BroxtonPlatformPkg/PlatformDsc/Components.dsc | 1 +
Platform/BroxtonPlatformPkg/PlatformPkg.fdf| 1 +
8 files changed, 40 insertions(+), 53 deletions(-)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Platform.asl
b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Platform.asl
index 7847f2f..04ea3ad 100644
--- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Platform.asl
+++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/Platform.asl
@@ -1,5 +1,5 @@
/** @file
- Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -19,7 +19,6 @@ External(PDC1)
External(PDC2)
External(PDC3)
External(\_PR.CPU0._PPC, IntObj)
-External(\_SB.PCI0.LPCB.TPM.PTS, MethodObj)
Name(ECUP, 1) // EC State indicator: 1- Normal Mode 0- Low Power Mode
Mutex(EHLD, 0) // EC Hold indicator: 0- No one accessing the EC Power State 1-
Someone else is accessing the EC Power State
@@ -153,10 +152,12 @@ Method(_PTS,1)
//clear GPE0_STS
Store(Ones, G0S)
- //
- // Call TPM PTS method
- //
- \_SB.TPM.PTS (Arg0)
+ If (CondRefOf(\_SB.TPM.PTS)) {
+//
+// Call TPM PTS method
+//
+\_SB.TPM.PTS (Arg0)
+ }
//
// Set GPIO_116 (SOC_CODEC_IRQ) 20k pull-down for device I2S audio codec
INT343A before enter S3/S4
diff --git
a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
index a3f5971..b506f13 100644
---
a/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
+++
b/Platform/BroxtonPlatformPkg/Common/SampleCode/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.c
@@ -2,7 +2,7 @@
Implementation of Generic Memory Test Protocol which does not perform real
memory test.
Also clears memory when the MemoryOverwriteRequest bit is set.
- Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -19,7 +19,6 @@
#include
#include
#include
-#include
UINT64mTestedSystemMemory = 0;
UINT64mTotalSystemMemory = 0;
@@ -151,19 +150,12 @@ BOOLEAN
IsMemoryOverwriteRequested (
)
{
- BOOLEAN bRetValue = 0;
- EFI_STATUS Status;
- UINT64 MemoryOverwriteReq = 0;
- UINTN VariableSize;
- UINT8 CmosRegValue;
-
- DEBUG((EFI_D_INFO, "+IsMemoryOverwriteRequested\n"));
+ BOOLEAN bRetValue = 0;
+ EFI_STATUS Status;
+ UINT64 MemoryOverwriteReq = 0;
+ UINTN VariableSize;
- //
- // Read the CMOS Register EFI_CMOS_CLEAN_RESET
- //
- IoWrite8(CmosIo_72, EFI_CMOS_CLEAN_RESET);
- CmosRegValue = IoRead8(CmosIo_73);
+ DEBUG ((EFI_D_INFO, "IsMemoryOverwriteRequested\n"));
//
// Get the MOR variable
@@ -187,25 +179,18 @@ IsMemoryOverwriteRequested (
);
} else {
+ MemoryOverwriteReq = 0;
DEBUG ((EFI_D_ERROR, "IsMemoryOverwriteRequested: Failed to Get MOR
Variable - Status = %r\n", Status));
}
goto Exit;
}
-
- DEBUG ((EFI_D_INFO, "IsMemoryOverwriteRequested: MOR Control Value = %02x,
CmosRegValue = %02x\n", MemoryOverwriteReq, CmosRegValue));
-
- if ((MOR_CLEAR_MEMORY_VALUE(MemoryOverwriteReq)) &&
-(((CmosRegValue != B_MAGIC_CLEAN_RESET_VALUE) &&
(MOR_DISABLE_AUTO_DETECT_VALUE(MemoryOverwriteReq) == 0)) ||
-(MOR_DISABLE_AUTO_DETECT_VALUE(MemoryOverwriteReq) == 1))
-)
- {
-DEBUG((EFI_D_INFO, "IsMemoryOverwriteRequested: Un-controlled Reset
detected and hence requesting the Memory Clear\n"));
+ if (MOR_CLEAR_MEMORY_VALUE (MemoryOverwriteReq)) {
+DEBUG ((EFI_D_INFO, "IsMemoryOverwriteRequested: Un-controlled Reset
detected and hence requesting the Memory Clear\n"));
bRetValue = 1;
}
Exit:
- IoWrite8(CmosIo_73, B_MAGIC_INIT_VALUE); // Initialize to a known
[edk2] [Patch][edk2-platforms] Vlv2DeviceRefCodePkg: Fixed thermal issue.
Fixed System auto shutdown when it reached minus 20 degree.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
index e63f5bc..fecc040 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/THERMAL.ASL
@@ -5,7 +5,7 @@
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved *;
+;*Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
@@ -69,7 +69,12 @@ Scope(\_TZ)
{
Store(DTS1,Local0)
}
-Return(Add(2732,Multiply(Local0,10)))
+If (LEqual(And(Local0, 0x80), 0)) {
+ Return(Add(2732,Multiply(Local0,10)))
+} else {
+ Add(Subtract(255, Local0), 1, Local0)
+ Return(Subtract(2732,Multiply(Local0,10)))
+}
//
// Else return a static value if both EC and DTS are unavailable.
//
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [edk2-platforms/devel-Minnowboard3] BroxtonPlatformPkg:Build script.
Update build script. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Platform/BroxtonPlatformPkg/BuildBios.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/BuildBios.bat b/Platform/BroxtonPlatformPkg/BuildBios.bat index 900083b..99a58ca 100644 --- a/Platform/BroxtonPlatformPkg/BuildBios.bat +++ b/Platform/BroxtonPlatformPkg/BuildBios.bat @@ -405,15 +405,15 @@ copy /y/b %BUILD_PATH%\FV\FvOBBY.fv %Storage_Folder% >nul if /i "%FSP_WRAPPER%" == "TRUE" ( if %Stepping%==B ( pushd %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspBinPkg\FspBin -python %WORKSPACE%\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f ApolloLakeFsp.fd -c m -b 0xFEF65000 -o .\ -n FSP.fd -python %WORKSPACE%\IntelFsp2Pkg\Tools\SplitFspBin.py split -f FSP.fd -o .\ -n FSP.Fv +python %WORKSPACE%\Core\IntelFsp2Pkg\Tools\SplitFspBin.py rebase -f ApolloLakeFsp.fd -c m -b 0xFEF65000 -o .\ -n FSP.fd +python %WORKSPACE%\Core\IntelFsp2Pkg\Tools\SplitFspBin.py split -f FSP.fd -o .\ -n FSP.Fv popd copy /y/b %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspBinPkg\FspBin\FSP_T.Fv %Storage_Folder%\FSP_T.Fv copy /y/b %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspBinPkg\FspBin\FSP_M.Fv %Storage_Folder%\FSP_M.Fv copy /y/b %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspBinPkg\FspBin\FSP_S.Fv %Storage_Folder%\FSP_S.Fv ) else ( pushd %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspGold\FSP -python %WORKSPACE%\IntelFsp2Pkg\Tools\SplitFspBin.py split -f FSP.fd -o .\ -n FSP.Fv +python %WORKSPACE%\Core\IntelFsp2Pkg\Tools\SplitFspBin.py split -f FSP.fd -o .\ -n FSP.Fv popd copy /y/b %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspGold\FSP\FSP_T.Fv %Storage_Folder%\FSP_T.Fv copy /y/b %WORKSPACE%\Silicon\BroxtonSoC\BroxtonFspPkg\ApolloLakeFspGold\FSP\FSP_M.Fv %Storage_Folder%\FSP_M.Fv -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [edk2-platforms/Minnowboard3] BroxtonPlatformPkg:Update UNDI driver.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
index b95bf59..93f0422 100644
--- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
+++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf
@@ -659,7 +659,7 @@ APRIORI DXE {
#
!if $(NETWORK_ENABLE) == TRUE
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
-SECTION PE32 =
BroxtonPlatformPkg/Common/Binaries/UNDI/I210PcieUndiDxe/E7006X3.EFI
+SECTION PE32 =
BroxtonPlatformPkg/Common/Binaries/UNDI/I210PcieUndiDxe/E7320X3.EFI
SECTION UI = "UNDI"
}
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH] Vlv2TbltDevicePkg:Add Intel I210 lan UNDI driver on Turbot2.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf| 7 +++
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 7 +++
2 files changed, 14 insertions(+)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf
b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 907f88a..ae4ee2d 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -696,6 +696,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
SECTION PE32 =
Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
SECTION UI = "UNDI"
}
+ # 32-bit E7006X3.EFI UNDI driver is not available.
+ !if $(DXE_ARCHITECTURE) == X64
+ FILE DRIVER = 0270D660-E7E2-4C6B-94B1-16B7FCD49351 {
+SECTION PE32 =
Vlv2MiscBinariesPkg/UNDI/I211PcieUndiDxe/$(DXE_ARCHITECTURE)/E7006X3.EFI
+SECTION UI = "UNDI"
+ }
+ !endif
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index af2b6cb..43d20ee 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -649,6 +649,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
SECTION PE32 =
Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
SECTION UI = "UNDI"
}
+ # 32-bit E7006X3.EFI UNDI driver is not available.
+ !if $(DXE_ARCHITECTURE) == X64
+ FILE DRIVER = 0270D660-E7E2-4C6B-94B1-16B7FCD49351 {
+SECTION PE32 =
Vlv2MiscBinariesPkg/UNDI/I211PcieUndiDxe/$(DXE_ARCHITECTURE)/E7006X3.EFI
+SECTION UI = "UNDI"
+ }
+ !endif
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
--
2.7.0.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH] Vlv2TbltDevicePkg: Update BIOS ID to V0.94.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/BiosIdD.env| 2 +- Vlv2TbltDevicePkg/BiosIdR.env| 2 +- Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +- Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index d4f2c67..d86f39c 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0093 +VERSION_MAJOR = 0094 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index 03582a6..98cc02e 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -35,5 +35,5 @@ OEM_ID= I32 BUILD_TYPE= R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0093 +VERSION_MAJOR = 0094 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index 9a754e2..fa17997 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= D -VERSION_MAJOR = 0093 +VERSION_MAJOR = 0094 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index 2ab601a..53190e8 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -25,6 +25,6 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= R -VERSION_MAJOR = 0093 +VERSION_MAJOR = 0094 VERSION_MINOR = 01 BOARD_ID = BBAYCRB -- 2.7.0.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Signal End of Dxe Event.
According to PI spec,DxeSmmReadyToLock protocol is published immediately after
signaling of the End of Dxe Event.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 02e4616..e1f3524 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -179,10 +179,15 @@ InstallReadyToLock (
EFI_NATIVE_INTERFACE,
NULL
);
ASSERT_EFI_ERROR (Status);
+//
+// Signal EndOfDxe PI Event
+//
+EfiEventGroupSignal ();
+
Handle = NULL;
Status = gBS->InstallProtocolInterface (
,
,
EFI_NATIVE_INTERFACE,
@@ -224,15 +229,10 @@ PlatformBdsInit (
)
{
EFI_STATUS Status;
EFI_EVENT ShellImageEvent;
EFI_GUIDShellEnvProtocol = SHELL_ENVIRONMENT_INTERFACE_PROTOCOL;
-
- //
- // Signal EndOfDxe PI Event
- //
- EfiEventGroupSignal ();
#ifdef __GNUC__
SerialPortWrite((UINT8 *)">>>>BdsEntry[GCC]\r\n", 19);
#else
SerialPortWrite((UINT8 *)">>>>BdsEntry\r\n", 14);
--
2.6.2.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Signal EndOfDxe Event.
According to PI spec,EndOfDxe Event should be signaled
before DxeSmmReadyToLock protocol installation.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 7 ++-
Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 195d734..82ad974 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,8 +1,8 @@
/** @file
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php.
@@ -224,10 +224,15 @@ PlatformBdsInit (
)
{
EFI_STATUS Status;
EFI_EVENT ShellImageEvent;
EFI_GUIDShellEnvProtocol = SHELL_ENVIRONMENT_INTERFACE_PROTOCOL;
+
+ //
+ // Signal EndOfDxe PI Event
+ //
+ EfiEventGroupSignal ();
#ifdef __GNUC__
SerialPortWrite((UINT8 *)">>>>BdsEntry[GCC]\r\n", 19);
#else
SerialPortWrite((UINT8 *)">>>>BdsEntry\r\n", 14);
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index 45578e8..c64bab9 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -1,9 +1,9 @@
#/** @file
# Component name for module PlatformBootManagerLib
#
-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
# The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php.
@@ -95,10 +95,11 @@
gEfiMemoryTypeInformationGuid
gEfiCapsuleVendorGuid
gEfiGlobalVariableGuid
gEfiNormalSetupGuid
gEfiPartTypeSystemPartGuid
+ gEfiEndOfDxeEventGroupGuid
[Pcd]
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase
--
2.6.2.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Signal EndOfDxe Event.
According to PI spec,EndOfDxe Event should be signaled
before DxeSmmReadyToLock protocol installation.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Library/PlatformBdsLib/BdsPlatform.c | 37 +-
.../Library/PlatformBdsLib/PlatformBdsLib.inf | 3 +-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 195d734..5df3396 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,8 +1,8 @@
/** @file
- Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php.
@@ -203,10 +203,29 @@ ShellImageCallback (
{
BdsSetConsoleMode (TRUE);
DEBUG ((EFI_D_INFO, "BdsEntry ShellImageCallback \n"));
}
+/**
+ An empty function to pass error checking of CreateEventEx ().
+
+ @param Event Event whose notification function is being invoked.
+ @param ContextPointer to the notification function's context,
+ which is implementation-dependent.
+
+**/
+STATIC
+VOID
+EFIAPI
+EmptyCallbackFunction (
+ IN EFI_EVENTEvent,
+ IN VOID *Context
+ )
+{
+ return;
+}
+
//
// BDS Platform Functions
//
/**
Platform Bds init. Incude the platform firmware vendor, revision
@@ -223,12 +242,28 @@ PlatformBdsInit (
VOID
)
{
EFI_STATUS Status;
EFI_EVENT ShellImageEvent;
+ EFI_EVENT EndOfDxeEvent;
EFI_GUIDShellEnvProtocol = SHELL_ENVIRONMENT_INTERFACE_PROTOCOL;
+ //
+ // Signal EndOfDxe PI Event
+ //
+ Status = gBS->CreateEventEx (
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
+ EmptyCallbackFunction,
+ NULL,
+ ,
+
+ );
+ if (!EFI_ERROR (Status)) {
+gBS->SignalEvent (EndOfDxeEvent);
+ }
+
#ifdef __GNUC__
SerialPortWrite((UINT8 *)">>>>BdsEntry[GCC]\r\n", 19);
#else
SerialPortWrite((UINT8 *)">>>>BdsEntry\r\n", 14);
#endif
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index 45578e8..c64bab9 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -1,9 +1,9 @@
#/** @file
# Component name for module PlatformBootManagerLib
#
-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
# The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php.
@@ -95,10 +95,11 @@
gEfiMemoryTypeInformationGuid
gEfiCapsuleVendorGuid
gEfiGlobalVariableGuid
gEfiNormalSetupGuid
gEfiPartTypeSystemPartGuid
+ gEfiEndOfDxeEventGroupGuid
[Pcd]
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase
--
2.6.2.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2DeviceRefCodePkg:Add sample WSMT table.
This is an sample WSMT table, which we only
update BIT0 and BIT1 of Protections flags fields.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf | 3 +-
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Wsmt/Wsmt.aslc | 60 ++
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 13 +
3 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Wsmt/Wsmt.aslc
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
index 9c00651..e9a7d80 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
@@ -3,11 +3,11 @@
#
# Build acpi table data required by system boot.
# All .asi files tagged with "ToolCode="DUMMY"" in following file list are
device description and are included
# by top level ASL file which will be dealed with by asl.exe application.
#
-# Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved
+# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved
#
# This program and the accompanying materials are licensed and made available
under
# the terms and conditions of the BSD License that accompanies this
distribution.
# The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php.
@@ -35,10 +35,11 @@
Facp/Facp.aslc
Madt/Madt30.aslc
Mcfg/Mcfg.aslc
Hpet/Hpet.aslc
Lpit/Lpit.aslc
+ Wsmt/Wsmt.aslc
[Packages]
MdePkg/MdePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Wsmt/Wsmt.aslc
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Wsmt/Wsmt.aslc
new file mode 100644
index 000..4142201
--- /dev/null
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Wsmt/Wsmt.aslc
@@ -0,0 +1,60 @@
+/*++
+ Copyright (c) 2016, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials are licensed and made available
under
+ the terms and conditions of the BSD License that accompanies this
distribution.
+ The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+
+
+Module Name:
+
+ Wsmt.c
+
+Abstract:
+
+ This file contains a structure definition for the Windows SMM Security
+ Mitigations Table (WSMT).
+
+++*/
+
+//
+// Statements that include other files
+//
+#include "AcpiTablePlatform.h"
+#include
+
+//
+// WSMT Table definition
+//
+EFI_ACPI_WSMT_TABLE WSMT = {
+ EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE,
+ sizeof (EFI_ACPI_WSMT_TABLE),
+ EFI_WSMT_TABLE_REVISION,
+ //
+ // Checksum will be updated at runtime
+ //
+ 0,
+ EFI_ACPI_OEM_ID,// OEMID is a 6 bytes long field
+ EFI_ACPI_OEM_TABLE_ID, // OEM table identification(8 bytes long)
+ EFI_ACPI_OEM_REVISION, // OEM revision
+ EFI_ACPI_CREATOR_ID,// ASL compiler vendor ID
+ EFI_ACPI_CREATOR_REVISION, // ASL compiler revision number
+ 0x, // Protection flag
+};
+
+VOID*
+ReferenceAcpiTable (
+ VOID
+ )
+{
+ //
+ // Reference the table being generated to prevent the optimizer from
+ // removing the data structure from the executable
+ //
+ return (VOID*)
+}
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index db1b5a5..8a883f2 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -56,10 +56,11 @@ Abstract:
#include
#include
#include
#include
#include
+#include
CHAR16EfiPlatformCpuInfoVariable[] = L"PlatformCpuInfo";
CHAR16gACPIOSFRModelStringVariableName[] =
ACPI_OSFR_MODEL_STRING_VARIABLE_NAME;
CHAR16gACPIOSFRRefDataBlockVariableName[] =
ACPI_OSFR_REF_DATA_BLOCK_VARIABLE_NAME;
@@ -236,10 +237,11 @@ PlatformUpdateTables (
UINTN LocalApicCounter;
EFI_PROCESSOR_INFORMATION
ProcessorInfoBuffer;
UINT8 TempVal;
EFI_ACPI_3_0_IO_APIC_STRUCTURE *IOApicType;
EFI_ACPI_3_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *APICTableHeader;
+ EFI_ACPI_WSMT_TABLE *WsmtTable;
CurrPtr = NULL;
EndPtr = NULL;
ApicPtr = NULL;
LocalApicCounter= 0;
@@ -597,10 +599,21 @@ PlatformUpdateTables (
}
gBS->FreePool (OcurMfgStringBuffer);
gBS->FreePool (OcurModelStringBuffer);
gBS->FreePool (OcurRefDataBlockBuffer);
break;
+
+
+
[edk2] [Patch] Vlv2TbltDevicePkg:Fix Gcc Debug image can't boot to Yocto.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 9 -
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 23 ---
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 935d1b4..9ae1a52 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -497,12 +497,19 @@ INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
#
# SMM
#
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+!if $(SOURCE_DEBUG_ENABLE) == TRUE
+!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE
+INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
+!else
+ INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
+!endif
+!else
INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
-
+!endif
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf
INF
$(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
INF RuleOverride = BINARY
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 8c45cb8..6a8f633 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -334,12 +334,19 @@
SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
!endif
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
+!if $(SOURCE_DEBUG_ENABLE) == TRUE
+
PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
+
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
+
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
+ DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
+!else
PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+!endif
!if $(MINNOW2_FSP_BUILD) == TRUE
PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
!endif
!if $(FTPM_ENABLE) == TRUE
@@ -1346,18 +1353,20 @@
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
#
# SMM
#
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
- MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf{
- !if $(TARGET) != RELEASE
-
-
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-
SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
- !endif
- }
+ MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+!if $(SOURCE_DEBUG_ENABLE) == TRUE
+!if $(SMM_SOURCE_DEBUG_ENABLE) == FALSE
+
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)RELEASE/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
+!else
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
+!endif
+!else
+
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf
+!endif
UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf
$(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
--
2.6.2.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Fix incompatible pointer with Gcc build
Fixed an incompatible pointer issue to pass Gcc build
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2TbltDevicePkg/PlatformRtcRuntimeDxe/PlatformRtc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/Vlv2TbltDevicePkg/PlatformRtcRuntimeDxe/PlatformRtc.c
b/Vlv2TbltDevicePkg/PlatformRtcRuntimeDxe/PlatformRtc.c
index f38c4db..6c4cdeb 100644
--- a/Vlv2TbltDevicePkg/PlatformRtcRuntimeDxe/PlatformRtc.c
+++ b/Vlv2TbltDevicePkg/PlatformRtcRuntimeDxe/PlatformRtc.c
@@ -24,10 +24,11 @@ EFI_SET_TIME mOriginalSetTime;
@retval EFI_SUCCESS The operation completed successfully.
**/
EFI_STATUS
+EFIAPI
PlatformRtcSetTime (
IN EFI_TIME*Time
)
{
EFI_STATUS Status;
--
2.6.2.windows.1
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Update BIOS ID to V0.93.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/BiosIdD.env| 4 ++-- Vlv2TbltDevicePkg/BiosIdR.env| 4 ++-- Vlv2TbltDevicePkg/BiosIdx64D.env | 4 ++-- Vlv2TbltDevicePkg/BiosIdx64R.env | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index 80fe281..d4f2c67 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -6,11 +6,11 @@ # BIOS ID string format: # $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -33,7 +33,7 @@ BOARD_REV = 1 OEM_ID= I32 BUILD_TYPE= D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0092 +VERSION_MAJOR = 0093 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index 219d2a2..03582a6 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -6,11 +6,11 @@ # BIOS ID string format: # $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -33,7 +33,7 @@ BOARD_REV = 1 OEM_ID= I32 BUILD_TYPE= R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0092 +VERSION_MAJOR = 0093 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index a6fb2ed..9a754e2 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -6,11 +6,11 @@ # BIOS ID string format: # $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. # The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. @@ -23,8 +23,8 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= D -VERSION_MAJOR = 0092 +VERSION_MAJOR = 0093 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index fdf1356..2ab601a 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -6,11 +6,11 @@ # BIOS ID string format: # $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM # All fields must have a fixed length. #Example: "TRFTCRB1.86C.0008.D03.0506081529" # -# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved. +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved. # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. # The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. @@ -23,8 +23,8 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= R -VERSION_MAJOR = 0092 +VERSION_MAJOR = 0093 VERSION_MINOR = 01 BOARD_ID = BBAYCRB -- 2.6.2.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg:Add PiSmmCommunication of UefiCpuPkg.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 5 ++--- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 5 ++--- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 6 -- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 -- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 6 -- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index a499006..93b4d2d 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -540,18 +540,17 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # # SMM # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf -# INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf # # ACPI # INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 72a0d2b..e9292ca 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -497,18 +497,17 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # # SMM # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf -# INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf # # ACPI # INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 466de88..9865785 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -398,10 +398,12 @@ ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf + SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif @@ -1328,14 +1330,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf + UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf $(PLATFORM_P
[edk2] [Patch] Vlv2DeviceRefCodePkg:Convert Mix to DOS.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
Reviewed-by: David Wei <david@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl |2 +-
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl|1 +
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 24 +-
Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 2703 ++--
Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h | 971 +++
.../PlatformSetupDxe/SouthClusterConfig.vfi| 98 +-
Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni | 31 +-
Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | 23 +-
8 files changed, 1934 insertions(+), 1919 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
index 21e526c..8702110 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
@@ -346,8 +346,8 @@ Field(GNVS,AnyAcc,Lock,Preserve)
SCPE, 8, //(789) Allow higher performance on AC/USB - Enable/Disable
Offset(792),
EDPV, 8, //(792) Check for eDP display device
DIDX, 32, //(793) Device ID for eDP device
IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT
project.
- BATT, 8, //(795) The Flag of RTC Battery Prensent.
+ BATT, 8, //(795) The Flag of RTC Battery Prensent.
}
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
index 38dac87..506b171 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
@@ -681,5 +681,6 @@ scope (\_SB.PCI0)
Return (0x0)
}
} // Device(SEC0)
} // End scope (\_SB.PCI0)
+
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 2ff14ec..0f536de 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,25 +1,25 @@
/** @file
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
-
+
This program and the accompanying materials are licensed and made available
under
- the terms and conditions of the BSD License that accompanies this
distribution.
+ the terms and conditions of the BSD License that accompanies this
distribution.
+
+ The full text of the license may be found at
- The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php.
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-
Module Name:
@@ -29,11 +29,11 @@ Module Name:
Abstract:
ACPI Platform Driver
---*/
+**/
#include
#include
#include
#include "AcpiPlatform.h"
@@ -706,11 +706,11 @@ OnReadyToBoot (
NULL,
,
);
ASSERT_EFI_ERROR (Status);
- }
+ }
//
// Find the AcpiSupport protocol.
//
Status = LocateSupportProtocol (, (VOID **)
, 0);
@@ -1128,11 +1128,11 @@ AcpiPlatformEntryPoint (
DEBUG ((EFI_D_ERROR, "mGlobalNvsArea.Area->emmcVersion = 1\n"));
mGlobalNvsArea.Area->emmcVersion = 1;
}
mGlobalNvsArea.Area->SdCardRemovable = mSystemConfiguration.SdCardRemovable;
-
+
//
// Microsoft IOT
//
if ((mSystemConfiguration.LpssHsuart0FlowControlEnabled == 1) && \
(mSystemConfiguration.LpssPwm0Enabled == 0) && \
@@ -1141,11 +1141,11 @@ AcpiPlatformEntryPoint (
DEBUG ((EFI_D_ERROR, "JP1 is set to be MSFT IOT configuration.\n"));
} else {
mGlobalNvsArea.Area->MicrosoftIoT = GLOBAL_NVS_DEVICE_DISABLE;
DEBUG ((EFI_D_ERROR, "JP1 is not set to be MSFT IOT configuration.\n"));
}
-
+
//
// SIO related option.
//
Status = gBS->LocateProtocol (, NULL, (void
**));
ASSERT_EFI_ERROR (Status);
diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index 5168bd5..e2a8875 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariabl
[edk2] [Patch] Vlv2TbltDevicePkg:Change UNIX to DOS format.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
Reviewed-by: David Wei <david@intel.com>
---
Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf | 22 ++---
Vlv2TbltDevicePkg/PlatformPkg.dec | 28 ++-
2 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
index 63ccf03..f1f2635 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
@@ -1,17 +1,17 @@
-#/*++
+## @file
#
# Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved
-#
+#
# This program and the accompanying materials are licensed and made available
under
-# the terms and conditions of the BSD License that accompanies this
distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-#
+# the terms and conditions of the BSD License that accompanies this
distribution.
+# The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
#
# Module Name:
#
#PlatformBB.inf
#
@@ -22,11 +22,11 @@
# Rev DateNameDescription
#
--
# R01 <04/22/2011> LB Update code for SIO83627UHG support.
#
--
#
-#--*/
+##
[defines]
INF_VERSION= 0x00010005
BASE_NAME = PlatformDxe
FILE_GUID = 056E7324-A718-465b-9A84-228F06642B4F
@@ -139,11 +139,11 @@
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoverySize
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase
-
+
[Depex]
gEfiPciRootBridgeIoProtocolGuid AND
gEfiVariableArchProtocolGuidAND
gEfiVariableWriteArchProtocolGuid AND
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.dec
b/Vlv2TbltDevicePkg/PlatformPkg.dec
index c5e0d24..e81b534 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.dec
+++ b/Vlv2TbltDevicePkg/PlatformPkg.dec
@@ -1,19 +1,28 @@
#/** @file
# Platform Package
#
# This package provides platform specific modules.
# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
-#
-# This program and the accompanying materials are licensed and made available
under
-# the terms and conditions of the BSD License that accompanies this
distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-#
+#
+
+# This program and the accompanying materials are licensed and made available
under
+
+# the terms and conditions of the BSD License that accompanies this
distribution.
+
+# The full text of the license may be found at
+
+# http://opensource.org/licenses/bsd-license.php.
+
+#
+
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+#
+
#
#
#**/
[Defines]
@@ -204,5 +213,6 @@
gEfiFirmwareClassGuid = { 0xb122a262, 0x3551, 0x4f48, { 0x88, 0x92,
0x55, 0xf6, 0xc0, 0x61, 0x42, 0x90 } }
gEfiDFUVerGuid = { 0x0dc73aed, 0xcbf6, 0x4a25, { 0xa6, 0x8d,
0x59, 0xc8, 0x0f, 0x44, 0xc7, 0xc3 } }
gEfiEsrtTableGuid = { 0xb122a263, 0x3661, 0x4f68, { 0x99, 0x29,
0x78, 0xf8, 0xb0, 0xd6, 0x21, 0x80 } }
gEfiCapsuleCrashLogVarGuid = { 0xf3ff1468, 0x04ba, 0x4966, { 0x9f, 0xb2,
0xe4, 0xa7, 0x90, 0x05, 0x46,
[edk2] [Patch] Vlv2TbltDevicePkg:Use PiSmmCpu of UefiCpuPkg replace IA32FamilyCpuPkg.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 4 ++-- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 4 ++-- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 6 -- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 -- Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 6 -- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index a499006..2ce2217 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -540,15 +540,15 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # # SMM # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf # INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 72a0d2b..92284ee 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -497,15 +497,15 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET # # SMM # INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf +INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf -INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf +INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf # INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 466de88..9865785 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -398,10 +398,12 @@ ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf + SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf + SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !endif @@ -1328,14 +1330,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf !endif } - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCpuDxeSmm.inf + UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf - $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf + UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf $(PLATFORM_BINARY_P
[edk2] [Patch] Vlv2TbltDevicePkg: Fixed build error issue.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf | 4 ++-- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf index f1f2635..c19edac 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf +++ b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf @@ -1,8 +1,8 @@ ## @file # -# Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved +# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. # The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php. @@ -134,11 +134,11 @@ gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection + gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoverySize gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index ace2d73..466de88 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -696,11 +696,11 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|FALSE ## This PCD specifies whether to use the optimized timing for best PS2 detection performance. # Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE + gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE ### # # Begin of MRC parameters # diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 9af9088..b7e1446 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -696,11 +696,11 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|FALSE ## This PCD specifies whether to use the optimized timing for best PS2 detection performance. # Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE + gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE ### # # Begin of MRC parameters # diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 152bf67..b4a35ee 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -696,11 +696,11 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLegacyBiosCacheLegacyRegion|FALSE ## This PCD specifies whether to use the optimized timing for best PS2 detection performance. # Note this PCD could be set to TRUE for best boot performance and set to FALSE for best device compatibility. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE + gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection|TRUE ### # # Begin of MRC parameters # -- 2.6.2.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2TbltDevicePkg: Update BIOS ID to V0.92.
Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2TbltDevicePkg/BiosIdD.env| 2 +- Vlv2TbltDevicePkg/BiosIdR.env| 2 +- Vlv2TbltDevicePkg/BiosIdx64D.env | 2 +- Vlv2TbltDevicePkg/BiosIdx64R.env | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index 28da4d3..80fe281 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -33,7 +33,7 @@ BOARD_REV = 1 OEM_ID= I32 BUILD_TYPE= D BOARD_ID = BLAKCRB -VERSION_MAJOR = 0091 +VERSION_MAJOR = 0092 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index 971f32d..219d2a2 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -33,7 +33,7 @@ BOARD_REV = 1 OEM_ID= I32 BUILD_TYPE= R BOARD_ID = BLAKCRB -VERSION_MAJOR = 0091 +VERSION_MAJOR = 0092 VERSION_MINOR = 01 diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index 061a991..a6fb2ed 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -23,8 +23,8 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= D -VERSION_MAJOR = 0091 +VERSION_MAJOR = 0092 VERSION_MINOR = 01 BOARD_ID = BBAYCRB diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index 9334e55..fdf1356 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -23,8 +23,8 @@ BOARD_REV = 1 OEM_ID= X64 BUILD_TYPE= R -VERSION_MAJOR = 0091 +VERSION_MAJOR = 0092 VERSION_MINOR = 01 BOARD_ID = BBAYCRB -- 2.6.2.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] Vlv2DeviceRefcodePkg:Add setup option to control _STA of LPE Audio
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl | 3 ++-
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl| 12 +---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl| 7 +--
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 3 ++-
Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 3 ++-
Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h | 3 ++-
.../PlatformSetupDxe/SouthClusterConfig.vfi| 11 ++-
Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni | Bin 66540 -> 66864 bytes
Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | Bin 215420 -> 216022 bytes
9 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
index 21e526c..32cfd9d 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
@@ -3,11 +3,11 @@
;**;
;*Intel Corporation - ACPI Reference Code for the Baytrail*;
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved *;
+;*Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
; The full text of the license may be found at
; http://opensource.org/licenses/bsd-license.php.
@@ -347,7 +347,8 @@ Field(GNVS,AnyAcc,Lock,Preserve)
Offset(792),
EDPV, 8, //(792) Check for eDP display device
DIDX, 32, //(793) Device ID for eDP device
IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT
project.
BATT, 8, //(795) The Flag of RTC Battery Prensent.
+ LPAD, 8, //(796)
}
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
index 38dac87..0d12719 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl
@@ -3,11 +3,11 @@
;**;
;*Intel Corporation - ACPI Reference Code for the Baytrail*;
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved*;
+;*Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved*;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
; The full text of the license may be found at
; http://opensource.org/licenses/bsd-license.php.
@@ -137,11 +137,14 @@ scope (\_SB)
Method (_STA, 0x0, NotSerialized)
{
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0)))
{
-Return (0xF)
+If(LEqual(LPAD, 1))
+{
+ Return (0xF)
+}
}
Return (0x0)
}
Method (_DIS, 0x0, NotSerialized)
@@ -216,11 +219,14 @@ scope (\_SB)
Method (_STA, 0x0, NotSerialized)
{
If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1)))
{
-Return (0xF)
+If(LEqual(LPAD, 1))
+{
+ Return (0xF)
+}
}
Return (0x0)
}
Method (_DIS, 0x0, NotSerialized)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
index 3e61e79..ecb20c1 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl
@@ -3,11 +3,11 @@
;**;
;*Intel Corporation - ACPI Reference Code for the Baytrail*;
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved*;
+;*Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved*;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
; The full text of the license may be foun
[edk2] [Patch] Vlv2DeviceRefCodePkg/Vlv2TbltDevicePkg: Reset BIOS Setup when Jumper is present on Turbot.
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../SouthCluster/Include/Library/PchPlatformLib.h | 9 ++
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 19 ++--
.../MultiPlatformLib/BoardClkGens/BoardClkGens.c | 6 +-
.../MultiPlatformLib/BoardClkGens/BoardClkGens.h | 2 +
.../MultiPlatformLib/BoardGpios/BoardGpios.c | 15 +++
.../MultiPlatformLib/BoardGpios/BoardGpios.h | 1 +
.../Library/MultiPlatformLib/MultiPlatformLib.inf | 1 +
.../Library/PchPlatformLib/PchPlatformLibrary.c| 108 +
.../Library/PlatformBdsLib/BdsPlatform.c | 29 --
.../Library/PlatformBdsLib/PlatformBdsLib.inf | 1 +
Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c| 8 +-
Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf | 1 +
Vlv2TbltDevicePkg/PlatformDxe/ExI.c| 8 +-
Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 51 +-
.../PlatformGopPolicy/PlatformGopPolicy.c | 9 +-
.../PlatformGopPolicy/PlatformGopPolicy.inf| 3 +
.../PlatformInfoDxe/PlatformInfoDxe.c | 9 +-
.../PlatformInfoDxe/PlatformInfoDxe.inf| 1 +
Vlv2TbltDevicePkg/PlatformInitPei/BootMode.c | 6 +-
.../PlatformInitPei/PlatformEarlyInit.c| 7 +-
Vlv2TbltDevicePkg/PlatformPei/BootMode.c | 16 +++
Vlv2TbltDevicePkg/PlatformPei/Platform.c | 7 +-
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf | 1 +
.../PlatformSetupDxe/PlatformSetupDxe.inf | 1 +
.../PlatformSetupDxe/SetupInfoRecords.c| 7 +-
Vlv2TbltDevicePkg/PlatformSmm/Platform.c | 15 ++-
26 files changed, 300 insertions(+), 41 deletions(-)
diff --git
a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Library/PchPlatformLib.h
b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Library/PchPlatformLib.h
index 8f0ca02..9651f94 100644
---
a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Library/PchPlatformLib.h
+++
b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Library/PchPlatformLib.h
@@ -115,7 +115,16 @@ PchAlternateAccessMode (
@retval NONE
**/
;
+UINT32
+DetectTurbotBoard (
+VOID
+ );
+
+UINT32
+DetectGpioPinValue (
+VOID
+ );
#endif
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 2ff14ec..a7e54e3 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -646,10 +646,11 @@ OnReadyToBoot (
SYSTEM_CONFIGURATIONSetupVarBuffer;
UINTN VariableSize;
EFI_PLATFORM_CPU_INFO *PlatformCpuInfoPtr = NULL;
EFI_PLATFORM_CPU_INFO PlatformCpuInfo;
EFI_PEI_HOB_POINTERS GuidHob;
+ UINT32 DxeGpioValue;
if (mFirstNotify) {
return;
}
@@ -684,10 +685,12 @@ OnReadyToBoot (
if ((PlatformCpuInfoPtr != NULL)) {
CopyMem(, PlatformCpuInfoPtr,
sizeof(EFI_PLATFORM_CPU_INFO));
}
+ DxeGpioValue = DetectGpioPinValue();
+
//
// Update the ACPI parameter blocks finally.
//
VariableSize = sizeof (SYSTEM_CONFIGURATION);
Status = gRT->GetVariable (
@@ -695,12 +698,12 @@ OnReadyToBoot (
,
NULL,
,
);
- if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION)) {
-//The setup variable is corrupted
+ if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION) ||
DxeGpioValue == 0) {
+//The setup variable is corrupted or detect GPIO_S5_17 Pin is low
VariableSize = sizeof(SYSTEM_CONFIGURATION);
Status = gRT->GetVariable(
L"SetupRecovery",
,
NULL,
@@ -794,10 +797,11 @@ AcpiPlatformEntryPoint (
EFI_MP_SERVICES_PROTOCOL *MpService;
UINTN MaximumNumberOfCPUs;
UINTN NumberOfEnabledCPUs;
UINT32Data32;
PCH_STEPPING pchStepping;
+ UINT32DxeGpioValue;
mFirstNotify = FALSE;
TableVersion = EFI_ACPI_TABLE_VERSION_2_0;
Instance = 0;
@@ -813,11 +817,12 @@ AcpiPlatformEntryPoint (
if (GuidHob.Raw != NULL) {
if ((GuidHob.Raw = GetNextGuidHob (, GuidHob.Raw)) !=
NULL) {
mPlatformInfo = GET_GUID_HOB_DATA (GuidHob.Guid);
}
}
-
+
+ DxeGpioValue = DetectGpioPinValue();
//
// Search for the Memory Configuration GUID HOB. If it is not present, then
// there's nothing we can do. It may not exist on the update path.
//
VarSize = sizeof(SYSTEM_CONFIGURATION);
@@ -826,12 +831,12 @@ AcpiPlatformEntryPoint (
,
NULL,
,
);
- if (EFI_ERROR (Status) || VarSize != sizeof(SYSTEM_CONFIGURATION)) {
-//The setup
[edk2] [Patch] [patch] Vlv2TbltDevicePkg: Add SsdtUpdate Application to update Ssdt table to ACPI table.
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
.../Application/SsdtUpdate/SsdtUpdate.asl | 28 +++
.../Application/SsdtUpdate/SsdtUpdate.c| 200 +
.../Application/SsdtUpdate/SsdtUpdate.h| 39
.../Application/SsdtUpdate/SsdtUpdate.inf | 64 +++
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc| 1 +
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 +
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 +
7 files changed, 334 insertions(+)
create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl
create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c
create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.h
create mode 100644 Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf
diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl
b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl
new file mode 100644
index 000..bdf48fa
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.asl
@@ -0,0 +1,28 @@
+/** @file
+ The definition block in ACPI table for Genernal device.
+
+ Copyright (c) 2015, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+DefinitionBlock (
+ "Gene.aml",
+ "SSDT",
+ 2,
+ "INTEL ",
+ "GeneTabl",
+ 0x1000
+ )
+{
+ Scope (\_SB)
+ {
+ }
+}
diff --git a/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c
b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c
new file mode 100644
index 000..f50a76d
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.c
@@ -0,0 +1,200 @@
+/** @file
+ Update SSDT table to ACPI table.
+
+ Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD
License
+ which accompanies this distribution. The full text of the license may be
found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include "SsdtUpdate.h"
+
+FV_INPUT_DATA mInputData = {0};
+
+/**
+ Read file data from given file name.
+
+ @param[in] FileNamePointer the readed given file name.
+ @param[out] Buffer The buffer which read the given file name's data.
+ @param[out] BufferSize The buffer size which read the given file name's
data.
+
+ @retval EFI_SUCCESS The file data is successfully readed.
+ @retval EFI_ERROR The file data is unsuccessfully readed.
+
+**/
+STATIC
+EFI_STATUS
+ReadFileData (
+ IN CHAR16 *FileName,
+ OUT UINT8**Buffer,
+ OUT UINT32 *BufferSize
+ )
+{
+ EFI_STATUS Status;
+ SHELL_FILE_HANDLE FileHandle;
+ UINT64 Size;
+ VOID *NewBuffer;
+ UINTN ReadSize;
+
+ FileHandle = NULL;
+ NewBuffer = NULL;
+ Size = 0;
+
+ Status = ShellOpenFileByName (FileName, , EFI_FILE_MODE_READ, 0);
+ if (EFI_ERROR (Status)) {
+goto Done;
+ }
+
+ Status = FileHandleIsDirectory (FileHandle);
+ if (!EFI_ERROR (Status)) {
+Status = EFI_NOT_FOUND;
+goto Done;
+ }
+
+ Status = FileHandleGetSize (FileHandle, );
+ if (EFI_ERROR (Status)) {
+goto Done;
+ }
+
+ NewBuffer = AllocatePool ((UINTN) Size);
+
+ ReadSize = (UINTN) Size;
+ Status = FileHandleRead (FileHandle, , NewBuffer);
+ if (EFI_ERROR (Status)) {
+goto Done;
+ } else if (ReadSize != (UINTN) Size) {
+Status = EFI_INVALID_PARAMETER;
+goto Done;
+ }
+
+Done:
+ if (FileHandle != NULL) {
+ShellCloseFile ();
+ }
+
+ if (EFI_ERROR (Status)) {
+if (NewBuffer != NULL) {
+ FreePool (NewBuffer);
+}
+ } else {
+*Buffer = NewBuffer;
+*BufferSize = (UINT32) Size;
+ }
+
+ return Status;
+}
+
+/**
+ Initialize and publish device in ACPI table.
+
+ @param[in] Table The pointer to the ACPI table which will be
published.
+ @param[in] TableSize The size of ACPI table which will be published.
+
+ @retval EFI_SUCCESS The ACPI table is published successfully.
+ @retval Others The ACPI table is not published.
+
+**/
+EFI_STATUS
+PublishAcpiTable (
+ IN UINT8 *Table,
+ IN UINT32 TableSize
+ )
+{
+ EFI_STATUS Status;
+ EFI_ACPI_TABLE_PROTOCOL*AcpiTable;
+ UINTN
[edk2] [Patch] Add BIOS Item "RTC Battery Present"
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl | 5 +++--
Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl| 14 --
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 3 ++-
Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 2 +-
Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h | 3 ++-
.../PlatformSetupDxe/SouthClusterConfig.vfi| 10 +-
Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni | Bin 65892 -> 66540 bytes
Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | Bin 214666 -> 215420 bytes
8 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
index fffc829..21e526c 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
@@ -3,11 +3,11 @@
;**;
;*Intel Corporation - ACPI Reference Code for the Baytrail*;
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved *;
+;*Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved *;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
; The full text of the license may be found at
; http://opensource.org/licenses/bsd-license.php.
@@ -345,8 +345,9 @@ Field(GNVS,AnyAcc,Lock,Preserve)
UTS, 8, //(788) Enable Test Device connected to URT for WHCK test.
SCPE, 8, //(789) Allow higher performance on AC/USB - Enable/Disable
Offset(792),
EDPV, 8, //(792) Check for eDP display device
DIDX, 32, //(793) Device ID for eDP device
- IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT
project.
+ IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT
project.
+ BATT, 8, //(795) The Flag of RTC Battery Prensent.
}
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
index 84a7ee2..2a57d0f 100644
--- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
+++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
@@ -3,11 +3,11 @@
;**;
;*Intel Corporation - ACPI Reference Code for the Sandy Bridge*;
;*Family of Customer Reference Boards.*;
;**;
;**;
-;*Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved*;
+;*Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved*;
;
; This program and the accompanying materials are licensed and made available
under
; the terms and conditions of the BSD License that accompanies this
distribution.
; The full text of the license may be found at
; http://opensource.org/licenses/bsd-license.php.
@@ -19,20 +19,30 @@
;**;
;**/
Scope(\_SB)
{
-
//RTC
Device(RTC)// RTC
{
Name(_HID,EISAID("PNP0B00"))
Name(_CRS,ResourceTemplate()
{
IO(Decode16,0x70,0x70,0x01,0x08)
})
+
+Method(_STA,0,Serialized) {
+
+ //
+ // Report RTC Battery is Prensent or Not Present.
+ //
+ If (LEqual(BATT, 1)) {
+Return (0xF)
+ }
+ Return (0x0)
+}
}
//RTC
Device(HPET) // High Performance Event Timer
{
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index c39c36d..2ff14ec 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,8 +1,8 @@
/** @file
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available
under
the terms and conditions of the BSD License that accompanies this
distribution.
@@ -966,10 +966,11 @@ AcpiPlatformEntryPoint (
mGlobalNvsArea.Area->PreviousDeviceList = 0x0F ;
mGlobalNvsArea.Area->UartSelection = mSystemConfiguration.UartInterface;
mGlobalNvsArea.Area->PcuUart1Enable
