diff options
author | Mark Hatle <mark.hatle@kernel.crashing.org> | 2020-02-04 15:06:30 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-06 12:16:34 +0000 |
commit | cdcacf26ec95cfa874b2060c059478666956cdca (patch) | |
tree | a720420ff80d92752a53bfe2857f7125ed9d13ab /meta/classes | |
parent | d6b0154a4c1e897d6cd2f815c13ad9d6f34c1355 (diff) | |
download | poky-cdcacf26ec95cfa874b2060c059478666956cdca.tar.gz |
microblaze: Adjust Linux items from microblazeeb to microblaze
Due to recent changes to the tune, in order to match config.guess, the name
of the big-endian microblaze architecture was changes to 'microblaze'.
(From OE-Core rev: 6f6a6bbac684ead3fe6d070d61f17c2f611a2c87)
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/meson.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/siteinfo.bbclass | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 001602bd04..06034e8b47 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass | |||
@@ -57,7 +57,7 @@ def meson_cpu_family(var, d): | |||
57 | return 'mips64' | 57 | return 'mips64' |
58 | elif re.match(r"i[3-6]86", arch): | 58 | elif re.match(r"i[3-6]86", arch): |
59 | return "x86" | 59 | return "x86" |
60 | elif arch == "microblazeel" or arch == "microblazeeb": | 60 | elif arch == "microblazeel": |
61 | return "microblaze" | 61 | return "microblaze" |
62 | else: | 62 | else: |
63 | return arch | 63 | return arch |
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index d62aaac0f0..1a048c053f 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass | |||
@@ -35,7 +35,6 @@ def siteinfo_data_for_machine(arch, os, d): | |||
35 | "lm32": "endian-big bit-32", | 35 | "lm32": "endian-big bit-32", |
36 | "m68k": "endian-big bit-32", | 36 | "m68k": "endian-big bit-32", |
37 | "microblaze": "endian-big bit-32 microblaze-common", | 37 | "microblaze": "endian-big bit-32 microblaze-common", |
38 | "microblazeeb": "endian-big bit-32 microblaze-common", | ||
39 | "microblazeel": "endian-little bit-32 microblaze-common", | 38 | "microblazeel": "endian-little bit-32 microblaze-common", |
40 | "mips": "endian-big bit-32 mips-common", | 39 | "mips": "endian-big bit-32 mips-common", |
41 | "mips64": "endian-big bit-64 mips-common", | 40 | "mips64": "endian-big bit-64 mips-common", |
@@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d): | |||
89 | "arm-linux-musleabi": "arm-linux", | 88 | "arm-linux-musleabi": "arm-linux", |
90 | "armeb-linux-gnueabi": "armeb-linux", | 89 | "armeb-linux-gnueabi": "armeb-linux", |
91 | "armeb-linux-musleabi": "armeb-linux", | 90 | "armeb-linux-musleabi": "armeb-linux", |
92 | "microblazeeb-linux" : "microblaze-linux", | ||
93 | "microblazeeb-linux-musl" : "microblaze-linux", | ||
94 | "microblazeel-linux" : "microblaze-linux", | 91 | "microblazeel-linux" : "microblaze-linux", |
95 | "microblazeel-linux-musl" : "microblaze-linux", | 92 | "microblazeel-linux-musl" : "microblaze-linux", |
96 | "mips-linux-musl": "mips-linux", | 93 | "mips-linux-musl": "mips-linux", |