diff mbox series

[1/1] malloc: add SPDX license identifiers

Message ID 20210529111800.30298-1-xypron.glpk@gmx.de
State Accepted
Commit 5ad9220bf7b54d958627dd8a0475a44c5a238f0a
Delegated to: Tom Rini
Headers show
Series [1/1] malloc: add SPDX license identifiers | expand

Commit Message

Heinrich Schuchardt May 29, 2021, 11:18 a.m. UTC 
The original code is in the public domain. Licenses/README states that the
general license for U-Boot is GPL 2.0+. So we can mark the malloc code as
GPL 2.0+ too.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 common/dlmalloc.c | 10 ++++++++++
 include/malloc.h  |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

--
2.30.2

Comments

Tom Rini June 24, 2021, 1:15 p.m. UTC | #1 
On Sat, May 29, 2021 at 01:18:00PM +0200, Heinrich Schuchardt wrote:

> The original code is in the public domain. Licenses/README states that the
> general license for U-Boot is GPL 2.0+. So we can mark the malloc code as
> GPL 2.0+ too.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index cf0270a9c1..11729e8c85 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1,3 +1,13 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * This code is based on a version (aka dlmalloc) of malloc/free/realloc written
+ * by Doug Lea and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/-
+ *
+ * The original code is available at http://gee.cs.oswego.edu/pub/misc/
+ * as file malloc-2.6.6.c.
+ */
+
 #include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
diff --git a/include/malloc.h b/include/malloc.h
index 024b18be00..1fbaf3755c 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -1,12 +1,13 @@ 
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
-  A version of malloc/free/realloc written by Doug Lea and released to the
-  public domain.  Send questions/comments/complaints/performance data
-  to dl@cs.oswego.edu
+  This code is based on a version of malloc/free/realloc written by Doug Lea and
+  released to the public domain. Send questions/comments/complaints/performance
+  data to dl@cs.oswego.edu

 * VERSION 2.6.6  Sun Mar  5 19:10:03 2000  Doug Lea  (dl at gee)

    Note: There may be an updated version of this malloc obtainable at
-	   ftp://g.oswego.edu/pub/misc/malloc.c
+	   http://g.oswego.edu/pub/misc/malloc.c
 	 Check before installing!

 * Why use this malloc?