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 09 of 19] tools: hvmloader: rename roms.h to roms.inc

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 09 of 19] tools: hvmloader: rename roms.h to roms.inc
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Tue, 12 Apr 2011 12:29:08 +0100
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Delivery-date: Tue, 12 Apr 2011 04:44:55 -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 1302601656 -3600
# Node ID 35d6dd63d96ee37c3fcf7690bac933c44a40b23c
# Parent  bb3e40b2c856db6b0f3500625ff45a9d07377d1f
tools: hvmloader: rename roms.h to roms.inc

It's not really a header, it's an autogenerated data file.

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

diff -r bb3e40b2c856 -r 35d6dd63d96e .hgignore
--- a/.hgignore Tue Apr 12 10:43:01 2011 +0100
+++ b/.hgignore Tue Apr 12 10:47:36 2011 +0100
@@ -143,7 +143,7 @@
 ^tools/firmware/hvmloader/acpi/dsdt.*\.c$
 ^tools/firmware/hvmloader/acpi/ssdt_.*\.h$
 ^tools/firmware/hvmloader/hvmloader$
-^tools/firmware/hvmloader/roms\.h$
+^tools/firmware/hvmloader/roms\.inc$
 ^tools/firmware/rombios/BIOS-bochs-[^/]*$
 ^tools/firmware/rombios/_rombios[^/]*_\.c$
 ^tools/firmware/rombios/rombios[^/]*\.s$
diff -r bb3e40b2c856 -r 35d6dd63d96e tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Apr 12 10:43:01 2011 +0100
+++ b/tools/firmware/hvmloader/Makefile Tue Apr 12 10:47:36 2011 +0100
@@ -51,7 +51,7 @@ endif
 all: subdirs-all
        $(MAKE) hvmloader
 
-hvmloader.o: roms.h
+hvmloader.o: roms.inc
 smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""
 
 hvmloader: $(OBJS) acpi/acpi.a
@@ -59,22 +59,25 @@ hvmloader: $(OBJS) acpi/acpi.a
        $(OBJCOPY) hvmloader.tmp hvmloader
        rm -f hvmloader.tmp
 
-roms.h: $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) ../etherboot/eb-roms.h
+roms.inc: $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) ../etherboot/eb-roms.h
+       echo "/* Autogenerated file. DO NOT EDIT */" > roms.inc
+
 ifneq ($(ROMBIOS_ROM),)
-       sh ./mkhex rombios $(ROMBIOS_ROM) > roms.h
+       sh ./mkhex rombios $(ROMBIOS_ROM) >> roms.inc
 endif
+
 ifneq ($(STDVGA_ROM),)
-       sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> roms.h
+       sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> roms.inc
 endif
 ifneq ($(CIRRUSVGA_ROM),)
-       sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> roms.h
+       sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> roms.inc
 endif
 
-       cat ../etherboot/eb-roms.h >> roms.h
+       cat ../etherboot/eb-roms.h >> roms.inc
 
 .PHONY: clean
 clean: subdirs-clean
-       rm -f roms.h acpi.h
+       rm -f roms.inc acpi.h
        rm -f hvmloader hvmloader.tmp *.o $(DEPS)
 
 -include $(DEPS)
diff -r bb3e40b2c856 -r 35d6dd63d96e tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 10:43:01 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 10:47:36 2011 +0100
@@ -20,7 +20,6 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "roms.h"
 #include "acpi/acpi2_0.h"
 #include "util.h"
 #include "hypercall.h"
@@ -33,6 +32,8 @@
 #include <xen/hvm/ioreq.h>
 #include <xen/memory.h>
 
+#include "roms.inc"
+
 asm (
     "    .text                       \n"
     "    .globl _start               \n"

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

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