Skip to content

Commit fdfd7f2

Browse files
committed
update rk3568 config file
1 parent 746fb6c commit fdfd7f2

File tree

5 files changed

+46
-49
lines changed

5 files changed

+46
-49
lines changed

Cargo.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configs/vms/arceos-aarch64-rk3568-smp1.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,28 @@ phys_cpu_sets = [1]
2121
# The entry point of the kernel image.
2222
entry_point = 0x7008_0000
2323
# The location of image: "memory" | "fs".
24-
# Load from file system.
24+
# Load from memory.
2525
image_location = "memory"
2626
# The load address of the kernel image.
2727
kernel_load_addr = 0x7008_0000
2828
## The file path of the kernel image.
29-
kernel_path = "/code/axvisor/axboard_test/config/rk3568-arceos/arceos.bin"
29+
kernel_path = "/path/arceos-aarch64-dyn.bin"
3030
## The file path of the device tree blob (DTB).
3131
dtb_load_addr = 0x7000_0000
32-
dtb_path = "/code/axvisor/axboard_test/config/rk3568-arceos/arceos-rk3568.dtb"
32+
dtb_path = "/path/arceos-rk3568.dtb"
3333
# Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
3434
# For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
35-
memory_regions = []
35+
memory_regions = [
36+
[0x7000_0000, 0x1000_0000, 0x7, 0], # System RAM 1G MAP_IDENTICAL
37+
]
3638

3739
#
3840
# Device specifications
3941
#
4042
[devices]
41-
# Emu_devices.
43+
# The interrupt mode.
4244
interrupt_mode = "passthrough"
45+
# Emu_devices.
4346
# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
4447
emu_devices = []
4548

configs/vms/arceos-aarch64-rk3568-smp2.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,27 @@ phys_cpu_sets = [1, 2]
2121
# The entry point of the kernel image.
2222
entry_point = 0x7008_0000
2323
# The location of image: "memory" | "fs".
24-
# Load from file system.
24+
# Load from memory.
2525
image_location = "memory"
2626
# The load address of the kernel image.
2727
kernel_load_addr = 0x7008_0000
2828
## The file path of the kernel image.
29-
kernel_path = "/guest/arceos-aarch64-rk3568_smp2.bin"
29+
kernel_path = "/path/arceos-aarch64-dyn.bin"
3030
## The file path of the device tree blob (DTB).
3131
dtb_load_addr = 0x7000_0000
32-
dtb_path = "/guest/arceos-aarch64-rk3568_smp2.dtb"
32+
dtb_path = "/path/arceos-aarch64-rk3568_smp2.dtb"
3333
# Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
3434
# For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
3535
memory_regions = [
36-
# [0x1000_0000, 0x800_0000, 0x7, 0],
37-
# [0x7000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
38-
# [0x1_f000_0000, 0x1000_0000 , 0x7, 1], # System RAM 1G MAP_IDENTICAL
39-
# [0x600_0000, 0x240_0000, 0x7, 1], # System RAM MAP_IDENTICAL
40-
# [0x1_f000_0000, 0x1000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
36+
[0x7000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
4137
]
4238

4339
#
4440
# Device specifications
4541
#
4642
[devices]
43+
# The interrupt mode.
44+
interrupt_mode = "passthrough"
4745
# Emu_devices.
4846
# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
4947
emu_devices = []

configs/vms/linux-aarch64-rk3568_smp1.toml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,26 @@ phys_cpu_sets = [1]
2121
# The entry point of the kernel image.
2222
entry_point = 0x8008_0000
2323
# The location of image: "memory" | "fs".
24-
# Load from file system.
25-
image_location = "fs"
24+
# Load from memory.
25+
image_location = "memory"
2626
# The load address of the kernel image.
2727
kernel_load_addr = 0x8008_0000
2828
## The file path of the kernel image.
29-
kernel_path = "/guest/Image"
29+
kernel_path = "/path/Image"
3030
## The file path of the device tree blob (DTB).
3131
dtb_load_addr = 0x8000_0000
32-
dtb_path = "/guest/linux-aarch64-rk3568_smp1.dtb"
32+
dtb_path = "/path/linux-aarch64-rk3568_smp1.dtb"
3333
# Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
3434
# For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
3535
memory_regions = [
36-
# [0x1000_0000, 0x800_0000, 0x7, 0],
37-
# [0x8000_0000, 0x6000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
38-
# [0x1_f000_0000, 0x1000_0000 , 0x7, 1], # System RAM 1G MAP_IDENTICAL
39-
# [0x600_0000, 0x240_0000, 0x7, 1], # System RAM MAP_IDENTICAL
40-
# [0x1_f000_0000, 0x1000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
36+
[0x8000_0000, 0x6000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
4137
]
4238
#
4339
# Device specifications
4440
#
4541
[devices]
42+
# The interrupt mode.
43+
interrupt_mode = "passthrough"
4644
# Emu_devices.
4745
# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
4846
emu_devices = []

configs/vms/linux-aarch64-rk3568_smp2.toml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,26 @@ phys_cpu_sets = [4, 8]
2121
# The entry point of the kernel image.
2222
entry_point = 0x8008_0000
2323
# The location of image: "memory" | "fs".
24-
# Load from file system.
25-
image_location = "fs"
24+
# Load from memory.
25+
image_location = "memory"
2626
# The load address of the kernel image.
2727
kernel_load_addr = 0x8008_0000
2828
## The file path of the kernel image.
29-
kernel_path = "/guest/Image"
29+
kernel_path = "/code/axvisor/rk3568-linux/Image"
3030
## The file path of the device tree blob (DTB).
3131
dtb_load_addr = 0x8000_0000
32-
dtb_path = "/guest/linux-aarch64-rk3568_smp2.dtb"
32+
dtb_path = "/code/axvisor/configs/vms/linux-aarch64-rk3568_smp2.dtb"
3333
# Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`).
3434
# For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`.
3535
memory_regions = [
36-
# [0x1000_0000, 0x800_0000, 0x7, 0],
37-
# [0x8000_0000, 0x6000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
38-
# [0x1_f000_0000, 0x1000_0000 , 0x7, 1], # System RAM 1G MAP_IDENTICAL
39-
# [0x600_0000, 0x240_0000, 0x7, 1], # System RAM MAP_IDENTICAL
40-
# [0x1_f000_0000, 0x1000_0000, 0x7, 1], # System RAM MAP_IDENTICAL
36+
[0x8000_0000, 0x6000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL
4137
]
4238
#
4339
# Device specifications
4440
#
4541
[devices]
42+
# The interrupt mode.
43+
interrupt_mode = "passthrough"
4644
# Emu_devices.
4745
# Name Base-Ipa Ipa_len Alloc-Irq Emu-Type EmuConfig.
4846
emu_devices = []

0 commit comments

Comments
 (0)