andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-24 08:56:17 +04:00
Code Issues Projects Releases Wiki Activity

bump rvm version and adjust memory size

Browse Source
This commit is contained in:
gjz010 2021-05-11 12:22:43 +08:00
parent d1aeb13310
commit 05303b9c6f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/Cargo.lock generated
View File

@ -681,7 +681,7 @@ dependencies = [
[[package]] [[package]]
name = "rvm" name = "rvm"
version = "1.2.0" 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 = [ dependencies = [
"bit-set", "bit-set",
"bit_field 0.10.1", "bit_field 0.10.1",
@ -701,7 +701,7 @@ dependencies = [
[[package]] [[package]]
name = "rvm_macros" name = "rvm_macros"
version = "0.1.0" 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 = [ dependencies = [
"quote", "quote",
"syn", "syn",

2
kernel/Cargo.toml
View File

@ -77,7 +77,7 @@ virtio-drivers = { git = "https://github.com/rcore-riscv-hypervisor-dev/virtio-d
volatile = "0.2" volatile = "0.2"
woke = "0.0.2" woke = "0.0.2"
xmas-elf = "0.7" 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] [target.'cfg(target_arch = "x86_64")'.dependencies]
apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" } apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" }

4
kernel/Makefile
View File

@ -141,13 +141,13 @@ qemu_opts += \
-cpu rv64,x-h=true \ -cpu rv64,x-h=true \
-serial mon:stdio \ -serial mon:stdio \
-bios ../tools/opensbi/fw_jump.elf \ -bios ../tools/opensbi/fw_jump.elf \
-m 2G\ -m 1G\
-kernel $(kernel_img) -kernel $(kernel_img)
else else
qemu_opts += \ qemu_opts += \
-machine virt \ -machine virt \
-cpu rv64,x-h=true \ -cpu rv64,x-h=true \
-m 1G \ -m 2G \
-serial mon:stdio -serial mon:stdio
ifeq ($(UART2), on) ifeq ($(UART2), on)
qemu_opts += \ qemu_opts += \

2
user

@ -1 +1 @@
Subproject commit 9251d3d5535d9ceff6d4d36e3f203a190e9f708c Subproject commit b4a7bd80a9dd34a9e4fe37fc623f0c33e6e23880