summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/mips
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/conf/machine/include/mips
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/mips')
-rw-r--r--meta/conf/machine/include/mips/README4
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc154
-rw-r--r--meta/conf/machine/include/mips/tune-mips-24k.inc36
-rw-r--r--meta/conf/machine/include/mips/tune-mips-74k.inc24
4 files changed, 109 insertions, 109 deletions
diff --git a/meta/conf/machine/include/mips/README b/meta/conf/machine/include/mips/README
index f36e87b45a..77448c5190 100644
--- a/meta/conf/machine/include/mips/README
+++ b/meta/conf/machine/include/mips/README
@@ -23,7 +23,7 @@ scheme. The scheme is: <mips variant>[-nf][-n32]
23 23
24TUNE_PKGARCH is defined as: 24TUNE_PKGARCH is defined as:
25 25
26${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI} 26${MIPSPKGSFX_VARIANT:tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}
27 27
28The following is a list of MIPS specific variables: 28The following is a list of MIPS specific variables:
29 29
@@ -35,7 +35,7 @@ defined as "el".
35MIPSPKGSFX_ENDIAN2 - For bigendian hardware this is "eb", otherwise it's 35MIPSPKGSFX_ENDIAN2 - For bigendian hardware this is "eb", otherwise it's
36defined as "el". 36defined as "el".
37 37
38MIPSPKGSFX_VARIANT_tune-<tune> - In the default tunings it is set to the 38MIPSPKGSFX_VARIANT:tune-<tune> - In the default tunings it is set to the
39same value as TUNE_ARCH. In custom, optimized tunings, the value should 39same value as TUNE_ARCH. In custom, optimized tunings, the value should
40be modified to more precisely describe the tuning. 40be modified to more precisely describe the tuning.
41 41
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index cb1a4c443c..e48ddd2d6b 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -21,7 +21,7 @@ ABIEXTENSION .= "${@bb.utils.filter('TUNE_FEATURES', 'n32', d)}"
21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}" 21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'n32', ' -mabi=n32', '', d)}"
22 22
23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture" 23# user mode qemu doesn't support mips64 n32: "Invalid ELF image for this architecture"
24MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}" 24MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'n32', 'qemu-usermode', '', d)}"
25 25
26TUNEVALID[n64] = "MIPS64 n64 ABI" 26TUNEVALID[n64] = "MIPS64 n64 ABI"
27TUNECONFLICTS[n64] = "o32 n32" 27TUNECONFLICTS[n64] = "o32 n32"
@@ -49,7 +49,7 @@ MIPSPKGSFX_64R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', 'isa', '
49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}" 49MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32', '', d)}"
50 50
51TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}" 51TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}"
52TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}" 52TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT:tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
53 53
54# Various Global Machine Overrides 54# Various Global Machine Overrides
55MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64${MIPSPKGSFX_ENDIAN2}:', '', d)}" 55MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarchn64${MIPSPKGSFX_ENDIAN2}:', '', d)}"
@@ -64,88 +64,88 @@ MACHINEOVERRIDES =. "mipsarch:"
64 64
65# Base tunes 65# Base tunes
66AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf" 66AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf"
67TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard" 67TUNE_FEATURES:tune-mips = "o32 bigendian fpu-hard"
68BASE_LIB_tune-mips = "lib" 68BASE_LIB:tune-mips = "lib"
69MIPSPKGSFX_VARIANT_tune-mips = "${TUNE_ARCH}" 69MIPSPKGSFX_VARIANT:tune-mips = "${TUNE_ARCH}"
70PACKAGE_EXTRA_ARCHS_tune-mips = "mips" 70PACKAGE_EXTRA_ARCHS:tune-mips = "mips"
71 71
72TUNE_FEATURES_tune-mips64-n32 = "n32 bigendian fpu-hard" 72TUNE_FEATURES:tune-mips64-n32 = "n32 bigendian fpu-hard"
73BASE_LIB_tune-mips64-n32 = "lib32" 73BASE_LIB:tune-mips64-n32 = "lib32"
74MIPSPKGSFX_VARIANT_tune-mips64-n32 = "${TUNE_ARCH}" 74MIPSPKGSFX_VARIANT:tune-mips64-n32 = "${TUNE_ARCH}"
75PACKAGE_EXTRA_ARCHS_tune-mips64-n32 = "mips64-n32" 75PACKAGE_EXTRA_ARCHS:tune-mips64-n32 = "mips64-n32"
76 76
77TUNE_FEATURES_tune-mips64 = "n64 bigendian fpu-hard" 77TUNE_FEATURES:tune-mips64 = "n64 bigendian fpu-hard"
78BASE_LIB_tune-mips64 = "lib64" 78BASE_LIB:tune-mips64 = "lib64"
79MIPSPKGSFX_VARIANT_tune-mips64 = "${TUNE_ARCH}" 79MIPSPKGSFX_VARIANT:tune-mips64 = "${TUNE_ARCH}"
80PACKAGE_EXTRA_ARCHS_tune-mips64 = "mips64" 80PACKAGE_EXTRA_ARCHS:tune-mips64 = "mips64"
81 81
82TUNE_FEATURES_tune-mipsel = "o32 fpu-hard" 82TUNE_FEATURES:tune-mipsel = "o32 fpu-hard"
83BASE_LIB_tune-mipsel = "lib" 83BASE_LIB:tune-mipsel = "lib"
84MIPSPKGSFX_VARIANT_tune-mipsel = "${TUNE_ARCH}" 84MIPSPKGSFX_VARIANT:tune-mipsel = "${TUNE_ARCH}"
85PACKAGE_EXTRA_ARCHS_tune-mipsel = "mipsel" 85PACKAGE_EXTRA_ARCHS:tune-mipsel = "mipsel"
86 86
87TUNE_FEATURES_tune-mips64el-n32 = "n32 fpu-hard" 87TUNE_FEATURES:tune-mips64el-n32 = "n32 fpu-hard"
88BASE_LIB_tune-mips64el-n32 = "lib32" 88BASE_LIB:tune-mips64el-n32 = "lib32"
89MIPSPKGSFX_VARIANT_tune-mips64el-n32 = "${TUNE_ARCH}" 89MIPSPKGSFX_VARIANT:tune-mips64el-n32 = "${TUNE_ARCH}"
90PACKAGE_EXTRA_ARCHS_tune-mips64el-n32 = "mips64el-n32" 90PACKAGE_EXTRA_ARCHS:tune-mips64el-n32 = "mips64el-n32"
91 91
92TUNE_FEATURES_tune-mips64el = "n64 fpu-hard" 92TUNE_FEATURES:tune-mips64el = "n64 fpu-hard"
93BASE_LIB_tune-mips64el = "lib64" 93BASE_LIB:tune-mips64el = "lib64"
94MIPSPKGSFX_VARIANT_tune-mips64el = "${TUNE_ARCH}" 94MIPSPKGSFX_VARIANT:tune-mips64el = "${TUNE_ARCH}"
95PACKAGE_EXTRA_ARCHS_tune-mips64el = "mips64el" 95PACKAGE_EXTRA_ARCHS:tune-mips64el = "mips64el"
96 96
97TUNE_FEATURES_tune-mips-nf = "o32 bigendian" 97TUNE_FEATURES:tune-mips-nf = "o32 bigendian"
98BASE_LIB_tune-mips-nf = "lib" 98BASE_LIB:tune-mips-nf = "lib"
99MIPSPKGSFX_VARIANT_tune-mips-nf = "${TUNE_ARCH}" 99MIPSPKGSFX_VARIANT:tune-mips-nf = "${TUNE_ARCH}"
100PACKAGE_EXTRA_ARCHS_tune-mips-nf = "mips-nf" 100PACKAGE_EXTRA_ARCHS:tune-mips-nf = "mips-nf"
101 101
102TUNE_FEATURES_tune-mips64-nf-n32 = "n32 bigendian" 102TUNE_FEATURES:tune-mips64-nf-n32 = "n32 bigendian"
103BASE_LIB_tune-mips64-nf-n32 = "lib32" 103BASE_LIB:tune-mips64-nf-n32 = "lib32"
104MIPSPKGSFX_VARIANT_tune-mips64-nf-n32 = "${TUNE_ARCH}" 104MIPSPKGSFX_VARIANT:tune-mips64-nf-n32 = "${TUNE_ARCH}"
105PACKAGE_EXTRA_ARCHS_tune-mips64-nf-n32 = "mips64-nf-n32" 105PACKAGE_EXTRA_ARCHS:tune-mips64-nf-n32 = "mips64-nf-n32"
106 106
107TUNE_FEATURES_tune-mips64-nf = "n64 bigendian" 107TUNE_FEATURES:tune-mips64-nf = "n64 bigendian"
108BASE_LIB_tune-mips64-nf = "lib64" 108BASE_LIB:tune-mips64-nf = "lib64"
109MIPSPKGSFX_VARIANT_tune-mips64-nf = "${TUNE_ARCH}" 109MIPSPKGSFX_VARIANT:tune-mips64-nf = "${TUNE_ARCH}"
110PACKAGE_EXTRA_ARCHS_tune-mips64-nf = "mips64-nf" 110PACKAGE_EXTRA_ARCHS:tune-mips64-nf = "mips64-nf"
111 111
112TUNE_FEATURES_tune-mipsel-nf = "o32" 112TUNE_FEATURES:tune-mipsel-nf = "o32"
113BASE_LIB_tune-mipsel-nf = "lib" 113BASE_LIB:tune-mipsel-nf = "lib"
114MIPSPKGSFX_VARIANT_tune-mipsel-nf = "${TUNE_ARCH}" 114MIPSPKGSFX_VARIANT:tune-mipsel-nf = "${TUNE_ARCH}"
115PACKAGE_EXTRA_ARCHS_tune-mipsel-nf = "mipsel-nf" 115PACKAGE_EXTRA_ARCHS:tune-mipsel-nf = "mipsel-nf"
116 116
117TUNE_FEATURES_tune-mips64el-nf-n32 = "n32" 117TUNE_FEATURES:tune-mips64el-nf-n32 = "n32"
118BASE_LIB_tune-mips64el-nf-n32 = "lib32" 118BASE_LIB:tune-mips64el-nf-n32 = "lib32"
119MIPSPKGSFX_VARIANT_tune-mips64el-nf-n32 = "${TUNE_ARCH}" 119MIPSPKGSFX_VARIANT:tune-mips64el-nf-n32 = "${TUNE_ARCH}"
120PACKAGE_EXTRA_ARCHS_tune-mips64el-nf-n32 = "mips64el-nf-n32" 120PACKAGE_EXTRA_ARCHS:tune-mips64el-nf-n32 = "mips64el-nf-n32"
121 121
122TUNE_FEATURES_tune-mips64el-nf = "n64" 122TUNE_FEATURES:tune-mips64el-nf = "n64"
123BASE_LIB_tune-mips64el-nf = "lib64" 123BASE_LIB:tune-mips64el-nf = "lib64"
124MIPSPKGSFX_VARIANT_tune-mips64el-nf = "${TUNE_ARCH}" 124MIPSPKGSFX_VARIANT:tune-mips64el-nf = "${TUNE_ARCH}"
125PACKAGE_EXTRA_ARCHS_tune-mips64el-nf = "mips64el-nf" 125PACKAGE_EXTRA_ARCHS:tune-mips64el-nf = "mips64el-nf"
126 126
127# MIPS 64 + o32 127# MIPS 64 + o32
128AVAILTUNES += "mips64-o32 mips64el-o32" 128AVAILTUNES += "mips64-o32 mips64el-o32"
129 129
130TUNE_FEATURES_tune-mips64-o32 = "o32 bigendian fpu-hard" 130TUNE_FEATURES:tune-mips64-o32 = "o32 bigendian fpu-hard"
131BASE_LIB_tune-mips64-o32 = "lib" 131BASE_LIB:tune-mips64-o32 = "lib"
132MIPSPKGSFX_VARIANT_tune-mips64-o32 = "${TUNE_ARCH}" 132MIPSPKGSFX_VARIANT:tune-mips64-o32 = "${TUNE_ARCH}"
133PACKAGE_EXTRA_ARCHS_tune-mips64-o32 = "mips mips64-o32" 133PACKAGE_EXTRA_ARCHS:tune-mips64-o32 = "mips mips64-o32"
134 134
135TUNE_FEATURES_tune-mips64el-o32 = "o32 fpu-hard" 135TUNE_FEATURES:tune-mips64el-o32 = "o32 fpu-hard"
136BASE_LIB_tune-mips64el-o32 = "lib" 136BASE_LIB:tune-mips64el-o32 = "lib"
137MIPSPKGSFX_VARIANT_tune-mips64el-o32 = "${TUNE_ARCH}" 137MIPSPKGSFX_VARIANT:tune-mips64el-o32 = "${TUNE_ARCH}"
138PACKAGE_EXTRA_ARCHS_tune-mips64el-o32 = "mipsel mips64el-o32" 138PACKAGE_EXTRA_ARCHS:tune-mips64el-o32 = "mipsel mips64el-o32"
139 139
140# MIPS 64 o32 and Soft Float 140# MIPS 64 o32 and Soft Float
141AVAILTUNES += "mips64-nf-o32 mips64el-nf-o32" 141AVAILTUNES += "mips64-nf-o32 mips64el-nf-o32"
142 142
143TUNE_FEATURES_tune-mips64-nf-o32 = "o32 bigendian" 143TUNE_FEATURES:tune-mips64-nf-o32 = "o32 bigendian"
144BASE_LIB_tune-mips64-nf-o32 = "lib" 144BASE_LIB:tune-mips64-nf-o32 = "lib"
145MIPSPKGSFX_VARIANT_tune-mips64-nf-o32 = "${TUNE_ARCH}" 145MIPSPKGSFX_VARIANT:tune-mips64-nf-o32 = "${TUNE_ARCH}"
146PACKAGE_EXTRA_ARCHS_tune-mips64-nf-o32 = "mips-nf mips64-nf-o32" 146PACKAGE_EXTRA_ARCHS:tune-mips64-nf-o32 = "mips-nf mips64-nf-o32"
147 147
148TUNE_FEATURES_tune-mips64el-nf-o32 = "o32" 148TUNE_FEATURES:tune-mips64el-nf-o32 = "o32"
149BASE_LIB_tune-mips64el-nf-o32 = "lib" 149BASE_LIB:tune-mips64el-nf-o32 = "lib"
150MIPSPKGSFX_VARIANT_tune-mips64el-nf-o32 = "${TUNE_ARCH}" 150MIPSPKGSFX_VARIANT:tune-mips64el-nf-o32 = "${TUNE_ARCH}"
151PACKAGE_EXTRA_ARCHS_tune-mips64el-nf-o32 = "mipsel-nf mips64el-nf-o32" 151PACKAGE_EXTRA_ARCHS:tune-mips64el-nf-o32 = "mipsel-nf mips64el-nf-o32"
diff --git a/meta/conf/machine/include/mips/tune-mips-24k.inc b/meta/conf/machine/include/mips/tune-mips-24k.inc
index 828acd42e3..ed6566587d 100644
--- a/meta/conf/machine/include/mips/tune-mips-24k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-24k.inc
@@ -16,36 +16,36 @@ AVAILTUNES += "mips32r2-24kc mips32r2-24kec mips32r2-24kec-m16"
16AVAILTUNES += "mips32r2el-24kc mips32r2el-24kec mips32r2el-24kec-m16" 16AVAILTUNES += "mips32r2el-24kc mips32r2el-24kec mips32r2el-24kec-m16"
17 17
18# big endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16 18# big endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16
19TUNE_FEATURES_tune-mips32r2-24kc = "${TUNE_FEATURES_tune-mips32r2-nf} 24kc" 19TUNE_FEATURES:tune-mips32r2-24kc = "${TUNE_FEATURES:tune-mips32r2-nf} 24kc"
20TUNE_FEATURES_tune-mips32r2-24kec = "${TUNE_FEATURES_tune-mips32r2-nf} 24kec" 20TUNE_FEATURES:tune-mips32r2-24kec = "${TUNE_FEATURES:tune-mips32r2-nf} 24kec"
21TUNE_FEATURES_tune-mips32r2-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2-24kec} mips16e" 21TUNE_FEATURES:tune-mips32r2-24kec-m16 = "${TUNE_FEATURES:tune-mips32r2-24kec} mips16e"
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" 25QEMU_EXTRAOPTIONS_mips32r2-24kc-nf = " -cpu 24Kc"
26 26
27MIPSPKGSFX_VARIANT_tune-mips32r2-24kec = "mips32r2-24kec" 27MIPSPKGSFX_VARIANT:tune-mips32r2-24kec = "mips32r2-24kec"
28PACKAGE_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" 29QEMU_EXTRAOPTIONS_mips32r2-24kec-nf = " -cpu 24KEc"
30 30
31MIPSPKGSFX_VARIANT_tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}" 31MIPSPKGSFX_VARIANT:tune-mips32r2-24kec-m16 = "mips32r2-24kec${MIPSPKGSFX_MIPS16E}"
32PACKAGE_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" 33QEMU_EXTRAOPTIONS_mips32r2-24kec-m16-nf = " -cpu 24KEc"
34 34
35 35
36# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16 36# little endian: kc, kc+dsp=kec, kc+dsp+mips16e=kec-m16
37TUNE_FEATURES_tune-mips32r2el-24kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 24kc" 37TUNE_FEATURES:tune-mips32r2el-24kc = "${TUNE_FEATURES:tune-mips32r2el-nf} 24kc"
38TUNE_FEATURES_tune-mips32r2el-24kec = "${TUNE_FEATURES_tune-mips32r2el-nf} 24kec" 38TUNE_FEATURES:tune-mips32r2el-24kec = "${TUNE_FEATURES:tune-mips32r2el-nf} 24kec"
39TUNE_FEATURES_tune-mips32r2el-24kec-m16 = "${TUNE_FEATURES_tune-mips32r2el-24kec} mips16e" 39TUNE_FEATURES:tune-mips32r2el-24kec-m16 = "${TUNE_FEATURES:tune-mips32r2el-24kec} mips16e"
40 40
41MIPSPKGSFX_VARIANT_tune-mips32r2el-24kc = "mips32r2el-24kc" 41MIPSPKGSFX_VARIANT:tune-mips32r2el-24kc = "mips32r2el-24kc"
42PACKAGE_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" 43QEMU_EXTRAOPTIONS_mips32r2el-24kc-nf = " -cpu 24Kc"
44 44
45MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec = "mips32r2el-24kec" 45MIPSPKGSFX_VARIANT:tune-mips32r2el-24kec = "mips32r2el-24kec"
46PACKAGE_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" 47QEMU_EXTRAOPTIONS_mips32r2el-24kec-nf = " -cpu 24KEc"
48 48
49MIPSPKGSFX_VARIANT_tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}" 49MIPSPKGSFX_VARIANT:tune-mips32r2el-24kec-m16 = "mips32r2el-24kec${MIPSPKGSFX_MIPS16E}"
50PACKAGE_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" 51QEMU_EXTRAOPTIONS_mips32r2el-24kec-m16-nf = " -cpu 24KEc"
diff --git a/meta/conf/machine/include/mips/tune-mips-74k.inc b/meta/conf/machine/include/mips/tune-mips-74k.inc
index 94afee34bd..988cfaef6e 100644
--- a/meta/conf/machine/include/mips/tune-mips-74k.inc
+++ b/meta/conf/machine/include/mips/tune-mips-74k.inc
@@ -13,25 +13,25 @@ AVAILTUNES += "mips32r2-74kc mips32r2-74kc-m16"
13AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16" 13AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16"
14 14
15# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 15# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16
16TUNE_FEATURES_tune-mips32r2-74kc = "${TUNE_FEATURES_tune-mips32r2-nf} 74kc" 16TUNE_FEATURES:tune-mips32r2-74kc = "${TUNE_FEATURES:tune-mips32r2-nf} 74kc"
17TUNE_FEATURES_tune-mips32r2-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2-74kc} mips16e" 17TUNE_FEATURES:tune-mips32r2-74kc-m16 = "${TUNE_FEATURES:tune-mips32r2-74kc} mips16e"
18 18
19MIPSPKGSFX_VARIANT_tune-mips32r2-74kc = "mips32r2-74kc" 19MIPSPKGSFX_VARIANT:tune-mips32r2-74kc = "mips32r2-74kc"
20PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-74kc-nf" 20PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-nf} mips32r2-74kc-nf"
21QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc" 21QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc"
22 22
23MIPSPKGSFX_VARIANT_tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}" 23MIPSPKGSFX_VARIANT:tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}"
24PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc} mips32r2-74kc-m16-nf" 24PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2-74kc} mips32r2-74kc-m16-nf"
25QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc" 25QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc"
26 26
27# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 27# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16
28TUNE_FEATURES_tune-mips32r2el-74kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 74kc" 28TUNE_FEATURES:tune-mips32r2el-74kc = "${TUNE_FEATURES:tune-mips32r2el-nf} 74kc"
29TUNE_FEATURES_tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2el-74kc} mips16e" 29TUNE_FEATURES:tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES:tune-mips32r2el-74kc} mips16e"
30 30
31MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc = "mips32r2el-74kc" 31MIPSPKGSFX_VARIANT:tune-mips32r2el-74kc = "mips32r2el-74kc"
32PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-74kc-nf" 32PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-nf} mips32r2el-74kc-nf"
33QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc" 33QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc"
34 34
35MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}" 35MIPSPKGSFX_VARIANT:tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}"
36PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf" 36PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS:tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf"
37QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc" 37QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc"