diff mbox series

configs/uevm5432_defconfig: bump Linux and U-Boot

Message ID 20240524155617.3231-1-vincent.stehle@laposte.net
State New
Headers show
Series configs/uevm5432_defconfig: bump Linux and U-Boot | expand

Commit Message

Vincent Stehlé May 24, 2024, 3:56 p.m. UTC 
- Bump Linux kernel to v6.8.10.
  The Devicetree has moved; update our config accordingly.

- Bump U-Boot to 2023.04.
  This is the most recent version we can use as U-Boot 2023.07 dropped
  support for the uevm.
  OpenSSL is now required for the build.
  The default boot method has changed; switch to booting with an extlinux
  configuration to overcome this.

Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
---
 board/uevm5432/extlinux.conf |  4 ++++
 board/uevm5432/genimage.cfg  |  6 ++++--
 board/uevm5432/post-build.sh |  6 ++++++
 configs/uevm5432_defconfig   | 13 +++++++------
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 board/uevm5432/extlinux.conf
 create mode 100755 board/uevm5432/post-build.sh
diff mbox series

Patch

diff --git a/board/uevm5432/extlinux.conf b/board/uevm5432/extlinux.conf
new file mode 100644
index 0000000000..50f3cd30fb
--- /dev/null
+++ b/board/uevm5432/extlinux.conf
@@ -0,0 +1,4 @@ 
+label uevm5432-buildroot
+  kernel /zImage
+  fdt /omap5-uevm.dtb
+  append root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait console=ttyO2,115200
diff --git a/board/uevm5432/genimage.cfg b/board/uevm5432/genimage.cfg
index dfe388227e..7bb90e198b 100644
--- a/board/uevm5432/genimage.cfg
+++ b/board/uevm5432/genimage.cfg
@@ -2,7 +2,10 @@  image boot.vfat {
 	vfat {
 		files = {
 			"MLO",
-			"u-boot.img"
+			"u-boot.img",
+			"zImage",
+			"omap5-uevm.dtb",
+			"extlinux"
 		}
 	}
 
@@ -22,6 +25,5 @@  image sdcard.img {
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 512M
 	}
 }
diff --git a/board/uevm5432/post-build.sh b/board/uevm5432/post-build.sh
new file mode 100755
index 0000000000..f90f76d8b5
--- /dev/null
+++ b/board/uevm5432/post-build.sh
@@ -0,0 +1,6 @@ 
+#!/bin/sh
+set -e
+
+BOARD_DIR="$(dirname "$0")"
+
+install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf
diff --git a/configs/uevm5432_defconfig b/configs/uevm5432_defconfig
index 7b9a4309c6..03dc789fa8 100644
--- a/configs/uevm5432_defconfig
+++ b/configs/uevm5432_defconfig
@@ -3,8 +3,8 @@  BR2_arm=y
 BR2_cortex_a15=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Linux headers same as kernel, a 5.12 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+# Linux headers same as kernel, a 6.8 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -12,17 +12,17 @@  BR2_TARGET_GENERIC_GETTY_PORT="ttyS2"
 BR2_SYSTEM_DHCP="eth0"
 
 # Image
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/uevm5432/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/uevm5432/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.10"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="omap5-uevm"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/omap5-uevm"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
 # Filesystem
@@ -34,8 +34,9 @@  BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap5_uevm"
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"