diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-02-08 11:25:59 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-02-16 07:46:15 -0800 |
| commit | 9fb49a0df1e1f8cf9c53412bba4dbc333c5850f9 (patch) | |
| tree | 4372316533289ef6cfb0f07e6d6fa23237ece391 | |
| parent | f495e27ce67888cd955bffded589f877ae503897 (diff) | |
| download | chrome-ec-9fb49a0df1e1f8cf9c53412bba4dbc333c5850f9.tar.gz | |
Fizz/CBI: Buid cbi-util as host-util
This patch also removes make rules to stop producing CBI blobs.
CBI blobs will be produced by another protage package.
BUG=b:73123025,chromium:809250
BRANCH=none
TEST=emerge-fizz chromeos-firmware-fizz and verify
/build/fizz/firmware/cbi contains EEPROM images.
Verify emerge ec-utils ec-devutils succeeds.
Change-Id: I13744b0ab97675afa0247046bffa3edac3e62ceb
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/909692
| -rw-r--r-- | board/fizz/build.mk | 27 | ||||
| -rw-r--r-- | util/build.mk | 8 |
2 files changed, 2 insertions, 33 deletions
diff --git a/board/fizz/build.mk b/board/fizz/build.mk index 936c79bda7..74094ac834 100644 --- a/board/fizz/build.mk +++ b/board/fizz/build.mk @@ -12,30 +12,3 @@ CHIP_VARIANT:=npcx5m6g board-y=board.o board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o board-y+=led.o - -brd_ver = 0x0202 - -# Build CBI blob for one model -# $1: Prefix for output files -# $2: OEM ID -# $3: SKU ID -make_cbi = $(out)/util/cbi-util --create $(1)_$(3).bin \ - --board_version $(brd_ver) --oem_id $(2) --sku_id $(3) --size 256; - -# Build CBI blobs for all SKU IDs -# $1: OEM ID -make_all_cbi = $(foreach s,$(sku_ids),$(call make_cbi,$(out)/$@,$(1),$(s))) - -cbi_kench: sku_ids = 0 1 2 3 4 5 6 -cbi_kench: $(out)/util/cbi-util - $(call make_all_cbi, 0) - -cbi_teemo: sku_ids = 0 1 4 5 -cbi_teemo: $(out)/util/cbi-util - $(call make_all_cbi, 1) - -cbi_sion: sku_ids = 0 1 2 3 4 5 6 -cbi_sion: $(out)/util/cbi-util - $(call make_all_cbi, 2) - -PROJECT_EXTRA += cbi_kench cbi_teemo cbi_sion
\ No newline at end of file diff --git a/util/build.mk b/util/build.mk index eccea4f7c9..7a1ab8b766 100644 --- a/util/build.mk +++ b/util/build.mk @@ -7,7 +7,7 @@ # host-util-bin=ectool lbplay stm32mon ec_sb_firmware_update lbcc \ - ec_parse_panicinfo + ec_parse_panicinfo cbi-util build-util-bin=ec_uartd iteflash build-util-art+=util/export_taskinfo.so ifeq ($(CHIP),npcx) @@ -57,11 +57,7 @@ $(out)/util/gen_touchpad_hash: BUILD_CFLAGS += $(OPENSSL_CFLAGS) $(out)/util/gen_touchpad_hash: BUILD_LDFLAGS += $(OPENSSL_LDFLAGS) endif # CONFIG_TOUCHPAD_VIRTUAL_OFF -build-util-bin += cbi-util -$(out)/util/cbi-util: $(out)/util/crc8.o -$(out)/util/cbi-util: BUILD_LDFLAGS=$(out)/util/crc8.o -static -$(out)/util/crc8.o: common/crc8.c - $(call quiet,c_to_vif,BUILDCC) +cbi-util-objs=../common/crc8.o $(out)/util/export_taskinfo.so: $(out)/util/export_taskinfo_ro.o \ $(out)/util/export_taskinfo_rw.o |