From f71d388c5b2f728d5f3dc4ad5a6e25d2e1c0a452 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 1 Jul 2026 21:06:41 +0200
Subject: [PATCH 1/2] Unconditionally compile bcm2835-sdhcid

This moves us closer towards having a single unified image for all arm64
systems. Only init still has the board compiled in rather than detecting
it from the device tree or ACPI tables.
---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 34f2af3900..cd652607b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 TARGET ?= x86_64-unknown-redox
 LINKER ?= $(shell redoxer env which $(shell redoxer env printenv LD))
-BOARD ?=
 BUILD_TYPE ?= release
 BUILD_FLAGS ?= --release
 CARGO ?= redoxer
@@ -28,9 +27,7 @@ ifneq (,$(filter i586-unknown-redox i686-unknown-redox x86_64-unknown-redox,$(TA
 endif
 
 ifeq ($(TARGET),aarch64-unknown-redox)
-    ifeq ($(BOARD),raspi3b)
-        INITFS_BINS += bcm2835-sdhcid
-    endif
+	INITFS_BINS += bcm2835-sdhcid
 endif
 
 INITFS_CARGO_ARGS = $(foreach bin,$(INITFS_BINS),-p $(bin))

From ed73d8a36d7cb6f022deedf61b944a3a149d9df5 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 1 Jul 2026 21:11:55 +0200
Subject: [PATCH 2/2] Rustfmt

---
 daemon/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs
index 6aa4ba8547..614fc352c9 100644
--- a/daemon/src/lib.rs
+++ b/daemon/src/lib.rs
@@ -7,8 +7,8 @@ use std::os::unix::process::CommandExt;
 use std::process::Command;
 
 use libredox::Fd;
-use redox_scheme::scheme::{SchemeAsync, SchemeSync};
 use redox_scheme::Socket;
+use redox_scheme::scheme::{SchemeAsync, SchemeSync};
 
 unsafe fn get_fd(var: &str) -> RawFd {
     let fd: RawFd = std::env::var(var).unwrap().parse().unwrap();