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/|\
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
Patch Set 2: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd.h File src/drivers/vpd/vpd.h:
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd.h@1 PS2, Line 1: BSD-3-Clause Need to retain the copyright notices: CB:41222
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd_tables.... File src/drivers/vpd/vpd_tables.h:
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd_tables.... PS2, Line 3: /* Ported from mosys project (http://code.google.com/p/mosys/). Comment style looks odd
Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Martin Roth, Angel Pons, Patrick Rudolph, HAOUAS Elyes,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41601
to look at the new patch set (#3).
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 LICENSES/retained-copyrights.txt 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 10 files changed, 19 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/41601/3
Jacob Garber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd.h File src/drivers/vpd/vpd.h:
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd.h@1 PS2, Line 1: BSD-3-Clause
Need to retain the copyright notices: CB:41222
Done
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd_tables.... File src/drivers/vpd/vpd_tables.h:
https://review.coreboot.org/c/coreboot/+/41601/2/src/drivers/vpd/vpd_tables.... PS2, Line 3: /* Ported from mosys project (http://code.google.com/p/mosys/).
Comment style looks odd
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
Patch Set 3: Code-Review+2
Angel Pons has submitted this change. ( 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41601 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M LICENSES/retained-copyrights.txt 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 10 files changed, 19 insertions(+), 27 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/LICENSES/retained-copyrights.txt b/LICENSES/retained-copyrights.txt index 066bf6f..bfa9ecc 100644 --- a/LICENSES/retained-copyrights.txt +++ b/LICENSES/retained-copyrights.txt @@ -7,6 +7,7 @@ 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 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 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..944e21b 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_d... */ diff --git a/src/drivers/vpd/vpd_decode.h b/src/drivers/vpd/vpd_decode.h index 5d595f3..d96a210 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/l... */ diff --git a/src/drivers/vpd/vpd_tables.h b/src/drivers/vpd/vpd_tables.h index 4add5bd..54f1685 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 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/|\
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41601 )
Change subject: drivers: Use SPDX identifiers ......................................................................
Patch Set 6:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/3946 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3945 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3944 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/3943
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Angel Pons (Code Review)
-
HAOUAS Elyes (Code Review)
-
Jacob Garber (Code Review)