From 3fd4e84f2ab4de1849489959c57e46dd8d2bbc36 Mon Sep 17 00:00:00 2001
From: Ben Gass <bgass@us.ibm.com>
Date: Tue, 9 Oct 2018 06:07:58 -0500
Subject: Update Axone engd.

Revert changes in ls_dbg_ctrl
Add nv3_npu_enabled
Add npu2 to npu scom inits
Include Axone in fix for SW430383

Change-Id: I2d96225237d086a51d9e127c2ee9da1a93f74bdd
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67199
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67203
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
---
 .../xml/attribute_info/chip_ec_attributes.xml      | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
index 06b16313..e3dc3d71 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
@@ -49,24 +49,6 @@
     </chipEcFeature>
   </attribute>
   <!-- ********************************************************************* -->
-  <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_SEPARATE_CORE_DBG_CNTL</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-       Support for the CDIAL LS_DBG_CTRL was dropped, so individual
-       debug dials need to be used.  See George Rohrbaugh.
-    </description>
-    <chipEcFeature>
-      <chip>
-        <name>ENUM_ATTR_NAME_AXONE</name>
-        <ec>
-          <value>0x10</value>
-          <test>GREATER_THAN_OR_EQUAL</test>
-        </ec>
-      </chip>
-    </chipEcFeature>
-  </attribute>
-  <!-- ********************************************************************* -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_ONE_NPU_TOP</id>
     <targetType>TARGET_TYPE_PROC_CHIP, TARGET_TYPE_PROC_CHIP</targetType>
@@ -7787,6 +7769,13 @@
           <test>GREATER_THAN_OR_EQUAL</test>
         </ec>
       </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_AXONE</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
     </chipEcFeature>
   </attribute>
   <!-- ******************************************************************** -->
-- 
cgit v1.2.1