diff mbox series

[v12,07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01

Message ID 20240407103512.1112712-8-romain.naour@smile.fr
State Accepted
Headers show
Series Add support for AM62x-SK HS-FS devices | expand

Commit Message

Romain Naour April 7, 2024, 10:35 a.m. UTC 
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>

The 2024.01 version of U-Boot for the am62x-sk board has introduced two
major changes:
- The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
  /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
  and the use of extlinux.conf for the proper loading of the device tree.
  Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
  auto-generate the extlinux.conf file so that developers can change the
  kernel loading options by modifying the .config.
- U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
  necessary to use custom tools like ti-k3-image-gen.
- Use a custom tiboot3.bin since the default is "hs-fs",
  but the ti_am62x_sk_defconfig expect the "gp" one

Tested on SK-AM62B-P1.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Changes in v12:
- Use a custom tiboot3.bin since the default is "hs-fs",
  but the ti_am62x_sk_defconfig expect the "gp" one.

Changes in v11:
- remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option
- add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option
- Use new BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS and
  BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS options to ease
  post build/image script.

Changes in v7:
- Add devicetree k3-am625-sk.dtb to extlinux.conf
- Improve error messages in post-build.sh script

Changes in v6:
- Enable BR2_TARGET_UBOOT_USE_BINMAN option

Changes in v5:
- Update commit message.

Changes in v4:
- bump to 204.01 instead of 2023.10
- Update the commit message
- Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs
  in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig.

Changes in v2:
- Update the commit message
- Drop Python options required by binman.
- Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically
  selects the Python modules required by binman.
---
 board/ti/am62x-sk/genimage.cfg                |  7 ++-
 .../ti-k3-r5-loader/ti-k3-r5-loader.hash      |  2 +-
 board/ti/am62x-sk/post-build.sh               | 54 +++++++++++++++++++
 configs/ti_am62x_sk_defconfig                 | 14 ++---
 4 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100755 board/ti/am62x-sk/post-build.sh

Comments

Arnout Vandecappelle April 8, 2024, 1 p.m. UTC | #1 
On 07/04/2024 12:35, Romain Naour wrote:
> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
> major changes:
> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
>    /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
>    and the use of extlinux.conf for the proper loading of the device tree.
>    Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
>    auto-generate the extlinux.conf file so that developers can change the
>    kernel loading options by modifying the .config.
> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
>    necessary to use custom tools like ti-k3-image-gen.
> - Use a custom tiboot3.bin since the default is "hs-fs",
>    but the ti_am62x_sk_defconfig expect the "gp" one
> 
> Tested on SK-AM62B-P1.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>

[snip]
> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
> +	label am62x-sk-buildroot
> +	  kernel /Image
> +	  fdtdir /
> +	  devicetree /${DEVICETREE}
> +	  append ${append}

  I wonder if it's really useful to have this custom extlinux.conf... We could 
also give the devicetree a common name, and move the append line into the device 
tree itself.

  But this patch has had enough iterations, let's just keep it as is :-)

[snip]
> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"

  The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we 
update the U-Boot version, it will no longer be. So to be future safe, we should 
add a local override of the uboot hash file as well (which is simply identical 
to uboot.hash).

  Regards,
  Arnout

>   BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
>   BR2_TARGET_UBOOT=y
>   BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>   BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
>   BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>   BR2_TARGET_UBOOT_NEEDS_DTC=y
>   BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>   BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>   BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
> +BR2_TARGET_UBOOT_USE_BINMAN=y
>   # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>   BR2_TARGET_UBOOT_FORMAT_IMG=y
>   BR2_TARGET_UBOOT_SPL=y
Romain Naour April 9, 2024, 11:36 a.m. UTC | #2 
Hello Arnout,

Le 08/04/2024 à 15:00, Arnout Vandecappelle a écrit :
> 
> 
> On 07/04/2024 12:35, Romain Naour wrote:
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
>> major changes:
>> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
>>    /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
>>    and the use of extlinux.conf for the proper loading of the device tree.
>>    Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
>>    auto-generate the extlinux.conf file so that developers can change the
>>    kernel loading options by modifying the .config.
>> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
>>    necessary to use custom tools like ti-k3-image-gen.
>> - Use a custom tiboot3.bin since the default is "hs-fs",
>>    but the ti_am62x_sk_defconfig expect the "gp" one
>>
>> Tested on SK-AM62B-P1.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> 
> [snip]
>> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
>> +    label am62x-sk-buildroot
>> +      kernel /Image
>> +      fdtdir /
>> +      devicetree /${DEVICETREE}
>> +      append ${append}
> 
>  I wonder if it's really useful to have this custom extlinux.conf... We could
> also give the devicetree a common name, and move the append line into the device
> tree itself.
> 

I believe it's to avoid using TI u-boot environment that expect a unusual
path /boot/dtb/ti for searching for devicetree.

See board/ti/j721e-sk/post-build.sh from:
http://lists.busybox.net/pipermail/buildroot/2024-February/685672.html

>  But this patch has had enough iterations, let's just keep it as is :-)

Indeed.

Best regards,
Romain


> 
> [snip]
>> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> 
>  The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
> update the U-Boot version, it will no longer be. So to be future safe, we should
> add a local override of the uboot hash file as well (which is simply identical
> to uboot.hash).
> 
>  Regards,
>  Arnout
> 
>>   BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
>> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
>> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
>>   BR2_TARGET_UBOOT=y
>>   BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>   BR2_TARGET_UBOOT_CUSTOM_VERSION=y
>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
>>   BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>>   BR2_TARGET_UBOOT_NEEDS_DTC=y
>>   BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>>   BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>>   BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
>> +BR2_TARGET_UBOOT_USE_BINMAN=y
>>   # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>>   BR2_TARGET_UBOOT_FORMAT_IMG=y
>>   BR2_TARGET_UBOOT_SPL=y
Romain Naour April 9, 2024, 12:05 p.m. UTC | #3 
Hello Arnout,

Le 08/04/2024 à 15:00, Arnout Vandecappelle a écrit :
> 
> 
> On 07/04/2024 12:35, Romain Naour wrote:
>> From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>>
>> The 2024.01 version of U-Boot for the am62x-sk board has introduced two
>> major changes:
>> - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in
>>    /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET
>>    and the use of extlinux.conf for the proper loading of the device tree.
>>    Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to
>>    auto-generate the extlinux.conf file so that developers can change the
>>    kernel loading options by modifying the .config.
>> - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer
>>    necessary to use custom tools like ti-k3-image-gen.
>> - Use a custom tiboot3.bin since the default is "hs-fs",
>>    but the ti_am62x_sk_defconfig expect the "gp" one
>>
>> Tested on SK-AM62B-P1.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> 
> [snip]
>> +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
>> +    label am62x-sk-buildroot
>> +      kernel /Image
>> +      fdtdir /
>> +      devicetree /${DEVICETREE}
>> +      append ${append}
> 
>  I wonder if it's really useful to have this custom extlinux.conf... We could
> also give the devicetree a common name, and move the append line into the device
> tree itself.
> 
>  But this patch has had enough iterations, let's just keep it as is :-)
> 
> [snip]
>> -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
> 
>  The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
> update the U-Boot version, it will no longer be. So to be future safe, we should
> add a local override of the uboot hash file as well (which is simply identical
> to uboot.hash).

I updated board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash in this
version, so we are future safe already :)

