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 configs

Browse Source
This commit is contained in:
Alex 2023-05-11 19:05:26 +03:00
parent 7b31e421bc
commit 721652909f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -183,7 +183,7 @@ QEMU_SMP_DBG = -smp 4
QEMU_SMP = -smp 4 QEMU_SMP = -smp 4
endif endif
vscode_debug: build_kernel build_userspace build_drivers build_image vscode_debug: build_lynx 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) $(QEMU_SMP_DBG) $(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 1G $(QEMUFLAGS) $(QEMU_SMP_DBG)
@ -208,6 +208,7 @@ clean:
rm -f initrd/system/*.raw rm -f initrd/system/*.raw
rm -f initrd/system/*.so rm -f initrd/system/*.so
rm -f initrd/system/*.a rm -f initrd/system/*.a
rm -f initrd/system/bin/*.elf
rm -f initrd/system/lib/*.a rm -f initrd/system/lib/*.a
rm -f initrd/system/lib/*.raw rm -f initrd/system/lib/*.raw
rm -f initrd/system/lib/*.so rm -f initrd/system/lib/*.so

0
initrd/home/default/.shrc Normal file
View File

0
initrd/system/bin/.gitkeep Normal file
View File

36
tools/grub.cfg
View File

@ -1,19 +1,19 @@
set default=0 set default=0
set timeout=5 set timeout=1
# set lang=ro_RO
set menu_color_normal=white/black set menu_color_normal=white/black
set menu_color_highlight=black/light-gray set menu_color_highlight=black/light-gray
menuentry "Fennix" { menuentry "Fennix" {
clear load_video
echo "Loading kernel" clear
echo "Loading kernel"
multiboot2 /kernel.fsys --alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false multiboot2 /kernel.fsys --alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false
echo "Loading initrd" echo "Loading initrd"
module2 /initrd.tar.gz initrd module2 /initrd.tar.gz initrd
echo "Loading bootanim" echo "Loading bootanim"
module2 /bootanim.tar.gz bootanim module2 /bootanim.tar.gz bootanim
echo "Booting..." echo "Booting..."
boot boot
} }
menuentry 'Boot from next volume' { menuentry 'Boot from next volume' {
@ -24,4 +24,18 @@ if [ ${grub_platform} == "efi" ]; then
menuentry 'UEFI Firmware Settings' { menuentry 'UEFI Firmware Settings' {
fwsetup fwsetup
} }
fi fi
function load_video {
if [ x$feature_all_video_module = xy ]; then
insmod all_video
else
insmod efi_gop
insmod efi_uga
insmod ieee1275_fb
insmod vbe
insmod vga
insmod video_bochs
insmod video_cirrus
fi
}