aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/config/xilinx-common/bsp
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/config/xilinx-common/bsp')
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg39
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc)8
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg)13
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc6
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg41
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg)7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc10
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg73
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg)3
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc11
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc18
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc19
20 files changed, 220 insertions, 64 deletions
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
new file mode 100644
index 00000000..f762d461
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
@@ -0,0 +1,39 @@
+# Common Board Drivers
+
+# CONFIG_LEGACY_PTYS is not set
+
+# Ethernet PHYs
+CONFIG_PHYLIB=y
+CONFIG_MARVELL_PHY=y
+CONFIG_VITESSE_PHY=y
+
+# I2C
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
+
+# EEPROM
+CONFIG_EEPROM_AT24=y
+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
+
+# Hardware monitors
+CONFIG_PMBUS=y
+CONFIG_SENSORS_PMBUS=y
+CONFIG_REGULATOR=y
+CONFIG_SENSORS_UCD9000=y
+CONFIG_SENSORS_UCD9200=y
+
+# RTC drivers
+CONFIG_RTC_DRV_PCF8563=y
+
+# SI570 I2C Device
+CONFIG_COMMON_CLK_SI570=y
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
new file mode 100644
index 00000000..6f1cd26c
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
@@ -0,0 +1,5 @@
+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/bsp/xilinx/soc/disable-macb.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg
new file mode 100644
index 00000000..536c8e0d
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg
@@ -0,0 +1,2 @@
+CONFIG_MACB=n
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc
new file mode 100644
index 00000000..e44196bc
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc
@@ -0,0 +1,5 @@
+define KFEATURE_DESCRIPTION "Disable the MACB Ethernet Driver"
+define KFEATURE_COMPATIBILITY board
+
+kconfig hardware disable-macb.cfg
+
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/bsp/xilinx/soc/xilinx-drivers.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg
new file mode 100644
index 00000000..fc53f3d1
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.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/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/bsp/xilinx/soc/zynq7-drivers.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg
new file mode 100644
index 00000000..4ddf9db2
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.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/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