Merge remote-tracking branch 'github/rel-v2023.1'

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

21 files changed, 51 insertions, 26 deletions

diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 76b3cf1d..1b3e8123 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -19,7 +19,7 @@ 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_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 077bf0a2..941f0aba 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -19,7 +19,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vmk180-reva-x-ebm-01-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
index 8eb6dea4..30818313 100644
--- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk120-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
index 099cd956..dd2dc111 100644
--- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "versal_cips_0_pspmc_0_psv_sbsauart
 YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vpk180-reva}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "pl011"
+ATF_CONSOLE ?= "pl011"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 61b2bf2b..c434067d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -20,7 +20,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index bf38eebe..710078eb 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -16,7 +16,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 6853edb0..23a936d8 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -20,7 +20,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 92e80460..5868449f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -20,7 +20,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 597c05a7..71c94038 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -12,7 +12,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 396eafe9..812a283f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -16,7 +16,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index d7b2f340..273606e2 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -16,7 +16,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 5f5856e8..80a15358 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -16,7 +16,7 @@ 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_DEFAULT ?= "cadence"
+ATF_CONSOLE ?= "cadence"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index b9523224..9745bb4d 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -69,7 +69,7 @@ PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION',
 
 XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
 XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.30-xilinx-v2023.1%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
index 01082966..72f43f71 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.1.inc
@@ -1,8 +1,8 @@
 UBOOT_VERSION = "v2023.01"
 
-UBRANCH = "xlnx_rebase_v2023.01"
+UBRANCH = "xlnx_rebase_v2023.01_update"
 
-SRCREV = "40a08d69e749c0472103551c85c02c41f979453d"
+SRCREV = "1689570b68dd3827e527a520805aa0bb7f58ee09"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
index 4d9a45c0..86ba4fc6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-blob.inc
@@ -7,7 +7,9 @@ UBOOT_BLOB_NAME ?= "${MACHINE}-fit-dtb${IMAGE_VERSION_SUFFIX}.blob"
 
 IMPORT_CC_DTBS ?= ""
 CC_DTBS_DUP ?= ""
+IMPORT_CC_UBOOT_DTBS ?= ""
 
+DEPENDS:append:eval-brd-sc-zynqmp = " uboot-device-tree"
 MKIMAGE_DTBLOB_OPTS ?= "-E -B 0x8"
 
 # Everything is swtiched on with UBOOT_IMAGE_BLOB = '1'
@@ -98,9 +100,24 @@ do_blob_generate () {
                 DTBO=$(echo $CC_DTB | cut -d: -f1)
         BASE_DTB=$(echo $CC_DTB | cut -d: -f2)
         OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3)
-        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}"
+        if [ "${SYSTEM_DTB_BLOB}" = "1" ]; then
+                BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${DTB_NAME}"
+        else
+                BASE_SYS_DTB="${B}/arch/arm/dts/${BASE_DTB}"
+        fi
+        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}"
                 if [ -f ${B}/arch/arm/dts/${DTBO} ]; then
-        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${B}/arch/arm/dts/${BASE_DTB} ${B}/arch/arm/dts/${DTBO}
+        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}
+                fi
+        done
+
+        for CC_DTB in ${IMPORT_CC_UBOOT_DTBS}; do
+                DTBO=$(echo $CC_DTB | cut -d: -f1)
+        OUTPUT_DTB=$(echo $CC_DTB | cut -d: -f3)
+        BASE_SYS_DTB="${RECIPE_SYSROOT}/${DTB_PATH}/${PACKAGE_UBOOT_DTB_NAME}"
+                if [ -f ${B}/arch/arm/dts/${DTBO} ] && [ -f ${BASE_SYS_DTB} ]; then
+        bbnote "fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}"
+        fdtoverlay -o ${DT_BLOB_DIR}/${OUTPUT_DTB} -i ${BASE_SYS_DTB} ${B}/arch/arm/dts/${DTBO}
                 fi
         done
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
index 91e787bd..dc1feda4 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.1.bb
@@ -2,5 +2,5 @@
 require qemu-devicetrees.inc
 
 BRANCH ?= "xlnx_rel_v2023.1"
-SRCREV ?= "1c45adcde1fc06432c01be250bf668c6477d8459"
+SRCREV ?= "56538937584f527fb408347c3b430142e74723e8"
 
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend
new file mode 100644
index 00000000..18396c5e
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_10.0.2.bbappend
@@ -0,0 +1,8 @@
+ZYNQMP_WARN_DEFAULT = "0"
+ZYNQMP_WARN_DEFAULT:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '0', d)}"
+ZYNQMP_WARN = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${ZYNQMP_WARN_DEFAULT}', '0', d)}"
+
+python() {
+    if d.getVar('ZYNQMP_WARN') == "1":
+        raise bb.parse.SkipRecipe("Weston 10.0.0.2 requires GLES 3 interfaces which are not available when libmali enabled.  Use Weston 9.0.0.0 instead.")
+}
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 14dd2ace..2355d090 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -3,7 +3,7 @@ LINUX_VERSION_EXTENSION ?= "-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE',
 PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
 
 # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
-KBRANCH ?= "xlnx_rebase_v5.15_LTS"
+KBRANCH ?= "undefined"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}"
 
 FILESOVERRIDES:append := ":${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}"
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
index 6740a459..d229f21c 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
@@ -1,7 +1,7 @@
-LINUX_VERSION = "6.1.5"
+LINUX_VERSION = "6.1.30"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta"
-KBRANCH="xlnx_rebase_v6.1_LTS"
-SRCREV = "716921b6d7dc9db49660369428fb61ca96947ccb"
+KBRANCH="xlnx_rebase_v6.1_LTS_2023.1_update"
+SRCREV = "9299ac26ca514a0ccd9f6ae01f50e816d7e79dfa"
 SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f"
 
 KCONF_AUDIT_LEVEL="0"
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index aaee9e68..51c8bdde 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -5,12 +5,12 @@ REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https"
 
 ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update"
 ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2"
-ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1"
+ESW_BRANCH[2023.1] = "xlnx_rel_v2023.1_update"
 BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}"
 
 ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01"
 ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2"
-ESW_REV[2023.1] = "86f54b77641f325042a1101fead96b2714e6d3ef"
+ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a"
 SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or 'invalid'}"
 
 EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
@@ -19,7 +19,7 @@ EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d'
 LIC_FILES_CHKSUM[xlnx_rel_v2022.2]  = 'ce611484168a6000bd35df68fc4f4290'
-LIC_FILES_CHKSUM[xlnx_rel_v2023.1] = '3c310a3ee2197a4c92c6a0e2937c207c'
+LIC_FILES_CHKSUM[xlnx_rel_v2023.1_update] = '3c310a3ee2197a4c92c6a0e2937c207c'
 LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}"
 
 SRC_URI = "${EMBEDDEDSW_SRCURI}"
diff --git a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
index 479398b0..6a88d757 100644
--- a/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-vendor/conf/machine/ultra96-zynqmp.conf
@@ -20,7 +20,7 @@ YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD avnet-ultra96-rev1}"
 
 # Yocto arm-trusted-firmware(TF-A) variables
-ATF_CONSOLE_DEFAULT ?= "cadence1"
+ATF_CONSOLE ?= "cadence1"
 TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PMUFW variables