diff --git a/.DS_Store b/.DS_Store index 3a7a409..ffa2d81 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Makefile b/Makefile index e215b81..7e56896 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ LDFLAGS = -m elf_x86_64 -nostdlib -static -pie --no-dynamic-linker \ NASMFLAGS = -f elf64 # Limine Version -LIMINE_VERSION = 7.0.0 +LIMINE_VERSION = 10.8.2 LIMINE_URL_BASE = https://github.com/limine-bootloader/limine/raw/v$(LIMINE_VERSION) .PHONY: all clean run limine-setup @@ -86,21 +86,21 @@ $(KERNEL_ELF): $(OBJ_FILES) $(MAKE) -C $(SRC_DIR)/userland # Create ISO -$(ISO_IMAGE): $(KERNEL_ELF) limine.cfg limine-setup +$(ISO_IMAGE): $(KERNEL_ELF) limine.conf limine-setup rm -rf $(ISO_DIR) mkdir -p $(ISO_DIR) mkdir -p $(ISO_DIR)/EFI/BOOT # Copy Kernel and Config cp $(KERNEL_ELF) $(ISO_DIR)/ - # Build ISO limine.cfg natively with modules - cp limine.cfg $(ISO_DIR)/ + # Build ISO limine.conf natively with modules + cp limine.conf $(ISO_DIR)/ mkdir -p $(ISO_DIR)/bin @for f in $(SRC_DIR)/userland/bin/*.elf; do \ if [ -f "$$f" ]; then \ basename=$$(basename "$$f"); \ cp "$$f" $(ISO_DIR)/bin/; \ - echo " MODULE_PATH=boot:///bin/$$basename" >> $(ISO_DIR)/limine.cfg; \ + echo " module_path: boot():/bin/$$basename" >> $(ISO_DIR)/limine.conf; \ fi \ done @@ -113,7 +113,7 @@ $(ISO_IMAGE): $(KERNEL_ELF) limine.cfg limine-setup if [ -f "$$f" ]; then \ basename=$$(basename "$$f"); \ cp "$$f" $(ISO_DIR)/Library/images/Wallpapers/; \ - echo " MODULE_PATH=boot:///Library/images/Wallpapers/$$basename" >> $(ISO_DIR)/limine.cfg; \ + echo " module_path: boot():/Library/images/Wallpapers/$$basename" >> $(ISO_DIR)/limine.conf; \ fi \ done @if [ -f splash.jpg ]; then cp splash.jpg $(ISO_DIR)/; fi diff --git a/README.md b/README.md index ca98ebb..13d3707 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ qemu-system-x86_64 -m 2G -serial stdio -cdrom boredos.iso -boot d - `iso_root/` - ISO filesystem layout (generated during build) - `limine/` - Limine bootloader files (downloaded automatically) - `linker.ld` - Linker script for x86_64 ELF -- `limine.cfg` - Limine bootloader configuration +- `limine.conf` - Limine bootloader configuration - `Makefile` - Build configuration and targets diff --git a/boredos.iso b/boredos.iso index 5df0757..b0d15a8 100644 Binary files a/boredos.iso and b/boredos.iso differ diff --git a/build/cmd.o b/build/cmd.o index 4632514..767b71c 100644 Binary files a/build/cmd.o and b/build/cmd.o differ diff --git a/build/main.o b/build/main.o index 5b3817e..199fef6 100644 Binary files a/build/main.o and b/build/main.o differ diff --git a/limine b/limine index 36783ec..38ff2c8 160000 --- a/limine +++ b/limine @@ -1 +1 @@ -Subproject commit 36783ec43af4db4841a1e80770355fd1e98f091b +Subproject commit 38ff2c855aabb92e4cfa2cc7ef0c8af665ecba94 diff --git a/limine.cfg b/limine.cfg deleted file mode 100644 index 290a623..0000000 --- a/limine.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2023-2026 Chris (boreddevnl) -# This software is released under the GNU General Public License v3.0. See LICENSE file for details. -# This header needs to maintain in any file it is present in, as per the GPL license terms. -TIMEOUT=3 -TERM_PALETTE=ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff;ffffff -TERM_BACKGROUND=00000000 -WALLPAPER=splash.jpg - -:BoredOS - PROTOCOL=limine - KERNEL_PATH=boot:///boredos.elf diff --git a/limine.conf b/limine.conf new file mode 100644 index 0000000..be1fc5f --- /dev/null +++ b/limine.conf @@ -0,0 +1,15 @@ +# Copyright (c) 2023-2026 Chris (boreddevnl) +# This software is released under the GNU General Public License v3.0. See LICENSE file for details. +# This header needs to maintain in any file it is present in, as per the GPL license terms. + +timeout: 3 +verbose: yes + +${WALLPAPER_PATH}=boot():/splash.jpg +wallpaper: ${WALLPAPER_PATH} +wallpaper_style: centered +backdrop: 000000 + +/BoredOS + protocol: limine + path: boot():/boredos.elf diff --git a/screenshot.jpg b/screenshot.jpg index c83ab84..3f0aa25 100644 Binary files a/screenshot.jpg and b/screenshot.jpg differ diff --git a/splash.jpg b/splash.jpg index 1e30504..93cd9a1 100644 Binary files a/splash.jpg and b/splash.jpg differ diff --git a/src/kernel/cmd.c b/src/kernel/cmd.c index 273f1ae..fd12da4 100644 --- a/src/kernel/cmd.c +++ b/src/kernel/cmd.c @@ -1997,7 +1997,7 @@ static void create_ramfs_files(void) { "- `iso_root/` - ISO filesystem layout (generated during build)\n" "- `limine/` - Limine bootloader files (downloaded automatically)\n" "- `linker.ld` - Linker script for x86_64 ELF\n" - "- `limine.cfg` - Limine bootloader configuration\n" + "- `limine.conf` - Limine bootloader configuration\n" "- `Makefile` - Build configuration and targets\n\n" "## License\n\n" "Copyright (C) 2024-2026 boreddevnl\n\n" diff --git a/src/kernel/images/.DS_Store b/src/kernel/images/.DS_Store index 0b11cb5..6cc4bb6 100644 Binary files a/src/kernel/images/.DS_Store and b/src/kernel/images/.DS_Store differ diff --git a/src/kernel/main.c b/src/kernel/main.c index 26e71d1..142f490 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -177,9 +177,6 @@ void kmain(void) { if (fh && fh->valid) { int written = fat32_write(fh, mod->address, mod->size); fat32_close(fh); - serial_write("[DEBUG] Module successfully copied to RAMFS. Written bytes: "); - serial_write_num(written); - serial_write("\n"); } else { serial_write("[DEBUG] ERROR: Failed to create file in RAMFS for module: "); serial_write(clean_path);