aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2019-04-10 14:56:41 -0700
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-06-28 16:11:36 -0700
commit3b825c1d9667fcfa3d16f513361236b87886033d (patch)
tree9be043ba434007ba3f65f4a8300350a86ea7c358
parent05729aebcf6efc5ec7ac3a9448e66bf29151575c (diff)
downloadmeta-xilinx-3b825c1d9667fcfa3d16f513361236b87886033d.tar.gz
meta-xilinx-3b825c1d9667fcfa3d16f513361236b87886033d.tar.bz2
meta-xilinx-3b825c1d9667fcfa3d16f513361236b87886033d.zip
Adding FPGA_MNGR_RECONFIG_ENABLE to control enabling fpga manager
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@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc1
-rw-r--r--meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc2
2 files changed, 2 insertions, 1 deletions
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 f714a21b..3d927e76 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -78,3 +78,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 4cc3a9e2..5de6c9c2 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)}"