summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-07-05 10:34:00 +0100
committerThomas Monjalon <thomas@monjalon.net>2019-07-30 15:20:41 +0200
commit473c88f9b391c2cd8b8622dcc488116cb09b624a (patch)
treeda80b934369c580d09dba32732425666c69a20f7
parent6420da3140f2392e10c22befaafaf0e4df0d049c (diff)
downloaddpdk-473c88f9b391c2cd8b8622dcc488116cb09b624a.zip
dpdk-473c88f9b391c2cd8b8622dcc488116cb09b624a.tar.gz
dpdk-473c88f9b391c2cd8b8622dcc488116cb09b624a.tar.xz
drivers/raw: remove rawdev from directory names
The ifpga and skeleton rawdev drivers included "rawdev" in their directory names, which was superfluous given that they were in the drivers/raw directory. Shorten the names via this patch. For meson builds, this will rename the final library .so/.a files produced, but those will be renamed again later via a patch to standardize rawdev names. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
-rw-r--r--MAINTAINERS8
-rw-r--r--doc/guides/rawdevs/ifpga.rst (renamed from doc/guides/rawdevs/ifpga_rawdev.rst)0
-rw-r--r--doc/guides/rawdevs/index.rst4
-rw-r--r--doc/guides/rawdevs/ioat.rst (renamed from doc/guides/rawdevs/ioat_rawdev.rst)0
-rw-r--r--drivers/raw/Makefile4
-rw-r--r--drivers/raw/ifpga/Makefile (renamed from drivers/raw/ifpga_rawdev/Makefile)4
-rw-r--r--drivers/raw/ifpga/base/Makefile (renamed from drivers/raw/ifpga_rawdev/base/Makefile)0
-rw-r--r--drivers/raw/ifpga/base/README (renamed from drivers/raw/ifpga_rawdev/base/README)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_api.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_api.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_api.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_compat.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_compat.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_defines.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_defines.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_enumerate.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_enumerate.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_feature_dev.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_feature_dev.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_fme.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_fme_dperf.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_fme_error.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_fme_iperf.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_fme_pr.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_hw.h (renamed from drivers/raw/ifpga_rawdev/base/ifpga_hw.h)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_port.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_port.c)0
-rw-r--r--drivers/raw/ifpga/base/ifpga_port_error.c (renamed from drivers/raw/ifpga_rawdev/base/ifpga_port_error.c)0
-rw-r--r--drivers/raw/ifpga/base/meson.build (renamed from drivers/raw/ifpga_rawdev/base/meson.build)0
-rw-r--r--drivers/raw/ifpga/base/opae_at24_eeprom.c (renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_at24_eeprom.h (renamed from drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_debug.c (renamed from drivers/raw/ifpga_rawdev/base/opae_debug.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_debug.h (renamed from drivers/raw/ifpga_rawdev/base/opae_debug.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_eth_group.c (renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_eth_group.h (renamed from drivers/raw/ifpga_rawdev/base/opae_eth_group.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_hw_api.c (renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_hw_api.h (renamed from drivers/raw/ifpga_rawdev/base/opae_hw_api.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_i2c.c (renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_i2c.h (renamed from drivers/raw/ifpga_rawdev/base/opae_i2c.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_ifpga_hw_api.c (renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_ifpga_hw_api.h (renamed from drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_intel_max10.c (renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_intel_max10.h (renamed from drivers/raw/ifpga_rawdev/base/opae_intel_max10.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_osdep.h (renamed from drivers/raw/ifpga_rawdev/base/opae_osdep.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_spi.c (renamed from drivers/raw/ifpga_rawdev/base/opae_spi.c)0
-rw-r--r--drivers/raw/ifpga/base/opae_spi.h (renamed from drivers/raw/ifpga_rawdev/base/opae_spi.h)0
-rw-r--r--drivers/raw/ifpga/base/opae_spi_transaction.c (renamed from drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c)0
-rw-r--r--drivers/raw/ifpga/base/osdep_raw/osdep_generic.h (renamed from drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h)0
-rw-r--r--drivers/raw/ifpga/base/osdep_rte/osdep_generic.h (renamed from drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h)0
-rw-r--r--drivers/raw/ifpga/ifpga_rawdev.c (renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.c)0
-rw-r--r--drivers/raw/ifpga/ifpga_rawdev.h (renamed from drivers/raw/ifpga_rawdev/ifpga_rawdev.h)0
-rw-r--r--drivers/raw/ifpga/meson.build (renamed from drivers/raw/ifpga_rawdev/meson.build)0
-rw-r--r--drivers/raw/ifpga/rte_pmd_ifpga_version.map (renamed from drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map)0
-rw-r--r--drivers/raw/meson.build4
-rw-r--r--drivers/raw/skeleton/Makefile (renamed from drivers/raw/skeleton_rawdev/Makefile)2
-rw-r--r--drivers/raw/skeleton/meson.build (renamed from drivers/raw/skeleton_rawdev/meson.build)0
-rw-r--r--drivers/raw/skeleton/rte_pmd_skeleton_version.map (renamed from drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map)0
-rw-r--r--drivers/raw/skeleton/skeleton_rawdev.c (renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.c)0
-rw-r--r--drivers/raw/skeleton/skeleton_rawdev.h (renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev.h)0
-rw-r--r--drivers/raw/skeleton/skeleton_rawdev_test.c (renamed from drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c)0
56 files changed, 13 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c2b575a..dc6648c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -449,7 +449,7 @@ Raw device API - EXPERIMENTAL
M: Shreyansh Jain <shreyansh.jain@nxp.com>
M: Hemant Agrawal <hemant.agrawal@nxp.com>
F: lib/librte_rawdev/
-F: drivers/raw/skeleton_rawdev/
+F: drivers/raw/skeleton/
F: app/test/test_rawdev.c
F: doc/guides/prog_guide/rawdev.rst
@@ -1103,13 +1103,13 @@ Rawdev Drivers
Intel FPGA
M: Rosen Xu <rosen.xu@intel.com>
M: Tianfei zhang <tianfei.zhang@intel.com>
-F: drivers/raw/ifpga_rawdev/
-F: doc/guides/rawdevs/ifpga_rawdev.rst
+F: drivers/raw/ifpga/
+F: doc/guides/rawdevs/ifpga.rst
IOAT Rawdev
M: Bruce Richardson <bruce.richardson@intel.com>
F: drivers/raw/ioat/
-F: doc/guides/rawdevs/ioat_rawdev.rst
+F: doc/guides/rawdevs/ioat.rst
NXP DPAA2 QDMA
M: Nipun Gupta <nipun.gupta@nxp.com>
diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst b/doc/guides/rawdevs/ifpga.rst
index a3d92a6..a3d92a6 100644
--- a/doc/guides/rawdevs/ifpga_rawdev.rst
+++ b/doc/guides/rawdevs/ifpga.rst
diff --git a/doc/guides/rawdevs/index.rst b/doc/guides/rawdevs/index.rst
index fad9516..22bc013 100644
--- a/doc/guides/rawdevs/index.rst
+++ b/doc/guides/rawdevs/index.rst
@@ -13,7 +13,7 @@ application through rawdev API.
dpaa2_cmdif
dpaa2_qdma
- ifpga_rawdev
- ioat_rawdev
+ ifpga
+ ioat
ntb
octeontx2_dma
diff --git a/doc/guides/rawdevs/ioat_rawdev.rst b/doc/guides/rawdevs/ioat.rst
index 607cb5a..607cb5a 100644
--- a/doc/guides/rawdevs/ioat_rawdev.rst
+++ b/doc/guides/rawdevs/ioat.rst
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
index 879fcca..0b6d13d 100644
--- a/drivers/raw/Makefile
+++ b/drivers/raw/Makefile
@@ -4,12 +4,12 @@
include $(RTE_SDK)/mk/rte.vars.mk
# DIRS-$(<configuration>) += <directory>
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma
endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb
DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma
diff --git a/drivers/raw/ifpga_rawdev/Makefile b/drivers/raw/ifpga/Makefile
index f60b547..5fa9303 100644
--- a/drivers/raw/ifpga_rawdev/Makefile
+++ b/drivers/raw/ifpga/Makefile
@@ -21,13 +21,13 @@ LDLIBS += -lrte_kvargs
LDLIBS += -lrte_bus_pci
LDLIBS += -lrte_bus_ifpga
-EXPORT_MAP := rte_pmd_ifpga_rawdev_version.map
+EXPORT_MAP := rte_pmd_ifpga_version.map
LIBABIVER := 1
VPATH += $(SRCDIR)/base
-include $(RTE_SDK)/drivers/raw/ifpga_rawdev/base/Makefile
+include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
#
# all source are stored in SRCS-y
diff --git a/drivers/raw/ifpga_rawdev/base/Makefile b/drivers/raw/ifpga/base/Makefile
index c5bbcbd..c5bbcbd 100644
--- a/drivers/raw/ifpga_rawdev/base/Makefile
+++ b/drivers/raw/ifpga/base/Makefile
diff --git a/drivers/raw/ifpga_rawdev/base/README b/drivers/raw/ifpga/base/README
index 6b2b171..6b2b171 100644
--- a/drivers/raw/ifpga_rawdev/base/README
+++ b/drivers/raw/ifpga/base/README
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c b/drivers/raw/ifpga/base/ifpga_api.c
index 7ae626d..7ae626d 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_api.c
+++ b/drivers/raw/ifpga/base/ifpga_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h b/drivers/raw/ifpga/base/ifpga_api.h
index 051ab82..051ab82 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_api.h
+++ b/drivers/raw/ifpga/base/ifpga_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h b/drivers/raw/ifpga/base/ifpga_compat.h
index 931c893..931c893 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_compat.h
+++ b/drivers/raw/ifpga/base/ifpga_compat.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h b/drivers/raw/ifpga/base/ifpga_defines.h
index b7151ca..b7151ca 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_defines.h
+++ b/drivers/raw/ifpga/base/ifpga_defines.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c b/drivers/raw/ifpga/base/ifpga_enumerate.c
index b8846e3..b8846e3 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c
+++ b/drivers/raw/ifpga/base/ifpga_enumerate.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h b/drivers/raw/ifpga/base/ifpga_enumerate.h
index 14131e3..14131e3 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.h
+++ b/drivers/raw/ifpga/base/ifpga_enumerate.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c b/drivers/raw/ifpga/base/ifpga_feature_dev.c
index 63c8bcc..63c8bcc 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c
+++ b/drivers/raw/ifpga/base/ifpga_feature_dev.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga/base/ifpga_feature_dev.h
index e243d42..e243d42 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
+++ b/drivers/raw/ifpga/base/ifpga_feature_dev.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
index 2b447fd..2b447fd 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c b/drivers/raw/ifpga/base/ifpga_fme_dperf.c
index 954f8a8..954f8a8 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c
+++ b/drivers/raw/ifpga/base/ifpga_fme_dperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c b/drivers/raw/ifpga/base/ifpga_fme_error.c
index 3794564..3794564 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c
+++ b/drivers/raw/ifpga/base/ifpga_fme_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c b/drivers/raw/ifpga/base/ifpga_fme_iperf.c
index 70543b9..70543b9 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c
+++ b/drivers/raw/ifpga/base/ifpga_fme_iperf.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c b/drivers/raw/ifpga/base/ifpga_fme_pr.c
index 9997942..9997942 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
+++ b/drivers/raw/ifpga/base/ifpga_fme_pr.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h b/drivers/raw/ifpga/base/ifpga_hw.h
index ff91c46..ff91c46 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h
+++ b/drivers/raw/ifpga/base/ifpga_hw.h
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c b/drivers/raw/ifpga/base/ifpga_port.c
index 6c41164..6c41164 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_port.c
+++ b/drivers/raw/ifpga/base/ifpga_port.c
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c b/drivers/raw/ifpga/base/ifpga_port_error.c
index 138284e..138284e 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c
+++ b/drivers/raw/ifpga/base/ifpga_port_error.c
diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga/base/meson.build
index f1015bb..f1015bb 100644
--- a/drivers/raw/ifpga_rawdev/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c b/drivers/raw/ifpga/base/opae_at24_eeprom.c
index d70f7af..d70f7af 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.c
+++ b/drivers/raw/ifpga/base/opae_at24_eeprom.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h b/drivers/raw/ifpga/base/opae_at24_eeprom.h
index caae9a3..caae9a3 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_at24_eeprom.h
+++ b/drivers/raw/ifpga/base/opae_at24_eeprom.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.c b/drivers/raw/ifpga/base/opae_debug.c
index 88f2d5c..88f2d5c 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_debug.c
+++ b/drivers/raw/ifpga/base/opae_debug.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_debug.h b/drivers/raw/ifpga/base/opae_debug.h
index a03dff9..a03dff9 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_debug.h
+++ b/drivers/raw/ifpga/base/opae_debug.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.c b/drivers/raw/ifpga/base/opae_eth_group.c
index d189dd5..d189dd5 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_eth_group.c
+++ b/drivers/raw/ifpga/base/opae_eth_group.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_eth_group.h b/drivers/raw/ifpga/base/opae_eth_group.h
index 4868bd0..4868bd0 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_eth_group.h
+++ b/drivers/raw/ifpga/base/opae_eth_group.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c b/drivers/raw/ifpga/base/opae_hw_api.c
index 8964e79..8964e79 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
+++ b/drivers/raw/ifpga/base/opae_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga/base/opae_hw_api.h
index 63405a4..63405a4 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
+++ b/drivers/raw/ifpga/base/opae_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.c b/drivers/raw/ifpga/base/opae_i2c.c
index f8bc247..f8bc247 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_i2c.c
+++ b/drivers/raw/ifpga/base/opae_i2c.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_i2c.h b/drivers/raw/ifpga/base/opae_i2c.h
index 8890c8f..8890c8f 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_i2c.h
+++ b/drivers/raw/ifpga/base/opae_i2c.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c b/drivers/raw/ifpga/base/opae_ifpga_hw_api.c
index 89c7b49..89c7b49 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.c
+++ b/drivers/raw/ifpga/base/opae_ifpga_hw_api.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h b/drivers/raw/ifpga/base/opae_ifpga_hw_api.h
index 4c2c990..4c2c990 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_ifpga_hw_api.h
+++ b/drivers/raw/ifpga/base/opae_ifpga_hw_api.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c
index 9ed10e2..9ed10e2 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.c
+++ b/drivers/raw/ifpga/base/opae_intel_max10.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.h b/drivers/raw/ifpga/base/opae_intel_max10.h
index 08b387e..08b387e 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_intel_max10.h
+++ b/drivers/raw/ifpga/base/opae_intel_max10.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_osdep.h b/drivers/raw/ifpga/base/opae_osdep.h
index 1596adc..1596adc 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_osdep.h
+++ b/drivers/raw/ifpga/base/opae_osdep.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.c b/drivers/raw/ifpga/base/opae_spi.c
index cc52782..cc52782 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_spi.c
+++ b/drivers/raw/ifpga/base/opae_spi.c
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi.h b/drivers/raw/ifpga/base/opae_spi.h
index ab66e1f..ab66e1f 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_spi.h
+++ b/drivers/raw/ifpga/base/opae_spi.h
diff --git a/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c b/drivers/raw/ifpga/base/opae_spi_transaction.c
index 17ec3c1..17ec3c1 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_spi_transaction.c
+++ b/drivers/raw/ifpga/base/opae_spi_transaction.c
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h b/drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
index 6769109..6769109 100644
--- a/drivers/raw/ifpga_rawdev/base/osdep_raw/osdep_generic.h
+++ b/drivers/raw/ifpga/base/osdep_raw/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
index 3ff49a8..3ff49a8 100644
--- a/drivers/raw/ifpga_rawdev/base/osdep_rte/osdep_generic.h
+++ b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index fef89e6..fef89e6 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h
index e153dba..e153dba 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.h
+++ b/drivers/raw/ifpga/ifpga_rawdev.h
diff --git a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga/meson.build
index 0ab6fd7..0ab6fd7 100644
--- a/drivers/raw/ifpga_rawdev/meson.build
+++ b/drivers/raw/ifpga/meson.build
diff --git a/drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map b/drivers/raw/ifpga/rte_pmd_ifpga_version.map
index 9b9ab1a..9b9ab1a 100644
--- a/drivers/raw/ifpga_rawdev/rte_pmd_ifpga_rawdev_version.map
+++ b/drivers/raw/ifpga/rte_pmd_ifpga_version.map
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
index c2d0348..bcd5553 100644
--- a/drivers/raw/meson.build
+++ b/drivers/raw/meson.build
@@ -2,9 +2,9 @@
# Copyright 2018 NXP
drivers = ['dpaa2_cmdif', 'dpaa2_qdma',
- 'ifpga_rawdev', 'ioat', 'ntb',
+ 'ifpga', 'ioat', 'ntb',
'octeontx2_dma',
- 'skeleton_rawdev']
+ 'skeleton']
std_deps = ['rawdev']
config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
driver_name_fmt = 'rte_pmd_@0@'
diff --git a/drivers/raw/skeleton_rawdev/Makefile b/drivers/raw/skeleton/Makefile
index 3f97c2e..9641e65 100644
--- a/drivers/raw/skeleton_rawdev/Makefile
+++ b/drivers/raw/skeleton/Makefile
@@ -15,7 +15,7 @@ LDLIBS += -lrte_rawdev
LDLIBS += -lrte_bus_vdev
LDLIBS += -lrte_kvargs
-EXPORT_MAP := rte_pmd_skeleton_rawdev_version.map
+EXPORT_MAP := rte_pmd_skeleton_version.map
LIBABIVER := 1
diff --git a/drivers/raw/skeleton_rawdev/meson.build b/drivers/raw/skeleton/meson.build
index b4a6ed0..b4a6ed0 100644
--- a/drivers/raw/skeleton_rawdev/meson.build
+++ b/drivers/raw/skeleton/meson.build
diff --git a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map b/drivers/raw/skeleton/rte_pmd_skeleton_version.map
index 179140f..179140f 100644
--- a/drivers/raw/skeleton_rawdev/rte_pmd_skeleton_rawdev_version.map
+++ b/drivers/raw/skeleton/rte_pmd_skeleton_version.map
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
index 586183a..586183a 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.c
+++ b/drivers/raw/skeleton/skeleton_rawdev.c
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev.h b/drivers/raw/skeleton/skeleton_rawdev.h
index c3f92e7..c3f92e7 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev.h
+++ b/drivers/raw/skeleton/skeleton_rawdev.h
diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton/skeleton_rawdev_test.c
index 9ecfdee..9ecfdee 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton/skeleton_rawdev_test.c