From fea3816246112da2516d0cd434c3009bb3071c44 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 Mar 2023 12:13:20 +0200 Subject: [PATCH] Add bootanim.tar.gz --- .gitignore | 1 + Fennix Kernel.code-workspace | 2 ++ Makefile | 7 +++++-- tools/grub.cfg | 2 +- tools/limine.cfg | 10 ++++++++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e34f298e..1cfe73ed 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ tools/* !tools/toolchain-gcc.patch doxygen-doc initrd.tar.gz +bootanim.tar.gz .dccache *.log *.log.* diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace index 3ac518eb..f6927057 100644 --- a/Fennix Kernel.code-workspace +++ b/Fennix Kernel.code-workspace @@ -56,6 +56,7 @@ "BLOCKDEVICE", "BNDCFGS", "bochs", + "bootanim", "bootdev", "Bootloader", "brontobyte", @@ -292,6 +293,7 @@ "SYMENT", "SYSENTER", "Tamsyn", + "targp", "TCCR", "TDCR", "TEXIT", diff --git a/Makefile b/Makefile index 4dbd4d84..03fc8b14 100644 --- a/Makefile +++ b/Makefile @@ -122,8 +122,11 @@ endif build_image: mkdir -p iso_tmp_data +# tar czf initrd.tar.gz -C initrd/ ./ --format=ustar +# tar czf bootanim.tar.gz -C bootanim/ ./ --format=ustar tar cf initrd.tar.gz -C initrd/ ./ --format=ustar - cp Kernel/kernel.fsys initrd.tar.gz \ + tar cf bootanim.tar.gz -C bootanim/ ./ --format=ustar + cp Kernel/kernel.fsys initrd.tar.gz bootanim.tar.gz \ iso_tmp_data/ ifeq ($(BOOTLOADER), lynx) cp tools/lynx.cfg Lynx/loader.bin Lynx/efi-loader.bin iso_tmp_data/ @@ -175,7 +178,7 @@ run: build qemu clean: rm -rf doxygen-doc iso_tmp_data - rm -f initrd.tar.gz $(OSNAME).iso $(OSNAME).img + rm -f initrd.tar.gz bootanim.tar.gz $(OSNAME).iso $(OSNAME).img rm -f initrd/system/drivers/*.fex rm -f initrd/system/drivers/*.elf rm -f initrd/system/drivers/*.raw diff --git a/tools/grub.cfg b/tools/grub.cfg index 1fc33dec..3c6d45f6 100644 --- a/tools/grub.cfg +++ b/tools/grub.cfg @@ -5,6 +5,6 @@ set timeout=0 menuentry "Fennix" { clear echo "Loading Fennix..." - multiboot2 /kernel.fsys --alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=true + 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 boot } diff --git a/tools/limine.cfg b/tools/limine.cfg index 100a3987..82328218 100644 --- a/tools/limine.cfg +++ b/tools/limine.cfg @@ -5,18 +5,24 @@ INTERFACE_BRANDING=Fennix # DO NOT EDIT! COMMENT=Boot Fennix using limine protocol PROTOCOL=limine - KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=true + KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false KERNEL_PATH=boot:///kernel.fsys MODULE_PATH=boot:///initrd.tar.gz MODULE_CMDLINE=initrd + MODULE_PATH=boot:///bootanim.tar.gz + MODULE_CMDLINE=bootanim + :Fennix (multiboot2) # DO NOT EDIT! COMMENT=Boot Fennix using multiboot2 protocol PROTOCOL=multiboot2 - KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true + KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false KERNEL_PATH=boot:///kernel.fsys MODULE_PATH=boot:///initrd.tar.gz MODULE_CMDLINE=initrd + + MODULE_PATH=boot:///bootanim.tar.gz + MODULE_CMDLINE=bootanim