Merge branch 'use_fbcond' into 'master'

Fix for the introduction of fbcond See merge request redox-os/cookbook!344

Merge branch 'use_fbcond' into 'master'
e4cdb8bf · Jeremy Soller · 673cde7b · 2787dad9 · e4cdb8bf · e4cdb8bf
Commit e4cdb8bf authored 1 year ago by Jeremy Soller
--- 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
+vesad G G G
-logd debug: display.vesa:1
+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
+vesad G G G
-logd debug: display.vesa:1
+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
+vesad G G G
-logd debug: display.vesa:1
+fbcond 1 2
+logd debug: fbcon:1
 stdio log:
 ps2d us
 ramfs logging