diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2023-10-21 09:26:10 -0500 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2023-10-21 09:26:10 -0500 |
| commit | b1c18d8556879817faba0f61b58eefc2e2f25919 (patch) | |
| tree | d598fb7c5c74648b43fcdc383959448f0624c1f8 | |
| parent | a93f12dc4cb5e56238d605ce86ad1908b879f509 (diff) | |
| parent | 05911e19d85fd98c42054238392afe95a5125265 (diff) | |
| download | meta-xilinx-b1c18d8556879817faba0f61b58eefc2e2f25919.tar.gz | |
Merge remote-tracking branch 'xilinx/rel-v2023.2' into 2024
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
5 files changed, 5 insertions, 5 deletions
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc index b9d6a16e..0cfbd846 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc | |||
| @@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" | |||
| 2 | 2 | ||
| 3 | UBRANCH = "xlnx_rebase_v2023.01" | 3 | UBRANCH = "xlnx_rebase_v2023.01" |
| 4 | 4 | ||
| 5 | SRCREV = "ddaf9cd263bfce05bc7427f544b71a0cc75647ac" | 5 | SRCREV = "0fc19cad5a07a09958443e7a5b6f11e420ef195c" |
| 6 | 6 | ||
| 7 | LICENSE = "GPL-2.0-or-later" | 7 | LICENSE = "GPL-2.0-or-later" |
| 8 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" | 8 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb index f6791406..d41743c1 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2023.2.bb | |||
| @@ -2,5 +2,5 @@ | |||
| 2 | require qemu-devicetrees.inc | 2 | require qemu-devicetrees.inc |
| 3 | 3 | ||
| 4 | BRANCH ?= "xlnx_rel_v2023.2" | 4 | BRANCH ?= "xlnx_rel_v2023.2" |
| 5 | SRCREV ?= "86b1a621919f2fb27e5ef4120fcacde67d43368d" | 5 | SRCREV ?= "d1013382d9a5ef816cd020e7840813b7a2d65c51" |
| 6 | 6 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc index d3effa9a..db6e1528 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-2023.2.inc | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | XILINX_QEMU_VERSION = "v7.1.0" | 1 | XILINX_QEMU_VERSION = "v7.1.0" |
| 2 | BRANCH = "xlnx_rel_v2023.2" | 2 | BRANCH = "xlnx_rel_v2023.2" |
| 3 | SRCREV = "5b17802c28879d2150df5ea16d8719aab3ee26a0" | 3 | SRCREV = "23b643ba1683a47ef49447a45643fe2172d6f8ca" |
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb index a464cdde..8842cb10 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.2.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | LINUX_VERSION = "6.1.30" | 1 | LINUX_VERSION = "6.1.30" |
| 2 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" | 2 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta" |
| 3 | KBRANCH="xlnx_rebase_v6.1_LTS" | 3 | KBRANCH="xlnx_rebase_v6.1_LTS" |
| 4 | SRCREV = "4f412ed20fd2c5353c1e878ef9ed77952a5040a1" | 4 | SRCREV = "a19da02cf5b44420ec6afb1eef348c21d9e8cda2" |
| 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" | 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" |
| 6 | 6 | ||
| 7 | KCONF_AUDIT_LEVEL="0" | 7 | KCONF_AUDIT_LEVEL="0" |
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 44dca75b..1b3bb827 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | |||
| @@ -9,7 +9,7 @@ ESW_BRANCH[2024.1] = "master-next" | |||
| 9 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" | 9 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" |
| 10 | 10 | ||
| 11 | ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" | 11 | ESW_REV[2023.1] = "af784f742dad0ca6e69e05baf8de51152c396b9a" |
| 12 | ESW_REV[2023.2] = "19ade382dd3b8a89aa737d9a67ceb2d28c6ab1bc" | 12 | ESW_REV[2023.2] = "c9a0ee31b2a14cbcfcb56ca369037319b4ad4847" |
| 13 | ESW_REV[2024.1] = "c62753a4278de3d5d9da8cfb4f3355b98ae17baf" | 13 | ESW_REV[2024.1] = "c62753a4278de3d5d9da8cfb4f3355b98ae17baf" |
| 14 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" | 14 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" |
| 15 | 15 | ||
