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

Timestamp:

Jul 9, 2012 12:54:37 PM (13 years ago)

Author:

vboxsync

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

78976

Message:

Renamed PC/BIOS-new to PC/BIOS and dropped the VBOX_WITH_NEW_BIOS makefile variable.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• PC/BIOS (moved) (moved from trunk/src/VBox/Devices/PC/BIOS-new )
• PC/BIOS/MakeDebianBiosAssembly.cpp (copied) (copied from trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp )
• PC/BIOS/Makefile.kmk (copied) (copied from trunk/src/VBox/Devices/PC/BIOS-new/Makefile.kmk ) (1 diff)
• PC/BIOS/VBoxBiosAlternative.asm (copied) (copied from trunk/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.asm )
• PC/BIOS/VBoxBiosAlternative.md5sum (copied) (copied from trunk/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.md5sum )

trunk/src/VBox/Devices/Makefile.kmk

@@ -33 +33 @@
 endif
 if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
- ifdef VBOX_WITH_NEW_BIOS
-  include $(PATH_SUB_CURRENT)/PC/BIOS-new/Makefile.kmk
- else
-  include $(PATH_SUB_CURRENT)/PC/BIOS/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/PC/BIOS/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk
  ifdef VBOX_WITH_EFI

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -101 +101 @@
         $(QUIET)yasm -f bin -o $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm
         $(VBOX_VBOXCMP) $< $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin
-        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(PATH_ROOT)/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.asm
+        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(PATH_ROOT)/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm
         $(REDIRECT) -C $(dir $(VBoxPcBios_1_TARGET)) -- \
                 $(MD5SUM_EXT) -bo $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(notdir $(VBoxPcBios_1_TARGET))
-        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(PATH_ROOT)/src/VBox/Devices/PC/BIOS-new/VBoxBiosAlternative.md5sum
+        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum $(PATH_ROOT)/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum
         $(RM) -f -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum
  else