Changeset 35400 in vbox for trunk/src/VBox

Timestamp:

Jan 4, 2011 11:58:52 AM (14 years ago)

Author:

vboxsync

Message:

introduced VBOX_WITH_PXE_ROM

Location:

trunk/src/VBox/Devices

Files:

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

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 ifndef VBOX_WITHOUT_ETHERBOOT
+else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
  include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
 endif
@@ -248 +248 @@
  VBoxDD2_LDFLAGS.l4      = -Wl,--no-undefined
 
+ ifdef VBOX_WITH_PXE_ROM
+  VBoxDD2_DEFS          += VBOX_WITH_PXE_ROM
+ endif
 
  #
@@ -352 +355 @@
   DevicesR3_DEFS        += VBOX_WITH_DMI_OEMSTRINGS
  endif
+ ifdef VBOX_WITH_PXE_ROM
+  DevicesR3_DEFS        += VBOX_WITH_PXE_ROM
+ endif
 
  ifdef VBOX_WITH_INIP

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -1352 +1352 @@
     if (pThis->pu8LanBoot == NULL)
     {
+#ifdef VBOX_WITH_PXE_ROM
         pu8LanBootBinary = g_abNetBiosBinary;
         cbLanBootBinary  = g_cbNetBiosBinary;
+#endif
     }
     else

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

@@ -40 +40 @@
     (void *)&g_abPcBiosBinary,
     (void *)&g_abVgaBiosBinary,
+#ifdef VBOX_WITH_PXE_ROM
     (void *)&g_abNetBiosBinary,
+#endif
 };
 

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

@@ -30 +30 @@
 extern DECLEXPORT(const unsigned char)  g_abVgaBiosBinary[];
 extern DECLEXPORT(const unsigned)       g_cbVgaBiosBinary;
+# ifdef VBOX_WITH_PXE_ROM
 extern DECLEXPORT(const unsigned char)  g_abNetBiosBinary[];
 extern DECLEXPORT(const unsigned)       g_cbNetBiosBinary;
-extern DECLEXPORT(const unsigned char)  g_abVmiBiosBinary[];
-extern DECLEXPORT(const unsigned)       g_cbVmiBiosBinary;
+# endif
 #else  /* !IN_VBOXDD2 */
 extern DECLIMPORT(const unsigned char)  g_abPcBiosBinary[];
@@ -39 +39 @@
 extern DECLIMPORT(const unsigned char)  g_abVgaBiosBinary[];
 extern DECLIMPORT(const unsigned)       g_cbVgaBiosBinary;
+# ifdef VBOX_WITH_PXE_ROM
 extern DECLIMPORT(const unsigned char)  g_abNetBiosBinary[];
 extern DECLIMPORT(const unsigned)       g_cbNetBiosBinary;
-extern DECLIMPORT(const unsigned char)  g_abVmiBiosBinary[];
-extern DECLIMPORT(const unsigned)       g_cbVmiBiosBinary;
+# endif
 #endif /* !IN_VBOXDD2 */
 extern const PDMDEVREG g_DeviceAPIC;