linux/config: Update and improve config fragments

Update and add new config fragments to enable newer features that are
now in the newer kernels (e.g. Zynq and ZynqMP drivers/features). This
update also attempts to cover ZynqMP configuration that is normally
provided by the ZynqMP defconfig in linux-xlnx, this allows for better
consistency between the Zynq/ZynqMP/MicroBlaze configuration for
linux-xlnx as well as enabling better configuration setup for the
linux-yocto* kernels.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

32 files changed, 177 insertions, 37 deletions

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 6640de7a..1c8b2f50 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
@@ -1,12 +1,20 @@
 
-# DMA
+# Xilinx DMA engines
 CONFIG_XILINX_DMA_ENGINES=y
-CONFIG_XILINX_AXIDMA=y
-CONFIG_XILINX_AXICDMA=y
-# DMA (linux-xlnx 3.14 only)
-CONFIG_XILINX_AXIVDMA=y
 
 # Xilinx Traffic Generator
 CONFIG_XILINX_TRAFGEN=y
 
+# Xilinx Perfmon UIO driver
+CONFIG_UIO_XILINX_APM=y
+
+# Interrupt controller
+CONFIG_XILINX_INTC=y
+
+# Xilinx PHY
 CONFIG_XILINX_PHY=y
+
+# JESD204B PHY
+CONFIG_XILINX_JESD204B=y
+CONFIG_XILINX_JESD204B_PHY=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
index de22f5ba..ac8cdb29 100644
--- 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
@@ -12,8 +12,3 @@ CONFIG_SPI_ZYNQ_QSPI=y
 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/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg
index 37d02cb9..e7c6e7ec 100644
--- 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
@@ -1,16 +1,39 @@
 
+CONFIG_SOC_XILINX_ZYNQMP=y
+
 # DMA
 CONFIG_DMADEVICES=y
 CONFIG_XILINX_DMA_ENGINES=y
 CONFIG_XILINX_DPDMA=y
-CONFIG_XILINX_ZYNQMP_DMA=y
 
 # NAND
+CONFIG_MTD=y
+CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ARASAN=y
 
 # PCIe
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_XILINX_NWL=y
+CONFIG_PCIE_XILINX_NWL=y
 
 # CONFIG_ARM_MALI is not set
+
+CONFIG_PHY_XILINX_ZYNQMP=y
+
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_CORTEX_ARM64=y
+CONFIG_EDAC_SYNOPSYS=y
+CONFIG_EDAC_ZYNQMP_OCM=y
+
+# Sound
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_XILINX_DP=y
+
+# Ethernet
+CONFIG_MACB_EXT_BD=y
+
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg
new file mode 100644
index 00000000..190c3bca
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg
@@ -0,0 +1,3 @@
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.scc b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.scc
new file mode 100644
index 00000000..395a1ca5
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable Huge Pages support"
+define KFEATURE_COMPATIBILITY arch
+
+kconf non-hardware hugepages.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg
new file mode 100644
index 00000000..6f48ed18
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg
@@ -0,0 +1,2 @@
+CONFIG_HUGETLB_PAGE=y
+CONFIG_HUGETLBFS=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc
new file mode 100644
index 00000000..1d0df3ce
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable Huge TLB support"
+define KFEATURE_COMPATIBILITY arch
+
+kconf non-hardware hugetlb.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg
new file mode 100644
index 00000000..5b4fb2d5
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg
@@ -0,0 +1,19 @@
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_TRIGGERS=y
+
+CONFIG_LEDS_TRIGGER_CPU=y
+
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_CAMERA=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+
+# GPIO features requires GPIOLIB
+# Include them here, but they won't be enabled unless GPIO is explicitly
+# enabled as well.
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGER_GPIO=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc
new file mode 100644
index 00000000..69992a4f
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable LED class and triggers"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware leds.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg b/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
index a1ae1110..2e9142f1 100644
--- a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
+++ b/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
@@ -1,3 +1 @@
 CONFIG_SCSI=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
diff --git a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
index 1a3db46b..c707f968 100644
--- a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
+++ b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
@@ -47,6 +47,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_TMPFS_POSIX_ACL=y
 
 CONFIG_CONNECTOR=y
 
@@ -69,7 +70,12 @@ CONFIG_TMPFS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_XATTR=y
 CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
 CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
 
diff --git a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
index d83766ee..288b8696 100644
--- a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
+++ b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
@@ -2,3 +2,6 @@
 
 kconf non-hardware standard.cfg
 
