From 5fae877bc1b7fd12cdf84486f20e22d3c2f0d363 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Wed, 1 Oct 2025 14:58:26 +0000 Subject: [PATCH] opensbi: Add support for custom license files The OpenSBI 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 (cherry picked from commit 399cc39621673c6b81c15c8d768ed1081648364f) Signed-off-by: Thomas Perale --- boot/opensbi/Config.in | 8 ++++++++ boot/opensbi/opensbi.mk | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index 98d6103ed6..d6b09795cb 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -64,6 +64,14 @@ config BR2_TARGET_OPENSBI_VERSION default BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPENSBI_CUSTOM_GIT +config BR2_TARGET_OPENSBI_LICENSE_FILES + string "OpenSBI license files" if BR2_TARGET_OPENSBI_CUSTOM_GIT || \ + BR2_TARGET_OPENSBI_CUSTOM_TARBALL + default "COPYING.BSD" + help + A space-separated list of license files related to the OpenSBI + package. + config BR2_TARGET_OPENSBI_PLAT string "OpenSBI Platform" default "" diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 0142769a12..f9f550176f 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -20,9 +20,7 @@ OPENSBI_SITE = $(call github,riscv-software-src,opensbi,v$(OPENSBI_VERSION)) endif OPENSBI_LICENSE = BSD-2-Clause -ifeq ($(BR2_TARGET_OPENSBI_LATEST_VERSION),y) -OPENSBI_LICENSE_FILES = COPYING.BSD -endif +OPENSBI_LICENSE_FILES = $(call qstrip,$(BR2_TARGET_OPENSBI_LICENSE_FILES)) OPENSBI_INSTALL_TARGET = NO OPENSBI_INSTALL_STAGING = YES