mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/qemu: move QEMU_EXTRAOPTIONS for PPC to the relevant tunes

Browse Source 
Every other architecture has the QEMU_EXTRAOPTIONS assignments in the
tune files, so move the PPC ones too.

(From OE-Core rev: ba05251c89d8cc243e861886124573c83197e949)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-01-10 13:01:14 +00:00
committed by Richard Purdie
parent 1fa2f50f75
commit 0165c71b10
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes-recipe/qemu.bbclass
View File

@@ -62,12 +62,3 @@ def qemu_run_binary(data, rootfs_path, binary):
QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('TUNE_PKGARCH')) or ""}"
QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${TUNE_PKGARCH}"
QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
QEMU_EXTRAOPTIONS_ppce500mc = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e500mc"
QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
QEMU_EXTRAOPTIONS_powerpc64le = " -cpu POWER9"

1
meta/conf/machine/include/powerpc/arch-powerpc64.inc
View File

@@ -21,3 +21,4 @@ TUNE_FEATURES:tune-powerpc64le = "m64 fpu-hard"
BASE_LIB:tune-powerpc64le = "lib64"
TUNE_PKGARCH:tune-powerpc64le = "powerpc64le"
PACKAGE_EXTRA_ARCHS:tune-powerpc64le = "powerpc64le"
QEMU_EXTRAOPTIONS_powerpc64le = " -cpu POWER9"

1
meta/conf/machine/include/powerpc/tune-ppc7400.inc
View File

@@ -9,3 +9,4 @@ AVAILTUNES += "ppc7400"
TUNE_FEATURES:tune-ppc7400 = "m32 fpu-hard ppc7400 altivec bigendian"
TUNE_PKGARCH:tune-ppc7400 = "ppc7400"
PACKAGE_EXTRA_ARCHS:tune-ppc7400 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppc7400"
QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"

1
meta/conf/machine/include/powerpc/tune-ppce500mc.inc
View File

@@ -9,6 +9,7 @@ AVAILTUNES += "ppce500mc"
TUNE_FEATURES:tune-ppce500mc = "m32 fpu-hard ppce500mc bigendian"
TUNE_PKGARCH:tune-ppce500mc = "ppce500mc"
PACKAGE_EXTRA_ARCHS:tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce500mc"
QEMU_EXTRAOPTIONS_ppce500mc = " -cpu e500mc"
# pass -mcpu=e500mc for ppce500mc kernel cross compile
TARGET_CC_KERNEL_ARCH = "-mcpu=e500mc"

1
meta/conf/machine/include/powerpc/tune-ppce500v2.inc
View File

@@ -18,3 +18,4 @@ AVAILTUNES += "ppce500v2"
TUNE_FEATURES:tune-ppce500v2 = "m32 ppce500v2 bigendian"
TUNE_PKGARCH:tune-ppce500v2 = "ppce500v2"
PACKAGE_EXTRA_ARCHS:tune-ppce500v2 = "ppce500v2"
QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"

2
meta/conf/machine/include/powerpc/tune-ppce5500.inc
View File

@@ -10,11 +10,13 @@ TUNE_FEATURES:tune-ppce5500 = "m32 fpu-hard e5500 bigendian"
BASE_LIB:tune-ppce5500 = "lib"
TUNE_PKGARCH:tune-ppce5500 = "ppce5500"
PACKAGE_EXTRA_ARCHS:tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce5500"
QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e500mc"
TUNE_FEATURES:tune-ppc64e5500 = "m64 fpu-hard e5500 bigendian"
BASE_LIB:tune-ppc64e5500 = "lib64"
TUNE_PKGARCH:tune-ppc64e5500 = "ppc64e5500"
PACKAGE_EXTRA_ARCHS:tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64e5500"
QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc"
# QEMU usermode fails with invalid instruction error (YOCTO: #10304)
MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'e5500', ' qemu-usermode', '', d)}"

2
meta/conf/machine/include/powerpc/tune-ppce6500.inc
View File

@@ -10,11 +10,13 @@ TUNE_FEATURES:tune-ppce6500 = "m32 fpu-hard e6500 altivec bigendian"
BASE_LIB:tune-ppce6500 = "lib"
TUNE_PKGARCH:tune-ppce6500 = "ppce6500"
PACKAGE_EXTRA_ARCHS:tune-ppce6500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc} ppce6500"
QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e500mc"
TUNE_FEATURES:tune-ppc64e6500 = "m64 fpu-hard e6500 altivec bigendian"
BASE_LIB:tune-ppc64e6500 = "lib64"
TUNE_PKGARCH:tune-ppc64e6500 = "ppc64e6500"
PACKAGE_EXTRA_ARCHS:tune-ppc64e6500 = "${PACKAGE_EXTRA_ARCHS:tune-powerpc64} ppc64e6500"
QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e500mc"
# QEMU usermode fails with invalid instruction error (YOCTO: #10304)
MACHINE_FEATURES_BACKFILL_CONSIDERED:append = "${@bb.utils.contains('TUNE_FEATURES', 'e6500', ' qemu-usermode', '', d)}"