Changeset 13155 in vbox

Timestamp:

Oct 10, 2008 8:07:41 AM (16 years ago)

Author:

vboxsync

Message:

re-applied the biossums merge

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Graphics/BIOS/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/Graphics/BIOS/biossums.c (deleted)
• src/VBox/Devices/PC/BIOS/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/PC/BIOS/biossums.c (deleted)
• src/bldprogs/Makefile.kmk (modified) (1 diff)
• src/bldprogs/biossums.c (deleted)

trunk/Config.kmk

@@ -1218 +1218 @@
 # bin2c (convert binary files into C arrays)
 VBOX_BIN2C     ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
+
+# biossums (set BIOS checksums)
+VBOX_BIOSSUMS  ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
 
 # mkisofs

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

@@ -31 +31 @@
 # Build program for calculating the VGA BIOS checksums.
 #
-BLDPROGS += vgabiossums vbetables-gen
-vgabiossums_TEMPLATE   = VBOXBLDPROG
-vgabiossums_SOURCES    = biossums.c
+BLDPROGS += vbetables-gen
 vbetables-gen_TEMPLATE = VBOXBLDPROG
 vbetables-gen_SOURCES  = vbetables-gen.c
@@ -102 +100 @@
 
 # 6. checksums
-$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(TARGET_vgabiossums)
-        $(call MSG_TOOL,vgabiossums,VgaBiosBin,$<,$@)
-        $(QUIET)$(CP) -f $(PATH_VgaBiosBin)/vgabios.tmp $@
-        $(QUIET)$(TARGET_vgabiossums) $@
+$$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(VBOX_BIOSSUMS)
+        $(call MSG_TOOL,biossums,VgaBiosBin,$<,$@)
+        $(QUIET)$(VBOX_BIOSSUMS) $< $@
 
 #

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

@@ -27 +27 @@
 #
 VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
-
-#
-# Build program for calculating the PC BIOS checksums.
-#
-BLDPROGS += pcbiossums
-pcbiossums_TEMPLATE = VBOXBLDPROG
-pcbiossums_SOURCES  = biossums.c
-
 
 #
@@ -94 +86 @@
 
 # 5. calculate checksums for the final BIOS image.
-$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(TARGET_pcbiossums)
-        $(call MSG_TOOL,pcbiossums,PcBiosBin,$<,$@)
-        $(QUIET)$(CP) -f $(PATH_PcBiosBin)/pcbios.tmp $(PATH_PcBiosBin)/pcbios.bin
-        $(QUIET)$(TARGET_pcbiossums) $(PATH_PcBiosBin)/pcbios.bin
+$$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(VBOX_BIOSSUMS)
+        $(call MSG_TOOL,biossums,PcBiosBin,$<,$@)
+        $(QUIET)$(VBOX_BIOSSUMS) $< $@
 
 # 6. create the symbol table.

trunk/src/bldprogs/Makefile.kmk

@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-BLDPROGS += bin2c
+BLDPROGS += bin2c biossums
+
 bin2c_TEMPLATE = VBOXBLDPROG
 bin2c_SOURCES = bin2c.c
 
+biossums_TEMPLATE = VBOXBLDPROG
+biossums_SOURCES = biossums.c
+
 include $(KBUILD_PATH)/subfooter.kmk