From 80262fb8f3b7d0f8692ee393192896cbd087bc56 Mon Sep 17 00:00:00 2001 From: Akash Kollipara Date: Sun, 14 Jul 2024 20:53:40 +0530 Subject: [PATCH 1/2] Now using QEMU v9.0.0 release - Added support for aarch64-softmmu, riscv64-softmmu and x86_64-softmmu targets - Using latest stable release Issue: #310 --- mk/qemu.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mk/qemu.mk b/mk/qemu.mk index 4c1ac90e..a9a822bc 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -10,11 +10,12 @@ T_ALLOWLIST += get_qemu clean_qemu qemu_test -QEMU_CHECKOUT := v7.2.0 +QEMU_CHECKOUT := v9.0.0 QEMU_PATH := $(TOOLS_ROOT)/qemu QEMU_BUILD_PATH := $(QEMU_PATH)/build QEMU_OUT_PATH := $(TOOLS_ROOT)/cc_qemu -QEMU_TLIST := avr-softmmu,arm-softmmu,riscv32-softmmu +QEMU_TLIST := avr-softmmu arm-softmmu aarch64-softmmu +QEMU_TLIST += riscv32-softmmu riscv64-softmmu x86_64-softmmu get_qemu: $(QEMU_OUT_PATH) @@ -27,10 +28,13 @@ $(TOOLS_ROOT)/qemu: @echo "< / > Done !" +s := $() $() +c := , + $(QEMU_OUT_PATH): $(QEMU_PATH) @echo "< ! > Building qemu ..." @echo "< ? > Please be patient as this might take a while ..." - cd $<; ./configure --prefix=$(QEMU_OUT_PATH) --target-list=$(QEMU_TLIST) 2> /dev/null 1> /dev/null + cd $<; ./configure --prefix=$(QEMU_OUT_PATH) --target-list=$(subst $(s),$(c),$(QEMU_TLIST)) 2> /dev/null 1> /dev/null make -j $(N_JOBS) -C $< install 2> /dev/null 1> /dev/null @echo "< ! > Cleaning up build space ..." rm -rf $(QEMU_PATH) From 68a7b72d4e5ec78ba9569aae35c6bdf32fe40905 Mon Sep 17 00:00:00 2001 From: Akash Kollipara Date: Sun, 14 Jul 2024 21:39:37 +0530 Subject: [PATCH 2/2] Updated RTC Clock Issue: #313 --- src/platform/sifive/qemu-sifive-e/resources/dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/sifive/qemu-sifive-e/resources/dp.c b/src/platform/sifive/qemu-sifive-e/resources/dp.c index d27d8e33..1288ec02 100644 --- a/src/platform/sifive/qemu-sifive-e/resources/dp.c +++ b/src/platform/sifive/qemu-sifive-e/resources/dp.c @@ -38,7 +38,7 @@ create_module(prci0, prci, 0x10008000, 0x1000, 0, 0); create_module(aon0, (aon | 0), 0x10000000, 0x1000, 0, 0); -create_module(timer_core0, (timer | 0), 0, 0, 1e7, 0, +create_module(timer_core0, (timer | 0), 0, 0, 32768, 0, add_irq(0, int_local, 7, int_level)); create_gpio_module(port0, (gpio | PORTA), 0x10012000, 0x4c);