OvmfPkg: remove <FrameworkDxe.h>

The <FrameworkDxe.h> header is not used by any source file at this point,
remove it.

<FrameworkDxe.h> is a thin wrapper for including all header files under
the "OvmfPkg/Csm/Include/Framework" directory. Remove that directory at
the same time (nothing else references contents in that directory
directly).

Consequently, the "OvmfPkg/Csm/Include" directory becomes empty, and git
automatically deletes it; remove that include path from
"OvmfPkg/OvmfPkg.dec".

This shrinks the list of resources scheduled for removal to:

- GUIDs (protocols or otherwise):
  - SYSTEM_ROM_FILE_GUID (1547B4F3-3E8A-4FEF-81C8-328ED647AB1A)
  - gEfiLegacy8259ProtocolGuid

- headers:
  - Protocol/Legacy8259.h

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4588
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20231110235820.644381-28-lersek@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Corvin Köhne <corvink@FreeBSD.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>

9 files changed, 0 insertions, 926 deletions

diff --git a/OvmfPkg/Csm/Include/Framework/BootScript.h b/OvmfPkg/Csm/Include/Framework/BootScript.h
deleted file mode 100644
index ea1d03cf47..0000000000
--- a/OvmfPkg/Csm/Include/Framework/BootScript.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/** @file

-  This file contains the boot script definitions that are shared between the

-  Boot Script Executor PPI and the Boot Script Save Protocol.

-

-Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#ifndef _BOOT_SCRIPT_H_

-#define _BOOT_SCRIPT_H_

-

-#include <PiDxe.h>

-///

-/// The framework implementation defines follow opcode that are different from the PI specification:

-/// Add FRAMEWORK_ prefix to avoid naming conflict.

-///

-/// S3 Boot Script Table identifier.

-///

-#define FRAMEWORK_EFI_ACPI_S3_RESUME_SCRIPT_TABLE  0x00

-///

-/// The opcode is used to add a record for memory reads of the memory location and continues when the

-/// exit criteria is satisfied, or after a defined duration.

-///

-#define FRAMEWORK_EFI_BOOT_SCRIPT_MEM_POLL_OPCODE  0x09

-///

-/// The opcode is used to add a record for dispatching specified arbitrary code into a specified

-/// boot script table.

-///

-#define FRAMEWORK_EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE  0x0D

-///

-/// The opcode indicates the start of the boot script table.

-///

-#define FRAMEWORK_EFI_BOOT_SCRIPT_TABLE_OPCODE  0xAA

-///

-/// The opcode indicates the end of the boot script table.

-///

-#define FRAMEWORK_EFI_BOOT_SCRIPT_TERMINATE_OPCODE  0xFF

-

-#endif

diff --git a/OvmfPkg/Csm/Include/Framework/DxeCis.h b/OvmfPkg/Csm/Include/Framework/DxeCis.h
deleted file mode 100644
index d2ee61d681..0000000000
--- a/OvmfPkg/Csm/Include/Framework/DxeCis.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/** @file

-  Include file for definitions in the Intel Platform Innovation Framework for EFI

-  Driver Execution Environment Core Interface Specification (DXE CIS) Version 0.91.

-

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#ifndef _DXECIS_H_

-#define _DXECIS_H_

-

-#include <Protocol/StatusCode.h>

-

-/**

-  Functions of this type are used with the Framework MP Services Protocol and

-  the  SMM Services Table to execute a procedure on enabled APs.  The context

-  the AP should use durng execution is specified by Buffer.

-

-  @param[in]  Buffer   The pointer to the procedure's argument.

-

-**/

-typedef

-VOID

-(EFIAPI *FRAMEWORK_EFI_AP_PROCEDURE)(

-  IN  VOID  *Buffer

-  );

-

-///

-/// The Framework EFI Runtime Services Table as an extension to the EFI 1.10 Runtime Services Table.

-///

-typedef struct {

-  //

-  // Table header for the Framework EFI Runtime Services Table

-  //

-  EFI_TABLE_HEADER                Hdr;

-  //

-  // Time services

-  //

-  EFI_GET_TIME                    GetTime;

-  EFI_SET_TIME                    SetTime;

-  EFI_GET_WAKEUP_TIME             GetWakeupTime;

-  EFI_SET_WAKEUP_TIME             SetWakeupTime;

-  //

-  // Virtual memory services

-  //

-  EFI_SET_VIRTUAL_ADDRESS_MAP     SetVirtualAddressMap;

-  EFI_CONVERT_POINTER             ConvertPointer;

-  //

-  // Variable services

-  //

-  EFI_GET_VARIABLE                GetVariable;

-  EFI_GET_NEXT_VARIABLE_NAME      GetNextVariableName;

-  EFI_SET_VARIABLE                SetVariable;

-  //

-  // Misc

-  //

-  EFI_GET_NEXT_HIGH_MONO_COUNT    GetNextHighMonotonicCount;

-  EFI_RESET_SYSTEM                ResetSystem;

-  ///

-  /// A Framework extension to the EFI 1.10 runtime table.

-  /// It was moved to a protocol to avoid conflict with UEFI 2.0.

-  ///

-  EFI_REPORT_STATUS_CODE          ReportStatusCode;

-} FRAMEWORK_EFI_RUNTIME_SERVICES;

-

-///

-/// The Framework EFI Boot Services Table. Complies with the DxeCis specification.