+include features/hugetlb/hugetlb.scc
+include features/hugetlb/hugepages.scc
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg
index 15632d2d..f7684cea 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg
@@ -4,4 +4,5 @@
 CONFIG_DRM_DIGILENT_ENCODER=y
 
 # Common Clock Framework
-CONFIG_COMMON_CLK_DGLNT_DYNCLK=y
\ No newline at end of file
+CONFIG_COMMON_CLK_DGLNT_DYNCLK=y
+
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
index 5adfca85..efd17c30 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
@@ -4,7 +4,24 @@
 
 # Ethernet PHYs
 CONFIG_PHYLIB=y
+CONFIG_AMD_PHY=y
+CONFIG_AT803X_PHY=y
+CONFIG_BCM7XXX_PHY=y
+CONFIG_BCM87XX_PHY=y
+CONFIG_BROADCOM_PHY=y
+CONFIG_CICADA_PHY=y
+CONFIG_DAVICOM_PHY=y
+CONFIG_DP83867_PHY=y
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=y
+CONFIG_LSI_ET1011C_PHY=y
+CONFIG_LXT_PHY=y
 CONFIG_MARVELL_PHY=y
+CONFIG_MICREL_PHY=y
+CONFIG_NATIONAL_PHY=y
+CONFIG_QSEMI_PHY=y
+CONFIG_REALTEK_PHY=y
+CONFIG_SMSC_PHY=y
 CONFIG_VITESSE_PHY=y
 
 # I2C
@@ -12,6 +29,9 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_MUX_PCA9541=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
 
 # EEPROM
 CONFIG_EEPROM_AT24=y
@@ -29,9 +49,20 @@ CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_HWMON=y
 CONFIG_PMBUS=y
 CONFIG_SENSORS_PMBUS=y
-CONFIG_REGULATOR=y
+# Power
 CONFIG_SENSORS_UCD9000=y
 CONFIG_SENSORS_UCD9200=y
+CONFIG_SENSORS_INA2XX=y
+CONFIG_SENSORS_MAX20751=y
+
+# Regulators
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+
+# Reset/power-off GPIO
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_LTC2952=y
 
 # RTC drivers
 CONFIG_RTC_CLASS=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
index 6f1cd26c..d79417d6 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
@@ -3,3 +3,5 @@ define KFEATURE_COMPATIBILITY board
 
 kconfig hardware board-common.cfg
 
+include features/leds/leds.scc
+
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 c3c87f7c..86914fbf 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
@@ -1,7 +1,7 @@
 
-# Device tree (for linux-xlnx 3.14)
-CONFIG_PROC_DEVICETREE=y
-
 # Debug
 CONFIG_PRINTK_TIME=y
 
+# Disable /dev/kmem
+# CONFIG_DEVKMEM is not set
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
index 3f29390e..a17fd2cf 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
@@ -4,7 +4,6 @@ define KFEATURE_COMPATIBILITY board
 kconfig hardware common.cfg
 
 include features/scsi/scsi.scc
-include features/scsi/scsi-generic.scc
 include features/scsi/disk.scc
 
 include features/mtd/mtd.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
index 3d03f180..5098d9b2 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
@@ -8,6 +8,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 
 # DMA
 CONFIG_DMADEVICES=y
+CONFIG_XILINX_DMA=y
 CONFIG_XILINX_VDMA=y
 
 # Watchdog
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 6db1341e..50af2e15 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
@@ -1,12 +1,18 @@
 
 # UART
 CONFIG_TTY=y
+CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 
 # SRAM
 CONFIG_SRAM=y
 
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_SYNOPSYS=y
+
 # DMA
 CONFIG_DMADEVICES=y
 CONFIG_PL330_DMA=y
@@ -44,6 +50,7 @@ CONFIG_CAN_XILINXCAN=y
 
 # MMC/SD
 CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=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
index 0ed616c3..dc69a659 100644
--- 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
@@ -1,6 +1,14 @@
 
+# Bus
+CONFIG_ARM_CCI400_PMU=y
+
+# IOMMU
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_ARM_SMMU=y
+
 # Serial
 CONFIG_TTY=y
+CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 
@@ -37,6 +45,8 @@ CONFIG_CAN_XILINXCAN=y
 
 # SATA
 CONFIG_ATA=y
+CONFIG_ATA_SFF=y
+CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_AHCI_CEVA=y
 
 # MMC/SD
