Changeset 105075 in vbox

Timestamp:

Jun 28, 2024 3:45:11 PM (9 months ago)

Author:

vboxsync

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

163695

Message:

ValKit/bootsectors: Produce a special 63.5MB capable bootsector and use it with the VBoxBS3KitImgBig template, disabling the 63.5MB capability in the regular bootsector so it works on USB sticks on real HW as well. bugref:10715

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Config.kmk (modified) (1 diff)
• bs3kit/Makefile.kmk (modified) (1 diff)
• bs3kit/bs3-bootsector.asm (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -826 +826 @@
 #TEMPLATE_VBoxBS3KitImgBig_POST_CMDS = $(NO_SUCH_VARIABLE)
 
+TEMPLATE_VBoxBS3KitImgBig_LNK_DEPS = \
+        $(bs3-bootsector-63MB_1_TARGET) \
+        $(VBoxBs3Linker_1_TARGET)
+TEMPLATE_VBoxBS3KitImgBig_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY) \
+                ,,$(QUIET)$(MV_EXT) -f -- "$(out)" "$(out).tmp" \
+                $$(NLTAB)$(QUIET)$(VBoxBs3Linker_1_TARGET) -o $(out) $(bs3-bootsector-63MB_1_TARGET) $(out).tmp $($(target)_2_VBOX_BS3KIT_HIGH_DLLS) \
+        $$(NLTAB)$(QUIET)$(RM_EXT) -f -- "$(out).tmp") \
+        $(eval .PRECIOUS: $(outbase).map) # ugly hack!
+
+
 # BS3Kit template for a high image.
 TEMPLATE_VBoxBS3KitHighImg = Template for building BS3Kit test images, the high DLL.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -55 +55 @@
 
 
-# The boot sector.
+# The boot sector for regular floppies.
 MISCBINS += bs3-bootsector
 bs3-bootsector_TEMPLATE = VBoxBS3KitBS
 bs3-bootsector_SOURCES  = bs3-bootsector.asm
+
+# The boot sector for 63.5MB floppies.
+MISCBINS += bs3-bootsector-63MB
+bs3-bootsector-63MB_TEMPLATE = VBoxBS3KitBS
+bs3-bootsector-63MB_DEFS     = BS3KIT_BOOTSECTOR_SUPPORT_63_5MB_FLOPPIES
+bs3-bootsector-63MB_SOURCES  = bs3-bootsector.asm
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-bootsector.asm

@@ -56 +56 @@
 %define BS3KIT_BOOTSECTOR_LOAD_DOTS
 ;; Enables support for fake 63.5 MB floppies with 255 sectors, 2 heads and 255 tracks.
-%define BS3KIT_BOOTSECTOR_SUPPORT_63_5MB_FLOPPIES
+;; @note This is typically enabled by the makefile.
+;%define BS3KIT_BOOTSECTOR_SUPPORT_63_5MB_FLOPPIES
 ;; Enables code to avoid trying to read across 64kB DMA boundaries.
 %define BS3KIT_BOOTSECTOR_DODGE_BOUNDARIES