From e941e10d9f22e5f7dbbdc293dc7f6e59ff63b8f0 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 4 Feb 2022 13:10:22 -0800 Subject: various: Move from 2022.1 to 2022.2 Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 8588b988..bb2c5de7 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -42,6 +42,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->xserver-xorg \ " -XILINX_RELEASE_VERSION = "v2022.1" +XILINX_RELEASE_VERSION = "v2022.2" HOSTTOOLS += "xxd" -- cgit v1.2.3-54-g00ecf From 533fb1625481f46d214474507192e965062d7aba Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 16 Mar 2022 14:41:37 -0700 Subject: u-boot-xlnx: oe-core now provides an xxd-native if required Remove host-tool requirement, switch to using Yocto Project provided xxd-native, provided by vim-native. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 -- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index bb2c5de7..e8b5ebd4 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -43,5 +43,3 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " XILINX_RELEASE_VERSION = "v2022.2" - -HOSTTOOLS += "xxd" diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc index c41a4bad..d9113cc7 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -1,6 +1,6 @@ require recipes-bsp/u-boot/u-boot.inc -DEPENDS += "bc-native dtc-native bison-native" +DEPENDS += "bc-native dtc-native bison-native xxd-native" XILINX_RELEASE_VERSION ?= "" UBOOT_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" -- cgit v1.2.3-54-g00ecf From bfafa8ba837c4399bd575aee4a6405a074237c7a Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Wed, 24 Aug 2022 21:43:59 -0600 Subject: device-tree.bbappend: Add board dt flags for generic machine conf Add YAML_DT_BOARD_FLAGS for all the generic machine configuration files. Below table provides machine conf, xsa and associated dtsi files details. Machine Conf XSA Board DTSI ------------ --- --------- microbalze-generic kc705-microblazeel kc705-full zynq-generic zc702-zynq7 zc702 zynqmp-generic zcu102-zynqmp zcu102-rev1.0 versal-generic vck190-versal versal-vck190-reva-x-ebm-01-reva versal-net-generic versal-net-generic versal-net-ipp-rev1.5 For ZC702 and ZCU102 eval boards linux kernel source has a copy of zc702 and zcu102-rev1.0 dts files but for VCK190 and KC705 kernel doesn't have a board dtsi files. Hence for Versal and MicroBlaze generic machine use VCK190 and KC705 board dtsi files from DTG which is synced from u-boot-xlnx repo. Signed-off-by: Sandeep Gundlupet Raju Moved from meta-xilinx-bsp to meta-xilinux-core, as the machines are defined in core. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/layer.conf | 2 ++ .../recipes-bsp/device-tree/device-tree.bbappend | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 meta-xilinx-core/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index e8b5ebd4..bdf14ee9 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -18,6 +18,8 @@ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \ +xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bb \ +xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend \ " LAYERDEPENDS_xilinx = "core" diff --git a/meta-xilinx-core/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend new file mode 100644 index 00000000..a3dedd85 --- /dev/null +++ b/meta-xilinx-core/dynamic-layers/meta-xilinx-tools/recipes-bsp/device-tree/device-tree.bbappend @@ -0,0 +1,18 @@ +# Set Board DTSI files for generic manchine configuration files based on HDF_MACHINE. + +# microblaze-generic.conf uses HDF_MACHINE = "kc705-microblazeel", Hence set kc705-full dtsi file. +YAML_MAIN_MEMORY_CONFIG:microblaze-generic ?= "mig_7series_0" +YAML_CONSOLE_DEVICE_CONFIG:microblaze-generic ?= "axi_uartlite_0" +YAML_DT_BOARD_FLAGS:microblaze-generic ?= "{BOARD kc705-full}" + +# zynq-generic.conf uses HDF_MACHINE = "zc702-zynq7", Hence set zc702 dtsi file. +YAML_DT_BOARD_FLAGS:zynq-generic ?= "{BOARD zc702}" + +# zynqmp-generic.conf uses HDF_MACHINE = "zcu102-zynqmp", Hence set zcu102-rev1.0 dtsi file. +YAML_DT_BOARD_FLAGS:zynqmp-generic ?= "{BOARD zcu102-rev1.0}" + +# versal-generic.conf file uses HDF_MACHINE = "vck190-versal", Hence set versal-vck190-reva-x-ebm-01-reva dtsi file. +YAML_DT_BOARD_FLAGS:versal-generic ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}" + +# versal-net-generic.conf uses HDF_MACHINE = "versal-net-generic", Hence set versal-net-ipp-rev1.5 dtsi file. +YAML_DT_BOARD_FLAGS:versal-net-generic ?= "{BOARD versal-net-ipp-rev1.5}" -- cgit v1.2.3-54-g00ecf From fb44a4e29a40c2653735358da4668c6ae2736fab Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 12 Sep 2022 17:14:45 -0700 Subject: User can now set XILINX_RELEASE_VERSION to either 'v2022.1' or 'v2022.2' This will in-turn select the preferred version for various components to match a given release. It is advise that the user use the latest version whenever possible, but if they are stuck on an older version of Vivado they may need to select the older release. Signed-off-by: Mark Hatle --- meta-xilinx-bsp/conf/layer.conf | 2 ++ meta-xilinx-contrib/conf/layer.conf | 2 -- meta-xilinx-core/conf/layer.conf | 13 ++++++++++++- meta-xilinx-core/conf/local.conf.sample | 2 +- meta-xilinx-standalone/conf/layer.conf | 7 ++++++- 5 files changed, 21 insertions(+), 5 deletions(-) (limited to 'meta-xilinx-core/conf/layer.conf') diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf index b5bb3b19..ef9e1a1d 100644 --- a/meta-xilinx-bsp/conf/layer.conf +++ b/meta-xilinx-bsp/conf/layer.conf @@ -17,3 +17,5 @@ BBFILE_PRIORITY_xilinx-bsp = "5" LAYERDEPENDS_xilinx-bsp = "xilinx" LAYERSERIES_COMPAT_xilinx-bsp = "honister" + +PREFERRED_VERSION_kc705-bitstream ?= "${XILINX_RELEASE_VERSION}" diff --git a/meta-xilinx-contrib/conf/layer.conf b/meta-xilinx-contrib/conf/layer.conf index 253d64d1..4b813365 100644 --- a/meta-xilinx-contrib/conf/layer.conf +++ b/meta-xilinx-contrib/conf/layer.conf @@ -13,5 +13,3 @@ LAYERDEPENDS_xilinx-contrib = "core" LAYERDEPENDS_xilinx-contrib = "xilinx" LAYERSERIES_COMPAT_xilinx-contrib = "honister" - -XILINX_RELEASE_VERSION = "v2022.2" diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index bdf14ee9..9090abe6 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -44,4 +44,15 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ *->xserver-xorg \ " -XILINX_RELEASE_VERSION = "v2022.2" +XILINX_RELEASE_VERSION ??= "v2022.2" + +BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" + +PREFERRED_VERSION_qemu-xilinx ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-xilinx-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-xilinx-system-native ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_qemu-devicetrees ?= "xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_arm-trusted-firmware ?= "2.6-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_u-boot-xlnx ?= "v2021.01-xilinx-${XILINX_RELEASE_VERSION}%" +PREFERRED_VERSION_pmu-rom-native ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}" +PREFERRED_VERSION_linux-xlnx ?= "${@'5.15.19' if d.getVar("XILINX_RELEASE_VERSION") == 'v2022.1' else '5.15.36'}%" diff --git a/meta-xilinx-core/conf/local.conf.sample b/meta-xilinx-core/conf/local.conf.sample index b907b072..10134d53 100644 --- a/meta-xilinx-core/conf/local.conf.sample +++ b/meta-xilinx-core/conf/local.conf.sample @@ -206,7 +206,7 @@ BB_DISKMON_DIRS ??= "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" -XILINX_VER_MAIN = "2022.2" +XILINX_RELEASE_VERSION = "v2022.2" # Uncomment below lines to provide path for custom xsct trim # diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf index 79997d24..492dda6f 100644 --- a/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx-standalone/conf/layer.conf @@ -16,4 +16,9 @@ LAYERDEPENDS_xilinx-standalone = "core xilinx" LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" LAYERSERIES_COMPAT_xilinx-standalone = "honister" -XILINX_RELEASE_VERSION = "v2022.2" + +PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_pmu-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +PREFERRED_VERSION_fsbl-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" + -- cgit v1.2.3-54-g00ecf