summaryrefslogtreecommitdiffstats
path: root/drivers/platform/chrome/Makefile
diff options
context:
space:
mode:
authorMark Brown2019-05-20 12:54:21 +0200
committerMark Brown2019-05-20 12:54:21 +0200
commiteceb995e04b74204c73f9dd0ccb19061d5082063 (patch)
tree265d09722dbaaa4a4c97619d763a40d2be954f16 /drivers/platform/chrome/Makefile
parentspi: tegra114: add support for TX and RX trimmers (diff)
parentLinux 5.2-rc1 (diff)
downloadkernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.gz
kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.tar.xz
kernel-qcow2-linux-eceb995e04b74204c73f9dd0ccb19061d5082063.zip
Merge tag 'v5.2-rc1' into spi-5.3
Linux 5.2-rc1
Diffstat (limited to 'drivers/platform/chrome/Makefile')
-rw-r--r--drivers/platform/chrome/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
index 1e2f0029b597..1b2f1dcfcd5c 100644
--- a/drivers/platform/chrome/Makefile
+++ b/drivers/platform/chrome/Makefile
@@ -1,18 +1,23 @@
# SPDX-License-Identifier: GPL-2.0
+# tell define_trace.h where to find the cros ec trace header
+CFLAGS_cros_ec_trace.o:= -I$(src)
+
obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o
obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o
obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o
obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o
+obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o
obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o
cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_reg.o
cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC) += cros_ec_lpc_mec.o
obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o
-obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o
+obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o
obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT) += cros_kbd_led_backlight.o
obj-$(CONFIG_CROS_EC_LIGHTBAR) += cros_ec_lightbar.o
obj-$(CONFIG_CROS_EC_VBC) += cros_ec_vbc.o
obj-$(CONFIG_CROS_EC_DEBUGFS) += cros_ec_debugfs.o
obj-$(CONFIG_CROS_EC_SYSFS) += cros_ec_sysfs.o
+obj-$(CONFIG_CROS_USBPD_LOGGER) += cros_usbpd_logger.o
obj-$(CONFIG_WILCO_EC) += wilco_ec/