diff --git a/bb-u-boot-beagleboneai64-mainline/readme.log b/bb-u-boot-beagleboneai64-mainline/readme.log
index 7a2478bd30a5c66f3ac6d7ef77e517e9f82eeda1..458595377ec87e551abe1213ce5cf3690fe1dfa5 100644
--- a/bb-u-boot-beagleboneai64-mainline/readme.log
+++ b/bb-u-boot-beagleboneai64-mainline/readme.log
@@ -1,6 +1,6 @@
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/changelog b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/changelog
index 5a48a7ab8fb4883f59fe2c75702c4c2288f42858..f1ef7c41fa25ff9126a78df26c123a87c8b079c4 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/changelog
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~bookworm+20250108) bookworm; urgency=low
+bb-u-boot-beagleboneai64-mainline (2025.04.20250210.0-0~bookworm+20250214) bookworm; urgency=low
 
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~bookworm+20250108) bookw
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 08 Jan 2025 11:20:32 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:52:51 -0600
 
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/install b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/install
index 141740569f26ba466e11e8e70ca7839196eceffb..4421acd7c69bbe1b833eec990e667bdfca4dda83 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/install
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/install
@@ -20,4 +20,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleboneai64-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleboneai64-mainline
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/rules b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/rules
index d7444771e4718655436b600e62fc4f0c724016ef..f71a119d1cc4a0be6ce49e032dc0e2d3412100d3 100755
--- a/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/rules
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bookworm/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleboneai64-mainline
 #HEAD: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=summary
 #TAGS: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tags
 #Mirror: https://github.com/beagleboard/ti-linux-firmware
-TILF_TAG=10.01.10
+TILF_TAG=11.00.03
 #TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #Local Mirror
 TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
@@ -34,7 +34,7 @@ TFA_BOARD=generic
 #HEAD: https://github.com/OP-TEE/optee_os
 #TAGS: https://github.com/OP-TEE/optee_os/tags
 #OPTEE_TAG=master
-OPTEE_TAG=4.4.0
+OPTEE_TAG=4.5.0
 #OPTEE_REPO="https://github.com/OP-TEE/optee_os"
 #Local Mirror
 OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2025.01"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
@@ -56,16 +56,16 @@ override_dh_strip:
 override_dh_auto_configure:
 	mkdir -p ./tmp/pkg/
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
-	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; echo "ti-linux-firmware:" > ./tmp/pkg/build.txt ; git --git-dir ./tmp/ti-linux-firmware/.git rev-parse HEAD >> ./tmp/pkg/build.txt ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
-	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/ ; echo "Trusted Firmware for A:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/trusted-firmware-a/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
+	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/
 	make -C ./tmp/trusted-firmware-a/ -j8 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(TFA_BOARD) SPD=opteed all
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin ./tmp/pkg/
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/ ; echo "OP-TEE:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/optee_os/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_ARM64_core=y all
 	cp -v ./tmp/optee/core/tee-pager_v2.bin ./tmp/pkg/
 	cp -v ./tmp/optee/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; echo "U-Boot:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/u-boot/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UBOOT_CFG_CORTEXR)
 	make -C ./tmp/u-boot -j8 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXR/
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/changelog b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/changelog
index ddcee5617d7ee65ebe17fda3cbd439e024ad67dd..e416a97a21bc1a60aaea7a1dd8cbdf1f9f13b697 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/changelog
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~bullseye+20250108) bullseye; urgency=low
+bb-u-boot-beagleboneai64-mainline (2025.04.20250210.0-0~bullseye+20250214) bullseye; urgency=low
 
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~bullseye+20250108) bulls
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 08 Jan 2025 11:20:32 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:52:51 -0600
 
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/install b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/install
index 141740569f26ba466e11e8e70ca7839196eceffb..4421acd7c69bbe1b833eec990e667bdfca4dda83 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/install
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/install
@@ -20,4 +20,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleboneai64-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleboneai64-mainline
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/rules b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/rules
index f494fa9a6312ab6edaead8531bcfabc8dd84c701..059c75bb316812606288bb1f60eb9cbbb4722941 100755
--- a/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/rules
+++ b/bb-u-boot-beagleboneai64-mainline/suite/bullseye/debian/rules
@@ -11,7 +11,7 @@ TARGETDIR=bb-u-boot-beagleboneai64-mainline
 #HEAD: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=summary
 #TAGS: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tags
 #Mirror: https://github.com/beagleboard/ti-linux-firmware
