diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2020-02-07 18:31:37 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2020-02-10 20:21:09 -0800 |
| commit | 06d46fd55343516fc079bec688c993a5382cd0d3 (patch) | |
| tree | d0d5902fa78653923474ab3d1de6b346eb046d81 /meta-xilinx-bsp | |
| parent | fb62f071f94fc45444357865665fec6d4b11d1ca (diff) | |
| download | meta-xilinx-06d46fd55343516fc079bec688c993a5382cd0d3.tar.gz | |
microblaze-tc: Minor update and corrections
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/microblaze-tc.conf | 67 |
1 files changed, 32 insertions, 35 deletions
diff --git a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf index ce1c81a8..081dd4e8 100644 --- a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf +++ b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf | |||
| @@ -12,25 +12,24 @@ TARGET_LINK_HASH_STYLE = "" | |||
| 12 | # Define all of the multilibs supproted by this configuration | 12 | # Define all of the multilibs supproted by this configuration |
| 13 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" | 13 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" |
| 14 | 14 | ||
| 15 | MULTILIBS += "multilib:libbs" | 15 | MULTILIBS += "multilib:libmbbs" |
| 16 | MULTILIBS += "multilib:lible" | 16 | MULTILIBS += "multilib:libmble" |
| 17 | # Can't be 'libm...' or failures happen | ||
| 18 | MULTILIBS += "multilib:libmbm" | 17 | MULTILIBS += "multilib:libmbm" |
| 19 | MULTILIBS += "multilib:libmbmmh" | 18 | MULTILIBS += "multilib:libmbmmh" |
| 19 | MULTILIBS += "multilib:libmblem" | ||
| 20 | MULTILIBS += "multilib:libmblemmh" | ||
| 21 | MULTILIBS += "multilib:libmbbsle" | ||
| 22 | MULTILIBS += "multilib:libmbbsm" | ||
| 23 | MULTILIBS += "multilib:libmbbsmmh" | ||
| 24 | MULTILIBS += "multilib:libmbbslem" | ||
| 25 | MULTILIBS += "multilib:libmbbslemmh" | ||
| 26 | MULTILIBS += "multilib:libmbm64le" | ||
| 27 | MULTILIBS += "multilib:libmbm64lem" | ||
| 28 | MULTILIBS += "multilib:libmbm64lemmh" | ||
| 29 | MULTILIBS += "multilib:libmbm64bsle" | ||
| 30 | MULTILIBS += "multilib:libmbm64bslem" | ||
| 31 | MULTILIBS += "multilib:libmbm64bslemmh" | ||
| 20 | 32 | ||
| 21 | MULTILIBS += "multilib:liblem" | ||
| 22 | MULTILIBS += "multilib:liblemmh" | ||
| 23 | MULTILIBS += "multilib:libbsle" | ||
| 24 | MULTILIBS += "multilib:libbsm" | ||
| 25 | MULTILIBS += "multilib:libbsmmh" | ||
| 26 | MULTILIBS += "multilib:libbslem" | ||
| 27 | MULTILIBS += "multilib:libbslemmh" | ||
| 28 | MULTILIBS += "multilib:lib64le" | ||
| 29 | MULTILIBS += "multilib:lib64lem" | ||
| 30 | MULTILIBS += "multilib:lib64lemmh" | ||
| 31 | MULTILIBS += "multilib:lib64bsle" | ||
| 32 | MULTILIBS += "multilib:lib64bslem" | ||
| 33 | MULTILIBS += "multilib:lib64bslemmh" | ||
| 34 | 33 | ||
| 35 | # Base configuration | 34 | # Base configuration |
| 36 | # CFLAGS: | 35 | # CFLAGS: |
| @@ -44,7 +43,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" | |||
| 44 | 43 | ||
| 45 | # bs | 44 | # bs |
| 46 | # CFLAGS: -mxl-barrel-shift | 45 | # CFLAGS: -mxl-barrel-shift |
| 47 | DEFAULTTUNE_virtclass-multilib-libbs = "microblazebs" | 46 | DEFAULTTUNE_virtclass-multilib-libmbbs = "microblazebs" |
| 48 | 47 | ||
| 49 | AVAILTUNES += "microblazebs" | 48 | AVAILTUNES += "microblazebs" |
| 50 | BASE_LIB_tune-microblazebs = "lib/bs" | 49 | BASE_LIB_tune-microblazebs = "lib/bs" |
| @@ -54,7 +53,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebs = "${TUNE_PKGARCH}" | |||
| 54 | 53 | ||
| 55 | # le | 54 | # le |
| 56 | # CFLAGS: -mlittle-endian | 55 | # CFLAGS: -mlittle-endian |
| 57 | DEFAULTTUNE_virtclass-multilib-lible = "microblazele" | 56 | DEFAULTTUNE_virtclass-multilib-libmble = "microblazele" |
| 58 | 57 | ||
| 59 | AVAILTUNES += "microblazele" | 58 | AVAILTUNES += "microblazele" |
| 60 | BASE_LIB_tune-microblazele = "lib/le" | 59 | BASE_LIB_tune-microblazele = "lib/le" |
| @@ -64,7 +63,6 @@ PACKAGE_EXTRA_ARCHS_tune-microblazele = "${TUNE_PKGARCH}" | |||
| 64 | 63 | ||
| 65 | # m | 64 | # m |
| 66 | # CFLAGS: -mno-xl-soft-mul | 65 | # CFLAGS: -mno-xl-soft-mul |
| 67 | # Can't be 'libm...' or failures happen | ||
| 68 | DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem" | 66 | DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem" |
| 69 | 67 | ||
| 70 | AVAILTUNES += "microblazem" | 68 | AVAILTUNES += "microblazem" |
| @@ -75,7 +73,6 @@ PACKAGE_EXTRA_ARCHS_tune-microblazem = "${TUNE_PKGARCH}" | |||
| 75 | 73 | ||
| 76 | # m/mh | 74 | # m/mh |
| 77 | # CFLAGS: -mno-xl-soft-mul -mxl-multiply-high | 75 | # CFLAGS: -mno-xl-soft-mul -mxl-multiply-high |
| 78 | # Can't be 'libm...' or failures happen | ||
| 79 | DEFAULTTUNE_virtclass-multilib-libmbmmh = "microblazemmh" | 76 | DEFAULTTUNE_virtclass-multilib-libmbmmh = "microblazemmh" |
| 80 | 77 | ||
| 81 | AVAILTUNES += "microblazemmh" | 78 | AVAILTUNES += "microblazemmh" |
| @@ -86,7 +83,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazemmh = "${TUNE_PKGARCH}" | |||
| 86 | 83 | ||
| 87 | # le/m | 84 | # le/m |
| 88 | # CFLAGS: -mlittle-endian -mno-xl-soft-mul | 85 | # CFLAGS: -mlittle-endian -mno-xl-soft-mul |
| 89 | DEFAULTTUNE_virtclass-multilib-liblem = "microblazelem" | 86 | DEFAULTTUNE_virtclass-multilib-libmblem = "microblazelem" |
| 90 | 87 | ||
| 91 | AVAILTUNES += "microblazelem" | 88 | AVAILTUNES += "microblazelem" |
| 92 | BASE_LIB_tune-microblazelem = "lib/le/m" | 89 | BASE_LIB_tune-microblazelem = "lib/le/m" |
| @@ -96,7 +93,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazelem = "${TUNE_PKGARCH}" | |||
| 96 | 93 | ||
| 97 | # le/m/mh | 94 | # le/m/mh |
| 98 | # CFLAGS: -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high | 95 | # CFLAGS: -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high |
| 99 | DEFAULTTUNE_virtclass-multilib-liblemmh = "microblazelemmh" | 96 | DEFAULTTUNE_virtclass-multilib-libmblemmh = "microblazelemmh" |
| 100 | 97 | ||
| 101 | AVAILTUNES += "microblazelemmh" | 98 | AVAILTUNES += "microblazelemmh" |
| 102 | BASE_LIB_tune-microblazelemmh = "lib/le/m/mh" | 99 | BASE_LIB_tune-microblazelemmh = "lib/le/m/mh" |
| @@ -106,16 +103,17 @@ PACKAGE_EXTRA_ARCHS_tune-microblazelemmh = "${TUNE_PKGARCH}" | |||
| 106 | 103 | ||
| 107 | # bs/le | 104 | # bs/le |
| 108 | # CFLAGS: -mxl-barrel-shift -mlittle-endian | 105 | # CFLAGS: -mxl-barrel-shift -mlittle-endian |
| 109 | DEFAULTTUNE_virtclass-multilib-libbsle = "microblazebsle" | 106 | DEFAULTTUNE_virtclass-multilib-libmbbsle = "microblazebsle" |
| 110 | 107 | ||
| 111 | AVAILTUNES += "microblazebsle" | 108 | AVAILTUNES += "microblazebsle" |
| 112 | BASE_LIB_tune-microblazebsle = "lib/bs/le" | 109 | BASE_LIB_tune-microblazebsle = "lib/bs/le" |
| 113 | TUNE_FEATURES_tune-microblazebsle = "microblaze bigendian barrel-shift" | 110 | TUNE_FEATURES_tune-microblazebsle = "microblaze barrel-shift" |
| 114 | PACKAGE_EXTRA_ARCHS_tune-microblazebsle = "${TUNE_PKGARCH}" | 111 | PACKAGE_EXTRA_ARCHS_tune-microblazebsle = "${TUNE_PKGARCH}" |
| 115 | 112 | ||
| 113 | |||
| 116 | # bs/m | 114 | # bs/m |
| 117 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul | 115 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul |
| 118 | DEFAULTTUNE_virtclass-multilib-libbsm = "microblazebsm" | 116 | DEFAULTTUNE_virtclass-multilib-libmbbsm = "microblazebsm" |
| 119 | 117 | ||
| 120 | AVAILTUNES += "microblazebsm" | 118 | AVAILTUNES += "microblazebsm" |
| 121 | BASE_LIB_tune-microblazebsm = "lib/bs/m" | 119 | BASE_LIB_tune-microblazebsm = "lib/bs/m" |
| @@ -125,7 +123,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebsm = "${TUNE_PKGARCH}" | |||
| 125 | 123 | ||
| 126 | # bs/m/mh | 124 | # bs/m/mh |
| 127 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mxl-multiply-high | 125 | # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mxl-multiply-high |
| 128 | DEFAULTTUNE_virtclass-multilib-libbsmmh = "microblazebsmmh" | 126 | DEFAULTTUNE_virtclass-multilib-libmbbsmmh = "microblazebsmmh" |
| 129 | 127 | ||
| 130 | AVAILTUNES += "microblazebsmmh" | 128 | AVAILTUNES += "microblazebsmmh" |
| 131 | BASE_LIB_tune-microblazebsmmh = "lib/bs/m/mh" | 129 | BASE_LIB_tune-microblazebsmmh = "lib/bs/m/mh" |
| @@ -135,7 +133,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebsmmh = "${TUNE_PKGARCH}" | |||
| 135 | 133 | ||
| 136 | # bs/le/m | 134 | # bs/le/m |
| 137 | # CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul | 135 | # CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul |
| 138 | DEFAULTTUNE_virtclass-multilib-libbslem = "microblazebslem" | 136 | DEFAULTTUNE_virtclass-multilib-libmbbslem = "microblazebslem" |
| 139 | 137 | ||
| 140 | AVAILTUNES += "microblazebslem" | 138 | AVAILTUNES += "microblazebslem" |
| 141 | BASE_LIB_tune-microblazebslem = "lib/bs/le/m" | 139 | BASE_LIB_tune-microblazebslem = "lib/bs/le/m" |
| @@ -145,7 +143,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebslem = "${TUNE_PKGARCH}" | |||
| 145 | 143 | ||
| 146 | # bs/le/m/mh | 144 | # bs/le/m/mh |
| 147 | # CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high | 145 | # CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high |
| 148 | DEFAULTTUNE_virtclass-multilib-libbslemmh = "microblazebslemmh" | 146 | DEFAULTTUNE_virtclass-multilib-libmbbslemmh = "microblazebslemmh" |
| 149 | 147 | ||
| 150 | AVAILTUNES += "microblazebslemmh" | 148 | AVAILTUNES += "microblazebslemmh" |
| 151 | BASE_LIB_tune-microblazebslemmh = "lib/bs/le/m/mh" | 149 | BASE_LIB_tune-microblazebslemmh = "lib/bs/le/m/mh" |
| @@ -155,7 +153,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebslemmh = "${TUNE_PKGARCH}" | |||
| 155 | 153 | ||
| 156 | # m64/le | 154 | # m64/le |
| 157 | # CFLAGS: -m64 -mlittle-endian | 155 | # CFLAGS: -m64 -mlittle-endian |
| 158 | DEFAULTTUNE_virtclass-multilib-lib64le = "microblaze64le" | 156 | DEFAULTTUNE_virtclass-multilib-libmbm64le = "microblaze64le" |
| 159 | 157 | ||
| 160 | AVAILTUNES += "microblaze64le" | 158 | AVAILTUNES += "microblaze64le" |
| 161 | BASE_LIB_tune-microblaze64le = "lib/m64/le" | 159 | BASE_LIB_tune-microblaze64le = "lib/m64/le" |
| @@ -165,7 +163,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64le = "${TUNE_PKGARCH}" | |||
| 165 | 163 | ||
| 166 | # m64/le/m | 164 | # m64/le/m |
| 167 | # CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul | 165 | # CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul |
| 168 | DEFAULTTUNE_virtclass-multilib-lib64lem = "microblaze64lem" | 166 | DEFAULTTUNE_virtclass-multilib-libmbm64lem = "microblaze64lem" |
| 169 | 167 | ||
| 170 | AVAILTUNES += "microblaze64lem" | 168 | AVAILTUNES += "microblaze64lem" |
| 171 | BASE_LIB_tune-microblaze64lem = "lib/m64/le/m" | 169 | BASE_LIB_tune-microblaze64lem = "lib/m64/le/m" |
| @@ -175,7 +173,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64lem = "${TUNE_PKGARCH}" | |||
| 175 | 173 | ||
| 176 | # m64/le/m/mh | 174 | # m64/le/m/mh |
| 177 | # CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high | 175 | # CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high |
| 178 | DEFAULTTUNE_virtclass-multilib-lib64lemmh = "microblaze64lemmh" | 176 | DEFAULTTUNE_virtclass-multilib-libmbm64lemmh = "microblaze64lemmh" |
| 179 | 177 | ||
| 180 | AVAILTUNES += "microblaze64lemmh" | 178 | AVAILTUNES += "microblaze64lemmh" |
| 181 | BASE_LIB_tune-microblaze64lemmh = "lib/m64/le/m/mh" | 179 | BASE_LIB_tune-microblaze64lemmh = "lib/m64/le/m/mh" |
| @@ -185,7 +183,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64lemmh = "${TUNE_PKGARCH}" | |||
| 185 | 183 | ||
| 186 | # m64/bs/le | 184 | # m64/bs/le |
| 187 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian | 185 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian |
| 188 | DEFAULTTUNE_virtclass-multilib-lib64bsle = "microblaze64bsle" | 186 | DEFAULTTUNE_virtclass-multilib-libmbm64bsle = "microblaze64bsle" |
| 189 | 187 | ||
| 190 | AVAILTUNES += "microblaze64bsle" | 188 | AVAILTUNES += "microblaze64bsle" |
| 191 | BASE_LIB_tune-microblaze64bsle = "lib/m64/bs/le" | 189 | BASE_LIB_tune-microblaze64bsle = "lib/m64/bs/le" |
| @@ -195,7 +193,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64bsle = "${TUNE_PKGARCH}" | |||
| 195 | 193 | ||
| 196 | # m64/bs/le/m | 194 | # m64/bs/le/m |
| 197 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul | 195 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul |
| 198 | DEFAULTTUNE_virtclass-multilib-lib64bslem = "microblaze64bslem" | 196 | DEFAULTTUNE_virtclass-multilib-libmbm64bslem = "microblaze64bslem" |
| 199 | 197 | ||
| 200 | AVAILTUNES += "microblaze64bslem" | 198 | AVAILTUNES += "microblaze64bslem" |
| 201 | BASE_LIB_tune-microblaze64bslem = "lib/m64/bs/le/m" | 199 | BASE_LIB_tune-microblaze64bslem = "lib/m64/bs/le/m" |
| @@ -205,10 +203,9 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64bslem = "${TUNE_PKGARCH}" | |||
| 205 | 203 | ||
| 206 | # m64/bs/le/m/mh | 204 | # m64/bs/le/m/mh |
| 207 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high | 205 | # CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high |
| 208 | DEFAULTTUNE_virtclass-multilib-lib64bslemmh = "microblaze64bslemmh" | 206 | DEFAULTTUNE_virtclass-multilib-libmbm64bslemmh = "microblaze64bslemmh" |
| 209 | 207 | ||
| 210 | AVAILTUNES += "microblaze64bslemmh" | 208 | AVAILTUNES += "microblaze64bslemmh" |
| 211 | BASE_LIB_tune-microblaze64bslemmh = "lib/m64/bs/le/m/mh" | 209 | BASE_LIB_tune-microblaze64bslemmh = "lib/m64/bs/le/m/mh" |
| 212 | TUNE_FEATURES_tune-microblaze64bslemmh = "microblaze 64-bit barrel-shift multiply-high" | 210 | TUNE_FEATURES_tune-microblaze64bslemmh = "microblaze 64-bit barrel-shift multiply-high" |
| 213 | PACKAGE_EXTRA_ARCHS_tune-microblaze64bslemmh = "${TUNE_PKGARCH}" | 211 | PACKAGE_EXTRA_ARCHS_tune-microblaze64bslemmh = "${TUNE_PKGARCH}" |
| 214 | |||
