Changeset 41752 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 15, 2012 11:38:51 AM (13 years ago)

Author:

vboxsync

Message:

iPXE: save a tiny bit more ROM space by ripping out the embedded image support, use it as the compiled in PXE ROM, but stick to Etherboot for OSE to avoid breakage until iPXE is included in the tree

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (3 diffs)
• build/VBoxDD2.cpp (modified) (2 diffs)
• build/VBoxDD2.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -24 +24 @@
 if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
  include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
-else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
- include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+else if defined(VBOX_WITH_PXE_ROM)
+ if !defined(VBOX_WITHOUT_ETHERBOOT)
+  include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+ endif
+ if !defined(VBOX_WITHOUT_IPXE)
+  include $(PATH_SUB_CURRENT)/PC/ipxe/Makefile.kmk
+ endif
 endif
 if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
@@ -254 +259 @@
         Graphics/DevVGA_VDMA.cpp
  endif
- 
+
  ifdef VBOX_VDMA_WITH_WATCHDOG
   VBoxDD_DEFS           += VBOX_VDMA_WITH_WATCHDOG
@@ -903 +908 @@
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
-        $(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
+        $(if $(VBOX_WITH_PXE_ROM),$(if $(VBOX_WITHOUT_IPXE),(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/iPxeBiosBin$(VBOX_SUFF_LIB)),) \
         $(LIB_VMM) \
         $(LIB_RUNTIME)

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

@@ -1 @@
-/* $Id $ */
+/* $Id$ */
 /** @file
  * VBoxDD2 - Built-in drivers & devices part 2.
@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as