@@ -52,3 +62,7 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
 
+# DMA
+CONFIG_DMA_ENGINE=y
+CONFIG_XILINX_ZYNQMP_DMA=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 0703af3a..be79ad7d 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,3 +7,7 @@ CONFIG_ARCH_ZYNQMP=y
 # SMP
 CONFIG_SMP=y
 
+# ARM 32-Bit compatiblity
+CONFIG_COMPAT=y
+# CONFIG_COMPAT_BRK is not set
+
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 1ac78c51..3c223894 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,7 +2,7 @@
 include cfg/timer/hz_100.scc
 
 kconf hardware zynqmp.cfg
-# include bsp/xilinx/soc/drivers/xilinx.scc
+include bsp/xilinx/soc/drivers/xilinx.scc
 include bsp/xilinx/soc/drivers/zynqmp.scc
 include bsp/xilinx/common.scc
 
diff --git a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg b/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
index e4727976..7b01ea0a 100644
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
@@ -18,3 +18,6 @@ CONFIG_SPARSE_RCU_POINTER=y
 # CONFIG_RCU_TORTURE_TEST not set
 CONFIG_RCU_CPU_STALL_INFO=y
 
+# SYSRQ
+CONFIG_MAGIC_SYSRQ=y
+
diff --git a/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg b/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg
index 2ca111d2..0f66c8bc 100644
--- a/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg
@@ -1,7 +1,7 @@
 # CMA
 CONFIG_CMA=y
 CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=40
+CONFIG_CMA_SIZE_MBYTES=128
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 CONFIG_CMA_ALIGNMENT=8
 
@@ -10,4 +10,5 @@ CONFIG_DRM=y
 CONFIG_DRM_XILINX=y
 
 # frame buffer console
-CONFIG_FRAMEBUFFER_CONSOLE=y
\ No newline at end of file
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
diff --git a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
new file mode 100644
index 00000000..190c3bca
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
@@ -0,0 +1,3 @@
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+
diff --git a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
new file mode 100644
index 00000000..395a1ca5
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable Huge Pages support"
+define KFEATURE_COMPATIBILITY arch
+
+kconf non-hardware hugepages.cfg
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
deleted file mode 100644
index 8e298861..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# 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/scsi/scsi-generic.scc b/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc
deleted file mode 100644
index ad4a5681..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/scsi/scsi-generic.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable Options for SCSI Generic Support"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware scsi-generic.cfg
-
diff --git a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg
index 6c066070..048ffe49 100644
--- a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg
@@ -1,2 +1,4 @@
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_UIO_DMEM_GENIRQ=y
+
diff --git a/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg b/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg
index c080d7ed..49a5d6fe 100644
--- a/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg
@@ -2,18 +2,22 @@
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+
+# V4L
+CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 
 # Xilinx Video drivers
-CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_XILINX=y
 CONFIG_VIDEO_XILINX_CFA=y
 CONFIG_VIDEO_XILINX_CRESAMPLE=y
+CONFIG_VIDEO_XILINX_HLS=y
 CONFIG_VIDEO_XILINX_REMAPPER=y
 CONFIG_VIDEO_XILINX_RGB2YUV=y
 CONFIG_VIDEO_XILINX_SCALER=y
 CONFIG_VIDEO_XILINX_SWITCH=y
 CONFIG_VIDEO_XILINX_TPG=y
 CONFIG_VIDEO_XILINX_VTC=y
+
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
index 5fae2cb4..e94a9d81 100644
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
+++ b/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
@@ -6,4 +6,5 @@ CONFIG_SND_SOC=y
 CONFIG_SND_SOC_ADI=y
 CONFIG_SND_SOC_ADI_AXI_I2S=y
 CONFIG_SND_SIMPLE_CARD=y
-CONFIG_SND_SOC_SSM2602_I2C=y
\ No newline at end of file
+CONFIG_SND_SOC_SSM2602_I2C=y
+
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index 4ec8826f..89ce20d7 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -27,5 +27,9 @@ KCONFIG_MODE_zcu102-zynqmp = "alldefconfig"
 
 KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc"
 KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc"
-KERNEL_FEATURES_append_zynqmp = " bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc"
+KERNEL_FEATURES_append_zynqmp = " \
+                bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc \
+                features/drm/drm-xilinx.scc \
+                features/v4l2/v4l2-xilinx.scc \
+                "