From 195e1fa9fb13b21bc41af4e0747d4646caeb65e5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 4 Jun 2024 16:51:04 -0600 Subject: various: Remove SOC_VARIANT, split versal and versal-net, add machine_features SOC_VARIANT has been remove, we are now only using the YP standard SOC_FAMILY configuration. The defined families are: zynq, zynqmp, versal and versal-net. Our decision of breaking up versal-net from versal, is based on the SoC CPU changes from cortexa72/r5 to cortexa78/r52, thus we're treating it as a different SoC family. In order to capture the individual capabilities that we used to handle via SOC_VARIANT, we have defined the following features (some may have been previously defined): - mali400 (zynqmp eg and ev) - vcu (zynqmp ev) - rfsoc (zynqmp dr RF capabiltiies) - aie - (versal ai & premium) - vdu - (versal ai) SOC_VARIANT_ARCH and SOC_FAMILY_ARCH are now obsolete and replaced by MACHINE_ARCH. This is based on the guideline that any recipes that use MACHINE_FEATURES should be MACHINE_ARCH specific. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index c3518577..a9dbe800 100644 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf @@ -3,9 +3,7 @@ #@DESCRIPTION: Machine support for ZC1254 Evaluation Board. # -SOC_VARIANT = "dr" - -require conf/machine/zynqmp-generic.conf +require conf/machine/zynqmp-dr-generic.conf # Add board compatibility override MACHINEOVERRIDES .= ":zc1254" -- cgit v1.2.3-54-g00ecf From a6fc68b61091d6d8a7ef45752127c9671e917cea Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Mon, 1 Jul 2024 23:28:12 -0600 Subject: Revert "Remove vck500, vhk158 and zcu670, these are not publicly available BSPs." This reverts commit 155bedb17469d3f622f184e74b47e3d660223008. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 49 ++++++++++++++++++++++ meta-xilinx-bsp/conf/machine/vhk158-versal.conf | 52 ++++++++++++++++++++++++ meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf | 50 +++++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 meta-xilinx-bsp/conf/machine/vck5000-versal.conf create mode 100644 meta-xilinx-bsp/conf/machine/vhk158-versal.conf create mode 100644 meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf new file mode 100644 index 00000000..a80788cc --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf @@ -0,0 +1,49 @@ +#@TYPE: Machine +#@NAME: vck500-versal +#@DESCRIPTION: Machine configuration for the VCK5000 evaluation board. + +# Compatibility with old BOARD value. +# TODO - Remove these once removed from petalinux bsp +MACHINEOVERRIDES =. "vck5000:" + +#### Preamble +MACHINEOVERRIDES =. "${@['', 'vck5000-versal:']['vck5000-versal' !='${MACHINE}']}" +#### Regular settings follow + +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in versal-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD template}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# vck5000-versal Serial Console +SERIAL_CONSOLES ?= "115200;ttyAMA0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# VCK5000 board uses Versal AI Core device hence use soc variant based generic +# machine inclusion +require conf/machine/versal-ai-core-generic.conf + +# This machine conf file uses vck5000-versal xsa as reference input. +# User can override with vck5000 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "vck5000-versal" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck5000_versal']['vck5000-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf new file mode 100644 index 00000000..5c0406de --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf @@ -0,0 +1,52 @@ +#@TYPE: Machine +#@NAME: vhk158-versal +#@DESCRIPTION: Machine configuration for the VHK158 evaluation board. + +#### Preamble +MACHINEOVERRIDES =. "${@['', 'vhk158-versal:']['vhk158-versal' !='${MACHINE}']}" +#### Regular settings follow + +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in versal-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "pl011" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PLM variables +YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# vhk158-versal Serial Console +SERIAL_CONSOLES ?= "115200;ttyAMA0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# VHK158 board uses Versal HBM device hence use soc variant based generic +# machine inclusion +require conf/machine/versal-hbm-generic.conf + +# This machine conf file uses vhk158-versal xsa as reference input. +# User can override with vhk158 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "vhk158-versal" + +# VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G, +# Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM +QB_MEM = "-m 32G" + +QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb" +QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'vhk158_versal']['vhk158-versal' != '${MACHINE}']}" \ No newline at end of file diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf new file mode 100644 index 00000000..6b1dd488 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf @@ -0,0 +1,50 @@ +#@TYPE: Machine +#@NAME: zcu670-zynqmp +#@DESCRIPTION: Machine configuration for the ZCU670 evaluation board. + +#### Preamble +MACHINEOVERRIDES =. "${@['', 'zcu670-zynqmp:']['zcu670-zynqmp' !='${MACHINE}']}" +#### Regular settings follow + +# Variables that changes based on hw design or board specific requirement must be +# defined before calling the required inclusion file else pre-expansion value +# defined in zynqmp-generic.conf will be set. + +# Yocto device-tree variables +YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" +YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}" + +# Yocto arm-trusted-firmware(TF-A) variables +ATF_CONSOLE_DEFAULT ?= "cadence" +TFA_BL33_LOAD ?= "0x8000000" + +# Yocto PMUFW variables +YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" + +# Yocto FSBL variables +YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" +YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" + +# Yocto KERNEL Variables +UBOOT_ENTRYPOINT ?= "0x200000" +UBOOT_LOADADDRESS ?= "0x200000" + +# zcu670-zynqmp Serial Console +SERIAL_CONSOLES ?= "115200;ttyPS0" +YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" + +# Required generic machine inclusion +# ZCU670 board uses ZynqMP DR device hence use soc variant based generic machine +# inclusion +require conf/machine/zynqmp-dr-generic.conf + +# This eval board machine conf file uses zcu670-zynqmp xsa as reference input. +# User can override with zcu670 custom xsa using HDF_BASE and HDF_PATH variables +# from local.conf. +HDF_MACHINE = "zcu670-zynqmp" + +#### No additional settings should be after the Postamble +#### Postamble +PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu670_zynqmp']['zcu670-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf From 56daa95ebe976f0e2adfe19dc4e0c2ddb8d9afbf Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Mon, 1 Jul 2024 23:28:13 -0600 Subject: vhk158-versal.conf: Update YAML_MAIN_MEMORY_CONFIG to lower 2GB Update YAML_MAIN_MEMORY_CONFIG to lower 2GB DDR for vhk158-versal.conf. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/vhk158-versal.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf index 5c0406de..bc2dc6c8 100644 --- a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf @@ -12,6 +12,7 @@ MACHINEOVERRIDES =. "${@['', 'vhk158-versal:']['vhk158-versal' !='${MACHINE}']}" # Yocto device-tree variables YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" +YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "axi_noc_0_C0_DDR_LOW0x2" YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}" # Yocto arm-trusted-firmware(TF-A) variables -- cgit v1.2.3-54-g00ecf From 7bad3964217a156266a85096e942d42cc712a6a9 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Mon, 1 Jul 2024 23:28:15 -0600 Subject: machine: Remove vck500-versal conf file Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/README.md | 1 - meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 49 ------------------------ 2 files changed, 50 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/vck5000-versal.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/README.md b/meta-xilinx-bsp/README.md index 2d869913..3f7df18e 100644 --- a/meta-xilinx-bsp/README.md +++ b/meta-xilinx-bsp/README.md @@ -38,7 +38,6 @@ The following boards are supported by the meta-xilinx-bsp layer: | | [ZCU670](https://www.xilinx.com/products/boards-and-kits/zcu670.html) | [zcu670-zynqmp](conf/machine/zcu670-zynqmp.conf) | `zcu670-zynqmp` | `zcu670-revb` | Yes | Yes | | 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 | | | [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 | -| | [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 | | | [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 | | | [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 | | | [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 | diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf deleted file mode 100644 index a80788cc..00000000 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ /dev/null @@ -1,49 +0,0 @@ -#@TYPE: Machine -#@NAME: vck500-versal -#@DESCRIPTION: Machine configuration for the VCK5000 evaluation board. - -# Compatibility with old BOARD value. -# TODO - Remove these once removed from petalinux bsp -MACHINEOVERRIDES =. "vck5000:" - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vck5000-versal:']['vck5000-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD template}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE_DEFAULT ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vck5000-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VCK5000 board uses Versal AI Core device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-ai-core-generic.conf - -# This machine conf file uses vck5000-versal xsa as reference input. -# User can override with vck5000 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vck5000-versal" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck5000_versal']['vck5000-versal' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf From bce34c2bca35da0cd48c4f11f6fac09aecde7ed5 Mon Sep 17 00:00:00 2001 From: John Toomey Date: Tue, 23 Jul 2024 17:05:47 +0100 Subject: device-tree: Move zcu111 dtsi to meta-xilinx-bsp This dtsi is required for the sdfec application and will be removed when the design has been updated Signed-off-by: John Toomey Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend | 5 +++++ .../recipes-bsp/device-tree/files/system-zcu111.dtsi | 11 +++++++++++ 2 files changed, 16 insertions(+) create mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi (limited to 'meta-xilinx-bsp') 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 7acda75e..35485c21 100644 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend @@ -7,3 +7,8 @@ SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts" EXTRA_OVERLAYS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' pnc.dtsi', '', d)}" EXTRA_OVERLAYS:append:vek280-versal = " system-vek280.dtsi" + +SDFEC_EXTRA_OVERLAYS ??= "" +SDFEC_EXTRA_OVERLAYS:zcu111-zynqmp = "system-zcu111.dtsi" + +EXTRA_OVERLAYS:append:zcu111-zynqmp = "${@' ${SDFEC_EXTRA_OVERLAYS}' if d.getVar('ENABLE_SDFEC_DT') == '1' else ''}" diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi new file mode 100644 index 00000000..870f13a8 --- /dev/null +++ b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi @@ -0,0 +1,11 @@ +/ { +/* Add Board specific PL gpio-line-names wrt design to have sdfec functional */ + amba_pl: pl-bus { + axi_gpio: gpio@a00c0000 { + gpio-line-names = "LED0","LED1"; + }; + gpio_reset: gpio@a00c1000 { + gpio-line-names = "RESET"; + }; + }; +}; -- cgit v1.2.3-54-g00ecf From 19496e1a7abebda2932311f65dbd846fb6cd3b14 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 25 Aug 2024 13:18:14 -0600 Subject: meta-xilinx-bsp: recipes-kernel move to meta-xilinx-contrib Remove s3adsp1800-qemu-microblazeeb references, this was removed long ago. Move ml605-qemu-microblazeel to the meta-xilinx-contrib layer. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend | 4 ---- meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 4 ---- meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend | 4 ---- meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-dev.bbappend | 3 +++ meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 3 +++ meta-xilinx-contrib/recipes-kernel/linux/linux-yocto_%.bbappend | 3 +++ 6 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-dev.bbappend create mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-tiny_%.bbappend create mode 100644 meta-xilinx-contrib/recipes-kernel/linux/linux-yocto_%.bbappend (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index 0233531d..d4dd83fe 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,7 +1,3 @@ -# MicroBlaze KMACHINEs -KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" -KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" - # Default kernel config fragements for specific machines KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend index 0233531d..d4dd83fe 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend @@ -1,7 +1,3 @@ -# MicroBlaze KMACHINEs -KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" -KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" - # Default kernel config fragements for specific machines KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend index 0233531d..d4dd83fe 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,7 +1,3 @@ -# MicroBlaze KMACHINEs -KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" -KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb" - # Default kernel config fragements for specific machines KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..8b41f24a --- /dev/null +++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,3 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" + diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-tiny_%.bbappend new file mode 100644 index 00000000..8b41f24a --- /dev/null +++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto-tiny_%.bbappend @@ -0,0 +1,3 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" + diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 00000000..8b41f24a --- /dev/null +++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1,3 @@ +# MicroBlaze KMACHINEs +KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel" + -- cgit v1.2.3-54-g00ecf From 6dfd742c59b2f0451ba32080eacaad52618437fd Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 25 Aug 2024 13:42:41 -0600 Subject: meta-xilinx-bsp: Move to provencore support to meta-petalinux Signed-off-by: Mark Hatle --- .../recipes-bsp/device-tree/device-tree.bbappend | 2 -- meta-xilinx-bsp/recipes-bsp/device-tree/files/pnc.dtsi | 13 ------------- .../arm-trusted-firmware/arm-trusted-firmware.inc | 3 --- 3 files changed, 18 deletions(-) delete mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/files/pnc.dtsi (limited to 'meta-xilinx-bsp') 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 35485c21..d62e305f 100644 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend @@ -4,8 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" COMPATIBLE_MACHINE:qemu-zynq7 = ".*" SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts" -EXTRA_OVERLAYS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' pnc.dtsi', '', d)}" - EXTRA_OVERLAYS:append:vek280-versal = " system-vek280.dtsi" SDFEC_EXTRA_OVERLAYS ??= "" diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/pnc.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/pnc.dtsi deleted file mode 100644 index 760b76be..00000000 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/pnc.dtsi +++ /dev/null @@ -1,13 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - pnc-reserved-memory@70000000{ - compatible = "pnc,secure-memory"; - reg = <0x0 0x70000000 0x0 0x0FF00000>; - no-map; - }; - }; -}; diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index c6d8b60d..485d3b17 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -75,9 +75,6 @@ EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.get EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}" EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" -ATF_PROVENCORE = "SPD=pncd SPD_PNCD_NS_IRQ=51 ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x0FF00000" -EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}" - TFA_BL33_LOAD ?= "" EXTRA_OEMAKE:append = "${@' PRELOADED_BL33_BASE=${TFA_BL33_LOAD}' if d.getVar('TFA_BL33_LOAD', True) != '' else ''}" -- cgit v1.2.3-54-g00ecf From 7272ab82957080c11fed21e6315e844c74c17fcf Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 27 Aug 2024 10:32:11 -0600 Subject: meta-xilinx-bsp: Remove obsolete microblazeel machines Signed-off-by: Mark Hatle --- .../conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf | 7 ------- .../conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf | 7 ------- 2 files changed, 14 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf delete mode 100644 meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf deleted file mode 100644 index 96b4e6d1..00000000 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: microblazeel-v11.0-bs-cmp-mh-div-generic -#@DESCRIPTION: microblazeel-v11.0-bs-cmp-mh-div - -TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high" - -require conf/machine/microblaze-generic.conf diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf deleted file mode 100644 index cf83acf8..00000000 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: microblazeel-v11.0-bs-cmp-ml-generic -#@DESCRIPTION: microblazeel-v11.0-bs-cmp-ml - -TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift reorder pattern-compare multiply-low" - -require conf/machine/microblaze-generic.conf -- cgit v1.2.3-54-g00ecf From 2633f0d890eea4b8dde4bf8dd21daca27f95e6b4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 25 Aug 2024 13:18:14 -0600 Subject: meta-xilinx-bsp: recipes-kernel move to meta-xilinx-tools Signed-off-by: Mark Hatle --- .../recipes-kernel/linux/linux-xlnx-dev.bbappend | 3 --- .../bsp/ac701-microblazeel/ac701-microblazeel.cfg | 19 ------------------- .../bsp/ac701-microblazeel/ac701-microblazeel.scc | 6 ------ .../bsp/vcu118-microblazeel/vcu118-microblazeel.cfg | 19 ------------------- .../bsp/vcu118-microblazeel/vcu118-microblazeel.scc | 6 ------ .../recipes-kernel/linux/linux-xlnx_%.bbappend | 10 ---------- .../recipes-kernel/linux/linux-yocto-dev.bbappend | 3 --- .../recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 3 --- .../recipes-kernel/linux/linux-yocto_%.bbappend | 3 --- 9 files changed, 72 deletions(-) delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.cfg delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.scc delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.cfg delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.scc delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend delete mode 100644 meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend deleted file mode 100644 index 5f4db309..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# MicroBlaze BSP fragments -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.cfg b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.cfg deleted file mode 100644 index 05452ce9..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: MIT - -#........................................................................ -# WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# refer the product documentation. -# -#........................................................................ - -# -# Definitions for MICROBLAZE -# -CONFIG_XILINX_MICROBLAZE0_FAMILY="artix7" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.scc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.scc deleted file mode 100644 index 6d551461..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/ac701-microblazeel/ac701-microblazeel.scc +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: MIT - -define KFEATURE_DESCRIPTION "Kernel Config for AC701 machine BSP" -define KFEATURE_COMPATIBILITY AC701 board - -kconf hardware ac701-microblazeel.cfg diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.cfg b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.cfg deleted file mode 100644 index c25a48e1..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: MIT - -#........................................................................ -# WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# refer the product documentation. -# -#........................................................................ - -# -# Definitions for MICROBLAZE -# -CONFIG_XILINX_MICROBLAZE0_FAMILY="virtexuplus" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.scc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.scc deleted file mode 100644 index 29261805..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/linux-xlnx-bsp-kmeta/bsp/vcu118-microblazeel/vcu118-microblazeel.scc +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: MIT - -define KFEATURE_DESCRIPTION "Kernel Config for VCU118 machine BSP" -define KFEATURE_COMPATIBILITY VCU118 board - -kconf hardware vcu118-microblazeel.cfg diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend deleted file mode 100644 index 627f6661..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append = " \ - file://linux-xlnx-bsp-kmeta;type=kmeta;name=linux-xlnx-bsp-kmeta;destsuffix=linux-xlnx-bsp-kmeta \ - " - -# MicroBlaze BSP fragments -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" -KERNEL_FEATURES:append:ac701-microblazeel = " bsp/ac701-microblazeel/ac701-microblazeel.scc" -KERNEL_FEATURES:append:vcu118-microblazeel = " bsp/vcu118-microblazeel/vcu118-microblazeel.scc" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend deleted file mode 100644 index d4dd83fe..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Default kernel config fragements for specific machines -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend deleted file mode 100644 index d4dd83fe..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Default kernel config fragements for specific machines -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend deleted file mode 100644 index d4dd83fe..00000000 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Default kernel config fragements for specific machines -KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" - -- cgit v1.2.3-54-g00ecf From 7bba8d33cb85c2ea88b2d62f138528278bf03be4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 25 Aug 2024 13:42:41 -0600 Subject: meta-xilinx-bsp: Move to meta-xilinx-tools Signed-off-by: Mark Hatle --- .../arm-trusted-firmware_%.bbappend | 2 - .../recipes-bsp/device-tree/device-tree.bbappend | 12 --- .../recipes-bsp/device-tree/files/qemu-zynq7.dts | 85 ---------------------- .../device-tree/files/system-vek280.dtsi | 20 ----- .../device-tree/files/system-zcu111.dtsi | 11 --- .../recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend | 10 --- .../dfx-mgr/files/zcu106-xlnx-firmware-detect | 71 ------------------ .../u-boot/files/kc705-microblazeel.cfg | 39 ---------- .../recipes-bsp/u-boot/u-boot-xlnx_%.bbappend | 5 -- 9 files changed, 255 deletions(-) delete mode 100644 meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend delete mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend delete mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts delete mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi delete mode 100644 meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi delete mode 100644 meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend delete mode 100644 meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect delete mode 100644 meta-xilinx-bsp/recipes-bsp/u-boot/files/kc705-microblazeel.cfg delete mode 100644 meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend deleted file mode 100644 index c6c92fe7..00000000 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_OEMAKE:append:vc-p-a2197-00-versal =" VERSAL_PLATFORM=silicon" - diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend deleted file mode 100644 index d62e305f..00000000 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -# device tree sources for the various machines -COMPATIBLE_MACHINE:qemu-zynq7 = ".*" -SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts" - -EXTRA_OVERLAYS:append:vek280-versal = " system-vek280.dtsi" - -SDFEC_EXTRA_OVERLAYS ??= "" -SDFEC_EXTRA_OVERLAYS:zcu111-zynqmp = "system-zcu111.dtsi" - -EXTRA_OVERLAYS:append:zcu111-zynqmp = "${@' ${SDFEC_EXTRA_OVERLAYS}' if d.getVar('ENABLE_SDFEC_DT') == '1' else ''}" diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts b/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts deleted file mode 100644 index cd0694d6..00000000 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts +++ /dev/null @@ -1,85 +0,0 @@ -/dts-v1/; -/include/ "zynq-7000.dtsi" -/include/ "zynq-7000-qspi-dummy.dtsi" - -/ { - model = "Zynq A9 QEMU"; - compatible = "qemu,xilinx-zynq-a9", "xlnx,zynq-7000"; - - aliases { - ethernet0 = &gem0; - serial0 = &uart1; - }; - - memory { - device_type = "memory"; - reg = <0x0 0x40000000>; - }; - - chosen { - bootargs = "earlyprintk"; - stdout-path = "serial0:115200n8"; - }; -}; - -&amba { - /* Setup a fixed 25 MHz clock (100Mbps) to trick the ethernet driver */ - fixednetclk: clock { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <25000000>; - }; -}; - -&gem0 { - status = "okay"; - clocks = <&clkc 30>, <&clkc 30>, <&fixednetclk>, <&fixednetclk>, <&clkc 30>; - phy-mode = "rgmii-id"; - phy-handle = <ðernet_phy>; - - ethernet_phy: ethernet-phy@23 { - device_type = "ethernet-phy"; - reg = <23>; - }; -}; - -&sdhci0 { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&qspi { - status = "okay"; - is-dual = <1>; - primary_flash: ps7-qspi@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "st,m25p80"; - reg = <0x0>; - spi-max-frequency = <50000000>; - partition@0x00000000 { - label = "boot"; - reg = <0x00000000 0x00500000>; - }; - partition@0x00500000 { - label = "bootenv"; - reg = <0x00500000 0x00020000>; - }; - partition@0x00520000 { - label = "config"; - reg = <0x00520000 0x00020000>; - }; - partition@0x00540000 { - label = "image"; - reg = <0x00540000 0x00a80000>; - }; - partition@0x00fc0000 { - label = "spare"; - reg = <0x00fc0000 0x00000000>; - }; - }; -}; - diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi deleted file mode 100644 index 0d2ca87d..00000000 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-vek280.dtsi +++ /dev/null @@ -1,20 +0,0 @@ -/ { -/* Reserve the bad block DDR memory for linux to not touch it, refer:CR-1143646 */ -reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - pl_ddr: buffer@0 - { - no-map; - reg = <0x08 0x00 0x00 0x80000000>; - }; - - lpddr_memory: buffer@1 - { - no-map; - reg = <0x500 0x0 0x2 0x0>; - }; - -}; -}; diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi b/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi deleted file mode 100644 index 870f13a8..00000000 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/system-zcu111.dtsi +++ /dev/null @@ -1,11 +0,0 @@ -/ { -/* Add Board specific PL gpio-line-names wrt design to have sdfec functional */ - amba_pl: pl-bus { - axi_gpio: gpio@a00c0000 { - gpio-line-names = "LED0","LED1"; - }; - gpio_reset: gpio@a00c1000 { - gpio-line-names = "RESET"; - }; - }; -}; diff --git a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend deleted file mode 100644 index 8fdf14bb..00000000 --- a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/files" - -SRC_URI += "file://zcu106-xlnx-firmware-detect" - -PACKAGE_ARCH:zcu106-zynqmp = "${MACHINE_ARCH}" - -# ZCU106 eval board firmware detection script. -do_install:append:zcu106-zynqmp () { - install -m 0755 ${WORKDIR}/zcu106-xlnx-firmware-detect ${D}${bindir}/xlnx-firmware-detect -} 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 deleted file mode 100644 index ef5654cc..00000000 --- a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/files/zcu106-xlnx-firmware-detect +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2022 Xilinx, Inc. All rights reserved. -# Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. -# -# SPDX-License-Identifier: MIT - -# read values from dfx-mgr conf file -conffile="/etc/dfx-mgrd/daemon.conf" -if [ ! -f "${conffile}" ]; then - echo "dfx-mgrd configuration file not found: ${conffile}" - exit 1 -fi - -fwbasedir=$(grep "firmware_location" ${conffile} | sed 's/.*:.*\[\"\(.*\)\"\],\?/\1/') -if [ -z "${fwbasedir}" ]; then - echo "Property 'firmware_location' not found in ${conffile}" - exit 1 -fi - -fwfile=$(grep "default_accel" ${conffile} | sed 's/.*:.*\"\(.*\)\",\?/\1/') -if [ -z "${fwfile}" ]; then - echo "Property 'default_accel' not found in ${conffile}" - exit 1 -fi - -# check if default firmware is already set and present -if [ -f "${fwfile}" ]; then - fwname=$(cat ${fwfile}) - fwdir="${fwbasedir}/${fwname}" - if [ -n "${fwname}" ] && [ -d "${fwdir}" ]; then - echo "Default firmware detected: ${fwname}" - exit 0 - fi -fi - -# search for firmware based on EEPROM board id -echo "Trying to detect default firmware based on EEPROM..." - -#check if board is a zcu106 eval board product -eeprom=$(ls /sys/bus/i2c/devices/*54/eeprom 2> /dev/null) -if [ -n "${eeprom}" ]; then - boardid=`dd if=$eeprom bs=1 count=6 skip=208 2>/dev/null | tr '[:upper:]' '[:lower:]'` - revision=`dd if=$eeprom bs=1 count=3 skip=224 2>/dev/null | tr '[:upper:]' '[:lower:]'` - - fwname="${boardid}-${revision}" - fwdir="${fwbasedir}/${fwname}" - - fixed_rev=2.0 - var=$(awk 'BEGIN{ print "'$fixed_rev'"<"'$revision'" }') - - if [ "${boardid}" == "zcu106" ] && [ "${var}" -eq 1 ] ;then - revision=2.0 - echo "later than 2.0 board revisions are supported in 2.0 bit and dtbo files" - fwname="${boardid}-${revision}" - fwdir="${fwbasedir}/${fwname}" - echo "${fwname}" > "${fwfile}" - exit 1 - elif [ ! -d "${fwdir}" ] ; then - echo "No default firmware named ${fwname} found in ${fwbasedir} , Loading rev1.0 bitstream and dtbo as default " - revision=1.0 - fwname=$(ls ${fwbasedir} | grep ${revision}) - fwdir="${fwbasedir}/${fwname}" - echo "${fwname}" > "${fwfile}" - exit 1 - fi - - echo "Default firmware detected: ${fwname}" - echo "${fwname}" > "${fwfile}" - exit 0 -fi diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/files/kc705-microblazeel.cfg b/meta-xilinx-bsp/recipes-bsp/u-boot/files/kc705-microblazeel.cfg deleted file mode 100644 index 8fb38950..00000000 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/files/kc705-microblazeel.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: MIT - -#........................................................................ -# WARNING -# -# This file is a u-boot configuration fragment, and not a full u-boot -# configuration file. The final u-boot configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on u-boot configuration, please -# refer the product documentation. -# -#....................................................................... - -# -# Definitions for KC705 evaluation board -# -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CMD_FLASH=y -CONFIG_CMD_IMLS=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_DEVICE=y -# CONFIG_CMD_SPI is not set -# CONFIG_CMD_SF is not set -# CONFIG_SPI_FLASH is not set -# CONFIG_SPI_FLASH_BAR is not set -# CONFIG_DM_SPI_FLASH is not set -# CONFIG_DM_SPI is not set -# CONFIG_SPI_FLASH_SPANSION is not set -# CONFIG_SPI_FLASH_STMICRO is not set -# CONFIG_SPI_FLASH_WINBOND is not set -# CONFIG_SPI_FLASH_MACRONIX is not set -# CONFIG_SPI is not set -# CONFIG_SPI_FLASH_ISSI is not set -# CONFIG_XILINX_SPI is not set \ No newline at end of file diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend deleted file mode 100644 index 23b1eb50..00000000 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append:kc705-microblazeel = " \ - file://kc705-microblazeel.cfg \ - " \ No newline at end of file -- cgit v1.2.3-54-g00ecf From d7238edf7afe4c7afb6e304f9564d46a883b1e1a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 6 Aug 2024 17:20:41 -0600 Subject: meta-xilinx-bsp: Move XSCT bsps to meta-xilinx-tools Signed-off-by: Mark Hatle --- .../conf/machine/ac701-microblazeel.conf | 50 ------------------- .../conf/machine/kc705-microblazeel.conf | 50 ------------------- .../conf/machine/kcu105-microblazeel.conf | 50 ------------------- .../conf/machine/sp701-microblazeel.conf | 52 ------------------- meta-xilinx-bsp/conf/machine/vck190-versal.conf | 45 ----------------- .../conf/machine/vcu118-microblazeel.conf | 50 ------------------- meta-xilinx-bsp/conf/machine/vek280-versal.conf | 55 -------------------- meta-xilinx-bsp/conf/machine/vhk158-versal.conf | 53 -------------------- meta-xilinx-bsp/conf/machine/vmk180-versal.conf | 45 ----------------- meta-xilinx-bsp/conf/machine/vpk120-versal.conf | 48 ------------------ meta-xilinx-bsp/conf/machine/vpk180-versal.conf | 48 ------------------ meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 11 ---- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 44 ---------------- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 44 ---------------- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 54 -------------------- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 58 ---------------------- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 58 ---------------------- meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 54 -------------------- meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | 52 ------------------- meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 56 --------------------- meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | 50 ------------------- meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | 50 ------------------- meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf | 50 ------------------- 23 files changed, 1127 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf delete mode 100644 meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf delete mode 100644 meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf delete mode 100644 meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vck190-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vek280-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vhk158-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vmk180-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vpk120-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/vpk180-versal.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zc702-zynq7.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zc706-zynq7.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf delete mode 100644 meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf deleted file mode 100644 index 27cb3939..00000000 --- a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: ac701-microblazeel -#@DESCRIPTION: Machine configuration for the AC701 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'ac701-microblazeel:']['ac701-microblazeel' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in microblazeel-generic.conf will be set. - -# Yocto AC701 device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}" - -# Yocto FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x80000000" -UBOOT_LOADADDRESS ?= "0x80000000" - -# ac701-microblazeel Serial Console -SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - -# Required generic machine inclusion -require conf/machine/microblaze-generic.conf - -# This machine conf file uses ac701-microblazeel xsa as reference input. -# User can override with ac701 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "ac701-microblazeel" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index f3236f07..00000000 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: kc705-microblazeel -#@DESCRIPTION: Machine configuration for the KC705 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'kc705-microblazeel:']['kc705-microblazeel' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in microblazeel-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}" - -# Yocto FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_emc_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x80000000" -UBOOT_LOADADDRESS ?= "0x80000000" - -# kc705-microblazeel Serial Console -SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - -# Required generic machine inclusion -require conf/machine/microblaze-generic.conf - -# This machine conf file uses kc705-microblazeel xsa as reference input. -# User can override with kc705 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "kc705-microblazeel" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index a866f87c..00000000 --- a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: kcu105-microblazeel -#@DESCRIPTION: Machine configuration for the KCU105 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'kcu105-microblazeel:']['kcu105-microblazeel' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in microblazeel-generic.conf will be set. - -# Yocto KCU105 device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}" - -# Yocto FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x80000000" -UBOOT_LOADADDRESS ?= "0x80000000" - -# kcu105-microblazeel Serial Console -SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - -# Required generic machine inclusion -require conf/machine/microblaze-generic.conf - -# This machine conf file uses kcu105-microblazeel xsa as reference input. -# User can override with kcu105 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "kcu105-microblazeel" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf deleted file mode 100644 index e3df1d26..00000000 --- a/meta-xilinx-bsp/conf/machine/sp701-microblazeel.conf +++ /dev/null @@ -1,52 +0,0 @@ -#@TYPE: Machine -#@NAME: sp701-microblazeel -#@DESCRIPTION: Machine configuration for the SP701 boards. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'sp701-microblazeel:']['sp701-microblazeel' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in microblazeel-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD sp701-rev1.0}" - -# Yocto u-boot-xlnx variables - -# Yocto FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x80000000" -UBOOT_LOADADDRESS ?= "0x80000000" - -# xilinx-sp701 Serial Console -SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - -# Required generic machine inclusion -require conf/machine/microblaze-generic.conf - -# This machine conf file uses sp701-microblazeel xsa as reference input. -# User can override with kc705 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "sp701-microblazeel" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' sp701_microblazeel']['sp701-microblazeel' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf deleted file mode 100644 index ed049268..00000000 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Machine -#@NAME: vck190-versal -#@DESCRIPTION: Machine configuration for the VCK190 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vck190-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VCK190 board uses Versal AI Core device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-ai-core-generic.conf - -# This machine conf file uses vck190-versal xsa as reference input. -# User can override with vck190 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vck190-versal" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index bfd60336..00000000 --- a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: vcu118-microblazeel -#@DESCRIPTION: Machine configuration for the VCU118 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in microblazeel-generic.conf will be set. - -# Yocto VCU118 device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0" -DT_PADDING_SIZE:pn-device-tree ?= "0x1000" -DTC_FLAGS:pn-device-tree ?= "" -XSCTH_PROC:pn-device-tree ?= "microblaze_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}" - -# Yocto FS-Boot variables -YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0" -YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0" -YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0" -XSCTH_PROC:pn-fs-boot ?= "microblaze_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x80000000" -UBOOT_LOADADDRESS ?= "0x80000000" - -# vcu118-microblazeel Serial Console -SERIAL_CONSOLES ?= "115200;ttyUL0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Set DDR Base address for u-boot-xlnx-scr variables -DDR_BASEADDR ?= "0x80000000" -SKIP_APPEND_BASEADDR ?= "0" - -# Required generic machine inclusion -require conf/machine/microblaze-generic.conf - -# This machine conf file uses vcu118-microblazeel xsa as reference input. -# User can override with vcu118 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vcu118-microblazeel" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index ffe2fcb7..00000000 --- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf +++ /dev/null @@ -1,55 +0,0 @@ -XILINX_DEPRECATED[vek280-versal] = "${@'vek280-versal is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}" - -#@TYPE: Machine -#@NAME: vek280-versal -#@DESCRIPTION: Machine configuration for the VEK280 evaluation boards. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vek280-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -require conf/machine/versal-ai-edge-generic.conf - -# This machine conf file uses vek280-versal xsa as reference input. -# User can override with vek280 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vek280-versal" - -# VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to -# 8G, Hence we need set 12G in QB_MEM. -QB_MEM = "-m 12G" - -QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb" -QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" - -# Yocto MACHINE_FEATURES Variable -MACHINE_FEATURES += "vdu" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' vek280_versal']['vek280-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf b/meta-xilinx-bsp/conf/machine/vhk158-versal.conf deleted file mode 100644 index bc2dc6c8..00000000 --- a/meta-xilinx-bsp/conf/machine/vhk158-versal.conf +++ /dev/null @@ -1,53 +0,0 @@ -#@TYPE: Machine -#@NAME: vhk158-versal -#@DESCRIPTION: Machine configuration for the VHK158 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vhk158-versal:']['vhk158-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "axi_noc_0_C0_DDR_LOW0x2" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vhk158-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE_DEFAULT ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vhk158-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VHK158 board uses Versal HBM device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-hbm-generic.conf - -# This machine conf file uses vhk158-versal xsa as reference input. -# User can override with vhk158 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vhk158-versal" - -# VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G, -# Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM -QB_MEM = "-m 32G" - -QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb" -QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'vhk158_versal']['vhk158-versal' != '${MACHINE}']}" \ No newline at end of file diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf deleted file mode 100644 index 0f474f78..00000000 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Machine -#@NAME: vmk180-versal -#@DESCRIPTION: Machine configuration for the VMK180 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vmk180-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VMK180 board uses Versal Prime device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-prime-generic.conf - -# This machine conf file uses vmk180-versal xsa as reference input. -# User can override with vmk180 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vmk180-versal" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index e200d42d..00000000 --- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf +++ /dev/null @@ -1,48 +0,0 @@ -#@TYPE: Machine -#@NAME: vpk120-versal -#@DESCRIPTION: Machine configuration for the VPK120 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vpk120-versal:']['vpk120-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vpk120-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VPK120 board uses Versal Premium device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-premium-generic.conf - -# This machine conf file uses vpk120-versal xsa as reference input. -# User can override with vpk120 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vpk120-versal" - -QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vpk120.dtb" -QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index 92630e97..00000000 --- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf +++ /dev/null @@ -1,48 +0,0 @@ -#@TYPE: Machine -#@NAME: vpk180-versal -#@DESCRIPTION: Machine configuration for the VPK180 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'vpk180-versal:']['vpk180-versal' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in versal-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "pl011" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PLM variables -YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# vpk180-versal Serial Console -SERIAL_CONSOLES ?= "115200;ttyAMA0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# VPK180 board uses Versal Premium device hence use soc variant based generic -# machine inclusion -require conf/machine/versal-premium-generic.conf - -# This machine conf file uses vpk180-versal xsa as reference input. -# User can override with vpk180 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "vpk180-versal" - -QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vpk180.dtb" -QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk180_versal']['vpk180-versal' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf deleted file mode 100644 index a9dbe800..00000000 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: zc1254-zynqmp -#@DESCRIPTION: Machine support for ZC1254 Evaluation Board. -# - -require conf/machine/zynqmp-dr-generic.conf - -# Add board compatibility override -MACHINEOVERRIDES .= ":zc1254" - -KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb" diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf deleted file mode 100644 index 1db0616f..00000000 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ /dev/null @@ -1,44 +0,0 @@ -#@TYPE: Machine -#@NAME: zc702-zynq7 -#@DESCRIPTION: Machine configuration for the ZC702 evaluation boards. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zc702-zynq7:']['zc702-zynq7' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynq-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zc702-zynq7 Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -require conf/machine/zynq-generic.conf - -# This eval board machine conf file uses zc702-zynq7 xsa as reference input. -# User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zc702-zynq7" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "zynq-zc702.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index 7e0525d1..00000000 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ /dev/null @@ -1,44 +0,0 @@ -#@TYPE: Machine -#@NAME: zc706-zynq7 -#@DESCRIPTION: Machine configuration for the ZC706 evaluation boards. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zc706-zynq7:']['zc706-zynq7' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynq-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zc706}" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zc706-zynq7 Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -require conf/machine/zynq-generic.conf - -# This eval board machine conf file uses zc702-zynq7 xsa as reference input. -# User can override with zc702 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zc706-zynq7" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "zynq-zc706.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index acd2544a..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ /dev/null @@ -1,54 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu102-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU102 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu102-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU102 board uses ZynqMP EG device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-eg-generic.conf - -# This eval board machine conf file uses zcu102-zynqmp xsa as reference input. -# User can override with zcu102 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu102-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index bff853b8..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ /dev/null @@ -1,58 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu104-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU104 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu104-zynqmp:']['zcu104-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu104-revc}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu104-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU104 board uses ZynqMP EV device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-ev-generic.conf - -# This eval board machine conf file uses zcu104-zynqmp xsa as reference input. -# User can override with zcu104 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu104-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb" - -# Yocto IMAGE_FEATURES Variable -MACHINE_HWCODECS = "libvcu-omxil" -IMAGE_FEATURES += "hwcodecs" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index cc2c6083..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ /dev/null @@ -1,58 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu106-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU106 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu106-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu106-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU106 board uses ZynqMP EV device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-ev-generic.conf - -# This eval board machine conf file uses zcu106-zynqmp xsa as reference input. -# User can override with zcu106 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu106-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb" - -# Yocto IMAGE_FEATURES Variable -MACHINE_HWCODECS = "libvcu-omxil" -IMAGE_FEATURES += "hwcodecs" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index 77da93ca..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ /dev/null @@ -1,54 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu111-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU111 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu111-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu111-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU111 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu111-zynqmp xsa as reference input. -# User can override with zcu111 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu111-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index 18aa3eee..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ /dev/null @@ -1,52 +0,0 @@ -XILINX_DEPRECATED[zcu1275-zynqmp] = "${@'zcu1275-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}" - -#@TYPE: Machine -#@NAME: zcu1275-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu1275-zynqmp:']['zcu1275-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1275-revb}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu1275-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU1275 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu1275-zynqmp xsa as reference input. -# User can override with zcu1275 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu1275-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu1275_zynqmp']['zcu1275-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf deleted file mode 100644 index 6fba3619..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ /dev/null @@ -1,56 +0,0 @@ -XILINX_DEPRECATED[zcu1285-zynqmp] = "${@'zcu1285-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}" - -#@TYPE: Machine -#@NAME: zcu1285-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu1285-zynqmp:']['zcu1285-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu1285-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu1285-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU1285 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu1285-zynqmp xsa as reference input. -# User can override with zcu1285 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu1285-zynqmp" - -# KERNEL_DEVICETREE is disabled as we use board device tree from DTG to match -# the xsa. User can enable explicitly if required from local.conf. -# KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu1285_zynqmp']['zcu1285-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf deleted file mode 100644 index 7bb2c9db..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu208-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU208 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu208-zynqmp:']['zcu208-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu208-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu208-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU208 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu208-zynqmp xsa as reference input. -# User can override with zcu208 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu208-zynqmp" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_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 deleted file mode 100644 index f4e1619d..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu216-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU216 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu216-zynqmp:']['zcu216-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu216-reva}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu216-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU216 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu216-zynqmp xsa as reference input. -# User can override with zcu216 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu216-zynqmp" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf deleted file mode 100644 index 6b1dd488..00000000 --- a/meta-xilinx-bsp/conf/machine/zcu670-zynqmp.conf +++ /dev/null @@ -1,50 +0,0 @@ -#@TYPE: Machine -#@NAME: zcu670-zynqmp -#@DESCRIPTION: Machine configuration for the ZCU670 evaluation board. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'zcu670-zynqmp:']['zcu670-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# Variables that changes based on hw design or board specific requirement must be -# defined before calling the required inclusion file else pre-expansion value -# defined in zynqmp-generic.conf will be set. - -# Yocto device-tree variables -YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0" -YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0" -YAML_DT_BOARD_FLAGS ?= "{BOARD zcu670-revb}" - -# Yocto arm-trusted-firmware(TF-A) variables -ATF_CONSOLE_DEFAULT ?= "cadence" -TFA_BL33_LOAD ?= "0x8000000" - -# Yocto PMUFW variables -YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0" - -# Yocto FSBL variables -YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0" -YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0" - -# Yocto KERNEL Variables -UBOOT_ENTRYPOINT ?= "0x200000" -UBOOT_LOADADDRESS ?= "0x200000" - -# zcu670-zynqmp Serial Console -SERIAL_CONSOLES ?= "115200;ttyPS0" -YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200" - -# Required generic machine inclusion -# ZCU670 board uses ZynqMP DR device hence use soc variant based generic machine -# inclusion -require conf/machine/zynqmp-dr-generic.conf - -# This eval board machine conf file uses zcu670-zynqmp xsa as reference input. -# User can override with zcu670 custom xsa using HDF_BASE and HDF_PATH variables -# from local.conf. -HDF_MACHINE = "zcu670-zynqmp" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu670_zynqmp']['zcu670-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf From d61b27238a4b5bc0b2c22b0152f3be193a171405 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 17 Aug 2024 20:52:49 -0600 Subject: meta-xilinx-bsp: Move qemu BSPs to meta-xilinx-tools Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf | 42 ---------------------- meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf | 45 ------------------------ 5 files changed, 213 deletions(-) delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf delete mode 100644 meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf deleted file mode 100644 index cb92bc71..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-cg.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP CG machine -#@DESCRIPTION: Machine configuration for running a ZynqMP CG system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-cg:']['qemu-zynqmp-cg' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-cg-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_cg']['qemu-zynqmp-cg' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf deleted file mode 100644 index 5fcb3541..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-dr.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP DR machine -#@DESCRIPTION: Machine configuration for running a ZynqMP DR system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-dr:']['qemu-zynqmp-dr' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-dr-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_dr']['qemu-zynqmp-dr' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf deleted file mode 100644 index 5f4b972c..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-eg.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP EG machine -#@DESCRIPTION: Machine configuration for running a ZynqMP EG system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-eg:']['qemu-zynqmp-eg' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-eg-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_eg']['qemu-zynqmp-eg' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf deleted file mode 100644 index 6058bfa4..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp-ev.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP EV machine -#@DESCRIPTION: Machine configuration for running a ZynqMP EV system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp-ev:']['qemu-zynqmp-ev' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-ev-generic.conf - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp_ev']['qemu-zynqmp-ev' != '${MACHINE}']}" diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf b/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf deleted file mode 100644 index 91a96ede..00000000 --- a/meta-xilinx-bsp/conf/machine/qemu-zynqmp.conf +++ /dev/null @@ -1,45 +0,0 @@ -#@TYPE: Machine -#@NAME: QEMU ZynqMP machine -#@DESCRIPTION: Machine configuration for running a ZynqMP system on QEMU w/ testimage - -# This machine is NOT designed to be inherited by other machines or used as an -# example of how to create a machine. It is only useful for running testimage -# with runqemu. - -#### Preamble -MACHINEOVERRIDES =. "${@['', 'qemu-zynqmp:']['qemu-zynqmp' !='${MACHINE}']}" -#### Regular settings follow - -# The following is from conf/machine/include/qemu.inc, but we can not use it -# as it changes other values that need to come from the distro and the -# AMD machine settings -XSERVER ?= "xserver-xorg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ - xf86-video-fbdev \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" - -MACHINEOVERRIDES =. "qemuall:" - -IMAGE_FSTYPES += "tar.bz2 ext4" - -# Don't include kernels in standard images -RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" - -# Provide the nfs server kernel module for all qemu images -KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" -KERNEL_FEATURES:append:pn-linux-xlnx = " features/nfsd/nfsd-enable.scc" - - -# Now include the generic machine which already supports QEMU booting -require conf/machine/zynqmp-generic.conf - -# This may break standalone runqemu, but allows testimage to work -QB_XILINX_SERIAL = "" - -#### No additional settings should be after the Postamble -#### Postamble -PACKAGE_EXTRA_ARCHS:append = "${@['', ' qemu_zynqmp']['qemu-zynqmp' != '${MACHINE}']}" -- cgit v1.2.3-54-g00ecf From 851bb48978a3294e23ffb198e1e78a6bc0d5bc48 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Fri, 18 Oct 2024 17:11:31 -0600 Subject: README.md: Update meta-xilinx-bsp docs to scrathgap 1. Update meta-xilinx-bsp docs to scrathgap. 2. Move XSCT Eval board BSP machine files README content from meta-xilinx-bsp layer to meta-xilinx-tools layer. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-bsp/README.md | 54 +++++++++-------------------------------------- 1 file changed, 10 insertions(+), 44 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/README.md b/meta-xilinx-bsp/README.md index 3f7df18e..3002355c 100644 --- a/meta-xilinx-bsp/README.md +++ b/meta-xilinx-bsp/README.md @@ -1,65 +1,31 @@ # meta-xilinx-bsp -This layer enables AMD Xilinx MicroBlaze, Zynq, ZynqMP and Versal device +This layer enables AMD MicroBlaze, Zynq, ZynqMP and Versal device evaluation boards and provides related metadata. ## Additional documentation * [Building Image Instructions](../README.building.md) * [Booting Image Instructions](../README.booting.md) ---- -## AMD Xilinx Evaluation Boards BSP Machines files - -The following boards are supported by the meta-xilinx-bsp layer: - -> **Variable usage examples:** -> -> Machine Configuration file: `MACHINE = "zcu102-zynqmp"` -> -> Reference XSA: `HDF_MACHINE = "zcu102-zynqmp"` -> -> HW Board Device tree: `YAML_DT_BOARD_FLAGS = "{BOARD zcu102-rev1.0}"` - -| Devices | Evaluation Board | Machine Configuration file | Reference XSA | HW Board Device tree | QEMU tested | HW tested | -|------------|-------------------------------------------------------------------------------|--------------------------------------------------------------|-----------------------|-------------------------------------|-------------|-----------| -| MicroBlaze | [KC705](https://www.xilinx.com/products/boards-and-kits/ek-k7-kc705-g.html) | [kc705-microblazeel](conf/machine/kc705-microblazeel.conf) | `kc705-microblazeel` | `kc705-full` | Yes | Yes | -| | [AC701](https://www.xilinx.com/products/boards-and-kits/ek-a7-ac701-g.html) | [ac701-microblazeel](conf/machine/ac701-microblazeel.conf) | `ac701-microblazeel` | `ac701-full` | Yes | Yes | -| | [KCU105](https://www.xilinx.com/products/boards-and-kits/kcu105.html) | [kcu105-microblazeel](conf/machine/kcu105-microblazeel.conf) | `kcu105-microblazeel` | `kcu105` | Yes | Yes | -| | [VCU118](https://www.xilinx.com/products/boards-and-kits/vcu118.html) | [vcu118-microblazeel](conf/machine/vcu118-microblazeel.conf) | `vcu118-microblazeel` | `vcu118-rev2.0` | Yes | Yes | -| Zynq-7000 | [ZC702](https://www.xilinx.com/products/boards-and-kits/ek-z7-zc702-g.html) | [zc702-zynq7](conf/machine/zc702-zynq7.conf) | `zc702-zynq7` | `zc702` | Yes | Yes | -| | [ZC706](https://www.xilinx.com/products/boards-and-kits/ek-z7-zc706-g.html) | [zc706-zynq7](conf/machine/zc706-zynq7.conf) | `zc706-zynq7` | `zc706` | Yes | Yes | -| ZynqMP | [ZCU102](https://www.xilinx.com/products/boards-and-kits/ek-u1-zcu102-g.html) | [zcu102-zynqmp](conf/machine/zcu102-zynqmp.conf) | `zcu102-zynqmp` | `zcu102-rev1.0` | Yes | Yes | -| | [ZCU104](https://www.xilinx.com/products/boards-and-kits/zcu104.html) | [zcu104-zynqmp](conf/machine/zcu104-zynqmp.conf) | `zcu104-zynqmp` | `zcu104-revc` | Yes | Yes | -| | [ZCU106](https://www.xilinx.com/products/boards-and-kits/zcu106.html) | [zcu106-zynqmp](conf/machine/zcu106-zynqmp.conf) | `zcu106-zynqmp` | `zcu106-reva` | Yes | Yes | -| | [ZCU111](https://www.xilinx.com/products/boards-and-kits/zcu111.html) | [zcu111-zynqmp](conf/machine/zcu111-zynqmp.conf) | `zcu111-zynqmp` | `zcu111-reva` | Yes | Yes | -| | [ZCU208](https://www.xilinx.com/products/boards-and-kits/zcu208.html) | [zcu208-zynqmp](conf/machine/zcu208-zynqmp.conf) | `zcu208-zynqmp` | `zcu208-reva` | Yes | Yes | -| | [ZCU216](https://www.xilinx.com/products/boards-and-kits/zcu216.html) | [zcu216-zynqmp](conf/machine/zcu216-zynqmp.conf) | `zcu216-zynqmp` | `zcu216-reva` | Yes | Yes | -| | [ZCU670](https://www.xilinx.com/products/boards-and-kits/zcu670.html) | [zcu670-zynqmp](conf/machine/zcu670-zynqmp.conf) | `zcu670-zynqmp` | `zcu670-revb` | Yes | Yes | -| 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 | -| | [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 | -| | [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 | -| | [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 | -| | [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 | -| | [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 | - -> **Note:** Additional information on Xilinx architectures can be found at: - https://www.xilinx.com/products/silicon-devices.html ---- ## Dependencies This layer depends on: URI: https://git.yoctoproject.org/poky layers: meta, meta-poky - branch: langdale + branch: scarthgap URI: https://git.openembedded.org/meta-openembedded layers: meta-oe - branch: langdale + branch: scarthgap + + URI: https://git.yoctoproject.org/meta-arm + layers: meta-arm, meta-arm-toolchain + branch: scarthgap URI: https://git.yoctoproject.org/meta-xilinx (official version) - https://github.com/Xilinx/meta-xilinx (development and amd xilinx release) - layers: meta-xilinx-microblaze, meta-xilinx-core - branch: langdale or amd xilinx release version (e.g. rel-v2023.1) + https://github.com/Xilinx/meta-xilinx (development and AMD release) + layers: meta-xilinx-microblaze, meta-xilinx-core, meta-xilinx-standalone + branch: scarthgap or AMD release version (e.g. rel-v2024.2) -- cgit v1.2.3-54-g00ecf From 770c06a27701a9271bd76f0ec915945f8552dee7 Mon Sep 17 00:00:00 2001 From: John Vicky Vykuntapu Date: Tue, 22 Oct 2024 16:54:11 +0530 Subject: fsbl-firmware_%.bbappend: Add generation of pmu-conf In SDT flow pmu-conf.bin is missing and observing qemu boot failure on kria SOM. Therefore, removed the SYSTEM_DTFILE flag check so, this way it generates for both xsct and sdt Signed-off-by: John Vicky Vykuntapu Signed-off-by: Mark Hatle --- .../recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend index 6a23dc47..c4b6c4ef 100644 --- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend +++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl-firmware_%.bbappend @@ -7,14 +7,10 @@ PMU_CONF_BASE_NAME ?= "${PMU_CONF_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAG DEPENDS:append:zynqmp = " virtual/${TARGET_PREFIX}binutils" do_compile:append:zynqmp () { - if [ -z "${SYSTEM_DTFILE}" ]; then - ${OBJCOPY} --dump-section .sys_cfg_data=${B}/${PMU_CONF_NAME}.bin ${B}/${ESW_COMPONENT} - fi + ${OBJCOPY} --dump-section .sys_cfg_data=${B}/${PMU_CONF_NAME}.bin ${B}/${ESW_COMPONENT} } do_deploy:append:zynqmp () { - if [ -z "${SYSTEM_DTFILE}" ]; then - install -Dm 0644 ${B}/${PMU_CONF_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_BASE_NAME}.bin - ln -s ${PMU_CONF_BASE_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_NAME}.bin - fi + install -Dm 0644 ${B}/${PMU_CONF_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_BASE_NAME}.bin + ln -s ${PMU_CONF_BASE_NAME}.bin ${DEPLOYDIR}/${PMU_CONF_NAME}.bin } -- cgit v1.2.3-54-g00ecf