From 1fdbd4047efea78206dfd3e8f8673ca3b3ba1469 Mon Sep 17 00:00:00 2001
From: Shaojun Yang <yangshaojun@phytium.com.cn>
Date: Thu, 19 Nov 2020 08:26:15 +0800
Subject: [PATCH] cpu_map: Add Phytium FT-2000+ and Tengyun-S2500

Signed-off-by: Shaojun Yang <yangshaojun@phytium.com.cn>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---
 src/cpu_map/arm_FT-2000plus.xml   | 6 ++++++
 src/cpu_map/arm_Tengyun-S2500.xml | 6 ++++++
 src/cpu_map/arm_vendors.xml       | 1 +
 src/cpu_map/index.xml             | 4 ++++
 src/cpu_map/meson.build           | 2 ++
 5 files changed, 19 insertions(+)
 create mode 100644 src/cpu_map/arm_FT-2000plus.xml
 create mode 100644 src/cpu_map/arm_Tengyun-S2500.xml

diff --git a/src/cpu_map/arm_FT-2000plus.xml b/src/cpu_map/arm_FT-2000plus.xml
new file mode 100644
index 0000000000..b532f65f68
--- /dev/null
+++ b/src/cpu_map/arm_FT-2000plus.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='FT-2000+'>
+    <vendor name='Phytium'/>
+    <pvr value='0x662'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/arm_Tengyun-S2500.xml b/src/cpu_map/arm_Tengyun-S2500.xml
new file mode 100644
index 0000000000..22b865e368
--- /dev/null
+++ b/src/cpu_map/arm_Tengyun-S2500.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name='Tengyun-S2500'>
+    <vendor name='Phytium'/>
+    <pvr value='0x663'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml
index ff799efcd7..4465463b5b 100644
--- a/src/cpu_map/arm_vendors.xml
+++ b/src/cpu_map/arm_vendors.xml
@@ -11,4 +11,5 @@
   <vendor name='Qualcomm' value='0x51'/>
   <vendor name='Marvell' value='0x56'/>
   <vendor name='Intel' value='0x69'/>
+  <vendor name='Phytium' value='0x70'/>
 </cpus>
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 08f052e7a0..065d9aede0 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -103,5 +103,9 @@
 
     <!-- Hisilicon-based CPU models -->
     <include filename='arm_Kunpeng-920.xml'/>
+
+    <!-- Phytium-based CPU models -->
+    <include filename='arm_FT-2000plus.xml'/>
+    <include filename='arm_Tengyun-S2500.xml'/>
   </arch>
 </cpus>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index b86612b6e0..8efa9207a2 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -3,8 +3,10 @@ cpumap_data = [
   'arm_cortex-a57.xml',
   'arm_cortex-a72.xml',
   'arm_Falkor.xml',
+  'arm_FT-2000plus.xml',
   'arm_features.xml',
   'arm_Kunpeng-920.xml',
+  'arm_Tengyun-S2500.xml',
   'arm_ThunderX299xx.xml',
   'arm_vendors.xml',
   'index.xml',
-- 
2.47.2