diff options
author | Jett Rink <jettrink@chromium.org> | 2018-04-20 10:08:44 -0600 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-26 17:00:45 -0700 |
commit | a34e253d28d8ac4d787856ca9f4c790b4a5c2e27 (patch) | |
tree | 5547f0baa64c029503b5c36c584ba6546c0b35e2 /util/build.mk | |
parent | 043ee28da36f45eeda1015a65827ff5feca00b5d (diff) | |
download | chrome-ec-a34e253d28d8ac4d787856ca9f4c790b4a5c2e27.tar.gz |
octopus: move common usb/battery code into baseboard
Also implement a few remaining usb function for bip
BRANCH=none
BUG=b:75972988,b:76218141,b:74132235,b:78344554
TEST=verified yorp still functions
Change-Id: I201408b5db689ac4a5bcab0011bc38698271b851
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1024279
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'util/build.mk')
-rw-r--r-- | util/build.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/util/build.mk b/util/build.mk index 13e4dc55d1..81bdfa3d81 100644 --- a/util/build.mk +++ b/util/build.mk @@ -45,7 +45,11 @@ $(out)/util/genvif: BUILD_LDFLAGS+=$(out)/util/usb_pd_policy.o -flto STANDALONE_FLAGS=-ffreestanding -fno-builtin -nostdinc \ -Ibuiltin/ -D"__keep= " -DVIF_BUILD -$(out)/util/usb_pd_policy.o: board/$(BOARD)/usb_pd_policy.c + +# If baseboard is defined, include its usb_pd_policy; otherwise, +# $(BASEDIR) will alias to `board/$(BOARD)` and includes same board file twice. +$(out)/util/usb_pd_policy.o: $(BASEDIR)/usb_pd_policy.c \ + board/$(BOARD)/usb_pd_policy.c $(call quiet,c_to_vif,BUILDCC) deps-$(CONFIG_USB_POWER_DELIVERY) += $(out)/util/usb_pd_policy.o.d endif # CONFIG_USB_POWER_DELIVERY |