diff options
author | Mark Hatle <mark.hatle@amd.com> | 2024-04-02 18:40:43 -0600 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2024-04-04 16:53:54 -0600 |
commit | c42dfae81cab9f62869a3f2eca30e68baf69f4d8 (patch) | |
tree | a162440c1a4091c59e7c5685d5ca8383ba16f5cf /meta-xilinx-core/conf | |
parent | d8a5293244c173bfd1faef83b9c52e6d3d27e9a5 (diff) | |
parent | 9fc4fc9e03f25ddcc60629b83db7c5b855046229 (diff) | |
download | meta-xilinx-c42dfae81cab9f62869a3f2eca30e68baf69f4d8.tar.gz |
Merge remote-tracking branch 'xilinx/rel-v2024.1' into HEAD
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core/conf')
-rw-r--r-- | meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index c732523c..1837da26 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | |||
@@ -23,6 +23,10 @@ PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx" | |||
23 | PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native" | 23 | PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native" |
24 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx" | 24 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx" |
25 | 25 | ||
26 | # Libmetal and OpenAMP Configuration | ||
27 | PREFERRED_PROVIDER_libmetal ?= "libmetal-xlnx" | ||
28 | PREFERRED_PROVIDER_open-amp ?= "open-amp-xlnx" | ||
29 | |||
26 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" | 30 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" |
27 | 31 | ||
28 | UBOOT_SUFFIX ?= "bin" | 32 | UBOOT_SUFFIX ?= "bin" |