Changeset 42143 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 13, 2012 12:46:05 PM (13 years ago)

Author:

vboxsync

Message:

Makefile.kmk for the new VGA BIOS. Had to change DEBUG to VGA_DEBUG to make it compilable.

File:

• trunk/src/VBox/Devices/Graphics/BIOS-new/Makefile.kmk (copied) (copied from trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk ) (6 diffs)

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

@@ -1 +1 @@
 # $Id$
 ## @file
-# Sub-Makefile for the New BIOS ROM.
+# Sub-Makefile for the New VGA BIOS ROM.
 #
 
@@ -23 +23 @@
 
  #
- # VBoxBios - Template for building the BIOS bits.
+ # VBoxVgaBios - Template for building the BIOS bits.
  #
- TEMPLATE_VBoxBios = PXE ROM
- TEMPLATE_VBoxBios_TOOL    = OPENWATCOM-16
- TEMPLATE_VBoxBios_LDTOOL  = OPENWATCOM-WL
- TEMPLATE_VBoxBios_ASTOOL  = OPENWATCOM-16
- TEMPLATE_VBoxBios_BLD_TRG = os-agnostic
- TEMPLATE_VBoxBios_BLD_TRG_ARCH = x86
- TEMPLATE_VBoxBios_BINSUFF = .rom
- TEMPLATE_VBoxBios_INCS    = .
- TEMPLATE_VBoxBios_ASFLAGS = -q -wx
- TEMPLATE_VBoxBios_CFLAGS  = -q -3 -wx -zl -zu -s -oas -d1+ -ms
- TEMPLATE_VBoxBios_DEFS    = \
-        VBOX_PC_BIOS \
-        VBOX_LANBOOT_SEG=0xE200 \
-        VBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" \
-        VBOX_WITH_SCSI \
-        VBOX_WITH_AHCI
- TEMPLATE_VBoxBios_LDFLAGS = system dos  \
+ TEMPLATE_VBoxVgaBios = PXE ROM
+ TEMPLATE_VBoxVgaBios_TOOL    = OPENWATCOM-16
+ TEMPLATE_VBoxVgaBios_LDTOOL  = OPENWATCOM-WL
+ TEMPLATE_VBoxVgaBios_ASTOOL  = OPENWATCOM-16
+ TEMPLATE_VBoxVgaBios_BLD_TRG = os-agnostic
+ TEMPLATE_VBoxVgaBios_BLD_TRG_ARCH = x86
+ TEMPLATE_VBoxVgaBios_BINSUFF = .rom
+ TEMPLATE_VBoxVgaBios_INCS    = .
+ TEMPLATE_VBoxVgaBios_ASFLAGS = -q -0 -wx
+ TEMPLATE_VBoxVgaBios_CFLAGS  = -q -3 -wx -zl -zu -s -oas -d1+ -ms
+ TEMPLATE_VBoxVgaBios_DEFS    = VBE
+# TEMPLATE_VBoxVgaBios_DEFS.debug = VGA_DEBUG - later
+ TEMPLATE_VBoxVgaBios_CDEFS   = \
+        'VBOX_VERSION_STRING="$(VBOX_VERSION_STRING)"' \
+        'VBOX_VENDOR="$(VBOX_VENDOR)"' \
+        'VBOX_PRODUCT="$(VBOX_PRODUCT)"'
+ TEMPLATE_VBoxVgaBios_LDFLAGS = system dos  \
         debug all \
         option quiet, nofarcalls, map, verbose, statics, symfile \
-        output raw offset=0xF0000 order \
-        clname DATA segaddr=0xF000 segment _DATA \
-        clname CODE \
-        segment _TEXT segaddr=0xF000 offset=0x1600 \
-        segment BIOS32 segaddr=0xF000 offset=0xDE00 \
-        segment BIOSSEG segaddr=0xF000 offset=0xE000 \
+        output raw offset=0xC0000 order \
+        clname CODE  \
+         segment VGAROM segaddr=0xC000 \
+         segment _TEXT  segaddr=0xC000 offset=0xA00 \
+         segment VBE32  segaddr=0xC000 offset=0x4600 \
+        clname DATA \
+         segment _DATA  segaddr=0xC000 offset=0x4800 \
         disable 1014, 1023, 2120
