From: Ross Philipson <ross.philipson@citrix.com>
Date: Tue, 4 Aug 2009 15:42:02 +0000 (-0400)
Subject: Removed unused static SMBIOS OEM patches.
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=d726a5d544aeaea37651cf3bf8de6d0805953274;p=xenclient%2Fxen-pq.git

Removed unused static SMBIOS OEM patches.

 Changes to be committed:
	new file:   master/rm-oem-smbios-files.patch
	modified:   master/series
---

diff --git a/master/rm-oem-smbios-files.patch b/master/rm-oem-smbios-files.patch
new file mode 100644
index 0000000..272eabc
--- /dev/null
+++ b/master/rm-oem-smbios-files.patch
@@ -0,0 +1,250 @@
+diff --git a/oem/dell-960-optiplex-smbios.patch b/oem/dell-960-optiplex-smbios.patch
+deleted file mode 100644
+index bd5613e..0000000
+--- a/oem/dell-960-optiplex-smbios.patch
++++ /dev/null
+@@ -1,49 +0,0 @@
+-diff -Nur a/tools/firmware/hvmloader/markers.h b/tools/firmware/hvmloader/markers.h
+---- a/tools/firmware/hvmloader/markers.h	2008-11-25 12:47:54.000000000 -0500
+-+++ b/tools/firmware/hvmloader/markers.h	2008-11-25 12:53:27.000000000 -0500
+-@@ -17,22 +17,22 @@
+- struct bios_vendor_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_vendor = {BIOS_VENDOR_MARKER, "Xen"};
+-+} bios_vendor = {BIOS_VENDOR_MARKER, "Dell Inc."};
+- 
+- struct bios_version_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_version = {BIOS_VERSION_MARKER, ""};
+-+} bios_version = {BIOS_VERSION_MARKER, "X20"};
+- 
+- struct sys_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Xen"};
+-+} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Dell Inc."};
+- 
+- struct sys_product_name_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "HVM domU"};
+-+} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "OptiPlex 960"};
+- 
+- struct sys_product_version_struct {
+-     char marker[65];
+-@@ -57,15 +57,15 @@
+- struct sys_enclosure_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Xen"};
+-+} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Dell Inc."};
+- 
+- struct sys_enclosure_serial_struct {
+-     char marker[65];
+-     char value[65];
+- } sys_enclosure_serial = {SYS_ENCLOSURE_SERIAL_MARKER, ""};
+- 
+--const char *oem_strings_array[1] = {
+--    NULL
+-+const char *oem_strings_array[2] = {
+-+    "www.dell.com", NULL
+- };
+- 
+- #endif /* __HVMLOADER_MARKERS_H__ */
+diff --git a/oem/dell-e6500-latitude-smbios.patch b/oem/dell-e6500-latitude-smbios.patch
+deleted file mode 100644
+index b949c7c..0000000
+--- a/oem/dell-e6500-latitude-smbios.patch
++++ /dev/null
+@@ -1,49 +0,0 @@
+-diff -Nur a/tools/firmware/hvmloader/markers.h b/tools/firmware/hvmloader/markers.h
+---- a/tools/firmware/hvmloader/markers.h	2008-12-15 14:44:08.000000000 -0500
+-+++ b/tools/firmware/hvmloader/markers.h	2008-12-15 14:56:51.000000000 -0500
+-@@ -17,22 +17,22 @@
+- struct bios_vendor_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_vendor = {BIOS_VENDOR_MARKER, "Xen"};
+-+} bios_vendor = {BIOS_VENDOR_MARKER, "Dell Inc."};
+- 
+- struct bios_version_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_version = {BIOS_VERSION_MARKER, ""};
+-+} bios_version = {BIOS_VERSION_MARKER, "A09"};
+- 
+- struct sys_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Xen"};
+-+} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Dell Inc."};
+- 
+- struct sys_product_name_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "HVM domU"};
+-+} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "Latitude E6500"};
+- 
+- struct sys_product_version_struct {
+-     char marker[65];
+-@@ -57,15 +57,15 @@
+- struct sys_enclosure_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Xen"};
+-+} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Dell Inc."};
+- 
+- struct sys_enclosure_serial_struct {
+-     char marker[65];
+-     char value[65];
+- } sys_enclosure_serial = {SYS_ENCLOSURE_SERIAL_MARKER, ""};
+- 
+--const char *oem_strings_array[1] = {
+--    NULL
+-+const char *oem_strings_array[4] = {
+-+    "Dell System", "5[0031]", "13[PP04X]", NULL
+- };
+- 
+- #endif /* __HVMLOADER_MARKERS_H__ */
+diff --git a/oem/hp-6930p-elitebook-smbios.patch b/oem/hp-6930p-elitebook-smbios.patch
+deleted file mode 100644
+index 8441b2a..0000000
+--- a/oem/hp-6930p-elitebook-smbios.patch
++++ /dev/null
+@@ -1,67 +0,0 @@
+-diff -Nur a/tools/firmware/hvmloader/markers.h b/tools/firmware/hvmloader/markers.h
+---- a/tools/firmware/hvmloader/markers.h	2008-11-25 12:47:54.000000000 -0500
+-+++ b/tools/firmware/hvmloader/markers.h	2008-11-25 12:46:41.000000000 -0500
+-@@ -17,27 +17,27 @@
+- struct bios_vendor_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_vendor = {BIOS_VENDOR_MARKER, "Xen"};
+-+} bios_vendor = {BIOS_VENDOR_MARKER, "Hewlett-Packard"};
+- 
+- struct bios_version_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_version = {BIOS_VERSION_MARKER, ""};
+-+} bios_version = {BIOS_VERSION_MARKER, "68PCU Ver. F.0B"};
+- 
+- struct sys_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Xen"};
+-+} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Hewlett-Packard"};
+- 
+- struct sys_product_name_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "HVM domU"};
+-+} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "HP EliteBook 6930p"};
+- 
+- struct sys_product_version_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_version = {SYS_PRODUCT_VERSION_MARKER, ""};
+-+} sys_product_version = {SYS_PRODUCT_VERSION_MARKER, "F.0B"};
+- 
+- struct sys_product_serial_struct {
+-     char marker[65];
+-@@ -47,25 +47,25 @@
+- struct sys_product_sku_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_sku = {SYS_PRODUCT_SKU_MARKER, ""};
+-+} sys_product_sku = {SYS_PRODUCT_SKU_MARKER, "GB996EA#ABU"};
+- 
+- struct sys_product_family_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_family = {SYS_PRODUCT_FAMILY_MARKER, ""};
+-+} sys_product_family = {SYS_PRODUCT_FAMILY_MARKER, "103C_5336AN"};
+- 
+- struct sys_enclosure_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Xen"};
+-+} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Hewlett-Packard"};
+- 
+- struct sys_enclosure_serial_struct {
+-     char marker[65];
+-     char value[65];
+- } sys_enclosure_serial = {SYS_ENCLOSURE_SERIAL_MARKER, ""};
+- 
+--const char *oem_strings_array[1] = {
+--    NULL
+-+const char *oem_strings_array[4] = {
+-+    "ABS 70/71 79 7A 7B 7C", "CSM v01.24", "www.hp.com", NULL
+- };
+- 
+- #endif /* __HVMLOADER_MARKERS_H__ */
+diff --git a/oem/lenovo-x200-thinkpad-smbios.patch b/oem/lenovo-x200-thinkpad-smbios.patch
+deleted file mode 100644
+index 26d1f09..0000000
+--- a/oem/lenovo-x200-thinkpad-smbios.patch
++++ /dev/null
+@@ -1,61 +0,0 @@
+-diff -Nur a/tools/firmware/hvmloader/markers.h b/tools/firmware/hvmloader/markers.h
+---- a/tools/firmware/hvmloader/markers.h	2008-12-15 14:44:08.000000000 -0500
+-+++ b/tools/firmware/hvmloader/markers.h	2008-12-16 10:09:53.000000000 -0500
+-@@ -17,27 +17,27 @@
+- struct bios_vendor_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_vendor = {BIOS_VENDOR_MARKER, "Xen"};
+-+} bios_vendor = {BIOS_VENDOR_MARKER, "LENOVO"};
+- 
+- struct bios_version_struct {
+-     char marker[65];
+-     char value[65];
+--} bios_version = {BIOS_VERSION_MARKER, ""};
+-+} bios_version = {BIOS_VERSION_MARKER, "6DET33WW (1.10 )"};
+- 
+- struct sys_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "Xen"};
+-+} sys_manufacturer = {SYS_MANUFACTURER_MARKER, "LENOVO"};
+- 
+- struct sys_product_name_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "HVM domU"};
+-+} sys_product_name = {SYS_PRODUCT_NAME_MARKER, "74542NU"};
+- 
+- struct sys_product_version_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_version = {SYS_PRODUCT_VERSION_MARKER, ""};
+-+} sys_product_version = {SYS_PRODUCT_VERSION_MARKER, "ThinkPad X200"};
+- 
+- struct sys_product_serial_struct {
+-     char marker[65];
+-@@ -52,20 +52,20 @@
+- struct sys_product_family_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_product_family = {SYS_PRODUCT_FAMILY_MARKER, ""};
+-+} sys_product_family = {SYS_PRODUCT_FAMILY_MARKER, "ThinkPad X200"};
+- 
+- struct sys_enclosure_manufacturer_struct {
+-     char marker[65];
+-     char value[65];
+--} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "Xen"};
+-+} sys_enclosure_manufacturer = {SYS_ENCLOSURE_MANUFACTURER_MARKER, "LENOVO"};
+- 
+- struct sys_enclosure_serial_struct {
+-     char marker[65];
+-     char value[65];
+- } sys_enclosure_serial = {SYS_ENCLOSURE_SERIAL_MARKER, ""};
+- 
+--const char *oem_strings_array[1] = {
+--    NULL
+-+const char *oem_strings_array[2] = {
+-+    "IBM ThinkPad Embedded Controller -[7XHT21WW-1.03    ]-", NULL
+- };
+- 
+- #endif /* __HVMLOADER_MARKERS_H__ */
diff --git a/master/series b/master/series
index 270e303..b6562a3 100644
--- a/master/series
+++ b/master/series
@@ -18,3 +18,4 @@ default-iommu-inclusive-mapping
 cx-initialize-safe-state
 igd-cmd-reg-change-for-reboot
 xblanker
+rm-oem-smbios-files.patch