From e22aaec27f16d5f36f4a2947a7b6d4de8c922b38 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Fri, 3 Nov 2017 17:16:02 -0700
Subject: Fix line endings in the logo

---
 Makefile.in   | 2 +-
 bbl/bbl.mk.in | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 0d5e862..0268629 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,7 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 CC            := @CC@
 READELF       := @READELF@
 OBJCOPY       := @OBJCOPY@
-CFLAGS        := @CFLAGS@ $(CFLAGS) -DBBL_PAYLOAD=\"bbl_payload\" -DBBL_LOGO_FILE=\"@BBL_LOGO_FILE@\"
+CFLAGS        := @CFLAGS@ $(CFLAGS) -DBBL_PAYLOAD=\"bbl_payload\" -DBBL_LOGO_FILE=\"bbl_logo_file\"
 BBL_PAYLOAD   := @BBL_PAYLOAD@
 COMPILE       := $(CC) -MMD -MP $(CFLAGS) \
                  $(sprojs_include)
diff --git a/bbl/bbl.mk.in b/bbl/bbl.mk.in
index 0840859..2bc96e1 100644
--- a/bbl/bbl.mk.in
+++ b/bbl/bbl.mk.in
@@ -19,6 +19,11 @@ payload.o: bbl_payload
 bbl_payload: $(BBL_PAYLOAD)
 	if $(READELF) -h $< 2> /dev/null > /dev/null; then $(OBJCOPY) -O binary $< $@; else cp $< $@; fi
 
+raw_logo.o: bbl_logo_file
+
+bbl_logo_file: @BBL_LOGO_FILE@
+	cat $^ | sed 's/$$/\r/' > $@
+
 bbl_test_srcs =
 
 bbl_install_prog_srcs = \
-- 
cgit v1.1