enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-07-02 19:09:16 +00:00
Code Issues Actions Releases Wiki Activity

Dump serial 3 and 4 too

Browse Source
This commit is contained in:
Alex
2023-02-16 02:30:34 +02:00
parent 1c68fdfc31
commit 5e19529fdd
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fennix Kernel.code-workspace
View File

@ -232,6 +232,7 @@
"tskdbg", "tskdbg",
"ttbr", "ttbr",
"uarch", "uarch",
"uartmemdmp",
"ubsan", "ubsan",
"UINTFASTX", "UINTFASTX",
"UINTLEASTX", "UINTLEASTX",

22
Makefile
View File

@ -30,11 +30,11 @@ QEMUFLAGS += -device vmware-svga -M q35 \
-net user \ -net user \
-netdev user,id=usernet0 \ -netdev user,id=usernet0 \
-device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \ -device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \
-object filter-dump,id=usernet0,netdev=usernet0,file=network.log,maxlen=1024 \ -object filter-dump,id=usernet0,netdev=usernet0,file=network.dmp,maxlen=1024 \
-serial file:serial.log \ -serial file:serial.log \
-serial file:profiler.log \ -serial file:profiler.log \
-serial null \ -serial file:serial3.dmp \
-serial null \ -serial file:serial4.dmp \
-device ahci,id=ahci \ -device ahci,id=ahci \
-drive id=bootdsk,file=$(OSNAME).iso,format=raw,if=none \ -drive id=bootdsk,file=$(OSNAME).iso,format=raw,if=none \
-device ide-hd,drive=bootdsk,bus=ahci.0 \ -device ide-hd,drive=bootdsk,bus=ahci.0 \
@ -50,11 +50,11 @@ QEMUFLAGS += -M q35 \
-net user \ -net user \
-netdev user,id=usernet0 \ -netdev user,id=usernet0 \
-device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \ -device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \
-object filter-dump,id=usernet0,netdev=usernet0,file=network.log,maxlen=1024 \ -object filter-dump,id=usernet0,netdev=usernet0,file=network.dmp,maxlen=1024 \
-serial file:serial.log \ -serial file:serial.log \
-serial file:profiler.log \ -serial file:profiler.log \
-serial null \ -serial file:serial3.dmp \
-serial null \ -serial file:serial4.dmp \
-hda $(OSNAME).iso \ -hda $(OSNAME).iso \
-audiodev pa,id=pa1,server=/run/user/1000/pulse/native \ -audiodev pa,id=pa1,server=/run/user/1000/pulse/native \
-machine pcspk-audiodev=pa1 \ -machine pcspk-audiodev=pa1 \
@ -64,8 +64,8 @@ QEMUFLAGS += -M raspi3b \
-cpu cortex-a57 \ -cpu cortex-a57 \
-serial file:serial.log \ -serial file:serial.log \
-serial file:profiler.log \ -serial file:profiler.log \
-serial null \ -serial file:serial3.dmp \
-serial null \ -serial file:serial4.dmp \
-kernel $(OSNAME).img -kernel $(OSNAME).img
endif endif
@ -162,15 +162,15 @@ endif
# endif # endif
vscode_debug: build_kernel build_userspace build_drivers build_image vscode_debug: build_kernel build_userspace build_drivers build_image
rm -f serial.log profiler.log network.log rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp
$(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 4G $(QEMUFLAGS) -smp $(shell echo $(shell nproc)/4 | bc) $(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 4G $(QEMUFLAGS) -smp $(shell echo $(shell nproc)/4 | bc)
qemu: qemu_vdisk qemu: qemu_vdisk
rm -f serial.log profiler.log network.log rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp
$(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc) $(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc)
qemubios: qemu_vdisk qemubios: qemu_vdisk
rm -f serial.log profiler.log network.log rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp
$(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc) $(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc)
run: build qemu run: build qemu