vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ivan/raspi3bp' into 'master'

Browse source 
add command to support qemu-arm64 and qemu-raspi3b

See merge request redox-os/redox!1385
This commit is contained in:
Jeremy Soller 2023-12-11 16:08:52 +00:00
parent 1d7c4b297f 636df55a51
commit fc90fb9e0d
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mk/qemu.mk
View file

@ -20,7 +20,11 @@ else ifeq ($(ARCH),aarch64)
QEMU_ARCH=aarch64 QEMU_ARCH=aarch64
QEMU_MACHINE=virt QEMU_MACHINE=virt
QEMU_CPU=max QEMU_CPU=max
QEMU_EFI=/usr/share/AAVMF/AAVMF_CODE.fd ifeq ($(BOARD),raspi3bp)
QEMU_EFI=https://gitlab.redox-os.org/Ivan/redox_firmware/-/raw/main/platform/raspberry_pi/rpi3/u-boot-rpi-3-b-plus.bin
else
QEMU_EFI=https://gitlab.redox-os.org/Ivan/redox_firmware/-/raw/main/platform/qemu/qemu_arm64/u-boot-qemu-arm64.bin
endif
QEMUFLAGS+=-smp 1 -m 2048 QEMUFLAGS+=-smp 1 -m 2048
ifneq ($(vga),no) ifneq ($(vga),no)
QEMUFLAGS+=-device ramfb QEMUFLAGS+=-device ramfb
@ -134,7 +138,11 @@ $(BUILD)/extra.img:
endif endif
$(BUILD)/firmware.rom: $(BUILD)/firmware.rom:
ifeq ($(ARCH),aarch64)
wget -O $@ $(QEMU_EFI)
else
cp $(QEMU_EFI) $@ cp $(QEMU_EFI) $@
endif
qemu: $(DISK) $(FIRMWARE) $(BUILD)/extra.img qemu: $(DISK) $(FIRMWARE) $(BUILD)/extra.img
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
@ -178,3 +186,9 @@ qemu_extra: $(FIRMWARE) $(BUILD)/extra.img
qemu_nvme_extra: $(FIRMWARE) $(BUILD)/extra.img qemu_nvme_extra: $(FIRMWARE) $(BUILD)/extra.img
$(QEMU) $(QEMUFLAGS) \ $(QEMU) $(QEMUFLAGS) \
-drive file=$(BUILD)/extra.img,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA -drive file=$(BUILD)/extra.img,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
#additional steps for $(DISK) are required!!!
qemu_raspi: $(FIRMWARE) $(DISK)
$(QEMU) -M raspi3b -smp 4,cores=1 \
-kernel $(FIRMWARE) \
-serial stdio -display none -sd $(DISK)