bb-u-boot-beagleboneai64 (2021.10.20220527.3)

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

bb-u-boot-beagleboneai64/suite/bullseye/debian/changelog

-bb-u-boot-beagleboneai64 (2021.10.20220527.2-0~bullseye+20220531) bullseye; urgency=low
+bb-u-boot-beagleboneai64 (2021.10.20220527.3-0~bullseye+20220531) bullseye; urgency=low
 
   * Rebuild for repos.rcn-ee.com
 
- -- Robert Nelson <robertcnelson@gmail.com>  Tue, 31 May 2022 14:49:36 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Tue, 31 May 2022 15:01:46 -0500
 

bb-u-boot-beagleboneai64/suite/bullseye/debian/control

@@ -5,7 +5,6 @@ Maintainer: Robert Nelson <robertcnelson@gmail.com>
 Build-Depends:
  debhelper (>= 9)
  , bb-k3-image-gen-j721e-evm,
- , bb-arm-trusted-firmware-k3-generic-opteed
  , bc,
  , bison
  , ca-certificates

bb-u-boot-beagleboneai64/suite/bullseye/debian/install

@@ -6,6 +6,7 @@ debian/install-emmc.sh /opt/u-boot/bb-u-boot-beagleboneai64
 debian/emmc-extlinux.conf /opt/u-boot/bb-u-boot-beagleboneai64
 debian/convert-to-extlinux-emmc.sh /opt/u-boot/bb-u-boot-beagleboneai64
 debian/ipc_echo_testb_mcu1_0_release_strip.xer5f /opt/u-boot/bb-u-boot-beagleboneai64
+tmp/arm-trusted-firmware/build/k3/generic/release/bl31.bin /opt/u-boot/bb-u-boot-beagleboneai64
 tmp/optee_os/out/arm-plat-k3/core/tee-pager_v2.bin /opt/u-boot/bb-u-boot-beagleboneai64
 tmp/r5/tiboot3.bin /opt/u-boot/bb-u-boot-beagleboneai64
 tmp/a72/tispl.bin /opt/u-boot/bb-u-boot-beagleboneai64

bb-u-boot-beagleboneai64/suite/bullseye/debian/rules

@@ -6,25 +6,34 @@ export DH_VERBOSE=1
 
 TARGETDIR=bb-u-boot-beagleboneai64
 
+#arm-trusted-firmware
+ATF_TAG=bbb.io-08.01.00.006
+
 #optee_os
-TAG=08.01.00.005
+TEE_TAG=08.01.00.005
 
 #U-Boot
 UB_TAG=v2021.01-ti-08.01.00.006
 UB_CONFIG=j721e_evm_
+UB_ATF=bl31.bin
+UB_TEE=tee-pager_v2.bin
+UB_DM=ipc_echo_testb_mcu1_0_release_strip.xer5f
 
 override_dh_strip:
 	# Just disable for now...
 
 override_dh_auto_configure:
 	mkdir -p /opt/u-boot/$(TARGETDIR)/
-	mkdir -p ./tmp/optee_os/ ; git clone -b $(TAG) https://github.com/beagleboard/optee_os --depth=1 ./tmp/optee_os/
+	mkdir -p ./tmp/arm-trusted-firmware/ ; git clone -b $(ATF_TAG) https://git.beagleboard.org/beagleboard/arm-trusted-firmware.git --depth=1 ./tmp/arm-trusted-firmware/
+	cd ./tmp/arm-trusted-firmware/ ; make -j4 CROSS_COMPILE=aarch64-linux-gnu- CFLAGS= LDFLAGS= ARCH=aarch64 PLAT=k3 TARGET_BOARD=generic SPD=opteed all
+	cp -v ./tmp/arm-trusted-firmware/build/k3/generic/release/bl31.bin /opt/u-boot/$(TARGETDIR)/
+	mkdir -p ./tmp/optee_os/ ; git clone -b $(TEE_TAG) https://git.beagleboard.org/beagleboard/optee_os.git --depth=1 ./tmp/optee_os/
 	cd ./tmp/optee_os/ ; make -j4 CFLAGS= LDFLAGS= PLATFORM=k3-j721e CFG_ARM64_core=y
 	cp -v ./tmp/optee_os/out/arm-plat-k3/core/tee-pager_v2.bin /opt/u-boot/$(TARGETDIR)/
 	cp -v debian/ipc_echo_testb_mcu1_0_release_strip.xer5f /opt/u-boot/$(TARGETDIR)/
 	mkdir -p ./tmp/u-boot/ ; git clone -b $(UB_TAG) https://git.beagleboard.org/beagleboard/u-boot.git --depth=1 ./tmp/u-boot/
 	cd ./tmp/u-boot/ ; make CROSS_COMPILE=arm-linux-gnueabihf- $(UB_CONFIG)r5_defconfig O=../r5 ; make -j5 CROSS_COMPILE=arm-linux-gnueabihf- O=../r5
-	cd ./tmp/u-boot/ ; make CROSS_COMPILE=aarch64-linux-gnu- $(UB_CONFIG)a72_defconfig O=../a72 ; make -j5 CROSS_COMPILE=aarch64-linux-gnu- ATF=/opt/u-boot/bb-arm-trusted-firmware-k3-generic-opteed/bl31.bin TEE=/opt/u-boot/$(TARGETDIR)/tee-pager_v2.bin DM=/opt/u-boot/$(TARGETDIR)/ipc_echo_testb_mcu1_0_release_strip.xer5f O=../a72
+	cd ./tmp/u-boot/ ; make CROSS_COMPILE=aarch64-linux-gnu- $(UB_CONFIG)a72_defconfig O=../a72 ; make -j5 CROSS_COMPILE=aarch64-linux-gnu- ATF=/opt/u-boot/$(TARGETDIR)/$(UB_ATF) TEE=/opt/u-boot/$(TARGETDIR)/$(UB_TEE) DM=/opt/u-boot/$(TARGETDIR)/$(UB_DM) O=../a72
 
 %:
 	dh $@

bb-u-boot-beagleboneai64/version.sh

@@ -4,7 +4,7 @@
 
 package_name="bb-u-boot-beagleboneai64"
 debian_pkg_name="${package_name}"
-package_version="2021.10.20220527.2"
+package_version="2021.10.20220527.3"
 package_source=""
 src_dir=""