linux/xilinx-kmeta: Consolidate zybo-linux-bd-zynq7 configs

Consolidate the BSP specific configs for the ZYBO Linux-BD BSP.

Move Xilinx DRM fragment under bsp/xilinx/soc/drivers-drm, this fragment
is currently only useful for linux-xlnx targets.

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

11 files changed, 28 insertions, 38 deletions

diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf
index d44575bd..b73d908d 100644
--- a/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/conf/machine/zybo-linux-bd-zynq7.conf
@@ -33,8 +33,6 @@ IMAGE_BOOT_FILES += " \
                 "
 
 KERNEL_FEATURES += " \
-                bsp/zybo-linux-bd-zynq7/zybo-snd.scc \
-                bsp/digilent/drm-digilent.scc \
-                features/gpio/kb-gpio.scc \
+                bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc \
                 features/v4l2/v4l2-xilinx.scc \
                 "
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg
deleted file mode 100644
index f7684cea..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Drivers for Digilent DRM encoder
-
-# DRM encoder
-CONFIG_DRM_DIGILENT_ENCODER=y
-
-# Common Clock Framework
-CONFIG_COMMON_CLK_DGLNT_DYNCLK=y
-
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc
deleted file mode 100644
index f4c347b5..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Support Digilent DRM Encoder"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware drm-digilent.cfg
-include features/drm/drm-xilinx.scc
\ No newline at end of file
diff --git a/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.cfg
index 0f66c8bc..0f66c8bc 100644
--- a/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.cfg
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.cfg
diff --git a/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.scc
index 849963a5..56c80c3a 100644
--- a/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.scc
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.scc
@@ -1,4 +1,4 @@
 define KFEATURE_DESCRIPTION "Enable Xilinx DRM support"
 define KFEATURE_COMPATIBILITY board
 
-kconfig hardware drm-xilinx.cfg
\ No newline at end of file
+kconfig hardware drivers-drm.cfg
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg
new file mode 100644
index 00000000..37eaa4cf
--- /dev/null
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg
@@ -0,0 +1,19 @@
+# Keyboard GPIO support
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_GPIO_POLLED=y
+
+# Sound support for Zybo linux_bd project
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_ADI=y
+CONFIG_SND_SOC_ADI_AXI_I2S=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_SOC_SSM2602_I2C=y
+
+# Drivers for Digilent DRM encoder
+# DRM encoder
+CONFIG_DRM_DIGILENT_ENCODER=y
+# Common Clock Framework
+CONFIG_COMMON_CLK_DGLNT_DYNCLK=y
+
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc
new file mode 100644
index 00000000..f3e6e8b8
--- /dev/null
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc
@@ -0,0 +1,7 @@
+define KFEATURE_DESCRIPTION "Kernel Config for ZYBO Linux-BD Design"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware zybo-linux-bd-zynq7.cfg
+
+include bsp/xilinx/soc/drivers-drm.scc
+
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
deleted file mode 100644
index e94a9d81..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-# Sound support for Zybo linux_bd project
-
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_ADI=y
-CONFIG_SND_SOC_ADI_AXI_I2S=y
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_SOC_SSM2602_I2C=y
-
diff --git a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
deleted file mode 100644
index a29d8d98..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Sound support for Digilent ZYBO linux_bd project"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware zybo-snd.cfg
\ No newline at end of file
diff --git a/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg b/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg
deleted file mode 100644
index bbe6ec53..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Keyboard GPIO support
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
diff --git a/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc b/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc
deleted file mode 100644
index 34632d9f..00000000
--- a/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable keyboard GPIO support"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware kb-gpio.cfg
\ No newline at end of file