diff --git a/Dockerfile b/Dockerfile index 1d29b465..ae454fb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster-slim ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick \ +RUN apt-get update && apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler \ && rm -rf /var/lib/apt/lists/* \ && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG en_US.utf8 diff --git a/Makefile b/Makefile index ea019a35..482be60e 100644 --- a/Makefile +++ b/Makefile @@ -186,10 +186,10 @@ update_cfg: build/build_tag.h: update_tag build/build_cfg.h: update_cfg -build/%.bin: data/%.png +build/%.bin: data/%.bin @echo " IMG $@" @mkdir -p "$(dir $@)" - @convert $< -background black -flatten -depth 8 rgba:$@ + @cp $< $@ build/%.o: build/%.bin @echo " BIN $@" diff --git a/README.md b/README.md index 5b5600e8..8567ea79 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ ## Building You need an `aarch64-linux-gnu-gcc` cross-compiler toolchain (or a native one, if running on ARM64). -You also need `convert` (from ImageMagick) for the boot logos. ```shell $ git clone --recursive https://github.com/AsahiLinux/m1n1.git @@ -21,7 +20,7 @@ Building on ARM64 macOS is supported with clang and LLVM; you need to use Homebr install the required dependencies: ```shell -$ brew install llvm imagemagick +$ brew install llvm ``` After that, just type `make`. diff --git a/data/bootlogo_128.bin b/data/bootlogo_128.bin new file mode 100644 index 00000000..6cea73a9 Binary files /dev/null and b/data/bootlogo_128.bin differ diff --git a/data/bootlogo_256.bin b/data/bootlogo_256.bin new file mode 100644 index 00000000..de38abfe Binary files /dev/null and b/data/bootlogo_256.bin differ diff --git a/data/makelogo.sh b/data/makelogo.sh new file mode 100755 index 00000000..79e44916 --- /dev/null +++ b/data/makelogo.sh @@ -0,0 +1,2 @@ +convert bootlogo_128.png -background black -flatten -depth 8 rgba:bootlogo_128.bin +convert bootlogo_256.png -background black -flatten -depth 8 rgba:bootlogo_256.bin