-///

-typedef struct {

-  ///

-  /// The table header for the EFI Boot Services Table.

-  ///

-  EFI_TABLE_HEADER                              Hdr;

-

-  //

-  // Task Priority Services

-  //

-  EFI_RAISE_TPL                                 RaiseTPL;

-  EFI_RESTORE_TPL                               RestoreTPL;

-

-  //

-  // Memory Services

-  //

-  EFI_ALLOCATE_PAGES                            AllocatePages;

-  EFI_FREE_PAGES                                FreePages;

-  EFI_GET_MEMORY_MAP                            GetMemoryMap;

-  EFI_ALLOCATE_POOL                             AllocatePool;

-  EFI_FREE_POOL                                 FreePool;

-

-  //

-  // Event & Timer Services

-  //

-  EFI_CREATE_EVENT                              CreateEvent;

-  EFI_SET_TIMER                                 SetTimer;

-  EFI_WAIT_FOR_EVENT                            WaitForEvent;

-  EFI_SIGNAL_EVENT                              SignalEvent;

-  EFI_CLOSE_EVENT                               CloseEvent;

-  EFI_CHECK_EVENT                               CheckEvent;

-

-  //

-  // Protocol Handler Services

-  //

-  EFI_INSTALL_PROTOCOL_INTERFACE                InstallProtocolInterface;

-  EFI_REINSTALL_PROTOCOL_INTERFACE              ReinstallProtocolInterface;

-  EFI_UNINSTALL_PROTOCOL_INTERFACE              UninstallProtocolInterface;

-  EFI_HANDLE_PROTOCOL                           HandleProtocol;

-  EFI_HANDLE_PROTOCOL                           PcHandleProtocol;

-  EFI_REGISTER_PROTOCOL_NOTIFY                  RegisterProtocolNotify;

-  EFI_LOCATE_HANDLE                             LocateHandle;

-  EFI_LOCATE_DEVICE_PATH                        LocateDevicePath;

-  EFI_INSTALL_CONFIGURATION_TABLE               InstallConfigurationTable;

-

-  //

-  // Image Services

-  //

-  EFI_IMAGE_LOAD                                LoadImage;

-  EFI_IMAGE_START                               StartImage;

-  EFI_EXIT                                      Exit;

-  EFI_IMAGE_UNLOAD                              UnloadImage;

-  EFI_EXIT_BOOT_SERVICES                        ExitBootServices;

-

-  //

-  // Miscellaneous Services

-  //

-  EFI_GET_NEXT_MONOTONIC_COUNT                  GetNextMonotonicCount;

-  EFI_STALL                                     Stall;

-  EFI_SET_WATCHDOG_TIMER                        SetWatchdogTimer;

-

-  //

-  // DriverSupport Services

-  //

-  EFI_CONNECT_CONTROLLER                        ConnectController;

-  EFI_DISCONNECT_CONTROLLER                     DisconnectController;

-

-  //

-  // Open and Close Protocol Services

-  //

-  EFI_OPEN_PROTOCOL                             OpenProtocol;

-  EFI_CLOSE_PROTOCOL                            CloseProtocol;

-  EFI_OPEN_PROTOCOL_INFORMATION                 OpenProtocolInformation;

-

-  //

-  // Library Services

-  //

-  EFI_PROTOCOLS_PER_HANDLE                      ProtocolsPerHandle;

-  EFI_LOCATE_HANDLE_BUFFER                      LocateHandleBuffer;

-  EFI_LOCATE_PROTOCOL                           LocateProtocol;

-  EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES      InstallMultipleProtocolInterfaces;

-  EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES    UninstallMultipleProtocolInterfaces;

-

-  //

-  // 32-bit CRC Services

-  //

-  EFI_CALCULATE_CRC32                           CalculateCrc32;

-

-  //

-  // Miscellaneous Services

-  //

-  EFI_COPY_MEM                                  CopyMem;

-  EFI_SET_MEM                                   SetMem;

-} FRAMEWORK_EFI_BOOT_SERVICES;

-

-#define EFI_EVENT_RUNTIME_CONTEXT       0x20000000

-#define EFI_EVENT_NOTIFY_SIGNAL_ALL     0x00000400

-#define EFI_EVENT_SIGNAL_READY_TO_BOOT  0x00000203

-#define EFI_EVENT_SIGNAL_LEGACY_BOOT    0x00000204

-

-#endif

diff --git a/OvmfPkg/Csm/Include/Framework/FirmwareVolumeHeader.h b/OvmfPkg/Csm/Include/Framework/FirmwareVolumeHeader.h
deleted file mode 100644
index 8da429286a..0000000000
--- a/OvmfPkg/Csm/Include/Framework/FirmwareVolumeHeader.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/** @file

-  Defines the data structure that is the volume header found at the beginning of

-  all firmware volumes that are either memory mapped or have an

-  associated FirmwareVolumeBlock protocol.

-

-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-  @par Revision Reference:

-  These definitions are from the Firmware Volume Block Spec 0.9.

-

-**/

-

-#ifndef __EFI_FIRMWARE_VOLUME_HEADER_H__

-#define __EFI_FIRMWARE_VOLUME_HEADER_H__

-

-///

-/// Firmware Volume Block Attributes bit definitions.

-///@{

-#define EFI_FVB_READ_DISABLED_CAP  0x00000001

