diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 1fca4deb..6f03456f 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -160,7 +160,7 @@ jobs: sudo apt-get update sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo -y make --quiet -C tools do_limine - make --quiet -C Drivers prepare + make --quiet -C Modules prepare make --quiet -C Userspace prepare make --quiet -C Lynx prepare make --quiet -C Kernel prepare @@ -204,7 +204,7 @@ jobs: sudo apt-get update sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y make --quiet -C tools do_limine - make --quiet -C Drivers prepare + make --quiet -C Modules prepare make --quiet -C Userspace prepare make --quiet -C Lynx prepare make --quiet -C Kernel prepare @@ -261,7 +261,7 @@ jobs: sudo apt-get update sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y make --quiet -C tools do_limine - make --quiet -C Drivers prepare + make --quiet -C Modules prepare make --quiet -C Userspace prepare make --quiet -C Lynx prepare make --quiet -C Kernel prepare @@ -318,7 +318,7 @@ jobs: sudo apt-get update sudo apt-get install rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 -y make --quiet -C tools do_limine - make --quiet -C Drivers prepare + make --quiet -C Modules prepare make --quiet -C Userspace prepare make --quiet -C Lynx prepare make --quiet -C Kernel prepare diff --git a/.gitignore b/.gitignore index 1cfe73ed..e0464afb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,19 @@ iso_tmp_data -initrd/system/include/* -initrd/system/*.raw -initrd/system/lib/*.raw -!initrd/system/include/.gitkeep +initrd/usr/include/* +!initrd/usr/include/.gitkeep tools/* !tools/ExtMemDbg !tools/stage2_eltorito !tools/*.md !tools/*.css !tools/README.md -!tools/menu.lst !tools/website !tools/Makefile !tools/*.c !tools/*.cpp !tools/*.cfg -!tools/toolchain-binutils-gdb.patch -!tools/toolchain-gcc.patch doxygen-doc initrd.tar.gz -bootanim.tar.gz .dccache *.log *.log.* @@ -27,7 +21,6 @@ bootanim.tar.gz *.iso *.drv *.fex -*.elf *.a *.so *.o diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8202cc9f..2c620632 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ build64: script: - apt-get update && apt-get install -y rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 - make --quiet -C tools do_limine - - make --quiet -C Drivers prepare + - make --quiet -C Modules prepare - make --quiet -C Userspace prepare - make --quiet -C Lynx prepare - make --quiet -C Kernel prepare @@ -107,7 +107,7 @@ build32: script: - apt-get update && apt-get install -y rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 - make --quiet -C tools do_limine - - make --quiet -C Drivers prepare + - make --quiet -C Modules prepare - make --quiet -C Userspace prepare - make --quiet -C Lynx prepare - make --quiet -C Kernel prepare @@ -130,7 +130,7 @@ buildarm64: script: - apt-get update && apt-get install -y rustc xorriso mtools genisoimage ovmf nasm doxygen make gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 mingw-w64 - make --quiet -C tools do_limine - - make --quiet -C Drivers prepare + - make --quiet -C Modules prepare - make --quiet -C Userspace prepare - make --quiet -C Lynx prepare - make --quiet -C Kernel prepare diff --git a/.gitmodules b/.gitmodules index 86bf90d3..8746c404 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,6 @@ [submodule "Userspace"] path = Userspace url = https://github.com/Fennix-Project/Userspace.git -[submodule "Drivers"] - path = Drivers - url = https://github.com/Fennix-Project/Drivers.git +[submodule "Modules"] + path = Modules + url = https://github.com/Fennix-Project/Modules.git diff --git a/Drivers b/Drivers deleted file mode 160000 index 1e763265..00000000 --- a/Drivers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e7632657e4f7c107746cafe398cfd019e7733fe diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace index 3c8f2244..84f6fd32 100644 --- a/Fennix Kernel.code-workspace +++ b/Fennix Kernel.code-workspace @@ -41,6 +41,7 @@ "AABBCC", "AAFF", "AAFFAA", + "ABAR", "ABIVERSION", "ABSPOINTER", "ACPI", @@ -91,6 +92,7 @@ "daif", "daifclr", "daifset", + "DAPI", "DEBUGCTL", "defragment", "dialup", @@ -235,6 +237,7 @@ "palignr", "PCIDE", "pcmpistri", + "PCNET", "PDBR", "PDPTE", "PEBS", diff --git a/Fennix Drivers.code-workspace b/Fennix Modules.code-workspace similarity index 98% rename from Fennix Drivers.code-workspace rename to Fennix Modules.code-workspace index 7a1b85c3..6495f46d 100644 --- a/Fennix Drivers.code-workspace +++ b/Fennix Modules.code-workspace @@ -1,7 +1,7 @@ { "folders": [ { - "path": "./Drivers" + "path": "./Modules" } ], "settings": { diff --git a/Kernel b/Kernel index f62c8b87..e8162bc3 160000 --- a/Kernel +++ b/Kernel @@ -1 +1 @@ -Subproject commit f62c8b87f9eacbc67577aae6a87ffca1f10fceab +Subproject commit e8162bc3cbd39780b70afdc59a336482d39e81b9 diff --git a/Lynx b/Lynx index 64553b5f..769b6b52 160000 --- a/Lynx +++ b/Lynx @@ -1 +1 @@ -Subproject commit 64553b5f842b5befe4cc06f6fda2cb55cabf7207 +Subproject commit 769b6b523cf930a46abb5569a752c52ea22d4674 diff --git a/Makefile b/Makefile index 38ba228d..f6b50627 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,7 @@ doxygen: doxygen Kernel/Doxyfile doxygen Lynx/Doxyfile doxygen Userspace/Doxyfile - doxygen Drivers/Doxyfile + doxygen Modules/Doxyfile qemu_vdisk: ifneq (,$(wildcard ./qemu-disk.img)) @@ -90,49 +90,52 @@ tools: make --quiet -C Kernel prepare make --quiet -C Lynx prepare make --quiet -C Userspace prepare - make --quiet -C Drivers prepare + make --quiet -C Modules prepare -build: build_lynx build_kernel build_userspace build_drivers build_image +build: build_lynx build_kernel build_userspace build_modules build_image dump: make --quiet -C Kernel dump rebuild: clean build -# Quickly build the operating system (it won't create the ISO file and doxygen documentation) +ifeq ($(QUIET_BUILD), 1) +MAKE_QUIET_FLAG = --quiet +endif + build_lynx: ifeq ($(BOOTLOADER), lynx) - make --quiet -C Lynx build + make $(MAKE_QUIET_FLAG) -C Lynx build endif build_kernel: ifeq ($(BUILD_KERNEL), 1) - make -j$(shell nproc) --quiet -C Kernel build + make -j$(shell nproc) $(MAKE_QUIET_FLAG) -C Kernel build endif build_userspace: -ifeq ($(OSARCH), amd64) ifeq ($(BUILD_USERSPACE), 1) - make --quiet -C Userspace build - cp -r Userspace/out/* initrd/ -endif + make $(MAKE_QUIET_FLAG) -C Userspace build endif -build_drivers: -ifeq ($(OSARCH), amd64) -ifeq ($(BUILD_DRIVERS), 1) - make --quiet -C Drivers build - cp Drivers/out/* initrd/system/drivers/ -endif +build_modules: +ifeq ($(BUILD_MODULES), 1) + make $(MAKE_QUIET_FLAG) -C Modules build 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 - tar cf bootanim.tar.gz -C bootanim/ ./ --format=ustar - cp Kernel/kernel.fsys initrd.tar.gz bootanim.tar.gz \ + mkdir -p initrd_tmp_data + cp -r initrd/* initrd_tmp_data/ +ifeq ($(BUILD_MODULES), 1) + cp -r Modules/out/* initrd_tmp_data/modules/ +endif +ifeq ($(BUILD_USERSPACE), 1) + cp -r Userspace/out/* initrd_tmp_data/ +endif +# tar czf initrd.tar.gz -C initrd_tmp_data/ ./ --format=ustar + tar cf initrd.tar.gz -C initrd_tmp_data/ ./ --format=ustar + cp Kernel/kernel.fsys initrd.tar.gz \ iso_tmp_data/ ifeq ($(BOOTLOADER), lynx) cp tools/lynx.cfg Lynx/loader.bin Lynx/efi-loader.bin iso_tmp_data/ @@ -183,7 +186,7 @@ QEMU_SMP_DBG = -smp 4 QEMU_SMP = -smp 4 endif -vscode_debug: build_lynx build_kernel build_userspace build_drivers build_image +vscode_debug: build_lynx build_kernel build_userspace build_modules build_image 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) @@ -198,26 +201,9 @@ qemubios: qemu_vdisk run: build qemu clean: - rm -rf doxygen-doc iso_tmp_data - 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 - rm -f initrd/system/*.fex - rm -f initrd/system/*.elf - rm -f initrd/system/*.raw - rm -f initrd/system/*.so - rm -f initrd/system/*.a - rm -f initrd/system/bin/*.elf - rm -f initrd/system/lib/*.a - rm -f initrd/system/lib/*.raw - rm -f initrd/system/lib/*.so - rm -f initrd/system/lib/*.o - rm -f initrd/system/include/*.h - rm -f initrd/system/include/*.hpp - rm -f initrd/system/include/sys/*.h - rm -f initrd/system/include/sys/*.hpp + rm -rf doxygen-doc iso_tmp_data initrd_tmp_data + rm -f initrd.tar.gz $(OSNAME).iso $(OSNAME).img make -C Kernel clean make -C Lynx clean make -C Userspace clean - make -C Drivers clean + make -C Modules clean diff --git a/Makefile.conf b/Makefile.conf index 195bd68d..2b779b71 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -22,7 +22,9 @@ BOOTLOADER = limine BUILD_KERNEL = 1 BUILD_USERSPACE = 1 -BUILD_DRIVERS = 1 +BUILD_MODULES = 1 + +QUIET_BUILD = 1 # The path of the cross-compiler. COMPILER_PATH = tools/cross/bin diff --git a/Modules b/Modules new file mode 160000 index 00000000..23d14424 --- /dev/null +++ b/Modules @@ -0,0 +1 @@ +Subproject commit 23d1442449dc95ab948036955668b3f40b282799 diff --git a/Userspace b/Userspace index 78cfe177..d9485978 160000 --- a/Userspace +++ b/Userspace @@ -1 +1 @@ -Subproject commit 78cfe1774935772d30f2d3a831dd4f47c641381a +Subproject commit d9485978bb08d94d5bc44dc18727c26eb4941b70 diff --git a/comp/linux/opt/.gitkeep b/comp/linux/opt/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/srv/.gitkeep b/comp/linux/srv/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/tmp/.gitkeep b/comp/linux/tmp/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/usr/bin/.gitkeep b/comp/linux/usr/bin/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/var/.gitkeep b/comp/linux/var/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Program Files (x86)/.gitkeep b/comp/windows/Program Files (x86)/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Program Files/.gitkeep b/comp/windows/Program Files/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/ProgramData/.gitkeep b/comp/windows/ProgramData/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/AppData/Local/Temp/.gitkeep b/comp/windows/Users/Public/AppData/Local/Temp/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/AppData/LocalLow/.gitkeep b/comp/windows/Users/Public/AppData/LocalLow/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/AppData/Roaming/.gitkeep b/comp/windows/Users/Public/AppData/Roaming/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/Documents/.gitkeep b/comp/windows/Users/Public/Documents/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/Downloads/.gitkeep b/comp/windows/Users/Public/Downloads/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/Music/.gitkeep b/comp/windows/Users/Public/Music/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/Pictures/.gitkeep b/comp/windows/Users/Public/Pictures/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Users/Public/Videos/.gitkeep b/comp/windows/Users/Public/Videos/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Windows/SysWOW64/.gitkeep b/comp/windows/Windows/SysWOW64/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Windows/System/.gitkeep b/comp/windows/Windows/System/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/windows/Windows/System32/.gitkeep b/comp/windows/Windows/System32/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/bin/.gitkeep b/initrd/bin/.gitkeep similarity index 100% rename from comp/linux/bin/.gitkeep rename to initrd/bin/.gitkeep diff --git a/initrd/system/config/audio/devices.cfg b/initrd/etc/audio/devices.cfg similarity index 100% rename from initrd/system/config/audio/devices.cfg rename to initrd/etc/audio/devices.cfg diff --git a/bootanim/1.tga b/initrd/etc/boot/1.tga similarity index 100% rename from bootanim/1.tga rename to initrd/etc/boot/1.tga diff --git a/bootanim/10.tga b/initrd/etc/boot/10.tga similarity index 100% rename from bootanim/10.tga rename to initrd/etc/boot/10.tga diff --git a/bootanim/11.tga b/initrd/etc/boot/11.tga similarity index 100% rename from bootanim/11.tga rename to initrd/etc/boot/11.tga diff --git a/bootanim/12.tga b/initrd/etc/boot/12.tga similarity index 100% rename from bootanim/12.tga rename to initrd/etc/boot/12.tga diff --git a/bootanim/13.tga b/initrd/etc/boot/13.tga similarity index 100% rename from bootanim/13.tga rename to initrd/etc/boot/13.tga diff --git a/bootanim/14.tga b/initrd/etc/boot/14.tga similarity index 100% rename from bootanim/14.tga rename to initrd/etc/boot/14.tga diff --git a/bootanim/15.tga b/initrd/etc/boot/15.tga similarity index 100% rename from bootanim/15.tga rename to initrd/etc/boot/15.tga diff --git a/bootanim/16.tga b/initrd/etc/boot/16.tga similarity index 100% rename from bootanim/16.tga rename to initrd/etc/boot/16.tga diff --git a/bootanim/17.tga b/initrd/etc/boot/17.tga similarity index 100% rename from bootanim/17.tga rename to initrd/etc/boot/17.tga diff --git a/bootanim/18.tga b/initrd/etc/boot/18.tga similarity index 100% rename from bootanim/18.tga rename to initrd/etc/boot/18.tga diff --git a/bootanim/19.tga b/initrd/etc/boot/19.tga similarity index 100% rename from bootanim/19.tga rename to initrd/etc/boot/19.tga diff --git a/bootanim/2.tga b/initrd/etc/boot/2.tga similarity index 100% rename from bootanim/2.tga rename to initrd/etc/boot/2.tga diff --git a/bootanim/20.tga b/initrd/etc/boot/20.tga similarity index 100% rename from bootanim/20.tga rename to initrd/etc/boot/20.tga diff --git a/bootanim/21.tga b/initrd/etc/boot/21.tga similarity index 100% rename from bootanim/21.tga rename to initrd/etc/boot/21.tga diff --git a/bootanim/22.tga b/initrd/etc/boot/22.tga similarity index 100% rename from bootanim/22.tga rename to initrd/etc/boot/22.tga diff --git a/bootanim/23.tga b/initrd/etc/boot/23.tga similarity index 100% rename from bootanim/23.tga rename to initrd/etc/boot/23.tga diff --git a/bootanim/24.tga b/initrd/etc/boot/24.tga similarity index 100% rename from bootanim/24.tga rename to initrd/etc/boot/24.tga diff --git a/bootanim/25.tga b/initrd/etc/boot/25.tga similarity index 100% rename from bootanim/25.tga rename to initrd/etc/boot/25.tga diff --git a/bootanim/26.tga b/initrd/etc/boot/26.tga similarity index 100% rename from bootanim/26.tga rename to initrd/etc/boot/26.tga diff --git a/bootanim/3.tga b/initrd/etc/boot/3.tga similarity index 100% rename from bootanim/3.tga rename to initrd/etc/boot/3.tga diff --git a/bootanim/4.tga b/initrd/etc/boot/4.tga similarity index 100% rename from bootanim/4.tga rename to initrd/etc/boot/4.tga diff --git a/bootanim/5.tga b/initrd/etc/boot/5.tga similarity index 100% rename from bootanim/5.tga rename to initrd/etc/boot/5.tga diff --git a/bootanim/6.tga b/initrd/etc/boot/6.tga similarity index 100% rename from bootanim/6.tga rename to initrd/etc/boot/6.tga diff --git a/bootanim/7.tga b/initrd/etc/boot/7.tga similarity index 100% rename from bootanim/7.tga rename to initrd/etc/boot/7.tga diff --git a/bootanim/8.tga b/initrd/etc/boot/8.tga similarity index 100% rename from bootanim/8.tga rename to initrd/etc/boot/8.tga diff --git a/bootanim/9.tga b/initrd/etc/boot/9.tga similarity index 100% rename from bootanim/9.tga rename to initrd/etc/boot/9.tga diff --git a/initrd/system/config/ntp b/initrd/etc/ntp similarity index 100% rename from initrd/system/config/ntp rename to initrd/etc/ntp diff --git a/comp/linux/boot/.gitkeep b/initrd/home/.gitkeep similarity index 100% rename from comp/linux/boot/.gitkeep rename to initrd/home/.gitkeep diff --git a/initrd/home/default/.config/.gitkeep b/initrd/home/default/.config/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/initrd/home/default/.shrc b/initrd/home/default/.shrc deleted file mode 100644 index e69de29b..00000000 diff --git a/initrd/home/default/Music/Ludwig van Beethoven - Fur Elise.mp3 b/initrd/home/default/Music/Ludwig van Beethoven - Fur Elise.mp3 deleted file mode 100644 index c24b77ff..00000000 Binary files a/initrd/home/default/Music/Ludwig van Beethoven - Fur Elise.mp3 and /dev/null differ diff --git a/comp/linux/dev/.gitkeep b/initrd/lib/.gitkeep similarity index 100% rename from comp/linux/dev/.gitkeep rename to initrd/lib/.gitkeep diff --git a/initrd/system/drivers/config.ini b/initrd/modules/config.ini similarity index 64% rename from initrd/system/drivers/config.ini rename to initrd/modules/config.ini index 55720cc7..cc70dc67 100644 --- a/initrd/system/drivers/config.ini +++ b/initrd/modules/config.ini @@ -1,4 +1,4 @@ -[FAKE_DIVER_API_VERSION] +[FAKE_API_VERSION] Enable=0 Major=0 Minor=0 diff --git a/comp/linux/home/.gitkeep b/initrd/root/.gitkeep similarity index 100% rename from comp/linux/home/.gitkeep rename to initrd/root/.gitkeep diff --git a/initrd/system/bin/.gitkeep b/initrd/system/bin/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/initrd/system/config/audio/media/dev_connected.mp3 b/initrd/system/config/audio/media/dev_connected.mp3 deleted file mode 100644 index 74ddc261..00000000 Binary files a/initrd/system/config/audio/media/dev_connected.mp3 and /dev/null differ diff --git a/initrd/system/config/audio/media/dev_disconnected.mp3 b/initrd/system/config/audio/media/dev_disconnected.mp3 deleted file mode 100644 index 17706d9e..00000000 Binary files a/initrd/system/config/audio/media/dev_disconnected.mp3 and /dev/null differ diff --git a/initrd/system/config/audio/media/dev_error.mp3 b/initrd/system/config/audio/media/dev_error.mp3 deleted file mode 100644 index 0048b709..00000000 Binary files a/initrd/system/config/audio/media/dev_error.mp3 and /dev/null differ diff --git a/initrd/system/config/audio/media/error.mp3 b/initrd/system/config/audio/media/error.mp3 deleted file mode 100644 index 60d05a29..00000000 Binary files a/initrd/system/config/audio/media/error.mp3 and /dev/null differ diff --git a/initrd/system/config/audio/media/notification.mp3 b/initrd/system/config/audio/media/notification.mp3 deleted file mode 100644 index 0ff170f8..00000000 Binary files a/initrd/system/config/audio/media/notification.mp3 and /dev/null differ diff --git a/initrd/system/config/audio/media/warning.mp3 b/initrd/system/config/audio/media/warning.mp3 deleted file mode 100644 index b44dd693..00000000 Binary files a/initrd/system/config/audio/media/warning.mp3 and /dev/null differ diff --git a/initrd/system/include/.gitkeep b/initrd/system/include/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/initrd/system/lib/.gitkeep b/initrd/system/lib/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/comp/linux/lib/.gitkeep b/initrd/tmp/.gitkeep similarity index 100% rename from comp/linux/lib/.gitkeep rename to initrd/tmp/.gitkeep diff --git a/comp/linux/media/.gitkeep b/initrd/usr/include/.gitkeep similarity index 100% rename from comp/linux/media/.gitkeep rename to initrd/usr/include/.gitkeep diff --git a/comp/linux/mnt/.gitkeep b/initrd/var/.gitkeep similarity index 100% rename from comp/linux/mnt/.gitkeep rename to initrd/var/.gitkeep diff --git a/tools/grub.cfg b/tools/grub.cfg index da6c311f..560b62d3 100644 --- a/tools/grub.cfg +++ b/tools/grub.cfg @@ -7,11 +7,9 @@ menuentry "Fennix" { load_video 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=/modules --init=/bin/init --ioc=true --udl=true --simd=false --bootanim=false echo "Loading initrd" module2 /initrd.tar.gz initrd - echo "Loading bootanim" - module2 /bootanim.tar.gz bootanim echo "Booting..." boot } diff --git a/tools/limine.cfg b/tools/limine.cfg index b7b32587..3d1a37c4 100644 --- a/tools/limine.cfg +++ b/tools/limine.cfg @@ -5,24 +5,18 @@ 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=false --bootanim=false + KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/modules --init=/bin/init --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 --ioapicirq=1 --tasking=multi --drvdir=/system/drivers --init=/system/init.elf --ioc=true --udl=true --simd=false --bootanim=false + KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/modules --init=/bin/init --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 diff --git a/tools/website/index.html b/tools/website/index.html index 09c8a634..b11536e1 100644 --- a/tools/website/index.html +++ b/tools/website/index.html @@ -25,7 +25,7 @@ Full Documentation Lynx Bootloader Kernel - Drivers + Modules Userspace Download