From 71df1d2f8287ab79fe130d9d0cda70ed56dfea43 Mon Sep 17 00:00:00 2001 From: Kamil Dziezyk Date: Thu, 16 Sep 2021 19:02:12 +0200 Subject: [PATCH] arm-autonomy/n1sdp: Fix xen build after tunes files update After update f9cd6797d2925496280fd51cf512cab13da63dbf xen build ends with: | cc1: error: switch '-mcpu=generic' conflicts with '-march=armv8.2-a+crypto' switch [-Werror] | cc1: all warnings being treated as errors This patch removes '-march=*' build flag for xen build. Issue-Id: SCM-2987 Signed-off-by: Kamil Dziezyk Change-Id: I526c412a0174cdf715b87fcac077b314bf368b8a Signed-off-by: Jon Mason --- .../meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc index 394d1b82..c2916b81 100644 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc @@ -88,3 +88,7 @@ d.getVar('PREFERRED_PROVIDER_alternate/kernel') else ''}" # Additionnal kernel modules are necessary for n1sdp to be able to mount FAT # filesystems using CP437. MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " kernel-module-nls-cp437 kernel-module-nls-iso8859-1" + +# '-mcpu=' and '-march=' conflicts for xen build +# lets not set '-march=' and let xen to overwrite '-mcpu=' +TUNE_CCARGS:remove:pn-xen = "${TUNE_CCARGS_MARCH}${TUNE_CCARGS_MARCH_OPTS}"