Skip to contentSkip to conversation

configs/beaglebone: update u-boot and linux

PATCH In review Waldemar Brodkorb 2 participants 2 messages Jul 26, 2024 – Jul 30, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/beaglebone: update u-boot and linux

Update u-boot to 2024.07. Update Linux to 6.6.32.
Add hash checking. Linux patches are no longer required so remove them.

Tested on Beaglebone Black.

---
 ...1-keep-jtag-clock-alive-for-debugger.patch |  16 -
 ...ce-Sun-Solaris-style-flag-on-section.patch | 432 ------------------
 ...EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch |  80 ----
 ...a-ahci-fix-enum-constants-for-gcc-13.patch | 357 ---------------
 .../beaglebone/patches/linux/linux.hash       |   2 +-
 .../beaglebone/patches/uboot/uboot.hash       |   2 +-
 configs/beaglebone_defconfig                  |  15 +-
 7 files changed, 12 insertions(+), 892 deletions(-)
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch
board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch deleted +0 -16
deleted file mode 100644
index 8e36d9abc5..0000000000
@@ -1,16 +0,0 @@
-This patch keeps the debugSS clock alive, it clocks the JTAG macro and enables
-access to the SoC via JTAG after the kernel booted.
-
-Signed-off-by: Lothar Felten <[email protected]>
----
-diff -Naur linux-orig/arch/arm/mach-omap2/omap_hwmod_33xx_data.c linux-52c4aa7cdb93d61f8008f380135beaf7b8fa6593/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
---- linux-orig/arch/arm/mach-omap2/omap_hwmod_33xx_data.c	2015-10-02 17:30:56.000000000 +0200
-+++ linux-52c4aa7cdb93d61f8008f380135beaf7b8fa6593/arch/arm/mach-omap2/omap_hwmod_33xx_data.c	2016-08-15 11:28:55.017617612 +0200
-@@ -208,6 +208,7 @@
- 	.name		= "debugss",
- 	.class		= &am33xx_debugss_hwmod_class,
- 	.clkdm_name	= "l3_aon_clkdm",
-+	.flags		= (HWMOD_INIT_NO_IDLE|HWMOD_INIT_NO_RESET), /* keep debugSS clock alive for JTAG */
- 	.main_clk	= "trace_clk_div_ck",
- 	.prcm		= {
- 		.omap4	= {
board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch deleted +0 -432

432 lines not on this page · raw message

board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch deleted +0 -80

80 lines not on this page · raw message

board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch deleted +0 -357

357 lines not on this page · raw message

board/beagleboard/beaglebone/patches/linux/linux.hash +1 -1
index 72d5bfff98..4a7384d036 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  394523e61eabf24bf920981ba967799ff90b6099a72dc1d1b92c918433439f61  linux-4.19.94-ti-r72.tar.gz
+sha256  f1ae7325c6c146e0f852866a3bfd3f90ae1b5f46e414bc99a38384ed677e3721  linux-6.6.32-ti-arm32-r7.tar.gz
board/beagleboard/beaglebone/patches/uboot/uboot.hash +1 -1
index 4b82872f31..fe9b4f53dc 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a  u-boot-2021.04.tar.bz2
+sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
configs/beaglebone_defconfig +10 -5
index b1a0c7cda4..8daf8d530a 100644
@@ -3,8 +3,12 @@ BR2_arm=y
 BR2_cortex_a8=y
 BR2_ARM_FPU_VFPV3=y
 
-# Linux headers same as kernel, a 6.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+# Hashes
+BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+
+# Linux headers same as kernel, a 6.6 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -17,21 +21,22 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboard/beaglebone/genimage.cfg"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.80-ti-r34)/linux-6.1.80-ti-r34.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.6.32-ti-arm32-r7)/linux-6.6.32-ti-arm32-r7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bb.org"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-bonegreen ti/omap/am335x-evmsk ti/omap/am335x-boneblue ti/omap/am335x-boneblack-wireless ti/omap/am335x-bonegreen-wireless"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="96M"
 
 # Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello Waldemar,

Quoted 6 lines · On Fri, 26 Jul 2024 13:55:47 +0200 Waldemar Brodkorb <[email protected]> wrote:

Update u-boot to 2024.07. Update Linux to 6.6.32.
Add hash checking. Linux patches are no longer required so remove them.

Tested on Beaglebone Black.

Quoted 13 lines
---
 ...1-keep-jtag-clock-alive-for-debugger.patch |  16 -
 ...ce-Sun-Solaris-style-flag-on-section.patch | 432 ------------------
 ...EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch |  80 ----
 ...a-ahci-fix-enum-constants-for-gcc-13.patch | 357 ---------------
 .../beaglebone/patches/linux/linux.hash       |   2 +-
 .../beaglebone/patches/uboot/uboot.hash       |   2 +-
 configs/beaglebone_defconfig                  |  15 +-
 7 files changed, 12 insertions(+), 892 deletions(-)
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch
 delete mode 100644 board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch

There is an earlier series from Dario that also updates this defconfig, to the same versions:

https://patchwork.ozlabs.org/project/buildroot/list/?series=416030

And you can't drop the kernel patches like this, because they are still used by the beaglebone_qt5 configuration.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot