Re: [Buildroot] [PATCH v9 01/11] boot/ti-k3-r5-loader: allow for full build source customization

[Julien Olivain <ju.o@free.fr>]

Hi Andreas,

On 22/06/2023 18:02, Andreas Dannenberg via buildroot wrote:
> The TI K3 R5 loader package essentially is a wrapper to build a special
> version of U-boot SPL used as part of a multi-stage boot flow on TI K3
> devices, and as such needs full flexibility as to specifying the U-Boot
> sources used for the build. To accomodate this, add the same options as
> already available in the regular U-Boot package. For most use cases, 
> the
> same source settings (repo URL, versions, etc.) should be used for both
> ti-k3-r5-loader and uboot packages.
> 
> Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
> ---
>  boot/ti-k3-r5-loader/Config.in          | 65 +++++++++++++++++++++++--
>  boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 32 +++++++++++-
>  2 files changed, 93 insertions(+), 4 deletions(-)
> 
> diff --git a/boot/ti-k3-r5-loader/Config.in 
> b/boot/ti-k3-r5-loader/Config.in
> index 10602c8df3..2419babe70 100644
> --- a/boot/ti-k3-r5-loader/Config.in
> +++ b/boot/ti-k3-r5-loader/Config.in
> @@ -1,14 +1,73 @@
>  config BR2_TARGET_TI_K3_R5_LOADER
> -	bool "ti-k3-r5-loader"
> +	bool "TI K3 R5 Loader"
>  	depends on BR2_aarch64
>  	help
> -	  Separate U-Boot build for R5 cores on TI's k3 boards.
> +	  Separate U-Boot SPL build for R5 core on TI's K3 processors.
>  	  Usually used to build tiboot3.bin with k3-image-gen.
> 
>  if BR2_TARGET_TI_K3_R5_LOADER
> 
>  choice
> -	prompt "Configuration"
> +	prompt "U-Boot Version"
> +	help
> +	  Select the specific U-Boot version you want to use to build the
> +	  initial SPL running on the R5 core. Note that for most use cases
> +	  you'd want to use the exact same configuration here as it is used
> +	  to build the main U-Boot package.

The command "utils/docker-run make check-package" reports warnings here:

     boot/ti-k3-r5-loader/Config.in:13: help text: <tab><2 spaces><62 
chars> (http://nightly.buildroot.org/#writing-rules-config-in)
     boot/ti-k3-r5-loader/Config.in:14: help text: <tab><2 spaces><62 
chars> (http://nightly.buildroot.org/#writing-rules-config-in)
     boot/ti-k3-r5-loader/Config.in:15: help text: <tab><2 spaces><62 
chars> (http://nightly.buildroot.org/#writing-rules-config-in)

To fix this issue, the help text should be reflowed as follow:

choice
	prompt "U-Boot Version"
	help
	  Select the specific U-Boot version you want to use to build
	  the initial SPL running on the R5 core. Note that for most
	  use cases you'd want to use the exact same configuration
	  here as it is used to build the main U-Boot package.

> +
> +config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION
> +	bool "2022.10"
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION
> +	bool "Custom version"
> +	help
> +	  This option allows to use a specific official versions
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL
> +	bool "Custom tarball"
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT
> +	bool "Custom Git repository"
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG
> +	bool "Custom Mercurial repository"
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN
> +	bool "Custom Subversion repository"
> +
> +endchoice
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE
> +	string "U-Boot version"
> +	depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION
> +	string "URL of custom U-Boot tarball"
> +	depends on BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL
> +
> +if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || 
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || 
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL
> +	string "URL of custom repository"
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION
> +	string "Custom repository version"
> +	help
> +	  Revision to use in the typical format used by
> +	  Git/Mercurial/Subversion E.G. a sha id, a tag, branch, ..
> +
> +endif
> +
> +config BR2_TARGET_TI_K3_R5_LOADER_VERSION
> +	string
> +	default "2022.10"	if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION
> +	default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \
> +		if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION
> +	default "custom"	if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL
> +	default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_VERSION \
> +		if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT || 
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG || 
> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN
> +choice
> +	prompt "U-Boot Configuration"
>  	default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG
> 
>  config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG

[...]

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot