From 00e56a20e740d3aa359220174a7916f4a36cf2f7 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 3 Sep 2020 12:40:30 +0100 Subject: [PATCH] arm-autonomy/xen/gem5: Update EARLY_PRINTK support From Xen 4.14 version, the CONFIG_EARLY_PRINTK setting was moved from the make define setting in xen/arch/arm/Rules.mk to the Kconfig infrastructure. Hence, we need to make usage of config fragments to add this option to the supported machines. Change-Id: I64a7dfbe05c803e59f3296d7d0799126b2eb7d1f Issue-Id: SCM-1197 Signed-off-by: Diego Sueiro Signed-off-by: Jon Mason --- .../recipes-extended/xen/files/gem5-arm64/early-printk.cfg | 2 ++ .../meta-gem5/recipes-extended/xen/xen_%.bbappend | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/files/gem5-arm64/early-printk.cfg diff --git a/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/files/gem5-arm64/early-printk.cfg b/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/files/gem5-arm64/early-printk.cfg new file mode 100644 index 00000000..e89e546c --- /dev/null +++ b/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/files/gem5-arm64/early-printk.cfg @@ -0,0 +1,2 @@ +CONFIG_DEBUG=y +CONFIG_EARLY_PRINTK_VEXPRESS=y diff --git a/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/xen_%.bbappend b/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/xen_%.bbappend index 9e7ba459..ef42c520 100644 --- a/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/xen_%.bbappend +++ b/meta-arm-autonomy/dynamic-layers/meta-gem5/recipes-extended/xen/xen_%.bbappend @@ -1,2 +1,4 @@ -# Machine specific settings -XEN_CONFIG_EARLY_PRINTK_gem5-arm64 = "vexpress" +# gem5-arm64 support +COMPATIBLE_MACHINE_gem5-arm64 = "gem5-arm64" +FILESEXTRAPATHS_prepend_gem5-arm64 := "${THISDIR}/files:" +SRC_URI_append_gem5-arm64 = " file://early-printk.cfg"