Changeset 47930 in vbox

Timestamp:

Aug 20, 2013 2:56:44 PM (11 years ago)

Author:

vboxsync

Message:

Etherboot is obsolete

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/PC/Etherboot-src (deleted)

trunk/Config.kmk

@@ -1036 +1036 @@
  VBOX_WITH_INTEL_PXE=
  VBOX_WITH_DEVMAPPER=
- ## @todo remove once the iPXE code is in public tree
- VBOX_WITHOUT_IPXE=1
  # Disable for OSE, requires snv_159+.
  VBOX_WITH_NETFLT_CROSSBOW=

trunk/src/VBox/Devices/Makefile.kmk

@@ -30 +30 @@
  include $(PATH_SUB_CURRENT)/PC/PXE/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
@@ -850 +847 @@
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/VgaBiosBin$(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)),) \
+        $(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/iPxeBiosBin$(VBOX_SUFF_LIB),) \
         $(LIB_VMM) \
         $(LIB_RUNTIME)