-TILF_TAG=10.01.10
+TILF_TAG=11.00.03
 #TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #Local Mirror
 TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
@@ -31,7 +31,7 @@ TFA_BOARD=generic
 #HEAD: https://github.com/OP-TEE/optee_os
 #TAGS: https://github.com/OP-TEE/optee_os/tags
 #OPTEE_TAG=master
-OPTEE_TAG=4.4.0
+OPTEE_TAG=4.5.0
 #OPTEE_REPO="https://github.com/OP-TEE/optee_os"
 #Local Mirror
 OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
@@ -40,7 +40,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2025.01"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
@@ -53,16 +53,16 @@ override_dh_strip:
 override_dh_auto_configure:
 	mkdir -p ./tmp/pkg/
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
-	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; echo "ti-linux-firmware:" > ./tmp/pkg/build.txt ; git --git-dir ./tmp/ti-linux-firmware/.git rev-parse HEAD >> ./tmp/pkg/build.txt ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
-	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/ ; echo "Trusted Firmware for A:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/trusted-firmware-a/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
+	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/
 	make -C ./tmp/trusted-firmware-a/ -j8 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(TFA_BOARD) SPD=opteed all
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin ./tmp/pkg/
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/ ; echo "OP-TEE:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/optee_os/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_ARM64_core=y all
 	cp -v ./tmp/optee/core/tee-pager_v2.bin ./tmp/pkg/
 	cp -v ./tmp/optee/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; echo "U-Boot:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/u-boot/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UBOOT_CFG_CORTEXR)
 	make -C ./tmp/u-boot -j8 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXR/
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/changelog b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/changelog
index aeae0dd65ae2eeb772db2693f6940ae8ad7cfe22..aaf3cd4a41f2d07e5e59a82ab84d45272e02d17d 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/changelog
+++ b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~jammy+20250108) jammy; urgency=low
+bb-u-boot-beagleboneai64-mainline (2025.04.20250210.0-0~jammy+20250214) jammy; urgency=low
 
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~jammy+20250108) jammy; u
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 08 Jan 2025 11:20:32 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:52:51 -0600
 
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/install b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/install
index 141740569f26ba466e11e8e70ca7839196eceffb..4421acd7c69bbe1b833eec990e667bdfca4dda83 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/install
+++ b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/install
@@ -20,4 +20,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleboneai64-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleboneai64-mainline
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/rules b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/rules
index a4f801cf2eba4558980b7ebc027f71594e273412..8d411dba80935de1b795a8e7b331db4df7b04f29 100755
--- a/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/rules
+++ b/bb-u-boot-beagleboneai64-mainline/suite/jammy/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleboneai64-mainline
 #HEAD: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=summary
 #TAGS: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tags
 #Mirror: https://github.com/beagleboard/ti-linux-firmware
-TILF_TAG=10.01.10
+TILF_TAG=11.00.03
 #TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #Local Mirror
 TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
@@ -34,7 +34,7 @@ TFA_BOARD=generic
 #HEAD: https://github.com/OP-TEE/optee_os
 #TAGS: https://github.com/OP-TEE/optee_os/tags
 #OPTEE_TAG=master
-OPTEE_TAG=4.4.0
+OPTEE_TAG=4.5.0
 #OPTEE_REPO="https://github.com/OP-TEE/optee_os"
 #Local Mirror
 OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2025.01"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
