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:02 +0000 |
| commit | 6f6a6bbac684ead3fe6d070d61f17c2f611a2c87 (patch) | |
| tree | 679f95e64f0f91af0785c2068d61f4bab04271f9 /meta | |
| parent | 78c38857486d3107ecd95d0ceefabcf5152c3928 (diff) | |
| download | openembedded-core-contrib-6f6a6bbac684ead3fe6d070d61f17c2f611a2c87.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'.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/meson.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/siteinfo.bbclass | 3 | ||||
| -rw-r--r-- | meta/lib/oe/elf.py | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h (renamed from meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h) | 0 |
4 files changed, 1 insertions, 7 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): return 'mips64' elif re.match(r"i[3-6]86", arch): return "x86" - elif arch == "microblazeel" or arch == "microblazeeb": + elif arch == "microblazeel": return "microblaze" else: 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): "lm32": "endian-big bit-32", "m68k": "endian-big bit-32", "microblaze": "endian-big bit-32 microblaze-common", - "microblazeeb": "endian-big bit-32 microblaze-common", "microblazeel": "endian-little bit-32 microblaze-common", "mips": "endian-big bit-32 mips-common", "mips64": "endian-big bit-64 mips-common", @@ -89,8 +88,6 @@ def siteinfo_data_for_machine(arch, os, d): "arm-linux-musleabi": "arm-linux", "armeb-linux-gnueabi": "armeb-linux", "armeb-linux-musleabi": "armeb-linux", - "microblazeeb-linux" : "microblaze-linux", - "microblazeeb-linux-musl" : "microblaze-linux", "microblazeel-linux" : "microblaze-linux", "microblazeel-linux-musl" : "microblaze-linux", "mips-linux-musl": "mips-linux", diff --git a/meta/lib/oe/elf.py b/meta/lib/oe/elf.py index 2ed614f652..df0a4593fa 100644 --- a/meta/lib/oe/elf.py +++ b/meta/lib/oe/elf.py @@ -22,7 +22,6 @@ def machine_dict(d): "mips": ( 8, 0, 0, False, 32), "mipsel": ( 8, 0, 0, True, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "powerpc": (20, 0, 0, False, 32), "riscv32": (243, 0, 0, True, 32), @@ -60,7 +59,6 @@ def machine_dict(d): "sh4": (42, 0, 0, True, 32), "sparc": ( 2, 0, 0, False, 32), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), }, "linux-musl" : { @@ -81,7 +79,6 @@ def machine_dict(d): "mips64": ( 8, 0, 0, False, 64), "mips64el": ( 8, 0, 0, True, 64), "microblaze": (189, 0, 0, False, 32), - "microblazeeb":(189, 0, 0, False, 32), "microblazeel":(189, 0, 0, True, 32), "riscv32": (243, 0, 0, True, 32), "riscv64": (243, 0, 0, True, 64), diff --git a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h index 63232fdfa6..63232fdfa6 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h +++ b/meta/recipes-extended/ghostscript/ghostscript/microblaze/objarch.h |