Merge branch 'use_fbcond' into 'master'

Fix for the introduction of fbcond See merge request redox-os/cookbook!344
2026-06-24 13:54:19 +08:00 · 2024-01-15 02:01:14 +00:00 · 2024-01-15 02:01:14 +00:00 · e4cdb8bff2
commit e4cdb8bff2
parent 673cde7b02 2787dad963
4 changed files with 10 additions and 6 deletions
--- a/recipes/core/drivers-initfs/recipe.toml
+++ b/recipes/core/drivers-initfs/recipe.toml
@ -6,6 +6,7 @@ template = "custom"
 script = """
 BINS=(
    ahcid
+    fbcond
    inputd
    nvmed
    pcid
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc
@ -4,8 +4,9 @@ nulld
 zerod
 randd
 inputd
-vesad T T G
-logd debug: display.vesa:1
+vesad G G G
+fbcond 1 2
+logd debug: fbcon:1
 stdio log:
 ramfs logging
 lived
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
@ -4,8 +4,9 @@ nulld
 zerod
 randd
 inputd
-vesad T T G
-logd debug: display.vesa:1
+vesad G G G
+fbcond 1 2
+logd debug: fbcon:1
 stdio log:
 ramfs logging
 lived
--- a/recipes/core/initfs/init.rc
+++ b/recipes/core/initfs/init.rc
@ -4,8 +4,9 @@ nulld
 zerod
 randd
 inputd
-vesad T T G
-logd debug: display.vesa:1
+vesad G G G
+fbcond 1 2
+logd debug: fbcon:1
 stdio log:
 ps2d us
 ramfs logging