Re: [edk2-devel] [edk2-platforms Patch 1/3] PurleyOpenBoardPkg: Remove All UGA support
can you avoid the unnecessary changes (e.g.: spacing)? -Original Message- From: devel@edk2.groups.io On Behalf Of Guomin Jiang Sent: Friday, March 11, 2022 9:01 AM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Chiu, Chasel Subject: [edk2-devel] [edk2-platforms Patch 1/3] PurleyOpenBoardPkg: Remove All UGA support REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368 Remove all UGA support in PurleyOpenBoardPkg Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Guomin Jiang --- .../Library/BoardBdsHookLib/BoardBdsHook.h| 70 +-- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h index fd943b3ca793..05e0a3f8920f 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h +++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h @@ -1,7 +1,7 @@ /** @file Header file for BDS Hook Library -Copyright (c) 2020, Intel Corporation. All rights reserved. +Copyright (c) 2020 - 2022, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -55,13 +54,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// ConnectType /// -#define CONSOLE_OUT 0x0001 -#define STD_ERROR 0x0002 -#define CONSOLE_IN 0x0004 -#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR) +#define CONSOLE_OUT 0x0001 +#define STD_ERROR0x0002 +#define CONSOLE_IN 0x0004 +#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR) -extern EFI_GUID gUefiShellFileGuid; -extern EFI_BOOT_MODE gBootMode; +extern EFI_GUID gUefiShellFileGuid; +extern EFI_BOOT_MODE gBootMode; #define gPciRootBridge \ { \ @@ -83,67 +82,66 @@ extern EFI_BOOT_MODE gBootMode; } typedef struct { - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - UINTN ConnectType; + EFI_DEVICE_PATH_PROTOCOL*DevicePath; + UINTN ConnectType; } BDS_CONSOLE_CONNECT_ENTRY; // // Platform Root Bridge // typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_ROOT_BRIDGE_DEVICE_PATH; // // Below is the platform console device path // typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH IsaBridge; - ACPI_HID_DEVICE_PATH Keyboard; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH IsaBridge; + ACPI_HID_DEVICE_PATHKeyboard; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_KEYBOARD_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH PciDevice; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH PciDevice; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_ONBOARD_CONTROLLER_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH Pci0Device; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH Pci0Device; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_PEG_ROOT_CONTROLLER_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH PciBridge; - PCI_DEVICE_PATH PciDevice; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH PciBridge; + PCI_DEVICE_PATH PciDevice; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_PCI_CONTROLLER_DEVICE_PATH; // // Below is the boot option device path // -#define CLASS_HID 3 -#define SUBCLASS_BOOT 1 -#define PROTOCOL_KEYBOARD 1 +#define CLASS_HID 3 +#define SUBCLASS_BOOT 1 +#define PROTOCOL_KEYBOARD 1 typedef struct { - USB_CLASS_DEVICE_PATH UsbClass; - EFI_DEVICE_PATH_PROTOCOLEnd; + USB_CLASS_DEVICE_PATH UsbClass; + EFI_DEVICE_PATH_PROTOCOLEnd; } USB_CLASS_FORMAT_DEVICE_PATH; -extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; +extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; // // Platform BDS Functions // - /** Perform the memory test base on the memory test intensive level, and update the memory resource. @@ -156,7 +154,7 @@ extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; **/ EFI_STATUS
[edk2-devel] [edk2-platforms Patch 1/3] PurleyOpenBoardPkg: Remove All UGA support
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2368 Remove all UGA support in PurleyOpenBoardPkg Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Guomin Jiang --- .../Library/BoardBdsHookLib/BoardBdsHook.h| 70 +-- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h index fd943b3ca793..05e0a3f8920f 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h +++ b/Platform/Intel/PurleyOpenBoardPkg/Override/Platform/Intel/BoardModulePkg/Library/BoardBdsHookLib/BoardBdsHook.h @@ -1,7 +1,7 @@ /** @file Header file for BDS Hook Library -Copyright (c) 2020, Intel Corporation. All rights reserved. +Copyright (c) 2020 - 2022, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include -#include #include #include #include @@ -55,13 +54,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent /// /// ConnectType /// -#define CONSOLE_OUT 0x0001 -#define STD_ERROR 0x0002 -#define CONSOLE_IN 0x0004 -#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR) +#define CONSOLE_OUT 0x0001 +#define STD_ERROR0x0002 +#define CONSOLE_IN 0x0004 +#define CONSOLE_ALL (CONSOLE_OUT | CONSOLE_IN | STD_ERROR) -extern EFI_GUID gUefiShellFileGuid; -extern EFI_BOOT_MODE gBootMode; +extern EFI_GUID gUefiShellFileGuid; +extern EFI_BOOT_MODE gBootMode; #define gPciRootBridge \ { \ @@ -83,67 +82,66 @@ extern EFI_BOOT_MODE gBootMode; } typedef struct { - EFI_DEVICE_PATH_PROTOCOL *DevicePath; - UINTN ConnectType; + EFI_DEVICE_PATH_PROTOCOL*DevicePath; + UINTN ConnectType; } BDS_CONSOLE_CONNECT_ENTRY; // // Platform Root Bridge // typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_ROOT_BRIDGE_DEVICE_PATH; // // Below is the platform console device path // typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH IsaBridge; - ACPI_HID_DEVICE_PATH Keyboard; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH IsaBridge; + ACPI_HID_DEVICE_PATHKeyboard; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_KEYBOARD_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH PciDevice; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH PciDevice; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_ONBOARD_CONTROLLER_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH Pci0Device; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH Pci0Device; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_PEG_ROOT_CONTROLLER_DEVICE_PATH; typedef struct { - ACPI_HID_DEVICE_PATH PciRootBridge; - PCI_DEVICE_PATH PciBridge; - PCI_DEVICE_PATH PciDevice; - EFI_DEVICE_PATH_PROTOCOL End; + ACPI_HID_DEVICE_PATHPciRootBridge; + PCI_DEVICE_PATH PciBridge; + PCI_DEVICE_PATH PciDevice; + EFI_DEVICE_PATH_PROTOCOLEnd; } PLATFORM_PCI_CONTROLLER_DEVICE_PATH; // // Below is the boot option device path // -#define CLASS_HID 3 -#define SUBCLASS_BOOT 1 -#define PROTOCOL_KEYBOARD 1 +#define CLASS_HID 3 +#define SUBCLASS_BOOT 1 +#define PROTOCOL_KEYBOARD 1 typedef struct { - USB_CLASS_DEVICE_PATH UsbClass; - EFI_DEVICE_PATH_PROTOCOLEnd; + USB_CLASS_DEVICE_PATH UsbClass; + EFI_DEVICE_PATH_PROTOCOLEnd; } USB_CLASS_FORMAT_DEVICE_PATH; -extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; +extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; // // Platform BDS Functions // - /** Perform the memory test base on the memory test intensive level, and update the memory resource. @@ -156,7 +154,7 @@ extern USB_CLASS_FORMAT_DEVICE_PATH gUsbClassKeyboardDevicePath; **/ EFI_STATUS MemoryTest ( - IN EXTENDMEM_COVERAGE_LEVEL Level + IN EXTENDMEM_COVERAGE_LEVEL Level ); /** @@ -167,10 +165,9 @@ MemoryTest ( **/ VOID ConnectSequence ( - IN EFI_BOOT_MODE BootMode + IN EFI_BOOT_MODE BootMode ); - /** Compares boot priorities of two boot options @@ -195,7 +192,6 @@ Register