pcr/xen: cleanup

9 files changed, 0 insertions, 425 deletions

diff --git a/pcr/xen/grub.conf b/pcr/xen/grub.conf
deleted file mode 100644
index e456973db..000000000
--- a/pcr/xen/grub.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#XEN_HYPERVISOR_CMDLINE="xsave=1"
-#XEN_LINUX_CMDLINE="console=tty0"
-#XEN_LINUX_CMDLINE_OVERRIDE=0
diff --git a/pcr/xen/ovmf.patch b/pcr/xen/ovmf.patch
deleted file mode 100644
index 19ad7d326..000000000
--- a/pcr/xen/ovmf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/tools/firmware/Makefile
-+++ b/tools/firmware/Makefile
-@@ -19,6 +19,9 @@
- 
- ovmf-dir:
- 	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir
-+	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/BinWrappers/PosixLike"/* || true
-+	sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/Tests/GNUmakefile"
-+	patch -Np1 -i patch-gcc6-ovmf-build.sh.patch
- 	cp ovmf-makefile ovmf-dir/Makefile;
- 
- seabios-dir:
diff --git a/pcr/xen/patch-gcc6-etherboot-ath9k-9287-array.patch b/pcr/xen/patch-gcc6-etherboot-ath9k-9287-array.patch
deleted file mode 100644
index 7b1f369b1..000000000
--- a/pcr/xen/patch-gcc6-etherboot-ath9k-9287-array.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 83d6f1f15f8cce844b0a131cbc63e444620e48b5 Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Mon, 14 Mar 2016 15:18:36 +0100
-Subject: ath9k: fix buffer overrun for ar9287
-
-Code that was added back in 2.6.38 has an obvious overflow
-when accessing a static array, and at the time it was added
-only a code comment was put in front of it as a reminder
-to have it reviewed properly.
-
-This has not happened, but gcc-6 now points to the specific
-overflow:
-
-drivers/net/wireless/ath/ath9k/eeprom.c: In function 'ath9k_hw_get_gain_boundaries_pdadcs':
-drivers/net/wireless/ath/ath9k/eeprom.c:483:44: error: array subscript is above array bounds [-Werror=array-bounds]
-     maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4];
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
-
-It turns out that the correct array length exists in the local
-'intercepts' variable of this function, so we can just use that
-instead of hardcoding '4', so this patch changes all three
-instances to use that variable. The other two instances were
-already correct, but it's more consistent this way.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Fixes: 940cd2c12ebf ("ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs")
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/wireless/ath/ath9k/eeprom.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/eeprom.c b/drivers/net/wireless/ath/ath9k/eeprom.c
-index 73fb423..a794157 100644
---- a/src/drivers/net/ath/ath9k/ath9k_eeprom.c
-+++ b/src/drivers/net/ath/ath9k/ath9k_eeprom.c
-@@ -477,10 +477,9 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 
- 	if (match) {
- 		if (AR_SREV_9287(ah)) {
--			/* FIXME: array overrun? */
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_9287[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_9287[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_9287[idxL].pwrPdg[i],
- 						data_9287[idxL].vpdPdg[i],
-@@ -490,7 +489,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 		} else if (eeprom_4k) {
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_4k[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_4k[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_4k[idxL].pwrPdg[i],
- 						data_4k[idxL].vpdPdg[i],
-@@ -500,7 +499,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,
- 		} else {
- 			for (i = 0; i < numXpdGains; i++) {
- 				minPwrT4[i] = data_def[idxL].pwrPdg[i][0];
--				maxPwrT4[i] = data_def[idxL].pwrPdg[i][4];
-+				maxPwrT4[i] = data_def[idxL].pwrPdg[i][intercepts - 1];
- 				ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i],
- 						data_def[idxL].pwrPdg[i],
- 						data_def[idxL].vpdPdg[i],
--- 
-cgit v0.12
-
diff --git a/pcr/xen/patch-gcc6-etherboot-e1000_phy.c.patch b/pcr/xen/patch-gcc6-etherboot-e1000_phy.c.patch
deleted file mode 100644
index 4cd6c246c..000000000
--- a/pcr/xen/patch-gcc6-etherboot-e1000_phy.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur a/src/drivers/net/e1000/e1000_phy.c b/src/drivers/net/e1000/e1000_phy.c
---- a/src/drivers/net/e1000/e1000_phy.c	2016-05-12 19:40:13.950772568 +1000
-+++ b/src/drivers/net/e1000/e1000_phy.c	2016-05-12 19:41:08.429089344 +1000
-@@ -164,7 +164,7 @@
- 
- 	DEBUGFUNC("e1000_get_phy_id");
- 
--	if (!(phy->ops.read_reg))
-+	if (!(phy->ops.read_reg)) {
- 		goto out;
- 
- 		ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-@@ -179,6 +179,7 @@
- 
- 		phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
- 		phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-+	}
- 
- out:
- 	return ret_val;
diff --git a/pcr/xen/patch-gcc6-etherboot-igb_phy.c.patch b/pcr/xen/patch-gcc6-etherboot-igb_phy.c.patch
deleted file mode 100644
index 44beb4baa..000000000
--- a/pcr/xen/patch-gcc6-etherboot-igb_phy.c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur a/src/drivers/net/igb/igb_phy.c b/src/drivers/net/igb/igb_phy.c
---- a/src/drivers/net/igb/igb_phy.c	2016-05-12 19:53:45.063246296 +1000
-+++ b/src/drivers/net/igb/igb_phy.c	2016-05-12 19:54:09.992692278 +1000
-@@ -88,7 +88,7 @@
- 
- 	DEBUGFUNC("igb_get_phy_id");
- 
--	if (!(phy->ops.read_reg))
-+	if (!(phy->ops.read_reg)) {
- 		goto out;
- 
- 		ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
-@@ -103,6 +103,7 @@
- 
- 		phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
- 		phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
-+	}
- 
- out:
- 	return ret_val;
diff --git a/pcr/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch b/pcr/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch
deleted file mode 100644
index 991d43330..000000000
--- a/pcr/xen/patch-gcc6-etherboot-rm-unused-string-functions.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From b54167b8b6a35c7dab19bbe4b421d447036558d4 Mon Sep 17 00:00:00 2001
-From: Michael Brown <mcb30@ipxe.org>
-Date: Mon, 16 Feb 2015 15:33:32 +0000
-Subject: [PATCH] [libc] Remove unused string functions
-
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/core/stringextra.c |  188 ------------------------------------------------
- src/include/string.h   |    6 --
- 2 files changed, 0 insertions(+), 194 deletions(-)
-
-diff --git a/src/core/stringextra.c b/src/core/stringextra.c
-index 0a50985..18ffc63 100644
---- a/src/core/stringextra.c
-+++ b/src/core/stringextra.c
-@@ -38,122 +38,6 @@ FILE_LICENCE ( GPL2_ONLY );
- 
- /* *** FROM string.c *** */
- 
--#ifndef __HAVE_ARCH_STRNICMP
--/**
-- * strnicmp - Case insensitive, length-limited string comparison
-- * @s1: One string
-- * @s2: The other string
-- * @len: the maximum number of characters to compare
-- */
--int strnicmp(const char *s1, const char *s2, size_t len)
--{
--	/* Yes, Virginia, it had better be unsigned */
--	unsigned char c1, c2;
--
--	c1 = 0;	c2 = 0;
--	if (len) {
--		do {
--			c1 = *s1; c2 = *s2;
--			s1++; s2++;
--			if (!c1)
--				break;
--			if (!c2)
--				break;
--			if (c1 == c2)
--				continue;
--			c1 = tolower(c1);
--			c2 = tolower(c2);
--			if (c1 != c2)
--				break;
--		} while (--len);
--	}
--	return (int)c1 - (int)c2;
--}
--#endif
--
--char * ___strtok;
--
--#ifndef __HAVE_ARCH_STRNCAT
--/**
-- * strncat - Append a length-limited, %NUL-terminated string to another
-- * @dest: The string to be appended to
-- * @src: The string to append to it
-- * @count: The maximum numbers of bytes to copy
-- *
-- * Note that in contrast to strncpy, strncat ensures the result is
-- * terminated.
-- */
--char * strncat(char *dest, const char *src, size_t count)
--{
--	char *tmp = dest;
--
--	if (count) {
--		while (*dest)
--			dest++;
--		while ((*dest++ = *src++)) {
--			if (--count == 0) {
--				*dest = '\0';
--				break;
--			}
--		}
--	}
--
--	return tmp;
--}
--#endif
--
--#ifndef __HAVE_ARCH_STRSPN
--/**
-- * strspn - Calculate the length of the initial substring of @s which only
-- * 	contain letters in @accept
-- * @s: The string to be searched
-- * @accept: The string to search for
-- */
--size_t strspn(const char *s, const char *accept)
--{
--	const char *p;
--	const char *a;
--	size_t count = 0;
--
--	for (p = s; *p != '\0'; ++p) {
--		for (a = accept; *a != '\0'; ++a) {
--			if (*p == *a)
--				break;
--		}
--		if (*a == '\0')
--			return count;
--		++count;
--	}
--
--	return count;
--}
--#endif
--
--#ifndef __HAVE_ARCH_STRCSPN
--/**
-- * strcspn - Calculate the length of the initial substring of @s which only
-- * 	contain letters not in @reject
-- * @s: The string to be searched
-- * @accept: The string to search for
-- */
--size_t strcspn(const char *s, const char *reject)
--{
--	const char *p;
--	const char *r;
--	size_t count = 0;
--
--	for (p = s; *p != '\0'; ++p) {
--		for (r = reject; *r != '\0'; ++r) {
--			if (*p == *r)
--				return count;
--		}
--		++count;
--	}
--
--	return count;
--}
--#endif
--
- #ifndef __HAVE_ARCH_STRPBRK
- /**
-  * strpbrk - Find the first occurrence of a set of characters
-@@ -174,35 +58,6 @@ char * strpbrk(const char * cs,const char * ct)
- }
- #endif
- 
--#ifndef __HAVE_ARCH_STRTOK
--/**
-- * strtok - Split a string into tokens
-- * @s: The string to be searched
-- * @ct: The characters to search for
-- *
-- * WARNING: strtok is deprecated, use strsep instead.
-- */
--char * strtok(char * s,const char * ct)
--{
--	char *sbegin, *send;
--
--	sbegin  = s ? s : ___strtok;
--	if (!sbegin) {
--		return NULL;
--	}
--	sbegin += strspn(sbegin,ct);
--	if (*sbegin == '\0') {
--		___strtok = NULL;
--		return( NULL );
--	}
--	send = strpbrk( sbegin, ct);
--	if (send && *send != '\0')
--		*send++ = '\0';
--	___strtok = send;
--	return (sbegin);
--}
--#endif
--
- #ifndef __HAVE_ARCH_STRSEP
- /**
-  * strsep - Split a string into tokens
-@@ -230,46 +85,3 @@ char * strsep(char **s, const char *ct)
- 	return sbegin;
- }
- #endif
--
--#ifndef __HAVE_ARCH_BCOPY
--/**
-- * bcopy - Copy one area of memory to another
-- * @src: Where to copy from
-- * @dest: Where to copy to
-- * @count: The size of the area.
-- *
-- * Note that this is the same as memcpy(), with the arguments reversed.
-- * memcpy() is the standard, bcopy() is a legacy BSD function.
-- *
-- * You should not use this function to access IO space, use memcpy_toio()
-- * or memcpy_fromio() instead.
-- */
--char * bcopy(const char * src, char * dest, int count)
--{
--	return memmove(dest,src,count);
--}
--#endif
--
--#ifndef __HAVE_ARCH_MEMSCAN
--/**
-- * memscan - Find a character in an area of memory.
-- * @addr: The memory area
-- * @c: The byte to search for
-- * @size: The size of the area.
-- *
-- * returns the address of the first occurrence of @c, or 1 byte past
-- * the area if @c is not found
-- */
--void * memscan(const void * addr, int c, size_t size)
--{
--	unsigned char * p = (unsigned char *) addr;
--
--	while (size) {
--		if (*p == c)
--			return (void *) p;
--		p++;
--		size--;
--	}
--  	return (void *) p;
--}
--#endif
-diff --git a/src/include/string.h b/src/include/string.h
-index 3482e1b..dfd78a6 100644
---- a/src/include/string.h
-+++ b/src/include/string.h
-@@ -19,11 +19,9 @@ FILE_LICENCE ( GPL2_ONLY );
- #include <stddef.h>
- #include <bits/string.h>
- 
--int __pure strnicmp(const char *s1, const char *s2, size_t len) __nonnull;
- char * strcpy(char * dest,const char *src) __nonnull;
- char * strncpy(char * dest,const char *src,size_t count) __nonnull;
- char * strcat(char * dest, const char * src) __nonnull;
--char * strncat(char *dest, const char *src, size_t count) __nonnull;
- int __pure strcmp(const char * cs,const char * ct) __nonnull;
- int __pure strncmp(const char * cs,const char * ct,
- 				     size_t count) __nonnull;
-@@ -31,16 +29,12 @@ char * __pure strchr(const char * s, int c) __nonnull;
- char * __pure strrchr(const char * s, int c) __nonnull;
- size_t __pure strlen(const char * s) __nonnull;
- size_t __pure strnlen(const char * s, size_t count) __nonnull;
--size_t __pure strspn(const char *s, const char *accept) __nonnull;
--size_t __pure strcspn(const char *s, const char *reject) __nonnull;
- char * __pure strpbrk(const char * cs,const char * ct) __nonnull;
--char * strtok(char * s,const char * ct) __nonnull;
- char * strsep(char **s, const char *ct) __nonnull;
- void * memset(void * s,int c,size_t count) __nonnull;
- void * memmove(void * dest,const void *src,size_t count) __nonnull;
- int __pure memcmp(const void * cs,const void * ct,
- 				    size_t count) __nonnull;
--void * __pure memscan(const void * addr, int c, size_t size) __nonnull;
- char * __pure strstr(const char * s1,const char * s2) __nonnull;
- void * __pure memchr(const void *s, int c, size_t n) __nonnull;
- char * __malloc strdup(const char *s) __nonnull;
--- 
-1.7.9
-
diff --git a/pcr/xen/patch-gcc6-etherboot-via-rhine.c.patch b/pcr/xen/patch-gcc6-etherboot-via-rhine.c.patch
deleted file mode 100644
index 697208ae3..000000000
--- a/pcr/xen/patch-gcc6-etherboot-via-rhine.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aru a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
---- a/src/drivers/net/via-rhine.c	2016-05-12 19:24:14.047825550 +1000
-+++ b/src/drivers/net/via-rhine.c	2016-05-12 19:33:18.061858418 +1000
-@@ -945,13 +945,15 @@
-             /* added comment by guard */
-             /* For supporting VT6107, please use revision id to recognize different chips in driver */
-             // if (tp->chip_id == 0x3065)
--            if( tp->chip_revision < 0x80 && tp->chip_revision >=0x40 )
-+            if( tp->chip_revision < 0x80 && tp->chip_revision >=0x40 ) {
-                 intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
-                 intr_status = (intr_status & ~DEFAULT_INTR);
--                if ( action == ENABLE ) 
-+                if ( action == ENABLE ) {
-                     intr_status = intr_status | DEFAULT_INTR;
-                     outw(intr_status, nic->ioaddr + IntrEnable);
-+                }
-                 break;
-+            }
-         case FORCE :
-             outw(0x0010, nic->ioaddr + 0x84);
-            break;
diff --git a/pcr/xen/patch-gcc6-etherboot-via-velocity.c.patch b/pcr/xen/patch-gcc6-etherboot-via-velocity.c.patch
deleted file mode 100644
index 36a3d8115..000000000
--- a/pcr/xen/patch-gcc6-etherboot-via-velocity.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur a/src/drivers/net/via-velocity.c b/src/drivers/net/via-velocity.c
---- a/src/drivers/net/via-velocity.c	2016-05-12 19:14:33.231788641 +1000
-+++ b/src/drivers/net/via-velocity.c	2016-05-12 19:17:08.235494746 +1000
-@@ -69,7 +69,7 @@
- 
- /* NIC specific static variables go here */
- #define VELOCITY_PARAM(N,D) \
--        static const int N[MAX_UNITS]=OPTION_DEFAULT;
-+        static __attribute__ ((unused)) const int N[MAX_UNITS]=OPTION_DEFAULT;
- /*        MODULE_PARM(N, "1-" __MODULE_STRING(MAX_UNITS) "i");\
-         MODULE_PARM_DESC(N, D); */
- 
diff --git a/pcr/xen/patch-gcc6-ovmf-build.sh.patch b/pcr/xen/patch-gcc6-ovmf-build.sh.patch
deleted file mode 100644
index 3da5e1c32..000000000
--- a/pcr/xen/patch-gcc6-ovmf-build.sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur a/ovmf-dir/OvmfPkg/build.sh b/ovmf-dir/OvmfPkg/build.sh
---- a/ovmf-dir/OvmfPkg/build.sh	2016-05-12 12:32:47.417562962 +1000
-+++ b/ovmf-dir/OvmfPkg/build.sh	2016-05-12 12:32:06.440897741 +1000
-@@ -95,7 +95,7 @@
-       4.8.*)
-         TARGET_TOOLS=GCC48
-         ;;
--      4.9.*|4.1[0-9].*|5.*.*)
-+      4.9.*|4.1[0-9].*|5.*.*|6.*.*)
-         TARGET_TOOLS=GCC49
-         ;;
-       *)