[PATCH] [Bionic] UBUNTU: [Config] azure: CONFIG_FPGA_MGR_XILINX_SPI=m

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1922582

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.azure-4.15/config/annotations             | 3 +++
 debian.azure-4.15/config/config.common.ubuntu    | 6 +++++-
 debian.azure-4.15/control.d/azure.inclusion-list | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian.azure-4.15/config/annotations b/debian.azure-4.15/config/annotations
index be5f3aa962b54..dda083c81e875 100644
--- a/debian.azure-4.15/config/annotations
+++ b/debian.azure-4.15/config/annotations
@@ -4,6 +4,9 @@
 
 include "../../debian.master/config/annotations"
 
+CONFIG_FPGA_MGR_XILINX_SPI                         mark<ENFORCED> note<LP:#1922582>
+CONFIG_FPGA_MGR_XILINX_SPI                         policy<{'amd64': 'm'}>
+
 CONFIG_MLX5_CORE                                   policy<{'amd64': 'm'}>
 CONFIG_MLX5_CORE                                   mark<ENFORCED> note<LP:#1837397>
 
diff --git a/debian.azure-4.15/config/config.common.ubuntu b/debian.azure-4.15/config/config.common.ubuntu
index 66f546f1f469f..df8915ff3715f 100644
--- a/debian.azure-4.15/config/config.common.ubuntu
+++ b/debian.azure-4.15/config/config.common.ubuntu
@@ -132,6 +132,7 @@ CONFIG_ALI_FIR=m
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_ALTERA_MBOX is not set
 CONFIG_ALTERA_MSGDMA=m
+# CONFIG_ALTERA_PR_IP_CORE is not set
 # CONFIG_ALTERA_STAPL is not set
 # CONFIG_ALTERA_TSE is not set
 CONFIG_AMD_IOMMU=y
@@ -1420,7 +1421,10 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_FPGA is not set
+CONFIG_FPGA=m
+# CONFIG_FPGA_MGR_ALTERA_CVP is not set
+# CONFIG_FPGA_MGR_ALTERA_PS_SPI is not set
+CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
diff --git a/debian.azure-4.15/control.d/azure.inclusion-list b/debian.azure-4.15/control.d/azure.inclusion-list
index d24e7203780ae..4907d3ae26ded 100644
--- a/debian.azure-4.15/control.d/azure.inclusion-list
+++ b/debian.azure-4.15/control.d/azure.inclusion-list
@@ -46,6 +46,7 @@ drivers/crypto/vmx/vmx-crypto.ko
 drivers/dax/*
 drivers/firmware/efi/*
 drivers/firmware/iscsi_ibft.ko
+drivers/fpga/*
 drivers/gpu/drm/ast/ast.ko
 drivers/gpu/drm/drm_kms_helper.ko
 drivers/gpu/drm/drm.ko
-- 
2.17.1