From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 28 Nov 2019 16:33:48 +0000 (+0000)
Subject: doc: reorder meson and make build instructions for Arm
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=50f5aa102073d65b8ea180da22a71731cee24ad0;p=dpdk.git

doc: reorder meson and make build instructions for Arm

Since the meson instructions are the simpler of the two sets, and also the
ones most future-proof, put those first in the user documentation with make
instructions following them.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Gavin Hu <gavin.hu@arm.com>
---

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 e799b0ba41..b8e48a01b0 100644
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -77,8 +77,23 @@ Copy the NUMA header files and lib to the cross compiler's directories:
 
 .. _configure_and_cross_compile_dpdk_build:
 
-Configure and cross compile DPDK Build
---------------------------------------
+Cross Compiling DPDK using Meson
+--------------------------------
+
+To cross-compile DPDK on a desired target machine we can use the following
+command::
+
+	meson cross-build --cross-file <target_machine_configuration>
+	ninja -C cross-build
+
+For example if the target machine is arm64 we can use the following
+command::
+
+	meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc
+	ninja -C arm64-build
+
+Configure and Cross Compile DPDK using Make
+-------------------------------------------
 To configure a build, choose one of the target configurations, like arm64-dpaa-linux-gcc and arm64-thunderx-linux-gcc.
 
 .. code-block:: console
@@ -118,18 +133,3 @@ To compile for non-NUMA targets, without compiling the kernel modules, use the f
    .. code-block:: console
 
       make -j CROSS=aarch64-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/lib -lnuma"
-
-Meson Cross Compiling DPDK
---------------------------
-
-To cross-compile DPDK on a desired target machine we can use the following
-command::
-
-	meson cross-build --cross-file <target_machine_configuration>
-	ninja -C cross-build
-
-For example if the target machine is arm64 we can use the following
-command::
-
-	meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc
-	ninja -C arm64-build