From cdcacf26ec95cfa874b2060c059478666956cdca Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 4 Feb 2020 15:06:30 -0600 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/meson.bbclass | 2 +- meta/classes/siteinfo.bbclass | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/classes') 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", -- cgit v1.2.3-54-g00ecf