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/ti-k3-r5-loader.mk 
> b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> index afa309aa98..341888623e 100644
> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk
> @@ -2,11 +2,41 @@
>  #
>  # ti-k3-r5-loader
>  #

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

     boot/ti-k3-r5-loader/ti-k3-r5-loader.mk:5: should be 80 hashes 
(http://nightly.buildroot.org/#writing-rules-mk)
     boot/ti-k3-r5-loader/ti-k3-r5-loader.mk:6: should be a blank line 
(http://nightly.buildroot.org/#writing-rules-mk)

To fix this warning, you should keep the first 6 original lines 
unchanged
and move this comment just after.

> +# The ti-k3-r5 loader package should really be built from the same 
> U-Boot
> +# sources as the uboot package itself, so for most users so all 
> LOADER_SITE /
> +# LOADER_SOURCE type definitions should be set the same for both 
> packages.
> +# However it still makes sense to keep the ti-k3-r5-loader package 
> somewhat
> +# separated and independent from the uboot package to allow for 
> special use
> +# cases such as Falcon boot (which would skip the uboot package 
> completely).
> +#
>  
> ################################################################################
> 
> -TI_K3_R5_LOADER_VERSION = 2022.10
> +TI_K3_R5_LOADER_VERSION = $(call 
> qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_VERSION))
> +
> +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL),y)
> +# Handle custom U-Boot tarballs as specified by the configuration
> +TI_K3_R5_LOADER_TARBALL = $(call 
> qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL_LOCATION))
> +TI_K3_R5_LOADER_SITE = $(patsubst %/,%,$(dir 
> $(TI_K3_R5_LOADER_TARBALL)))
> +TI_K3_R5_LOADER_SOURCE = $(notdir $(TI_K3_R5_LOADER_TARBALL))
> +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_GIT),y)
> +TI_K3_R5_LOADER_SITE = $(call 
> qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL))
> +TI_K3_R5_LOADER_SITE_METHOD = git
> +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_HG),y)
> +TI_K3_R5_LOADER_SITE = $(call 
> qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL))
> +TI_K3_R5_LOADER_SITE_METHOD = hg
> +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_SVN),y)
> +TI_K3_R5_LOADER_SITE = $(call 
> qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_REPO_URL))
> +TI_K3_R5_LOADER_SITE_METHOD = svn
> +else
> +# Handle stable official U-Boot versions
>  TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot
>  TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2
> +endif
> +
> +ifeq 
> ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION),y)
> +BR_NO_CHECK_HASH_FOR += $(TI_K3_R5_LOADER_SOURCE)
> +endif
> +
>  TI_K3_R5_LOADER_LICENSE = GPL-2.0+
>  TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt
>  TI_K3_R5_LOADER_CPE_ID_VENDOR = denx

Best regards,

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