From 95b88a095eb02426ad9bf5a0f6c630610ca03790 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 24 Jan 2025 16:59:07 -0600
Subject: [PATCH] bb-u-boot-sk-am69 (2023.04.20240319.0-09.02.00.009)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 bb-u-boot-sk-am69/readme.log                      |  4 ++--
 bb-u-boot-sk-am69/suite/bookworm/debian/changelog |  8 ++++----
 bb-u-boot-sk-am69/suite/bookworm/debian/rules     | 15 ++++++---------
 bb-u-boot-sk-am69/version.sh                      |  6 +++---
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/bb-u-boot-sk-am69/readme.log b/bb-u-boot-sk-am69/readme.log
index c85f32520..192218826 100644
--- a/bb-u-boot-sk-am69/readme.log
+++ b/bb-u-boot-sk-am69/readme.log
@@ -1,5 +1,5 @@
-  * 20231206 - 09.01.00.008 - https://git.ti.com/gitweb?p=ti-u-boot/ti-u-boot.git;a=tag;h=refs/tags/09.01.00.008
-  * 20231130 - 09.01.00.008 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.01.00.008
+  * 20240319 - 09.02.00.009 - https://openbeagle.org/beagleboard/u-boot/-/commits/v2023.04-ti-09.02.00.009-BeagleY-AI-Production
+  * 20240712 - 10.00.06 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.00.06
   * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * SK-AM69, add extlinux.conf boot options over serial
diff --git a/bb-u-boot-sk-am69/suite/bookworm/debian/changelog b/bb-u-boot-sk-am69/suite/bookworm/debian/changelog
index 69b190022..60467d757 100644
--- a/bb-u-boot-sk-am69/suite/bookworm/debian/changelog
+++ b/bb-u-boot-sk-am69/suite/bookworm/debian/changelog
@@ -1,12 +1,12 @@
-bb-u-boot-sk-am69 (2023.04.20231206.4-09.01.00.008-0~bookworm+20250124) bookworm; urgency=low
+bb-u-boot-sk-am69 (2023.04.20240319.0-09.02.00.009-0~bookworm+20250124) bookworm; urgency=low
 
-  * 20231206 - 09.01.00.008 - https://git.ti.com/gitweb?p=ti-u-boot/ti-u-boot.git;a=tag;h=refs/tags/09.01.00.008
-  * 20231130 - 09.01.00.008 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=shortlog;h=refs/tags/09.01.00.008
+  * 20240319 - 09.02.00.009 - https://openbeagle.org/beagleboard/u-boot/-/commits/v2023.04-ti-09.02.00.009-BeagleY-AI-Production
+  * 20240712 - 10.00.06 - https://git.ti.com/gitweb?p=processor-firmware/ti-linux-firmware.git;a=tag;h=refs/tags/10.00.06
   * 20241018 - 4.4.0 - https://github.com/OP-TEE/optee_os/commits/4.4.0
   * 20241115 - v2.12.0 - https://github.com/ARM-software/arm-trusted-firmware/releases/tag/v2.12.0
   * SK-AM69, add extlinux.conf boot options over serial
   * Bump FAT partition to 256MB for boot recovery images
   * extlinux.conf: force fdt /k3-am69-sk.dtb
 
- -- Robert Nelson <robertcnelson@gmail.com>  Fri, 24 Jan 2025 16:43:58 -0600
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 24 Jan 2025 16:58:51 -0600
 
diff --git a/bb-u-boot-sk-am69/suite/bookworm/debian/rules b/bb-u-boot-sk-am69/suite/bookworm/debian/rules
index ba575587c..79428e232 100755
--- a/bb-u-boot-sk-am69/suite/bookworm/debian/rules
+++ b/bb-u-boot-sk-am69/suite/bookworm/debian/rules
@@ -14,7 +14,7 @@ TARGETDIR=bb-u-boot-sk-am69
 #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=09.01.00.008
+TILF_TAG=10.00.06
 #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"
@@ -41,11 +41,8 @@ OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
 OPTEE_PLATFORM=k3-j784s4
 
 #U-Boot
-UB_CONFIG=j784s4_evm
-UB_BRANCH=v2023.04-ti-09.01.00.008-BeaglePlay
-UB_REPO="https://git.beagleboard.org/beagleboard/u-boot.git"
-#Local Mirror
-#UB_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-u-boot.git"
+UB_TAG="v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
+UB_REPO="https://github.com/beagleboard/u-boot.git"
 UB_TIBOOT=tiboot3-j784s4-hs-fs-evm.bin
 
 override_dh_strip:
@@ -63,12 +60,12 @@ override_dh_auto_configure:
 	make -C ./tmp/optee_os/ -j8 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(OPTEE_PLATFORM) CFG_CONSOLE_UART=0x8 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_BRANCH) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; git --git-dir ./tmp/u-boot/.git log --pretty=oneline
-	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- $(UB_CONFIG)_r5_defconfig
+	mkdir -p ./tmp/u-boot/ ; git -c http.sslVerify=false clone -b $(UB_TAG) $(UB_REPO) --depth=5 ./tmp/u-boot/ ; git --git-dir ./tmp/u-boot/.git log --pretty=oneline
+	make -C ./tmp/u-boot -j1 O=../CORTEXR CROSS_COMPILE=arm-linux-gnueabihf- j784s4_evm_r5_defconfig
 	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/
 	cp -v ./tmp/CORTEXR/$(UB_TIBOOT) ./tmp/pkg/tiboot3.bin
-	make -C ./tmp/u-boot -j1 O=../CORTEXA CROSS_COMPILE=aarch64-linux-gnu- $(UB_CONFIG)_a72_defconfig
+	make -C ./tmp/u-boot -j1 O=../CORTEXA CROSS_COMPILE=aarch64-linux-gnu- j784s4_evm_a72_defconfig
 	make -C ./tmp/u-boot -j8 O=../CORTEXA CROSS_COMPILE=aarch64-linux-gnu- BL31=/opt/u-boot/$(TARGETDIR)/bl31.bin TEE=/opt/u-boot/$(TARGETDIR)/tee-pager_v2.bin BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/CORTEXA/
 	cp -v ./tmp/CORTEXA/tispl.bin ./tmp/pkg/tispl.bin
diff --git a/bb-u-boot-sk-am69/version.sh b/bb-u-boot-sk-am69/version.sh
index dfc35620d..01ace00c6 100644
--- a/bb-u-boot-sk-am69/version.sh
+++ b/bb-u-boot-sk-am69/version.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
-#https://git.beagleboard.org/beagleboard/u-boot/
-#https://git.ti.com/gitweb?p=ti-u-boot/ti-u-boot.git;a=shortlog;h=refs/heads/ti-u-boot-2023.04
+#https://openbeagle.org/beagleboard/u-boot/
+#https://github.com/u-boot/u-boot/commits/master
 
 package_name="bb-u-boot-sk-am69"
 debian_pkg_name="${package_name}"
-package_version="2023.04.20231206.4-09.01.00.008"
+package_version="2023.04.20240319.0-09.02.00.009"
 package_source=""
 src_dir=""
 
-- 
GitLab