summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2016-07-26 16:49:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:11 +0100
commit1ebec491aac49020b58d885a89ef8a9d33b0daf5 (patch)
tree111e877fee1e329a3524efa85824557ba3d4d501
parentb004e3aef97ca65349dd72e6a12a927f21297a18 (diff)
downloadpoky-1ebec491aac49020b58d885a89ef8a9d33b0daf5.tar.gz
tune-mips-24k: add QEMU_EXTRAOPTIONS for DSP and MIPS16e cores
The core emulated by default by qemu-mips(el) just crashes with illegal instruction when encountering DSP and/or MIPS16e instructions - we have to specify a CPU that supports the extra instructions. This is an issue when generating a rootfs and e.g. running some of the package postinstall scriptlets. The patch to qemu to add 24KEc as a CPU has been accepted upstream, so let's use that CPU here as well as needed. (From OE-Core rev: 8af17075f56241dd8f3ea86c609adbd73f248218) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/mips/tune-mips-24k.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/conf/machine/include/mips/tune-mips-24k.inc b/meta/conf/machine/include/mips/tune-mips-24k.inc
index 154ab56990..828acd42e3 100644
--- a/meta/conf/machine/include/mips/tune-mips-24k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-24k.inc
@@ -22,12 +22,15 @@ TUNE_FEATURES_tune-mips32r2-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2-24kec} mi
22 22
23MIPSPKGSFX_VARIANT_tune-mips32r2-24kc = "mips32r2-24kc" 23MIPSPKGSFX_VARIANT_tune-mips32r2-24kc = "mips32r2-24kc"
24PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-24kc-nf" 24PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-24kc-nf"
25QEMU_EXTRAOPTIONS_mips32r2-24kc-nf = " -cpu 24Kc"
25 26
26MIPSPKGSFX_VARIANT_tune-mips32r2-24kec = "mips32r2-24kec" 27MIPSPKGSFX_VARIANT_tune-mips32r2-24kec = "mips32r2-24kec"
27PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc} mips32r2-24kec-nf" 28PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kc} mips32r2-24kec-nf"
29QEMU_EXTRAOPTIONS_mips32r2-24kec-nf = " -cpu 24KEc"
28 30
29MIPSPKGSFX_VARIANT_tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}" 31MIPSPKGSFX_VARIANT_tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}"
30PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec} mips32r2-24kec-m16-nf" 32PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-24kec} mips32r2-24kec-m16-nf"
33QEMU_EXTRAOPTIONS_mips32r2-24kec-m16-nf = " -cpu 24KEc"
31 34
32 35
33# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16 36# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16
@@ -37,9 +40,12 @@ TUNE_FEATURES_tune-mips32r2el-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2el-24kec
37 40
38MIPSPKGSFX_VARIANT_tune-mips32r2el-24kc = "mips32r2el-24kc" 41MIPSPKGSFX_VARIANT_tune-mips32r2el-24kc = "mips32r2el-24kc"
39PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-24kc-nf" 42PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-24kc-nf"
43QEMU_EXTRAOPTIONS_mips32r2el-24kc-nf = " -cpu 24Kc"
40 44
41MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec = "mips32r2el-24kec" 45MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec = "mips32r2el-24kec"
42PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc} mips32r2el-24kec-nf" 46PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kc} mips32r2el-24kec-nf"
47QEMU_EXTRAOPTIONS_mips32r2el-24kec-nf = " -cpu 24KEc"
43 48
44MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}" 49MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}"
45PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec} mips32r2el-24kec-m16-nf" 50PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-24kec} mips32r2el-24kec-m16-nf"
51QEMU_EXTRAOPTIONS_mips32r2el-24kec-m16-nf = " -cpu 24KEc"