Habanero Updates for SL
diff --git a/openpower/package/habanero-xml/habanero-xml-0001-Revert-Merge-pull-request-18-from-open-power-bofferd.patch b/openpower/package/habanero-xml/habanero-xml-0001-Revert-Merge-pull-request-18-from-open-power-bofferd.patch
new file mode 100644
index 0000000..0a921c5
--- /dev/null
+++ b/openpower/package/habanero-xml/habanero-xml-0001-Revert-Merge-pull-request-18-from-open-power-bofferd.patch
@@ -0,0 +1,84 @@
+From b1eb2395a4bf796603cb34aa5913f43b84c42855 Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 31 Mar 2015 07:56:06 -0500
+Subject: [PATCH] Revert "Merge pull request #18 from
+ open-power/bofferdn-hab-loadline"
+
+This reverts commit ddb962894919657517f0d9bca4540a427953f987, reversing
+changes made to a98bf456ff5d9f18dc2af1ffc59d67a302029a76.
+
+Conflicts:
+ habanero.xml
+---
+ habanero.xml | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/habanero.xml b/habanero.xml
+index 8768f72..1aa85a8 100644
+--- a/habanero.xml
++++ b/habanero.xml
+@@ -4967,6 +4967,30 @@
+ <default>1</default>
+ </attribute>
+ <attribute>
++ <id>PROC_R_DISTLOSS_VCS</id>
++ <default></default>
++ </attribute>
++ <attribute>
++ <id>PROC_R_DISTLOSS_VDD</id>
++ <default></default>
++ </attribute>
++ <attribute>
++ <id>PROC_R_LOADLINE_VCS</id>
++ <default></default>
++ </attribute>
++ <attribute>
++ <id>PROC_R_LOADLINE_VDD</id>
++ <default></default>
++ </attribute>
++ <attribute>
++ <id>PROC_VRM_VOFFSET_VCS</id>
++ <default></default>
++ </attribute>
++ <attribute>
++ <id>PROC_VRM_VOFFSET_VDD</id>
++ <default></default>
++ </attribute>
++ <attribute>
+ <id>PROC_X_BUS_WIDTH</id>
+ <default>2</default>
+ </attribute>
+@@ -6996,30 +7020,6 @@
+ <default>0</default>
+ </attribute>
+ <attribute>
+- <id>PROC_R_DISTLOSS_VCS</id>
+- <default></default>
+- </attribute>
+- <attribute>
+- <id>PROC_R_DISTLOSS_VDD</id>
+- <default></default>
+- </attribute>
+- <attribute>
+- <id>PROC_R_LOADLINE_VCS</id>
+- <default></default>
+- </attribute>
+- <attribute>
+- <id>PROC_R_LOADLINE_VDD</id>
+- <default></default>
+- </attribute>
+- <attribute>
+- <id>PROC_VRM_VOFFSET_VCS</id>
+- <default></default>
+- </attribute>
+- <attribute>
+- <id>PROC_VRM_VOFFSET_VDD</id>
+- <default></default>
+- </attribute>
+- <attribute>
+ <id>PSI_BRIDGE_BASE_ADDR</id>
+ <default>0,0x0000000000000000</default>
+ </attribute>
+--
+1.8.2.2
+
diff --git a/openpower/package/habanero-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch b/openpower/package/habanero-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch
new file mode 100644
index 0000000..f285bfa
--- /dev/null
+++ b/openpower/package/habanero-xml/habanero-xml-0002-Add-System-Fw-Fru-Id.patch
@@ -0,0 +1,27 @@
+From d1fa8a2e10849a388e09f94dd25dc9008951c1c8 Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 31 Mar 2015 07:43:23 -0500
+Subject: [PATCH] Add System Fw Fru Id
+
+---
+ habanero.xml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/habanero.xml b/habanero.xml
+index 1aa85a8..16976a7 100644
+--- a/habanero.xml
++++ b/habanero.xml
+@@ -4667,6 +4667,10 @@
+ <default></default>
+ </attribute>
+ <attribute>
++ <id>BMC_FRU_ID</id>
++ <default>43</default>
++ </attribute>
++ <attribute>
+ <id>FRU_NAME</id>
+ <default></default>
+ </attribute>
+--
+1.8.2.2
+
diff --git a/openpower/package/habanero-xml/habanero-xml.mk b/openpower/package/habanero-xml/habanero-xml.mk
index e1abd28..0ab244c 100644
--- a/openpower/package/habanero-xml/habanero-xml.mk
+++ b/openpower/package/habanero-xml/habanero-xml.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HABANERO_XML_VERSION ?= 4c1e936c0329384020b126efe69d2148cfe48960
+HABANERO_XML_VERSION ?= 4173b205b0a7dfd18a97f3a0d5319c9aad893035
HABANERO_XML_SITE ?= $(call github,open-power,habanero-xml,$(HABANERO_XML_VERSION))
HABANERO_XML_LICENSE = Apache-2.0