mirror of
https://github.com/rcore-os/rCore.git
synced 2024-11-24 00:46:17 +04:00
bump rvm version and adjust memory size
This commit is contained in:
parent
d1aeb13310
commit
05303b9c6f
4
kernel/Cargo.lock
generated
4
kernel/Cargo.lock
generated
@ -681,7 +681,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "rvm"
|
||||
version = "1.2.0"
|
||||
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=fa31039#fa310395b771590df3c6fc354798037c0ae0e9df"
|
||||
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383"
|
||||
dependencies = [
|
||||
"bit-set",
|
||||
"bit_field 0.10.1",
|
||||
@ -701,7 +701,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "rvm_macros"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=fa31039#fa310395b771590df3c6fc354798037c0ae0e9df"
|
||||
source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
|
@ -77,7 +77,7 @@ virtio-drivers = { git = "https://github.com/rcore-riscv-hypervisor-dev/virtio-d
|
||||
volatile = "0.2"
|
||||
woke = "0.0.2"
|
||||
xmas-elf = "0.7"
|
||||
rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "fa31039", optional = true }
|
||||
rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "5cde71c", optional = true }
|
||||
|
||||
[target.'cfg(target_arch = "x86_64")'.dependencies]
|
||||
apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" }
|
||||
|
@ -141,13 +141,13 @@ qemu_opts += \
|
||||
-cpu rv64,x-h=true \
|
||||
-serial mon:stdio \
|
||||
-bios ../tools/opensbi/fw_jump.elf \
|
||||
-m 2G\
|
||||
-m 1G\
|
||||
-kernel $(kernel_img)
|
||||
else
|
||||
qemu_opts += \
|
||||
-machine virt \
|
||||
-cpu rv64,x-h=true \
|
||||
-m 1G \
|
||||
-m 2G \
|
||||
-serial mon:stdio
|
||||
ifeq ($(UART2), on)
|
||||
qemu_opts += \
|
||||
|
2
user
2
user
@ -1 +1 @@
|
||||
Subproject commit 9251d3d5535d9ceff6d4d36e3f203a190e9f708c
|
||||
Subproject commit b4a7bd80a9dd34a9e4fe37fc623f0c33e6e23880
|
Loading…
Reference in New Issue
Block a user