6 files changed, 12 insertions, 11 deletions

diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
index b2bea55c9..9cc6b958d 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2024.07.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2025.01.inc
@@ -10,10 +10,10 @@ DEPENDS += "flex-native bison-native"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
 
-SRCREV = "5b4d66dd41432d36c22bcdfa2d1ca4afc3a1c2fc"
-SRCBRANCH = "2024.07+fslc"
+SRCREV = "aa4bc52d08c342df83e3c576e2c108d7c8816e0e"
+SRCBRANCH = "2025.01+fslc"
 
-PV = "2024.07+fslc+git${SRCPV}"
+PV = "2025.01+fslc+git${SRCPV}"
+CVE_PRODUCT = "denx:u-boot"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
index b7e4ca760..b7e4ca760 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2024.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2025.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
index 4dc698219..4dc698219 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2024.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2025.01.bb
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
index 5d49a8306..9640ba1de 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2024.04.inc
@@ -3,10 +3,11 @@ DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
+UBOOT_SRC ?= "git://github.com/nxp-imx/uboot-imx.git;protocol=https"
 SRCBRANCH = "lf_v2024.04"
-LOCALVERSION ?= "-imx_v2024.04_6.6.23-2.0.0"
-SRCREV = "674440bc73e1dd483b84269cccfad89ab40af424"
+LOCALVERSION ?= "-${SRCBRANCH}"
+SRCREV = "e3219a5a73445219df605d1492687918d488055c"
 
 DEPENDS += " \
     bc-native \
@@ -17,7 +18,6 @@ DEPENDS += " \
     xxd-native \
 "
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 inherit fsl-u-boot-localversion
diff --git a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
index 29d835278..695987801 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2024.04.bb
@@ -1,6 +1,6 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
 # Copyright 2018 (C) O.S. Systems Software LTDA.
-# Copyright (C) 2017-2024 NXP
+# Copyright 2017-2024 NXP
 
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-imx-common_${PV}.inc
@@ -14,6 +14,8 @@ inherit uuu_bootloader_tag
 UUU_BOOTLOADER:mx8-generic-bsp = ""
 UUU_BOOTLOADER:mx9-generic-bsp = ""
 
+TOOLCHAIN_OPTIONS:append = " -Wno-error=implicit-function-declaration"
+
 do_deploy:append:mx8m-generic-bsp() {
     # Deploy u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
index c46eae331..c765cd2d7 100644
--- a/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2021.04.bb
@@ -15,9 +15,8 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "git://github.com/nxp-qoriq/u-boot;protocol=https;nobranch=1"
-SRCREV= "1c0116f3da250c5a52858c53efb8b38c0963f477"
+SRCREV = "1c0116f3da250c5a52858c53efb8b38c0963f477"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 PV:append = "+fslgit"
 LOCALVERSION = "+fsl"