diff options
| -rw-r--r-- | LICENSES/retained-copyrights.txt | 2 | ||||
| -rw-r--r-- | src/drivers/intel/gma/acpi/default_brightness_levels.asl | 2 | ||||
| -rw-r--r-- | src/drivers/intel/gma/int15.h | 2 | ||||
| -rw-r--r-- | src/drivers/net/ns8390.h | 4 | ||||
| -rw-r--r-- | src/drivers/vpd/vpd.c | 6 | ||||
| -rw-r--r-- | src/drivers/vpd/vpd.h | 6 | ||||
| -rw-r--r-- | src/drivers/vpd/vpd_decode.c | 6 | ||||
| -rw-r--r-- | src/drivers/vpd/vpd_decode.h | 6 | ||||
| -rw-r--r-- | src/drivers/vpd/vpd_tables.h | 10 | ||||
| -rwxr-xr-x | util/lint/lint-000-license-headers | 2 |
10 files changed, 19 insertions, 27 deletions
diff --git a/LICENSES/retained-copyrights.txt b/LICENSES/retained-copyrights.txt index 066bf6f7d0..bfa9ecccb8 100644 --- a/LICENSES/retained-copyrights.txt +++ b/LICENSES/retained-copyrights.txt @@ -7,6 +7,7 @@ Copyright © 2012 Intel Corporation Copyright 2012 Red Hat Inc. Copyright 2013 Google Inc. Copyright 2014 Google Inc. +Copyright 2014 The Chromium OS Authors. All rights reserved. Copyright 2015 Google Inc. Copyright 2015, Google Inc. Copyright 2016 Jonathan Neuschäfer <j.neuschaefer@gmx.net> @@ -16,6 +17,7 @@ Copyright 2017 Google Inc. Copyright 2018 Generated Code Copyright 2018-present Facebook, Inc. Copyright 2019 9Elements Agency GmbH <patrick.rudolph@9elements.com> +Copyright 2019 The Chromium OS Authors. All rights reserved. Copyright (C) 2002 David S. Peterson. All rights reserved. Copyright (c) 2003-2016 Cavium Inc. (support@cavium.com). All rights Copyright (c) 2003-2017 Cavium Inc. (support@cavium.com). All rights diff --git a/src/drivers/intel/gma/acpi/default_brightness_levels.asl b/src/drivers/intel/gma/acpi/default_brightness_levels.asl index b584c0925a..9e8174109f 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 176ae24bf1..559ec22ab1 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 23a68a089d..635a0304bf 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 @@ Author: Martin Renters **************************************************************************/ -//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 7ed1255357..7314c35025 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 05b7db8f6d..a78662579a 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 527c50818e..944e21b2a7 100644 --- a/src/drivers/vpd/vpd_decode.c +++ b/src/drivers/vpd/vpd_decode.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + /* - * 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: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/lib/vpd_decode.c */ diff --git a/src/drivers/vpd/vpd_decode.h b/src/drivers/vpd/vpd_decode.h index 5d595f367f..d96a21000c 100644 --- a/src/drivers/vpd/vpd_decode.h +++ b/src/drivers/vpd/vpd_decode.h @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + /* - * 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: * https://chromium.googlesource.com/chromiumos/platform/vpd/+/master/include/lib/vpd_decode.h */ diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h index 4add5bd49d..54f1685e10 100644 --- a/src/drivers/vpd/vpd_tables.h +++ b/src/drivers/vpd/vpd_tables.h @@ -1,10 +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__ #define __LIB_VPD_TABLES_H__ diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers index 12654e4f59..eb14a94632 100755 --- a/util/lint/lint-000-license-headers +++ b/util/lint/lint-000-license-headers @@ -12,6 +12,8 @@ HEADER_EXCLUDED="\ ^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/|\ |