diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-13 10:19:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-15 08:15:25 +0100 |
| commit | 23ec0e5e7401f33116071eb9937287c02d921791 (patch) | |
| tree | 0030d058f5f944a6b2dcb01b2e3a158c862f3049 | |
| parent | 58ca420c350affadb6332371c574fc9b37e7df77 (diff) | |
| download | poky-23ec0e5e7401f33116071eb9937287c02d921791.tar.gz | |
mips/tune-mips64r2: Set qemu cpu option correctly
Ensure the CPU enabled in QEMU is correct for this architecture.
(From OE-Core rev: 6e0d176c4ce2bbbd975b74e41f63e60df7e3a554)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/machine/include/mips/tune-mips64r2.inc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/conf/machine/include/mips/tune-mips64r2.inc b/meta/conf/machine/include/mips/tune-mips64r2.inc index c644f40918..e9ca4201ff 100644 --- a/meta/conf/machine/include/mips/tune-mips64r2.inc +++ b/meta/conf/machine/include/mips/tune-mips64r2.inc | |||
| @@ -12,11 +12,13 @@ TUNE_FEATURES:tune-mips64r2 = "${TUNE_FEATURES:tune-mips64} mips64r2" | |||
| 12 | BASE_LIB:tune-mips64r2 = "lib64" | 12 | BASE_LIB:tune-mips64r2 = "lib64" |
| 13 | MIPSPKGSFX_VARIANT:tune-mips64r2 = "mips64r2" | 13 | MIPSPKGSFX_VARIANT:tune-mips64r2 = "mips64r2" |
| 14 | PACKAGE_EXTRA_ARCHS:tune-mips64r2 = "mips64 mips64r2" | 14 | PACKAGE_EXTRA_ARCHS:tune-mips64r2 = "mips64 mips64r2" |
| 15 | QEMU_EXTRAOPTIONS_mips64r2 = " -cpu MIPS64R2-generic" | ||
| 15 | 16 | ||
| 16 | TUNE_FEATURES:tune-mips64r2el = "${TUNE_FEATURES:tune-mips64el} mips64r2" | 17 | TUNE_FEATURES:tune-mips64r2el = "${TUNE_FEATURES:tune-mips64el} mips64r2" |
| 17 | BASE_LIB:tune-mips64r2el = "lib64" | 18 | BASE_LIB:tune-mips64r2el = "lib64" |
| 18 | MIPSPKGSFX_VARIANT:tune-mips64r2el = "mips64r2el" | 19 | MIPSPKGSFX_VARIANT:tune-mips64r2el = "mips64r2el" |
| 19 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el = "mips64el mips64r2el" | 20 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el = "mips64el mips64r2el" |
| 21 | QEMU_EXTRAOPTIONS_mips64r2el = " -cpu MIPS64R2-generic" | ||
| 20 | 22 | ||
| 21 | # MIPS 64r2 Soft Float | 23 | # MIPS 64r2 Soft Float |
| 22 | AVAILTUNES += "mips64r2-nf mips64r2el-nf" | 24 | AVAILTUNES += "mips64r2-nf mips64r2el-nf" |
| @@ -25,11 +27,13 @@ TUNE_FEATURES:tune-mips64r2-nf = "${TUNE_FEATURES:tune-mips64-nf} mips64r2" | |||
| 25 | BASE_LIB:tune-mips64r2-nf = "lib64" | 27 | BASE_LIB:tune-mips64r2-nf = "lib64" |
| 26 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf = "${TUNE_ARCH}" | 28 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf = "${TUNE_ARCH}" |
| 27 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf = "mips64-nf mips64r2-nf" | 29 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf = "mips64-nf mips64r2-nf" |
| 30 | QEMU_EXTRAOPTIONS_mips64r2-nf = " -cpu MIPS64R2-generic" | ||
| 28 | 31 | ||
| 29 | TUNE_FEATURES:tune-mips64r2el-nf = "${TUNE_FEATURES:tune-mips64el-nf} mips64r2" | 32 | TUNE_FEATURES:tune-mips64r2el-nf = "${TUNE_FEATURES:tune-mips64el-nf} mips64r2" |
| 30 | BASE_LIB:tune-mips64r2el-nf = "lib64" | 33 | BASE_LIB:tune-mips64r2el-nf = "lib64" |
| 31 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf = "${TUNE_ARCH}" | 34 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf = "${TUNE_ARCH}" |
| 32 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf = "mips64el-nf mips64r2el-nf" | 35 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf = "mips64el-nf mips64r2el-nf" |
| 36 | QEMU_EXTRAOPTIONS_mips64r2el-nf = " -cpu MIPS64R2-generic" | ||
| 33 | 37 | ||
| 34 | # MIPS 64r2 n32 | 38 | # MIPS 64r2 n32 |
| 35 | AVAILTUNES += "mips64r2-n32 mips64r2el-n32" | 39 | AVAILTUNES += "mips64r2-n32 mips64r2el-n32" |
| @@ -38,11 +42,13 @@ TUNE_FEATURES:tune-mips64r2-n32 = "${TUNE_FEATURES:tune-mips64-n32} mips64r2" | |||
| 38 | BASE_LIB:tune-mips64r2-n32 = "lib32" | 42 | BASE_LIB:tune-mips64r2-n32 = "lib32" |
| 39 | MIPSPKGSFX_VARIANT:tune-mips64r2-n32 = "${TUNE_ARCH}" | 43 | MIPSPKGSFX_VARIANT:tune-mips64r2-n32 = "${TUNE_ARCH}" |
| 40 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-n32 = "mips64-n32 mips64r2-n32" | 44 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-n32 = "mips64-n32 mips64r2-n32" |
| 45 | QEMU_EXTRAOPTIONS_mips64r2-n32 = " -cpu MIPS64R2-generic" | ||
| 41 | 46 | ||
| 42 | TUNE_FEATURES:tune-mips64r2el-n32 = "${TUNE_FEATURES:tune-mips64el-n32} mips64r2" | 47 | TUNE_FEATURES:tune-mips64r2el-n32 = "${TUNE_FEATURES:tune-mips64el-n32} mips64r2" |
| 43 | BASE_LIB:tune-mips64r2el-n32 = "lib32" | 48 | BASE_LIB:tune-mips64r2el-n32 = "lib32" |
| 44 | MIPSPKGSFX_VARIANT:tune-mips64r2el-n32 = "${TUNE_ARCH}" | 49 | MIPSPKGSFX_VARIANT:tune-mips64r2el-n32 = "${TUNE_ARCH}" |
| 45 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-n32 = "mips64el-n32 mips64r2el-n32" | 50 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-n32 = "mips64el-n32 mips64r2el-n32" |
| 51 | QEMU_EXTRAOPTIONS_mips64r2el-n32 = " -cpu MIPS64R2-generic" | ||
| 46 | 52 | ||
| 47 | # MIPS 64r2 n32 and Soft Float | 53 | # MIPS 64r2 n32 and Soft Float |
| 48 | AVAILTUNES += "mips64r2-nf-n32 mips64r2el-nf-n32" | 54 | AVAILTUNES += "mips64r2-nf-n32 mips64r2el-nf-n32" |
| @@ -51,11 +57,13 @@ TUNE_FEATURES:tune-mips64r2-nf-n32 = "${TUNE_FEATURES:tune-mips64-nf-n32} mips64 | |||
| 51 | BASE_LIB:tune-mips64r2-nf-n32 = "lib32" | 57 | BASE_LIB:tune-mips64r2-nf-n32 = "lib32" |
| 52 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf-n32 = "${TUNE_ARCH}" | 58 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf-n32 = "${TUNE_ARCH}" |
| 53 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-n32 = "mips64-nf-n32 mips64r2-nf-n32" | 59 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-n32 = "mips64-nf-n32 mips64r2-nf-n32" |
| 60 | QEMU_EXTRAOPTIONS_mips64r2-nf-n32 = " -cpu MIPS64R2-generic" | ||
| 54 | 61 | ||
| 55 | TUNE_FEATURES:tune-mips64r2el-nf-n32 = "${TUNE_FEATURES:tune-mips64el-nf-n32} mips64r2" | 62 | TUNE_FEATURES:tune-mips64r2el-nf-n32 = "${TUNE_FEATURES:tune-mips64el-nf-n32} mips64r2" |
| 56 | BASE_LIB:tune-mips64r2el-nf-n32 = "lib32" | 63 | BASE_LIB:tune-mips64r2el-nf-n32 = "lib32" |
| 57 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-n32 = "${TUNE_ARCH}" | 64 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-n32 = "${TUNE_ARCH}" |
| 58 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-n32 = "mips64el-nf-n32 mips64r2el-nf-n32" | 65 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-n32 = "mips64el-nf-n32 mips64r2el-nf-n32" |
| 66 | QEMU_EXTRAOPTIONS_mips64r2el-nf-32 = " -cpu MIPS64R2-generic" | ||
| 59 | 67 | ||
| 60 | # MIPS 64r2 o32 | 68 | # MIPS 64r2 o32 |
| 61 | AVAILTUNES += "mips64r2-o32 mips64r2el-o32" | 69 | AVAILTUNES += "mips64r2-o32 mips64r2el-o32" |
| @@ -64,11 +72,13 @@ TUNE_FEATURES:tune-mips64r2-o32 = "${TUNE_FEATURES:tune-mips64-o32} mips64r2" | |||
| 64 | BASE_LIB:tune-mips64r2-o32 = "lib" | 72 | BASE_LIB:tune-mips64r2-o32 = "lib" |
| 65 | MIPSPKGSFX_VARIANT:tune-mips64r2-o32 = "${TUNE_ARCH}" | 73 | MIPSPKGSFX_VARIANT:tune-mips64r2-o32 = "${TUNE_ARCH}" |
| 66 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-o32 = "mips mips64-o32 mips64r2-o32" | 74 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-o32 = "mips mips64-o32 mips64r2-o32" |
| 75 | QEMU_EXTRAOPTIONS_mips64r2-o32 = " -cpu MIPS64R2-generic" | ||
| 67 | 76 | ||
| 68 | TUNE_FEATURES:tune-mips64r2el-o32 = "${TUNE_FEATURES:tune-mips64el-o32} mips64r2" | 77 | TUNE_FEATURES:tune-mips64r2el-o32 = "${TUNE_FEATURES:tune-mips64el-o32} mips64r2" |
| 69 | BASE_LIB:tune-mips64r2el-o32 = "lib" | 78 | BASE_LIB:tune-mips64r2el-o32 = "lib" |
| 70 | MIPSPKGSFX_VARIANT:tune-mips64r2el-o32 = "${TUNE_ARCH}" | 79 | MIPSPKGSFX_VARIANT:tune-mips64r2el-o32 = "${TUNE_ARCH}" |
| 71 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-o32 = "mipsel mips64el-o32 mips64r2el-o32" | 80 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-o32 = "mipsel mips64el-o32 mips64r2el-o32" |
| 81 | QEMU_EXTRAOPTIONS_mips64r2el-o32 = " -cpu MIPS64R2-generic" | ||
| 72 | 82 | ||
| 73 | # MIPS 64r2 o32 and Soft Float | 83 | # MIPS 64r2 o32 and Soft Float |
| 74 | AVAILTUNES += "mips64r2-nf-o32 mips64r2el-nf-o32" | 84 | AVAILTUNES += "mips64r2-nf-o32 mips64r2el-nf-o32" |
| @@ -77,8 +87,10 @@ TUNE_FEATURES:tune-mips64r2-nf-o32 = "${TUNE_FEATURES:tune-mips64-nf-o32} mips64 | |||
| 77 | BASE_LIB:tune-mips64r2-nf-o32 = "lib" | 87 | BASE_LIB:tune-mips64r2-nf-o32 = "lib" |
| 78 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf-o32 = "${TUNE_ARCH}" | 88 | MIPSPKGSFX_VARIANT:tune-mips64r2-nf-o32 = "${TUNE_ARCH}" |
| 79 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-o32 = "mips-nf mips64r2-nf-o32" | 89 | PACKAGE_EXTRA_ARCHS:tune-mips64r2-nf-o32 = "mips-nf mips64r2-nf-o32" |
| 90 | QEMU_EXTRAOPTIONS_mips64r2-nf-o32 = " -cpu MIPS64R2-generic" | ||
| 80 | 91 | ||
| 81 | TUNE_FEATURES:tune-mips64r2el-nf-o32 = "${TUNE_FEATURES:tune-mips64el-nf-o32} mips64r2" | 92 | TUNE_FEATURES:tune-mips64r2el-nf-o32 = "${TUNE_FEATURES:tune-mips64el-nf-o32} mips64r2" |
| 82 | BASE_LIB:tune-mips64r2el-nf-o32 = "lib" | 93 | BASE_LIB:tune-mips64r2el-nf-o32 = "lib" |
| 83 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-o32 = "${TUNE_ARCH}" | 94 | MIPSPKGSFX_VARIANT:tune-mips64r2el-nf-o32 = "${TUNE_ARCH}" |
| 84 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-o32 = "mipsel-nf mips64r2el-nf-o32" | 95 | PACKAGE_EXTRA_ARCHS:tune-mips64r2el-nf-o32 = "mipsel-nf mips64r2el-nf-o32" |
| 96 | QEMU_EXTRAOPTIONS_mips64r2el-nf-o32 = " -cpu MIPS64R2-generic" | ||