-#define EFI_FVB_READ_ENABLED_CAP   0x00000002

-#define EFI_FVB_READ_STATUS        0x00000004

-

-#define EFI_FVB_WRITE_DISABLED_CAP  0x00000008

-#define EFI_FVB_WRITE_ENABLED_CAP   0x00000010

-#define EFI_FVB_WRITE_STATUS        0x00000020

-

-#define EFI_FVB_LOCK_CAP     0x00000040

-#define EFI_FVB_LOCK_STATUS  0x00000080

-

-#define EFI_FVB_STICKY_WRITE    0x00000200

-#define EFI_FVB_MEMORY_MAPPED   0x00000400

-#define EFI_FVB_ERASE_POLARITY  0x00000800

-

-#define EFI_FVB_ALIGNMENT_CAP  0x00008000

-#define EFI_FVB_ALIGNMENT_2    0x00010000

-#define EFI_FVB_ALIGNMENT_4    0x00020000

-#define EFI_FVB_ALIGNMENT_8    0x00040000

-#define EFI_FVB_ALIGNMENT_16   0x00080000

-#define EFI_FVB_ALIGNMENT_32   0x00100000

-#define EFI_FVB_ALIGNMENT_64   0x00200000

-#define EFI_FVB_ALIGNMENT_128  0x00400000

-#define EFI_FVB_ALIGNMENT_256  0x00800000

-#define EFI_FVB_ALIGNMENT_512  0x01000000

-#define EFI_FVB_ALIGNMENT_1K   0x02000000

-#define EFI_FVB_ALIGNMENT_2K   0x04000000

-#define EFI_FVB_ALIGNMENT_4K   0x08000000

-#define EFI_FVB_ALIGNMENT_8K   0x10000000

-#define EFI_FVB_ALIGNMENT_16K  0x20000000

-#define EFI_FVB_ALIGNMENT_32K  0x40000000

-#define EFI_FVB_ALIGNMENT_64K  0x80000000

-///@}

-

-/// This is a simple macro defined as the set of all FV Block Attributes signifying capabilities.

-#define EFI_FVB_CAPABILITIES  ( EFI_FVB_READ_DISABLED_CAP  | \

-                                EFI_FVB_READ_ENABLED_CAP   | \

-                                EFI_FVB_WRITE_DISABLED_CAP | \

-                                EFI_FVB_WRITE_ENABLED_CAP  | \

-                                EFI_FVB_LOCK_CAP \

-                              )

-

-/** A parameterized macro defining a boolean expression that tests the state of a particular bit.

-  *

-  * @param FvbAttributes  Indicates a test for CLEAR if EFI_FVB_ERASE_POLARITY is 1, else test for SET.

-  *

-  * @param TestAttributes The set of bits to test.

-  *

-  * @param Bit            A value indicating the bit(s) to test.

-  *                       If multiple bits are set, the logical OR of their tests is the expression's value.

-**/

-#define EFI_TEST_FFS_ATTRIBUTES_BIT(FvbAttributes, TestAttributes, Bit) \

-    ((BOOLEAN) \

-      ((FvbAttributes & EFI_FVB_ERASE_POLARITY) ? (((~TestAttributes) & Bit) == Bit) : ((TestAttributes & Bit) == Bit)) \

-    )

-

-/// A simple macro defined as the set of all FV Block Attribute bits that indicate status.

-#define EFI_FVB_STATUS  (EFI_FVB_READ_STATUS | EFI_FVB_WRITE_STATUS | EFI_FVB_LOCK_STATUS)

-

-#endif /* __EFI_FIRMWARE_VOLUME_HEADER_H__ */

diff --git a/OvmfPkg/Csm/Include/Framework/FirmwareVolumeImageFormat.h b/OvmfPkg/Csm/Include/Framework/FirmwareVolumeImageFormat.h
deleted file mode 100644
index 02fadd1351..0000000000
--- a/OvmfPkg/Csm/Include/Framework/FirmwareVolumeImageFormat.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/** @file

-  This file defines the data structures that are architecturally defined for file

-  images loaded via the FirmwareVolume protocol.  The Firmware Volume specification

-  is the basis for these definitions.

-

-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-  @par Revision Reference:

-  These definitions are from the Firmware Volume Spec 0.9.

-

-**/

-

-#ifndef __FIRMWARE_VOLUME_IMAGE_FORMAT_H__

-#define __FIRMWARE_VOLUME_IMAGE_FORMAT_H__

-

-//

-// Bit values for AuthenticationStatus

-//

-#define EFI_AGGREGATE_AUTH_STATUS_PLATFORM_OVERRIDE  0x000001

-#define EFI_AGGREGATE_AUTH_STATUS_IMAGE_SIGNED       0x000002

-#define EFI_AGGREGATE_AUTH_STATUS_NOT_TESTED         0x000004

-#define EFI_AGGREGATE_AUTH_STATUS_TEST_FAILED        0x000008

-#define EFI_AGGREGATE_AUTH_STATUS_ALL                0x00000f

-

-#define EFI_LOCAL_AUTH_STATUS_PLATFORM_OVERRIDE  0x010000

-#define EFI_LOCAL_AUTH_STATUS_IMAGE_SIGNED       0x020000

-#define EFI_LOCAL_AUTH_STATUS_NOT_TESTED         0x040000

