From 705cb7355ef263d3e1db29ace8715a779d83f022 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 8 Mar 2024 12:02:24 -0600
Subject: [PATCH] bb-u-boot-beagleplay (2023.04.20231206.6)
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
bb-u-boot-beagleplay-debian-11/get_latest.sh | 21 +++++++++++++++++
bb-u-boot-beagleplay-debian-11/readme.log | 8 +++----
.../debian/beagleplay-emmc-to-microsd | 1 +
.../debian/beagleplay-emmc-to-microsd-w-swap | 1 +
.../debian/beagleplay-microsd-to-emmc | 1 +
.../debian/beagleplay-microsd-to-emmc-w-swap | 1 +
.../suite/bullseye/debian/changelog | 12 +++++-----
.../suite/bullseye/debian/rules | 23 ++++++++-----------
bb-u-boot-beagleplay-debian-11/version.sh | 4 ++--
9 files changed, 47 insertions(+), 25 deletions(-)
create mode 100755 bb-u-boot-beagleplay-debian-11/get_latest.sh
diff --git a/bb-u-boot-beagleplay-debian-11/get_latest.sh b/bb-u-boot-beagleplay-debian-11/get_latest.sh
new file mode 100755
index 000000000..cffd6dd19
--- /dev/null
+++ b/bb-u-boot-beagleplay-debian-11/get_latest.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+dl_src () {
+ if [ -d ./src/ ] ; then
+ rm -rf ./src/
+ fi
+
+ git clone https://openbeagle.org/beagleboard/usr-customizations.git ./src/
+}
+
+
+copy_all () {
+ cp -v ./src/${wfile} ./suite/bullseye/debian/
+}
+
+dl_src
+
+wfile="arm64/etc/beagle-flasher/beagleplay-emmc-to-microsd" ; copy_all
+wfile="arm64/etc/beagle-flasher/beagleplay-emmc-to-microsd-w-swap" ; copy_all
+wfile="arm64/etc/beagle-flasher/beagleplay-microsd-to-emmc" ; copy_all
+wfile="arm64/etc/beagle-flasher/beagleplay-microsd-to-emmc-w-swap" ; copy_all
diff --git a/bb-u-boot-beagleplay-debian-11/readme.log b/bb-u-boot-beagleplay-debian-11/readme.log
index 709f703cb..bab90eb0d 100644
--- a/bb-u-boot-beagleplay-debian-11/readme.log
+++ b/bb-u-boot-beagleplay-debian-11/readme.log
@@ -1,10 +1,10 @@
* 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
- * 20231122 - v2.10.0 - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/log/?h=v2.10.0
- * 20231020 - 4.0.0 - https://github.com/OP-TEE/optee_os/commits/4.0.0
- * BeaglePlay, add extlinux.conf boot options over serial
+ * 20240209 - v2.10.2 - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/log/?h=lts-v2.10.2
+ * 20240119 - 4.1.0 - https://github.com/OP-TEE/optee_os/commits/4.1.0
+ * add extlinux.conf boot menu options over serial
* Bump FAT partition to 256MB for boot recovery images
- * Enable a extlinux.conf option to flash eMMC directly
+ * Enable a extlinux.conf option to flash other media directly
* extlinux.conf more vocal on eMMC vs microSD
* Flasher scripts, echo Serial over HDMI
* extlinux.conf, unify labels to make flasher change more generic
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd
index 9805bb744..fbf6369b8 100644
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd
@@ -4,6 +4,7 @@ destination=/dev/mmcblk1
rfs_partition=dual
rfs_boot_startmb=1
rfs_boot_size_mb=256
+rfs_boot_permissions=user,uid=1000,gid=1000,defaults
flash_back=/opt/u-boot/bb-u-boot-beagleplay/beagleplay-microsd-to-emmc
extlinux=/opt/u-boot/bb-u-boot-beagleplay/microsd-extlinux.conf
flash_cc1352p=enable
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd-w-swap b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd-w-swap
index 0520ab68b..37c2cecdf 100644
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd-w-swap
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-emmc-to-microsd-w-swap
@@ -4,6 +4,7 @@ destination=/dev/mmcblk1
rfs_partition=dual
rfs_boot_startmb=1
rfs_boot_size_mb=256
+rfs_boot_permissions=user,uid=1000,gid=1000,defaults
rfs_swap_size_mb=2048
flash_back=/opt/u-boot/bb-u-boot-beagleplay/beagleplay-microsd-to-emmc-w-swap
extlinux=/opt/u-boot/bb-u-boot-beagleplay/microsd-extlinux-w-swap.conf
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc
index 298c3b81a..c4da41628 100644
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc
@@ -4,6 +4,7 @@ destination=/dev/mmcblk0
rfs_partition=dual
rfs_boot_startmb=1
rfs_boot_size_mb=256
+rfs_boot_permissions=user,uid=1000,gid=1000,defaults
bootloader=/opt/u-boot/bb-u-boot-beagleplay/install-emmc.sh
flash_back=/opt/u-boot/bb-u-boot-beagleplay/beagleplay-emmc-to-microsd
extlinux=/opt/u-boot/bb-u-boot-beagleplay/emmc-extlinux.conf
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc-w-swap b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc-w-swap
index 73f02b58a..d4e48ee71 100644
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc-w-swap
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/beagleplay-microsd-to-emmc-w-swap
@@ -4,6 +4,7 @@ destination=/dev/mmcblk0
rfs_partition=dual
rfs_boot_startmb=1
rfs_boot_size_mb=256
+rfs_boot_permissions=user,uid=1000,gid=1000,defaults
rfs_swap_size_mb=2048
bootloader=/opt/u-boot/bb-u-boot-beagleplay/install-emmc.sh
flash_back=/opt/u-boot/bb-u-boot-beagleplay/beagleplay-emmc-to-microsd-w-swap
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/changelog b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/changelog
index 89f2639eb..3b0f2feeb 100644
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/changelog
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/changelog
@@ -1,16 +1,16 @@
-bb-u-boot-beagleplay (2023.04.20231206.5-09.01.00.008-0~bullseye+20231228) bullseye; urgency=low
+bb-u-boot-beagleplay (2023.04.20231206.6-09.01.00.008-0~bullseye+20240308) bullseye; 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
- * 20231122 - v2.10.0 - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/log/?h=v2.10.0
- * 20231020 - 4.0.0 - https://github.com/OP-TEE/optee_os/commits/4.0.0
- * BeaglePlay, add extlinux.conf boot options over serial
+ * 20240209 - v2.10.2 - https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/log/?h=lts-v2.10.2
+ * 20240119 - 4.1.0 - https://github.com/OP-TEE/optee_os/commits/4.1.0
+ * add extlinux.conf boot menu options over serial
* Bump FAT partition to 256MB for boot recovery images
- * Enable a extlinux.conf option to flash eMMC directly
+ * Enable a extlinux.conf option to flash other media directly
* extlinux.conf more vocal on eMMC vs microSD
* Flasher scripts, echo Serial over HDMI
* extlinux.conf, unify labels to make flasher change more generic
* extlinux.conf, flasher auto disable k3-am625-beagleplay-bcfserial-no-firmware.dtbo for 5.10.x kernels
- -- Robert Nelson <robertcnelson@gmail.com> Thu, 28 Dec 2023 11:37:03 -0600
+ -- Robert Nelson <robertcnelson@gmail.com> Fri, 08 Mar 2024 12:02:01 -0600
diff --git a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/rules b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/rules
index d7b5aa961..cbf6eb0ec 100755
--- a/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/rules
+++ b/bb-u-boot-beagleplay-debian-11/suite/bullseye/debian/rules
@@ -9,6 +9,7 @@ TARGETDIR=bb-u-boot-beagleplay
#ti-linux-firmware
#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_REPO="https://github.com/beagleboard/ti-linux-firmware.git"
@@ -17,8 +18,9 @@ TILF_REPO="https://git.gfnd.rcn-ee.org/TexasInstruments/ti-linux-firmware.git"
#trusted-firmware-a
#HEAD: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/
+#TAGS: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/refs/
#TFA_TAG=master
-TFA_TAG=v2.10.0
+TFA_TAG=lts-v2.10.2
#TFA_REPO="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
#Local Mirror
TFA_REPO="https://git.gfnd.rcn-ee.org/mirror/trusted-firmware-a.git"
@@ -26,23 +28,18 @@ TFA_BOARD=lite
#optee_os
#HEAD: https://github.com/OP-TEE/optee_os
+#TAGS: https://github.com/OP-TEE/optee_os/tags
#OPTEE_TAG=master
-OPTEE_TAG=4.0.0
+OPTEE_TAG=4.1.0
#OPTEE_REPO="https://github.com/OP-TEE/optee_os"
#Local Mirror
OPTEE_REPO="https://git.gfnd.rcn-ee.org/mirror/optee_os.git"
OPTEE_PLATFORM=k3-am62x
#U-Boot
-UB_CONFIG=am62x_evm
-#UB_CONFIG_BOARD=am625_beagleplay
-UB_CONFIG_BOARD=beagleplay
-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/mirror/u-boot.git"
+UB_TAG="v2023.04-ti-09.01.00.008-BeaglePlay"
+UB_REPO="https://openbeagle.org/beagleboard/u-boot.git"
UB_TIBOOT=tiboot3-am62x-gp-evm.bin
-MCORE=a53
override_dh_strip:
# Just disable for now...
@@ -59,12 +56,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_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_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 $(UB_CONFIG_BOARD)_r5.config
+ 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- am62x_evm_r5_defconfig beagleplay_r5.config
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)_$(MCORE)_defconfig $(UB_CONFIG_BOARD)_$(MCORE).config
+ make -C ./tmp/u-boot -j1 O=../CORTEXA CROSS_COMPILE=aarch64-linux-gnu- am62x_evm_a53_defconfig beagleplay_a53.config
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_unsigned ./tmp/pkg/tispl.bin
diff --git a/bb-u-boot-beagleplay-debian-11/version.sh b/bb-u-boot-beagleplay-debian-11/version.sh
index 29349126e..8221cadd6 100644
--- a/bb-u-boot-beagleplay-debian-11/version.sh
+++ b/bb-u-boot-beagleplay-debian-11/version.sh
@@ -5,7 +5,7 @@
package_name="bb-u-boot-beagleplay"
debian_pkg_name="${package_name}"
-package_version="2023.04.20231206.5-09.01.00.008"
+package_version="2023.04.20231206.6-09.01.00.008"
package_source=""
src_dir=""
@@ -20,4 +20,4 @@ debian_patch=""
clear_changelog="enable"
-bullseye_version="~bullseye+20231228"
+bullseye_version="~bullseye+20240308"
--
GitLab