From d2e65d43fe818ca5947521ee88f6b73aeec00cc5 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Wed, 21 Oct 2020 09:17:11 +0100 Subject: [PATCH] doc: remove references to make from platforms guide Make is no longer supported for compiling DPDK, references are now removed in the documentation. Signed-off-by: Ciara Power Signed-off-by: Harman Kalra Reviewed-by: Kevin Laatz --- doc/guides/platform/bluefield.rst | 22 ------------- doc/guides/platform/octeontx.rst | 51 ++++++++++++------------------- doc/guides/platform/octeontx2.rst | 32 ------------------- 3 files changed, 19 insertions(+), 86 deletions(-) diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index deda675b75..366f2b23a7 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -60,17 +60,6 @@ Native Compilation Refer to :doc:`../nics/mlx5` for prerequisites. Either Mellanox OFED/EN or rdma-core library with corresponding kernel drivers is required. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -126,17 +115,6 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. cd $(dirname $(which aarch64-linux-gnu-gcc))/.. tar xf aarch64-linux-gnu-mlx.tar -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-bluefield-linux-gcc - make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_bluefield_linux_gcc diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 7d1cb647d3..42ddb1762e 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -94,19 +94,15 @@ drivers can be compiled with the following steps, .. code-block:: console - cd - make config T=arm64-thunderx-linux-gcc - make + meson build -Dexamples= + ninja -C build The example applications can be compiled using the following: .. code-block:: console - cd - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/ - make + meson build -Dexamples= + ninja -C build Cross Compilation ~~~~~~~~~~~~~~~~~ @@ -115,10 +111,7 @@ The DPDK applications can be cross-compiled on any x86 based platform. The OCTEON TX SDK need to be installed on the build system. The SDK package will provide the required toolchain etc. -Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for further steps on -compilation. The 'host' & 'CC' to be used in the commands would change, -in addition to the paths to which libnuma related files have to be -copied. +Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. The following steps can be used to perform cross-compilation with OCTEON TX SDK 6.2.0 patch 3: @@ -128,34 +121,28 @@ SDK 6.2.0 patch 3: cd source env-setup - git clone https://github.com/numactl/numactl.git - cd numactl - git checkout v2.0.11 -b v2.0.11 - ./autogen.sh - autoconf -i - ./configure --host=aarch64-thunderx-linux CC=aarch64-thunderx-linux-gnu-gcc --prefix= - make install - -The above steps will prepare build system with numa additions. Now this build system can be used -to build applications for **OCTEON TX** :sup:`®` platforms. +The above steps will prepare build system with required toolchain. +Now this build system can be used to build applications for **OCTEON TX** :sup:`®` platforms. .. code-block:: console cd - export RTE_SDK=$PWD - export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linux-gcc - make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem /include" EXTRA_LDFLAGS="-L/lib -lnuma" + meson build --cross-file config/arm/arm64_thunderx_linux_gcc + ninja -C build -If NUMA support is not required, it can be disabled as explained in -:doc:`../linux_gsg/cross_build_dpdk_for_arm64`. - -Following steps could be used in that case. +The example applications can be compiled using the following: .. code-block:: console - make config T=arm64-thunderx-linux-gcc - make CROSS=aarch64-thunderx-linux-gnu- + cd + meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples= + ninja -C build + +.. note:: + By default, meson cross compilation uses ``aarch64-linux-gnu-gcc`` toolchain, + if OCTEON TX SDK 6.2.0 patch 3 is available then it can be used by + overriding the c, cpp, ar, strip ``binaries`` attributes to respective thunderx + toolchain binaries in ``config/arm/arm64_thunderx_linux_gcc`` file. SDK and related information can be obtained from: `Cavium support site `_. diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index c4d64ab4b2..8b5991f03b 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -503,27 +503,6 @@ an x86 based platform. Native Compilation ~~~~~~~~~~~~~~~~~~ -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j - -The example applications can be compiled using the following: - -.. code-block:: console - - cd - export RTE_SDK=$PWD - export RTE_TARGET=build - cd examples/ - make -j - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build @@ -534,17 +513,6 @@ Cross Compilation Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details. -make build -^^^^^^^^^^ - -.. code-block:: console - - make config T=arm64-octeontx2-linux-gcc - make -j CROSS=aarch64-marvell-linux-gnu- CONFIG_RTE_KNI_KMOD=n - -meson build -^^^^^^^^^^^ - .. code-block:: console meson build --cross-file config/arm/arm64_octeontx2_linux_gcc -- 2.20.1