Merge pull request #302 from YanLien/next2

YanLien · web-flow · commit 8a77f3f0cae3 · 2025-11-20T18:32:10.000+08:00
fix: update test configurations and dependencies
diff --git a/.github/workflows/test-board.yml b/.github/workflows/test-board.yml
@@ -19,16 +19,16 @@ jobs:
             vmconfigs: configs/vms/linux-aarch64-e2000-smp1.toml
             vmconfigs_name: Linux
             vmimage_name: phytiumpi_linux
-        #   - board: roc-rk3568-pc
-        #     vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml
-        #     vmconfigs_name: ArceOS
-        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
-        #     vmimage_name: roc-rk3568-pc_arceos
-        #   - board: roc-rk3568-pc
-        #     vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml
-        #     vmconfigs_name: Linux
-        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
-        #     vmimage_name: roc-rk3568-pc_linux
+          - board: roc-rk3568-pc
+            vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml
+            vmconfigs_name: ArceOS
+            # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
+            vmimage_name: roc-rk3568-pc_arceos
+          - board: roc-rk3568-pc
+            vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml
+            vmconfigs_name: Linux
+            # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
+            vmimage_name: roc-rk3568-pc_linux
       fail-fast: false
     runs-on:
       - self-hosted
diff --git a/.github/workflows/uboot.toml b/.github/workflows/uboot.toml
@@ -13,6 +13,7 @@ success_regex = [
     "root@firefly:~#",
     "root@phytium-Ubuntu:~#",
     "Welcome to Phytium Buildroot",
+    "Last login: *",
 ]
 
 [net]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/configs/vms/arceos-aarch64-rk3568-smp1.toml b/configs/vms/arceos-aarch64-rk3568-smp1.toml
@@ -31,7 +31,7 @@ dtb_load_addr = 0x7000_0000
 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
 # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
 memory_regions = [
-  [0x7000_0000, 0x1000_0000, 0x7, 0], # System RAM 1G MAP_IDENTICAL
+  [0x7000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
 ]
 
 #

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ success_regex = [`
`13`	`13`	`"root@firefly:~#",`
`14`	`14`	`"root@phytium-Ubuntu:~#",`
`15`	`15`	`"Welcome to Phytium Buildroot",`
	`16`	`+ "Last login: *",`
`16`	`17`	`]`
`17`	`18`
`18`	`19`	`[net]`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ dtb_load_addr = 0x7000_0000`
`31`	`31`	# Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
`32`	`32`	# For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
`33`	`33`	`memory_regions = [`
`34`		`- [0x7000_0000, 0x1000_0000, 0x7, 0], # System RAM 1G MAP_IDENTICAL`
	`34`	`+ [0x7000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL`
`35`	`35`	`]`
`36`	`36`
`37`	`37`	`#`