From 40f5e1996a3f7620dbbeaaa257ac06e6d6eb04b3 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 7 Dec 2015 23:43:48 +1000 Subject: linux/configs: Update config fragments Update and refactor config fragments to work with newer kernels as well as supporting new features that are now available. This changeset also moves a large number of 'linux-xlnx' only drivers into seperate config fragments for cleaner maintainence. Signed-off-by: Nathan Rossi --- .../bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg | 6 +-- .../bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg | 19 +++++++++ .../bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc | 5 +++ .../bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg | 13 ++++++ .../bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc | 5 +++ .../config/xilinx-common/bsp/xilinx/common.cfg | 2 +- .../bsp/xilinx/soc/drivers/xilinx.cfg | 1 - .../xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg | 24 ++++------- .../bsp/xilinx/soc/drivers/zynqmp.cfg | 49 ++++++++++++++++++++++ .../bsp/xilinx/soc/drivers/zynqmp.scc | 5 +++ .../config/xilinx-common/bsp/xilinx/soc/zynq7.cfg | 11 ++--- .../config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg | 5 --- .../config/xilinx-common/bsp/xilinx/soc/zynqmp.scc | 4 +- .../xilinx-common/features/scsi/scsi-generic.cfg | 1 + .../config/xilinx-common/features/xen/xen.cfg | 7 ---- 15 files changed, 113 insertions(+), 44 deletions(-) create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg create mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc 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 index 889b04c5..178d8ef5 100644 --- 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 @@ -2,11 +2,11 @@ # DMA CONFIG_XILINX_DMA_ENGINES=y CONFIG_XILINX_AXIDMA=y -CONFIG_XILINX_AXIVDMA=y CONFIG_XILINX_AXICDMA=y -CONFIG_XILINX_DPDMA=y +# DMA (linux-xlnx 3.14 only) +CONFIG_XILINX_AXIVDMA=y -# PCI(e) +# PCI(e) (linux-xlnx 3.14 & 3.19 only) CONFIG_XILINX_AXIPCIE=y CONFIG_PCI_MSI=y diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg new file mode 100644 index 00000000..de22f5ba --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg @@ -0,0 +1,19 @@ + +# Devcfg +CONFIG_XILINX_DEVCFG=y + +# Ethernet +CONFIG_XILINX_PS_EMAC=y + +# SPI +CONFIG_SPI_ZYNQ_QSPI=y + +# NAND +CONFIG_MTD_NAND_PL353=y +CONFIG_MTD_NAND_PL35X=y + +# EDAC +CONFIG_EDAC=y +CONFIG_EDAC_MM_EDAC=y +CONFIG_EDAC_ZYNQ=y + diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc new file mode 100644 index 00000000..66f3c675 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers (From linux-xlnx kernels)" +define KFEATURE_COMPATIBILITY board + +kconfig hardware zynq7.cfg + diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg new file mode 100644 index 00000000..84da2da2 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg @@ -0,0 +1,13 @@ + +# DMA +CONFIG_XILINX_DMA_ENGINES=y +CONFIG_XILINX_DPDMA=y +CONFIG_XILINX_ZYNQMP_DMA=y + +# NAND +CONFIG_MTD_NAND_ARASAN=y + +# PCIe +CONFIG_PCI_MSI=y +CONFIG_PCI_XILINX_NWL=y + diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc new file mode 100644 index 00000000..4bd73e4c --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers (From linux-xlnx kernels)" +define KFEATURE_COMPATIBILITY board + +kconfig hardware zynqmp.cfg + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg index 903b4c50..c3c87f7c 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg @@ -1,5 +1,5 @@ -# Device tree +# Device tree (for linux-xlnx 3.14) CONFIG_PROC_DEVICETREE=y # Debug 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 index fc53f3d1..d2582335 100644 --- 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 @@ -1,6 +1,5 @@ # Serial/UART -CONFIG_SERIAL=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_UARTLITE=y 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 index 4ddf9db2..78b6beab 100644 --- 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 @@ -15,16 +15,12 @@ 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 @@ -37,7 +33,6 @@ CONFIG_I2C_CADENCE=y # SPI CONFIG_SPI=y CONFIG_SPI_CADENCE=y -CONFIG_SPI_ZYNQ_QSPI=y # CAN CONFIG_CAN=y @@ -49,11 +44,9 @@ 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_EHCI_HCD=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y @@ -61,13 +54,10 @@ 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 +# PCIe +CONFIG_PCIE_XILINX=y + +# FPGA +CONFIG_FPGA=y +CONFIG_FPGA_MGR_ZYNQ_FPGA=y diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg new file mode 100644 index 00000000..3c50e481 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg @@ -0,0 +1,49 @@ + +# Serial +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_CADENCE_WATCHDOG=y + +# RTC +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_ZYNQMP=y + +# Ethernet +CONFIG_MACB=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_ZYNQMP_GQSPI=y + +# CAN +CONFIG_CAN=y +CONFIG_CAN_XILINXCAN=y + +# SATA +CONFIG_ATA=y +CONFIG_AHCI_CEVA=y + +# MMC/SD +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y + +# USB +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_ULPI=y +CONFIG_USB_OTG=y +CONFIG_USB_GADGET=y + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc new file mode 100644 index 00000000..70474078 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers" +define KFEATURE_COMPATIBILITY board + +kconfig hardware zynqmp.cfg + 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 index 808ec20a..fc65839a 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg @@ -20,7 +20,7 @@ CONFIG_SCHED_SMT=y # Memory CONFIG_HIGHMEM=y -# Power management +# Power management (For linux-xlnx 3.14) CONFIG_PM_RUNTIME=y # Thermal @@ -35,13 +35,8 @@ 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 +# (For linux-xlnx 3.14) +CONFIG_GENERIC_CPUFREQ_CPU0=y diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg index b9b50088..0703af3a 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg @@ -7,8 +7,3 @@ CONFIG_ARCH_ZYNQMP=y # SMP CONFIG_SMP=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y - -CONFIG_MACB=y - diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc index 6713767b..1ac78c51 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc @@ -2,8 +2,8 @@ include cfg/timer/hz_100.scc kconf hardware zynqmp.cfg -# include bsp/xilinx/soc/xilinx-drivers.scc -# include bsp/xilinx/soc/zynqmp-ip.scc +# include bsp/xilinx/soc/drivers/xilinx.scc +include bsp/xilinx/soc/drivers/zynqmp.scc include bsp/xilinx/common.scc include cfg/timer/no_hz.scc diff --git a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg index 70210a01..8e298861 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg +++ b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg @@ -1,4 +1,5 @@ # Generic SCSI CONFIG_CHR_DEV_SG=y +# (For linux-xlnx 3.14) CONFIG_SCSI_MULTI_LUN=y diff --git a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg b/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg index 835802e0..ee01563b 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg +++ b/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg @@ -1,8 +1,3 @@ -### -# linux 3.4, 3.8 -CONFIG_PARAVIRT_GUEST=y -### - ### # linux 3.10 CONFIG_HYPERVISOR_GUEST=y @@ -11,9 +6,7 @@ CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_XEN=y CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y CONFIG_PARAVIRT_CLOCK=y CONFIG_HIBERNATE_CALLBACKS=y -- cgit v1.2.3-54-g00ecf