Enable J1939 support for qemu machines

Tweak the can-bus.cfg kernel configuration fragment to set
CONFIG_CAN_J1939, and add an over-ride in the agl-service-can-low-level
recipe to enable J1939 support on qemu platforms where we know we have
a 5.4 kernel where it will work.

Bug-AGL: SPEC-3538

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I16e77a70794dd79ac37139dd19b15a9e131cbf3e
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25139
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg
index 57e25fc..2f24b76 100644 (file)
--- a/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg
+++ b/meta-agl-bsp/recipes-kernel/linux/linux/can-bus.cfg
@@ -7,6 +7,7 @@ CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
 
 #
 # CAN Device Drivers

diff --git a/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
index d06cfd2..83f6c1e 100644 (file)
--- a/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
+++ b/meta-agl-profile-core/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
@@ -16,4 +16,8 @@ DEPENDS = "libafb-helpers libappcontroller"
 
 inherit cmake aglwgt pkgconfig ptest
 
+# For now, just enable J1939 on the qemu platforms where we know the
+# linux-yocto kernel is new enough (>= 5.4) and has the support enabled.
+AGLWGT_CMAKE_CONFIGURE_ARGS_append_qemuall = " -DWITH_FEATURE_J1939=ON"
+
 RDEPENDS_${PN} = "virtual/low-can-dev-mapping"