Order SOC configurations and names alphabetically. Signed-off-by: Wathsala Vithanage <wathsala.vithan...@arm.com> Reviewed-by: Dhruv Tripathi <dhruv.tripa...@arm.com>
--- config/arm/meson.build | 72 +++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 04819e75eb..da69ddfa23 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -397,6 +397,17 @@ soc_bluefield = { 'numa': false } +soc_bluefield3 = { + 'description': 'NVIDIA BlueField-3', + 'implementer': '0x41', + 'flags': [ + ['RTE_MAX_LCORE', 32], + ['RTE_MAX_NUMA_NODES', 1] + ], + 'part_number': '0xd42', + 'numa': false +} + soc_capri = { 'description': 'AMD Pensando Capri', 'implementer': '0x75', @@ -479,13 +490,6 @@ soc_ft2000plus = { 'numa': true } -soc_tys2500 = { - 'description': 'Phytium TengYun S2500', - 'implementer': '0x70', - 'part_number': '0x663', - 'numa': true -} - soc_grace = { 'description': 'NVIDIA Grace', 'implementer': '0x41', @@ -596,27 +600,23 @@ soc_thunderx2 = { 'part_number': '0xaf' } -soc_thunderxt88 = { - 'description': 'Marvell ThunderX T88', - 'implementer': '0x43', - 'part_number': '0xa1' -} - soc_thunderxt83 = { 'description': 'Marvell ThunderX T83', 'implementer': '0x43', 'part_number': '0xa3' } -soc_bluefield3 = { - 'description': 'NVIDIA BlueField-3', - 'implementer': '0x41', - 'flags': [ - ['RTE_MAX_LCORE', 32], - ['RTE_MAX_NUMA_NODES', 1] - ], - 'part_number': '0xd42', - 'numa': false +soc_thunderxt88 = { + 'description': 'Marvell ThunderX T88', + 'implementer': '0x43', + 'part_number': '0xa1' +} + +soc_tys2500 = { + 'description': 'Phytium TengYun S2500', + 'implementer': '0x70', + 'part_number': '0x663', + 'numa': true } soc_v2 = { @@ -627,26 +627,26 @@ soc_v2 = { } mcpu_defs = { - 'mcpu_kunpeng930': { - 'march': 'armv8.2-a', - 'march_extensions': ['crypto', 'sve'] + 'mcpu_centriq2400': { + 'march': 'armv8-a', + 'march_extensions': ['crc'] + }, + 'mcpu_ft2000plus': { + 'march': 'armv8-a', + 'march_extensions': ['crc'] }, 'mcpu_hip10': { 'march': 'armv8.5-a', 'march_extensions': ['crypto', 'sve'] }, - 'mcpu_ft2000plus': { - 'march': 'armv8-a', - 'march_extensions': ['crc'] + 'mcpu_kunpeng930': { + 'march': 'armv8.2-a', + 'march_extensions': ['crypto', 'sve'] }, 'mcpu_tys2500': { 'march': 'armv8-a', 'march_extensions': ['crc'] } - 'mcpu_centriq2400': { - 'march': 'armv8-a', - 'march_extensions': ['crc'] - } } ''' @@ -668,7 +668,6 @@ dpaa: NXP DPAA elba: AMD Pensando Elba emag: Ampere eMAG ft2000plus: Phytium FT-2000+ -tys2500: Phytium TengYun S2500 grace: NVIDIA Grace graviton2: AWS Graviton2 graviton3: AWS Graviton3 @@ -681,8 +680,9 @@ n2: Arm Neoverse N2 odyssey: Marvell Odyssey stingray: Broadcom Stingray thunderx2: Marvell ThunderX2 T99 -thunderxt88: Marvell ThunderX T88 thunderxt83: Marvell ThunderX T83 +thunderxt88: Marvell ThunderX T88 +tys2500: Phytium TengYun S2500 v2: Arm Neoverse V2 End of SoCs list ''' @@ -706,7 +706,6 @@ socs = { 'elba': soc_elba, 'emag': soc_emag, 'ft2000plus': soc_ft2000plus, - 'tys2500': soc_tys2500, 'grace': soc_grace, 'graviton2': soc_graviton2, 'graviton3': soc_graviton3, @@ -720,8 +719,9 @@ socs = { 'odyssey' : soc_odyssey, 'stingray': soc_stingray, 'thunderx2': soc_thunderx2, - 'thunderxt88': soc_thunderxt88, 'thunderxt83': soc_thunderxt83, + 'thunderxt88': soc_thunderxt88, + 'tys2500': soc_tys2500, 'v2': soc_v2, } -- 2.34.1