mirror of
https://github.com/BoredDevNL/BoredOS.git
synced 2026-05-15 10:48:38 +00:00
limine update
This commit is contained in:
parent
67640ec8db
commit
22dd21c580
14 changed files with 24 additions and 23 deletions
BIN
.DS_Store
vendored
BIN
.DS_Store
vendored
Binary file not shown.
12
Makefile
12
Makefile
|
|
@ -34,7 +34,7 @@ LDFLAGS = -m elf_x86_64 -nostdlib -static -pie --no-dynamic-linker \
|
||||||
NASMFLAGS = -f elf64
|
NASMFLAGS = -f elf64
|
||||||
|
|
||||||
# Limine Version
|
# 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)
|
LIMINE_URL_BASE = https://github.com/limine-bootloader/limine/raw/v$(LIMINE_VERSION)
|
||||||
|
|
||||||
.PHONY: all clean run limine-setup
|
.PHONY: all clean run limine-setup
|
||||||
|
|
@ -86,21 +86,21 @@ $(KERNEL_ELF): $(OBJ_FILES)
|
||||||
$(MAKE) -C $(SRC_DIR)/userland
|
$(MAKE) -C $(SRC_DIR)/userland
|
||||||
|
|
||||||
# Create ISO
|
# Create ISO
|
||||||
$(ISO_IMAGE): $(KERNEL_ELF) limine.cfg limine-setup
|
$(ISO_IMAGE): $(KERNEL_ELF) limine.conf limine-setup
|
||||||
rm -rf $(ISO_DIR)
|
rm -rf $(ISO_DIR)
|
||||||
mkdir -p $(ISO_DIR)
|
mkdir -p $(ISO_DIR)
|
||||||
mkdir -p $(ISO_DIR)/EFI/BOOT
|
mkdir -p $(ISO_DIR)/EFI/BOOT
|
||||||
|
|
||||||
# Copy Kernel and Config
|
# Copy Kernel and Config
|
||||||
cp $(KERNEL_ELF) $(ISO_DIR)/
|
cp $(KERNEL_ELF) $(ISO_DIR)/
|
||||||
# Build ISO limine.cfg natively with modules
|
# Build ISO limine.conf natively with modules
|
||||||
cp limine.cfg $(ISO_DIR)/
|
cp limine.conf $(ISO_DIR)/
|
||||||
mkdir -p $(ISO_DIR)/bin
|
mkdir -p $(ISO_DIR)/bin
|
||||||
@for f in $(SRC_DIR)/userland/bin/*.elf; do \
|
@for f in $(SRC_DIR)/userland/bin/*.elf; do \
|
||||||
if [ -f "$$f" ]; then \
|
if [ -f "$$f" ]; then \
|
||||||
basename=$$(basename "$$f"); \
|
basename=$$(basename "$$f"); \
|
||||||
cp "$$f" $(ISO_DIR)/bin/; \
|
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 \
|
fi \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ $(ISO_IMAGE): $(KERNEL_ELF) limine.cfg limine-setup
|
||||||
if [ -f "$$f" ]; then \
|
if [ -f "$$f" ]; then \
|
||||||
basename=$$(basename "$$f"); \
|
basename=$$(basename "$$f"); \
|
||||||
cp "$$f" $(ISO_DIR)/Library/images/Wallpapers/; \
|
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 \
|
fi \
|
||||||
done
|
done
|
||||||
@if [ -f splash.jpg ]; then cp splash.jpg $(ISO_DIR)/; fi
|
@if [ -f splash.jpg ]; then cp splash.jpg $(ISO_DIR)/; fi
|
||||||
|
|
|
||||||
|
|
@ -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)
|
- `iso_root/` - ISO filesystem layout (generated during build)
|
||||||
- `limine/` - Limine bootloader files (downloaded automatically)
|
- `limine/` - Limine bootloader files (downloaded automatically)
|
||||||
- `linker.ld` - Linker script for x86_64 ELF
|
- `linker.ld` - Linker script for x86_64 ELF
|
||||||
- `limine.cfg` - Limine bootloader configuration
|
- `limine.conf` - Limine bootloader configuration
|
||||||
- `Makefile` - Build configuration and targets
|
- `Makefile` - Build configuration and targets
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
BIN
boredos.iso
BIN
boredos.iso
Binary file not shown.
BIN
build/cmd.o
BIN
build/cmd.o
Binary file not shown.
BIN
build/main.o
BIN
build/main.o
Binary file not shown.
2
limine
2
limine
|
|
@ -1 +1 @@
|
||||||
Subproject commit 36783ec43af4db4841a1e80770355fd1e98f091b
|
Subproject commit 38ff2c855aabb92e4cfa2cc7ef0c8af665ecba94
|
||||||
11
limine.cfg
11
limine.cfg
|
|
@ -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
|
|
||||||
15
limine.conf
Normal file
15
limine.conf
Normal file
|
|
@ -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
|
||||||
BIN
screenshot.jpg
BIN
screenshot.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 216 KiB After Width: | Height: | Size: 317 KiB |
BIN
splash.jpg
BIN
splash.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 40 KiB |
|
|
@ -1997,7 +1997,7 @@ static void create_ramfs_files(void) {
|
||||||
"- `iso_root/` - ISO filesystem layout (generated during build)\n"
|
"- `iso_root/` - ISO filesystem layout (generated during build)\n"
|
||||||
"- `limine/` - Limine bootloader files (downloaded automatically)\n"
|
"- `limine/` - Limine bootloader files (downloaded automatically)\n"
|
||||||
"- `linker.ld` - Linker script for x86_64 ELF\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"
|
"- `Makefile` - Build configuration and targets\n\n"
|
||||||
"## License\n\n"
|
"## License\n\n"
|
||||||
"Copyright (C) 2024-2026 boreddevnl\n\n"
|
"Copyright (C) 2024-2026 boreddevnl\n\n"
|
||||||
|
|
|
||||||
BIN
src/kernel/images/.DS_Store
vendored
BIN
src/kernel/images/.DS_Store
vendored
Binary file not shown.
|
|
@ -177,9 +177,6 @@ void kmain(void) {
|
||||||
if (fh && fh->valid) {
|
if (fh && fh->valid) {
|
||||||
int written = fat32_write(fh, mod->address, mod->size);
|
int written = fat32_write(fh, mod->address, mod->size);
|
||||||
fat32_close(fh);
|
fat32_close(fh);
|
||||||
serial_write("[DEBUG] Module successfully copied to RAMFS. Written bytes: ");
|
|
||||||
serial_write_num(written);
|
|
||||||
serial_write("\n");
|
|
||||||
} else {
|
} else {
|
||||||
serial_write("[DEBUG] ERROR: Failed to create file in RAMFS for module: ");
|
serial_write("[DEBUG] ERROR: Failed to create file in RAMFS for module: ");
|
||||||
serial_write(clean_path);
|
serial_write(clean_path);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue