[Xen-changelog] [xen-unstable] tools: hvmloader: rename roms.h to roms.inc

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302612103 -3600
# Node ID d237d2e2a47d4caf6d469d7041e62d3bcb2518ce
# Parent  95746ab3b1e4a989c98817bbf3206393f852b681
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>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 95746ab3b1e4 -r d237d2e2a47d .hgignore
--- a/.hgignore Tue Apr 12 13:40:49 2011 +0100
+++ b/.hgignore Tue Apr 12 13:41:43 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 95746ab3b1e4 -r d237d2e2a47d tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Apr 12 13:40:49 2011 +0100
+++ b/tools/firmware/hvmloader/Makefile Tue Apr 12 13:41:43 2011 +0100
@@ -51,7 +51,7 @@
 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 @@
        $(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 95746ab3b1e4 -r d237d2e2a47d tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 13:40:49 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Tue Apr 12 13:41:43 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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog