diff --git a/bb-u-boot-beagleplay-mainline/readme.log b/bb-u-boot-beagleplay-mainline/readme.log
index 7a2478bd30a5c66f3ac6d7ef77e517e9f82eeda1..458595377ec87e551abe1213ce5cf3690fe1dfa5 100644
--- a/bb-u-boot-beagleplay-mainline/readme.log
+++ b/bb-u-boot-beagleplay-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-beagleplay-mainline/suite/bookworm/debian/changelog b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/changelog
index 8e838387055c54f797c6553309394c5849dd730d..64fb6f68ed6c2174907e44a98361b11a4046c2c4 100644
--- a/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/changelog
+++ b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleplay-mainline (2025.01.20250107.1-0~bookworm+20250114) bookworm; urgency=low
+bb-u-boot-beagleplay-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-beagleplay-mainline (2025.01.20250107.1-0~bookworm+20250114) bookworm;
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 14 Jan 2025 15:45:31 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:49:34 -0600
 
diff --git a/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/install b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/install
index b7328565948c7ba77dbf2e339dddefef383d7398..4940ef7af5c145280d02eab5fc6bd1cb11eb5f50 100644
--- a/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/install
+++ b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/install
@@ -17,4 +17,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleplay-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleplay-mainline
diff --git a/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/rules b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/rules
index 0e480d7d890aac8fa7788a4036305b1b113c1f9e..c12c644064d92bc326eec1fd042c97b7bf7b337a 100755
--- a/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/rules
+++ b/bb-u-boot-beagleplay-mainline/suite/bookworm/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleplay-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=lite
 #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-am62x
 #U-Boot
 UBOOT_CFG_CORTEXR="am62x_beagleplay_r5_defconfig"
 UBOOT_CFG_CORTEXA="am62x_beagleplay_a53_defconfig"
-UB_TAG="v2025.01-Beagle"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-am62x-gp-evm.bin
 UB_TISPL=tispl.bin_unsigned
@@ -55,16 +55,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) K3_PM_SYSTEM_SUSPEND=1 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_WITH_SOFTWARE_PRNG=y 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-beagleplay-mainline/suite/bullseye/debian/changelog b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/changelog
index 09f9d6aaaadcc49951ef354872248ff8b4e0e289..da40ed868d401378eac8fb8f51a59894ed8471a6 100644
--- a/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/changelog
+++ b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleplay-mainline (2025.01.20250107.1-0~bullseye+20250114) bullseye; urgency=low
+bb-u-boot-beagleplay-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-beagleplay-mainline (2025.01.20250107.1-0~bullseye+20250114) bullseye;
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 14 Jan 2025 15:45:31 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:49:34 -0600
 
diff --git a/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/install b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/install
index b7328565948c7ba77dbf2e339dddefef383d7398..4940ef7af5c145280d02eab5fc6bd1cb11eb5f50 100644
--- a/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/install
+++ b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/install
@@ -17,4 +17,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleplay-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleplay-mainline
diff --git a/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/rules b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/rules
index b56a09273c97add8368531797b5aecab1aeb4918..a3617f8edd2ffada6787e92c7bc8ac9dc5a674ed 100755
--- a/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/rules
+++ b/bb-u-boot-beagleplay-mainline/suite/bullseye/debian/rules
@@ -11,7 +11,7 @@ TARGETDIR=bb-u-boot-beagleplay-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=lite
 #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-am62x
 #U-Boot
 UBOOT_CFG_CORTEXR="am62x_beagleplay_r5_defconfig"
 UBOOT_CFG_CORTEXA="am62x_beagleplay_a53_defconfig"
-UB_TAG="v2025.01-Beagle"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-am62x-gp-evm.bin
 UB_TISPL=tispl.bin_unsigned
