baseband/fpga_5gnr_fec: remove filler from HARQ

[dpdk.git] / drivers / meson.build

diff --git a/drivers/meson.build b/drivers/meson.build
index 0052247..1d8123b 100644 (file)
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -10,14 +10,16 @@ subdirs = [
         'common/qat',     # depends on bus.
         'common/sfc_efx', # depends on bus.
         'mempool',        # depends on common and bus.
+        'dma',            # depends on common and bus.
         'net',            # depends on common, bus, mempool
-        'raw',            # depends on common, bus and net.
+        'raw',            # depends on common, bus, dma and net.
         'crypto',         # depends on common, bus and mempool (net in future).
         'compress',       # depends on common, bus, mempool.
         'regex',          # depends on common, bus, regexdev.
         'vdpa',           # depends on common, bus and mempool.
         'event',          # depends on common, bus, mempool and net.
         'baseband',       # depends on common and bus.
+        'gpu',            # depends on common and bus.
 ]
 
 if meson.is_cross_build()
@@ -38,6 +40,8 @@ endif
 
 # these drivers must always be enabled, otherwise the build breaks
 always_enable = ['bus/pci', 'bus/vdev']
+# we always need a mempool driver, and ring is default, so make it mandatory
+always_enable += ['mempool/ring']
 enable_drivers += always_enable
 
 default_cflags = machine_args
@@ -51,6 +55,7 @@ endif
 foreach subpath:subdirs
     drivers = []
     std_deps = []
+    log_prefix = ''
 
     # subpath can be either "class" or "class/driver"
     if subpath.contains('/')
@@ -69,6 +74,12 @@ foreach subpath:subdirs
     # get already enabled drivers of the same class
     enabled_drivers = get_variable(class + '_drivers', [])
 
+    # default log prefix can be defined per class
+    if log_prefix == ''
+        # default log name is pmd.class.driver
+        log_prefix = 'pmd.' + class
+    endif
+
     foreach drv:drivers
         drv_path = join_paths(class, drv)
 
@@ -102,16 +113,19 @@ foreach subpath:subdirs
                 build = false
                 reason = 'explicitly disabled via build config'
             endif
-        else
-            # pull in driver directory which should update all the local variables
-            subdir(drv_path)
         endif
 
         if build
+            # pull in driver directory which should update all the local variables
+            subdir(drv_path)
+
             # get dependency objs from strings
             shared_deps = ext_deps
             static_deps = ext_deps
             foreach d:deps
+                if not build
+                    break
+                endif
                 if not is_variable('shared_rte_' + d)
                     build = false
                     reason = 'missing internal dependency, "@0@"'.format(d)
@@ -137,6 +151,7 @@ foreach subpath:subdirs
 
         enabled_drivers += name
         lib_name = '_'.join(['rte', class, name])
+        cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=' + '.'.join([log_prefix, name])
         dpdk_conf.set(lib_name.to_upper(), 1)
 
         dpdk_extra_ldflags += pkgconfig_extra_libs
@@ -152,7 +167,7 @@ foreach subpath:subdirs
                 include_directories: includes,
                 dependencies: static_deps,
                 c_args: cflags)
-        objs += tmp_lib.extract_all_objects()
+        objs += tmp_lib.extract_all_objects(recursive: true)
         sources = custom_target(out_filename,
                 command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
                 output: out_filename,