Skip to content

Commit

Permalink
sys-boot: upgrade Limine to 8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mintsuki committed Aug 2, 2024
1 parent 2b7c5ad commit 1046713
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 80 deletions.
4 changes: 2 additions & 2 deletions bootstrap.d/sys-boot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ sources:
- name: limine
subdir: 'ports'
git: 'https://github.com/limine-bootloader/limine.git'
tag: 'v7.13.3'
version: '7.13.3'
tag: 'v8.0.0'
version: '8.0.0'
tools_required:
- host-autoconf-v2.69
- host-automake-v1.16
Expand Down
77 changes: 0 additions & 77 deletions scripts/limine.cfg

This file was deleted.

67 changes: 67 additions & 0 deletions scripts/limine.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
timeout: 3

/managarm (Weston, e9 output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: bochs init.launch=weston plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/managarm (kmscon, e9 output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: bochs init.launch=kmscon plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/managarm (sway, e9 output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: bochs init.launch=sway plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/managarm (Weston, e9 output)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: bochs init.launch=weston

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/managarm (kmscon, e9 output)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: bochs init.launch=kmscon

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/Physical hardware
//managarm (Weston, serial output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: serial init.launch=weston plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

//managarm (kmscon, serial output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: serial init.launch=kmscon plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio

/Expert options
//managarm (profiling, Weston, e9 output, plainfb)
kernel_path: boot():/managarm/eir-mb2
protocol: multiboot2
cmdline: kernel-profile bochs init.launch=weston plainfb.force=1

module_path: boot():/managarm/thor
module_path: boot():/managarm/initrd.cpio
2 changes: 1 addition & 1 deletion scripts/update-image.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def generate_plan(arch, root_uuid, scriptdir):
yield FsAction.CP, "tools/host-limine/share/limine/limine-bios.sys", "boot/"

yield FsAction.CP_SED, os.path.join(
scriptdir, "limine.cfg"
scriptdir, "limine.conf"
), "boot/", "@ROOT_UUID@", root_uuid

yield FsAction.RSYNC, "bin"
Expand Down

0 comments on commit 1046713

Please sign in to comment.