[coreboot-gerrit] Change in coreboot[master]: commonlib: Move commonlib/cbmem_id.h to commonlib/bsd/

[Jakub Czapiga (Code Review)]

Jakub Czapiga has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59696 )

Change subject: commonlib: Move commonlib/cbmem_id.h to commonlib/bsd/
......................................................................

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 
---
R src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h
M src/include/cbmem.h
M tests/lib/cbmem_stage_cache-test.c
M util/cbmem/cbmem.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/59696/1

diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h
similarity index 98%
rename from src/commonlib/include/commonlib/cbmem_id.h
rename to src/commonlib/bsd/include/commonlib/bsd/cbmem_id.h
index d150811..4c13535 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 ec2b928..cd7751c 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 8a07e6f..070f431 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 085e004..bff863f 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>