Enable FPGA Manager kernel framework

32 files changed, 250 insertions, 19 deletions

diff --git a/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE b/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE
new file mode 100644
index 000000000..a0fd395df
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE
@@ -0,0 +1 @@
+CONFIG_ALTERA_PR_IP_CORE=m
diff --git a/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE_PLAT=n b/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE_PLAT=n
new file mode 100644
index 000000000..6965c768b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ALTERA_PR_IP_CORE_PLAT=n
@@ -0,0 +1 @@
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
diff --git a/configs/fedora/generic/CONFIG_FPGA b/configs/fedora/generic/CONFIG_FPGA
index 8bb6ca99e..d2b7e02ab 100644
--- a/configs/fedora/generic/CONFIG_FPGA
+++ b/configs/fedora/generic/CONFIG_FPGA
@@ -1 +1 @@
-# CONFIG_FPGA is not set
+CONFIG_FPGA=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_BRIDGE b/configs/fedora/generic/CONFIG_FPGA_BRIDGE
new file mode 100644
index 000000000..079e28b13
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_BRIDGE
@@ -0,0 +1 @@
+CONFIG_FPGA_BRIDGE=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_CVP b/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_CVP
new file mode 100644
index 000000000..82ea7b1e3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_CVP
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_ALTERA_CVP=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_PS_SPI b/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_PS_SPI
new file mode 100644
index 000000000..2a4d73470
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_ALTERA_PS_SPI
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_ICE40_SPI b/configs/fedora/generic/CONFIG_FPGA_MGR_ICE40_SPI
new file mode 100644
index 000000000..563232ae3
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_ICE40_SPI
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_ICE40_SPI=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_MACHXO2_SPI b/configs/fedora/generic/CONFIG_FPGA_MGR_MACHXO2_SPI
new file mode 100644
index 000000000..b81709352
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_MACHXO2_SPI
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_XILINX_SPI b/configs/fedora/generic/CONFIG_FPGA_MGR_XILINX_SPI
new file mode 100644
index 000000000..f04ba5558
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_XILINX_SPI
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_XILINX_SPI=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_MGR_ZYNQ_FPGA=n b/configs/fedora/generic/CONFIG_FPGA_MGR_ZYNQ_FPGA=n
new file mode 100644
index 000000000..4923c59b0
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_MGR_ZYNQ_FPGA=n
@@ -0,0 +1 @@
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
diff --git a/configs/fedora/generic/CONFIG_FPGA_REGION b/configs/fedora/generic/CONFIG_FPGA_REGION
new file mode 100644
index 000000000..3dfea57d2
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FPGA_REGION
@@ -0,0 +1 @@
+CONFIG_FPGA_REGION=m
diff --git a/configs/fedora/generic/CONFIG_OF_FPGA_REGION b/configs/fedora/generic/CONFIG_OF_FPGA_REGION
new file mode 100644
index 000000000..880f924a0
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_OF_FPGA_REGION
@@ -0,0 +1 @@
+CONFIG_OF_FPGA_REGION=m
diff --git a/configs/fedora/generic/CONFIG_XILINX_PR_DECOUPLER b/configs/fedora/generic/CONFIG_XILINX_PR_DECOUPLER
new file mode 100644
index 000000000..b83937147
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XILINX_PR_DECOUPLER
@@ -0,0 +1 @@
+CONFIG_XILINX_PR_DECOUPLER=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 86cfd1c72..f2489c47e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -183,6 +183,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1808,7 +1810,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4152,6 +4162,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -6990,6 +7001,7 @@ CONFIG_XGENE_PMU=y
 CONFIG_XGENE_SLIMPRO_MBOX=m
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILINX_ZYNQMP_DMA=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 4d6003578..09ba5c062 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -183,6 +183,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1790,7 +1792,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4130,6 +4140,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -6966,6 +6977,7 @@ CONFIG_XGENE_PMU=y
 CONFIG_XGENE_SLIMPRO_MBOX=m
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILINX_ZYNQMP_DMA=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 04f93a6be..72a505842 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -161,6 +161,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1924,7 +1926,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4371,6 +4381,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -7501,6 +7512,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 005231928..81ef06112 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -159,6 +159,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1828,7 +1830,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4185,6 +4195,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -7045,6 +7056,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ca671a56a..21f200d56 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -159,6 +159,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1810,7 +1812,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4163,6 +4173,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -7021,6 +7032,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILINX_ZYNQMP_DMA is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 794edfdfa..d81f28103 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -161,6 +161,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1906,7 +1908,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4349,6 +4359,7 @@ CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_FLATTREE=y
+CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
@@ -7477,6 +7488,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 7aa906ed6..ae2feca2d 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -203,6 +203,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1632,7 +1634,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3961,6 +3971,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6598,6 +6609,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 3e2b903f8..34fa6ef07 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -203,6 +203,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1653,7 +1655,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3984,6 +3994,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6623,6 +6634,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 810b3f13c..d99171272 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -203,6 +203,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1653,7 +1655,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3984,6 +3994,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6621,6 +6632,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 9b4236dbc..c4a9393c3 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -203,6 +203,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1632,7 +1634,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3961,6 +3971,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6596,6 +6607,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index fb97f8b5d..b856d001d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -158,6 +158,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALTIVEC=y
@@ -1567,7 +1569,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3799,6 +3809,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCXL=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6298,6 +6309,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILINX_LL_TEMAC is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 9bf502e93..4009c30e3 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -158,6 +158,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALTIVEC=y
@@ -1546,7 +1548,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3774,6 +3784,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCXL=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6271,6 +6282,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILINX_LL_TEMAC is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index bb2795e12..8dd84cea1 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -153,6 +153,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALTIVEC=y
@@ -1520,7 +1522,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3743,6 +3753,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCXL=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6219,6 +6230,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILINX_LL_TEMAC is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index de79f63db..656a21e7a 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -153,6 +153,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALTIVEC=y
@@ -1499,7 +1501,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 CONFIG_FORCEDETH=m
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3718,6 +3728,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCXL=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
@@ -6192,6 +6203,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILINX_LL_TEMAC is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 372f8350a..a62e2ca32 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -153,6 +153,8 @@ CONFIG_ALIM1535_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_ALTERA_TSE is not set
 CONFIG_ALTERNATIVES=y
