[meta-xilinx] [PATCH 02/12] linux/configs: base: Rearrange scc/cfg files for linux-xlnx drivers

Nathan Rossi nathan at nathanrossi.com
Mon Dec 28 04:46:02 PST 2015


Rearrange the linux-xlnx specific config fragments, nesting them under
soc/linux-xlnx/driver/. Leaving the 'xilinx-driver-linux-xlnx.scc' for
compatiblity.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 .../bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg          | 15 +++++++++++++++
 .../bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc          |  5 +++++
 .../xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg  | 15 ---------------
 .../xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc  |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg
 create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
 delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg

diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg
new file mode 100644
index 0000000..889b04c
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg
@@ -0,0 +1,15 @@
+
+# DMA
+CONFIG_XILINX_DMA_ENGINES=y
+CONFIG_XILINX_AXIDMA=y
+CONFIG_XILINX_AXIVDMA=y
+CONFIG_XILINX_AXICDMA=y
+CONFIG_XILINX_DPDMA=y
+
+# PCI(e)
+CONFIG_XILINX_AXIPCIE=y
+CONFIG_PCI_MSI=y
+
+# Xilinx Traffic Generator
+CONFIG_XILINX_TRAFGEN=y
+
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
new file mode 100644
index 0000000..9fc0c02
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
@@ -0,0 +1,5 @@
+define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers (From linux-xlnx kernels)"
+define KFEATURE_COMPATIBILITY board
+
+kconfig hardware xilinx.cfg
+
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg
deleted file mode 100644
index 889b04c..0000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# DMA
-CONFIG_XILINX_DMA_ENGINES=y
-CONFIG_XILINX_AXIDMA=y
-CONFIG_XILINX_AXIVDMA=y
-CONFIG_XILINX_AXICDMA=y
-CONFIG_XILINX_DPDMA=y
-
-# PCI(e)
-CONFIG_XILINX_AXIPCIE=y
-CONFIG_PCI_MSI=y
-
-# Xilinx Traffic Generator
-CONFIG_XILINX_TRAFGEN=y
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
index 66c2d31..9e12d2f 100644
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
+++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
@@ -1,5 +1,5 @@
 define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support (For linux-xlnx kernels)"
 define KFEATURE_COMPATIBILITY board
 
-kconfig hardware xilinx-drivers-linux-xlnx.cfg
+include bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
 
-- 
2.6.4




More information about the meta-xilinx mailing list