Browse Source

Merge pull request #69 from riscv/endings

Fix line endings in the logo
pull/70/head
Palmer Dabbelt 9 years ago
committed by GitHub
parent
commit
d05ff0d3e4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Makefile.in
  2. 5
      bbl/bbl.mk.in

2
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)

5
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 = \

Loading…
Cancel
Save