@@ -56,16 +56,16 @@ override_dh_strip:
 override_dh_auto_configure:
 	mkdir -p ./tmp/pkg/
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
-	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; echo "ti-linux-firmware:" > ./tmp/pkg/build.txt ; git --git-dir ./tmp/ti-linux-firmware/.git rev-parse HEAD >> ./tmp/pkg/build.txt ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
-	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/ ; echo "Trusted Firmware for A:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/trusted-firmware-a/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
+	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/
 	make -C ./tmp/trusted-firmware-a/ -j8 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(TFA_BOARD) SPD=opteed all
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin ./tmp/pkg/
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/ ; echo "OP-TEE:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/optee_os/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_ARM64_core=y all
 	cp -v ./tmp/optee/core/tee-pager_v2.bin ./tmp/pkg/
 	cp -v ./tmp/optee/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; echo "U-Boot:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/u-boot/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UBOOT_CFG_CORTEXR)
 	make -C ./tmp/u-boot -j8 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXR/
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/changelog b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/changelog
index a5a27dd6ede159847d83099d1f69d1cd95106be2..91092b40f696ca7f36712ed044d0c7e6352efdee 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/changelog
+++ b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~noble+20250108) noble; urgency=low
+bb-u-boot-beagleboneai64-mainline (2025.04.20250210.0-0~noble+20250214) noble; urgency=low
 
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~noble+20250108) noble; u
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 08 Jan 2025 11:20:32 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:52:51 -0600
 
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/install b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/install
index 141740569f26ba466e11e8e70ca7839196eceffb..4421acd7c69bbe1b833eec990e667bdfca4dda83 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/install
+++ b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/install
@@ -20,4 +20,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleboneai64-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleboneai64-mainline
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/rules b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/rules
index 5e0244c490d38d08defbb446694ac06902d47cde..1822d7e1676b2c346556ca2cc18ffb7cff6523c3 100755
--- a/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/rules
+++ b/bb-u-boot-beagleboneai64-mainline/suite/noble/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleboneai64-mainline
 #HEAD: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=summary
 #TAGS: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tags
 #Mirror: https://github.com/beagleboard/ti-linux-firmware
-TILF_TAG=10.01.10
+TILF_TAG=11.00.03
 #TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #Local Mirror
 TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
@@ -34,7 +34,7 @@ TFA_BOARD=generic
 #HEAD: https://github.com/OP-TEE/optee_os
 #TAGS: https://github.com/OP-TEE/optee_os/tags
 #OPTEE_TAG=master
-OPTEE_TAG=4.4.0
+OPTEE_TAG=4.5.0
 #OPTEE_REPO="https://github.com/OP-TEE/optee_os"
 #Local Mirror
 OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
@@ -43,7 +43,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2025.01"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
@@ -56,16 +56,16 @@ override_dh_strip:
 override_dh_auto_configure:
 	mkdir -p ./tmp/pkg/
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
-	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; echo "ti-linux-firmware:" > ./tmp/pkg/build.txt ; git --git-dir ./tmp/ti-linux-firmware/.git rev-parse HEAD >> ./tmp/pkg/build.txt ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
-	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/ ; echo "Trusted Firmware for A:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/trusted-firmware-a/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
+	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/
 	make -C ./tmp/trusted-firmware-a/ -j8 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(TFA_BOARD) SPD=opteed all
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin ./tmp/pkg/
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/ ; echo "OP-TEE:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/optee_os/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_ARM64_core=y all
 	cp -v ./tmp/optee/core/tee-pager_v2.bin ./tmp/pkg/
 	cp -v ./tmp/optee/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; echo "U-Boot:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/u-boot/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UBOOT_CFG_CORTEXR)
 	make -C ./tmp/u-boot -j8 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXR/
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/changelog b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/changelog
index 38a6b17ce91979a8018a1f531abaa4e1aa514ed8..b35847ef7a06473ffe115a128bf26de1268e0efd 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/changelog
+++ b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~trixie+20250108) trixie; urgency=low
+bb-u-boot-beagleboneai64-mainline (2025.04.20250210.0-0~trixie+20250214) trixie; urgency=low
 
-  * 20250107 - v2025.01 - https://github.com/u-boot/u-boot/releases/tag/v2025.01
-  * 20241204 - 10.01.10 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.01.10
-  * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
+  * 20250210 - v2025.04-rc2 - https://github.com/u-boot/u-boot/releases/tag/v2025.04-rc2
+  * 20250214 - 11.00.03 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/11.00.03
+  * 20250117 - 4.5.0 - https://github.com/OP-TEE/optee_os/commits/4.5.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * add extlinux.conf boot menu options over serial
   * Bump FAT partition to 256MB for boot recovery images
@@ -11,5 +11,5 @@ bb-u-boot-beagleboneai64-mainline (2025.01.20250107.0-0~trixie+20250108) trixie;
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Wed, 08 Jan 2025 11:20:32 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:52:51 -0600
 
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/install b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/install
index 141740569f26ba466e11e8e70ca7839196eceffb..4421acd7c69bbe1b833eec990e667bdfca4dda83 100644
--- a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/install
+++ b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/install
@@ -20,4 +20,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleboneai64-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleboneai64-mainline
diff --git a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/rules b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/rules
index 611ccbe120fe6d6059748a6484e1af673af95aec..35dbececd3cd9c7b6b1c018b5fa93b507ea0a858 100755
--- a/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/rules
+++ b/bb-u-boot-beagleboneai64-mainline/suite/trixie/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleboneai64-mainline
 #HEAD: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=summary
 #TAGS: https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tags
 #Mirror: https://github.com/beagleboard/ti-linux-firmware
