From 28252e600fda4d6ba19cabe6d104bf45ce3e4b6d Mon Sep 17 00:00:00 2001
From: Brendan Jackman <brendan.jackman@arm.com>
Date: Fri, 22 Sep 2017 12:31:26 +0100
Subject: [PATCH 1/2] platforms/hikey960: Fix whitespace

---
 libs/utils/platforms/hikey960.json | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/libs/utils/platforms/hikey960.json b/libs/utils/platforms/hikey960.json
index 559a5aed1..e94937192 100644
--- a/libs/utils/platforms/hikey960.json
+++ b/libs/utils/platforms/hikey960.json
@@ -1,30 +1,30 @@
 {
     "board" : {
-	"cores" : [
-	    "A53", "A53", "A53", "A53", 
-	    "A73", "A73", "A73", "A73"
-	],
-	"big_core" : "A73",
-	"modules" : ["bl", "cpufreq", "cpuidle"]
+        "cores" : [
+            "A53", "A53", "A53", "A53",
+            "A73", "A73", "A73", "A73"
+        ],
+        "big_core" : "A73",
+        "modules" : ["bl", "cpufreq", "cpuidle"]
     },
     "nrg_model": {
-	"big": {
-	    "cluster": {
-		"nrg_max": 413
-	    },
-	    "cpu": {
-		"cap_max": 1023,
-		"nrg_max": 1214
-	    }
-	},
-	"little": {
-	    "cluster": {
-		"nrg_max": 84
-	    },
-	    "cpu": {
-		"cap_max": 402,
-		"nrg_max": 242
-	    }
-	}
+        "big": {
+            "cluster": {
+                "nrg_max": 413
+            },
+            "cpu": {
+                "cap_max": 1023,
+                "nrg_max": 1214
+            }
+        },
+        "little": {
+            "cluster": {
+                "nrg_max": 84
+            },
+            "cpu": {
+                "cap_max": 402,
+                "nrg_max": 242
+            }
+        }
     }
 }
-- 
GitLab


From 523e6eaaba3b9db14524333964f0e20f1373acbf Mon Sep 17 00:00:00 2001
From: Brendan Jackman <brendan.jackman@arm.com>
Date: Fri, 22 Sep 2017 12:27:51 +0100
Subject: [PATCH 2/2] platforms: Add target-derived platform info for hikey960

This makes it easier to do platform-specific trace analysis when not connected
to a target.
---
 libs/utils/platforms/hikey960.json | 48 +++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/libs/utils/platforms/hikey960.json b/libs/utils/platforms/hikey960.json
index e94937192..229b8d615 100644
--- a/libs/utils/platforms/hikey960.json
+++ b/libs/utils/platforms/hikey960.json
@@ -26,5 +26,51 @@
                 "nrg_max": 242
             }
         }
-    }
+    },
+    "abi": "arm64",
+    "clusters": {
+        "0": [
+            0,
+            1,
+            2,
+            3
+        ],
+        "1": [
+            4,
+            5,
+            6,
+            7
+        ]
+    },
+    "cpus_count": 8,
+    "freqs": {
+        "0": [
+            533000,
+            999000,
+            1402000,
+            1709000,
+            1844000
+        ],
+        "1": [
+            903000,
+            1421000,
+            1805000,
+            2112000,
+            2362000
+        ]
+    },
+    "topology": [
+        [
+            0,
+            1,
+            2,
+            3
+        ],
+        [
+            4,
+            5,
+            6,
+            7
+        ]
+    ]
 }
-- 
GitLab