Reviewed-by: Isaac Oram <isaac.w.o...@intel.com> -----Original Message----- From: Benjamin Doron <benjamin.doro...@gmail.com> Sent: Tuesday, September 6, 2022 10:43 AM To: devel@edk2.groups.io Cc: Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; Oram, Isaac W <isaac.w.o...@intel.com>; Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L <nathaniel.l.desim...@intel.com> Subject: [edk2-devel][edk2-platforms][PATCH v1 1/7] KabylakeOpenBoardPkg/AspireVn7Dash572G: Cleanup library includes
Remove unused includes, LibraryClasses and update a comment or two. Cc: Sai Chaganty <rangasai.v.chaga...@intel.com> Cc: Isaac Oram <isaac.w.o...@intel.com> Cc: Chasel Chiu <chasel.c...@intel.com> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> Signed-off-by: Benjamin Doron <benjamin.doro...@gmail.com> --- .../PcieDeviceTable.c | 1 - .../PeiBoardPolicyUpdate.c | 6 ++++-- .../PeiPchPolicyUpdate.h | 3 ++- .../PeiPchPolicyUpdatePreMem.c | 1 - .../PeiSiliconPolicyUpdateLibFsp.inf | 5 ++--- .../BoardAcpiLib/DxeBoardAcpiTableLib.inf | 5 +---- .../SmmAspireVn7Dash572GAcpiEnableLib.c | 9 +++++---- .../BoardAcpiLib/SmmBoardAcpiEnableLib.inf | 3 ++- .../Library/BoardEcLib/EcCommands.c | 14 ++++++++------ .../AspireVn7Dash572GHdaVerbTables.c | 3 ++- .../BoardInitLib/PeiAspireVn7Dash572GInitLib.h | 3 +-- .../PeiAspireVn7Dash572GInitPreMemLib.c | 18 +++++++++--------- .../BoardInitLib/PeiBoardInitPostMemLib.inf | 4 +--- .../BoardInitLib/PeiBoardInitPreMemLib.inf | 5 +---- .../AspireVn7Dash572G/OpenBoardPkg.fdf | 3 ++- .../OpenBoardPkgBuildOption.dsc | 4 ++-- .../DxeGopPolicyInit.h | 3 --- .../DxeSaPolicyInit.h | 3 --- .../DxeSiliconPolicyUpdateLib.c | 3 +-- .../DxeSiliconPolicyUpdateLib.inf | 2 ++ 20 files changed, 45 insertions(+), 53 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c index 205ca581c6f3..537fb5c8e4f4 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/L +++ ibrary/PeiSiliconPolicyUpdateLibFsp/PcieDeviceTable.c @@ -7,7 +7,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include "PeiPchPolicyUpdate.h"-#include <Library/PchPcieRpLib.h> #define PCI_CLASS_NETWORK 0x02 #define PCI_CLASS_NETWORK_ETHERNET 0x00diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiBoardPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiBoardPolicyUpdate.c index 81cd8b940f05..452c961b17ac 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiBoardPolicyUpdate.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/L +++ ibrary/PeiSiliconPolicyUpdateLibFsp/PeiBoardPolicyUpdate.c @@ -12,14 +12,16 @@ #include <Library/PcdLib.h> #include <PchPolicyCommon.h> -/* TODO:+/*+ * TODO: * - Validate PCH Sample policies: only SA one used by default. * - Remove likely fuse-disabled devices when reset handling is committed? * - Remove duplicate policy * - Consider updating some policies, rather than overriding. This could be factored into * BoardInitLib for deduplication * - Copy initialised array, where sane- * - Set IgdDvmt50PreAlloc? */+ * - Set IgdDvmt50PreAlloc?+ */ #define SA_VR 0 #define IA_VR 1diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h index 5e720b0041e8..134188698077 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/L +++ ibrary/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h @@ -17,10 +17,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Library/DebugLib.h> #include <Library/IoLib.h> #include <Library/MmPciLib.h>-#include <Ppi/SiPolicy.h> #include <FspEas.h> #include <FspmUpd.h> #include <FspsUpd.h> +#include <PchPolicyCommon.h>+ #endifdiff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c index 2bc142c0e5ff..28e4e45375c2 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/L +++ ibrary/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdatePreMem.c @@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "PeiPchPolicyUpdate.h" #include <Library/BaseMemoryLib.h> #include <Library/PchInfoLib.h>-#include <Library/PchPcrLib.h> #include <Library/PchHsioLib.h> #include <Library/PchPcieRpLib.h> #include <PchHsioPtssTables.h>diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf index eac9344b0aa2..0e1b42c20cd8 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/FspWrapper/L +++ ibrary/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf @@ -62,19 +62,18 @@ [LibraryClasses.IA32] FspWrapperApiLib- FspWrapperPlatformLib BaseMemoryLib DebugLib- HobLib IoLib PcdLib MmPciLib- ConfigBlockLib+ PciLib PeiSaPolicyLib PchInfoLib PchHsioLib PchPcieRpLib SiPolicyLib+ MemoryAllocationLib PeiLib [Pcd]diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf index 0d8264554734..660afe9292ec 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/DxeBoardAcpiTableLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dAcpiLib/DxeBoardAcpiTableLib.inf @@ -22,10 +22,7 @@ # [LibraryClasses]- BaseLib- IoLib- PciLib- AslUpdateLib+ PcdLib EcLib [Packages]diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c index 69e9c928ff69..fa2ed9745ea6 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dAcpiLib/SmmAspireVn7Dash572GAcpiEnableLib.c @@ -2,6 +2,7 @@ Acer Aspire VN7-572G SMM Board ACPI Enable library Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2021, Baruch Binyamin Doron<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -20,8 +21,8 @@ AspireVn7Dash572GBoardEnableAcpi ( EFI_STATUS Status; /* Tests at runtime show this re-enables charging and battery reporting- * - Obtained somewhere from somewhere in vendor's SmmKbcDriver (or RtKbcDriver).- * Further reversing will be performed */+ * - Obtained from somewhere in vendor's SmmKbcDriver.+ * Further information is needed */ Status = SendEcCommand (0xE9); /* Vendor implements using ACPI "CMDB" register" */ if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a(): SendEcCommand(0xE9) failed!\n", __FUNCTION__));@@ -48,8 +49,8 @@ AspireVn7Dash572GBoardDisableAcpi ( EFI_STATUS Status; /* Tests at runtime show this disables charging and battery reporting- * - Obtained somewhere from somewhere in vendor's SmmKbcDriver (or RtKbcDriver).- * Further reversing will be performed */+ * - Obtained from somewhere in vendor's SmmKbcDriver.+ * Further information is needed */ Status = SendEcCommand (0xE9); /* Vendor implements using ACPI "CMDB" register" */ if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a(): SendEcCommand(0xE9) failed!\n", __FUNCTION__));diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf index 63a54e1830a5..5db00224dfce 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dAcpiLib/SmmBoardAcpiEnableLib.inf @@ -23,9 +23,10 @@ [LibraryClasses] BaseLib+ DebugLib EcLib IoLib- PciLib+ PcdLib MmPciLib PchCycleDecodingLib diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c index 6e752b4e227e..54cfaba47b1b 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardEcLib/EcCommands.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dEcLib/EcCommands.c @@ -13,7 +13,8 @@ #include <Library/EcLib.h> #include <Library/IoLib.h> -/* Notes:+/*+ * Notes: * - ACPI "CMDB": Writing to this offset is equivalent to sending commands. * The CMDx bytes contain the command parameters. *@@ -21,9 +22,10 @@ * - Commands: 0x58, 0xE1 and 0xE2 * - 0x51, 0x52: EC flash write? * - ACPI CMDB: 0x63 and 0x64, 0xC7- * - 0x0B: Flash write (Boolean argument? Set in offset 0x0B?)+ * - 0x0B: Flash lock/write (Set offset 0x0B?)+ * - Key/recovery detection? *- * Reversing vendor's protocols:+ * Vendor's protocols: * - Only read and write are used. * - Query, ACPI "CMDB" processing and command 58 are unused. * - Equivalent KbcPeim is an unused PPI.@@ -32,9 +34,9 @@ */ #define EC_INDEX_IO_PORT 0x1200-#define EC_INDEX_IO_HIGH_ADDR_PORT EC_INDEX_IO_PORT+1-#define EC_INDEX_IO_LOW_ADDR_PORT EC_INDEX_IO_PORT+2-#define EC_INDEX_IO_DATA_PORT EC_INDEX_IO_PORT+3+#define EC_INDEX_IO_HIGH_ADDR_PORT (EC_INDEX_IO_PORT + 1)+#define EC_INDEX_IO_LOW_ADDR_PORT (EC_INDEX_IO_PORT + 2)+#define EC_INDEX_IO_DATA_PORT (EC_INDEX_IO_PORT + 3) /** Reads a byte of EC RAM.diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/AspireVn7Dash572GHdaVerbTables.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/AspireVn7Dash572GHdaVerbTables.c index 0573736060fa..cc7369f3484c 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/AspireVn7Dash572GHdaVerbTables.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/AspireVn7Dash572GHdaVerbTables.c @@ -2,6 +2,7 @@ HDA Verb table for Acer Aspire VN7-572G Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2021, Baruch Binyamin Doron<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -9,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef _ASPIRE_VN7_572G_HDA_VERB_TABLES_H_ #define _ASPIRE_VN7_572G_HDA_VERB_TABLES_H_ -#include <Ppi/SiPolicy.h>+#include <PchPolicyCommon.h> HDAUDIO_VERB_TABLE HdaVerbTableAlc255AspireVn7Dash572G = HDAUDIO_VERB_TABLE_INIT ( //diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitLib.h b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitLib.h index 83789c90becf..51a7b714c463 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitLib.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiAspireVn7Dash572GInitLib.h @@ -8,10 +8,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef _PEI_ASPIRE_VN7_572G_BOARD_INIT_LIB_H_ #define _PEI_ASPIRE_VN7_572G_BOARD_INIT_LIB_H_ -#include <Uefi.h>+#include <PiPei.h> #include <Library/BaseLib.h> #include <Library/PcdLib.h>-#include <Library/MemoryAllocationLib.h> #include <Library/DebugLib.h> #include <Library/GpioLib.h> #include <Ppi/SiPolicy.h>diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c index 1b4c6b484b43..d0125ebdbcb2 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiAspireVn7Dash572GInitPreMemLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiAspireVn7Dash572GInitPreMemLib.c @@ -1,6 +1,7 @@ /** @file Copyright (c) 2017 - 2022, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2021, Baruch Binyamin Doron<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/@@ -8,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <PiPei.h> #include <Library/DebugLib.h> #include <Library/IoLib.h>-#include <Library/MemoryAllocationLib.h> #include <Library/PcdLib.h> #include <Library/PchCycleDecodingLib.h> #include <Library/PchPmcLib.h>@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Library/PciLib.h> #include <Library/SiliconInitLib.h> #include <Library/TimerLib.h>-#include <Library/PeiLib.h> #include <Library/GpioLib.h> #include <GpioPinsSklLp.h>@@ -47,12 +46,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED const UINT16 RcompTargetAspireVn7Dash572G[SA_MRC_M #define DGPU_HOLD_RST GPIO_SKL_LP_GPP_B4 /* Active low */ #define DGPU_PWR_EN GPIO_SKL_LP_GPP_B21 /* Active low */ -EFI_STATUS-EFIAPI-AspireVn7Dash572GBoardDetect (- VOID- );- /** Aspire VN7-572G board configuration init function for PEI pre-memory phase. @@ -75,7 +68,7 @@ AspireVn7Dash572GInitPreMem ( // PcdSet8S (PcdSaMiscUserBd, 5); // ULT/ULX/Mobile Halo PcdSet8S (PcdMrcCaVrefConfig, 2); // DDR4: "VREF_CA to CH_A and VREF_DQ_B to CH_B"- // TODO: Clear Dq/Dqs?+ // TODO: Search vendor FW for Dq/Dqs. Unnecessary if FSP detects LPDDR PcdSetBoolS (PcdMrcDqPinsInterleaved, TRUE); PcdSet32S (PcdMrcRcompResistor, (UINTN) RcompResistorAspireVn7Dash572G);@@ -241,9 +234,16 @@ AspireVn7Dash572GBoardInitAfterMemoryInit ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_WARN, "Failed to enable LGMR. Were ACPI tables built for LGMR memory map?\n")); }+ return EFI_SUCCESS; } +EFI_STATUS+EFIAPI+AspireVn7Dash572GBoardDetect (+ VOID+ );+ EFI_STATUS EFIAPI AspireVn7Dash572GBoardDebugInit (diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPostMemLib.inf index c8c49fa20dcc..7b68f66ac78b 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPostMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiBoardInitPostMemLib.inf @@ -10,7 +10,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PeiBoardPostMemInitLib- FILE_GUID = 7fcc3900-d38d-419f-826b-72481e8b5509+ FILE_GUID = 7FCC3900-D38D-419F-826B-72481E8B5509 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = BoardInitLib@@ -18,8 +18,6 @@ [LibraryClasses] BaseLib DebugLib- BaseMemoryLib- MemoryAllocationLib PcdLib SiliconInitLib PchCycleDecodingLibdiff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.inf index c53114e15450..a3164870ef9b 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/BoardInitLib/PeiBoardInitPreMemLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Library/Boar +++ dInitLib/PeiBoardInitPreMemLib.inf @@ -10,7 +10,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PeiBoardInitPreMemLib- FILE_GUID = ec3675bc-1470-417d-826e-37378140213d+ FILE_GUID = EC3675BC-1470-417D-826E-37378140213D MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = BoardInitLib@@ -18,8 +18,6 @@ [LibraryClasses] BaseLib DebugLib- BaseMemoryLib- MemoryAllocationLib PcdLib SiliconInitLib TimerLib@@ -30,7 +28,6 @@ EcLib BoardEcLib GpioLib- PeiLib PeiServicesLib PchPmcLib diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.fdf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.fdf index 864d5561d7d8..b59d9a4f24e1 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg.fdf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg +++ .fdf @@ -279,7 +279,7 @@ INF IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf INF $(PLATFORM_PACKAGE)/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf !if gSiPkgTokenSpaceGuid.PcdPeiDisplayEnable == TRUE-FILE FREEFORM = 4ad46122-ffeb-4a52-bfb0-518cfca02db0 {+FILE FREEFORM = 4AD46122-FFEB-4A52-BFB0-518CFCA02DB0 { SECTION RAW = $(BOARD)/Vbt.bin SECTION UI = "Vbt" }@@ -346,6 +346,7 @@ APRIORI DXE { INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf +# TODO: Add NvmExpressDxe if supporting Newgate and RayleighSLS INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.infdiff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgBuildOption.dsc b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgBuildOption.dsc index b1a04c474845..6e2053d67734 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkgBuildOption.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/OpenBoardPkg +++ BuildOption.dsc @@ -84,6 +84,7 @@ DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $( DEFINE DSC_PLTPKG_FEATURE_BUILD_OPTIONS = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) $(DSC_ACPI_BUILD_OPTIONS) $(UP_SERVER_SUPPORT_BUILD_OPTIONS) $(USBTYPEC_BUILD_OPTION) $(SINITBIN_BUILD_OPTION) $(MINTREE_FLAG_BUILD_OPTION) # FIXME: $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) is passed multiple times+# BUGBUG: `-Wl,--allow-multiple-definition` breaks CLANG build [BuildOptions.Common.EDKII] #@@ -141,8 +142,7 @@ MSFT: *_*_X64_ASLCC_FLAGS = $(DSC_PLTPKG_FEATURE_BUILD_OPTIONS) MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096 GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -# FIXME: Protection broken, but works on UefiPayload, and not related to-# FspWrapperNotifyDxe. Cannot be related to SMM?+# FIXME: Protection broken, yet works on UefiPayload. Consider diffing module/library include lists (unrelated to FspWrapperNotifyDxe). # Force PE/COFF sections to be aligned at 4KB boundaries to support NX protection [BuildOptions.common.EDKII.DXE_DRIVER, BuildOptions.common.EDKII.DXE_CORE, BuildOptions.common.EDKII.UEFI_DRIVER, BuildOptions.common.EDKII.UEFI_APPLICATION] #MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h index 63cad5e3753f..56cab1df9b1d 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Libra +++ ry/DxeSiliconPolicyUpdateLib/DxeGopPolicyInit.h @@ -9,11 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define _GOP_POLICY_INIT_DXE_H_ #include <Protocol/FirmwareVolume2.h>-#include <Library/UefiLib.h> #include <Library/BaseLib.h>-#include <Library/DxeServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>-#include <Library/UefiRuntimeServicesTableLib.h> #include <Library/BaseMemoryLib.h> #include <Library/DebugLib.h> #include <Library/PcdLib.h>diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h index 801387b9476f..88a507547f69 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Libra +++ ry/DxeSiliconPolicyUpdateLib/DxeSaPolicyInit.h @@ -8,12 +8,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef _SA_POLICY_INIT_DXE_H_ #define _SA_POLICY_INIT_DXE_H_ -#include <Library/BaseMemoryLib.h>-#include <Library/MemoryAllocationLib.h> #include <Library/DebugLib.h> #include <Library/UefiBootServicesTableLib.h> #include <Protocol/SaPolicy.h>-#include <Library/DxeSaPolicyLib.h> #include <SaAccess.h> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c index 6298bb53e65d..6840531da986 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Libra +++ ry/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.c @@ -1,14 +1,13 @@ /** @file Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>+Copyright (c) 2021, Baruch Binyamin Doron<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include <Library/ConfigBlockLib.h> #include <Library/SiliconPolicyUpdateLib.h>-#include <Library/PcdLib.h>-#include <Library/DebugLib.h> #include <Protocol/GopPolicy.h> #include <Protocol/SaPolicy.h> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf index 63ac194cd0d5..989796cf8244 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/AspireVn7Dash572G/Policy/Libra +++ ry/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf @@ -17,6 +17,8 @@ [LibraryClasses] BaseLib+ BaseMemoryLib+ UefiBootServicesTableLib PcdLib DebugLib ConfigBlockLib-- 2.37.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#93616): https://edk2.groups.io/g/devel/message/93616 Mute This Topic: https://groups.io/mt/93507094/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-