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)) 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();