Changeset 44575 in vbox

Timestamp:

Feb 6, 2013 6:21:17 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83645

Message:

Making VBOX_WITH_OVMF default, removing the old #else cases.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h (modified) (3 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/build/VBoxDD.cpp (modified) (1 diff)
• src/VBox/Devices/build/VBoxDD.h (modified) (1 diff)

trunk/Config.kmk

@@ -422 +422 @@
 # Enable EFI support
 VBOX_WITH_EFI = 1
-# Enable EFI/Ovmf support
-VBOX_WITH_OVMF = 1
 # Fetch EFI firmware image from the build server
 #VBOX_WITH_EFIFW_FROM_BUILD_SERVER = 1

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h

@@ -44 +44 @@
 typedef enum
 {
-    EFI_INFO_INDEX_INVALID                    = 0,
+    EFI_INFO_INDEX_INVALID = 0,
     EFI_INFO_INDEX_VOLUME_BASE,
     EFI_INFO_INDEX_VOLUME_SIZE,
@@ -59 +59 @@
     EFI_INFO_INDEX_UGA_HORISONTAL_RESOLUTION,
     EFI_INFO_INDEX_UGA_VERTICAL_RESOLUTION,
-#ifdef VBOX_WITH_OVMF
-
-#endif
     EFI_INFO_INDEX_END
 } EfiInfoIndex;
@@ -70 +67 @@
  * Reading from the port has no effect. */
 #define EFI_PANIC_PORT          (EFI_PORT_BASE+0x1)
+
 /** @defgroup grp_devefi_panic_cmd  Panic Commands for EFI_PANIC_PORT
  * @{ */

trunk/src/VBox/Devices/Makefile.kmk

@@ -40 +40 @@
  include $(PATH_SUB_CURRENT)/PC/BIOS/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk
- if defined(VBOX_WITH_EFI) && !defined(VBOX_WITH_OVMF)
-  include $(PATH_SUB_CURRENT)/EFI/Thunk/Makefile.kmk
- endif
 
  #
@@ -438 +435 @@
 
  ifdef VBOX_WITH_EFI
-  ifndef VBOX_WITH_OVMF
-   VBoxDD_DEFS           += VBOX_WITH_EFI
-   VBoxDD_LIBS           += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
-   ifdef VBOX_WITH_ALT_EFITHUNK
-    VBoxDD_DEFS          += VBOX_WITH_ALT_EFITHUNK
-   endif
-   VBoxDD_SOURCES        += EFI/DevEFI.cpp
-   EFI/DevEFI.cpp_INCS       += EFI/tools/include
-   EFI/DevEFI.cpp_INCS.x86   += EFI/tools/include/Ia32
-   EFI/DevEFI.cpp_INCS.amd64 += EFI/tools/include/X64
-  else
    VBoxDD_DEFS           += VBOX_WITH_EFI
    VBoxDD_SOURCES        += EFI/DevOVMF.cpp
@@ -454 +440 @@
    EFI/DevOVMF.cpp_INCS.x86   += EFI/tools/include/Ia32
    EFI/DevOVMF.cpp_INCS.amd64 += EFI/tools/include/X64
-   build/VBoxDD.cpp_DEFS += VBOX_WITH_OVMF
-  endif
  endif
 

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -37 +37 @@
 const void *g_apvVBoxDDDependencies[] =
 {
-#if defined(VBOX_WITH_EFI) && !defined(VBOX_WITH_OVMF)
-    &g_abEfiThunkBinary[0],
-#endif
     NULL,
 };

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -27 +27 @@
 /** The size of the default BIOS logo data. */
 extern const unsigned       g_cbVgaDefBiosLogo;
-#ifdef VBOX_WITH_EFI
-/** The EFI thunk binary. */
-extern const unsigned char  g_abEfiThunkBinary[];
-/** The size of the EFI thunk binary. */
-extern const unsigned       g_cbEfiThunkBinary;
-#endif