Changeset 85788 in vbox

Timestamp:

Aug 17, 2020 7:03:03 AM (5 years ago)

Author:

vboxsync

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

139944

Message:

Makefile.kmk,Devices/Makefile.kmk,Devices/EFI: Removed old EFI firmware. Using edk2-stable202005 from now on. bugref:4643

Location:

trunk

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/EFI/Firmware (moved) (moved from trunk/src/VBox/Devices/EFI/FirmwareNew )
• src/VBox/Devices/EFI/Firmware/Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)

trunk/Makefile.kmk

@@ -395 +395 @@
    #
    ifndef VBOX_EFI_FIRMWARE_EFI_MODULES_KMK_INCLUDED
-    include $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareNew/EfiModules.kmk
+    include $(PATH_ROOT)/src/VBox/Devices/EFI/Firmware/EfiModules.kmk
    endif
    INSTALLS += buildserver-efifw
@@ -1877 +1877 @@
 
 efi-build: $(VBOX_VERSION_HEADER)
-        + $(KMK) -C src/VBox/Devices/EFI/FirmwareNew$(VBOX_EFI_FIRMWARE_SUFFIX)
+        + $(KMK) -C src/VBox/Devices/EFI/Firmware$(VBOX_EFI_FIRMWARE_SUFFIX)
 
 efi-packing:
-        + $(KMK) -C src/VBox/Devices/EFI/FirmwareNew$(VBOX_EFI_FIRMWARE_SUFFIX) $(PATH_STAGE)/VBoxEfiFirmware.zip
+        + $(KMK) -C src/VBox/Devices/EFI/Firmware$(VBOX_EFI_FIRMWARE_SUFFIX) $(PATH_STAGE)/VBoxEfiFirmware.zip
 
 

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -38 +38 @@
 # Globals.
 #
-VBOX_PATH_EFI_FIRMWARE = $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareNew
+VBOX_PATH_EFI_FIRMWARE = $(PATH_ROOT)/src/VBox/Devices/EFI/Firmware
 VBOX_PATH_STAGE_EFI_BLDPROGS = $(PATH_STAGE)/EfiBldProgs
 VBOX_EFI_BUILD_TARGET  = $(if-expr $(intersects release profile, $(KBUILD_TYPE)),RELEASE,DEBUG)

trunk/src/VBox/Devices/Makefile.kmk

@@ -184 +184 @@
         Input/DrvKeyboardQueue.cpp \
         Input/DrvMouseQueue.cpp \
+        Misc/DevIce.cpp \
         Network/DrvIntNet.cpp \
         Network/DrvDedicatedNic.cpp \
@@ -203 +204 @@
         Network/Pcap.cpp \
         Trace/DrvIfsTrace.cpp \
-        Trace/DrvIfsTrace-serial.cpp
+        Trace/DrvIfsTrace-serial.cpp \
+        Misc/DrvSerialIce.cpp
  ifn1of ($(KBUILD_TARGET), os2)
   VBoxDD_SOURCES += Storage/DrvHostBase.cpp
@@ -572 +574 @@
   VBoxDD_DEFS           += VBOX_WITH_EFI
   VBoxDD_SOURCES        += EFI/DevEFI.cpp
-  EFI/DevEFI.cpp_INCS       += EFI/FirmwareNew/BaseTools/Source/C/Include
-  EFI/DevEFI.cpp_INCS.x86   += EFI/FirmwareNew/BaseTools/Source/C/Include/Ia32
-  EFI/DevEFI.cpp_INCS.amd64 += EFI/FirmwareNew/BaseTools/Source/C/Include/X64
+  EFI/DevEFI.cpp_INCS       += EFI/Firmware/BaseTools/Source/C/Include
+  EFI/DevEFI.cpp_INCS.x86   += EFI/Firmware/BaseTools/Source/C/Include/Ia32
+  EFI/DevEFI.cpp_INCS.amd64 += EFI/Firmware/BaseTools/Source/C/Include/X64
  endif