From fb86e9b882bf4fd715a4e4b14058a61c9f2469ed Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Tue, 6 Feb 2024 18:28:57 -0300 Subject: jailhouse-imx: Avoid the build error when using -mcpu and -march It changes the Makefile, so the recipe is the only one controlling the build arguments. It is related to [1] [1] https://git.yoctoproject.org/poky/commit/?id=04eac1f2b67eac5f892a9e0f8fcfe54849923af5 Signed-off-by: Daiane Angolini --- ...akefile-Remove-march-option-from-Makefile.patch | 40 ++++++++++++++++++++++ recipes-extended/jailhouse/jailhouse-imx_git.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch diff --git a/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch b/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch new file mode 100644 index 00000000..442d2831 --- /dev/null +++ b/recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch @@ -0,0 +1,40 @@ +From 7117c1fe979053e4b1071968b444c03fbffe55bb Mon Sep 17 00:00:00 2001 +From: Daiane Angolini +Date: Tue, 6 Feb 2024 18:01:07 -0300 +Subject: [PATCH] arm:arm64: Makefile: Remove -march option from Makefile + +It let the recipe to decide which are the compilation flags to be used. + +It acomodates to [1]. + +[1] https://git.yoctoproject.org/poky/commit/?id=04eac1f2b67eac5f892a9e0f8fcfe54849923af5 + +Upstream-Status: Inappropriate [See above] + +Signed-off-by: Daiane Angolini +--- + hypervisor/arch/arm/Makefile | 2 -- + hypervisor/arch/arm64/Makefile | 1 - + 2 files changed, 3 deletions(-) + +diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile +index a54370fc..cddb6cd3 100644 +--- a/hypervisor/arch/arm/Makefile ++++ b/hypervisor/arch/arm/Makefile +@@ -12,5 +12,3 @@ + + LINUXINCLUDE += -I$(src)/arch/arm-common/include + +-KBUILD_CFLAGS += -marm -march=armv7ve -msoft-float +-KBUILD_AFLAGS += -march=armv7ve -msoft-float +diff --git a/hypervisor/arch/arm64/Makefile b/hypervisor/arch/arm64/Makefile +index 0718994d..5d7a80c6 100644 +--- a/hypervisor/arch/arm64/Makefile ++++ b/hypervisor/arch/arm64/Makefile +@@ -12,4 +12,3 @@ + + LINUXINCLUDE += -I$(src)/arch/arm-common/include + +-KBUILD_CFLAGS += -march=armv8-a+nofp +-- +2.34.1 diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 9c03436c..21a5c93f 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -20,7 +20,9 @@ SRCBRANCH = "lf-6.1.36_2.1.0" SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f" IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" -SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}" +SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ + file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \ + " DEPENDS = " \ make-native \ -- cgit v1.2.3-54-g00ecf