-#define EFI_LOCAL_AUTH_STATUS_TEST_FAILED        0x080000

-#define EFI_LOCAL_AUTH_STATUS_ALL                0x0f0000

-

-#endif

diff --git a/OvmfPkg/Csm/Include/Framework/FrameworkInternalFormRepresentation.h b/OvmfPkg/Csm/Include/Framework/FrameworkInternalFormRepresentation.h
deleted file mode 100644
index 2dcf6380e3..0000000000
--- a/OvmfPkg/Csm/Include/Framework/FrameworkInternalFormRepresentation.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/** @file

-  This file defines the encoding for the VFR (Visual Form Representation) language.

-  Framework IFR is primarily consumed by the EFI presentation engine, and produced by EFI

-  internal application and drivers as well as all add-in card option-ROM drivers

-

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-  @par Revision Reference:

-  These definitions are from the Framework Specification HII 0.92.

-

-**/

-

-#ifndef __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__

-#define __FRAMEWORK_INTERNAL_FORMREPRESENTATION_H__

-

-typedef UINT16 STRING_REF;

-

-//

-// IFR Op codes

-//

-#define FRAMEWORK_EFI_IFR_FORM_OP             0x01

-#define FRAMEWORK_EFI_IFR_SUBTITLE_OP         0x02

-#define FRAMEWORK_EFI_IFR_TEXT_OP             0x03

-#define EFI_IFR_GRAPHIC_OP                    0x04

-#define FRAMEWORK_EFI_IFR_ONE_OF_OP           0x05

-#define FRAMEWORK_EFI_IFR_CHECKBOX_OP         0x06

-#define FRAMEWORK_EFI_IFR_NUMERIC_OP          0x07

-#define FRAMEWORK_EFI_IFR_PASSWORD_OP         0x08

-#define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP    0x09      ///< ONEOF OPTION field.

-#define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP      0x0A

-#define EFI_IFR_END_FORM_OP                   0x0B

-#define EFI_IFR_HIDDEN_OP                     0x0C

-#define EFI_IFR_END_FORM_SET_OP               0x0D

-#define FRAMEWORK_EFI_IFR_FORM_SET_OP         0x0E

-#define FRAMEWORK_EFI_IFR_REF_OP              0x0F

-#define EFI_IFR_END_ONE_OF_OP                 0x10

-#define FRAMEWORK_EFI_IFR_END_OP              EFI_IFR_END_ONE_OF_OP

-#define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP  0x11

-#define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP        0x12

-#define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP         0x13

-#define FRAMEWORK_EFI_IFR_EQ_ID_LIST_OP       0x14

-#define FRAMEWORK_EFI_IFR_AND_OP              0x15

-#define FRAMEWORK_EFI_IFR_OR_OP               0x16

-#define FRAMEWORK_EFI_IFR_NOT_OP              0x17

-#define EFI_IFR_END_IF_OP                     0x18      ///< For endif of inconsistentif, suppressif, grayoutif.

-#define EFI_IFR_GRAYOUT_IF_OP                 0x19

-#define FRAMEWORK_EFI_IFR_DATE_OP             0x1A

-#define FRAMEWORK_EFI_IFR_TIME_OP             0x1B

-#define FRAMEWORK_EFI_IFR_STRING_OP           0x1C

-#define EFI_IFR_LABEL_OP                      0x1D

-#define EFI_IFR_SAVE_DEFAULTS_OP              0x1E

-#define EFI_IFR_RESTORE_DEFAULTS_OP           0x1F

-#define EFI_IFR_BANNER_OP                     0x20

-#define EFI_IFR_INVENTORY_OP                  0x21

-#define EFI_IFR_EQ_VAR_VAL_OP                 0x22

-#define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP     0x23

-#define FRAMEWORK_EFI_IFR_VARSTORE_OP         0x24

-#define EFI_IFR_VARSTORE_SELECT_OP            0x25

-#define EFI_IFR_VARSTORE_SELECT_PAIR_OP       0x26

-#define EFI_IFR_LAST_OPCODE                   EFI_IFR_VARSTORE_SELECT_PAIR_OP

-#define EFI_IFR_OEM_OP                        0xFE

-#define EFI_IFR_NV_ACCESS_COMMAND             0xFF

-

-//

-// Define values for the flags fields in some VFR opcodes. These are

-// bitmasks.

-//

-#define EFI_IFR_FLAG_DEFAULT         0x01

-#define EFI_IFR_FLAG_MANUFACTURING   0x02

-#define EFI_IFR_FLAG_INTERACTIVE     0x04

-#define EFI_IFR_FLAG_NV_ACCESS       0x08

-#define EFI_IFR_FLAG_RESET_REQUIRED  0x10

-#define EFI_IFR_FLAG_LATE_CHECK      0x20

-

-#define EFI_NON_DEVICE_CLASS       0x00         ///< Useful when you do not want something in the Device Manager.

-#define EFI_DISK_DEVICE_CLASS      0x01

-#define EFI_VIDEO_DEVICE_CLASS     0x02

-#define EFI_NETWORK_DEVICE_CLASS   0x04

-#define EFI_INPUT_DEVICE_CLASS     0x08

-#define EFI_ON_BOARD_DEVICE_CLASS  0x10

-#define EFI_OTHER_DEVICE_CLASS     0x20

-

-#define EFI_SETUP_APPLICATION_SUBCLASS    0x00

