Commit 489b48b6 authored by Kamil Dzieżyk's avatar Kamil Dzieżyk Committed by Diego Sueiro
Browse files

ewaol-distro: Remove 'x86' related configs from xen kernel config check



This patch aslo removes 'x86' configs from the 'XEN_CONFIG_IGNORE_LIST'.

Issue-Id: SCM-4427
Signed-off-by: Kamil Dzieżyk's avatarKamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I4bce8cd5f27e64270ef2b0a0885d266a6c7261dc
parent abe6b4d2
......@@ -7,18 +7,10 @@ inherit kernelcfg_check
# Current checksum, should be updated to track latest xen requirements
# https://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/tree/features/xen/xen.cfg
XEN_CONFIG_FILE ?= "xen.cfg"
XEN_CONFIG_FILE_MD5 ?= "1a3c770197a4c0c720b0ae1d73f4c090"
XEN_CONFIG_FILE_MD5 ?= "9dd5450b99fc05551999bf119208acf8"
# List of XEN configs not valid or not wanted for aarch64 machines
XEN_CONFIG_IGNORE_LIST ?= "CONFIG_HYPERVISOR_GUEST \
CONFIG_XEN_PVHVM \
CONFIG_XEN_SAVE_RESTORE \
CONFIG_PCI_XEN \
CONFIG_XEN_PCIDEV_FRONTEND \
CONFIG_XEN_SCRUB_PAGES \
CONFIG_XEN_PCIDEV_BACKEND \
CONFIG_XEN_ACPI_PROCESSOR \
CONFIG_XEN_MCE_LOG \
XEN_CONFIG_IGNORE_LIST ?= "\
CONFIG_XEN_HAVE_PVMMU \
CONFIG_XEN_PVCALLS_FRONTEND \
CONFIG_XEN_PVCALLS_BACKEND \
......
......@@ -14,3 +14,15 @@ SRC_URI:append:ewaol = " file://ewaol-kmeta;type=kmeta;name=ewaol-kmeta;destsuff
KERNEL_FEATURES:append:ewaol:aarch64 = "${@bb.utils.contains('DISTRO_FEATURES', \
'ewaol-sdk', \
' features/ewaol/gator.scc', '', d)}"
#
# yocto kernel cache
#
# Add patch for kernel meta only for kernel recipes
EWAOL_KERNEL_META_PATCHES:append:ewaol = "${@bb.utils.contains('PROVIDES', \
'virtual/kernel', \
' file://0001-xen-move-x86-configs-into-a-separate-file.patch;patchdir=kernel-meta', \
'', d)}"
SRC_URI:append:ewaol = "${EWAOL_KERNEL_META_PATCHES}"
From f82d70a644b7695142b882fbb40d8f8cc70d38db Mon Sep 17 00:00:00 2001
From: Kamil Dziezyk <kamil.dziezyk@arm.com>
Date: Wed, 25 May 2022 19:22:14 +0100
Subject: [PATCH] features/xen: Move x86 configs to separate file
These configs are:
- HYPERVISOR_GUEST
- PCI_XEN
- XEN_ACPI_PROCESSOR
- XEN_DEBUG_FS
- XEN_MCE_LOG
- XEN_PCIDEV_BACKEND
- XEN_PCIDEV_FRONTEND
- XEN_PVHVM
- XEN_SAVE_RESTORE
This patch also replaces config 'XEN_SCRUB_PAGES' with the
'XEN_SCRUB_PAGES_DEFAULT', because it was renamed since 4.19 release.
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
---
features/xen/xen-x86.cfg | 11 +++++++++++
features/xen/xen.cfg | 11 +----------
features/xen/xen.scc | 4 ++++
3 files changed, 16 insertions(+), 10 deletions(-)
create mode 100644 features/xen/xen-x86.cfg
diff --git a/features/xen/xen-x86.cfg b/features/xen/xen-x86.cfg
new file mode 100644
index 00000000..39e6993f
--- /dev/null
+++ b/features/xen/xen-x86.cfg
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PCI_XEN=y
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PCIDEV_FRONTEND=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_SAVE_RESTORE=y
diff --git a/features/xen/xen.cfg b/features/xen/xen.cfg
index 1f414c08..7da87825 100644
--- a/features/xen/xen.cfg
+++ b/features/xen/xen.cfg
@@ -1,14 +1,8 @@
-CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
CONFIG_MMU_NOTIFIER=y
CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_PCI_XEN=y
-CONFIG_XEN_PCIDEV_FRONTEND=y
CONFIG_SYS_HYPERVISOR=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_BACKEND=m
@@ -28,7 +22,7 @@ CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
CONFIG_XEN_FBDEV_FRONTEND=y
CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_DEV_EVTCHN=y
CONFIG_XEN_BACKEND=y
CONFIG_XENFS=y
@@ -38,10 +32,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
CONFIG_XEN_GNTDEV=m
CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-CONFIG_XEN_MCE_LOG=y
CONFIG_XEN_HAVE_PVMMU=y
CONFIG_XEN_PVCALLS_FRONTEND=y
CONFIG_XEN_PVCALLS_BACKEND=y
diff --git a/features/xen/xen.scc b/features/xen/xen.scc
index b588e5df..e7c85a1b 100644
--- a/features/xen/xen.scc
+++ b/features/xen/xen.scc
@@ -2,3 +2,7 @@ define KFEATURE_DESCRIPTION "Xen Kernel Support"
define KFEATURE_COMPATIBILITY arch
kconf non-hardware xen.cfg
+
+if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then
+ kconf non-hardware xen-x86.cfg
+fi
--
2.17.1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment