Browse Source

Always build bbl.bin

bbl.bin is necessary for booting on hardware and is created by
a simple objcopy line. It's much more convienent for riscv-pk to
create this file then to expect the user to know to do it or
to dig through the SDK's makefile to learn that it's required.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
pull/150/head
Logan Gunthorpe 7 years ago
parent
commit
b54479d8e7
No known key found for this signature in database GPG Key ID: 1F744C71943DE2F9
  1. 7
      Makefile.in
  2. 5
      bbl/bbl.mk.in

7
Makefile.in

@ -283,11 +283,11 @@ $$($(2)_install_prog_exes) : % : %.o $$($(2)_prog_libnames)
$(2)_c_deps += $$($(2)_install_prog_deps) $(2)_c_deps += $$($(2)_install_prog_deps)
$(2)_junk += \ $(2)_junk += \
$$($(2)_install_prog_objs) $$($(2)_install_prog_deps) \ $$($(2)_install_prog_objs) $$($(2)_install_prog_deps) \
$$($(2)_install_prog_exes) $$($(2)_install_prog_exes) $($(2)_extra_targets)
# Subproject specific targets # Subproject specific targets
all-$(1) : lib$(1).a $$($(2)_install_prog_exes) all-$(1) : lib$(1).a $$($(2)_install_prog_exes) $($(2)_extra_targets)
check-$(1) : $$($(2)_test_outs) check-$(1) : $$($(2)_test_outs)
echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segementation' $$^; echo echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segementation' $$^; echo
@ -311,6 +311,7 @@ test_outs += $$($(2)_test_outs)
install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs))
install_libs += lib$(1).a install_libs += lib$(1).a
install_exes += $$($(2)_install_prog_exes) install_exes += $$($(2)_install_prog_exes)
extra_targets += $($(2)_extra_targets)
endef endef
@ -446,7 +447,7 @@ junk += $(project_name)-*.tar.gz
# Default # Default
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
all : $(install_hdrs) $(install_libs) $(install_exes) all : $(install_hdrs) $(install_libs) $(install_exes) $(extra_targets)
.PHONY : all .PHONY : all
#------------------------------------------------------------------------- #-------------------------------------------------------------------------

5
bbl/bbl.mk.in

@ -35,3 +35,8 @@ bbl_test_srcs =
bbl_install_prog_srcs = \ bbl_install_prog_srcs = \
bbl.c \ bbl.c \
bbl.bin: bbl
$(OBJCOPY) -S -O binary --change-addresses -0x80000000 $< $@
bbl_extra_targets = bbl.bin

Loading…
Cancel
Save