enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

Update submodules

Browse Source
This commit is contained in:
Alex 2023-04-07 05:29:28 +03:00
parent a7f700584d
commit 061c2ef1aa
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Fennix Kernel.code-workspace
View File

@ -242,6 +242,7 @@
"PLTGOT", "PLTGOT",
"PLTREL", "PLTREL",
"PLTRELSZ", "PLTRELSZ",
"POPCNT",
"powerline", "powerline",
"Prefetchable", "Prefetchable",
"PREINIT", "PREINIT",

5
Fennix Userspace.code-workspace
View File

@ -22,16 +22,19 @@
"inttypes.h": "c", "inttypes.h": "c",
"doomkeys.h": "c", "doomkeys.h": "c",
"doomgeneric.h": "c", "doomgeneric.h": "c",
"elf.h": "c" "elf.h": "c",
"init.h": "c"
}, },
"cSpell.words": [ "cSpell.words": [
"auxv", "auxv",
"cmpq", "cmpq",
"FENNIX", "FENNIX",
"JMPREL",
"Krnl", "Krnl",
"liballoc", "liballoc",
"libinit", "libinit",
"preinit", "preinit",
"Shdr",
"vfctprintf" "vfctprintf"
] ]
} }

2
Kernel

@ -1 +1 @@
Subproject commit 212121a40b38d9d249676cfb3ed895f01264aabd Subproject commit 25aa9ff6a6ea2ecd27c410e791f5c4a6c88a6ffc

21
Makefile
View File

@ -168,17 +168,32 @@ endif
# QEMU_UEFI_BIOS = -bios -bios /usr/share/AAVMF/AAVMF_CODE.fd # QEMU_UEFI_BIOS = -bios -bios /usr/share/AAVMF/AAVMF_CODE.fd
# endif # endif
ifeq ($(OSARCH), amd64)
QEMU_SMP_DBG = -smp $(shell echo $(shell nproc)/4 | bc)
QEMU_SMP = -smp $(shell nproc)
endif
ifeq ($(OSARCH), i386)
QEMU_SMP_DBG = -smp $(shell echo $(shell nproc)/4 | bc)
QEMU_SMP = -smp $(shell nproc)
endif
ifeq ($(OSARCH), aarch64)
QEMU_SMP_DBG = -smp 4
QEMU_SMP = -smp 4
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 memtrk.dmp serial4.dmp network.dmp rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
$(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) -smp $(shell echo $(shell nproc)/4 | bc) $(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) $(QEMU_SMP_DBG)
qemu: qemu_vdisk qemu: qemu_vdisk
rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp rm -f serial.log profiler.log memtrk.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) $(QEMU_SMP)
qemubios: qemu_vdisk qemubios: qemu_vdisk
rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
$(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc) $(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) $(QEMU_SMP)
run: build qemu run: build qemu

2
Userspace

@ -1 +1 @@
Subproject commit fc97b09d6ed2540fc53592a8ae0fa905beac3f28 Subproject commit c20aae950434d96598034f9974a8cc6f00ec8546