Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/UefiCpuPkg/CpuDxe/CpuDxe.inf

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• UefiCpuPkg/CpuDxe/CpuDxe.inf (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/Firmware/UefiCpuPkg/CpuDxe/CpuDxe.inf

@@ -1 +1 @@
 ## @file
+#  Simple CPU driver installs CPU Architecture Protocol.
 #
-#    Component description file for simple CPU driver
-#
-#  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17 +16 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CpuDxe
+  MODULE_UNI_FILE                = CpuDxe.uni
   FILE_GUID                      = 1A1E4886-9517-440e-9FDE-3BE44CEE2136
   MODULE_TYPE                    = DXE_DRIVER
@@ -38 +38 @@
   UefiBootServicesTableLib
   UefiDriverEntryPoint
+  LocalApicLib
+  UefiCpuLib
+  UefiLib
+  CpuExceptionHandlerLib
 
 [Sources]
@@ -43 +47 @@
   CpuDxe.h
   CpuGdt.c
-
-  Ia32/IvtAsm.asm | MSFT
-  Ia32/IvtAsm.asm | INTEL
-  Ia32/IvtAsm.S   | GCC
 
 [Sources.IA32]
@@ -59 +59 @@
 
 [Protocols]
-  gEfiCpuArchProtocolGuid
+  gEfiCpuArchProtocolGuid                       ## PRODUCES
 
 [Guids]
-  gIdleLoopEventGuid                            ## CONSUMES ## GUID
+  gIdleLoopEventGuid                            ## CONSUMES           ## Event
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_CONSUMES ## SystemTable
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  CpuDxeExtra.uni