mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-12-28 10:45:22 +00:00
432ea75d92
A typical EC image includes two similar in their functionality
subsections, RO and RW. CR50 has a small RO subsection, all it does -
detects a proper RW image to run and starts it up. To provide for
reliable firmware updates, the CR50 image needs to include two RW
sections, while the code is running from one RW subsection, the other
one can be upgraded.
This patch adds the ability to generate two identical RW sections,
mapped half flash size apart, and include them into the resulting EC
image.
To keep things simple the previously existing RW section's name is not
being changed, while the new (identical) RW section is named RW_B.
Two configuration options need to be defined to enable building of the
new image type: CONFIG_RW_B to enable the feature and
CONFIG_RW_B_MEM_OFF to define where RW_B should be mapped into the
flash.
A new rule added to Makefile.rules allows to generate a different lds
file from the same source (core/cortex-m/ec.lds.S) by defining a
compile time variable to pick a different base address for the
rewritable section, when RW_B is built.
BRANCH=none
BUG=chromium:43025
TEST=as follows:
- make buildall -j still succeeds
- verified that regular CR50 image starts successfully
- modified chip/g/loader/main.c to launch RW_B first, re-built and
re-run the image, observed on the console:
vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
cr50 bootloader, 20151118_11218@80881, no USB, full crypto
Valid image found at 0x00084000, jumping
--- UART initialized after reboot ---
[Reset cause: power-on]
[Image: unknown, cr50_v1.1.4160-4c8a789-dirty 2015-12-07 18:54:27 vbendeb@eskimo.mtv.corp.google.com]
[0.001148 Inits done]
This FPGA image has no USB support
Console is enabled; type HELP for help.
> [0.002212 task 2 waiting for events...]
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
(note that the image base address is 0x840000, which is RW_B).
Change-Id: Ia2f90d5e5b7a9f252ea3ecf3ff5babfad8a97444
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/316703
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
354 lines
12 KiB
Makefile
354 lines
12 KiB
Makefile
# -*- makefile -*-
|
|
# vim: set filetype=make :
|
|
# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
#
|
|
# Embedded Controller firmware build system - common targets
|
|
#
|
|
|
|
build-utils := $(foreach u,$(build-util-bin),$(out)/util/$(u))
|
|
host-utils := $(foreach u,$(host-util-bin),$(out)/util/$(u))
|
|
build-srcs := $(foreach u,$(build-util-bin),$(sort $($(u)-objs:%.o=util/%.c) util/$(u).c))
|
|
host-srcs := $(foreach u,$(host-util-bin),$(sort $($(u)-objs:%.o=util/%.c) util/$(u).c))
|
|
|
|
# Don't do a build test on the following boards:
|
|
skip_boards = OWNERS host it8380dev
|
|
boards := $(filter-out $(skip_boards),$(notdir $(wildcard board/* private*/board/*)))
|
|
|
|
# Create output directories if necessary
|
|
_common_dir_create := $(foreach d,$(common_dirs),$(shell [ -d $(out)/$(d) ] || \
|
|
mkdir -p $(out)/$(d)))
|
|
_sharedlib_dir_create := $(foreach d,$(dirs),$(shell \
|
|
[ -d $(out)/$(SHOBJLIB)/$(d) ] || mkdir -p $(out)/$(SHOBJLIB)/$(d)))
|
|
_dir_create := $(foreach d,$(dirs),$(shell [ -d $(out)/$(BLD)/$(d) ] || \
|
|
mkdir -p $(out)/RO/$(d); mkdir -p $(out)/RW/$(d)))
|
|
_dir_y_create := $(foreach d,$(dirs-y),$(shell [ -d $(out)/$(BLD)/$(d) ] || \
|
|
mkdir -p $(out)/RO/$(d); mkdir -p $(out)/RW/$(d)))
|
|
|
|
# Decrease verbosity unless you pass V=1
|
|
quiet = $(if $(V),,@echo ' $(2)' $(subst $(out)/,,$@) ; )$(cmd_$(1))
|
|
silent = $(if $(V),,1>/dev/null)
|
|
silent_err = $(if $(V),,2>/dev/null)
|
|
|
|
# commands to build all targets
|
|
cmd_lds = $(CPP) -P -C -MMD -MF $@.d -MT $@ $(CPPFLAGS) $< -o $@
|
|
cmd_lds_b = $(cmd_lds) -DRW_B_LDS
|
|
# Allow obj_to_bin to be overridden by board or chip specific commands
|
|
cmd_obj_to_bin ?= $(OBJCOPY) --gap-fill=0xff -O binary $^ $(out)/$*.bin.tmp
|
|
cmd_flat_to_obj = $(CC) -T $(out)/firmware_image.lds -nostdlib $(CPPFLAGS) \
|
|
-Wl,--build-id=none -o $@ $<
|
|
# Allow the .roshared section to overlap other sections (itself)
|
|
cmd_ec_elf_to_flat ?= $(OBJCOPY) --set-section-flags .roshared=share \
|
|
-O binary $< $@
|
|
cmd_elf_to_signed ?= $(out)/util/signer --key=util/signer/$(3).pem \
|
|
--input=$< --format=bin --output=$@.signed \
|
|
&& mv $@.signed $@
|
|
cmd_elf_to_dis = $(OBJDUMP) -D $< > $@
|
|
cmd_elf_to_hex = $(OBJCOPY) -O ihex $< $@
|
|
cmd_bin_to_hex = $(OBJCOPY) -I binary -O ihex \
|
|
--change-addresses $(_program_memory_base) $^ $@
|
|
cmd_smap = $(NM) $< | sort > $@
|
|
cmd_elf = $(CC) $(objs) $(libsharedobjs_elf-y) $(LDFLAGS) \
|
|
-o $@ -Wl,-T,$< -Wl,-Map,$(patsubst %.elf,%.map,$@)
|
|
cmd_exe = $(CC) $(ro-objs) $(HOST_TEST_LDFLAGS) -o $@
|
|
cmd_c_to_o = $(CC) $(CFLAGS) -MMD -MF $@.d -c $< -o $(@D)/$(@F)
|
|
cmd_c_to_build = $(BUILDCC) $(BUILD_CFLAGS) \
|
|
$(sort $(foreach c,$($(*F)-objs),util/$(c:%.o=%.c)) $*.c) \
|
|
$(BUILD_LDFLAGS) \
|
|
-MMD -MF $@.d -o $@
|
|
cmd_c_to_host = $(HOSTCC) $(HOST_CFLAGS) -MMD -MF $@.d -o $@ \
|
|
$(sort $(foreach c,$($(*F)-objs),util/$(c:%.o=%.c)) $*.c)
|
|
cmd_cxx_to_host = $(HOSTCXX) -std=c++0x $(COMMON_WARN) $(HOST_CXXFLAGS)\
|
|
-I ./$($(notdir $@)_ROOT) -o $@ $(filter %.cc,$^) $($(notdir $@)_LIBS)
|
|
cmd_host_test = ./util/run_host_test $* $(silent)
|
|
cmd_version = ./util/getversion.sh > $@
|
|
cmd_mv_from_tmp = mv $(out)/$*.bin.tmp $(out)/$*.bin
|
|
cmd_extractrw-y = dd if=$(out)/$(PROJECT).bin.tmp of=$(out)/$(PROJECT).RW.bin \
|
|
bs=1 count=$(_rw_size) skip=$(_rw_off) $(silent_err)
|
|
cmd_copyrw-y = cd $(out) && cp RW/$(PROJECT).RW.flat RW/$(PROJECT).RW.bin
|
|
cmd_sharedlib_elf = $(CC) $(libsharedobjs_deps) \
|
|
-Wl,-T,common/ec.$(SHOBJLIB).ld $(LDFLAGS) \
|
|
-o $(out)/$(SHOBJLIB)/$(SHOBJLIB).elf \
|
|
-Wl,-Map,$(out)/$(SHOBJLIB)/$(SHOBJLIB).map
|
|
|
|
# commands for RSA signature
|
|
cmd_rsasign = futility sign --type usbpd1 --pem $(PEM) $(out)/$*.bin.tmp
|
|
|
|
# commands to build optional xref files
|
|
cmd_deps_to_list = cat $(deps) | tr -d ':\\' | tr ' ' '\012' \
|
|
| egrep '\.[chS]$$' | sort | uniq > $@
|
|
cmd_etags = etags -o $@ $(shell cat $<)
|
|
cmd_ctags = ctags -o $@ $(shell cat $<)
|
|
targ_if_prog = $(if $(shell which $(1) 2>/dev/null),$(2),)
|
|
|
|
# When building with -j, it's easy to miss errors. If you don't have your shell
|
|
# configured to warn you about nonzero exit, you may not even notice that "make
|
|
# buildall -j" failed. To make it more obvious, we'll do one level of recursion
|
|
# here.
|
|
.PHONY: try_buildall
|
|
try_buildall: $(foreach b, $(boards), proj-$(b))
|
|
|
|
.PHONY: buildall
|
|
buildall:
|
|
$(MAKE) try_buildall
|
|
$(MAKE) runtests
|
|
@touch .tests-passed
|
|
@echo "$@ completed successfully!"
|
|
|
|
# Print any important notices at the end of the build.
|
|
.PHONY: notice
|
|
notice: $(config)
|
|
ifeq ($(CONFIG_EXPERIMENTAL_CONSOLE),y)
|
|
ifeq ($(TEST_BUILD),)
|
|
@echo "*** NOTE: The experimental console is ENABLED. ***"
|
|
@echo "You will need to run the EC-3PO interactive console in the util"
|
|
@echo "directory! Otherwise, you won't be able to enter any commands."
|
|
endif # not a TEST_BUILD
|
|
endif # CONFIG_EXPERIMENTAL_CONSOLE=y
|
|
|
|
proj-%:
|
|
@echo "======= building $*"; \
|
|
$(MAKE) --no-print-directory BOARD=$* V=$(V)
|
|
|
|
dis-y := $(out)/RW/$(PROJECT).RW.dis
|
|
dis-$(CONFIG_FW_INCLUDE_RO) += $(out)/RO/$(PROJECT).RO.dis
|
|
dis-$(CONFIG_SHAREDLIB) += $(out)/$(SHOBJLIB)/$(SHOBJLIB).dis
|
|
dis: $(dis-y)
|
|
.PHONY: dis
|
|
|
|
hex-y := $(out)/RO/$(PROJECT).RO.hex $(out)/RW/$(PROJECT).RW.hex $(out)/$(PROJECT).hex
|
|
hex: $(hex-y)
|
|
.PHONY: hex
|
|
|
|
.PHONY: utils-host
|
|
utils-host: $(host-utils)
|
|
|
|
.PHONY: utils-build
|
|
utils-build: $(build-utils)
|
|
|
|
.PHONY: utils
|
|
utils: utils-host utils-build
|
|
|
|
# On board test binaries
|
|
test-targets=$(foreach t,$(test-list-y),test-$(t))
|
|
.PHONY: $(test-targets)
|
|
|
|
ifeq "$(CONFIG_COMMON_RUNTIME)" "y"
|
|
$(test-targets): test-%:
|
|
@set -e ; \
|
|
echo " BUILD $(out)/$*" ; \
|
|
$(MAKE) --no-print-directory BOARD=$(BOARD) PROJECT=$* \
|
|
V=$(V) out=$(out)/$* TEST_BUILD=y; \
|
|
cp $(out)/$*/$*.bin $(out)/test-$*.bin
|
|
endif
|
|
|
|
.PHONY: tests
|
|
tests: $(test-targets)
|
|
|
|
# Emulator test executables
|
|
host-test-targets=$(foreach t,$(test-list-host),host-$(t))
|
|
run-test-targets=$(foreach t,$(test-list-host),run-$(t))
|
|
.PHONY: $(host-test-targets) $(run-test-targets)
|
|
|
|
$(host-test-targets): host-%:
|
|
@set -e ; \
|
|
echo " BUILD host - build/host/$*" ; \
|
|
$(MAKE) --no-print-directory BOARD=host PROJECT=$* \
|
|
V=$(V) out=build/host/$* TEST_BUILD=y EMU_BUILD=y $(TEST_FLAG) \
|
|
CROSS_COMPILE= build/host/$*/$*.exe
|
|
|
|
$(run-test-targets): run-%: host-%
|
|
$(call quiet,host_test,TEST )
|
|
|
|
.PHONY: hosttests runtests
|
|
hosttests: $(host-test-targets)
|
|
runtests: $(run-test-targets)
|
|
|
|
cov-test-targets=$(foreach t,$(test-list-host),build/host/$(t).info)
|
|
bldversion=$(shell (./util/getversion.sh ; echo VERSION) | $(CPP) -P)
|
|
|
|
# lcov fails when multiple instances run at the same time.
|
|
# We need to run them sequentially by using flock
|
|
cmd_lcov=flock /tmp/ec-lcov-lock -c "lcov -q -o $@ -c -d build/host/$*"
|
|
cmd_report_cov=genhtml -q -o build/host/coverage_rpt -t \
|
|
"EC Unittest "$(bldversion) $^
|
|
|
|
build/host/%.info: run-%
|
|
$(call quiet,lcov,COV )
|
|
|
|
.PHONY: coverage
|
|
coverage: TEST_FLAG=TEST_COVERAGE=y
|
|
coverage: $(cov-test-targets)
|
|
$(call quiet,report_cov,REPORT )
|
|
|
|
$(out)/firmware_image.lds: common/firmware_image.lds.S
|
|
$(call quiet,lds,LDS )
|
|
$(out)/%.lds: core/$(CORE)/ec.lds.S
|
|
$(call quiet,lds,LDS )
|
|
|
|
$(out)/%_B.lds: core/$(CORE)/ec.lds.S
|
|
$(call quiet,lds_b,LDS_B )
|
|
|
|
$(out)/%.bin: $(out)/%.obj
|
|
$(call quiet,obj_to_bin,OBJCOPY)
|
|
$(if $(wildcard $(PEM)),$(call quiet,rsasign,SIGN ),)
|
|
$(if $(wildcard $(PEM)),$(call quiet,extractrw-y,EXTR_RW), \
|
|
$(call quiet,copyrw-y,COPY_RW))
|
|
$(call quiet,mv_from_tmp,MV )
|
|
|
|
flat-y := $(out)/RW/$(PROJECT).RW.flat
|
|
flat-$(CONFIG_FW_INCLUDE_RO) += $(out)/RO/$(PROJECT).RO.flat
|
|
|
|
deps += $(out)/firmware_image.lds.d $(flat-y:%.flat=%.lds.d)
|
|
|
|
flat-$(CONFIG_SHAREDLIB) += $(libsharedobjs-y)
|
|
|
|
$(out)/$(PROJECT).obj: common/firmware_image.S $(out)/firmware_image.lds \
|
|
$(flat-y)
|
|
$(call quiet,flat_to_obj,CAT )
|
|
|
|
$(out)/%.dis: $(out)/%.elf
|
|
$(call quiet,elf_to_dis,OBJDUMP)
|
|
|
|
$(out)/RW/%.hex: $(out)/RW/%.elf $(out)/RW/%.smap
|
|
$(call quiet,elf_to_hex,OBJCOPY)
|
|
|
|
ifeq ($(SIGNED_IMAGES),)
|
|
$(out)/%.flat: $(out)/%.elf $(out)/%.smap
|
|
$(call quiet,ec_elf_to_flat,OBJCOPY)
|
|
|
|
$(out)/RO/%.hex: $(out)/RO/%.elf $(out)/RO/%.smap
|
|
$(call quiet,elf_to_hex,OBJCOPY)
|
|
else
|
|
$(out)/RO/%.flat: $(out)/RO/%.elf $(out)/RO/%.smap
|
|
$(call quiet,elf_to_signed,RO_SIGN,rom-testkey-A)
|
|
|
|
$(out)/RW/%.flat: $(out)/RW/%.elf $(out)/RW/%.smap
|
|
$(call quiet,elf_to_signed,RW_SIGN,loader-testkey-A)
|
|
|
|
$(out)/RO/%.hex: $(out)/RO/%.flat
|
|
$(call quiet,bin_to_hex,OBJCOPY)
|
|
endif
|
|
$(out)/$(PROJECT).hex: $(out)/$(PROJECT).bin
|
|
$(call quiet,bin_to_hex,OBJCOPY)
|
|
|
|
$(out)/RW/%.elf: override BLD:=RW
|
|
$(out)/RW/%.elf: private objs := $(rw-objs)
|
|
$(out)/RW/%.elf: $(out)/RW/%.lds $(rw-objs) $(libsharedobjs_elf-y)
|
|
$(call quiet,elf,LD )
|
|
|
|
$(out)/RO/%.elf: override BLD:=RO
|
|
$(out)/RO/%.elf: private objs := $(ro-objs)
|
|
$(out)/RO/%.elf: $(out)/RO/%.lds $(ro-objs) $(libsharedobjs_elf-y)
|
|
$(call quiet,elf,LD )
|
|
|
|
$(out)/%.elf: $(out)/%.lds $(objs)
|
|
$(call quiet,elf,LD )
|
|
|
|
$(out)/$(SHOBJLIB)/$(SHOBJLIB).elf: $(sharedlib-objs)
|
|
@mkdir -p $(out)/$(SHOBJLIB)
|
|
$(call quiet,sharedlib_elf,LD )
|
|
|
|
$(out)/%.smap: $(out)/%.elf
|
|
$(call quiet,smap,NM )
|
|
|
|
$(out)/$(PROJECT).exe: $(ro-objs)
|
|
$(call quiet,exe,EXE )
|
|
|
|
$(out)/RO/%.o:%.c
|
|
$(call quiet,c_to_o,CC )
|
|
$(out)/RW/%.o:%.c
|
|
$(call quiet,c_to_o,CC )
|
|
|
|
$(out)/$(SHOBJLIB)/%.o: override LATE_CFLAGS_DEFINE:=-DSHAREDLIB_IMAGE
|
|
$(out)/$(SHOBJLIB)/%.o:%.c
|
|
$(call quiet,c_to_o,CC )
|
|
|
|
$(out)/RO/%.o:%.S
|
|
$(call quiet,c_to_o,AS )
|
|
$(out)/RW/%.o:%.S
|
|
$(call quiet,c_to_o,AS )
|
|
|
|
|
|
# Conditionally force the rebuilding of ec_version.h only if it would be
|
|
# changed.
|
|
old_version_hash := $(shell cat $(out)/ec_version.h 2> /dev/null | md5sum -)
|
|
new_version_hash := $(shell BOARD=$(BOARD) ./util/getversion.sh | md5sum -)
|
|
|
|
ifneq ($(old_version_hash),$(new_version_hash))
|
|
.PHONY: $(out)/ec_version.h
|
|
endif
|
|
|
|
# All of the objects have an order only dependency on the ec_version header.
|
|
# This ensures that if ec_version.h needs to be built (because it was marked
|
|
# PHONY above) then it will be rebuilt before any objects. This is important
|
|
# because some source files will include ec_version.h and fail to compile if
|
|
# it doesn't already exist. This dependency shouldn't be a normal dependency
|
|
# because that would cause every object to be rebuilt when ec_version.h
|
|
# changes, instead of just the ones that actually depend on it. The objects
|
|
# that truly depend on ec_version.h will have that information encoded in their
|
|
# .d file.
|
|
$(ro-objs): | $(out)/ec_version.h
|
|
$(rw-objs): | $(out)/ec_version.h
|
|
$(sharedlib-objs): | $(out)/ec_version.h
|
|
|
|
$(out)/ec_version.h:
|
|
$(call quiet,version,VERSION)
|
|
|
|
$(build-utils): $(out)/%:$(build-srcs)
|
|
$(call quiet,c_to_build,BUILDCC)
|
|
|
|
$(host-utils): $(out)/%:$(host-srcs)
|
|
$(call quiet,c_to_host,HOSTCC )
|
|
|
|
$(out)/cscope.files: $(out)/$(PROJECT).bin
|
|
$(call quiet,deps_to_list,SH )
|
|
|
|
$(out)/TAGS: $(out)/cscope.files
|
|
$(call quiet,etags,ETAGS )
|
|
|
|
$(out)/tags: $(out)/cscope.files
|
|
$(call quiet,ctags,CTAGS )
|
|
|
|
# TODO: optional make rules for PROJECT_EXTRA
|
|
$(npcx-flash-fw-bin):
|
|
$(if $(V),,@echo ' EXTBIN ' $(subst $(out)/,,$@) ; )
|
|
-@ mkdir -p $(@D)
|
|
-@ $(CC) $(CFLAGS) -MMD -MF $(out)/$(npcx-lfw).d -c $(npcx-flash-fw).c \
|
|
-o $(out)/$(npcx-flash-fw).o
|
|
-@ $(CC) $(out)/$(npcx-flash-fw).o $(LDFLAGS) \
|
|
-o $(out)/$(npcx-flash-fw).elf -Wl,-T,$(npcx-flash-fw).ld \
|
|
-Wl,-Map,$(out)/$(npcx-flash-fw).map
|
|
-@ $(OBJCOPY) -O binary $(out)/$(npcx-flash-fw).elf $@
|
|
|
|
.PHONY: xrefs
|
|
xrefs: $(call targ_if_prog,etags,$(out)/TAGS) \
|
|
$(call targ_if_prog,ctags,$(out)/tags)
|
|
|
|
.PHONY: flash
|
|
flash: $(out)/ec.bin
|
|
openocd -c "set BOARD $(BOARD)"\
|
|
-c "set BUILD_DIR $(out)"\
|
|
-f $(BDIR)/openocd-flash.cfg
|
|
|
|
.PHONY: flash_ec
|
|
flash_ec: $(out)/ec.bin
|
|
./util/flash_ec --board $(BOARD) --image $(out)/ec.bin
|
|
|
|
.PHONY: flash_dfu
|
|
flash_dfu: $(out)/ec.bin
|
|
sudo ./$(BDIR)/dfu $(out)/ec.bin
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
-rm -rf $(out)
|
|
|
|
.PHONY: clobber
|
|
clobber:
|
|
-rm -rf build TAGS cscope.files cscope.out
|
|
|
|
.SECONDARY:
|
|
|
|
-include $(deps)
|