@@ -1505,7 +1507,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3677,6 +3687,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_PMEM=m
 CONFIG_OMAP_PM_NOOP=y
@@ -6107,6 +6118,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILLYBUS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d09739048..7c7e35e20 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -153,6 +153,8 @@ CONFIG_ALIM1535_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_ALTERA_TSE is not set
 CONFIG_ALTERNATIVES=y
@@ -1484,7 +1486,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -3652,6 +3662,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_PMEM=m
 CONFIG_OMAP_PM_NOOP=y
@@ -6080,6 +6091,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_XILLYBUS is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c2d2b55cd..1749cb00f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -205,6 +205,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1697,7 +1699,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4042,6 +4052,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_PMEM=m
 CONFIG_OMAP_PM_NOOP=y
@@ -6707,6 +6718,7 @@ CONFIG_XFS_QUOTA=y
 CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index bb87bcf2b..9c21fd160 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -205,6 +205,8 @@ CONFIG_ALIM7101_WDT=m
 CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_ALTERA_PR_IP_CORE_PLAT=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
@@ -1676,7 +1678,15 @@ CONFIG_FMC_WRITE_EEPROM=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA_BRIDGE=m
+CONFIG_FPGA=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ICE40_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_REGION=m
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -4019,6 +4029,7 @@ CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
 CONFIG_OF_PMEM=m
 CONFIG_OMAP_PM_NOOP=y
@@ -6682,6 +6693,7 @@ CONFIG_XFS_QUOTA=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_VCU=m
 # CONFIG_XILINX_WATCHDOG is not set
 CONFIG_XILLYBUS=m
diff --git a/kernel.spec b/kernel.spec
index 6a47b5bcb..85bb6fa1f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1884,6 +1884,9 @@ fi
 #
 #
 %changelog
+* Fri Jul 27 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable FPGA Manager kernel framework
+
 * Fri Jul 27 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc6.git3.1
 - Linux v4.18-rc6-152-gcd3f77d74ac3
 - Disable headers in preparation for kernel headers split