From 6213adf2b26d94db3dc2837add22020ba0488059 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 7 Dec 2015 22:45:11 +1000 Subject: 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 --- .../bsp/xilinx/soc/drivers/xilinx.cfg | 41 ++++++++++++ .../bsp/xilinx/soc/drivers/xilinx.scc | 5 ++ .../xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg | 73 ++++++++++++++++++++++ .../xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc | 5 ++ .../xilinx-common/bsp/xilinx/soc/microblaze.scc | 2 +- .../bsp/xilinx/soc/xilinx-drivers.cfg | 41 ------------ .../bsp/xilinx/soc/xilinx-drivers.scc | 5 -- .../config/xilinx-common/bsp/xilinx/soc/zynq.cfg | 47 -------------- .../config/xilinx-common/bsp/xilinx/soc/zynq.scc | 10 --- .../xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg | 73 ---------------------- .../config/xilinx-common/bsp/xilinx/soc/zynq7.cfg | 47 ++++++++++++++ .../config/xilinx-common/bsp/xilinx/soc/zynq7.scc | 10 +++ .../xilinx-common/bsp/xilinx/zynq-standard.scc | 2 +- 13 files changed, 183 insertions(+), 178 deletions(-) create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg new file mode 100644 index 00000000..fc53f3d1 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg @@ -0,0 +1,41 @@ + +# Serial/UART +CONFIG_SERIAL=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_UARTLITE=y +CONFIG_SERIAL_UARTLITE_CONSOLE=y + +# DMA +CONFIG_DMADEVICES=y +CONFIG_XILINX_VDMA=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_XILINX_WATCHDOG=y + +# Ethernet +CONFIG_XILINX_EMACLITE=y +CONFIG_XILINX_AXI_EMAC=y + +# GPIO +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_XILINX=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_XILINX=y + +# SPI +CONFIG_SPI=y +CONFIG_SPI_XILINX=y + +# Xilinx XADC +CONFIG_IIO=y +CONFIG_XILINX_XADC=y + +# Xilinx AXI USB2 Device +CONFIG_USB_GADGET_XILINX=y + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc new file mode 100644 index 00000000..7d5b75e9 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" +define KFEATURE_COMPATIBILITY board + +kconfig hardware xilinx.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg new file mode 100644 index 00000000..4ddf9db2 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg @@ -0,0 +1,73 @@ + +# UART +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y + +# SRAM +CONFIG_SRAM=y + +# DMA +CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y + +# PL310 +CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_PL310_ERRATA_769419=y + +# Devcfg +CONFIG_XILINX_DEVCFG=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_CADENCE_WATCHDOG=y + +# Ethernet +CONFIG_MACB=y +CONFIG_XILINX_PS_EMAC=y + +# GPIO +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_ZYNQ=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_CADENCE=y + +# SPI +CONFIG_SPI=y +CONFIG_SPI_CADENCE=y +CONFIG_SPI_ZYNQ_QSPI=y + +# CAN +CONFIG_CAN=y +CONFIG_CAN_XILINXCAN=y + +# MMC/SD +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y + +# NAND +CONFIG_MTD_NAND_PL353=y + +# USB +CONFIG_USB=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_OTG=y +CONFIG_USB_GADGET=y + +# USB (+otg) +CONFIG_USB=y +CONFIG_USB_ZYNQ=y +CONFIG_USB_ZYNQ_PHY=y +CONFIG_USB_ZYNQ_ERRATA_DT654401=y +CONFIG_USB_ZYNQ_DR_OF=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ZYNQ=y +CONFIG_USB_GADGET=y + 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/xilinx-drivers.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg deleted file mode 100644 index fc53f3d1..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg +++ /dev/null @@ -1,41 +0,0 @@ - -# Serial/UART -CONFIG_SERIAL=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_UARTLITE=y -CONFIG_SERIAL_UARTLITE_CONSOLE=y - -# DMA -CONFIG_DMADEVICES=y -CONFIG_XILINX_VDMA=y - -# Watchdog -CONFIG_WATCHDOG=y -CONFIG_XILINX_WATCHDOG=y - -# Ethernet -CONFIG_XILINX_EMACLITE=y -CONFIG_XILINX_AXI_EMAC=y - -# GPIO -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y - -# I2C -CONFIG_I2C=y -CONFIG_I2C_XILINX=y - -# SPI -CONFIG_SPI=y -CONFIG_SPI_XILINX=y - -# Xilinx XADC -CONFIG_IIO=y -CONFIG_XILINX_XADC=y - -# Xilinx AXI USB2 Device -CONFIG_USB_GADGET_XILINX=y - 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/xilinx-drivers.scc deleted file mode 100644 index fe6b6103..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc +++ /dev/null @@ -1,5 +0,0 @@ -define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" -define KFEATURE_COMPATIBILITY board - -kconfig hardware xilinx-drivers.cfg - diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg deleted file mode 100644 index 808ec20a..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg +++ /dev/null @@ -1,47 +0,0 @@ - -# Arch Feature Selections -CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_ZYNQ=y -CONFIG_VFP=y -CONFIG_NEON=y -CONFIG_AEABI=y - -# CPU Erratas -CONFIG_ARM_ERRATA_754322=y -CONFIG_ARM_ERRATA_754327=y -CONFIG_ARM_ERRATA_764369=y -CONFIG_ARM_ERRATA_775420=y - -# SMP -CONFIG_SMP=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y - -# Memory -CONFIG_HIGHMEM=y - -# Power management -CONFIG_PM_RUNTIME=y - -# Thermal -CONFIG_THERMAL=y -CONFIG_CPU_THERMAL=y - -# CPU Frequency -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_GENERIC_CPUFREQ_CPU0=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_ZYNQ=y -CONFIG_ARM_ZYNQ_CPUIDLE=y - -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y -CONFIG_EDAC_ZYNQ=y - diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc deleted file mode 100644 index 345cdc9c..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc +++ /dev/null @@ -1,10 +0,0 @@ - -kconf hardware zynq.cfg -kconf hardware zynq7-drivers.cfg -include bsp/xilinx/soc/xilinx-drivers.scc -include bsp/xilinx/common.scc - -include cfg/timer/no_hz.scc -include cfg/usb-mass-storage.scc -include features/blk/dev-ram-32mb.scc - 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/zynq7-drivers.cfg deleted file mode 100644 index 4ddf9db2..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg +++ /dev/null @@ -1,73 +0,0 @@ - -# UART -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y - -# SRAM -CONFIG_SRAM=y - -# DMA -CONFIG_DMADEVICES=y -CONFIG_PL330_DMA=y - -# PL310 -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_PL310_ERRATA_769419=y - -# Devcfg -CONFIG_XILINX_DEVCFG=y - -# Watchdog -CONFIG_WATCHDOG=y -CONFIG_CADENCE_WATCHDOG=y - -# Ethernet -CONFIG_MACB=y -CONFIG_XILINX_PS_EMAC=y - -# GPIO -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_ZYNQ=y - -# I2C -CONFIG_I2C=y -CONFIG_I2C_CADENCE=y - -# SPI -CONFIG_SPI=y -CONFIG_SPI_CADENCE=y -CONFIG_SPI_ZYNQ_QSPI=y - -# CAN -CONFIG_CAN=y -CONFIG_CAN_XILINXCAN=y - -# MMC/SD -CONFIG_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF_ARASAN=y - -# NAND -CONFIG_MTD_NAND_PL353=y - -# USB -CONFIG_USB=y -CONFIG_USB_CHIPIDEA=y -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_OTG=y -CONFIG_USB_GADGET=y - -# USB (+otg) -CONFIG_USB=y -CONFIG_USB_ZYNQ=y -CONFIG_USB_ZYNQ_PHY=y -CONFIG_USB_ZYNQ_ERRATA_DT654401=y -CONFIG_USB_ZYNQ_DR_OF=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ZYNQ=y -CONFIG_USB_GADGET=y - diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg new file mode 100644 index 00000000..808ec20a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg @@ -0,0 +1,47 @@ + +# Arch Feature Selections +CONFIG_ARCH_VEXPRESS=y +CONFIG_ARCH_ZYNQ=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_AEABI=y + +# CPU Erratas +CONFIG_ARM_ERRATA_754322=y +CONFIG_ARM_ERRATA_754327=y +CONFIG_ARM_ERRATA_764369=y +CONFIG_ARM_ERRATA_775420=y + +# SMP +CONFIG_SMP=y +CONFIG_SCHED_MC=y +CONFIG_SCHED_SMT=y + +# Memory +CONFIG_HIGHMEM=y + +# Power management +CONFIG_PM_RUNTIME=y + +# Thermal +CONFIG_THERMAL=y +CONFIG_CPU_THERMAL=y + +# CPU Frequency +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_GENERIC_CPUFREQ_CPU0=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_ZYNQ=y +CONFIG_ARM_ZYNQ_CPUIDLE=y + +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=y +CONFIG_EDAC_ZYNQ=y + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc new file mode 100644 index 00000000..1cea7c3a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc @@ -0,0 +1,10 @@ + +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 +include cfg/usb-mass-storage.scc +include features/blk/dev-ram-32mb.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 -- cgit v1.2.3-54-g00ecf