[build] Avoid using embedded script in VirtualBox named configuration

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/config/vbox/README b/src/config/vbox/README
index 2725eea337a47fe70f1ce3f27ee9ad233419b654..b6f2da95090c37fc16f6ffaf208b6a73c953d9b9 100644 (file)
--- a/src/config/vbox/README
+++ b/src/config/vbox/README
@@ -1,16 +1,18 @@
 Build using this command line:
 
-make CONFIG=vbox EMBED=config/vbox/embedded.ipxe bin/intel--virtio-net--pcnet32.rom
+make CONFIG=vbox bin/intel--virtio-net--pcnet32.isarom
 
 Max size of a VirtualBox ROM is 56KB, 57344 bytes. There should be no need
 to pad the image as long as the binary is smaller or equal to this size.
 
-The embedded script is required because VirtualBox uses the ROM as an ISA
-ROM, which will not perform any autoboot behavior.  The bundled embedded
-script reproduces the default autoboot behavior.
-
 To use the ROM in VirtualBox you need to enable it using this command:
 
 vboxmanage setextradata global \
     VBoxInternal/Devices/pcbios/0/Config/LanBootRom \
-    path/to/intel--virtio-net--pcnet32.rom
+    /absolute/path/to/intel--virtio-net--pcnet32.isarom
+
+NB: If you build the ROM using the .rom prefix then it'll be built as a PCI
+ROM, which won't work properly in VirtualBox.  The error message you'll see
+is "No more network devices", which is somewhat confusing.  If you enter the
+shell and use the "autoboot" command things will work as intended.  Remember
+to always build as a .isarom to avoid this issue.

diff --git a/src/config/vbox/embedded.ipxe b/src/config/vbox/embedded.ipxe
deleted file mode 100644 (file)
index ea34b30..0000000
--- a/src/config/vbox/embedded.ipxe
+++ /dev/null
@@ -1,5 +0,0 @@
-#!ipxe
-prompt --key 0x02 --timeout 2000 Press Ctrl-B to enter the iPXE shell... && shell || goto auto
-exit
-:auto
-autoboot

diff --git a/src/config/vbox/general.h b/src/config/vbox/general.h
index 3ebecd68c80c923398dd086063b91a6f1c23b498..27d15daf2bf253d52b416ac266bdddf231e33984 100644 (file)
--- a/src/config/vbox/general.h
+++ b/src/config/vbox/general.h
@@ -1,7 +1,6 @@
 /* Disabled from config/defaults/pcbios.h */
 
 #undef IMAGE_ELF
-#undef IMAGE_MULTIBOOT
 #undef SANBOOT_PROTO_ISCSI
 #undef SANBOOT_PROTO_AOE
 #undef SANBOOT_PROTO_IB_SRP