From 9f7d59306d07d9a17edd5fa75987cb6bda9ac831 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 9 Dec 2024 11:33:29 -0600 Subject: device-tree: ENABLE_OPENAMP_DTSI add a third state '2' for pre-integrated The tri-state is now defined as: ENABLE_OPENAMP_DTSI = 0 or empty: Build a dtbo ENABLE_OPENAMP_DTSI = 1: Bundle into the device-tree the openamp items ENABLE_OPENAMP_DTSI = 2 (!= 0, 1 or empty): Do nothing, assume openamp is already integrated into the device-tree Signed-off-by: Mark Hatle --- .../openamp-layer/recipes-bsp/device-tree/device-tree.bbappend | 3 +++ .../openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend index 7d374291..9e7fa4fa 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend @@ -10,6 +10,9 @@ OPENAMP_EXTRA_DT_INCLUDE_FILES:zynqmp = "zynqmp-openamp.dtsi" OPENAMP_EXTRA_DT_INCLUDE_FILES:versal = "versal-openamp.dtsi" OPENAMP_EXTRA_DT_INCLUDE_FILES:versal-net = "versal-net-openamp.dtsi" +# ENABLE_OPENAMP_DTSI = 0 or empty: Build a dtbo +# ENABLE_OPENAMP_DTSI = 1: Bundle into the device-tree the openamp items +# ENABLE_OPENAMP_DTSI = 2 (!= 0, 1 or empty): Do nothing, assume openamp is already integrated into the device-tree def set_openamp_extra_dt_include_files(d): distro_features = d.getVar('DISTRO_FEATURES', True) enable_openamp_dtsi = d.getVar('ENABLE_OPENAMP_DTSI') diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb index 13992ebc..9149bc28 100644 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb +++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-core/packagegroups/packagegroup-openamp.bb @@ -25,7 +25,10 @@ RDEPENDS:${PN}-matrix-mul:append:zcu102-zynqmp = " openamp-fw-mat-muld" RDEPENDS:${PN}-rpc-demo = "rpmsg-proxy-app" RDEPENDS:${PN}-rpc-demo:append:zcu102-zynqmp = " openamp-fw-rpc-demo" -RDEPENDS:${PN}:append = " ${@'open-amp-device-tree' if d.getVar('ENABLE_OPENAMP_DTSI') != '1' else ''}" +# ENABLE_OPENAMP_DTSI = 0 or empty: Build a dtbo +# ENABLE_OPENAMP_DTSI = 1: Bundle into the device-tree the openamp items +# ENABLE_OPENAMP_DTSI = 2 (!= 0, 1 or empty): Do nothing, assume openamp is already integrated into the device-tree +RDEPENDS:${PN}:append = " ${@'open-amp-device-tree' if not d.getVar('ENABLE_OPENAMP_DTSI') or d.getVar('ENABLE_OPENAMP_DTSI') == '0' else ''}" RDEPENDS:${PN}:append = " \ libmetal \ -- cgit v1.2.3-54-g00ecf