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>

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 e81e6db..f94b638 100644 (file)
--- 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 e6a60e5..854b759 100644 (file)
--- 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 1db6d42..8417982 100644 (file)
--- 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 8a16423..368f1ba 100755 (executable)
--- 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 c2c7e5f..b2e5431 100644 (file)
--- 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 (file)
index 0000000..0363760
--- /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/meta-intel/recipes-kernel/linux/files/can-bus.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg
similarity index 100%
rename from meta-agl-bsp/meta-intel/recipes-kernel/linux/files/can-bus.cfg
rename to meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg