[Xen-devel] [PATCH 08 of 11] tools: hvmloader: Use more generic name for BIOS ROM image

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302013752 -3600
# Node ID 478740ab3110e79142ee9fde73f5b7e9d066a6ce
# Parent  2da3ecf0587edd56d37bd6d81b50906c92f1b47c
tools: hvmloader: Use more generic name for BIOS ROM image

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

diff -r 2da3ecf0587e -r 478740ab3110 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Tue Apr 05 15:29:12 2011 +0100
+++ b/tools/firmware/hvmloader/Makefile Tue Apr 05 15:29:12 2011 +0100
@@ -49,7 +49,9 @@ hvmloader: $(OBJS) acpi/acpi.a
 
 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
+       echo "/* Autogenerated file. DO NOT EDIT */" > roms.h
+
+       sh ./mkhex biosimg ../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
diff -r 2da3ecf0587e -r 478740ab3110 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Tue Apr 05 15:29:12 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Tue Apr 05 15:29:12 2011 +0100
@@ -726,8 +726,9 @@ int main(void)
                                         SMBIOS_MAXIMUM_SIZE);
 
     printf("Loading ROMBIOS ...\n");
-    BUILD_BUG_ON(sizeof(rombios) > ROMBIOS_MAXIMUM_SIZE);
-    memcpy((void *)ROMBIOS_PHYSICAL_ADDRESS, rombios, sizeof(rombios));
+    BUILD_BUG_ON(sizeof(biosimg) > BIOS_MAXIMUM_SIZE);
+    memcpy((void *)BIOS_PHYSICAL_ADDRESS, biosimg, sizeof(biosimg));
+
     bios32_addr = highbios_setup();
 
     if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode )
@@ -803,8 +804,8 @@ int main(void)
                SMBIOS_PHYSICAL_ADDRESS,
                SMBIOS_PHYSICAL_ADDRESS + smbios_sz - 1);
     printf(" %05x-%05x: Main BIOS\n",
-           ROMBIOS_PHYSICAL_ADDRESS,
-           ROMBIOS_PHYSICAL_ADDRESS + sizeof(rombios) - 1);
+           BIOS_PHYSICAL_ADDRESS,
+           BIOS_PHYSICAL_ADDRESS + sizeof(biosimg) - 1);
 
     build_e820_table();
     dump_e820_table();
diff -r 2da3ecf0587e -r 478740ab3110 tools/firmware/rombios/config.h
--- a/tools/firmware/rombios/config.h   Tue Apr 05 15:29:12 2011 +0100
+++ b/tools/firmware/rombios/config.h   Tue Apr 05 15:29:12 2011 +0100
@@ -13,9 +13,9 @@
 #define E820_PHYSICAL_ADDRESS         0x000EA100
 #define SMBIOS_PHYSICAL_ADDRESS       0x000EB000
 #define SMBIOS_MAXIMUM_SIZE           0x00005000
-#define ROMBIOS_PHYSICAL_ADDRESS      0x000F0000
+#define BIOS_PHYSICAL_ADDRESS         0x000F0000
 
-#define ROMBIOS_MAXIMUM_SIZE         (0x00100000 - ROMBIOS_PHYSICAL_ADDRESS)
+#define BIOS_MAXIMUM_SIZE            (0x00100000 - BIOS_PHYSICAL_ADDRESS)
 
 /* Offsets from E820_PHYSICAL_ADDRESS. */
 #define E820_NR_OFFSET                0x0

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