diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-11-03 17:35:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 17:35:26 -0700 |
| commit | d05ff0d3e45195507cc7158fcdb25f442ab9e2ca (patch) | |
| tree | 7489cc4af1d55b413ae555b13a57f009ff1da9df | |
| parent | 37a68944a44c99abef3f129be606c6d5f5f0dcc1 (diff) | |
| parent | e22aaec27f16d5f36f4a2947a7b6d4de8c922b38 (diff) | |
| download | riscv-pk-d05ff0d3e45195507cc7158fcdb25f442ab9e2ca.zip riscv-pk-d05ff0d3e45195507cc7158fcdb25f442ab9e2ca.tar.gz riscv-pk-d05ff0d3e45195507cc7158fcdb25f442ab9e2ca.tar.bz2 | |
Merge pull request #69 from riscv/endings
Fix line endings in the logo
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | bbl/bbl.mk.in | 5 |
2 files changed, 6 insertions, 1 deletions
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 = \ |