Currently, the conditions of both licenses (GPL 2.0 and BSD-3-Clause) must
be met. However, the original commit message states that the BSD-3-Clause
was added to allow use of the files under a less restrictive license than
GPL 2.0. Therefore, the required OR between the licenses has been added.
While at it update the SPDX-License-Identifier to SPDX version 3.
Fixes: 6c9e3d1f ("bloblist: Relicense to allow BSD-3-Clause")
Signed-off-by: Max Merchel <max.merc...@ew.tq-group.com>
---
common/bloblist.c | 2 +-
include/bloblist.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/bloblist.c b/common/bloblist.c
index 6e4f020d7c4..5d9cf0725d9 100644
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
+// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
/*
* Copyright 2018 Google, Inc
* Written by Simon Glass <s...@chromium.org>
diff --git a/include/bloblist.h b/include/bloblist.h
index f32faf78560..695111014f1 100644
--- a/include/bloblist.h
+++ b/include/bloblist.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */
+/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */
/*
* This provides a standard way of passing information between boot phases
* (TPL -> SPL -> U-Boot proper.)
--
2.43.0