@@ -52,16 +52,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) K3_PM_SYSTEM_SUSPEND=1 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_WITH_SOFTWARE_PRNG=y 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-beagleplay-mainline/suite/jammy/debian/changelog b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/changelog
index cd001bffd1b676a1512f3c969a0c9e1b709fef39..2dadc4cffb1a7d896fba6eec3a98b609ad385cb0 100644
--- a/bb-u-boot-beagleplay-mainline/suite/jammy/debian/changelog
+++ b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleplay-mainline (2025.01.20250107.1-0~jammy+20250114) jammy; urgency=low
+bb-u-boot-beagleplay-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-beagleplay-mainline (2025.01.20250107.1-0~jammy+20250114) jammy; urgen
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 14 Jan 2025 15:45:31 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:49:34 -0600
 
diff --git a/bb-u-boot-beagleplay-mainline/suite/jammy/debian/install b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/install
index b7328565948c7ba77dbf2e339dddefef383d7398..4940ef7af5c145280d02eab5fc6bd1cb11eb5f50 100644
--- a/bb-u-boot-beagleplay-mainline/suite/jammy/debian/install
+++ b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/install
@@ -17,4 +17,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleplay-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleplay-mainline
diff --git a/bb-u-boot-beagleplay-mainline/suite/jammy/debian/rules b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/rules
index ccef4d4491e1ef3831b93c05cef09dd9d0e5e388..75fba6fbacf46a5e95033fbd5798d332ae40b11d 100755
--- a/bb-u-boot-beagleplay-mainline/suite/jammy/debian/rules
+++ b/bb-u-boot-beagleplay-mainline/suite/jammy/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleplay-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=lite
 #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-am62x
 #U-Boot
 UBOOT_CFG_CORTEXR="am62x_beagleplay_r5_defconfig"
 UBOOT_CFG_CORTEXA="am62x_beagleplay_a53_defconfig"
-UB_TAG="v2025.01-Beagle"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-am62x-gp-evm.bin
 UB_TISPL=tispl.bin_unsigned
@@ -55,16 +55,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) K3_PM_SYSTEM_SUSPEND=1 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_WITH_SOFTWARE_PRNG=y 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-beagleplay-mainline/suite/noble/debian/changelog b/bb-u-boot-beagleplay-mainline/suite/noble/debian/changelog
index ea7f1344b148ef9c503aba8351850c3d6af97993..01154a9a8c7b908c4c93e9f0e446a6450553e7c8 100644
--- a/bb-u-boot-beagleplay-mainline/suite/noble/debian/changelog
+++ b/bb-u-boot-beagleplay-mainline/suite/noble/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleplay-mainline (2025.01.20250107.1-0~noble+20250114) noble; urgency=low
+bb-u-boot-beagleplay-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-beagleplay-mainline (2025.01.20250107.1-0~noble+20250114) noble; urgen
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 14 Jan 2025 15:45:31 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:49:34 -0600
 
diff --git a/bb-u-boot-beagleplay-mainline/suite/noble/debian/install b/bb-u-boot-beagleplay-mainline/suite/noble/debian/install
index b7328565948c7ba77dbf2e339dddefef383d7398..4940ef7af5c145280d02eab5fc6bd1cb11eb5f50 100644
--- a/bb-u-boot-beagleplay-mainline/suite/noble/debian/install
+++ b/bb-u-boot-beagleplay-mainline/suite/noble/debian/install
@@ -17,4 +17,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleplay-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleplay-mainline
diff --git a/bb-u-boot-beagleplay-mainline/suite/noble/debian/rules b/bb-u-boot-beagleplay-mainline/suite/noble/debian/rules
index bb90a642cdecf3c9cd0576e31608d80871dafd89..39c103284ff59e3a534c5d7645262055f5bb9c10 100755
--- a/bb-u-boot-beagleplay-mainline/suite/noble/debian/rules
+++ b/bb-u-boot-beagleplay-mainline/suite/noble/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleplay-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=lite
 #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-am62x
 #U-Boot
 UBOOT_CFG_CORTEXR="am62x_beagleplay_r5_defconfig"
 UBOOT_CFG_CORTEXA="am62x_beagleplay_a53_defconfig"
