aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-intel
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-26 12:37:11 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-06-28 19:40:29 +0000
commitdb2fae4724880a43e5942bf770bc8e6e200012b4 (patch)
tree9a25b8dbb4fbe51d1bfb0f53809c687f00663f85 /meta-agl-bsp/meta-intel
parent3283601f4d9bb9e5ed5b0bf3e7190c33c168e0bf (diff)
Add CAN drivers by default to AGL boards
v2 (jsmoeller): Add append files for boards that need special handling. Change-Id: I172b71be6e825aa6399f22899e9b6eaacc86e72b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9791 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-intel')
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg39
-rw-r--r--meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend4
2 files changed, 0 insertions, 43 deletions
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg b/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg
deleted file mode 100644
index 5966198d7..000000000
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-# CONFIG_TASK_XACCT is not set
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-
-#
-# CAN Device Drivers
-#
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-# CONFIG_CAN_LEDS is not set
-# CONFIG_CAN_SJA1000 is not set
-# CONFIG_CAN_C_CAN is not set
-# CONFIG_CAN_M_CAN is not set
-# CONFIG_CAN_CC770 is not set
-
-#
-# CAN SPI interfaces
-#
-CONFIG_CAN_MCP251X=m
-
-#
-# CAN USB interfaces
-#
-# CONFIG_CAN_EMS_USB is not set
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_GS_USB=m
-CONFIG_CAN_KVASER_USB=m
-CONFIG_CAN_PEAK_USB=m
-CONFIG_CAN_8DEV_USB=m
-# CONFIG_CAN_SOFTING is not set
-# CONFIG_CAN_DEBUG_DEVICES is not set
diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend
index e81e6dbf0..f94b638b0 100644
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend
@@ -1,9 +1,5 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-# adding most supported CAN devices
-SRC_URI_append = " file://can-bus.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg"
-
# adding most supported USB Bluetooth, Wifiand Ehternet devices
SRC_URI_append = " file://usb-devices.cfg"