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

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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/qemu.bbclass b/meta/classes-recipe/qemu.bbclass
index 8d7c82668b4f5b0be2e392207aa3a05d92ad600e..42a39dd05995d1e730388804bcea497ab5441bfa 100644 (file)
--- a/meta/classes-recipe/qemu.bbclass
+++ b/meta/classes-recipe/qemu.bbclass
@@ -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"

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 2533151869bc7cd170f7297ade261940d0bfb1fa..af0635a641fc52dbc378c15dde13adb97b566be3 100644 (file)
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -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"

diff --git a/meta/conf/machine/include/powerpc/tune-ppc7400.inc b/meta/conf/machine/include/powerpc/tune-ppc7400.inc
index 49b94f5ee1ce213323e9899bbc8613e0c0051c06..6d3c158bbb598dc26bc7a95aca88462472cc0382 100644 (file)
--- a/meta/conf/machine/include/powerpc/tune-ppc7400.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppc7400.inc
@@ -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"

diff --git a/meta/conf/machine/include/powerpc/tune-ppce500mc.inc b/meta/conf/machine/include/powerpc/tune-ppce500mc.inc
index 036f8b26315b306879f2eb996ee33ec5cf666ca5..8c4630b368ccfbd9741ede1df9638ae7e4056f4b 100644 (file)
--- a/meta/conf/machine/include/powerpc/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce500mc.inc
@@ -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"

diff --git a/meta/conf/machine/include/powerpc/tune-ppce500v2.inc b/meta/conf/machine/include/powerpc/tune-ppce500v2.inc
index 461164d818fa1d734e50d77299952a68c60a959e..204580ee15a04a4d0756abdc220be5b8d03fc0d1 100644 (file)
--- a/meta/conf/machine/include/powerpc/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce500v2.inc
@@ -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"

diff --git a/meta/conf/machine/include/powerpc/tune-ppce5500.inc b/meta/conf/machine/include/powerpc/tune-ppce5500.inc
index 4915b81ee4d3b31ece813626f38805241c0b8122..8976c1612fdb6e1059b822ed7d8608f6767eda36 100644 (file)
--- a/meta/conf/machine/include/powerpc/tune-ppce5500.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce5500.inc
@@ -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)}"

diff --git a/meta/conf/machine/include/powerpc/tune-ppce6500.inc b/meta/conf/machine/include/powerpc/tune-ppce6500.inc
index f6310ab4c44069bc4c9454daf05f8b493d9d4f6e..b0efe1924c51a2d3a47f58ec28bb217b2772c37c 100644 (file)
--- a/meta/conf/machine/include/powerpc/tune-ppce6500.inc
+++ b/meta/conf/machine/include/powerpc/tune-ppce6500.inc
@@ -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)}"