From ca9b559b804d3f0736af7f1efac3cf81d29a2880 Mon Sep 17 00:00:00 2001
From: CHonghao <chonghao1108@163.com>
Date: Tue, 10 Dec 2024 14:03:19 +0800
Subject: [PATCH] fix(images): edit zone config to resolve boot bug in zone1,2

---
 images/aarch64/devicetree/linux1.dts       | 2 +-
 images/aarch64/devicetree/linux2.dts       | 8 --------
 images/aarch64/devicetree/linux2.json      | 1 +
 images/aarch64/devicetree/linux3.json      | 1 +
 images/aarch64/devicetree/virtio_cfg2.json | 8 +++++++-
 images/aarch64/devicetree/virtio_cfg3.json | 8 +++++++-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/images/aarch64/devicetree/linux1.dts b/images/aarch64/devicetree/linux1.dts
index 0a07e4a..a3b0d5b 100644
--- a/images/aarch64/devicetree/linux1.dts
+++ b/images/aarch64/devicetree/linux1.dts
@@ -189,7 +189,7 @@
 		stdout-path = "/pl011@9000000";
 	};
 
-	hvisor_device {
+	hvisor_virtio_device {
 		compatible = "hvisor";
 		interrupt-parent = <0x01>;
 		interrupts = <0x00 0x20 0x01>;
diff --git a/images/aarch64/devicetree/linux2.dts b/images/aarch64/devicetree/linux2.dts
index 80dc78e..9a08c7c 100644
--- a/images/aarch64/devicetree/linux2.dts
+++ b/images/aarch64/devicetree/linux2.dts
@@ -17,14 +17,6 @@
 			compatible = "arm,cortex-a57";
 			device_type = "cpu";
 		};
-
-		cpu@3 {
-			reg = <0x03>;
-			enable-method = "psci";
-			compatible = "arm,cortex-a57";
-			device_type = "cpu";
-		};
-
 	};
 
 	psci {
diff --git a/images/aarch64/devicetree/linux2.json b/images/aarch64/devicetree/linux2.json
index ad7f91d..516adaa 100644
--- a/images/aarch64/devicetree/linux2.json
+++ b/images/aarch64/devicetree/linux2.json
@@ -24,6 +24,7 @@
         }
     ],
     "interrupts": [75, 76, 78, 35, 36, 37, 38],
+    "ivc_configs": [],
     "kernel_filepath": "./Image",
     "dtb_filepath": "./linux2.dtb",
     "kernel_load_paddr": "0x50400000",
diff --git a/images/aarch64/devicetree/linux3.json b/images/aarch64/devicetree/linux3.json
index a7f1542..296a219 100644
--- a/images/aarch64/devicetree/linux3.json
+++ b/images/aarch64/devicetree/linux3.json
@@ -24,6 +24,7 @@
         }
     ],
     "interrupts": [75, 76, 78],
+    "ivc_configs": [],
     "kernel_filepath": "./Image",
     "dtb_filepath": "./linux3.dtb",
     "kernel_load_paddr": "0x80400000",
diff --git a/images/aarch64/devicetree/virtio_cfg2.json b/images/aarch64/devicetree/virtio_cfg2.json
index 7b74ec8..e9924ea 100644
--- a/images/aarch64/devicetree/virtio_cfg2.json
+++ b/images/aarch64/devicetree/virtio_cfg2.json
@@ -2,7 +2,13 @@
     "zones": [
         {
             "id": 1,
-            "memory_region": ["0x50000000", "0x30000000"],
+            "memory_region": [
+                {
+                    "zone0_ipa": "0x50000000",
+                    "zonex_ipa": "0x50000000",
+                    "size": "0x30000000"
+                }
+            ],
             "devices": [
                     {
                         "type": "blk",
diff --git a/images/aarch64/devicetree/virtio_cfg3.json b/images/aarch64/devicetree/virtio_cfg3.json
index d535364..8cea0b9 100644
--- a/images/aarch64/devicetree/virtio_cfg3.json
+++ b/images/aarch64/devicetree/virtio_cfg3.json
@@ -2,7 +2,13 @@
     "zones": [
         {
             "id": 2,
-            "memory_region": ["0x80000000", "0x10000000"],
+            "memory_region": [
+                {
+                    "zone0_ipa": "0x80000000",
+                    "zonex_ipa": "0x80000000",
+                    "size": "0x10000000"
+                }
+            ],
             "devices": [
                     {
                         "type": "blk",