Merge witherspoon XML updates from https://github.com/open-power/op-build/pull/1084
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index aa393a2..66c1c1e 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -58,13 +58,11 @@
BR2_SKIBOOT_CUSTOM_VERSION=y
BR2_SKIBOOT_CUSTOM_VERSION_VALUE="f0ebbc8318e64870a68d337e77b0257678c2b055"
BR2_PACKAGE_LOADKEYS=y
-BR2_OPENPOWER_MACHINE_XML_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/package/machine-xml/witherspoon-patches"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="cee25d28dfe368a1838a0ef9295d6652da851635"
+BR2_OPENPOWER_MACHINE_XML_VERSION="e536539f7c769944d2ce8318a2d96f6c159668c8"
BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
BR2_IMA_CATALOG_DTS="POWER9"
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
diff --git a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0001-Fix-FABRIC-GROUP-CHIP-settings-on-2nd-socket.patch b/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0001-Fix-FABRIC-GROUP-CHIP-settings-on-2nd-socket.patch
deleted file mode 100644
index 1d7c02d..0000000
--- a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0001-Fix-FABRIC-GROUP-CHIP-settings-on-2nd-socket.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 71a38e19fbb44be2c084b03e3b833a7cb14f0017 Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Wed, 3 May 2017 09:54:06 -0500
-Subject: [PATCH] Fix FABRIC GROUP + CHIP settings on 2nd socket
-
----
- witherspoon.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index d7a6d08..7597986 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -41022,11 +41022,11 @@
- </attribute>
- <attribute>
- <id>FABRIC_CHIP_ID</id>
-- <default>1</default>
-+ <default>0</default>
- </attribute>
- <attribute>
- <id>FABRIC_GROUP_ID</id>
-- <default>0</default>
-+ <default>1</default>
- </attribute>
- <attribute>
- <id>LOCATION_CODE</id>
---
-1.8.2.2
-
diff --git a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0002-set-ATTR_CLOCK_PLL_MUX-bit-14-0b1.patch b/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0002-set-ATTR_CLOCK_PLL_MUX-bit-14-0b1.patch
deleted file mode 100644
index db13d20..0000000
--- a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0002-set-ATTR_CLOCK_PLL_MUX-bit-14-0b1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc3ab23fede96dfc59489a01417285af533a7dcd Mon Sep 17 00:00:00 2001
-From: Erich Hauptli <ejhauptl@us.ibm.com>
-Date: Mon, 8 May 2017 13:56:09 -0500
-Subject: [PATCH 1/3] set ATTR_CLOCK_PLL_MUX bit 14 = 0b1
-
-set ATTR_CLOCK_PLL_MUX bit 14 = 0b1
----
- witherspoon.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index 7597986..eab3d86 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -13001,7 +13001,7 @@
- </attribute>
- <attribute>
- <id>CLOCK_PLL_MUX</id>
-- <default>0x8c810000</default>
-+ <default>0x8c830000</default>
- </attribute>
- <attribute>
- <id>CLOCK_PLL_MUX0</id>
---
-1.8.2.2
-
diff --git a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0003-Adjusting-A-Bus-Frequency.patch b/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0003-Adjusting-A-Bus-Frequency.patch
deleted file mode 100644
index 6ebcddc..0000000
--- a/openpower/patches/witherspoon-patches/machine-xml/witherspoon-xml-0003-Adjusting-A-Bus-Frequency.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b389046aba0486a834b18021a5de6af12919a265 Mon Sep 17 00:00:00 2001
-From: Erich Hauptli <ejhauptl@us.ibm.com>
-Date: Mon, 8 May 2017 16:08:13 -0500
-Subject: [PATCH 3/3] Adjusting A Bus Frequency
-
-Per Joe McGill, lowering the A bus frequency to support the slower 20Gbs
-OBUS rate.
----
- witherspoon.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index ed4f21e..3477f03 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -9727,7 +9727,7 @@
- </attribute>
- <attribute>
- <id>FREQ_A_MHZ</id>
-- <default>0x1900</default>
-+ <default>0x1250</default>
- </attribute>
- <attribute>
- <id>FREQ_CORE_MAX</id>
---
-1.8.2.2
-