-#define EFI_GENERAL_APPLICATION_SUBCLASS  0x01

-#define EFI_FRONT_PAGE_SUBCLASS           0x02

-#define EFI_SINGLE_USE_SUBCLASS           0x03  ///< Used to display a single entity ,and then exit.

-

-///

-/// Used to flag dynamically created op-codes. This is meaningful to the IFR Library set

-/// and the browser because we need to distinguish between compiled NV map data and created data.

-/// We do not allow new entries to be created in the NV map dynamically, but we do need

-/// to display this information correctly.  To dynamically create op-codes and assume that their

-/// data will be saved, ensure that the NV starting location they refer to is pre-defined in the

-/// NV map.

-///

-#define EFI_IFR_FLAG_CREATED  128

-

-#pragma pack(1)

-//

-// IFR Structure definitions

-//

-typedef struct {

-  UINT8    OpCode;

-  UINT8    Length;

-} FRAMEWORK_EFI_IFR_OP_HEADER;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  EFI_GUID                       Guid;

-  STRING_REF                     FormSetTitle;

-  STRING_REF                     Help;

-  EFI_PHYSICAL_ADDRESS           CallbackHandle;

-  UINT16                         Class;

-  UINT16                         SubClass;

-  UINT16                         NvDataSize;    ///< Set once; the size of the NV data as defined in the script.

-} FRAMEWORK_EFI_IFR_FORM_SET;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         FormId;

-  STRING_REF                     FormTitle;

-} FRAMEWORK_EFI_IFR_FORM;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         LabelId;

-} EFI_IFR_LABEL;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     SubTitle;

-} FRAMEWORK_EFI_IFR_SUBTITLE;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     Help;

-  STRING_REF                     Text;

-  STRING_REF                     TextTwo;

-  UINT8                          Flags;     ///< This is included solely for purposes of interactive/dynamic support.

-  UINT16                         Key;       ///< The value to be passed to the caller to identify this particular op-code.

-} FRAMEWORK_EFI_IFR_TEXT;

-

-//

-// goto

-//

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         FormId;

-  STRING_REF                     Prompt;

-  STRING_REF                     Help;      ///< The string Token for the context-help.

-  UINT8                          Flags;     ///< This is included solely for purposes of interactive/dynamic support.

-  UINT16                         Key;       ///< The value to be passed to the caller to identify this particular op-code.

-} FRAMEWORK_EFI_IFR_REF;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} EFI_IFR_END_FORM;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} EFI_IFR_END_FORM_SET;

-

-//

-// Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......

-// code assumes this to be true, if this ever changes we need to revisit the InitializeTagStructures code

-//

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;    ///< The ID designating what the question is about...

-  UINT8                          Width;         ///< The Size of the Data being saved.

-  STRING_REF                     Prompt;        ///< The String Token for the Prompt.

-  STRING_REF                     Help;          ///< The string Token for the context-help.

-} FRAMEWORK_EFI_IFR_ONE_OF;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;    ///< The offset in NV for storage of the data.

-  UINT8                          MaxEntries;    ///< The maximum number of options in the ordered list (=size of NVStore).

-  STRING_REF                     Prompt;        ///< The string token for the prompt.

-  STRING_REF                     Help;          ///< The string token for the context-help.

-} FRAMEWORK_EFI_IFR_ORDERED_LIST;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;    ///< The ID designating what the question is about...

-  UINT8                          Width;         ///< The Size of the Data being saved.

-  STRING_REF                     Prompt;        ///< The String Token for the Prompt.

-  STRING_REF                     Help;          ///< The string Token for the context-help.

-  UINT8                          Flags;         ///< If non-zero, it means that it is the default option.

-  UINT16                         Key;           ///< Value to be passed to caller to identify this particular op-code.

-} FRAMEWORK_EFI_IFR_CHECKBOX, EFI_IFR_CHECK_BOX;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     Option;        ///< The string token describing the option.

-  UINT16                         Value;         ///< The value associated with this option that is stored in the NVRAM.

-  UINT8                          Flags;         ///< If non-zero, it means that it is the default option.

-  UINT16                         Key;           ///< Value to be passed to caller to identify this particular op-code.

-} FRAMEWORK_EFI_IFR_ONE_OF_OPTION;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;    ///< The ID designating what the question is about...

-  UINT8                          Width;         ///< The Size of the Data being saved.

-  STRING_REF                     Prompt;        ///< The String Token for the Prompt.

-  STRING_REF                     Help;          ///< The string Token for the context-help.

-  UINT8                          Flags;         ///< This is included solely for purposes of interactive/dynamic support.

-  UINT16                         Key;           ///< The value to be passed to caller to identify this particular op-code.

-  UINT16                         Minimum;

-  UINT16                         Maximum;

-  UINT16                         Step;          ///< Zero means manual input. Otherwise, arrow selection is called for.

-  UINT16                         Default;

-} FRAMEWORK_EFI_IFR_NUMERIC;

-

-//

-// There is an interesting twist with regards to Time and Date.  This is one of the few items which can accept input

-// from a user, and may or may not need to use storage in the NVRAM space.  The decided method for determining

-// if NVRAM space will be used (only for a TimeOp or DateOp) is:  If .QuestionId == 0 && .Width == 0 (normally an

-// impossibility) then use system resources to store the data away and not NV resources.  In other words, the setup

