bb-u-boot-sk-am69 (2023.04.20230717.2)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

bb-u-boot-sk-am69/suite/bookworm/debian/changelog

-bb-u-boot-sk-am69 (2023.04.20230717.1-0~bookworm+20230727) bookworm; urgency=low
+bb-u-boot-sk-am69 (2023.04.20230717.2-0~bookworm+20230728) bookworm; urgency=low
 
   * Rebuild for repos.rcn-ee.com
 
- -- Robert Nelson <robertcnelson@gmail.com>  Thu, 27 Jul 2023 20:31:21 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Fri, 28 Jul 2023 18:23:54 -0500
 

bb-u-boot-sk-am69/suite/bookworm/debian/install

@@ -3,8 +3,8 @@ debian/install-microsd.sh /opt/u-boot/bb-u-boot-sk-am69
 debian/microsd-extlinux.conf /opt/u-boot/bb-u-boot-sk-am69
 debian/nvme-extlinux.conf /opt/u-boot/bb-u-boot-sk-am69
 debian/sk-am69-microsd-to-nvme /opt/u-boot/bb-u-boot-sk-am69
-tmp/arm-trusted-firmware/build/k3/j784s4/release/bl31.bin /opt/u-boot/bb-u-boot-sk-am69
-tmp/optee/core/tee-pager_v2.bin /opt/u-boot/bb-u-boot-sk-am69
+tmp/pkg/bl31.bin /opt/u-boot/bb-u-boot-sk-am69
+tmp/pkg/tee-pager_v2.bin /opt/u-boot/bb-u-boot-sk-am69
 tmp/pkg/tiboot3.bin /opt/u-boot/bb-u-boot-sk-am69
 tmp/pkg/tispl.bin /opt/u-boot/bb-u-boot-sk-am69
 tmp/pkg/u-boot.img /opt/u-boot/bb-u-boot-sk-am69

bb-u-boot-sk-am69/suite/bookworm/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-TARGETDIR=bb-u-boot-beagleplay-mainline
+TARGETDIR=bb-u-boot-sk-am69-ti-2023.04
 #/opt/u-boot/$(TARGETDIR)/
 
 #ti-linux-firmware
@@ -19,6 +19,7 @@ TILF_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
 #2.9+
 ATF_TAG=v2.9.0
 ATF_REPO="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
+ATF_BOARD=j784s4
 
 #optee_os
 #HEAD: https://github.com/OP-TEE/optee_os
@@ -26,11 +27,14 @@ ATF_REPO="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
 #3.22.0+
 TEE_TAG=master
 TEE_REPO="https://github.com/OP-TEE/optee_os"
+TEE_BOARD=k3-j784s4
 
 #U-Boot
 UB_CONFIG=j784s4_evm
 UB_BRANCH=ti-u-boot-2023.04
 UB_REPO="https://github.com/beagleboard/ti-u-boot.git"
+UB_TIBOOT=tiboot3-j784s4-hs-fs-evm.bin
+MCORE=a72
 
 override_dh_strip:
 	# Just disable for now...
@@ -40,21 +44,23 @@ override_dh_auto_configure:
 	mkdir -p /opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	mkdir -p ./tmp/ti-linux-firmware/ ; git 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/arm-trusted-firmware/ ; git clone -b $(ATF_TAG) $(ATF_REPO) --depth=5 ./tmp/arm-trusted-firmware/
-	make -C ./tmp/arm-trusted-firmware/ -j4 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=j784s4 K3_USART=0x8 SPD=opteed all
-	cp -v ./tmp/arm-trusted-firmware/build/k3/j784s4/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
+	make -C ./tmp/arm-trusted-firmware/ -j4 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=$(ATF_BOARD) K3_USART=0x8 SPD=opteed all
+	cp -v ./tmp/arm-trusted-firmware/build/k3/$(ATF_BOARD)/release/bl31.bin ./tmp/pkg/
+	cp -v ./tmp/arm-trusted-firmware/build/k3/$(ATF_BOARD)/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
 	mkdir -p ./tmp/optee_os/ ; git clone -b $(TEE_TAG) $(TEE_REPO) --depth=5 ./tmp/optee_os/
-	make -C ./tmp/optee_os/ -j4 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=k3-j784s4 CFG_CONSOLE_UART=0x8 CFG_ARM64_core=y all
+	make -C ./tmp/optee_os/ -j4 O=../optee CROSS_COMPILE=arm-linux-gnueabihf- CROSS_COMPILE64=aarch64-linux-gnu- CFLAGS= LDFLAGS= PLATFORM=$(TEE_BOARD) 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 clone -b $(UB_BRANCH) $(UB_REPO) --depth=5 ./tmp/u-boot/
 	make -C ./tmp/u-boot -j1 O=../r5 ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- $(UB_CONFIG)_r5_defconfig
 	make -C ./tmp/u-boot -j5 O=../r5 ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- BINMAN_INDIRS=/opt/u-boot/$(TARGETDIR)/ti-linux-firmware/
 	ls -lha ./tmp/r5/
-	cp -v ./tmp/r5/tiboot3-j784s4-hs-fs-evm.bin ./tmp/pkg/tiboot3.bin
-	make -C ./tmp/u-boot -j1 O=../a72 ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- $(UB_CONFIG)_a72_defconfig
-	make -C ./tmp/u-boot -j5 O=../a72 ARCH=arm 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/a72/
-	cp -v ./tmp/a72/tispl.bin ./tmp/pkg/tispl.bin
-	cp -v ./tmp/a72/u-boot.img ./tmp/pkg/u-boot.img
+	cp -v ./tmp/r5/$(UB_TIBOOT) ./tmp/pkg/tiboot3.bin
+	make -C ./tmp/u-boot -j1 O=../$(MCORE) ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- $(UB_CONFIG)_$(MCORE)_defconfig
+	make -C ./tmp/u-boot -j5 O=../$(MCORE) ARCH=arm 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/$(MCORE)/
+	cp -v ./tmp/$(MCORE)/tispl.bin ./tmp/pkg/tispl.bin
+	cp -v ./tmp/$(MCORE)/u-boot.img ./tmp/pkg/u-boot.img
 
 %:
 	dh $@

bb-u-boot-sk-am69/suite/bookworm/debian/sk-am69-microsd-to-nvme

 source=/dev/mmcblk1
 destination=/dev/nvme0n1
+#destination=/dev/sda
 rfs_partition=hybrid
 rfs_rootfs_startmb=1
 extlinux=/opt/u-boot/bb-u-boot-sk-am69/nvme-extlinux.conf

bb-u-boot-sk-am69/version.sh

@@ -4,7 +4,7 @@
 
 package_name="bb-u-boot-sk-am69"
 debian_pkg_name="${package_name}"
-package_version="2023.04.20230717.1"
+package_version="2023.04.20230717.2"
 package_source=""
 src_dir=""
 
@@ -19,4 +19,4 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bookworm_version="~bookworm+20230727"
+bookworm_version="~bookworm+20230728"