From c826ba419f06f9df9cded8e60633253ddc7b60ff Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 14 Aug 2022 11:07:42 +0200 Subject: [PATCH] commonlib/clamp.h: Relicense file to be BSD-compatible I added this header in commit a6c8b4becbd12fe6043557ca1e398c1a7c691007 (nb/intel/sandybridge: Rewrite get_FRQ). Relicense it as "BSD-3-Clause OR GPL-2.0-or-later" and move it into the BSD-licensed commonlib part. Change-Id: I89ebdcdf8d06e78e624e37a443696981b3b17b7d Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/66711 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- .../commonlib => bsd/include/commonlib/bsd}/clamp.h | 8 ++++---- src/northbridge/intel/sandybridge/raminit_native.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/commonlib/{include/commonlib => bsd/include/commonlib/bsd}/clamp.h (61%) diff --git a/src/commonlib/include/commonlib/clamp.h b/src/commonlib/bsd/include/commonlib/bsd/clamp.h similarity index 61% rename from src/commonlib/include/commonlib/clamp.h rename to src/commonlib/bsd/include/commonlib/bsd/clamp.h index e01a107ed4..66513b0337 100644 --- a/src/commonlib/include/commonlib/clamp.h +++ b/src/commonlib/bsd/include/commonlib/bsd/clamp.h @@ -1,7 +1,7 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later */ -#ifndef COMMONLIB_CLAMP_H -#define COMMONLIB_CLAMP_H +#ifndef COMMONLIB_BSD_CLAMP_H +#define COMMONLIB_BSD_CLAMP_H #include @@ -19,4 +19,4 @@ static inline u32 clamp_u32(const u32 min, const u32 val, const u32 max) return val; } -#endif /* COMMONLIB_CLAMP_H */ +#endif /* COMMONLIB_BSD_CLAMP_H */ diff --git a/src/northbridge/intel/sandybridge/raminit_native.c b/src/northbridge/intel/sandybridge/raminit_native.c index ca26628704..7141116840 100644 --- a/src/northbridge/intel/sandybridge/raminit_native.c +++ b/src/northbridge/intel/sandybridge/raminit_native.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include +#include #include #include #include