-// engine will call gRT->SetTime, and gRT->SetDate for the saving of data, and the values displayed will be from the

-// gRT->GetXXXX series of calls.

-//

-typedef struct {

-  FRAMEWORK_EFI_IFR_NUMERIC    Hour;

-  FRAMEWORK_EFI_IFR_NUMERIC    Minute;

-  FRAMEWORK_EFI_IFR_NUMERIC    Second;

-} FRAMEWORK_EFI_IFR_TIME;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_NUMERIC    Year;

-  FRAMEWORK_EFI_IFR_NUMERIC    Month;

-  FRAMEWORK_EFI_IFR_NUMERIC    Day;

-} FRAMEWORK_EFI_IFR_DATE;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;   ///< The ID designating what the question is about...

-  UINT8                          Width;        ///< The Size of the Data being saved.

-  STRING_REF                     Prompt;       ///< The String Token for the Prompt.

-  STRING_REF                     Help;         ///< The string Token for the context-help.

-  UINT8                          Flags;        ///< This is included solely for purposes of interactive/dynamic support.

-  UINT16                         Key;          ///< The value to be passed to caller to identify this particular op-code.

-  UINT8                          MinSize;      ///< Minimum allowable sized password.

-  UINT8                          MaxSize;      ///< Maximum allowable sized password.

-  UINT16                         Encoding;

-} FRAMEWORK_EFI_IFR_PASSWORD;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;    ///< The ID designating what the question is about...

-  UINT8                          Width;         ///< The Size of the Data being saved.

-  STRING_REF                     Prompt;        ///< The String Token for the Prompt.

-  STRING_REF                     Help;          ///< The string Token for the context-help.

-  UINT8                          Flags;         ///< This is included solely for purposes of interactive/dynamic support.

-  UINT16                         Key;           ///< The value to be passed to caller to identify this particular op-code.

-  UINT8                          MinSize;       ///< Minimum allowable sized password.

-  UINT8                          MaxSize;       ///< Maximum allowable sized password.

-} FRAMEWORK_EFI_IFR_STRING;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} EFI_IFR_END_ONE_OF;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         Value;

-  UINT16                         Key;

-} EFI_IFR_HIDDEN;

-

-///

-/// Inconsistent with specification here:

-/// The following definition may not comply with Framework Specification HII 0.92. To

-/// keep the inconsistant is for implementation needed.

-///@{

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT8                          Flags;

-} EFI_IFR_SUPPRESS;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT8                          Flags;

-} EFI_IFR_GRAY_OUT;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     Popup;

-  UINT8                          Flags;

-} EFI_IFR_INCONSISTENT;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;      ///< The offset into variable storage.

-  UINT8                          Width;           ///< The size of variable storage.

-  UINT16                         Value;           ///< The value to compare against.

-} FRAMEWORK_EFI_IFR_EQ_ID_VAL;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId;      ///< The offset into variable storage.

-  UINT8                          Width;           ///< The size of variable storage.

-  UINT16                         ListLength;

-  UINT16                         ValueList[1];

-} FRAMEWORK_EFI_IFR_EQ_ID_LIST;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         QuestionId1;     ///< The offset into variable storage for first value to compare.

-  UINT8                          Width;           ///< The size of variable storage (must be same for both).

-  UINT16                         QuestionId2;     ///< The offset into variable storage for second value to compare.

-} FRAMEWORK_EFI_IFR_EQ_ID_ID;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         VariableId;      ///< The offset into variable storage.

-  UINT16                         Value;           ///< The value to compare against.

-} EFI_IFR_EQ_VAR_VAL;

-///@}

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} FRAMEWORK_EFI_IFR_AND;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} FRAMEWORK_EFI_IFR_OR;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} FRAMEWORK_EFI_IFR_NOT;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-} EFI_IFR_END_EXPR, EFI_IFR_END_IF;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         FormId;

-  STRING_REF                     Prompt;

-  STRING_REF                     Help;

-  UINT8                          Flags;

-  UINT16                         Key;

-} EFI_IFR_SAVE_DEFAULTS;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     Help;

-  STRING_REF                     Text;

-  STRING_REF                     TextTwo;       ///< Optional text.

-} EFI_IFR_INVENTORY;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  EFI_GUID                       Guid;          ///< GUID for the variable.

-  UINT16                         VarId;         ///< The variable store ID, as referenced elsewhere in the form.

-  UINT16                         Size;          ///< The size of the variable storage.

-} FRAMEWORK_EFI_IFR_VARSTORE;

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         VarId;         ///< The variable store ID, as referenced elsewhere in the form.

-} EFI_IFR_VARSTORE_SELECT;

-

-///

-/// Used for the ideqid VFR statement where two variable stores may be referenced in the

-/// same VFR statement.

-/// A browser should treat this as an FRAMEWORK_EFI_IFR_VARSTORE_SELECT statement and assume that all following

-/// IFR opcodes use the VarId as defined here.

-///

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  UINT16                         VarId;             ///< The variable store ID, as referenced elsewhere in the form.

-  UINT16                         SecondaryVarId;    ///< The variable store ID, as referenced elsewhere in the form.

-} EFI_IFR_VARSTORE_SELECT_PAIR;

-

-///

-/// Save defaults and restore defaults have same structure.

-///

-#define EFI_IFR_RESTORE_DEFAULTS  EFI_IFR_SAVE_DEFAULTS

