From 3118af980077c827753d42c4f5b1e48a0b7ee120 Mon Sep 17 00:00:00 2001
From: dallas <dallas.xyf@gmail.com>
Date: Wed, 9 Sep 2026 15:26:05 +0800
Subject: [PATCH 1/2] fix wrong cpu id for gicv3-qemu

---
 jenkins/ci.yaml | 70 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/jenkins/ci.yaml b/jenkins/ci.yaml
index 9542f239a..e60513fca 100644
--- a/jenkins/ci.yaml
+++ b/jenkins/ci.yaml
@@ -18,41 +18,41 @@ bids:
         - zone0_start
         - zone1_start
 
-  - bid: aarch64/rk3568
-    build_args:
-      - KDIR=/home/light/DEMO/sdk/rk356x-up4-2c/kernel
-    tests:
-      mode: board
-      serial: /dev/serial/by-path/pci-0000:00:14.0-usb-0:9:1.0-port0
-      power_serial: /dev/serial/by-path/pci-0000:00:14.0-usb-0:10:1.0-port0
-      power_channel: 4
-      baudrate: 1500000
-      tftp_dir: /home/light/tftp/rk3568
-      zone0_dtbs:
-        - platform/aarch64/rk3568/image/dts/rk3568_limit_zone0.dtb
-      zone0_image: /home/light/DEMO/sdk/rk356x-up4-2c/kernel/arch/arm64/boot/Image
-      uboot_ready_pattern: '=>'
-      zone0_ready_pattern: 'root@linux:[^\r\n]*#\s?'
-      zone0_shell_timeout: 180
-      uboot_step_timeout: 90
-      uboot_cmds:
-        - pci enum; setenv serverip 192.168.1.181; setenv ipaddr 192.168.1.240; setenv loadaddr 0x60800000; setenv fdt_addr 0xa0000000; setenv zone0_kernel_addr 0x00280000
-        - tftp ${loadaddr} ${serverip}:rk3568/hvisor.bin
-        - tftp ${fdt_addr} ${serverip}:rk3568/rk3568_limit_zone0.dtb
-        - tftp ${zone0_kernel_addr} ${serverip}:rk3568/Image
-        - bootm ${loadaddr} - ${fdt_addr}
-      deploy:
-        board_ip: 192.168.1.240
-        board_iface: eth0
-        link_wait: 3
-        host_ip: 192.168.1.181
-        host_user: light
-        zone1_dtb: platform/aarch64/rk3568/image/dts/rk3568_limit_zone1.dtb
-      cases:
-        - zone0_start
-        - login
-        - network_and_trans
-        - zone1_start
+  # - bid: aarch64/rk3568
+  #   build_args:
+  #     - KDIR=/home/light/DEMO/sdk/rk356x-up4-2c/kernel
+  #   tests:
+  #     mode: board
+  #     serial: /dev/serial/by-path/pci-0000:00:14.0-usb-0:9:1.0-port0
+  #     power_serial: /dev/serial/by-path/pci-0000:00:14.0-usb-0:10:1.0-port0
+  #     power_channel: 4
+  #     baudrate: 1500000
+  #     tftp_dir: /home/light/tftp/rk3568
+  #     zone0_dtbs:
+  #       - platform/aarch64/rk3568/image/dts/rk3568_limit_zone0.dtb
+  #     zone0_image: /home/light/DEMO/sdk/rk356x-up4-2c/kernel/arch/arm64/boot/Image
+  #     uboot_ready_pattern: '=>'
+  #     zone0_ready_pattern: 'root@linux:[^\r\n]*#\s?'
+  #     zone0_shell_timeout: 180
+  #     uboot_step_timeout: 90
+  #     uboot_cmds:
+  #       - pci enum; setenv serverip 192.168.1.181; setenv ipaddr 192.168.1.240; setenv loadaddr 0x60800000; setenv fdt_addr 0xa0000000; setenv zone0_kernel_addr 0x00280000
+  #       - tftp ${loadaddr} ${serverip}:rk3568/hvisor.bin
+  #       - tftp ${fdt_addr} ${serverip}:rk3568/rk3568_limit_zone0.dtb
+  #       - tftp ${zone0_kernel_addr} ${serverip}:rk3568/Image
+  #       - bootm ${loadaddr} - ${fdt_addr}
+  #     deploy:
+  #       board_ip: 192.168.1.240
+  #       board_iface: eth0
+  #       link_wait: 3
+  #       host_ip: 192.168.1.181
+  #       host_user: light
+  #       zone1_dtb: platform/aarch64/rk3568/image/dts/rk3568_limit_zone1.dtb
+  #     cases:
+  #       - zone0_start
+  #       - login
+  #       - network_and_trans
+  #       - zone1_start
 
   - bid: aarch64/phytium-pi
     build_args:

From dd881e85bbe5da1c8c6c77e0fd8ef19716e60ba6 Mon Sep 17 00:00:00 2001
From: dallas <dallas.xyf@gmail.com>
Date: Wed, 9 Sep 2026 15:26:19 +0800
Subject: [PATCH 2/2] remove rk3568 config

---
 platform/aarch64/qemu-gicv3/configs/zone1-linux.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/aarch64/qemu-gicv3/configs/zone1-linux.json b/platform/aarch64/qemu-gicv3/configs/zone1-linux.json
index b73f0bc98..514c16f91 100644
--- a/platform/aarch64/qemu-gicv3/configs/zone1-linux.json
+++ b/platform/aarch64/qemu-gicv3/configs/zone1-linux.json
@@ -2,8 +2,8 @@
     "name": "linux2",
     "zone_id": 1,
     "cpus": [
-        3,
-        4
+        2,
+        3
     ],
     "memory_regions": [
         {