diff options
Diffstat (limited to 'meta-xilinx-core/conf')
-rw-r--r-- | meta-xilinx-core/conf/layer.conf | 3 | ||||
-rw-r--r-- | meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 6c1c2423..a2c9438d 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -63,9 +63,10 @@ PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', | |||
63 | 63 | ||
64 | XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" | 64 | XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" |
65 | XILINX_UBOOT_VERSION[v2022.2] = "v2021.01-xilinx-v2022.2%" | 65 | XILINX_UBOOT_VERSION[v2022.2] = "v2021.01-xilinx-v2022.2%" |
66 | XILINX_UBOOT_VERSION[v2023.1] = "v2021.01-xilinx-v2023.1%" | 66 | XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%" |
67 | 67 | ||
68 | PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 68 | PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
69 | PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | ||
69 | 70 | ||
70 | XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" | 71 | XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%" |
71 | XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" | 72 | XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%" |
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 dc6ab05c..0cbd4249 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | |||
@@ -16,6 +16,9 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" | |||
16 | # U-Boot Configuration | 16 | # U-Boot Configuration |
17 | PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" | 17 | PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" |
18 | PREFERRED_PROVIDER_virtual/boot-bin ??= "xilinx-bootbin" | 18 | PREFERRED_PROVIDER_virtual/boot-bin ??= "xilinx-bootbin" |
19 | PREFERRED_PROVIDER_u-boot-tools ??= "u-boot-tools-xlnx" | ||
20 | PREFERRED_PROVIDER_u-boot-tools-native ??= "u-boot-tools-xlnx-native" | ||
21 | PREFERRED_PROVIDER_nativesdk-u-boot-tools ??= "nativesdk-u-boot-tools-xlnx" | ||
19 | 22 | ||
20 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" | 23 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" |
21 | 24 | ||