Best regards,
Romain


> 
>  Regards,
>  Arnout
> 
>>   BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
>> +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
>> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
>>   BR2_TARGET_UBOOT=y
>>   BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>   BR2_TARGET_UBOOT_CUSTOM_VERSION=y
>> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
>> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
>>   BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
>>   BR2_TARGET_UBOOT_NEEDS_DTC=y
>>   BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
>>   BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
>>   BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
>> +BR2_TARGET_UBOOT_USE_BINMAN=y
>>   # BR2_TARGET_UBOOT_FORMAT_BIN is not set
>>   BR2_TARGET_UBOOT_FORMAT_IMG=y
>>   BR2_TARGET_UBOOT_SPL=y
diff mbox series

Patch

diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg
index 26304fe98f..398209f4d8 100644
--- a/board/ti/am62x-sk/genimage.cfg
+++ b/board/ti/am62x-sk/genimage.cfg
@@ -4,10 +4,15 @@  image boot.vfat {
 			"tiboot3.bin",
 			"tispl.bin",
 			"u-boot.img",
+			"k3-am625-sk.dtb",
+			"Image"
+		}
+		file extlinux/extlinux.conf {
+			image = extlinux.conf
 		}
 	}
 
-	size = 16M
+	size = 64M
 }
 
 image sdcard.img {
diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
index 2a5c99c459..0e171c56f5 100644
--- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
+++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash
@@ -1,2 +1,2 @@ 
 # Locally computed:
-sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
+sha256  b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3  u-boot-2024.01.tar.bz2
diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh
new file mode 100755
index 0000000000..4f19f4d6cf
--- /dev/null
+++ b/board/ti/am62x-sk/post-build.sh
@@ -0,0 +1,54 @@ 
+#!/bin/sh -x
+
+# genimage will need to find the extlinux.conf
+# in the binaries directory
+
+die() {
+  cat <<EOF >&2
+Error: $@
+
+Usage: ${0} -c <console> -r <root> [-x <extra-args>]
+EOF
+  exit 1
+}
+
+o='c:d:r:x:'
+O='console:,devicetree:,root:,extra-args:'
+opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")"
+eval set -- "${opts}"
+while [ ${#} -gt 0 ]; do
+    case "${1}" in
+    (-c|--console)
+        CONSOLE="${2}"; shift 2
+        ;;
+    (-d|--devicetree)
+        DEVICETREE="${2}"; shift 2
+        ;;
+    (-r|--root)
+        ROOT="${2}"; shift 2
+        ;;
+    (-x|--extra-args)
+        EXTRA_ARGS="${2}"; shift 2
+        ;;
+    (--)
+        shift 1; break
+        ;;
+    esac
+done
+
+[ -n "${CONSOLE}" ] || die "Missing \`console' argument"
+[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument"
+[ -n "${ROOT}" ] || die "Missing \`root' argument"
+append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait"
+if [ -n "${EXTRA_ARGS}" ]; then
+    append="${append} ${EXTRA_ARGS}"
+fi
+
+mkdir -p "${BINARIES_DIR}"
+cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
+	label am62x-sk-buildroot
+	  kernel /Image
+	  fdtdir /
+	  devicetree /${DEVICETREE}
+	  append ${append}
+	__HEADER_EOF
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index b2814526bb..7a411ed423 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -1,15 +1,16 @@ 
 BR2_aarch64=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y
 BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
+BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y
 BR2_TARGET_ROOTFS_EXT2=y
@@ -23,21 +24,22 @@  BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y
 BR2_TARGET_OPTEE_OS=y
 BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x"
-BR2_TARGET_TI_K3_IMAGE_GEN=y
-BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y
 BR2_TARGET_TI_K3_R5_LOADER=y
 BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y
-BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5"
+BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin"
+BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
+BR2_TARGET_UBOOT_USE_BINMAN=y
 # BR2_TARGET_UBOOT_FORMAT_BIN is not set
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y