WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 07 of 19] tools: hvmloader: refactor Makefile to move

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 07 of 19] tools: hvmloader: refactor Makefile to move ROM filenames into variables
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Tue, 12 Apr 2011 12:29:06 +0100
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Delivery-date: Tue, 12 Apr 2011 04:46:03 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1302607739@xxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1302607739@xxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.6.4
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302600838 -3600
# Node ID 70bf20a0b5462f3a1fa4213592bae076ec1a81ba
# Parent  170ca1c6603ce0cc1893125103c4666dfa303364
tools: hvmloader: refactor Makefile to move ROM filenames into variables.

Add an option to use debug Cirrus video BIOS, simply as a convenience.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r 170ca1c6603c -r 70bf20a0b546 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Apr 12 10:22:47 2011 +0100
+++ b/tools/firmware/hvmloader/Makefile Tue Apr 12 10:33:58 2011 +0100
@@ -36,6 +36,17 @@ SRCS += tests.c
 endif
 OBJS  = $(patsubst %.c,%.o,$(SRCS))
 
+CIRRUSVGA_DEBUG ?= n
+
+ROMBIOS_ROM   := ../rombios/BIOS-bochs-latest
+
+STDVGA_ROM    := ../vgabios/VGABIOS-lgpl-latest.bin
+ifeq ($(CIRRUSVGA_DEBUG),y)
+CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
+else
+CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
+endif
+
 .PHONY: all
 all: subdirs-all
        $(MAKE) hvmloader
@@ -48,12 +59,17 @@ hvmloader: $(OBJS) acpi/acpi.a
        $(OBJCOPY) hvmloader.tmp hvmloader
        rm -f hvmloader.tmp
 
-roms.h: ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin \
-       ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../etherboot/eb-roms.h
-       sh ./mkhex rombios ../rombios/BIOS-bochs-latest > roms.h
-       sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h
-       sh ./mkhex vgabios_cirrusvga \
-               ../vgabios/VGABIOS-lgpl-latest.cirrus.bin >> roms.h
+roms.h: $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) ../etherboot/eb-roms.h
+ifneq ($(ROMBIOS_ROM),)
+       sh ./mkhex rombios $(ROMBIOS_ROM) > roms.h
+endif
+ifneq ($(STDVGA_ROM),)
+       sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> roms.h
+endif
+ifneq ($(CIRRUSVGA_ROM),)
+       sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> roms.h
+endif
+
        cat ../etherboot/eb-roms.h >> roms.h
 
 .PHONY: clean

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>