-

-typedef struct {

-  FRAMEWORK_EFI_IFR_OP_HEADER    Header;

-  STRING_REF                     Title;           ///< The string token for the banner title.

-  UINT16                         LineNumber;      ///< 1-based line number.

-  UINT8                          Alignment;       ///< Left, center, or right-aligned.

-} EFI_IFR_BANNER;

-

-#define EFI_IFR_BANNER_ALIGN_LEFT    0

-#define EFI_IFR_BANNER_ALIGN_CENTER  1

-#define EFI_IFR_BANNER_ALIGN_RIGHT   2

-#define EFI_IFR_BANNER_TIMEOUT       0xFF

-

-#pragma pack()

-

-#endif

diff --git a/OvmfPkg/Csm/Include/Framework/Hob.h b/OvmfPkg/Csm/Include/Framework/Hob.h
deleted file mode 100644
index 592a179bc2..0000000000
--- a/OvmfPkg/Csm/Include/Framework/Hob.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/** @file

-  This file defines the data structures per HOB specification v0.9.

-

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-  @par Revision Reference:

-  These definitions are from the HOB Spec 0.9 that were not adopted by the PI specifications.

-

-**/

-

-#ifndef _HOB_H_

-#define _HOB_H_

-

-///

-/// Capsule volume HOB -- identical to a firmware volume.

-/// This macro is defined to comply with the hob Framework Spec. And the marco was

-/// retired in the PI1.0 specification.

-///

-#define EFI_HOB_TYPE_CV  0x0008

-

-typedef struct {

-  EFI_HOB_GENERIC_HEADER    Header;

-  EFI_PHYSICAL_ADDRESS      BaseAddress;

-  UINT64                    Length;

-} EFI_HOB_CAPSULE_VOLUME;

-

-#endif

diff --git a/OvmfPkg/Csm/Include/Framework/StatusCode.h b/OvmfPkg/Csm/Include/Framework/StatusCode.h
deleted file mode 100644
index 5678127a24..0000000000
--- a/OvmfPkg/Csm/Include/Framework/StatusCode.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/** @file

-  Status Code Definitions, according to Intel Platform Innovation Framework

-  for EFI Status Codes Specification

-

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-

-  @par Revision Reference:

-  Intel Platform Innovation Framework for EFI Status Codes Specification

-  Version 0.92.

-

-**/

-

-#ifndef _FRAMEWORK_STATUS_CODE_H_

-#define _FRAMEWORK_STATUS_CODE_H_

-

-//

-// Required for X64 defines for CPU exception types

-//

-#include <Protocol/DebugSupport.h>

-

-///

-/// Software Class DXE BS Driver Subclass Progress Code definitions.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_SW_DXE_BS_PC_BEGIN_CONNECTING_DRIVERS  (EFI_SUBCLASS_SPECIFIC | 0x00000005)

-#define EFI_SW_DXE_BS_PC_VERIFYING_PASSWORD        (EFI_SUBCLASS_SPECIFIC | 0x00000006)

-///@}

-

-///

-/// Software Class DXE RT Driver Subclass Progress Code definitions.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_SW_DXE_RT_PC_S0  (EFI_SUBCLASS_SPECIFIC | 0x00000000)

-#define EFI_SW_DXE_RT_PC_S1  (EFI_SUBCLASS_SPECIFIC | 0x00000001)

-#define EFI_SW_DXE_RT_PC_S2  (EFI_SUBCLASS_SPECIFIC | 0x00000002)

-#define EFI_SW_DXE_RT_PC_S3  (EFI_SUBCLASS_SPECIFIC | 0x00000003)

-#define EFI_SW_DXE_RT_PC_S4  (EFI_SUBCLASS_SPECIFIC | 0x00000004)

-#define EFI_SW_DXE_RT_PC_S5  (EFI_SUBCLASS_SPECIFIC | 0x00000005)

-///@}

-

-///

-/// Software Subclass definitions.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-#define EFI_SOFTWARE_X64_EXCEPTION  (EFI_SOFTWARE | 0x00130000)

-

-///

-/// Software Class X64 Exception Subclass Error Code definitions.

-/// These exceptions are derived from the debug protocol definitions in the EFI

-/// specification.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_SW_EC_X64_DIVIDE_ERROR     EXCEPT_X64_DIVIDE_ERROR

-#define EFI_SW_EC_X64_DEBUG            EXCEPT_X64_DEBUG

-#define EFI_SW_EC_X64_NMI              EXCEPT_X64_NMI

-#define EFI_SW_EC_X64_BREAKPOINT       EXCEPT_X64_BREAKPOINT

-#define EFI_SW_EC_X64_OVERFLOW         EXCEPT_X64_OVERFLOW

-#define EFI_SW_EC_X64_BOUND            EXCEPT_X64_BOUND

-#define EFI_SW_EC_X64_INVALID_OPCODE   EXCEPT_X64_INVALID_OPCODE

-#define EFI_SW_EC_X64_DOUBLE_FAULT     EXCEPT_X64_DOUBLE_FAULT

-#define EFI_SW_EC_X64_INVALID_TSS      EXCEPT_X64_INVALID_TSS

-#define EFI_SW_EC_X64_SEG_NOT_PRESENT  EXCEPT_X64_SEG_NOT_PRESENT

-#define EFI_SW_EC_X64_STACK_FAULT      EXCEPT_X64_STACK_FAULT

