diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2023-10-26 16:17:13 -0500 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2023-10-31 09:43:06 -0500 |
| commit | 55f8ef835dc2356479dbefd187fd92b5a16b7b88 (patch) | |
| tree | c7707d7928d3aa5ecfa119324b82fe9d18ec1c18 | |
| parent | 2fca1dcb50f0995d08ab03f3d0990a03b186ccb3 (diff) | |
| download | meta-xilinx-55f8ef835dc2356479dbefd187fd92b5a16b7b88.tar.gz | |
meta-xilinx-core: linux-xlnx: Reset 2024.1 for development
2024.1 has been reset back to 6.1.0 version, but is otherwise functionally
similar to the 6.1.30 release from 2023.2.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
| -rw-r--r-- | meta-xilinx-core/conf/layer.conf | 2 | ||||
| -rw-r--r-- | meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 1a2b2777..60b709dd 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
| @@ -68,7 +68,7 @@ PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', | |||
| 68 | 68 | ||
| 69 | XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%" | 69 | XILINX_LINUX_VERSION[v2023.1] = "6.1.5-xilinx-v2023.1%" |
| 70 | XILINX_LINUX_VERSION[v2023.2] = "6.1.30-xilinx-v2023.2%" | 70 | XILINX_LINUX_VERSION[v2023.2] = "6.1.30-xilinx-v2023.2%" |
| 71 | XILINX_LINUX_VERSION[v2024.1] = "6.1.30-xilinx-v2024.1%" | 71 | XILINX_LINUX_VERSION[v2024.1] = "6.1.0-xilinx-v2024.1%" |
| 72 | PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 72 | PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
| 73 | 73 | ||
| 74 | # Add support to eSDK for gen-machine-conf if it exists | 74 | # Add support to eSDK for gen-machine-conf if it exists |
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb index 8842cb10..2a0dfe97 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2024.1.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | LINUX_VERSION = "6.1.30" | 1 | LINUX_VERSION = "6.1.0" |
| 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="master" |
| 4 | SRCREV = "a19da02cf5b44420ec6afb1eef348c21d9e8cda2" | 4 | SRCREV = "c8b3583bc86352009c6ac61e2ced0e12118f8ebb" |
| 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" | 5 | SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f" |
| 6 | 6 | ||
| 7 | KCONF_AUDIT_LEVEL="0" | 7 | KCONF_AUDIT_LEVEL="0" |