diff options
| author | Mark Hatle <mark.hatle@kernel.crashing.org> | 2022-10-19 18:22:02 -0500 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@kernel.crashing.org> | 2022-10-19 18:22:02 -0500 |
| commit | 6cbae9509694a2ed65435f391c5a900e4c1d3908 (patch) | |
| tree | 9499c678a12cc701e3dd7dc5faccda6738b5fca6 /meta-xilinx-standalone/conf | |
| parent | dac30aebed7f273f49bfc8f803058a5a0a9014e0 (diff) | |
| parent | 8aa8e5af31f71e7a29e990fcfa5d463e6d91d264 (diff) | |
| download | meta-xilinx-6cbae9509694a2ed65435f391c5a900e4c1d3908.tar.gz | |
Merge remote-tracking branch 'origin/kirkstone-next' into master-next
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Diffstat (limited to 'meta-xilinx-standalone/conf')
| -rw-r--r-- | meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index bf1698a3..57fbf956 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | |||
| @@ -34,8 +34,8 @@ VIRTUAL-RUNTIME_init_manager:xilinx-standalone = "" | |||
| 34 | 34 | ||
| 35 | PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" | 35 | PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" |
| 36 | 36 | ||
| 37 | PREFERRED_VERSION_libmetal = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" | 37 | PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" |
| 38 | PREFERRED_VERSION_open-amp = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" | 38 | PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" |
| 39 | 39 | ||
| 40 | # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian | 40 | # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian |
| 41 | LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" | 41 | LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" |