-#define EFI_SW_EC_X64_GP_FAULT         EXCEPT_X64_GP_FAULT

-#define EFI_SW_EC_X64_PAGE_FAULT       EXCEPT_X64_PAGE_FAULT

-#define EFI_SW_EC_X64_FP_ERROR         EXCEPT_X64_FP_ERROR

-#define EFI_SW_EC_X64_ALIGNMENT_CHECK  EXCEPT_X64_ALIGNMENT_CHECK

-#define EFI_SW_EC_X64_MACHINE_CHECK    EXCEPT_X64_MACHINE_CHECK

-#define EFI_SW_EC_X64_SIMD             EXCEPT_X64_SIMD

-///@}

-

-///

-/// Software Class EFI After Life Subclass Progress Code definitions.

-///

-///@{

-#define EFI_SW_AL_PC_ENTRY_POINT     (EFI_SUBCLASS_SPECIFIC | 0x00000000)

-#define EFI_SW_AL_PC_RETURN_TO_LAST  (EFI_SUBCLASS_SPECIFIC | 0x00000001)

-///@}

-

-///

-/// Software Class DXE Core Subclass Error Code definitions.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-#define EFI_SW_CSM_LEGACY_ROM_INIT  (EFI_SUBCLASS_SPECIFIC | 0x00000000)

-

-///

-/// IO Bus Class ATA/ATAPI Subclass Progress Code definitions.

-///

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_IOB_ATA_BUS_SMART_ENABLE          (EFI_SUBCLASS_SPECIFIC | 0x00000000)

-#define EFI_IOB_ATA_BUS_SMART_DISABLE         (EFI_SUBCLASS_SPECIFIC | 0x00000001)

-#define EFI_IOB_ATA_BUS_SMART_OVERTHRESHOLD   (EFI_SUBCLASS_SPECIFIC | 0x00000002)

-#define EFI_IOB_ATA_BUS_SMART_UNDERTHRESHOLD  (EFI_SUBCLASS_SPECIFIC | 0x00000003)

-///@}

-

-///

-/// IO Bus Class ATA/ATAPI Subclass Error Code definitions.

-///

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_IOB_ATA_BUS_SMART_NOTSUPPORTED  (EFI_SUBCLASS_SPECIFIC | 0x00000000)

-#define EFI_IOB_ATA_BUS_SMART_DISABLED      (EFI_SUBCLASS_SPECIFIC | 0x00000001)

-///@}

-

-///

-/// The reason that the processor was disabled.

-///

-/// Inconsistent with specification here:

-/// The Framework Specification, StatusCodes 0.92, does not define the macros.

-///

-///@{

-#define EFI_CPU_CAUSE_NOT_DISABLED  0x0000

-///@}

-

-///

-/// Software Class PEI Module Subclass Progress Code definitions.

-///

-///@{

-#define EFI_SW_PEIM_PC_RECOVERY_BEGIN  EFI_SW_PEI_PC_RECOVERY_BEGIN

-#define EFI_SW_PEIM_PC_CAPSULE_LOAD    EFI_SW_PEI_PC_CAPSULE_LOAD

-#define EFI_SW_PEIM_PC_CAPSULE_START   EFI_SW_PEI_PC_CAPSULE_START

-#define EFI_SW_PEIM_PC_RECOVERY_USER   EFI_SW_PEI_PC_RECOVERY_USER

-#define EFI_SW_PEIM_PC_RECOVERY_AUTO   EFI_SW_PEI_PC_RECOVERY_AUTO

-///@}

-

-///

-/// Software Class PEI Core Subclass Error Code definitions.

-///

-///@{

-#define EFI_SW_PEIM_CORE_EC_DXE_CORRUPT       EFI_SW_PEI_CORE_EC_DXE_CORRUPT

-#define EFI_SW_PEIM_CORE_EC_DXEIPL_NOT_FOUND  EFI_SW_PEI_CORE_EC_DXEIPL_NOT_FOUND

-///@}

-

-#endif

diff --git a/OvmfPkg/Csm/Include/FrameworkDxe.h b/OvmfPkg/Csm/Include/FrameworkDxe.h
deleted file mode 100644
index 1d801960fe..0000000000
--- a/OvmfPkg/Csm/Include/FrameworkDxe.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file

-  The root header file that provides Framework extension to UEFI/PI for modules. It can be included by

-  DXE, RUNTIME and SMM type modules that use Framework definitions.

-

-

-  This header file includes Framework extension definitions common to DXE

-  modules.

-

-Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

-SPDX-License-Identifier: BSD-2-Clause-Patent

-**/

-

-#ifndef _FRAMEWORK_DXE_H_

-#define _FRAMEWORK_DXE_H_

-

-#include <PiDxe.h>

-

-#include <Framework/FrameworkInternalFormRepresentation.h>

-#include <Framework/FirmwareVolumeImageFormat.h>

-#include <Framework/FirmwareVolumeHeader.h>

-#include <Framework/Hob.h>

-#include <Framework/BootScript.h>

-#include <Framework/StatusCode.h>

-#include <Framework/DxeCis.h>

-

-#endif

diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 32543e466a..9d326e8143 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -17,7 +17,6 @@
 

 [Includes]

   Include

-  Csm/Include

 

 [LibraryClasses]

   ##  @libraryclass  Search and install ACPI tables.