diff options
author | Daiane Angolini <daiane.angolini@foundries.io> | 2024-02-06 18:28:57 -0300 |
---|---|---|
committer | Daiane Angolini <daiane.angolini@foundries.io> | 2024-02-07 15:13:07 -0300 |
commit | fb86e9b882bf4fd715a4e4b14058a61c9f2469ed (patch) | |
tree | bb87ed75ceb5b608a66f6969837e4fcde85d0534 | |
parent | b6c7fdfb1d8c8576663eb634d966f8408ce59d7f (diff) | |
download | meta-freescale-fb86e9b882bf4fd715a4e4b14058a61c9f2469ed.tar.gz |
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 <daiane.angolini@foundries.io>
-rw-r--r-- | recipes-extended/jailhouse/files/arm-arm64-Makefile-Remove-march-option-from-Makefile.patch | 40 | ||||
-rw-r--r-- | recipes-extended/jailhouse/jailhouse-imx_git.bb | 4 |
2 files changed, 43 insertions, 1 deletions
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 @@ | |||
1 | From 7117c1fe979053e4b1071968b444c03fbffe55bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Daiane Angolini <daiane.angolini@foundries.io> | ||
3 | Date: Tue, 6 Feb 2024 18:01:07 -0300 | ||
4 | Subject: [PATCH] arm:arm64: Makefile: Remove -march option from Makefile | ||
5 | |||
6 | It let the recipe to decide which are the compilation flags to be used. | ||
7 | |||
8 | It acomodates to [1]. | ||
9 | |||
10 | [1] https://git.yoctoproject.org/poky/commit/?id=04eac1f2b67eac5f892a9e0f8fcfe54849923af5 | ||
11 | |||
12 | Upstream-Status: Inappropriate [See above] | ||
13 | |||
14 | Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io> | ||
15 | --- | ||
16 | hypervisor/arch/arm/Makefile | 2 -- | ||
17 | hypervisor/arch/arm64/Makefile | 1 - | ||
18 | 2 files changed, 3 deletions(-) | ||
19 | |||
20 | diff --git a/hypervisor/arch/arm/Makefile b/hypervisor/arch/arm/Makefile | ||
21 | index a54370fc..cddb6cd3 100644 | ||
22 | --- a/hypervisor/arch/arm/Makefile | ||
23 | +++ b/hypervisor/arch/arm/Makefile | ||
24 | @@ -12,5 +12,3 @@ | ||
25 | |||
26 | LINUXINCLUDE += -I$(src)/arch/arm-common/include | ||
27 | |||
28 | -KBUILD_CFLAGS += -marm -march=armv7ve -msoft-float | ||
29 | -KBUILD_AFLAGS += -march=armv7ve -msoft-float | ||
30 | diff --git a/hypervisor/arch/arm64/Makefile b/hypervisor/arch/arm64/Makefile | ||
31 | index 0718994d..5d7a80c6 100644 | ||
32 | --- a/hypervisor/arch/arm64/Makefile | ||
33 | +++ b/hypervisor/arch/arm64/Makefile | ||
34 | @@ -12,4 +12,3 @@ | ||
35 | |||
36 | LINUXINCLUDE += -I$(src)/arch/arm-common/include | ||
37 | |||
38 | -KBUILD_CFLAGS += -march=armv8-a+nofp | ||
39 | -- | ||
40 | 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" | |||
20 | SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f" | 20 | SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f" |
21 | 21 | ||
22 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" | 22 | IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" |
23 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}" | 23 | SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \ |
24 | file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \ | ||
25 | " | ||
24 | 26 | ||
25 | DEPENDS = " \ | 27 | DEPENDS = " \ |
26 | make-native \ | 28 | make-native \ |