From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web09.350.1572637878422956207 for ; Fri, 01 Nov 2019 12:51:18 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: prince.agyeman@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2019 12:51:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,256,1569308400"; d="scan'208";a="203952097" Received: from paagyema-desk2.amr.corp.intel.com ([10.24.15.58]) by orsmga003.jf.intel.com with ESMTP; 01 Nov 2019 12:51:16 -0700 From: "Agyeman, Prince" To: devel@edk2.groups.io Cc: Michael Kubacki , Chasel Chiu , Nate DeSimone Subject: [edk2-platforms] [PATCH 2/5] Platform/Intel: Move Sio Dxe Driver Date: Fri, 1 Nov 2019 12:51:13 -0700 Message-Id: <20191101195116.23212-3-prince.agyeman@intel.com> X-Mailer: git-send-email 2.19.1.windows.1 In-Reply-To: <20191101195116.23212-1-prince.agyeman@intel.com> References: <20191101195116.23212-1-prince.agyeman@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Moved LegacySioDxe from SimicsOpenBoardPkg to BoardModulePkg as LegacySioDxe is generic and can be shared between open board packages Removed unused libraries and functions in LegacySioDxe Pointed BoardX58Ich10 to the current LegacySioDxe location Cc: Michael Kubacki Cc: Chasel Chiu Cc: Nate DeSimone Signed-off-by: Prince Agyeman --- Platform/Intel/BoardModulePkg/BoardModulePkg.dsc | 1 + .../LegacySioDxe/ComponentName.c | 0 .../LegacySioDxe/ComponentName.h | 0 .../LegacySioDxe/LegacySioDxe.inf | 3 --- .../LegacySioDxe/Register.h | 0 .../LegacySioDxe/SioChip.c | 2 -- .../LegacySioDxe/SioChip.h | 10 ---------- .../LegacySioDxe/SioDriver.c | 0 .../LegacySioDxe/SioDriver.h | 1 - .../LegacySioDxe/SioService.c | 0 .../LegacySioDxe/SioService.h | 0 .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 2 +- .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 2 +- 13 files changed, 3 insertions(+), 18 deletions(-) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/ComponentName.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/ComponentName.h (100%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/LegacySioDxe.inf (92%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/Register.h (100%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioChip.c (94%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioChip.h (93%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioDriver.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioDriver.h (95%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioService.c (100%) rename Platform/Intel/{SimicsOpenBoardPkg => BoardModulePkg}/LegacySioDxe/SioService.h (100%) diff --git a/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc b/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc index 5ec68ceebf..fffc135d75 100644 --- a/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc +++ b/Platform/Intel/BoardModulePkg/BoardModulePkg.dsc @@ -76,6 +76,7 @@ [Components] BoardModulePkg/FirmwareBootMediaInfo/FirmwareBootMediaInfoPei.inf + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf BoardModulePkg/Library/CmosAccessLib/CmosAccessLib.inf BoardModulePkg/Library/PlatformCmosAccessLibNull/PlatformCmosAccessLibNull.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.c b/Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.h b/Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/ComponentName.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/ComponentName.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.inf b/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf similarity index 92% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.inf rename to Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf index 275f36ca47..d606ba43dc 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/LegacySioDxe.inf +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/LegacySioDxe.inf @@ -28,11 +28,8 @@ MemoryAllocationLib PcdLib DevicePathLib - IoLib UefiDriverEntryPoint UefiBootServicesTableLib - S3BootScriptLib - S3IoLib [Packages] MdePkg/MdePkg.dec diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/Register.h b/Platform/Intel/BoardModulePkg/LegacySioDxe/Register.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/Register.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/Register.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c similarity index 94% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c index b9a7b9cd24..81efe3c38b 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.c +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.c @@ -7,9 +7,7 @@ **/ #include "SioDriver.h" -#include -LOCAL_IO_WRITE8 mIoWrite8 = IoWrite8; // // System configuration (setup) information // diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h similarity index 93% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h index 48e28c44b0..9322365923 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioChip.h +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioChip.h @@ -46,16 +46,6 @@ typedef struct { ACPI_RESOURCE_HEADER_PTR PossibleResources; } DEVICE_INFO; - -/** - Initialize the SIO chip for S3. -**/ -VOID -SioInitForS3 ( - VOID - ); - - /** Return the supported devices. diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.c b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h similarity index 95% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h index 2e75871f7f..8817019fbf 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioDriver.h +++ b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioDriver.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.c b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.c rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.h b/Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/LegacySioDxe/SioService.h rename to Platform/Intel/BoardModulePkg/LegacySioDxe/SioService.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 78f1e80990..f91f71e246 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -280,7 +280,7 @@ ####################################### $(BOARD_PKG)/AcpiTables/AcpiTables.inf $(BOARD_PKG)/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf - $(BOARD_PKG)/LegacySioDxe/LegacySioDxe.inf + BoardModulePkg/LegacySioDxe/LegacySioDxe.inf $(BOARD_PKG)/SimicsDxe/SimicsDxe.inf $(BOARD_PKG)/SimicsVideoDxe/SimicsVideoDxe.inf $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index 39226251a7..590e01a14e 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -213,7 +213,7 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf -INF $(BOARD_PKG)/LegacySioDxe/LegacySioDxe.inf +INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf INF $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf -- 2.19.1.windows.1