From db2fae4724880a43e5942bf770bc8e6e200012b4 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 26 Jun 2017 12:37:11 +0000 Subject: Add CAN drivers by default to AGL boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2 (jsmoeller): Add append files for boards that need special handling. Change-Id: I172b71be6e825aa6399f22899e9b6eaacc86e72b Signed-off-by: Romain Forlot Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9791 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Stéphane Desneux --- .../recipes-kernel/linux/files/can-bus.cfg | 39 ------------------- .../recipes-kernel/linux/linux-yocto_4.4%.bbappend | 4 -- .../linux/linux-linaro-qcomlt_4.9.bbappend | 3 ++ .../linux/linux-raspberrypi_%.bbappend | 45 +++++++++++++++++++--- .../recipes-kernel/linux/linux-renesas_%.bbappend | 3 ++ .../linux/linux-ti-staging_%.bbappend | 3 ++ meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend | 5 +++ .../recipes-kernel/linux/linux/can-bus.cfg | 39 +++++++++++++++++++ 8 files changed, 92 insertions(+), 49 deletions(-) delete mode 100644 meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg 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" diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend index e6a60e584..854b7592f 100644 --- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend +++ b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend @@ -25,3 +25,6 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\ ${WORKDIR}/smack.cfg \ ${WORKDIR}/smack-default-lsm.cfg \ " + +# file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 1db6d4221..841798265 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -31,6 +31,39 @@ do_configure_append_sota() { kernel_configure_variable BLK_DEV_RAM y } +# can +do_configure_append() { + + kernel_configure_variable TASKSTATS y + kernel_configure_variable TASK_DELAY_ACCT y + kernel_configure_variable USER_RETURN_NOTIFIER y + kernel_configure_variable PREEMPT_NOTIFIERS y + kernel_configure_variable CAN m + kernel_configure_variable CAN_RAW m + kernel_configure_variable CAN_BCM m + kernel_configure_variable CAN_GW m + kernel_configure_variable CAN_VCAN m + kernel_configure_variable CAN_SLCAN m + kernel_configure_variable CAN_DEV m + kernel_configure_variable CAN_CALC_BITTIMING y + kernel_configure_variable CAN_MCP251X m + kernel_configure_variable CAN_ESD_USB2 m + kernel_configure_variable CAN_GS_USB m + kernel_configure_variable CAN_KVASER_USB m + kernel_configure_variable CAN_PEAK_USB m + kernel_configure_variable CAN_8DEV_USB m + +# not enabled, yet ? +# kernel_configure_variable CAN_LEDS is not set +# kernel_configure_variable CAN_SJA1000 is not set +# kernel_configure_variable CAN_C_CAN is not set +# kernel_configure_variable CAN_M_CAN is not set +# kernel_configure_variable CAN_CC770 is not set +# kernel_configure_variable CAN_EMS_USB is not set +# kernel_configure_variable CAN_SOFTING is not set +# kernel_configure_variable CAN_DEBUG_DEVICES is not set +} + do_configure_append() { # VC4 Wayland/Weston @@ -41,14 +74,14 @@ do_configure_append() { kernel_configure_variable FB_BCM2708 n # Enable support for TP-Link TL-W722N USB Wifi adapter - kernel_configure_variable CONFIG_ATH_CARDS m - kernel_configure_variable CONFIG_ATH9K_HTC m + kernel_configure_variable ATH_CARDS m + kernel_configure_variable ATH9K_HTC m # Enable support for RTLSDR - kernel_configure_variable CONFIG_MEDIA_USB_SUPPORT y - kernel_configure_variable CONFIG_MEDIA_DIGITAL_TV_SUPPORT y - kernel_configure_variable CONFIG_DVB_USB_V2 m - kernel_configure_variable CONFIG_DVB_USB_RTL28XXU m + kernel_configure_variable MEDIA_USB_SUPPORT y + kernel_configure_variable MEDIA_DIGITAL_TV_SUPPORT y + kernel_configure_variable DVB_USB_V2 m + kernel_configure_variable DVB_USB_RTL28XXU m # KEEP until fixed upstream: # Keep this the last line diff --git a/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend index 8a164235e..368f1ba1c 100755 --- a/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend @@ -39,3 +39,6 @@ SRC_URI_append_agl-porter-hibernate = " file://hibernation/0001-Add-Hibernation- " KERNEL_CONFIG_FRAGMENTS_append_agl-porter-hibernate += " ${WORKDIR}/hibernation/hibernation.cfg" + +# file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend index c2c7e5fbe..b2e543140 100644 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend +++ b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend @@ -28,3 +28,6 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\ ${WORKDIR}/smack.cfg \ ${WORKDIR}/smack-default-lsm.cfg \ " + +# file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend new file mode 100644 index 000000000..0363760ab --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" + +# Extra configuration options for the AGL kernel +SRC_URI += "file://can-bus.cfg \ + " diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg new file mode 100644 index 000000000..5966198d7 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg @@ -0,0 +1,39 @@ +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 -- cgit 1.2.3-korg