From 5b05fc833577bb4c5f4b9a7e4d425a11ee46cbb5 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 7 Dec 2015 22:49:10 +1000 Subject: linux/configs: base: Rearrange scc/cfg files for linux-xlnx drivers 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 --- .../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 00000000..889b04c5 --- /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 00000000..9fc0c028 --- /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 889b04c5..00000000 --- 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 66c2d313..9e12d2fa 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 -- cgit v1.2.3-54-g00ecf