summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Czapiga <jacz@semihalf.com>2021-11-23 08:43:25 +0000
committerPatrick Georgi <patrick@coreboot.org>2021-11-30 17:23:37 +0000
commitea619425eebd17d9a850792cda598432cb139689 (patch)
tree67c09b2659815afd8a738f2eb6cdd1aab1928796
parent6ba7bee1aae390fbdef9063ac766665250f1d24a (diff)
commonlib: Move commonlib/cbmem_id.h to commonlib/bsd/
Libpayload requires cbmem_id.h file to support extracting values from CBMEM IMD entries of coreboot tables. Libpayload use BSD-3-Clause license, and all of its files used to compile a static library have to use it too. Change-Id: I97c080e34ebdbcdf14fe3a3c9515b1dea8ede179 Signed-off-by: Jakub Czapiga <jacz@semihalf.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/59696 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <patrick@coreboot.org>
-rw-r--r--src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h (renamed from src/commonlib/include/commonlib/cbmem_id.h)2
-rw-r--r--src/include/cbmem.h2
-rw-r--r--tests/lib/cbmem_stage_cache-test.c2
-rw-r--r--util/cbmem/cbmem.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h
index d1508110c0..4c13535fb7 100644
--- a/src/commonlib/include/commonlib/cbmem_id.h
+++ b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: BSD-3-Clause */
#ifndef _CBMEM_ID_H_
#define _CBMEM_ID_H_
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index ec2b928ff8..cd7751cab1 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -3,7 +3,7 @@
#ifndef _CBMEM_H_
#define _CBMEM_H_
-#include <commonlib/cbmem_id.h>
+#include <commonlib/bsd/cbmem_id.h>
#include <stddef.h>
#include <stdint.h>
#include <boot/coreboot_tables.h>
diff --git a/tests/lib/cbmem_stage_cache-test.c b/tests/lib/cbmem_stage_cache-test.c
index 8a07e6fabe..070f4318ca 100644
--- a/tests/lib/cbmem_stage_cache-test.c
+++ b/tests/lib/cbmem_stage_cache-test.c
@@ -2,7 +2,7 @@
#include <tests/test.h>
#include <cbmem.h>
-#include <commonlib/cbmem_id.h>
+#include <commonlib/bsd/cbmem_id.h>
#include <stage_cache.h>
#define CBMEM_SIZE (32 * KiB)
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 085e004606..bff863f3b8 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -17,7 +17,7 @@
#include <libgen.h>
#include <assert.h>
#include <regex.h>
-#include <commonlib/cbmem_id.h>
+#include <commonlib/bsd/cbmem_id.h>
#include <commonlib/timestamp_serialized.h>
#include <commonlib/tcpa_log_serialized.h>
#include <commonlib/coreboot_tables.h>