linux/configs: common: Rearrange scc/cfg for drivers

Nest the driver config fragments in soc/drivers whilst keeping the SoC
config fragments at the soc/ level. Also rename 'zynq' to 'zynq7' where
applicable.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

8 files changed, 11 insertions, 6 deletions

diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
index fc53f3d1..fc53f3d1 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
index fe6b6103..7d5b75e9 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
@@ -1,5 +1,5 @@
 define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers"
 define KFEATURE_COMPATIBILITY board
 
-kconfig hardware xilinx-drivers.cfg
+kconfig hardware xilinx.cfg
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
index 4ddf9db2..4ddf9db2 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
new file mode 100644
index 00000000..07c0daf6
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
@@ -0,0 +1,5 @@
+define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers"
+define KFEATURE_COMPATIBILITY board
+
+kconfig hardware zynq7.cfg
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
index f5c10386..e4dd77ae 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
@@ -2,5 +2,5 @@ include arch/microblaze/microblaze.scc
 
 kconf hardware microblaze.cfg
 include bsp/xilinx/common.scc
-include bsp/xilinx/soc/xilinx-drivers.scc
+include bsp/xilinx/soc/drivers/xilinx.scc
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
index 808ec20a..808ec20a 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
index 345cdc9c..1cea7c3a 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
@@ -1,7 +1,7 @@
 
-kconf hardware zynq.cfg
-kconf hardware zynq7-drivers.cfg
-include bsp/xilinx/soc/xilinx-drivers.scc
+kconf hardware zynq7.cfg
+include bsp/xilinx/soc/drivers/xilinx.scc
+include bsp/xilinx/soc/drivers/zynq7.scc
 include bsp/xilinx/common.scc
 
 include cfg/timer/no_hz.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
index f952f080..d0dedb1d 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
@@ -4,7 +4,7 @@ define KARCH arm
 
 include ktypes/standard/standard.scc
 
-include bsp/xilinx/soc/zynq.scc
+include bsp/xilinx/soc/zynq7.scc
 
 # Common board drivers
 include bsp/xilinx/board-common.scc