8 files changed, 24 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index f34f6e6..ac91896 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -26,3 +26,7 @@ INHERIT += "xsct-tarball"
 LAYERSERIES_COMPAT_xilinx-tools = "honister"
 
 BUILDCFG_VARS:append = " XILINX_XSCT_VERSION"
+
+PREFERRED_VERSION_openamp-fw-echo-testd ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}"
+PREFERRED_VERSION_openamp-fw-mat-muld   ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}"
+PREFERRED_VERSION_openamp-fw-rpc-demo   ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}"
diff --git a/recipes-openamp/examples/openamp-fw-echo-testd_git.bb b/recipes-openamp/examples/openamp-fw-echo-testd_2022.1.bb
index f84e4b7..f84e4b7 100644
--- a/recipes-openamp/examples/openamp-fw-echo-testd_git.bb
+++ b/recipes-openamp/examples/openamp-fw-echo-testd_2022.1.bb
diff --git a/recipes-openamp/examples/openamp-fw-echo-testd_2022.2.bb b/recipes-openamp/examples/openamp-fw-echo-testd_2022.2.bb
new file mode 100644
index 0000000..f84e4b7
--- /dev/null
+++ b/recipes-openamp/examples/openamp-fw-echo-testd_2022.2.bb
@@ -0,0 +1,5 @@
+require openamp-fw.inc
+
+XSCTH_APP = "OpenAMP echo-test"
+
+OPENAMP_FW_NAME = "image_echo_test"
diff --git a/recipes-openamp/examples/openamp-fw-mat-muld_git.bb b/recipes-openamp/examples/openamp-fw-mat-muld_2022.1.bb
index b4ffa9a..b4ffa9a 100644
--- a/recipes-openamp/examples/openamp-fw-mat-muld_git.bb
+++ b/recipes-openamp/examples/openamp-fw-mat-muld_2022.1.bb
diff --git a/recipes-openamp/examples/openamp-fw-mat-muld_2022.2.bb b/recipes-openamp/examples/openamp-fw-mat-muld_2022.2.bb
new file mode 100644
index 0000000..b4ffa9a
--- /dev/null
+++ b/recipes-openamp/examples/openamp-fw-mat-muld_2022.2.bb
@@ -0,0 +1,6 @@
+require openamp-fw.inc
+
+XSCTH_APP = "OpenAMP matrix multiplication Demo"
+
+OPENAMP_FW_NAME = "image_matrix_multiply"
+
diff --git a/recipes-openamp/examples/openamp-fw-rpc-demo_git.bb b/recipes-openamp/examples/openamp-fw-rpc-demo_2022.1.bb
index 2ad05c6..2ad05c6 100644
--- a/recipes-openamp/examples/openamp-fw-rpc-demo_git.bb
+++ b/recipes-openamp/examples/openamp-fw-rpc-demo_2022.1.bb
diff --git a/recipes-openamp/examples/openamp-fw-rpc-demo_2022.2.bb b/recipes-openamp/examples/openamp-fw-rpc-demo_2022.2.bb
new file mode 100644
index 0000000..2ad05c6
--- /dev/null
+++ b/recipes-openamp/examples/openamp-fw-rpc-demo_2022.2.bb
@@ -0,0 +1,7 @@
+require openamp-fw.inc
+
+YAML_BSP_CONFIG[WITH_PROXY] = "set,true"
+
+XSCTH_APP = "OpenAMP RPC Demo"
+
+OPENAMP_FW_NAME = "image_rpc_demo"
diff --git a/recipes-openamp/examples/openamp-fw.inc b/recipes-openamp/examples/openamp-fw.inc
index f844f9b..2f67443 100644
--- a/recipes-openamp/examples/openamp-fw.inc
+++ b/recipes-openamp/examples/openamp-fw.inc
@@ -1,5 +1,7 @@
 DESCRIPTION = "OpenAMP demo firmware"
 
+ESW_VER = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or '${XILINX_XSCT_VERSION}'}"
+
 inherit xsctapp xsctyaml deploy
 
 LICENSE = "BSD"