Changeset 101616 in vbox for trunk

Timestamp:

Oct 27, 2023 12:37:51 PM (15 months ago)

Author:

vboxsync

Message:

Devices: Don't (ab)use VBOX_VMM_TARGET_ARMV8 for defining whether the Armv8 bits are compiled in. Use VBOX_WITH_VIRT_ARMV8 as VBoxDD is combined for x86 and arm and doesn't has a dedicated binary like VBoxVMMArm has, bugref:10385

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI-binaries.S (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)
• build/VBoxDD2.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI-binaries.S

@@ -72 +72 @@
 #endif
 
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_WITH_VIRT_ARMV8
 ;
 ; The ARMv8 bits

trunk/src/VBox/Devices/Makefile.kmk

@@ -925 +925 @@
  # --- ARMv8 bits. ---
  if defined(VBOX_WITH_VIRT_ARMV8)
-  VBoxDD_DEFS       += VBOX_VMM_TARGET_ARMV8
+  VBoxDD_DEFS       += VBOX_WITH_VIRT_ARMV8
   VBoxDD_SOURCES    += \
         Bus/DevPciGenericEcam.cpp \
@@ -1217 +1217 @@
         IN_VBOXDD2 \
         $(if $(VBOX_WITH_PXE_ROM),VBOX_WITH_PXE_ROM,) \
-        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_VMM_TARGET_ARMV8,)
+        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_WITH_VIRT_ARMV8,)
  VBoxDD2_INCS           := \
         build \

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

@@ -248 +248 @@
         return rc;
 #endif
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_WITH_VIRT_ARMV8
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEfiArmV8);
     if (RT_FAILURE(rc))

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

@@ -234 +234 @@
 #endif
 
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_WITH_VIRT_ARMV8
 extern const PDMDEVREG g_DeviceEfiArmV8;
 extern const PDMDEVREG g_DevicePl011;

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

@@ -60 +60 @@
 extern DECLEXPORT(const unsigned char)  g_abEfiFirmware64[];
 extern DECLEXPORT(const unsigned)       g_cbEfiFirmware64;
-#  ifdef VBOX_VMM_TARGET_ARMV8
+#  ifdef VBOX_WITH_VIRT_ARMV8
 extern DECLEXPORT(const unsigned char)  g_abEfiFirmwareAArch32[];
 extern DECLEXPORT(const unsigned)       g_cbEfiFirmwareAArch32;
@@ -89 +89 @@
 extern DECLIMPORT(const unsigned char)  g_abEfiFirmware64[];
 extern DECLIMPORT(const unsigned)       g_cbEfiFirmware64;
-#  ifdef VBOX_VMM_TARGET_ARMV8
+#  ifdef VBOX_WITH_VIRT_ARMV8
 extern DECLIMPORT(const unsigned char)  g_abEfiFirmwareAArch32[];
 extern DECLIMPORT(const unsigned)       g_cbEfiFirmwareAArch32;