- TEMPLATE_VBoxBios_LNK_DEPS = $(VBOX_BIOSSUMS)
- TEMPLATE_VBoxBios_POST_CMDS = \
+
+ TEMPLATE_VBoxVgaBios_LNK_DEPS = $(VBOX_BIOSSUMS)
+ TEMPLATE_VBoxVgaBios_POST_CMDS = \
         $(QUIET)$(MV_EXT) -f $(out) $(out).tmp \
         && $(VBOX_BIOSSUMS) $(out).tmp $(out) \
@@ -62 +64 @@
  #
  MISCBINS += VBoxPcBios
- VBoxPcBios_TEMPLATE = VBoxBios
+ VBoxPcBios_TEMPLATE = VBoxVgaBios
  VBoxPcBios_SOURCES = \
-        bios.c \
-        print.c \
-        ata.c \
-        floppy.c \
-        eltorito.c \
-        boot.c \
-        keyboard.c \
-        disk.c \
-        serial.c \
-        system.c \
-        timepci.c \
-        pcibios.c \
-        ps2mouse.c \
-        parallel.c \
-        logo.c \
-        scsi.c \
-        ahci.c \
-        pciutil.c \
-        vds.c \
-        support.asm \
-        pcibio32.asm \
-        orgs.asm
+        vgarom.asm \
+        vberom.asm \
+        vgabios.c \
+        vbe.c
 
  #
  # Updates the alternative source file.
  #
- update-bios-source | $(PATH_SUB_CURRENT)/VBoxBiosAlternative.asm $(PATH_SUB_CURRENT)/VBoxBiosAlternative.md5sum: \
+ update-bios-source | $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative.asm $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative.md5sum: \
                 $$(VBoxPcBios_1_TARGET) \
                 $$(MakeDebianBiosAssembly_1_TARGET) \
@@ -99 +83 @@
                 --bios-map $(basename $<).map \
                 --bios-sym $(basename $<).sym \
