summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r--meta-xilinx-bsp/README.md7
-rw-r--r--meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf24
-rw-r--r--meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf12
-rw-r--r--meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf24
-rw-r--r--meta-xilinx-bsp/conf/machine/vck190-versal.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf20
-rw-r--r--meta-xilinx-bsp/conf/machine/vek280-versal.conf22
-rw-r--r--meta-xilinx-bsp/conf/machine/vmk180-versal.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/vpk120-versal.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/vpk180-versal.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf4
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf3
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf7
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf6
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf2
-rw-r--r--meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend8
-rw-r--r--meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend10
-rw-r--r--meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect71
23 files changed, 177 insertions, 77 deletions
diff --git a/meta-xilinx-bsp/README.md b/meta-xilinx-bsp/README.md
index 96a23687..2d869913 100644
--- a/meta-xilinx-bsp/README.md
+++ b/meta-xilinx-bsp/README.md
@@ -33,15 +33,16 @@ The following boards are supported by the meta-xilinx-bsp layer:
33| | [ZCU104](https://www.xilinx.com/products/boards-and-kits/zcu104.html) | [zcu104-zynqmp](conf/machine/zcu104-zynqmp.conf) | `zcu104-zynqmp` | `zcu104-revc` | Yes | Yes | 33| | [ZCU104](https://www.xilinx.com/products/boards-and-kits/zcu104.html) | [zcu104-zynqmp](conf/machine/zcu104-zynqmp.conf) | `zcu104-zynqmp` | `zcu104-revc` | Yes | Yes |
34| | [ZCU106](https://www.xilinx.com/products/boards-and-kits/zcu106.html) | [zcu106-zynqmp](conf/machine/zcu106-zynqmp.conf) | `zcu106-zynqmp` | `zcu106-reva` | Yes | Yes | 34| | [ZCU106](https://www.xilinx.com/products/boards-and-kits/zcu106.html) | [zcu106-zynqmp](conf/machine/zcu106-zynqmp.conf) | `zcu106-zynqmp` | `zcu106-reva` | Yes | Yes |
35| | [ZCU111](https://www.xilinx.com/products/boards-and-kits/zcu111.html) | [zcu111-zynqmp](conf/machine/zcu111-zynqmp.conf) | `zcu111-zynqmp` | `zcu111-reva` | Yes | Yes | 35| | [ZCU111](https://www.xilinx.com/products/boards-and-kits/zcu111.html) | [zcu111-zynqmp](conf/machine/zcu111-zynqmp.conf) | `zcu111-zynqmp` | `zcu111-reva` | Yes | Yes |
36| | [ZCU1275](https://www.xilinx.com/products/boards-and-kits/zcu1275.html) | [zcu1275-zynqmp](conf/machine/zcu1275-zynqmp.conf) | `zcu1275-zynqmp` | `zcu1275-revb` | Yes | Yes |
37| | [ZCU1285](https://www.xilinx.com/products/boards-and-kits/zcu1285.html) | [zcu1285-zynqmp](conf/machine/zcu1285-zynqmp.conf) | `zcu1285-zynqmp` | `zcu1285-reva` | Yes | Yes |
38| | [ZCU208](https://www.xilinx.com/products/boards-and-kits/zcu208.html) | [zcu208-zynqmp](conf/machine/zcu208-zynqmp.conf) | `zcu208-zynqmp` | `zcu208-reva` | Yes | Yes | 36| | [ZCU208](https://www.xilinx.com/products/boards-and-kits/zcu208.html) | [zcu208-zynqmp](conf/machine/zcu208-zynqmp.conf) | `zcu208-zynqmp` | `zcu208-reva` | Yes | Yes |
39| | [ZCU216](https://www.xilinx.com/products/boards-and-kits/zcu216.html) | [zcu216-zynqmp](conf/machine/zcu216-zynqmp.conf) | `zcu216-zynqmp` | `zcu216-reva` | Yes | Yes | 37| | [ZCU216](https://www.xilinx.com/products/boards-and-kits/zcu216.html) | [zcu216-zynqmp](conf/machine/zcu216-zynqmp.conf) | `zcu216-zynqmp` | `zcu216-reva` | Yes | Yes |
38| | [ZCU670](https://www.xilinx.com/products/boards-and-kits/zcu670.html) | [zcu670-zynqmp](conf/machine/zcu670-zynqmp.conf) | `zcu670-zynqmp` | `zcu670-revb` | Yes | Yes |
40| Versal | [VCK190](https://www.xilinx.com/products/boards-and-kits/vck190.html) | [vck190-versal](conf/machine/vck190-versal.conf) | `vck190-versal` | `versal-vck190-reva-x-ebm-01-reva` | Yes | Yes | 39| Versal | [VCK190](https://www.xilinx.com/products/boards-and-kits/vck190.html) | [vck190-versal](conf/machine/vck190-versal.conf) | `vck190-versal` | `versal-vck190-reva-x-ebm-01-reva` | Yes | Yes |
41| | [VMK180](https://www.xilinx.com/products/boards-and-kits/vmk180.html) | [vmk180-versal](conf/machine/vmk180-versal.conf) | `vmk180-versal` | `versal-vmk180-reva-x-ebm-01-reva` | Yes | Yes | 40| | [VMK180](https://www.xilinx.com/products/boards-and-kits/vmk180.html) | [vmk180-versal](conf/machine/vmk180-versal.conf) | `vmk180-versal` | `versal-vmk180-reva-x-ebm-01-reva` | Yes | Yes |
41| | [VCK5000](https://www.xilinx.com/products/boards-and-kits/vck5000.html) | [vck5000-versal](conf/machine/vck5000-versal.conf) | `vck5000-versal` | `versal-vck5000-reva-x-ebm-01-reva` | No | No |
42| | [VPK120](https://www.xilinx.com/products/boards-and-kits/vpk120.html) | [vpk120-versal](conf/machine/vpk120-versal.conf) | `vpk120-versal` | `versal-vpk120-reva` | Yes | Yes | 42| | [VPK120](https://www.xilinx.com/products/boards-and-kits/vpk120.html) | [vpk120-versal](conf/machine/vpk120-versal.conf) | `vpk120-versal` | `versal-vpk120-reva` | Yes | Yes |
43| | [VPK180](https://www.xilinx.com/products/boards-and-kits/vpk180.html) | [vpk180-versal](conf/machine/vpk180-versal.conf) | `vpk180-versal` | `versal-vpk180-reva` | Yes | Yes | 43| | [VPK180](https://www.xilinx.com/products/boards-and-kits/vpk180.html) | [vpk180-versal](conf/machine/vpk180-versal.conf) | `vpk180-versal` | `versal-vpk180-reva` | Yes | Yes |
44| | [VEK280](https://www.xilinx.com/products/boards-and-kits/vek280.html) | [vek280-versal](conf/machine/vek280-versal.conf) | `vek280-versal` | `versal-vek280-reva` | Yes | Yes | 44| | [VEK280](https://www.xilinx.com/products/boards-and-kits/vek280.html) | [vek280-versal](conf/machine/vek280-versal.conf) | `vek280-versal` | `versal-vek280-revb` | Yes | Yes |
45| | [VHK158](https://www.xilinx.com/products/boards-and-kits/vhk158.html) | [vhk158-versal](conf/machine/vhk158-versal.conf) | `vhk158-versal` | `versal-vhk158-reva` | Yes | Yes |
45 46
46> **Note:** Additional information on Xilinx architectures can be found at: 47> **Note:** Additional information on Xilinx architectures can be found at:
47 https://www.xilinx.com/products/silicon-devices.html 48 https://www.xilinx.com/products/silicon-devices.html
diff --git a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
index 88a0d7bb..27cb3939 100644
--- a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'ac701-microblazeel:']['ac701-microblazeel' !='${MA
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in microblazeel-generic.conf will be set. 11# defined in microblazeel-generic.conf will be set.
12 12
13# Yocto AC701 FS-Boot variables
14YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
15YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
16YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0"
17YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
18XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
19
20# Yocto AC701 device-tree variables 13# Yocto AC701 device-tree variables
21YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" 14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
22YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" 15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0"
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
25XSCTH_PROC:pn-device-tree ?= "microblaze_0" 18XSCTH_PROC:pn-device-tree ?= "microblaze_0"
26YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" 19YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}"
27 20
21# Yocto FS-Boot variables
22YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
23YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
24YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0"
25YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
26XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
27
28# Yocto KERNEL Variables
29UBOOT_ENTRYPOINT ?= "0x80000000"
30UBOOT_LOADADDRESS ?= "0x80000000"
31
32# ac701-microblazeel Serial Console
33SERIAL_CONSOLES ?= "115200;ttyUL0"
34YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
35
28# Set DDR Base address for u-boot-xlnx-scr variables 36# Set DDR Base address for u-boot-xlnx-scr variables
29DDR_BASEADDR ?= "0x80000000" 37DDR_BASEADDR ?= "0x80000000"
30SKIP_APPEND_BASEADDR ?= "0" 38SKIP_APPEND_BASEADDR ?= "0"
@@ -39,4 +47,4 @@ HDF_MACHINE = "ac701-microblazeel"
39 47
40#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
41#### Postamble 49#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', 'ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index f24d0356..f3236f07 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" 15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0"
16DT_PADDING_SIZE:pn-device-tree ?= "0x1000" 16DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
17DTC_FLAGS:pn-device-tree ?= "" 17DTC_FLAGS:pn-device-tree ?= ""
18XSCTH_PROC:microblaze:pn-device-tree ?= "microblaze_0" 18XSCTH_PROC:pn-device-tree ?= "microblaze_0"
19YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}" 19YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}"
20 20
21# Yocto FS-Boot variables 21# Yocto FS-Boot variables
@@ -29,14 +29,14 @@ XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
29UBOOT_ENTRYPOINT ?= "0x80000000" 29UBOOT_ENTRYPOINT ?= "0x80000000"
30UBOOT_LOADADDRESS ?= "0x80000000" 30UBOOT_LOADADDRESS ?= "0x80000000"
31 31
32# Set DDR Base address for u-boot-xlnx-scr variables
33DDR_BASEADDR ?= "0x80000000"
34SKIP_APPEND_BASEADDR ?= "0"
35
36# kc705-microblazeel Serial Console 32# kc705-microblazeel Serial Console
37SERIAL_CONSOLES ?= "115200;ttyUL0" 33SERIAL_CONSOLES ?= "115200;ttyUL0"
38YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" 34YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
39 35
36# Set DDR Base address for u-boot-xlnx-scr variables
37DDR_BASEADDR ?= "0x80000000"
38SKIP_APPEND_BASEADDR ?= "0"
39
40# Required generic machine inclusion 40# Required generic machine inclusion
41require conf/machine/microblaze-generic.conf 41require conf/machine/microblaze-generic.conf
42 42
@@ -47,4 +47,4 @@ HDF_MACHINE = "kc705-microblazeel"
47 47
48#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
49#### Postamble 49#### Postamble
50PACKAGE_EXTRA_ARCHS:append = "${@['', 'kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
index 3edf190e..a866f87c 100644
--- a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'kcu105-microblazeel:']['kcu105-microblazeel' !='${
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in microblazeel-generic.conf will be set. 11# defined in microblazeel-generic.conf will be set.
12 12
13# Yocto KCU105 FS-Boot variables
14YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
15YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
16YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
17YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
18XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
19
20# Yocto KCU105 device-tree variables 13# Yocto KCU105 device-tree variables
21YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" 14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
22YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" 15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
25XSCTH_PROC:pn-device-tree ?= "microblaze_0" 18XSCTH_PROC:pn-device-tree ?= "microblaze_0"
26YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" 19YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}"
27 20
21# Yocto FS-Boot variables
22YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
23YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
24YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
25YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
26XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
27
28# Yocto KERNEL Variables
29UBOOT_ENTRYPOINT ?= "0x80000000"
30UBOOT_LOADADDRESS ?= "0x80000000"
31
32# kcu105-microblazeel Serial Console
33SERIAL_CONSOLES ?= "115200;ttyUL0"
34YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
35
28# Set DDR Base address for u-boot-xlnx-scr variables 36# Set DDR Base address for u-boot-xlnx-scr variables
29DDR_BASEADDR ?= "0x80000000" 37DDR_BASEADDR ?= "0x80000000"
30SKIP_APPEND_BASEADDR ?= "0" 38SKIP_APPEND_BASEADDR ?= "0"
@@ -39,4 +47,4 @@ HDF_MACHINE = "kcu105-microblazeel"
39 47
40#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
41#### Postamble 49#### Postamble
42PACKAGE_EXTRA_ARCHS:append = "${@['', 'kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 1b3e8123..ed049268 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -2,10 +2,6 @@
2#@NAME: vck190-versal 2#@NAME: vck190-versal
3#@DESCRIPTION: Machine configuration for the VCK190 evaluation board. 3#@DESCRIPTION: Machine configuration for the VCK190 evaluation board.
4 4
5# Compatibility with old BOARD value.
6# TODO - Remove these once removed from petalinux bsp
7MACHINEOVERRIDES =. "vck190:"
8
9#### Preamble 5#### Preamble
10MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}" 6MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}"
11#### Regular settings follow 7#### Regular settings follow
@@ -46,4 +42,4 @@ HDF_MACHINE = "vck190-versal"
46 42
47#### No additional settings should be after the Postamble 43#### No additional settings should be after the Postamble
48#### Postamble 44#### Postamble
49PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck190_versal']['vck190-versal' != '${MACHINE}']}" 45PACKAGE_EXTRA_ARCHS:append = "${@['', ' vck190_versal']['vck190-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
index ada52ceb..bfd60336 100644
--- a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${
10# defined before calling the required inclusion file else pre-expansion value 10# defined before calling the required inclusion file else pre-expansion value
11# defined in microblazeel-generic.conf will be set. 11# defined in microblazeel-generic.conf will be set.
12 12
13# Yocto VCU118 FS-Boot variables
14YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
15YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
16YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
17YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
18XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
19
20# Yocto VCU118 device-tree variables 13# Yocto VCU118 device-tree variables
21YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" 14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
22YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" 15YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
@@ -25,10 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
25XSCTH_PROC:pn-device-tree ?= "microblaze_0" 18XSCTH_PROC:pn-device-tree ?= "microblaze_0"
26YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" 19YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}"
27 20
21# Yocto FS-Boot variables
22YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
23YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
24YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
25YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
26XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
27
28# Yocto KERNEL Variables 28# Yocto KERNEL Variables
29UBOOT_ENTRYPOINT ?= "0x80000000" 29UBOOT_ENTRYPOINT ?= "0x80000000"
30UBOOT_LOADADDRESS ?= "0x80000000" 30UBOOT_LOADADDRESS ?= "0x80000000"
31 31
32# vcu118-microblazeel Serial Console
33SERIAL_CONSOLES ?= "115200;ttyUL0"
34YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
35
32# Set DDR Base address for u-boot-xlnx-scr variables 36# Set DDR Base address for u-boot-xlnx-scr variables
33DDR_BASEADDR ?= "0x80000000" 37DDR_BASEADDR ?= "0x80000000"
34SKIP_APPEND_BASEADDR ?= "0" 38SKIP_APPEND_BASEADDR ?= "0"
@@ -43,4 +47,4 @@ HDF_MACHINE = "vcu118-microblazeel"
43 47
44#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
45#### Postamble 49#### Postamble
46PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vek280-versal.conf b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
index b533b833..625cbca1 100644
--- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
@@ -12,12 +12,20 @@ MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}"
12 12
13# Yocto device-tree variables 13# Yocto device-tree variables
14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" 14YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
15YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-reva}" 15YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}"
16
17# Yocto arm-trusted-firmware(TF-A) variables
18ATF_CONSOLE ?= "pl011"
19TFA_BL33_LOAD ?= "0x8000000"
16 20
17# Yocto PLM variables 21# Yocto PLM variables
18YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" 22YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
19YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" 23YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
20 24
25# Yocto KERNEL Variables
26UBOOT_ENTRYPOINT ?= "0x200000"
27UBOOT_LOADADDRESS ?= "0x200000"
28
21# vek280-versal Serial Console 29# vek280-versal Serial Console
22SERIAL_CONSOLES ?= "115200;ttyAMA0" 30SERIAL_CONSOLES ?= "115200;ttyAMA0"
23YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" 31YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
@@ -30,6 +38,16 @@ require conf/machine/versal-ai-edge-generic.conf
30# from local.conf. 38# from local.conf.
31HDF_MACHINE = "vek280-versal" 39HDF_MACHINE = "vek280-versal"
32 40
41# VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
42# 8G, Hence we need set 12G in QB_MEM.
43QB_MEM = "-m 12G"
44
45QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
46QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
47
48# Yocto MACHINE_FEATURES Variable
49MACHINE_FEATURES += "vdu"
50
33#### No additional settings should be after the Postamble 51#### No additional settings should be after the Postamble
34#### Postamble 52#### Postamble
35PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}" \ No newline at end of file 53PACKAGE_EXTRA_ARCHS:append = "${@['', ' vek280_versal']['vek280-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 941f0aba..0f474f78 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -2,10 +2,6 @@
2#@NAME: vmk180-versal 2#@NAME: vmk180-versal
3#@DESCRIPTION: Machine configuration for the VMK180 evaluation board. 3#@DESCRIPTION: Machine configuration for the VMK180 evaluation board.
4 4
5# Compatibility with old BOARD value.
6# TODO - Remove these once removed from petalinux bsp
7MACHINEOVERRIDES =. "vmk180:"
8
9#### Preamble 5#### Preamble
10MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}" 6MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}"
11#### Regular settings follow 7#### Regular settings follow
@@ -46,4 +42,4 @@ HDF_MACHINE = "vmk180-versal"
46 42
47#### No additional settings should be after the Postamble 43#### No additional settings should be after the Postamble
48#### Postamble 44#### Postamble
49PACKAGE_EXTRA_ARCHS:append = "${@['', 'vmk180_versal']['vmk180-versal' != '${MACHINE}']}" 45PACKAGE_EXTRA_ARCHS:append = "${@['', ' vmk180_versal']['vmk180-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
index 30818313..e200d42d 100644
--- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
@@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar
26UBOOT_ENTRYPOINT ?= "0x200000" 26UBOOT_ENTRYPOINT ?= "0x200000"
27UBOOT_LOADADDRESS ?= "0x200000" 27UBOOT_LOADADDRESS ?= "0x200000"
28 28
29# vpk120-versal Serial Console 29# vpk120-versal Serial Console
30SERIAL_CONSOLES ?= "115200;ttyAMA0" 30SERIAL_CONSOLES ?= "115200;ttyAMA0"
31YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" 31YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
32 32
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
45 45
46#### No additional settings should be after the Postamble 46#### No additional settings should be after the Postamble
47#### Postamble 47#### Postamble
48PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk120_versal']['vpk120-versal' != '${MACHINE}']}" 48PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk120_versal']['vpk120-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
index dd2dc111..92630e97 100644
--- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
@@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar
26UBOOT_ENTRYPOINT ?= "0x200000" 26UBOOT_ENTRYPOINT ?= "0x200000"
27UBOOT_LOADADDRESS ?= "0x200000" 27UBOOT_LOADADDRESS ?= "0x200000"
28 28
29# vpk180-versal Serial Console 29# vpk180-versal Serial Console
30SERIAL_CONSOLES ?= "115200;ttyAMA0" 30SERIAL_CONSOLES ?= "115200;ttyAMA0"
31YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" 31YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
32 32
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
45 45
46#### No additional settings should be after the Postamble 46#### No additional settings should be after the Postamble
47#### Postamble 47#### Postamble
48PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk180_versal']['vpk180-versal' != '${MACHINE}']}" 48PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk180_versal']['vpk180-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index dc6f55b1..1db0616f 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -41,4 +41,4 @@ HDF_MACHINE = "zc702-zynq7"
41 41
42#### No additional settings should be after the Postamble 42#### No additional settings should be after the Postamble
43#### Postamble 43#### Postamble
44PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}" 44PACKAGE_EXTRA_ARCHS:append = "${@['', ' zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index e6b7ce57..7e0525d1 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -23,7 +23,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1"
23UBOOT_ENTRYPOINT ?= "0x200000" 23UBOOT_ENTRYPOINT ?= "0x200000"
24UBOOT_LOADADDRESS ?= "0x200000" 24UBOOT_LOADADDRESS ?= "0x200000"
25 25
26# zc702-zynq7 Serial Console 26# zc706-zynq7 Serial Console
27SERIAL_CONSOLES ?= "115200;ttyPS0" 27SERIAL_CONSOLES ?= "115200;ttyPS0"
28YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" 28YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
29 29
@@ -41,4 +41,4 @@ HDF_MACHINE = "zc706-zynq7"
41 41
42#### No additional settings should be after the Postamble 42#### No additional settings should be after the Postamble
43#### Postamble 43#### Postamble
44PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}" 44PACKAGE_EXTRA_ARCHS:append = "${@['', ' zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index c434067d..acd2544a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -2,10 +2,6 @@
2#@NAME: zcu102-zynqmp 2#@NAME: zcu102-zynqmp
3#@DESCRIPTION: Machine configuration for the ZCU102 evaluation board. 3#@DESCRIPTION: Machine configuration for the ZCU102 evaluation board.
4 4
5# Compatibility with old BOARD value.
6# TODO - Remove these once removed from petalinux bsp
7MACHINEOVERRIDES =. "zcu102:"
8
9#### Preamble 5#### Preamble
10MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}" 6MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}"
11#### Regular settings follow 7#### Regular settings follow
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu102-zynqmp"
55 51
56#### No additional settings should be after the Postamble 52#### No additional settings should be after the Postamble
57#### Postamble 53#### Postamble
58PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}" 54PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 710078eb..b4c11f3a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -49,9 +49,10 @@ HDF_MACHINE = "zcu104-zynqmp"
49# the xsa. User can enable explicitly if required from local.conf. 49# the xsa. User can enable explicitly if required from local.conf.
50# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" 50# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb"
51 51
52# Yocto IMAGE_FEATURES Variable
52MACHINE_HWCODECS = "libomxil-xlnx" 53MACHINE_HWCODECS = "libomxil-xlnx"
53IMAGE_FEATURES += "hwcodecs" 54IMAGE_FEATURES += "hwcodecs"
54 55
55#### No additional settings should be after the Postamble 56#### No additional settings should be after the Postamble
56#### Postamble 57#### Postamble
57PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}" 58PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 23a936d8..ff273134 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -2,10 +2,6 @@
2#@NAME: zcu106-zynqmp 2#@NAME: zcu106-zynqmp
3#@DESCRIPTION: Machine configuration for the ZCU106 evaluation board. 3#@DESCRIPTION: Machine configuration for the ZCU106 evaluation board.
4 4
5# Compatibility with old BOARD value.
6# TODO - Remove these once removed from petalinux bsp
7MACHINEOVERRIDES =. "zcu106:"
8
9#### Preamble 5#### Preamble
10MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}" 6MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}"
11#### Regular settings follow 7#### Regular settings follow
@@ -53,9 +49,10 @@ HDF_MACHINE = "zcu106-zynqmp"
53# the xsa. User can enable explicitly if required from local.conf. 49# the xsa. User can enable explicitly if required from local.conf.
54# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" 50# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb"
55 51
52# Yocto IMAGE_FEATURES Variable
56MACHINE_HWCODECS = "libomxil-xlnx" 53MACHINE_HWCODECS = "libomxil-xlnx"
57IMAGE_FEATURES += "hwcodecs" 54IMAGE_FEATURES += "hwcodecs"
58 55
59#### No additional settings should be after the Postamble 56#### No additional settings should be after the Postamble
60#### Postamble 57#### Postamble
61PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}" 58PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 5868449f..77da93ca 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -2,10 +2,6 @@
2#@NAME: zcu111-zynqmp 2#@NAME: zcu111-zynqmp
3#@DESCRIPTION: Machine configuration for the ZCU111 evaluation board. 3#@DESCRIPTION: Machine configuration for the ZCU111 evaluation board.
4 4
5# Compatibility with old BOARD value.
6# TODO - Remove these once removed from petalinux bsp
7MACHINEOVERRIDES =. "zcu111:"
8
9#### Preamble 5#### Preamble
10MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}" 6MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}"
11#### Regular settings follow 7#### Regular settings follow
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu111-zynqmp"
55 51
56#### No additional settings should be after the Postamble 52#### No additional settings should be after the Postamble
57#### Postamble 53#### Postamble
58PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}" 54PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 71c94038..18aa3eee 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -1,3 +1,5 @@
1XILINX_DEPRECATED[zcu1275-zynqmp] = "${@'zcu1275-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}"
2
1#@TYPE: Machine 3#@TYPE: Machine
2#@NAME: zcu1275-zynqmp 4#@NAME: zcu1275-zynqmp
3#@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. 5#@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board.
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 812a283f..6fba3619 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -1,3 +1,5 @@
1XILINX_DEPRECATED[zcu1285-zynqmp] = "${@'zcu1285-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}"
2
1#@TYPE: Machine 3#@TYPE: Machine
2#@NAME: zcu1285-zynqmp 4#@NAME: zcu1285-zynqmp
3#@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. 5#@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board.
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 273606e2..7bb2c9db 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -47,4 +47,4 @@ HDF_MACHINE = "zcu208-zynqmp"
47 47
48#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
49#### Postamble 49#### Postamble
50PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 80a15358..f4e1619d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -47,4 +47,4 @@ HDF_MACHINE = "zcu216-zynqmp"
47 47
48#### No additional settings should be after the Postamble 48#### No additional settings should be after the Postamble
49#### Postamble 49#### Postamble
50PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" 50PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
index 9ab3f24e..fa4816af 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend
@@ -4,10 +4,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
4COMPATIBLE_MACHINE:qemu-zynq7 = ".*" 4COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
5SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts" 5SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
6 6
7SRC_URI:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' file://pnc.dtsi', '', d)}" 7EXTRA_OVERLAYS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' pnc.dtsi', '', d)}"
8
9do_configure:append() {
10 if [ ${@bb.utils.contains('MACHINE_FEATURES', 'provencore', 'true', '', d)} ]; then
11 echo '#include "pnc.dtsi"' >> ${DT_FILES_PATH}/system-top.dts
12 fi
13}
diff --git a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend
new file mode 100644
index 00000000..8fdf14bb
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend
@@ -0,0 +1,10 @@
1FILESEXTRAPATHS:append := ":${THISDIR}/files"
2
3SRC_URI += "file://zcu106-xlnx-firmware-detect"
4
5PACKAGE_ARCH:zcu106-zynqmp = "${MACHINE_ARCH}"
6
7# ZCU106 eval board firmware detection script.
8do_install:append:zcu106-zynqmp () {
9 install -m 0755 ${WORKDIR}/zcu106-xlnx-firmware-detect ${D}${bindir}/xlnx-firmware-detect
10}
diff --git a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect
new file mode 100644
index 00000000..ef5654cc
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect
@@ -0,0 +1,71 @@
1#! /bin/sh
2
3# Copyright (C) 2022 Xilinx, Inc. All rights reserved.
4# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
5#
6# SPDX-License-Identifier: MIT
7
8# read values from dfx-mgr conf file
9conffile="/etc/dfx-mgrd/daemon.conf"
10if [ ! -f "${conffile}" ]; then
11 echo "dfx-mgrd configuration file not found: ${conffile}"
12 exit 1
13fi
14
15fwbasedir=$(grep "firmware_location" ${conffile} | sed 's/.*:.*\[\"\(.*\)\"\],\?/\1/')
16if [ -z "${fwbasedir}" ]; then
17 echo "Property 'firmware_location' not found in ${conffile}"
18 exit 1
19fi
20
21fwfile=$(grep "default_accel" ${conffile} | sed 's/.*:.*\"\(.*\)\",\?/\1/')
22if [ -z "${fwfile}" ]; then
23 echo "Property 'default_accel' not found in ${conffile}"
24 exit 1
25fi
26
27# check if default firmware is already set and present
28if [ -f "${fwfile}" ]; then
29 fwname=$(cat ${fwfile})
30 fwdir="${fwbasedir}/${fwname}"
31 if [ -n "${fwname}" ] && [ -d "${fwdir}" ]; then
32 echo "Default firmware detected: ${fwname}"
33 exit 0
34 fi
35fi
36
37# search for firmware based on EEPROM board id
38echo "Trying to detect default firmware based on EEPROM..."
39
40#check if board is a zcu106 eval board product
41eeprom=$(ls /sys/bus/i2c/devices/*54/eeprom 2> /dev/null)
42if [ -n "${eeprom}" ]; then
43 boardid=`dd if=$eeprom bs=1 count=6 skip=208 2>/dev/null | tr '[:upper:]' '[:lower:]'`
44 revision=`dd if=$eeprom bs=1 count=3 skip=224 2>/dev/null | tr '[:upper:]' '[:lower:]'`
45
46 fwname="${boardid}-${revision}"
47 fwdir="${fwbasedir}/${fwname}"
48
49 fixed_rev=2.0
50 var=$(awk 'BEGIN{ print "'$fixed_rev'"<"'$revision'" }')
51
52 if [ "${boardid}" == "zcu106" ] && [ "${var}" -eq 1 ] ;then
53 revision=2.0
54 echo "later than 2.0 board revisions are supported in 2.0 bit and dtbo files"
55 fwname="${boardid}-${revision}"
56 fwdir="${fwbasedir}/${fwname}"
57 echo "${fwname}" > "${fwfile}"
58 exit 1
59 elif [ ! -d "${fwdir}" ] ; then
60 echo "No default firmware named ${fwname} found in ${fwbasedir} , Loading rev1.0 bitstream and dtbo as default "
61 revision=1.0
62 fwname=$(ls ${fwbasedir} | grep ${revision})
63 fwdir="${fwbasedir}/${fwname}"
64 echo "${fwname}" > "${fwfile}"
65 exit 1
66 fi
67
68 echo "Default firmware detected: ${fwname}"
69 echo "${fwname}" > "${fwfile}"
70 exit 0
71fi
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-06 10:36:44 +0000