arm-autonomy/linux: Move linaro recipes to arm-autonomy layer

The n1sdp has been upgraded to the linux-yocto 5.10 kernel in
meta-arm-bsp, but Xen + PREEMPT_RT is currently broken in 5.10, so
autonomy builds cannot upgrade.

Therefore, move the linux-linaro-arm configuration and recipes to
meta-arm-autonomy as they are now only required for autonomy
builds.

Issue-Id: SCM-2185
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Change-Id: Ibe918bc39ffef0d9c92c19ed0a0815c83e48a2be
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-autonomy/conf/layer.conf

@@ -33,6 +33,7 @@ USER_CLASSES_append = " arm-autonomy-features"
 
 BBFILES_DYNAMIC += " \
     meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bbappend \
+    meta-arm-bsp:${LAYERDIR}/dynamic-layers/meta-arm-bsp/*/*/*.bb \
     meta-gem5:${LAYERDIR}/dynamic-layers/meta-gem5/*/*/*.bbappend \
 "
 # Root directory for the meta-arm-autonomy/dynamic-layers/meta-arm-bsp

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-n1sdp.inc

@@ -22,10 +22,6 @@ KCONFIG_MODE = "--alldefconfig"
 
 COMPATIBLE_MACHINE = "n1sdp"
 
-# RT kernel machine description
-FILESEXTRAPATHS_prepend_pn-linux-linaro-arm-rt := "${THISDIR}:"
-SRC_URI_append_pn-linux-linaro-arm-rt = " file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta"
-
 # 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_pn-linux-linaro-arm-rt = "0"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-rt_5.4.bb

@@ -3,10 +3,17 @@
 # linux-linaro-arm-rt to enable it as the default kernel.
 require linux-linaro-arm_5.4.bb
 
+
 #
 # Include preempt-rt patches
 #
-SRC_URI_append = " https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.3-rt1.patch.gz;name=rt-patch"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
+SRC_URI_append = " \
+    https://cdn.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.3-rt1.patch.gz;name=rt-patch \
+    file://0001-xen-use-handle_fasteoi_irq-to-handle-xen-dynamic-eve.patch \
+    "
 SRC_URI[rt-patch.sha256sum] = "6b92ba32c7ce30919c9b66e49e5f1dce58e1f8bd92fef91e548d6f2d434a2b39"
 
 LINUX_KERNEL_TYPE = "preempt-rt"
+
+KERNEL_FEATURES += "features/arm-autonomy/preempt-rt-extras.scc"

meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-linaro-arm-rt_5.4.bbappend

@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:"
-
-SRC_URI_append = " \
-    file://0001-xen-use-handle_fasteoi_irq-to-handle-xen-dynamic-eve.patch \
-    "
-
-KERNEL_FEATURES += "features/arm-autonomy/preempt-rt-extras.scc"