[Buildroot] [PATCH v2 6/7] arm-trusted-firmware: Add support for custom license files

[Kory Maincent]

The ATF 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 <kory.maincent at bootlin.com>
---

Change in v2:
- Do not show license option if it is not a custom repo
---
 boot/arm-trusted-firmware/Config.in               | 16 ++++++++++++++++
 boot/arm-trusted-firmware/arm-trusted-firmware.mk |  9 +++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index 72684e5974c1c0c9f8f3453254c5699a0a5d7106..1bc6cac831247a1fdcc4b2cb7f9846eaa472a62b 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -80,6 +80,22 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION
 
 endif
 
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_LICENSE_FILES
+	string "ATF license files"
+	default "docs/license.rst"
+	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT || \
+		   BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
+	help
+	  A space-separated list of license files related to the ATF
+	  package.
+
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LICENSE_FILES
+	string
+	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_LICENSE_FILES \
+		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT || \
+		   BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
+	default "docs/license.rst"
+
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
 	string "ATF platform"
 	help
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index dca16d396044c5004480fdfb4cf15df6837b4413..303fd2cb09bc1bf59b8ccd2e0865f43099318154 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -18,14 +18,11 @@ else
 # Handle stable official ATF versions
 ARM_TRUSTED_FIRMWARE_SITE = https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
 ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
-# The licensing of custom or from-git versions is unknown.
-# This is valid only for the latest (i.e. known) version.
-ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_10_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION),y)
-ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
-ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst
-endif
 endif
 
+ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
+ARM_TRUSTED_FIRMWARE_LICENSE_FILES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LICENSE_FILES))
+
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y)
 BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
 endif

-- 
2.43.0