Merger trackers #7807 and #8372.

[mirror_edk2.git] / Nt32Pkg / PlatformBdsDxe / PlatformData.c

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformData.c b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
index c2beec9bcec2d60f03bd11837397ad234e20fe14..e67de004b8b6b35f09720660e28e2e46820326a9 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/PlatformData.c
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformData.c
@@ -20,11 +20,6 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
-\r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
 #include <Protocol/WinNtThunk.h>\r
@@ -186,62 +181,6 @@ NT_ISA_SERIAL_DEVICE_PATH   gNtSerialDevicePath1 = {
   gEndEntire\r
 };\r
 \r
-NT_PLATFORM_CPU_MODEL_VIRTUAL_DEVICE_PATH gCpuModelDevicePath = {\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
-    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
-  },\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_WIN_NT_CPU_MODEL_GUID,\r
-    0\r
-  },\r
-  gEndEntire\r
-};\r
-\r
-NT_PLATFORM_CPU_SPEED_VIRTUAL_DEVICE_PATH gCpuSpeedDevicePath = {\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
-    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
-  },\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_WIN_NT_CPU_SPEED_GUID,\r
-    0\r
-  },\r
-  gEndEntire\r
-};\r
-\r
-NT_PLATFORM_MEMORY_VIRTUAL_DEVICE_PATH gMemoryDevicePath = {\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
-    EFI_WIN_NT_THUNK_PROTOCOL_GUID\r
-  },\r
-  {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (WIN_NT_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_WIN_NT_MEMORY_GUID,\r
-    0\r
-  },\r
-  gEndEntire\r
-};\r
 \r
 //\r
 // Predefined platform default console device path\r
@@ -271,18 +210,6 @@ BDS_CONSOLE_CONNECT_ENTRY   gPlatformConsole[] = {
     (EFI_DEVICE_PATH_PROTOCOL *) &gGopDevicePath1,\r
     (CONSOLE_OUT | CONSOLE_IN)\r
   },\r
-  {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gCpuModelDevicePath,\r
-    (CONSOLE_OUT | CONSOLE_IN)\r
-  },  \r
-  {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gCpuSpeedDevicePath,\r
-    (CONSOLE_OUT | CONSOLE_IN)\r
-  },    \r
-  {\r
-    (EFI_DEVICE_PATH_PROTOCOL *) &gMemoryDevicePath,\r
-    (CONSOLE_OUT | CONSOLE_IN)\r
-  },      \r
   {\r
     NULL,\r
     0\r