-----Original Message----- From: Ferruh Yigit <ferruh.yi...@intel.com> Sent: Wednesday, 16 December 2020 15:49 To: Liron Himi <lir...@marvell.com> Cc: dev@dpdk.org; Luca Boccassi <bl...@debian.org>; Kevin Traynor <ktray...@redhat.com>; Akhil Goyal <akhil.go...@nxp.com> Subject: Re: [EXT] Re: [PATCH v2] meson: update meson build for armada drivers
On 12/16/2020 1:41 PM, Liron Himi wrote: > > -----Original Message----- > From: Ferruh Yigit <ferruh.yi...@intel.com> > Sent: Wednesday, 16 December 2020 15:37 > To: Liron Himi <lir...@marvell.com> > Cc: dev@dpdk.org; Luca Boccassi <bl...@debian.org>; Kevin Traynor > <ktray...@redhat.com>; Akhil Goyal <akhil.go...@nxp.com> > Subject: [EXT] Re: [PATCH v2] meson: update meson build for armada > drivers > > External Email > > ---------------------------------------------------------------------- > On 12/15/2020 10:23 PM, lir...@marvell.com wrote: >> From: Liron Himi <lir...@marvell.com> >> >> With pkg-config support available within musdk library (from >> musdk-release-SDK-10.3.5.0-PR2 version), meson option 'lib_musdk_dir' >> can be removed. >> PKG_CONFIG_PATH environment variable should be set appropriately to >> use the musdk library. > > Hi Liron, > > It is good change to get rid of an custom meson option, can we or should we > backport this to the v20.11? > [L.H.] yes, it can be backported. > >> >> docs are updated with new musdk version and meson instructions. >> >> Signed-off-by: Liron Himi <lir...@marvell.com> >> Reviewed-by: Liron Himi <lir...@marvell.com> >> --- >> v2: >> * include updated docs in this patch >> * add musdk version in commit message >> --- >> doc/guides/nics/mvneta.rst | 13 ++++++++----- >> doc/guides/nics/mvpp2.rst | 15 +++++++++------ >> drivers/common/mvep/meson.build | 14 +++++--------- >> drivers/crypto/mvsam/meson.build | 15 +++++---------- > > @Ahil, is it OK if I get this to the next-net, since logically related? > >> drivers/net/mvneta/meson.build | 19 +++++-------------- >> drivers/net/mvneta/mvneta_ethdev.h | 1 + >> drivers/net/mvpp2/meson.build | 15 +++++---------- >> meson_options.txt | 2 -- >> 8 files changed, 38 insertions(+), 56 deletions(-) >> > > <...> > >> @@ -94,7 +94,7 @@ be passed as part of EAL arguments. >> -c 3 -- -i --p 3 -a >> >> >> -Building DPDK >> +Building MUSDK >> ------------- >> > > This is giving doc warning because of "Title underline too short". > [L.H.] okay, will fix in v3 > > <...> > >> @@ -108,7 +108,7 @@ Prerequisites >> DPDK environment. >> >> >> -Building DPDK >> +Building MUSDK >> ------------- >> > > Ditto. > [L.H.] same > > <...> > >> diff --git a/drivers/net/mvneta/mvneta_ethdev.h >> b/drivers/net/mvneta/mvneta_ethdev.h >> index ef8067790..e090abc25 100644 >> --- a/drivers/net/mvneta/mvneta_ethdev.h >> +++ b/drivers/net/mvneta/mvneta_ethdev.h >> @@ -21,6 +21,7 @@ >> #undef container_of >> #endif >> >> +#include <env/mv_autogen_comp_flags.h> > > Is this include related with this patch? > [L.H.] yes, without it meson build will fail > There is no change in the code, how it was working before but failing now? Can you please give more details why it is needed? [L.H.] I have updated the musdk pkg-config, so this change is not needed. Will be removed in v3