diff --git a/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc b/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc index a7fe5238..d2aaabf0 100644 --- a/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc +++ b/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc @@ -6,11 +6,6 @@ ARM_AUTONOMY_HOST_OVERRIDES = ":autonomy-host" DISTRO_FEATURES_append = " xen ipv4" DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host" -# Since meta-virtualization master branch bumped to 4.15+stable we need to -# force the 4.14+stable selection until we validate the new version -PREFERRED_VERSION_xen = "4.14+stable%" -PREFERRED_VERSION_xen-tools = "4.14+stable%" - # Don't include kernels in standard images when building arm-autonomy-host # If the kernel image is needed in the rootfs the following should be set from # a bbappend: RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image" diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.cfg b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.cfg deleted file mode 100644 index 7e87cab4..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.cfg +++ /dev/null @@ -1,4 +0,0 @@ -# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping -# Linux kernel with a coredump while trying to access ZEN bit of CPACR1 core -# register. -# CONFIG_ARM64_SVE is not set diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.scc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.scc deleted file mode 100644 index 6bc769cc..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/disable-arm64-sve.scc +++ /dev/null @@ -1,3 +0,0 @@ -define KFEATURE_DESCRIPTION "Disable SVE support" - -kconf non-hardware disable-arm64-sve.cfg diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend deleted file mode 100644 index f590e713..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -# Use OVERRIDES to minimize the usage of -# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ... -OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}" - -FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}:" - -# -# arm-autonomy kmeta extra -# -SRC_URI_append_autonomy-host_fvp-base = " \ - file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra" - -# We need to turn off SVE support in the Linux kernel otherwise Xen is stopping -# Linux kernel with a coredump while trying to access XEN bit of CPACR1 core -# register. -KERNEL_FEATURES_append_autonomy-host_fvp-base = " \ - features/arm-autonomy/disable-arm64-sve.scc"