-                --output $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm
-        $(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/VBoxBiosAlternative.asm
+                --output $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.asm
+        $(QUIET)yasm -f bin -o $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.asm
+        $(VBOX_VBOXCMP) $< $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.bin
+        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.asm $(PATH_ROOT)/src/VBox/Devices/PC/BIOS/VBoxVgaBiosAlternative.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/VBoxBiosAlternative.md5sum
-        $(RM) -f -- $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.asm $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxBiosAlternative.md5sum
+                $(MD5SUM_EXT) -bo $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.md5sum $(notdir $(VBoxPcBios_1_TARGET))
+        $(CP) --changed -- $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.md5sum $(PATH_ROOT)/src/VBox/Devices/PC/BIOS/VBoxVgaBiosAlternative.md5sum
+        $(RM) -f -- $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.asm $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.bin $(VBoxPcBios_0_OUTDIR)/VBoxVgaBiosAlternative.md5sum
  else
-        $(QUIET)$(ECHO) "Fatal error: Can only update VBoxBiosAlternative.asm/md5sum with a release build."
+        $(QUIET)$(ECHO) "Fatal error: Can only update VBoxVgaBiosAlternative.asm/md5sum with a release build."
         $(QUIET)exit 1
  endif
@@ -116 +100 @@
 
 #
-# The library containing the PC BIOS image.
+# The library containing the VGA BIOS image.
 #
-LIBRARIES += PcBiosBin
-PcBiosBin_TEMPLATE  = VBOXR3
-PcBiosBin_DEFS      = IN_VBOXDD2
-PcBiosBin_SOURCES   = $(PcBiosBin_0_OUTDIR)/PcBiosBin.c
-PcBiosBin_CLEAN     = $(PcBiosBin_0_OUTDIR)/PcBiosBin.c
+LIBRARIES += VgaBiosBin
+VgaBiosBin_TEMPLATE  = VBOXR3
+VgaBiosBin_DEFS      = IN_VBOXDD2
+VgaBiosBin_SOURCES   = $(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c
+VgaBiosBin_CLEAN     = $(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c
 
 ifdef VBOX_WITH_OPEN_WATCOM
- $$(PcBiosBin_0_OUTDIR)/PcBiosBin.c: $$(VBoxPcBios_1_TARGET) $(VBOX_BIN2C) | $$(dir $$@)
-        $(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
-        $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $< $@
+ $$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c: $$(VBoxPcBios_1_TARGET) $(VBOX_BIN2C) | $$(dir $$@)
+        $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
+        $(QUIET)$(VBOX_BIN2C) -min 32 -max 36 -mask 0x0fff -ascii -export VgaBiosBinary $< $@
 else
- PcBiosBin_CLEAN    += $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom
+ VgaBiosBin_CLEAN    += $(VgaBiosBin_0_OUTDIR)/VBoxPcBios.rom
 
- $$(PcBiosBin_0_OUTDIR)/PcBiosBin.c + $$(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom: \
-                $(PATH_SUB_CURRENT)/VBoxBiosAlternative.asm \
-                $(PATH_SUB_CURRENT)/VBoxBiosAlternative.md5sum \
+ $$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c + $$(VgaBiosBin_0_OUTDIR)/VBoxPcBios.rom: \
+                $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative.asm \
+                $(PATH_SUB_CURRENT)/VBoxVgaBiosAlternative.md5sum \
                 $(VBOX_BIN2C) | $$(dir $$@)
-        $(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
-        $(QUIET)yasm -f bin -o $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom $<
-        $(QUIET)$(REDIRECT) -C $(PcBiosBin_0_OUTDIR) -- \
+        $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
+        $(QUIET)yasm -f bin -o $(VgaBiosBin_0_OUTDIR)/VBoxPcBios.rom $<
+        $(QUIET)$(REDIRECT) -C $(VgaBiosBin_0_OUTDIR) -- \
                 $(MD5SUM_EXT) -c $(basename $<).md5sum
-        $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom $@
-        $(QUIET)$(RM) -f -- $$(PcBiosBin_0_OUTDIR)/VBoxPcBios.rom
+        $(QUIET)$(VBOX_BIN2C) -min 32 -max 36 -mask 0x0fff -ascii -export VgaBiosBinary $(VgaBiosBin_0_OUTDIR)/VBoxPcBios.rom $@
+        $(QUIET)$(RM) -f -- $$(VgaBiosBin_0_OUTDIR)/VBoxPcBios.rom
 endif
 
@@ -147 +131 @@
 # MakeDebianBiosAssembly - For distros without OpenWatcom.
 #
-BLDPROGS += MakeDebianBiosAssembly
-MakeDebianBiosAssembly_TEMPLATE = VBoxAdvBldProg
-MakeDebianBiosAssembly_DEFS     = IN_DIS
-MakeDebianBiosAssembly_SOURCES  = MakeDebianBiosAssembly.cpp
-MakeDebianBiosAssembly_LIBS     = \
+##BLDPROGS += MakeDebianVgaBiosAssembly
+MakeDebianVgaBiosAssembly_TEMPLATE = VBoxAdvBldProg
+MakeDebianVgaBiosAssembly_DEFS     = IN_DIS
+MakeDebianVgaBiosAssembly_SOURCES  = MakeDebianVgaBiosAssembly.cpp
+MakeDebianVgaBiosAssembly_LIBS     = \
         $(PATH_STAGE_LIB)/DisasmBldProg$(VBOX_SUFF_LIB)