summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2022-01-25 16:52:12 -0800
committerMark Hatle <mark.hatle@xilinx.com>2022-01-25 17:07:32 -0800
commite3d57d0fa5424838b6083e18bb395aa9a228e872 (patch)
tree92bde1b89ef0de58cced50232ac4e5eac0777353
parenta1643135ff0942233bd475b1319e53d75c68defa (diff)
downloadmeta-xilinx-e3d57d0fa5424838b6083e18bb395aa9a228e872.tar.gz
Revert "Updated SRCREV for 2022"
This reverts commit a1643135ff0942233bd475b1319e53d75c68defa. Caused QEMU build failure. When building for mingw32: | ../git/hw/misc/xlnx-versal-cframe-reg.c: In function 'cframe_incr_far': | ../git/hw/misc/xlnx-versal-cframe-reg.c:385:18: error: expected identifier or '(' before '=' token | 385 | uint32_t far = ARRAY_FIELD_EX32(s->regs, FAR0, FRAME_ADDR); | | ^ | ../git/hw/misc/xlnx-versal-cframe-reg.c:390:10: error: expected expression before ';' token | 390 | far++; | | ^ | ../git/hw/misc/xlnx-versal-cframe-reg.c:392:13: error: expected expression before '>' token | 392 | if (far > s->cfg.blktype_num_frames[blktype]) { | | ^ | ../git/hw/misc/xlnx-versal-cframe-reg.c:394:13: error: expected expression before '=' token | 394 | far = 0; | | ^ Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb2
-rw-r--r--meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb2
-rw-r--r--meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc2
-rw-r--r--meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb2
-rw-r--r--meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
index 78305084..01994ee8 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.1.bb
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2021.01"
2 2
3UBRANCH ?= "master" 3UBRANCH ?= "master"
4 4
5SRCREV = "23aba033fcbf74eb3258d8597c8101f5bf8d8a85" 5SRCREV = "f767ae53c5dc8984769dd6d0d04f3f5dec4fe2fc"
6 6
7include u-boot-xlnx.inc 7include u-boot-xlnx.inc
8include u-boot-spl-zynq-init.inc 8include u-boot-spl-zynq-init.inc
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
index 7baf24cd..54164c56 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.1.bb
@@ -2,4 +2,4 @@
2require qemu-devicetrees.inc 2require qemu-devicetrees.inc
3 3
4BRANCH ?= "master" 4BRANCH ?= "master"
5SRCREV ?= "688e1afbcb0816d4d94ac36e09011654cc24e132" 5SRCREV ?= "e151ddb709f351e51339d5a45f59203dc3908329"
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
index 509e8bd8..9f402a2b 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
@@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native"
12 12
13XILINX_QEMU_VERSION ?= "v6.1.0" 13XILINX_QEMU_VERSION ?= "v6.1.0"
14BRANCH ?= "master" 14BRANCH ?= "master"
15SRCREV = "4f3e3ee5c0deee197623419b217e6d0d2d50ab4c" 15SRCREV = "58e43069b15879cf8bc926ebae02a21909fb7df8"
16 16
17FILESEXTRAPATHS:prepend := "${THISDIR}/files:" 17FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
18 18
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
index 6be44549..7a347625 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.1.bb
@@ -1,6 +1,6 @@
1LINUX_VERSION = "5.15" 1LINUX_VERSION = "5.15"
2KBRANCH="master" 2KBRANCH="master"
3SRCREV = "8f3691e6b43c0f2c74584eebd1cd0b9645e525ae" 3SRCREV = "a37f8cd486fd2ed22ccf9636d4616bb5f14b1b5d"
4 4
5KCONF_AUDIT_LEVEL="0" 5KCONF_AUDIT_LEVEL="0"
6 6
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
index e7b238f6..d3b8d036 100644
--- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
+++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass
@@ -19,7 +19,7 @@ ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd"
19ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" 19ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c"
20ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7" 20ESW_REV[2021.1] = "d37a0e8824182597abf31ac3f1087a5321b33ad7"
21ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03" 21ESW_REV[2021.2] = "49c6694fc3cab6b87dd564da58a83bb8656a7c03"
22ESW_REV[2022.1] = "52df4e141d47ea07e40bb50af6d2dc7edca1f785" 22ESW_REV[2022.1] = "377825b73375864963952b5cc51a7373f434feee"
23ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770" 23ESW_REV[git] = "7ec60e1c0e25bfa9c5e8c77d6d063876f6670770"
24SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" 24SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}"
25 25