[1/4] u-boot-beagleplay: Update to v2025.10

Message ID 7b7564270ed5464f1f17a4a24861fdcf2355b6cb.1763968559.git.jan.kiszka@siemens.com
State Accepted, archived
Headers show
Series Updates for BeaglePlay board, hybrid-boot plugin deprecation | expand

Commit Message

Jan Kiszka Nov. 24, 2025, 7:15 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to drop the patch we were carrying.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...2x-Add-basic-initialization-for-usb-.patch | 80 -------------------
 .../recipes-bsp/u-boot/files/rules-beagleplay |  4 +-
 ...024.01.bb => u-boot-beagleplay_2025.10.bb} | 16 ++--
 3 files changed, 10 insertions(+), 90 deletions(-)
 delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-TMP-board-ti-am62x-Add-basic-initialization-for-usb-.patch
 rename meta-isar/recipes-bsp/u-boot/{u-boot-beagleplay_2024.01.bb => u-boot-beagleplay_2025.10.bb} (71%)

Patch

diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-TMP-board-ti-am62x-Add-basic-initialization-for-usb-.patch b/meta-isar/recipes-bsp/u-boot/files/0001-TMP-board-ti-am62x-Add-basic-initialization-for-usb-.patch
deleted file mode 100644
index d4e3137e..00000000
--- a/meta-isar/recipes-bsp/u-boot/files/0001-TMP-board-ti-am62x-Add-basic-initialization-for-usb-.patch
+++ /dev/null
@@ -1,80 +0,0 @@ 
-From 3502d8a4dd51b3bfe9b2fb123f0e8d6f7c0735ec Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Tue, 25 Jul 2023 13:52:50 -0500
-Subject: [PATCH] TMP: board: ti: am62x: Add basic initialization for usb
- voltage, 32k crystal, debounce
-
-Do the basic configuration required for setting up the USB core voltage
-configuration, setup to configure the 32k clock coming from 32k crystal
-and the debounce configurations for the various pins.
-
-See https://lore.kernel.org/u-boot/20230725185253.2123433-4-nm@ti.com/
-Changes since then: writel(val, reg) - fixed for debounce values
-
-Signed-off-by: Nishanth Menon <nm@ti.com>
----
- board/ti/am62x/evm.c | 46 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c
-index ad939088402..a1575c2b220 100644
---- a/board/ti/am62x/evm.c
-+++ b/board/ti/am62x/evm.c
-@@ -78,8 +78,54 @@ static int video_setup(void)
- 	return 0;
- }
- 
-+#define CTRLMMR_USB0_PHY_CTRL	0x43004008
-+#define CTRLMMR_USB1_PHY_CTRL	0x43004018
-+#define CORE_VOLTAGE		0x80000000
-+
-+#define WKUP_CTRLMMR_DBOUNCE_CFG1 0x04504084
-+#define WKUP_CTRLMMR_DBOUNCE_CFG2 0x04504088
-+#define WKUP_CTRLMMR_DBOUNCE_CFG3 0x0450408c
-+#define WKUP_CTRLMMR_DBOUNCE_CFG4 0x04504090
-+#define WKUP_CTRLMMR_DBOUNCE_CFG5 0x04504094
-+#define WKUP_CTRLMMR_DBOUNCE_CFG6 0x04504098
-+
- void spl_board_init(void)
- {
-+	u32 val;
-+
-+	/* Set USB0 PHY core voltage to 0.85V */
-+	val = readl(CTRLMMR_USB0_PHY_CTRL);
-+	val &= ~(CORE_VOLTAGE);
-+	writel(val, CTRLMMR_USB0_PHY_CTRL);
-+
-+	/* Set USB1 PHY core voltage to 0.85V */
-+	val = readl(CTRLMMR_USB1_PHY_CTRL);
-+	val &= ~(CORE_VOLTAGE);
-+	writel(val, CTRLMMR_USB1_PHY_CTRL);
-+
-+	/* We have 32k crystal, so lets enable it */
-+	val = readl(MCU_CTRL_LFXOSC_CTRL);
-+	val &= ~(MCU_CTRL_LFXOSC_32K_DISABLE_VAL);
-+	writel(val, MCU_CTRL_LFXOSC_CTRL);
-+	/* Add any TRIM needed for the crystal here.. */
-+	/* Make sure to mux up to take the SoC 32k from the crystal */
-+	writel(MCU_CTRL_DEVICE_CLKOUT_LFOSC_SELECT_VAL,
-+	       MCU_CTRL_DEVICE_CLKOUT_32K_CTRL);
-+
-+	/* Setup debounce conf registers - arbitrary values. Times are approx */
-+	/* 1.9ms debounce @ 32k */
-+	writel(0x1, WKUP_CTRLMMR_DBOUNCE_CFG1);
-+	/* 5ms debounce @ 32k */
-+	writel(0x5, WKUP_CTRLMMR_DBOUNCE_CFG2);
-+	/* 20ms debounce @ 32k */
-+	writel(0x14, WKUP_CTRLMMR_DBOUNCE_CFG3);
-+	/* 46ms debounce @ 32k */
-+	writel(0x18, WKUP_CTRLMMR_DBOUNCE_CFG4);
-+	/* 100ms debounce @ 32k */
-+	writel(0x1c, WKUP_CTRLMMR_DBOUNCE_CFG5);
-+	/* 156ms debounce @ 32k */
-+	writel(0x1f, WKUP_CTRLMMR_DBOUNCE_CFG6);
-+
- 	video_setup();
- 	enable_caches();
- 	if (IS_ENABLED(CONFIG_SPL_SPLASH_SCREEN) && IS_ENABLED(CONFIG_SPL_BMP))
--- 
-2.35.3
-
diff --git a/meta-isar/recipes-bsp/u-boot/files/rules-beagleplay b/meta-isar/recipes-bsp/u-boot/files/rules-beagleplay
index bc6c8f2b..fbd423a7 100755
--- a/meta-isar/recipes-bsp/u-boot/files/rules-beagleplay
+++ b/meta-isar/recipes-bsp/u-boot/files/rules-beagleplay
@@ -13,10 +13,10 @@  SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y
 endif
 
 override_dh_auto_build:
-	$(MAKE) $(PARALLEL_MAKE) ARCH=arm am62x_evm_r5_defconfig beagleplay_r5.config
+	$(MAKE) $(PARALLEL_MAKE) ARCH=arm am62x_beagleplay_r5_defconfig
 	$(MAKE) $(PARALLEL_MAKE) ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf-
 
-	$(MAKE) $(PARALLEL_MAKE) am62x_evm_a53_defconfig beagleplay_a53.config
+	$(MAKE) $(PARALLEL_MAKE) am62x_beagleplay_a53_defconfig
 	$(MAKE) $(PARALLEL_MAKE) BL31=/usr/lib/trusted-firmware-a/beagleplay/bl31.bin \
 		TEE=/usr/lib/optee-os/beagleplay/tee-raw.bin
 	$(MAKE) $(PARALLEL_MAKE) u-boot-initial-env
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2024.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2025.10.bb
similarity index 71%
rename from meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2024.01.bb
rename to meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2025.10.bb
index f9b6b6c3..b3ec4503 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2024.01.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-beagleplay_2025.10.bb
@@ -7,19 +7,18 @@ 
 
 require recipes-bsp/u-boot/u-boot-custom.inc
 
-TI_FIRMWARE_SRCREV = "9ee2fedb1fb4815f54310dd872d34faf9948c7c1"
+TI_FIRMWARE_SRCREV = "0a37dc07b1120127eba73c7196a0b532350b9639"
 
 SRC_URI += " \
     https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
     https://github.com/TexasInstruments/ti-linux-firmware/raw/${TI_FIRMWARE_SRCREV}/ti-sysfw/ti-fs-firmware-am62x-gp.bin;downloadfilename=ti-fs-firmware-am62x-gp.bin;name=sysfw \
     https://github.com/TexasInstruments/ti-linux-firmware/raw/${TI_FIRMWARE_SRCREV}/ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin;downloadfilename=ti-fs-stub-firmware-am62x-gp.bin;name=sysfw-stub \
     https://github.com/TexasInstruments/ti-linux-firmware/raw/${TI_FIRMWARE_SRCREV}/ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f;downloadfilename=ipc_echo_testb_mcu1_0_release_strip.xer5f;name=dm \
-    file://0001-TMP-board-ti-am62x-Add-basic-initialization-for-usb-.patch \
     file://rules-beagleplay"
-SRC_URI[sha256sum] = "b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3"
-SRC_URI[sysfw.sha256sum] = "be7008fdf60ea7ac72d36f57a29c6a1cc6b1aa01a595eae7b3e0e927aae78e2b"
-SRC_URI[sysfw-stub.sha256sum] = "1d5b23b8395037539c3b97eda2f3cc887ac2d6d0c834c9238fb727efc3c8a253"
-SRC_URI[dm.sha256sum] = "6d8a1d8a8ea430efcc6effe025865df1e5eeebf572273d97e9529781e1d04663"
+SRC_URI[sha256sum] = "b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a"
+SRC_URI[sysfw.sha256sum] = "368457718e7dc2c429db7177b31949b5d120ec97563746867fbc4883c94ee1c3"
+SRC_URI[sysfw-stub.sha256sum] = "451f273b81c35b42d64e3ddfa73271dbff9da1d93f0713ec6e69bed5e836c28d"
+SRC_URI[dm.sha256sum] = "0748804446dc79a8f9564f2d734d1f4346639a55e667707714c11e62766bcfce"
 
 S = "${WORKDIR}/u-boot-${PV}"
 
@@ -29,9 +28,10 @@  U_BOOT_BIN_INSTALL = "tiboot3-am62x-gp-evm.bin tispl.bin_unsigned u-boot.img_uns
 
 DEPENDS += "trusted-firmware-a-beagleplay optee-os-beagleplay"
 DEBIAN_BUILD_DEPENDS =. "gcc-arm-linux-gnueabihf, \
-    libssl-dev:native, libssl-dev, \
+    libgnutls28-dev:native, libgnutls28-dev:${DISTRO_ARCH}, \
+    libssl-dev:native, libssl-dev:${DISTRO_ARCH}, \
     swig, python3-dev:native, python3-setuptools, python3-pyelftools, \
-    python3-jsonschema:native, python3-yaml:native, \
+    python3-jsonschema:native, python3-yaml:native, yamllint:native, \
     trusted-firmware-a-beagleplay, optee-os-beagleplay,"
 
 do_prepare_build:append() {