From a4d5b20462602aa89a7e6a5587cb187f71e31d5e Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Wed, 1 Oct 2025 14:58:24 +0000 Subject: [PATCH] uboot: Add support for custom license files The U-Boot package was not providing any license file when a custom Linux version was selected. Fix this by adding a Kconfig option to specify the license file, with a default value set to the commonly used license paths. Signed-off-by: Kory Maincent [Arnout: use a single Kconfig option with conditional prompt] Signed-off-by: Arnout Vandecappelle --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 29f3f40b1b..47ce24ee76 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -92,6 +92,14 @@ config BR2_TARGET_UBOOT_VERSION default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \ if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG || BR2_TARGET_UBOOT_CUSTOM_SVN +config BR2_TARGET_UBOOT_LICENSE_FILES + string "U-boot license files" if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG || \ + BR2_TARGET_UBOOT_CUSTOM_SVN || BR2_TARGET_UBOOT_CUSTOM_TARBALL + default "Licenses/gpl-2.0.txt" + help + A space-separated list of license files related to U-Boot + package. + config BR2_TARGET_UBOOT_PATCH string "Custom U-Boot patches" default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" # legacy diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 936b8fd266..6ddbb9e438 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -8,9 +8,7 @@ UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) UBOOT_LICENSE = GPL-2.0+ -ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) -UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt -endif +UBOOT_LICENSE_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_LICENSE_FILES)) UBOOT_CPE_ID_VENDOR = denx UBOOT_CPE_ID_PRODUCT = u-boot