From 229c5ecc8b45161f6d0a81c8c2f15ce9558e81a0 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 24 Dec 2024 21:45:22 +0100
Subject: [PATCH] Run fbbootlogd during startup

---
 recipes/core/drivers-initfs/recipe.toml                    | 3 ++-
 recipes/core/initfs/aarch64-unknown-redox/init.rc          | 5 +++--
 recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp | 5 +++--
 recipes/core/initfs/init.rc                                | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/recipes/core/drivers-initfs/recipe.toml b/recipes/core/drivers-initfs/recipe.toml
index 402f9227..f4d3fd1f 100644
--- a/recipes/core/drivers-initfs/recipe.toml
+++ b/recipes/core/drivers-initfs/recipe.toml
@@ -6,6 +6,7 @@ template = "custom"
 script = """
 BINS=(
     acpid
+    fbbootlogd
     fbcond
     inputd
     lived
@@ -61,7 +62,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
 for bin in "${BINS[@]}"
 do
     case "${bin}" in
-      pcid | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
+      pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
         cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
         ;;
       *)
diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc b/recipes/core/initfs/aarch64-unknown-redox/init.rc
index 4943384a..0c64d22c 100644
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc
@@ -7,8 +7,9 @@ inputd
 vesad G G G
 unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
 #TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
+fbbootlogd
+fbcond 2
+logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
 acpid
diff --git a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
index 741469f9..3bcad17e 100644
--- a/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
+++ b/recipes/core/initfs/aarch64-unknown-redox/init.rc.raspi3bp
@@ -7,8 +7,9 @@ inputd
 vesad G G G
 unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
 #TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
+fbbootlogd
+fbcond 2
+logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
 lived
diff --git a/recipes/core/initfs/init.rc b/recipes/core/initfs/init.rc
index bdeb3765..48a5855b 100644
--- a/recipes/core/initfs/init.rc
+++ b/recipes/core/initfs/init.rc
@@ -7,8 +7,9 @@ inputd
 vesad G G G
 unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
 #TODO: unset FRAMEBUFFER1 and beyond?
-fbcond 1 2
-logd /scheme/debug /scheme/fbcon/1
+fbbootlogd
+fbcond 2
+logd /scheme/debug /scheme/fbbootlog
 stdio /scheme/log
 ramfs logging
 ps2d us