From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 09 of 19] tools: hvmloader: rename roms.h to roms.inc
Date: Tue, 12 Apr 2011 12:29:08 +0100 [thread overview]
Message-ID: <35d6dd63d96ee37c3fcf.1302607748@localhost.localdomain> (raw)
In-Reply-To: <patchbomb.1302607739@localhost.localdomain>
# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# 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@citrix.com>
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"
next prev parent reply other threads:[~2011-04-12 11:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-12 11:28 [PATCH 00 of 19] tools: SeaBIOS integration Ian Campbell
2011-04-12 11:29 ` [PATCH 01 of 19] tools: hvmloader: move ROMBIOS configuration into tools/firmware/rombios/ Ian Campbell
2011-04-12 11:29 ` [PATCH 02 of 19] tools: hvmloader: split e820 support into its own code module Ian Campbell
2011-04-12 11:29 ` [PATCH 03 of 19] tools: hvmloader: pass ACPI_PHYSICAL_ADDRESS as a runtime parameter Ian Campbell
2011-04-12 11:29 ` [PATCH 04 of 19] tools: hvmloader: pass SMBIOS location " Ian Campbell
2011-04-12 11:29 ` [PATCH 05 of 19] tools: hvmloader: pass option ROM end address around as a parameter Ian Campbell
2011-04-12 11:29 ` [PATCH 06 of 19] tools: hvmloader: split scratch and hypercall addressing from ROMBIOS low heap Ian Campbell
2011-04-12 11:29 ` [PATCH 07 of 19] tools: hvmloader: refactor Makefile to move ROM filenames into variables Ian Campbell
2011-04-12 11:29 ` [PATCH 08 of 19] tools: hvmloader: remove rombios_sz, just use sizeof(rombios) Ian Campbell
2011-04-12 11:29 ` Ian Campbell [this message]
2011-04-12 11:29 ` [PATCH 10 of 19] tools: hvmloader: Define $(OBJS) directly instead of via $(SRCS) Ian Campbell
2011-04-12 11:29 ` [PATCH 11 of 19] tools: hvmloader: add bios_config data structure Ian Campbell
2011-04-12 11:29 ` [PATCH 12 of 19] tools: hvmloader: Refactor APIC, PCI and SMP setup into struct bios_config Ian Campbell
2011-04-12 11:29 ` [PATCH 13 of 19] tools: hvmloader: refactor highbios and bios_info " Ian Campbell
2011-04-12 11:29 ` [PATCH 14 of 19] tools: hvmloader: Refactor VM86 and E820 " Ian Campbell
2011-04-12 11:29 ` [PATCH 15 of 19] tools: hvmloader: Refactor ACPI table " Ian Campbell
2011-04-12 11:29 ` [PATCH 16 of 19] tools: hvmloader: Refactor MP " Ian Campbell
2011-04-12 11:29 ` [PATCH 17 of 19] tools: libxl: hide selection of device-model, hvmloader and BIOS by default Ian Campbell
2011-04-14 18:09 ` Ian Jackson
2011-04-15 7:53 ` Ian Campbell
2011-04-12 11:29 ` [PATCH 18 of 19] tools: hvmloader: select BIOS through xenstore Ian Campbell
2011-04-12 11:29 ` [PATCH 19 of 19] tools: support SeaBIOS. Use by default when upstream qemu is configured Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=35d6dd63d96ee37c3fcf.1302607748@localhost.localdomain \
--to=ian.campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).