From 4cb762efa4f35fa62a63475154c9431fd0da8e97 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 7 Jun 2024 11:37:12 +0200 Subject: [PATCH] boot/ti-k3-r5-loader: share download files with uboot ti-k3-r5-loader is just a U-Boot SPL running on the R5 core on TI's K3 processors, so it makes sense to just share the downloads with U-Boot. With commit ebe238f2b595 (package/pkg-download: use _DL_SUBDIR as root dir of generated archives), the root of the generated archive will also be based on _DL_SUBDIR, but the name of the archive, _SOURCE, is still based on the current package unless explicitly set. For ti-k3-r5-loader, that would create an archive which fiename does not match its root directory; although Buildroot does not care (we --strip-components=1 when extracting), this would be a bit surprising to anyone manually extrating the archive, as it diverges from the usual expectations. Do like we do for linux-headers, and force the ti-k3-r4-loader archive filename to be u-boot-VERSION.tar.gz Signed-off-by: Yann E. MORIN Cc: Anand Gadiyar Cc: Bryan Brattlof Cc: Xuanhao Shi Cc: Paresh Bhagat Reviewed-by: Bryan Brattlof Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) 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 98a6d473f1..e426f039e0 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -5,6 +5,7 @@ ################################################################################ TI_K3_R5_LOADER_VERSION = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_VERSION)) +TI_K3_R5_LOADER_DL_SUBDIR = uboot ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL),y) # Handle custom U-Boot tarballs as specified by the configuration @@ -14,12 +15,15 @@ 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 +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz 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 +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz 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 +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.gz else # Handle stable official U-Boot versions TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot