From 4f8766b081d3c32c145604d586078de9635e7915 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Fri, 12 Mar 2021 09:11:28 +0000 Subject: [PATCH] arm-bsp/linux: Add support for linux-yocto-rt for N1SDP * Enable linux-arm-platforms.inc for N1SDP * Create n1sdp-preempt-rt.scc config * Disable KVM as incompatible with preempt-rt * Disable kconf audit warnings as preempt-rt.scc clashes with defconfig Issue-Id: SCM-1506 Signed-off-by: Peter Hoyes Change-Id: I4f9c61c7fe2400858578576aad7c5d1c958e9a2e Signed-off-by: Jon Mason --- .../bsp/arm-platforms/n1sdp-preempt-rt.scc | 6 ++++++ .../bsp/arm-platforms/n1sdp/disable-kvm.cfg | 1 + meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc | 3 +++ meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend | 5 +++++ 4 files changed, 15 insertions(+) create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp-preempt-rt.scc create mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp/disable-kvm.cfg create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp-preempt-rt.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp-preempt-rt.scc new file mode 100644 index 00000000..dc844458 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp-preempt-rt.scc @@ -0,0 +1,6 @@ +define KMACHINE n1sdp +define KTYPE preempt-rt +define KARCH arm64 + +include ktypes/preempt-rt/preempt-rt.scc +include n1sdp/disable-kvm.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp/disable-kvm.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp/disable-kvm.cfg new file mode 100644 index 00000000..617d3e51 --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/n1sdp/disable-kvm.cfg @@ -0,0 +1 @@ +# CONFIG_KVM is not set diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index f2bb079f..711c67af 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -104,6 +104,9 @@ SRC_URI_append_n1sdp = " \ file://enable-realtek-R8169.cfg \ file://enable-usb_conn_gpio.cfg \ " +# Since we use the intree defconfig and the preempt-rt turns off some configs +# do_kernel_configcheck will display warnings. So, lets disable it. +KCONF_AUDIT_LEVEL_n1sdp_pn-linux-yocto-rt = "0" # # Musca B1/S2 can't run Linux diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend new file mode 100644 index 00000000..7f6030fa --- /dev/null +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-rt_%.bbappend @@ -0,0 +1,5 @@ +# Only enable linux-yocto-rt for n1sdp +LINUX_YOCTO_RT_REQUIRE ?= "" +LINUX_YOCTO_RT_REQUIRE_n1sdp = "linux-arm-platforms.inc" + +require ${LINUX_YOCTO_RT_REQUIRE}