diff mbox series

[2/2] configs/beaglebone: bump U-Boot version to 2022.10

Message ID 20230205214132.6941-2-dario.binacchi@amarulasolutions.com
State Accepted
Headers show
Series [1/2] configs/beaglebone: bump Linux version to 5.10.145-ti-r54 | expand

Commit Message

Dario Binacchi Feb. 5, 2023, 9:41 p.m. UTC
Starting from version 2021.10 only distro booting is supported, as
reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only").
The patch allows to update U-Boot to versions later than 2021.10.

Tested on beaglebone black.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 board/beaglebone/extlinux.conf | 4 ++++
 board/beaglebone/genimage.cfg  | 1 +
 board/beaglebone/post-build.sh | 2 ++
 configs/beaglebone_defconfig   | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 board/beaglebone/extlinux.conf

Comments

Thomas Petazzoni Feb. 7, 2023, 9:03 a.m. UTC | #1
On Sun,  5 Feb 2023 22:41:32 +0100
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Starting from version 2021.10 only distro booting is supported, as
> reported by commit ff8f277e9121 ("ti: am335x_evm: Switch to DISTRO_BOOT only").
> The patch allows to update U-Boot to versions later than 2021.10.
> 
> Tested on beaglebone black.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  board/beaglebone/extlinux.conf | 4 ++++
>  board/beaglebone/genimage.cfg  | 1 +
>  board/beaglebone/post-build.sh | 2 ++
>  configs/beaglebone_defconfig   | 2 +-
>  4 files changed, 8 insertions(+), 1 deletion(-)
>  create mode 100644 board/beaglebone/extlinux.conf

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf
new file mode 100644
index 000000000000..4a08c9dedad9
--- /dev/null
+++ b/board/beaglebone/extlinux.conf
@@ -0,0 +1,4 @@ 
+label beaglebone-buildroot
+  kernel /zImage
+  fdtdir /
+  append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
\ No newline at end of file
diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg
index 987d20507551..4b026fda8431 100644
--- a/board/beaglebone/genimage.cfg
+++ b/board/beaglebone/genimage.cfg
@@ -12,6 +12,7 @@  image boot.vfat {
 			"am335x-bonegreen.dtb",
 			"am335x-boneblack-wireless.dtb",
 			"am335x-bonegreen-wireless.dtb",
+			"extlinux"
 		}
 	}
 
diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh
index ffdd19138c7f..b7afd92ffeae 100755
--- a/board/beaglebone/post-build.sh
+++ b/board/beaglebone/post-build.sh
@@ -2,3 +2,5 @@ 
 BOARD_DIR="$(dirname $0)"
 
 cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt
+
+install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index dff7dea422ee..0207916d0166 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -34,7 +34,7 @@  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="2022.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set