From c3946acf2295a38c1104c722f15268bc65199b72 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 29 Apr 2021 09:00:06 +0200 Subject: [PATCH] doc: fix Arm SoCs list Keep the list of SoCs in a single place and include it so that the documentation won't get outdated. Fixes: 8f5ea6a464ac ("config/arm: fix implementer and its SoCs") Fixes: 1b4c86a721c9 ("config/arm: add Marvell CN10K") Fixes: 7cf32a22b240 ("config/arm: add Hisilicon kunpeng") Signed-off-by: David Marchand Reviewed-by: Jerin Jacob Reviewed-by: Ruifeng Wang --- config/arm/meson.build | 21 +++++++++++++++++++ .../linux_gsg/cross_build_dpdk_for_arm64.rst | 18 +++++----------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/config/arm/meson.build b/config/arm/meson.build index 22cd81319c..3f34ec9248 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -321,6 +321,27 @@ soc_thunderxt88 = { 'part_number': '0xa1' } +''' +Start of SoCs list +generic: Generic un-optimized build for all aarch64 machines. +armada: Marvell ARMADA +bluefield: NVIDIA BlueField +cn10k: Marvell OCTEON 10 +dpaa: NXP DPAA +emag: Ampere eMAG +graviton2: AWS Graviton2 +kunpeng920: HiSilicon Kunpeng 920 +kunpeng930: HiSilicon Kunpeng 930 +n1sdp: Arm Neoverse N1SDP +n2: Arm Neoverse N2 +octeontx2: Marvell OCTEON TX2 +stingray: Broadcom Stingray +thunderx2: Marvell ThunderX2 T99 +thunderxt88: Marvell ThunderX T88 +End of SoCs list +''' +# The string above is included in the documentation, keep it in sync with the +# SoCs list below. socs = { 'generic': soc_generic, 'armada': soc_armada, diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index 3857cdefe9..2fa9702c1b 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -197,19 +197,11 @@ option:: meson soc_build -Dplatform= -Substitute with one of the supported SoCs:: - - generic: Generic un-optimized build for all aarch64 machines. - armada: Marvell ARMADA - bluefield: NVIDIA BlueField - dpaa: NXP DPAA - emag: Ampere eMAG - graviton2: AWS Graviton2 - n1sdp: Arm Neoverse N1SDP - octeontx2: Marvell OCTEON TX2 - stingray: Broadcom Stingray - thunderx2: Marvell ThunderX2 T99 - thunderxt88: Marvell ThunderX T88 +Substitute with one of the supported SoCs + +.. literalinclude:: ../../../config/arm/meson.build + :start-after: Start of SoCs list + :end-before: End of SoCs list These SoCs are also used in cross files, e.g.:: -- 2.20.1