diff options
23 files changed, 89 insertions, 97 deletions
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg new file mode 100644 index 00000000..adcc9a4a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg @@ -0,0 +1,14 @@ + +# DMA +CONFIG_XILINX_DMA_ENGINES=y +CONFIG_XILINX_AXIDMA=y +CONFIG_XILINX_AXIVDMA=y +CONFIG_XILINX_AXICDMA=y + +# PCI(e) +CONFIG_XILINX_AXIPCIE=y +CONFIG_PCI_MSI=y + +# Xilinx Traffic Generator +CONFIG_XILINX_TRAFGEN=y + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc index e4f75d7e..3934fdac 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc @@ -1,5 +1,5 @@ -define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support" +define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support (For linux-xlnx kernels)" define KFEATURE_COMPATIBILITY board -kconfig hardware xilinx-ip.cfg +kconfig hardware xilinx-ip-linux-xlnx.cfg diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg index 022c1d19..f762d461 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg @@ -1,6 +1,6 @@ -# Common drivers for Zynq Boards +# Common Board Drivers -CONFIG_LEGACY_PTYS=n +# CONFIG_LEGACY_PTYS is not set # Ethernet PHYs CONFIG_PHYLIB=y @@ -19,6 +19,7 @@ CONFIG_EEPROM_AT25=y # MTD CONFIG_MTD=y +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_M25P80=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc index 480158ee..6f1cd26c 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc @@ -1,4 +1,4 @@ -define KFEATURE_DESCRIPTION "Xilinx Evaluation Board Common Drivers" +define KFEATURE_DESCRIPTION "Xilinx Common Board Drivers" define KFEATURE_COMPATIBILITY board kconfig hardware board-common.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 new file mode 100644 index 00000000..903b4c50 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg @@ -0,0 +1,7 @@ + +# Device tree +CONFIG_PROC_DEVICETREE=y + +# Debug +CONFIG_PRINTK_TIME=y + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc index 955e0275..3f29390e 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc @@ -1,8 +1,7 @@ -include arch/microblaze/microblaze.scc +define KFEATURE_DESCRIPTION "Xilinx Common BSP fragments" +define KFEATURE_COMPATIBILITY board -kconf hardware microblaze.cfg - -include features/xilinx/xilinx-ip.scc +kconfig hardware common.cfg include features/scsi/scsi.scc include features/scsi/scsi-generic.scc @@ -12,3 +11,4 @@ include features/mtd/mtd.scc include features/uio/uio.scc include cfg/fs/debugfs.scc + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc index 66eaccca..170489d4 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc @@ -4,10 +4,10 @@ define KARCH microblaze include ktypes/standard/standard.scc -include bsp/microblaze/microblaze.scc +include bsp/xilinx/soc/microblaze.scc # Common board drivers -include features/xilinx/board-common.scc +include bsp/xilinx/board-common.scc # default policy for standard kernels include features/latencytop/latencytop.scc diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg index 536c8e0d..536c8e0d 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc index e44196bc..e44196bc 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg index e9dcfb7a..464f945b 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg @@ -13,16 +13,15 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 # Memory CONFIG_HIGHMEM=y -# Device tree -CONFIG_PROC_DEVICETREE=y - -# Debug -CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - # OF Scan serial devices CONFIG_SERIAL_OF_PLATFORM=y +# Xilinx SYSACE (MicroBlaze only) +CONFIG_XILINX_SYSACE=y + +# Xilinx HW-ICAP (MicroBlaze only) +CONFIG_XILINX_HWICAP=y + # Disable VT (Non-Functional with MicroBlaze) CONFIG_VT=n # Disable FTRACE, does not work with MicroBlaze 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 new file mode 100644 index 00000000..f5c10386 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc @@ -0,0 +1,6 @@ +include arch/microblaze/microblaze.scc + +kconf hardware microblaze.cfg +include bsp/xilinx/common.scc +include bsp/xilinx/soc/xilinx-drivers.scc + diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg index b72c3841..fc53f3d1 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg @@ -1,7 +1,6 @@ # Serial/UART CONFIG_SERIAL=y -CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_UARTLITE=y @@ -10,10 +9,6 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y # DMA CONFIG_DMADEVICES=y CONFIG_XILINX_VDMA=y -CONFIG_XILINX_DMA_ENGINES=y -CONFIG_XILINX_AXIDMA=y -CONFIG_XILINX_AXIVDMA=y -CONFIG_XILINX_AXICDMA=y # Watchdog CONFIG_WATCHDOG=y @@ -37,20 +32,10 @@ CONFIG_I2C_XILINX=y CONFIG_SPI=y CONFIG_SPI_XILINX=y -# PCI(e) -CONFIG_XILINX_AXIPCIE=y -CONFIG_PCI_MSI=y - -# Xilinx Traffic Generator -CONFIG_XILINX_TRAFGEN=y - # Xilinx XADC CONFIG_IIO=y CONFIG_XILINX_XADC=y -# Xilinx SYSACE -CONFIG_XILINX_SYSACE=y - -# Xilinx HW-ICAP -CONFIG_XILINX_HWICAP=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 new file mode 100644 index 00000000..fe6b6103 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc @@ -0,0 +1,5 @@ +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/zynq/zynq.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg index 07f0ccb2..808ec20a 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg @@ -45,10 +45,3 @@ CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_ZYNQ=y -# Device tree -CONFIG_PROC_DEVICETREE=y - -# Debug -CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=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 new file mode 100644 index 00000000..345cdc9c --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc @@ -0,0 +1,10 @@ + +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/features/xilinx/zynq7-ip.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg index 1ef12244..4ddf9db2 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg @@ -3,15 +3,11 @@ CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -# devcfg -CONFIG_XILINX_DEVCFG=y - # SRAM CONFIG_SRAM=y # DMA CONFIG_DMADEVICES=y -CONFIG_XILINX_DMA_ENGINES=y CONFIG_PL330_DMA=y # PL310 @@ -19,6 +15,9 @@ 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 @@ -53,15 +52,22 @@ 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_OTG=y CONFIG_USB_ZYNQ_DR_OF=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ZYNQ=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_XILINX=y diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg index 57944f37..b9b50088 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg @@ -7,9 +7,6 @@ CONFIG_ARCH_ZYNQMP=y # SMP CONFIG_SMP=y -# Debug -CONFIG_PRINTK_TIME=y - CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=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 new file mode 100644 index 00000000..6713767b --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc @@ -0,0 +1,11 @@ +# include arch/arm64/arm64.scc +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/common.scc + +include cfg/timer/no_hz.scc +include cfg/usb-mass-storage.scc + diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc index 05ab5ec1..f952f080 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc @@ -4,10 +4,10 @@ define KARCH arm include ktypes/standard/standard.scc -include bsp/zynq/zynq.scc +include bsp/xilinx/soc/zynq.scc # Common board drivers -include features/xilinx/board-common.scc +include bsp/xilinx/board-common.scc # default policy for standard kernels include features/latencytop/latencytop.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc index 8092ec7d..bc4f6e8b 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc @@ -4,10 +4,10 @@ define KARCH arm64 include ktypes/standard/standard.scc -include bsp/zynqmp/zynqmp.scc +include bsp/xilinx/soc/zynqmp.scc # Common board drivers -include features/xilinx/board-common.scc +include bsp/xilinx/board-common.scc # default policy for standard kernels #include features/latencytop/latencytop.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc deleted file mode 100644 index 187f83a9..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc +++ /dev/null @@ -1,18 +0,0 @@ -kconf hardware zynq.cfg - -include cfg/timer/no_hz.scc - -include features/xilinx/zynq7-ip.scc -include features/xilinx/xilinx-ip.scc - -include cfg/usb-mass-storage.scc - -include features/scsi/scsi.scc -include features/scsi/scsi-generic.scc -include features/scsi/disk.scc - -include features/blk/dev-ram-32mb.scc -include features/mtd/mtd.scc -include features/uio/uio.scc - -include cfg/fs/debugfs.scc diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc deleted file mode 100644 index 360ba5d1..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc +++ /dev/null @@ -1,19 +0,0 @@ -# include arch/arm64/arm64.scc -include cfg/timer/hz_100.scc - -kconf hardware zynqmp.cfg - -include cfg/timer/no_hz.scc - -# include features/xilinx/xilinx-ip.scc - -include cfg/usb-mass-storage.scc - -include features/scsi/scsi.scc -include features/scsi/scsi-generic.scc -include features/scsi/disk.scc - -include features/mtd/mtd.scc -include features/uio/uio.scc - -include cfg/fs/debugfs.scc diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc deleted file mode 100644 index 3a7f8ce4..00000000 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc +++ /dev/null @@ -1,5 +0,0 @@ -define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 IP Core Drivers/Support" -define KFEATURE_COMPATIBILITY board - -kconfig hardware zynq7-ip.cfg - |