recipes-drivers: Update condition for subcores in multimedia recipes

HDCP subcores to be included only if its enabled in the subsystem.
Updated conditional inclusion of the same in the DP and HDMI recipes.

Signed-off-by: Kunal Rane <kunal.rane@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

8 files changed, 19 insertions, 7 deletions

diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/dp12rxss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/dp12rxss_2024.2.bb
index dcd2c83c..2304e259 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/dp12rxss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/dp12rxss_2024.2.bb
@@ -5,7 +5,8 @@ REQUIRED_MACHINE_FEATURES = "dp12rxss"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone video-common dp12 iic iicps hdcp1x"
+DEPENDS += "xilstandalone video-common dp12 iic iicps"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp12rxss/src/"
 ESW_COMPONENT_NAME = "libdp12rxss.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/dp12txss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/dp12txss_2024.2.bb
index fb06efac..b2aaf9d0 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/dp12txss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/dp12txss_2024.2.bb
@@ -6,6 +6,7 @@ REQUIRED_MACHINE_FEATURES = "dp12txss"
 inherit esw python3native
 
 DEPENDS += "xilstandalone dual-splitter vtc dp12 tmrctr"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp12txss/src/"
 ESW_COMPONENT_NAME = "libdp12txss.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/dp14rxss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/dp14rxss_2024.2.bb
index b623d5df..d3942a6e 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/dp14rxss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/dp14rxss_2024.2.bb
@@ -5,7 +5,9 @@ REQUIRED_MACHINE_FEATURES = "dp14rxss"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone video-common dp14 iic iicps hdcp1x hdcp22-rx-dp"
+DEPENDS += "xilstandalone video-common dp14 iic iicps"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp22-rx-dp", "hdcp22-rx-dp", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14rxss/src/"
 ESW_COMPONENT_NAME = "libdp14rxss.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/dp14txss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/dp14txss_2024.2.bb
index 078d277f..2553e788 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/dp14txss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/dp14txss_2024.2.bb
@@ -5,7 +5,9 @@ REQUIRED_MACHINE_FEATURES = "dp14txss"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone dual-splitter vtc dp14 tmrctr hdcp1x hdcp22-tx-dp"
+DEPENDS += "xilstandalone dual-splitter vtc dp14 tmrctr"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp22-tx-dp", "hdcp22-tx-dp", "",d)}"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dp14txss/src/"
 ESW_COMPONENT_NAME = "libdp14txss.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss1_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss1_2024.2.bb
index ffc2c249..a1139a5d 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss1_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss1_2024.2.bb
@@ -5,7 +5,9 @@ REQUIRED_MACHINE_FEATURES = "v-hdmirxss1"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone v-hdmi-common v-hdmirx1 tmrctr hdcp1x hdcp22-rx"
+DEPENDS += "xilstandalone v-hdmi-common v-hdmirx1 tmrctr"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp22-rx", "hdcp22-rx", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirxss1/src/"
 ESW_COMPONENT_NAME = "libv_hdmirxss1.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss_2024.2.bb
index df690421..5b703988 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmirxss_2024.2.bb
@@ -5,7 +5,8 @@ REQUIRED_MACHINE_FEATURES = "v-hdmirxss"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone v-hdmirx v-hdmi-common hdcp1x"
+DEPENDS += "xilstandalone v-hdmirx v-hdmi-common"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmirxss/src/"
 ESW_COMPONENT_NAME = "libv_hdmirxss.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss1_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss1_2024.2.bb
index 06a6c5a1..7d86f9c6 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss1_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss1_2024.2.bb
@@ -5,7 +5,9 @@ REQUIRED_MACHINE_FEATURES = "v-hdmitxss1"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone v-hdmitx1 vtc tmrctr v-hdmi-common hdcp1x hdcp22-tx"
+DEPENDS += "xilstandalone v-hdmitx1 vtc tmrctr v-hdmi-common"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp22-tx", "hdcp22-tx", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitxss1/src/"
 ESW_COMPONENT_NAME = "libv_hdmitxss1.a"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss_2024.2.bb
index a7328b19..7dfbb3b5 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/v-hdmitxss_2024.2.bb
@@ -5,7 +5,8 @@ REQUIRED_MACHINE_FEATURES = "v-hdmitxss"
 
 inherit esw python3native
 
-DEPENDS += "xilstandalone v-hdmitx vtc v-hdmi-common hdcp1x"
+DEPENDS += "xilstandalone v-hdmitx vtc v-hdmi-common"
+DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "hdcp1x", "hdcp1x", "",d)}"
 
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_hdmitxss/src/"
 ESW_COMPONENT_NAME = "libv_hdmitxss.a"