-UB_TAG="v2025.01-Beagle"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-am62x-gp-evm.bin
 UB_TISPL=tispl.bin_unsigned
@@ -55,16 +55,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) K3_PM_SYSTEM_SUSPEND=1 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_WITH_SOFTWARE_PRNG=y 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-beagleplay-mainline/suite/trixie/debian/changelog b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/changelog
index cddf3fd010bc49b1d4d6230f8c6275fe6f4c0583..e72e2a45e481be6ea487edadb1304b0853bf16fd 100644
--- a/bb-u-boot-beagleplay-mainline/suite/trixie/debian/changelog
+++ b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/changelog
@@ -1,8 +1,8 @@
-bb-u-boot-beagleplay-mainline (2025.01.20250107.1-0~trixie+20250114) trixie; urgency=low
+bb-u-boot-beagleplay-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-beagleplay-mainline (2025.01.20250107.1-0~trixie+20250114) trixie; urg
   * Flasher scripts, echo Serial over HDMI
   * extlinux.conf, unify labels to make flasher change more generic
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 14 Jan 2025 15:45:31 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 14 Feb 2025 11:49:34 -0600
 
diff --git a/bb-u-boot-beagleplay-mainline/suite/trixie/debian/install b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/install
index b7328565948c7ba77dbf2e339dddefef383d7398..4940ef7af5c145280d02eab5fc6bd1cb11eb5f50 100644
--- a/bb-u-boot-beagleplay-mainline/suite/trixie/debian/install
+++ b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/install
@@ -17,4 +17,3 @@ tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-beagleplay-mainline
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-beagleplay-mainline
-tmp/pkg/build.txt /opt/u-boot/bb-u-boot-beagleplay-mainline
diff --git a/bb-u-boot-beagleplay-mainline/suite/trixie/debian/rules b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/rules
index 9283bf21a639b0ffbf7eb727153ed188e7c05bdf..f4d3da166b52a0d06278f306a35815c38ab4fbac 100755
--- a/bb-u-boot-beagleplay-mainline/suite/trixie/debian/rules
+++ b/bb-u-boot-beagleplay-mainline/suite/trixie/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-beagleplay-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=lite
 #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-am62x
 #U-Boot
 UBOOT_CFG_CORTEXR="am62x_beagleplay_r5_defconfig"
 UBOOT_CFG_CORTEXA="am62x_beagleplay_a53_defconfig"
-UB_TAG="v2025.01-Beagle"
+UB_TAG="v2025.04-rc2"
 UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-am62x-gp-evm.bin
 UB_TISPL=tispl.bin_unsigned
@@ -57,16 +57,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) K3_PM_SYSTEM_SUSPEND=1 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_WITH_SOFTWARE_PRNG=y 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-beagleplay-mainline/version.sh b/bb-u-boot-beagleplay-mainline/version.sh
index 9513b78c687a9d463490174e1b2d693c83cab473..00f15d4328960966110a17e0e7264d7d847aee96 100644
--- a/bb-u-boot-beagleplay-mainline/version.sh
+++ b/bb-u-boot-beagleplay-mainline/version.sh
@@ -5,7 +5,7 @@
 
 package_name="bb-u-boot-beagleplay-mainline"
 debian_pkg_name="${package_name}"
-package_version="2025.01.20250107.1"
+package_version="2025.04.20250210.0"
 package_source=""
 src_dir=""
 
@@ -20,8 +20,8 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20250114"
-bookworm_version="~bookworm+20250114"
-trixie_version="~trixie+20250114"
-jammy_version="~jammy+20250114"
-noble_version="~noble+20250114"
+bullseye_version="~bullseye+20250214"
+bookworm_version="~bookworm+20250214"
+trixie_version="~trixie+20250214"
+jammy_version="~jammy+20250214"
+noble_version="~noble+20250214"