diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2017-09-30 01:31:33 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-10-18 18:00:09 +1000 |
| commit | f2bf3acefdbe7a96b8cd2997d4fec6d723c043f7 (patch) | |
| tree | 18d4e23c4a7c5e9f07eb9cfab4ed062c5eaba4ad /recipes-kernel | |
| parent | f27e34fc790b5571fdd7bcd8a36320353f5fbb8c (diff) | |
| download | meta-xilinx-f2bf3acefdbe7a96b8cd2997d4fec6d723c043f7.tar.gz | |
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>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg | 8 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc | 5 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.cfg (renamed from recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.cfg) | 0 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-drm.scc (renamed from recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.scc) | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg | 19 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc | 7 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg | 10 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg | 3 | ||||
| -rw-r--r-- | recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc | 4 |
10 files changed, 27 insertions, 35 deletions
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 @@ | |||
| 1 | # Drivers for Digilent DRM encoder | ||
| 2 | |||
| 3 | # DRM encoder | ||
| 4 | CONFIG_DRM_DIGILENT_ENCODER=y | ||
| 5 | |||
| 6 | # Common Clock Framework | ||
| 7 | CONFIG_COMMON_CLK_DGLNT_DYNCLK=y | ||
| 8 | |||
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 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Support Digilent DRM Encoder" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | kconfig hardware drm-digilent.cfg | ||
| 5 | 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 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Enable Xilinx DRM support" | 1 | define KFEATURE_DESCRIPTION "Enable Xilinx DRM support" |
| 2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
| 3 | 3 | ||
| 4 | kconfig hardware drm-xilinx.cfg \ No newline at end of file | 4 | 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 @@ | |||
| 1 | # Keyboard GPIO support | ||
| 2 | CONFIG_KEYBOARD_GPIO=y | ||
| 3 | CONFIG_KEYBOARD_GPIO_POLLED=y | ||
| 4 | |||
| 5 | # Sound support for Zybo linux_bd project | ||
| 6 | CONFIG_SOUND=y | ||
| 7 | CONFIG_SND=y | ||
| 8 | CONFIG_SND_SOC=y | ||
| 9 | CONFIG_SND_SOC_ADI=y | ||
| 10 | CONFIG_SND_SOC_ADI_AXI_I2S=y | ||
| 11 | CONFIG_SND_SIMPLE_CARD=y | ||
| 12 | CONFIG_SND_SOC_SSM2602_I2C=y | ||
| 13 | |||
| 14 | # Drivers for Digilent DRM encoder | ||
| 15 | # DRM encoder | ||
| 16 | CONFIG_DRM_DIGILENT_ENCODER=y | ||
| 17 | # Common Clock Framework | ||
| 18 | CONFIG_COMMON_CLK_DGLNT_DYNCLK=y | ||
| 19 | |||
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 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Kernel Config for ZYBO Linux-BD Design" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | kconf hardware zybo-linux-bd-zynq7.cfg | ||
| 5 | |||
| 6 | include bsp/xilinx/soc/drivers-drm.scc | ||
| 7 | |||
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 @@ | |||
| 1 | # Sound support for Zybo linux_bd project | ||
| 2 | |||
| 3 | CONFIG_SOUND=y | ||
| 4 | CONFIG_SND=y | ||
| 5 | CONFIG_SND_SOC=y | ||
| 6 | CONFIG_SND_SOC_ADI=y | ||
| 7 | CONFIG_SND_SOC_ADI_AXI_I2S=y | ||
| 8 | CONFIG_SND_SIMPLE_CARD=y | ||
| 9 | CONFIG_SND_SOC_SSM2602_I2C=y | ||
| 10 | |||
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 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Sound support for Digilent ZYBO linux_bd project" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | 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 @@ | |||
| 1 | # Keyboard GPIO support | ||
| 2 | CONFIG_KEYBOARD_GPIO=y | ||
| 3 | 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 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Enable keyboard GPIO support" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | kconfig hardware kb-gpio.cfg \ No newline at end of file | ||