diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2024-07-09 17:32:55 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-09 17:32:55 -0300 |
commit | 2d011b5726b9339ed03e09fe12a41d06c2fd5f0f (patch) | |
tree | 967b06724b5c8dd1f1dbd3330d0199fe11f4f87e | |
parent | 478993fc218939b6e389ea78543f261a402c4b88 (diff) | |
parent | c1bd142771904927c30a2b236f89b44e25ea6623 (diff) | |
download | meta-freescale-2d011b5726b9339ed03e09fe12a41d06c2fd5f0f.tar.gz |
Merge pull request #1864 from Freescale/upgrades/linux-uboot-fslc
linux-fslc: 6.6.32 -> 6.6.36, u-boot-fslc: 2024.04 -> 2024.07
-rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc (renamed from recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc) | 6 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb (renamed from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb) | 0 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-fslc_2024.07.bb (renamed from recipes-bsp/u-boot/u-boot-fslc_2024.04.bb) | 0 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_6.6.bb | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc index b270dfd74..214d45323 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.04.inc +++ b/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc | |||
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native" | |||
10 | 10 | ||
11 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" | 11 | SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https" |
12 | 12 | ||
13 | SRCREV = "1a2bdc16b79a6f9c31829ede1bbf4063ccea6e54" | 13 | SRCREV = "1406c04f60f5c375e0fc77b9f661aecd08dff45e" |
14 | SRCBRANCH = "2024.04+fslc" | 14 | SRCBRANCH = "2024.07+fslc" |
15 | 15 | ||
16 | PV = "2024.04+git${SRCPV}" | 16 | PV = "2024.07+fslc+git${SRCPV}" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | B = "${WORKDIR}/build" | 19 | B = "${WORKDIR}/build" |
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb index b7e4ca760..b7e4ca760 100644 --- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.04.bb +++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb | |||
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb index eba8876aa..eba8876aa 100644 --- a/recipes-bsp/u-boot/u-boot-fslc_2024.04.bb +++ b/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb | |||
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.6.bb index f9a54080e..35489fefb 100644 --- a/recipes-kernel/linux/linux-fslc_6.6.bb +++ b/recipes-kernel/linux/linux-fslc_6.6.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | # Copyright (C) 2012-2019 O.S. Systems Software LTDA. | 1 | # Copyright (C) 2012-2024 O.S. Systems Software LTDA. |
2 | # Released under the MIT license (see COPYING.MIT for the terms) | 2 | # Released under the MIT license (see COPYING.MIT for the terms) |
3 | # | 3 | # |
4 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol= | |||
19 | # | 19 | # |
20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 20 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
21 | # should be updated once patchlevel is merged. | 21 | # should be updated once patchlevel is merged. |
22 | LINUX_VERSION = "6.6.32" | 22 | LINUX_VERSION = "6.6.36" |
23 | 23 | ||
24 | KBRANCH = "6.6.x+fslc" | 24 | KBRANCH = "6.6.x+fslc" |
25 | SRCREV = "8c0a83d1bb158cd9d90ab7378fd963e72b4a5a7f" | 25 | SRCREV = "32a79dc5c8f69f1eb7b10b7707b0078fb2fdfa98" |
26 | 26 | ||
27 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" | 27 | KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" |
28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" | 28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" |