From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: nathaniel.l.desimone@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Thu, 29 Aug 2019 16:40:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Aug 2019 16:40:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,445,1559545200"; d="scan'208";a="181031973" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by fmsmga008.fm.intel.com with ESMTP; 29 Aug 2019 16:40:56 -0700 Received: from orsmsx161.amr.corp.intel.com (10.22.240.84) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 29 Aug 2019 16:40:55 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.225]) by ORSMSX161.amr.corp.intel.com ([169.254.4.172]) with mapi id 14.03.0439.000; Thu, 29 Aug 2019 16:40:55 -0700 From: "Nate DeSimone" To: "Wei, David Y" , "devel@edk2.groups.io" CC: "Wu, Hao A" , "Gao, Liming" , "Sinha, Ankit" , "Agyeman, Prince" , "Kubacki, Michael A" , "Kinney, Michael D" Subject: Re: [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overridden Drivers Thread-Topic: [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overridden Drivers Thread-Index: AQHVXrswYqvfoSISHkqmAl4UkamdW6cSx1pg Date: Thu, 29 Aug 2019 23:40:54 +0000 Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAEE76B16@ORSMSX114.amr.corp.intel.com> References: <7a75e89cc8c301da42aa16bcc081233f5661a05a.1567117942.git.david.y.wei@intel.com> In-Reply-To: <7a75e89cc8c301da42aa16bcc081233f5661a05a.1567117942.git.david.y.wei@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTc4NWIzZTUtNmY0Ni00NjBmLThkNTEtMzIzNjdjOTQwYzlmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoieHl3UXBra05WbzBoYzZKZ0RjVWJmUThpQWNqaUdEeDZBdFZENHl0ZmpFakdDTCtHYlh3OU4yalBrWmducmdcL2cifQ== x-ctpclassification: CTP_NT x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: nathaniel.l.desimone@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi David, I would prefer that the contents of this patch be merged into PATCH 4 throu= gh 7 as appropriate. Thanks, Nate -----Original Message----- From: Wei, David Y=20 Sent: Thursday, August 29, 2019 3:43 PM To: devel@edk2.groups.io Cc: Wu, Hao A ; Gao, Liming ; Sin= ha, Ankit ; Agyeman, Prince ; Kubacki, Michael A ; Desimone, Nathaniel L= ; Kinney, Michael D Subject: [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overrid= den Drivers Remove overridden Drivers, rename them and relocate underSimicsOpenBoardPkg Cc: Hao Wu Cc: Liming Gao Cc: Ankit Sinha Cc: Agyeman Prince Cc: Kubacki Michael A Cc: Nate DeSimone Cc: Michael D Kinney Signed-off-by: David Wei --- .../MinPlatformAcpiTables}/AcpiPlatform.c | 2 +- .../MinPlatformAcpiTables}/Facs/Facs.c | 0 .../MinPlatformAcpiTables}/Fadt/Fadt.c | 0 .../MinPlatformAcpiTables}/Hpet/Hpet.c | 0 .../MinPlatformAcpiTables}/Wsmt/Wsmt.c | 0 .../ComponentName.c | 2 +- .../QemuVideoDxe =3D> SimicsVideoDxe}/Driver.c | 2 +- .../DriverSupportedEfiVersion.c | 2 +- .../OvmfPkg/QemuVideoDxe =3D> SimicsVideoDxe}/Gop.c | 2 +- .../QemuVideoDxe =3D> SimicsVideoDxe}/Initialize.c | 2 +- .../QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.c | 2 +- .../MinPlatformAcpiTables}/AcpiPlatform.h | 0 .../MinPlatformAcpiTables}/AcpiPlatform.inf | 0 .../BoardX58Ich10/OpenBoardPkg.dsc | 4 +- .../BoardX58Ich10/OpenBoardPkg.fdf | 4 +- .../Library/DxeLogoLib/OEMBadging.h | 83 ------------------= ---- .../Qemu.h =3D> SimicsVideoDxe/Simics.h} | 0 .../SimicsVideoDxe.inf} | 2 +- .../QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.asm | 0 .../QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.h | 0 .../QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.sh | 0 21 files changed, 12 insertions(+), 95 deletions(-) rename Platform/Intel= /SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTabl= es/MinPlatformAcpiTables}/AcpiPlatform.c (97%) rename Platform/Intel/Simic= sOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/Min= PlatformAcpiTables}/Facs/Facs.c (100%) rename Platform/Intel/SimicsOpenBoa= rdPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/MinPlatform= AcpiTables}/Fadt/Fadt.c (100%) rename Platform/Intel/SimicsOpenBoardPkg/{O= verrides/MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/MinPlatformAcpiTabl= es}/Hpet/Hpet.c (100%) rename Platform/Intel/SimicsOpenBoardPkg/{Overrides= /MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/MinPlatformAcpiTables}/Wsmt= /Wsmt.c (100%) rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg= /QemuVideoDxe =3D> SimicsVideoDxe}/ComponentName.c (97%) rename Platform/I= ntel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe =3D> SimicsVideoDxe= }/Driver.c (96%) rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfP= kg/QemuVideoDxe =3D> SimicsVideoDxe}/DriverSupportedEfiVersion.c (93%) ren= ame Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe =3D> = SimicsVideoDxe}/Gop.c (96%) rename Platform/Intel/SimicsOpenBoardPkg/{Over= rides/OvmfPkg/QemuVideoDxe =3D> SimicsVideoDxe}/Initialize.c (96%) rename = Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe =3D> Simi= csVideoDxe}/VbeShim.c (96%) rename Platform/Intel/SimicsOpenBoardPkg/{Over= rides/MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/MinPlatformAcpiTables}= /AcpiPlatform.h (100%) rename Platform/Intel/SimicsOpenBoardPkg/{Overrides= /MinPlatformPkg/Acpi/AcpiTables =3D> AcpiTables/MinPlatformAcpiTables}/Acpi= Platform.inf (100%) delete mode 100644 Platform/Intel/SimicsOpenBoardPkg/L= ibrary/DxeLogoLib/OEMBadging.h rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe/Q= emu.h =3D> SimicsVideoDxe/Simics.h} (100%) rename Platform/Intel/SimicsOpe= nBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf =3D> SimicsVideo= Dxe/SimicsVideoDxe.inf} (95%) rename Platform/Intel/SimicsOpenBoardPkg/{Ov= errides/OvmfPkg/QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.asm (100%) renam= e Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe =3D> Si= micsVideoDxe}/VbeShim.h (100%) rename Platform/Intel/SimicsOpenBoardPkg/{O= verrides/OvmfPkg/QemuVideoDxe =3D> SimicsVideoDxe}/VbeShim.sh (100%) diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/AcpiPlatform.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/= MinPlatformAcpiTables/AcpiPlatform.c similarity index 97% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/AcpiPlatform.c rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/AcpiPlatform.c index f050d8afc0..1edac89240 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiT= ables/AcpiPlatform.c +++ b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables +++ /AcpiPlatform.c @@ -1472,7 +1472,7 @@ UpdateLocalTable ( =20 for (Index =3D 0; Index < sizeof(mLocalTable)/sizeof(mLocalTable[0]); In= dex++) { CurrentTable =3D mLocalTable[Index]; - =20 + PlatformUpdateTables (CurrentTable, &Version); =20 TableHandle =3D 0; diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/Facs/Facs.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Min= PlatformAcpiTables/Facs/Facs.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/Facs/Facs.c rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/Facs/Facs.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/Fadt/Fadt.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Min= PlatformAcpiTables/Fadt/Fadt.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/Fadt/Fadt.c rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/Fadt/Fadt.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/Hpet/Hpet.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Min= PlatformAcpiTables/Hpet/Hpet.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/Hpet/Hpet.c rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/Hpet/Hpet.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/Wsmt/Wsmt.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/Min= PlatformAcpiTables/Wsmt/Wsmt.c similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/Wsmt/Wsmt.c rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/Wsmt/Wsmt.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/ComponentName.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Compo= nentName.c similarity index 97% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/ComponentName.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/ComponentName.c index d6d1d451df..b1286b0b64 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Comp= onentName.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/ComponentName.c @@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "Qemu.h" +#include "Simics.h" =20 // // EFI Component Name Protocol diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/Driver.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c similarity index 96% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/Driver.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c index e49e7a465c..15f03812bf 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Driv= er.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "Qemu.h" +#include "Simics.h" #include =20 EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding =3D { diff --git a/Pla= tform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/DriverSupport= edEfiVersion.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSup= portedEfiVersion.c similarity index 93% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/DriverSupportedEfiVersion.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSupportedE= fiVersion.c index af658f9f60..a743056382 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Driv= erSupportedEfiVersion.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSupportedEf +++ iVersion.c @@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "Qemu.h" +#include "Simics.h" =20 EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gQemuVideoDriverSupportedEfiVers= ion =3D { sizeof (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL), // Size of Protocol = structure. diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/Gop.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Gop.c similarity index 96% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/Gop.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Gop.c index 5158e4851e..bbb82fe867 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Gop.= c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Gop.c @@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "Qemu.h" +#include "Simics.h" =20 STATIC VOID diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/Initialize.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initiali= ze.c similarity index 96% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/Initialize.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initialize.c index 543d360861..c8a76636af 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Init= ialize.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initialize.c @@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 -#include "Qemu.h" +#include "Simics.h" =20 =20 /// diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/VbeShim.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c similarity index 96% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/VbeShim.c rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c index aa4648f813..ba13e3d8e5 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeS= him.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c @@ -21,7 +21,7 @@ #include #include =20 -#include "Qemu.h" +#include "Simics.h" #include "VbeShim.h" =20 #pragma pack (1) diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/AcpiPlatform.h b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/= MinPlatformAcpiTables/AcpiPlatform.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/AcpiPlatform.h rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/AcpiPlatform.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acp= i/AcpiTables/AcpiPlatform.inf b/Platform/Intel/SimicsOpenBoardPkg/AcpiTable= s/MinPlatformAcpiTables/AcpiPlatform.inf similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi= /AcpiTables/AcpiPlatform.inf rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTable= s/AcpiPlatform.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.d= sc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index d75d33b494..baaaddc772 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -163,7 +163,7 @@ # # Video support # - $(BOARD_PKG)/Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + $(BOARD_PKG)/SimicsVideoDxe/SimicsVideoDxe.inf =20 MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf @@ -224,7 +224,7 @@ # ACPI Support # MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf - $(BOARD_PKG)/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf + $(BOARD_PKG)/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf =20 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable =3D=3D TRUE AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.f= df b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index bd97f7a3e2..df7cddfd7a 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -219,10 +219,10 @@ INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardD= xe.inf INF $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf =20 INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf -INF $(BOARD_PKG)/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.in= f +INF $(BOARD_PKG)/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf INF RuleOverride=3DACPITABLE $(BOARD_PKG)/AcpiTables/AcpiTables.inf =20 -INF $(BOARD_PKG)/Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +INF $(BOARD_PKG)/SimicsVideoDxe/SimicsVideoDxe.inf INF MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf INF MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf INF $(BOARD_PKG)/SimicsDxe/SimicsDxe.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/OEMBadgin= g.h b/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/OEMBadging.h deleted file mode 100644 index 4f06bae5d1..0000000000 --- a/Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/OEMBadging.h +++ /dev/null @@ -1,83 +0,0 @@ -/** @file - The OEM Badging Protocol defines the interface to get the OEM badging - image with the display attribute. This protocol can be produced based on= OEM badging images. - - Copyright (c) 2006 - 2019 Intel Corporation. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __EFI_OEM_BADGING_H__ -#define __EFI_OEM_BADGING_H__ - -// -// GUID for EFI OEM Badging Protocol -// -#define EFI_OEM_BADGING_PROTOCOL_GUID \ - { 0x170e13c0, 0xbf1b, 0x4218, {0x87, 0x1d, 0x2a, 0xbd, 0xc6, 0xf8, 0x87,= 0xbc } } - - -typedef struct _EFI_OEM_BADGING_PROTOCOL EFI_OEM_BADGING_PROTOCOL; - -typedef enum { - EfiBadgingFormatBMP, - EfiBadgingFormatJPEG, - EfiBadgingFormatTIFF, - EfiBadgingFormatGIF, - EfiBadgingFormatUnknown -} EFI_BADGING_FORMAT; - -typedef enum { - EfiBadgingDisplayAttributeLeftTop, - EfiBadgingDisplayAttributeCenterTop, - EfiBadgingDisplayAttributeRightTop, - EfiBadgingDisplayAttributeCenterRight, - EfiBadgingDisplayAttributeRightBottom, - EfiBadgingDisplayAttributeCenterBottom, - EfiBadgingDisplayAttributeLeftBottom, - EfiBadgingDisplayAttributeCenterLeft, - EfiBadgingDisplayAttributeCenter, - EfiBadgingDisplayAttributeCustomized -} EFI_BADGING_DISPLAY_ATTRIBUTE; - -/** - - Load an OEM badge image and return its data and attributes. - - @param This The pointer to this protocol instance. - @param Instance The visible image instance is found. - @param Format The format of the image. Examples: BMP, JPEG. - @param ImageData The image data for the badge file. Currently on= ly=20 - supports the .bmp file format.=20 - @param ImageSize The size of the image returned. - @param Attribute The display attributes of the image returned. - @param CoordinateX The X coordinate of the image. - @param CoordinateY The Y coordinate of the image. - - @retval EFI_SUCCESS The image was fetched successfully. - @retval EFI_NOT_FOUND The specified image could not be found. - -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_BADGING_GET_IMAGE)( - IN EFI_OEM_BADGING_PROTOCOL *This, - IN OUT UINT32 *Instance, - OUT EFI_BADGING_FORMAT *Format, - OUT UINT8 **ImageData, - OUT UINTN *ImageSize, - OUT EFI_BADGING_DISPLAY_ATTRIBUTE *Attribute, - OUT UINTN *CoordinateX, - OUT UINTN *CoordinateY -); - - -struct _EFI_OEM_BADGING_PROTOCOL { - EFI_BADGING_GET_IMAGE GetImage; -}; - - -extern EFI_GUID gEfiOEMBadgingProtocolGuid; - -#endif diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/Qemu.h b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Simics.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/Qemu.h rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Simics.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/QemuVideoDxe.inf b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Simi= csVideoDxe.inf similarity index 95% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/QemuVideoDxe.inf rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/SimicsVideoDxe.i= nf index 4143487366..002cb56826 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Qemu= VideoDxe.inf +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/SimicsVideoDxe.in +++ f @@ -32,7 +32,7 @@ DriverSupportedEfiVersion.c Gop.c Initialize.c - Qemu.h + Simics.h =20 [Sources.Ia32, Sources.X64] VbeShim.c diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/VbeShim.asm b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.a= sm similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/VbeShim.asm rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.asm diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/VbeShim.h b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.h similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/VbeShim.h rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.h diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoD= xe/VbeShim.sh b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.sh similarity index 100% rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDx= e/VbeShim.sh rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.sh -- 2.16.2.windows.1