summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-12-11 15:47:42 -0800
committerJulius Werner <jwerner@chromium.org>2020-01-28 06:36:13 +0000
commit98eeb961353d187a26085a07889bd0414cdaa910 (patch)
treeb97e2edbdb5033a93095044be96c809271bd0be8 /src/lib
parente4d6c033fe91cf777a95531669622f7829e6b44d (diff)
commonlib: Add commonlib/bsd
This patch creates a new commonlib/bsd subdirectory with a similar purpose to the existing commonlib, with the difference that all files under this subdirectory shall be licensed under the BSD-3-Clause license (or compatible permissive license). The goal is to allow more code to be shared with libpayload in the future. Initially, I'm going to move a few files there that have already been BSD-licensed in the existing commonlib. I am also exracting most contents of the often-needed <commonlib/helpers.h> as long as they have either been written by me (and are hereby relicensed) or have an existing equivalent in BSD-licensed libpayload code. I am also relicensing <commonlib/compression.h> (written by me) and <commonlib/compiler.h> (same stuff exists in libpayload). Finally, I am extracting the cb_err error code definitions from <types.h> into a new BSD-licensed header so that future commonlib/bsd code can build upon a common set of error values. I am making the assumption here that the enum constants and the half-sentence fragments of documentation next to them by themselves do not meet the threshold of copyrightability. Change-Id: I316cea70930f131e8e93d4218542ddb5ae4b63a2 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38420 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/cbfs.c2
-rw-r--r--src/lib/decompressor.c2
-rw-r--r--src/lib/fit.c2
-rw-r--r--src/lib/fit_payload.c4
-rw-r--r--src/lib/fmap.c1
-rw-r--r--src/lib/selfboot.c2
6 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index e31c7cc925..c712f76be8 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <boot_device.h>
#include <cbfs.h>
-#include <commonlib/compression.h>
+#include <commonlib/bsd/compression.h>
#include <endian.h>
#include <lib.h>
#include <symbols.h>
diff --git a/src/lib/decompressor.c b/src/lib/decompressor.c
index eb7f16cd88..947105920a 100644
--- a/src/lib/decompressor.c
+++ b/src/lib/decompressor.c
@@ -15,7 +15,7 @@
*/
#include <bootblock_common.h>
-#include <commonlib/compression.h>
+#include <commonlib/bsd/compression.h>
#include <delay.h>
#include <program_loading.h>
#include <symbols.h>
diff --git a/src/lib/fit.c b/src/lib/fit.c
index 831e5180f0..edac1927e7 100644
--- a/src/lib/fit.c
+++ b/src/lib/fit.c
@@ -16,6 +16,7 @@
*/
#include <assert.h>
+#include <cbfs.h>
#include <console/console.h>
#include <ctype.h>
#include <endian.h>
@@ -27,7 +28,6 @@
#include <memrange.h>
#include <fit.h>
#include <boardid.h>
-#include <commonlib/cbfs_serialized.h>
#include <commonlib/stdlib.h>
static struct list_node image_nodes;
diff --git a/src/lib/fit_payload.c b/src/lib/fit_payload.c
index 1b6c9860f0..83e9b8e901 100644
--- a/src/lib/fit_payload.c
+++ b/src/lib/fit_payload.c
@@ -15,6 +15,8 @@
* GNU General Public License for more details.
*/
+#include <cbfs.h>
+#include <commonlib/bsd/compression.h>
#include <console/console.h>
#include <bootmem.h>
#include <cbmem.h>
@@ -25,8 +27,6 @@
#include <program_loading.h>
#include <timestamp.h>
#include <string.h>
-#include <commonlib/cbfs_serialized.h>
-#include <commonlib/compression.h>
#include <lib.h>
#include <fit_payload.h>
#include <boardid.h>
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index 9d2b4e781f..c8843a7340 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -17,7 +17,6 @@
#include <cbmem.h>
#include <console/console.h>
#include <fmap.h>
-#include <commonlib/fmap_serialized.h>
#include <stddef.h>
#include <string.h>
#include <symbols.h>
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index 8cf7a6ff57..11fdff3ba1 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
*/
-#include <commonlib/compression.h>
+#include <commonlib/bsd/compression.h>
#include <commonlib/endian.h>
#include <console/console.h>
#include <stdint.h>