1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00

Kernel: Separate framebuffers from bootmode

Bootmode used to control framebuffers, panic behavior, and SystemServer.
This patch factors framebuffer control into a separate flag.
Note that the combination 'bootmode=self-test fbdev=on' leads to
unexpected behavior, which can only be fixed in a later commit.
This commit is contained in:
Ben Wiederhake 2021-10-23 17:18:57 +02:00 committed by Andreas Kling
parent 314b8a374b
commit 542a88a7be
16 changed files with 26 additions and 26 deletions

View file

@ -80,7 +80,7 @@ jobs:
timeoutInMinutes: 60
env:
SERENITY_QEMU_CPU: 'max,vmx=off'
SERENITY_KERNEL_CMDLINE: 'boot_mode=self-test'
SERENITY_KERNEL_CMDLINE: 'fbdev=off boot_mode=self-test'
SERENITY_RUN: 'ci'
- script: |

View file

@ -13,7 +13,7 @@ LABEL SerenityOS
LABEL SerenityOSText
MENU LABEL SerenityOS (text mode)
KERNEL mboot.c32
APPEND ../Prekernel root=/dev/hda1 boot_mode=text --- ../Kernel
APPEND ../Prekernel root=/dev/hda1 fbdev=off --- ../Kernel
LABEL SerenityOSNoACPI
MENU LABEL SerenityOS (No ACPI)

View file

@ -8,7 +8,7 @@ menuentry 'SerenityOS (normal)' {
menuentry 'SerenityOS (text mode)' {
root=hd0,5
multiboot /boot/Prekernel boot_mode=no-fbdev root=/dev/hda4
multiboot /boot/Prekernel fbdev=off root=/dev/hda4
module /boot/Kernel
}

View file

@ -8,7 +8,7 @@ menuentry 'SerenityOS (normal)' {
menuentry 'SerenityOS (text mode)' {
root=hd0,2
multiboot /boot/Prekernel boot_mode=no-fbdev root=/dev/hda2
multiboot /boot/Prekernel fbdev=off root=/dev/hda2
module /boot/Kernel
}

View file

@ -8,7 +8,7 @@ menuentry 'SerenityOS (normal)' {
menuentry 'SerenityOS (text mode)' {
root=hd0,1
multiboot /boot/Prekernel boot_mode=no-fbdev root=/dev/hda1
multiboot /boot/Prekernel fbdev=off root=/dev/hda1
module /boot/Kernel
}

View file

@ -69,6 +69,7 @@ fi
[ "$KVM_SUPPORT" -eq "1" ] && SERENITY_VIRT_TECH_ARG="-enable-kvm"
# For default values, see Kernel/CommandLine.cpp
[ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"
[ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=1G

View file

@ -358,7 +358,7 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad
else
build_target install
build_target image
export SERENITY_KERNEL_CMDLINE="boot_mode=self-test"
export SERENITY_KERNEL_CMDLINE="fbdev=off boot_mode=self-test"
export SERENITY_RUN="ci"
build_target run
fi