[meta-xilinx] [meta-xilinx-bsp][PATCH] Adding FPGA_MNGR_RECONFIG_ENABLE to control enabling fpga manager

[Manjukumar Matha]

From: Jaewon Lee <jaewon.lee at xilinx.com>

Introduce FPGA_MNGR_RECONFIG_ENABLE to enable overlay configuration for
fpga-manager support in kernel.
To enable, set FPGA_MNGR_RECONFIG_ENABLE = "1" in local.conf or other
bitbake configuration files.

For backward compatibility, set FPGA_MNGR_RECONFIG_ENABLE based on
IMAGE_FEATURES.
In future release, the option of fpga-manager in IMAGE_FEATURES will be
deprecated.

Signed-off-by: Jaewon Lee <jaewon.lee at xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 1 +
 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
index f68b835..2ffd5b2 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -83,3 +83,4 @@ XSERVER_EXT_zynqmp ?= "xf86-video-armsoc"
 # For MicroBlaze default all microblaze machines to use GDB 7.7.1 (for gdbserver/gdb)
 PREFERRED_VERSION_gdb_microblaze = "7.7.1"
 
+FPGA_MNGR_RECONFIG_ENABLE ?= "${@bb.utils.contains('IMAGE_FEATURES', 'fpga-manager', '1', '0', d)}"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index 3200ed6..6202c1a 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -56,7 +56,7 @@ KERNEL_FEATURES_append_kc705-microblazeel = " bsp/kc705-microblazeel/kc705-micro
 
 KERNEL_FEATURES_append_zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' bsp/xilinx/xen.scc', '', d)}"
 
-KERNEL_FEATURES_append_zynqmp = "${@bb.utils.contains('IMAGE_FEATURES', 'fpga-manager', ' features/overlay/overlay.scc', '', d)}"
+KERNEL_FEATURES_append_zynqmp = "${@' features/overlay/overlay.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
 
 KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' bsp/xilinx/xen.scc', '', d)}"
 
-- 
2.7.4