Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
drivers: Use SPDX identifiers
Convert the remaining files in src/drivers to use SPDX identifiers.
int15.h and default_brightness_levels.asl did not have license headers, but they were both copied from other GPL2 files, so they should be under the GPL2 as well.
ne2k.c and drm_dp_helper.h are licensed under custom BSD-like licenses that do not have an SPDX equivalent, so they are added as exceptions to the license header lint.
Change-Id: I87fb1c637b8d11b0463f7c19f70b847413e14aed Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M src/drivers/intel/gma/acpi/default_brightness_levels.asl M src/drivers/intel/gma/int15.h M src/drivers/net/ns8390.h M src/drivers/vpd/vpd.c M src/drivers/vpd/vpd.h M src/drivers/vpd/vpd_decode.c M src/drivers/vpd/vpd_decode.h M src/drivers/vpd/vpd_tables.h M util/lint/lint-000-license-headers 9 files changed, 19 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/41601/1
diff --git a/src/drivers/intel/gma/acpi/default_brightness_levels.asl b/src/drivers/intel/gma/acpi/default_brightness_levels.asl index b584c09..9e81741 100644 --- a/src/drivers/intel/gma/acpi/default_brightness_levels.asl +++ b/src/drivers/intel/gma/acpi/default_brightness_levels.asl @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + #include "gma.asl"
Scope (GFX0) diff --git a/src/drivers/intel/gma/int15.h b/src/drivers/intel/gma/int15.h index 176ae24..559ec22 100644 --- a/src/drivers/intel/gma/int15.h +++ b/src/drivers/intel/gma/int15.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + int intel_vga_int15_handler(void);
enum { diff --git a/src/drivers/net/ns8390.h b/src/drivers/net/ns8390.h index 23a68a0..635a030 100644 --- a/src/drivers/net/ns8390.h +++ b/src/drivers/net/ns8390.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + /************************************************************************** ETHERBOOT - BOOTP/TFTP Bootstrap Program
@@ -6,8 +8,6 @@
**************************************************************************/
-//FILE_LICENCE ( BSD2 ); - #define VENDOR_NONE 0 #define VENDOR_WD 1 #define VENDOR_NOVELL 2 diff --git a/src/drivers/vpd/vpd.c b/src/drivers/vpd/vpd.c index 7ed1255..7314c35 100644 --- a/src/drivers/vpd/vpd.c +++ b/src/drivers/vpd/vpd.c @@ -1,8 +1,4 @@ -/* - * Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */
#include <assert.h> #include <console/console.h> diff --git a/src/drivers/vpd/vpd.h b/src/drivers/vpd/vpd.h index 05b7db8..a786625 100644 --- a/src/drivers/vpd/vpd.h +++ b/src/drivers/vpd/vpd.h @@ -1,8 +1,4 @@ -/* - * Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ +/* SPDX-License-Identifier: BSD-3-Clause */
#ifndef __VPD_H__ #define __VPD_H__ diff --git a/src/drivers/vpd/vpd_decode.c b/src/drivers/vpd/vpd_decode.c index 527c508..d144728 100644 --- a/src/drivers/vpd/vpd_decode.c +++ b/src/drivers/vpd/vpd_decode.c @@ -1,9 +1,6 @@ -/* - * Copyright 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * This is a copy from upstream: +/* SPDX-License-Identifier: BSD-3-Clause */ + +/* This is a copy from upstream: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/lib/vpd_d... */ #include "vpd_decode.h" diff --git a/src/drivers/vpd/vpd_decode.h b/src/drivers/vpd/vpd_decode.h index 5d595f3..63a0795 100644 --- a/src/drivers/vpd/vpd_decode.h +++ b/src/drivers/vpd/vpd_decode.h @@ -1,9 +1,6 @@ -/* - * Copyright 2019 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * This is a copy from upstream: +/* SPDX-License-Identifier: BSD-3-Clause */ + +/* This is a copy from upstream: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/include/l... */
diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h index 4add5bd..111f225 100644 --- a/src/drivers/vpd/vpd_tables.h +++ b/src/drivers/vpd/vpd_tables.h @@ -1,9 +1,6 @@ -/* - * Copyright (c) 2014 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Ported from mosys project (http://code.google.com/p/mosys/). +/* SPDX-License-Identifier: BSD-3-Clause */ + +/* Ported from mosys project (http://code.google.com/p/mosys/). */
#ifndef __LIB_VPD_TABLES_H__ diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index 12654e4..eb14a94 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -12,6 +12,8 @@ ^src/device/oprom/x86emu/|\ ^src/device/oprom/include/x86emu/|\ ^src/device/oprom/yabel/|\ +^src/drivers/intel/gma/drm_dp_helper.h$|\ +^src/drivers/net/ne2k.c$|\ ^src/drivers/xgi/common/initdef.h$|\ ^src/drivers/xgi/common/vstruct.h$|\ ^src/lib/gnat/|\