From 588ccf38618e1d9401f6636c7565424d438a51b2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 5 Feb 2023 22:41:32 +0100 Subject: [PATCH] configs/beaglebone: bump U-Boot version to 2022.10 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 Signed-off-by: Thomas Petazzoni --- 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 diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 0000000000..13affcabd4 --- /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 diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 987d205075..4b026fda84 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 ffdd19138c..b7afd92ffe 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 3ce5721265..d0aa5ad860 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