-TILF_TAG=10.01.10
+TILF_TAG=11.00.03
 #TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #Local Mirror
 TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
@@ -36,7 +36,7 @@ TFA_BOARD=generic
 #HEAD: https://github.com/OP-TEE/optee_os
 #TAGS: https://github.com/OP-TEE/optee_os/tags
 #OPTEE_TAG=master
-OPTEE_TAG=4.4.0
+OPTEE_TAG=4.5.0
 #OPTEE_REPO="https://github.com/OP-TEE/optee_os"
 #Local Mirror
 OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
@@ -45,7 +45,7 @@ OPTEE_PLATFORM=k3-j721e
 #U-Boot
 UBOOT_CFG_CORTEXR="j721e_beagleboneai64_r5_defconfig"
 UBOOT_CFG_CORTEXA="j721e_beagleboneai64_a72_defconfig"
-UB_TAG="v2025.01"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j721e-gp-evm.bin
 UB_ITB=sysfw-j721e-gp-evm.itb
@@ -58,16 +58,16 @@ override_dh_strip:
 override_dh_auto_configure:
 	mkdir -p ./tmp/pkg/
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
-	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; echo "ti-linux-firmware:" > ./tmp/pkg/build.txt ; git --git-dir ./tmp/ti-linux-firmware/.git rev-parse HEAD >> ./tmp/pkg/build.txt ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
-	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/ ; echo "Trusted Firmware for A:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/trusted-firmware-a/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/ti-linux-firmware/ ; git -c http.sslVerify=false clone -b $(TILF_TAG) $(TILF_REPO) --depth=5 ./tmp/ti-linux-firmware/ ; rsync -a ./tmp/ti-linux-firmware/* /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/ --delete
+	mkdir -p ./tmp/trusted-firmware-a/ ; git -c http.sslVerify=false clone -b $(TFA_TAG) $(TFA_REPO) --depth=5 ./tmp/trusted-firmware-a/
 	make -C ./tmp/trusted-firmware-a/ -j8 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(TFA_BOARD) SPD=opteed all
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin ./tmp/pkg/
 	cp -v ./tmp/trusted-firmware-a/build/k3/$(TFA_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/ ; echo "OP-TEE:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/optee_os/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/optee_os/ ; git -c http.sslVerify=false clone -b $(OPTEE_TAG) $(OPTEE_REPO) --depth=5 ./tmp/optee_os/
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_ARM64_core=y all
 	cp -v ./tmp/optee/core/tee-pager_v2.bin ./tmp/pkg/
 	cp -v ./tmp/optee/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; echo "U-Boot:" >> ./tmp/pkg/build.txt ; git --git-dir ./tmp/u-boot/.git rev-parse HEAD >> ./tmp/pkg/build.txt
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UBOOT_CFG_CORTEXR)
 	make -C ./tmp/u-boot -j8 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXR/
diff --git a/bb-u-boot-beagleboneai64-mainline/version.sh b/bb-u-boot-beagleboneai64-mainline/version.sh
index da1bc8d4db458a120ededf4702fc44d811db9dc5..44b0476339b361eccdade5eddc712d696ab74659 100644
--- a/bb-u-boot-beagleboneai64-mainline/version.sh
+++ b/bb-u-boot-beagleboneai64-mainline/version.sh
@@ -5,7 +5,7 @@
 
 package_name="bb-u-boot-beagleboneai64-mainline"
 debian_pkg_name="${package_name}"
-package_version="2025.01.20250107.0"
+package_version="2025.04.20250210.0"
 package_source=""
 src_dir=""
 
@@ -20,8 +20,8 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20250108"
-bookworm_version="~bookworm+20250108"
-trixie_version="~trixie+20250108"
-jammy_version="~jammy+20250108"
-noble_version="~noble+20250108"
+bullseye_version="~bullseye+20250214"
+bookworm_version="~bookworm+20250214"
+trixie_version="~trixie+20250214"
+jammy_version="~jammy+20250214"
+noble_version="~noble+20250214"