public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "Wei, David Y" <david.y.wei@intel.com>,
	"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Wu, Hao A" <hao.a.wu@intel.com>,
	"Gao, Liming" <liming.gao@intel.com>,
	"Sinha, Ankit" <ankit.sinha@intel.com>,
	"Agyeman, Prince" <prince.agyeman@intel.com>,
	"Kubacki, Michael A" <michael.a.kubacki@intel.com>,
	"Kinney, Michael D" <michael.d.kinney@intel.com>
Subject: Re: [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overridden Drivers
Date: Thu, 29 Aug 2019 23:40:54 +0000	[thread overview]
Message-ID: <02A34F284D1DA44BB705E61F7180EF0AAEE76B16@ORSMSX114.amr.corp.intel.com> (raw)
In-Reply-To: <7a75e89cc8c301da42aa16bcc081233f5661a05a.1567117942.git.david.y.wei@intel.com>

Hi David,

I would prefer that the contents of this patch be merged into PATCH 4 through 7 as appropriate.

Thanks,
Nate

-----Original Message-----
From: Wei, David Y 
Sent: Thursday, August 29, 2019 3:43 PM
To: devel@edk2.groups.io
Cc: Wu, Hao A <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>; Sinha, Ankit <ankit.sinha@intel.com>; Agyeman, Prince <prince.agyeman@intel.com>; Kubacki, Michael A <michael.a.kubacki@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overridden Drivers

Remove overridden Drivers, rename them and relocate underSimicsOpenBoardPkg

Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Agyeman Prince <prince.agyeman@intel.com>
Cc: Kubacki Michael A <michael.a.kubacki@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Signed-off-by: David Wei <david.y.wei@intel.com>
---
 .../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 => SimicsVideoDxe}/Driver.c       |  2 +-
 .../DriverSupportedEfiVersion.c                    |  2 +-
 .../OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/Gop.c  |  2 +-
 .../QemuVideoDxe => SimicsVideoDxe}/Initialize.c   |  2 +-
 .../QemuVideoDxe => 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 => SimicsVideoDxe/Simics.h}             |  0
 .../SimicsVideoDxe.inf}                            |  2 +-
 .../QemuVideoDxe => SimicsVideoDxe}/VbeShim.asm    |  0
 .../QemuVideoDxe => SimicsVideoDxe}/VbeShim.h      |  0
 .../QemuVideoDxe => SimicsVideoDxe}/VbeShim.sh     |  0
 21 files changed, 12 insertions(+), 95 deletions(-)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/AcpiPlatform.c (97%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/Facs/Facs.c (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/Fadt/Fadt.c (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/Hpet/Hpet.c (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/Wsmt/Wsmt.c (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/ComponentName.c (97%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/Driver.c (96%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/DriverSupportedEfiVersion.c (93%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/Gop.c (96%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/Initialize.c (96%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/VbeShim.c (96%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/AcpiPlatform.h (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/MinPlatformPkg/Acpi/AcpiTables => AcpiTables/MinPlatformAcpiTables}/AcpiPlatform.inf (100%)  delete mode 100644 Platform/Intel/SimicsOpenBoardPkg/Library/DxeLogoLib/OEMBadging.h
 rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe/Qemu.h => SimicsVideoDxe/Simics.h} (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf => SimicsVideoDxe/SimicsVideoDxe.inf} (95%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/VbeShim.asm (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/VbeShim.h (100%)  rename Platform/Intel/SimicsOpenBoardPkg/{Overrides/OvmfPkg/QemuVideoDxe => SimicsVideoDxe}/VbeShim.sh (100%)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/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/MinPlatformAcpiTables/AcpiPlatform.c
index f050d8afc0..1edac89240 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables
+++ /AcpiPlatform.c
@@ -1472,7 +1472,7 @@ UpdateLocalTable (
 
   for (Index = 0; Index < sizeof(mLocalTable)/sizeof(mLocalTable[0]); Index++) {
     CurrentTable = mLocalTable[Index];
-  
+
     PlatformUpdateTables (CurrentTable, &Version);
 
     TableHandle = 0;
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Facs/Facs.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Facs/Facs.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Fadt/Fadt.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Fadt/Fadt.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Hpet/Hpet.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Hpet/Hpet.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Wsmt/Wsmt.c
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/Wsmt/Wsmt.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/ComponentName.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/ComponentName.c
similarity index 97%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/ComponentName.c
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/ComponentName.c
index d6d1d451df..b1286b0b64 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/ComponentName.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/ComponentName.c
@@ -6,7 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent  **/
 
-#include "Qemu.h"
+#include "Simics.h"
 
 //
 // EFI Component Name Protocol
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Driver.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c
similarity index 96%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Driver.c
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c
index e49e7a465c..15f03812bf 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Driver.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Driver.c
@@ -7,7 +7,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent  **/
 
-#include "Qemu.h"
+#include "Simics.h"
 #include <IndustryStandard/Acpi.h>
 
 EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = { diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/DriverSupportedEfiVersion.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSupportedEfiVersion.c
similarity index 93%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/DriverSupportedEfiVersion.c
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSupportedEfiVersion.c
index af658f9f60..a743056382 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/DriverSupportedEfiVersion.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/DriverSupportedEf
+++ iVersion.c
@@ -6,7 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent  **/
 
-#include "Qemu.h"
+#include "Simics.h"
 
 EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL gQemuVideoDriverSupportedEfiVersion = {
   sizeof (EFI_DRIVER_SUPPORTED_EFI_VERSION_PROTOCOL), // Size of Protocol structure.
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Gop.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Gop.c
similarity index 96%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/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  **/
 
-#include "Qemu.h"
+#include "Simics.h"
 
 STATIC
 VOID
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Initialize.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initialize.c
similarity index 96%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Initialize.c
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initialize.c
index 543d360861..c8a76636af 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Initialize.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Initialize.c
@@ -6,7 +6,7 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent  **/
 
-#include "Qemu.h"
+#include "Simics.h"
 
 
 ///
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c
similarity index 96%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.c
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c
index aa4648f813..ba13e3d8e5 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.c
@@ -21,7 +21,7 @@
 #include <Library/PrintLib.h>
 #include <SimicsPlatforms.h>
 
-#include "Qemu.h"
+#include "Simics.h"
 #include "VbeShim.h"
 
 #pragma pack (1)
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/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/MinPlatformAcpiTables/AcpiPlatform.h
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf b/Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
rename to Platform/Intel/SimicsOpenBoardPkg/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc 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
 
   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
 
 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE
   AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf
diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf 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/Ps2KeyboardDxe.inf
 INF  $(BOARD_PKG)/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
 INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
-INF  $(BOARD_PKG)/Overrides/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
+INF  $(BOARD_PKG)/AcpiTables/MinPlatformAcpiTables/AcpiPlatform.inf
 INF  RuleOverride=ACPITABLE $(BOARD_PKG)/AcpiTables/AcpiTables.inf
 
-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/OEMBadging.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. <BR>
-
-  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 only 
-                           supports the .bmp file format. 
-  @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/QemuVideoDxe/Qemu.h b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Simics.h
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/Qemu.h
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/Simics.h
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/SimicsVideoDxe.inf
similarity index 95%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/SimicsVideoDxe.inf
index 4143487366..002cb56826 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/SimicsVideoDxe.in
+++ f
@@ -32,7 +32,7 @@
   DriverSupportedEfiVersion.c
   Gop.c
   Initialize.c
-  Qemu.h
+  Simics.h
 
 [Sources.Ia32, Sources.X64]
   VbeShim.c
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.asm b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.asm
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.asm
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.asm
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.h b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.h
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.h
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.h
diff --git a/Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.sh b/Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.sh
similarity index 100%
rename from Platform/Intel/SimicsOpenBoardPkg/Overrides/OvmfPkg/QemuVideoDxe/VbeShim.sh
rename to Platform/Intel/SimicsOpenBoardPkg/SimicsVideoDxe/VbeShim.sh
--
2.16.2.windows.1


  reply	other threads:[~2019-08-29 23:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-29 22:43 [edk2-platforms PATCH v3 00/11] Add Initial QSP MinPlatform Pkg for SIMICS David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 01/11] SimicsX58SktPkg: Add CPU Pkg for SimicsX58 David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 02/11] SimicsICH10Pkg: Add PCH Pkg for SimicsICH10 David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 03/11] SimicsOpenBoardPkg: Add SimicsOpenBoardPkg and its modules David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 04/11] SimicsOpenBoardPkg: Add DXE driver for Legacy Sio David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 05/11] SimicsOpenBoardPkg: Add Overrides modules and Logo image for SIMICS QSP Platform David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 06/11] SimicsOpenBoardPkg/BoardX58Ich10: Add board module for QSP Build tip David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 07/11] Platform/Intel: Add build option for SIMICS QSP Platform David Wei
2019-08-29 22:43 ` [edk2-platforms PATCH v3 08/11] SimicsOpenBoardPkg: Remove overridden Drivers David Wei
2019-08-29 23:40   ` Nate DeSimone [this message]
2019-08-29 22:43 ` [edk2-platforms PATCH v3 09/11] SimicsX58SktPkg: update the copyright years in file header David Wei
2019-08-29 23:40   ` [edk2-devel] " Nate DeSimone
2019-08-29 22:43 ` [edk2-platforms PATCH v3 10/11] SimicsIch10Pkg: " David Wei
2019-08-29 23:40   ` Nate DeSimone
2019-08-29 22:43 ` [edk2-platforms PATCH v3 11/11] SimicsOpenBoardPkg: " David Wei
2019-08-29 23:41   ` Nate DeSimone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=02A34F284D1DA44BB705E61F7180EF0AAEE76B16@ORSMSX114.amr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox