diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2022-10-11 10:06:23 -0700 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-10-11 10:06:23 -0700 |
| commit | dac30aebed7f273f49bfc8f803058a5a0a9014e0 (patch) | |
| tree | c0697f21eb6c8e84a94754a3558d9d6905528803 /meta-xilinx-core | |
| parent | 25a6d54279db8a81b4066c07f0c94311fbc9123a (diff) | |
| parent | 3bde26bfe3616b997eef95ec6411058961c81c62 (diff) | |
| download | meta-xilinx-dac30aebed7f273f49bfc8f803058a5a0a9014e0.tar.gz | |
Merge remote-tracking branch 'origin/kirkstone-next'
Last sync with honister/kirkstone-next and rel-v2022.2 release
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-core')
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb | 2 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb | 2 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-xrt/xrt/xrt.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb index d9758f19..260224b8 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | LINUX_VERSION = "5.15.36" | 1 | LINUX_VERSION = "5.15.36" |
| 2 | KBRANCH="xlnx_rebase_v5.15_LTS" | 2 | KBRANCH="xlnx_rebase_v5.15_LTS" |
| 3 | SRCREV = "d677bf9fa4cb6987fe90e720fdd8ee5c6e15e809" | 3 | SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189" |
| 4 | 4 | ||
| 5 | KCONF_AUDIT_LEVEL="0" | 5 | KCONF_AUDIT_LEVEL="0" |
| 6 | 6 | ||
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb index 36f59d60..6be9fe54 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb | |||
| @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" | |||
| 10 | 10 | ||
| 11 | BRANCH ?= "xlnx_rel_v2022.2" | 11 | BRANCH ?= "xlnx_rel_v2022.2" |
| 12 | REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https" | 12 | REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https" |
| 13 | SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963" | 13 | SRCREV = "3980c778d71fa51a15e89bf70fd8fb28d5cb12e0" |
| 14 | 14 | ||
| 15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 16 | SRC_URI = "${REPO};${BRANCHARG}" | 16 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc index 0c54511b..52bed585 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc | |||
| @@ -3,6 +3,6 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != ' | |||
| 3 | SRC_URI = "${REPO};${BRANCHARG}" | 3 | SRC_URI = "${REPO};${BRANCHARG}" |
| 4 | 4 | ||
| 5 | BRANCH= "2022.2" | 5 | BRANCH= "2022.2" |
| 6 | SRCREV= "5da182a12e8f8d6e81d7e78186ce85c5f207578e" | 6 | SRCREV= "43926231f7183688add2dccfd391b36a1f000bea" |
| 7 | PV = "202220.2.14.0" | 7 | PV = "202220.2.14.0" |
| 8 | 8 | ||
