diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /arch/x86/cpu | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86/cpu')
117 files changed, 117 insertions, 251 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 94cdff18cc..d5a17d08cf 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifeq ($(CONFIG_$(SPL_)X86_64),y) extra-y = start64.o diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index f47bedaf8d..ac58b03810 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_BAYTRAIL bool diff --git a/arch/x86/cpu/baytrail/Makefile b/arch/x86/cpu/baytrail/Makefile index a0216f3059..ce5d6178cd 100644 --- a/arch/x86/cpu/baytrail/Makefile +++ b/arch/x86/cpu/baytrail/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cpu.o obj-y += early_uart.o diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 7aac634d66..445e4ba2d7 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index 0bb08524f8..29baf087aa 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Based on code from coreboot */ diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index afab21f1dd..08dbd5538f 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c index 6b762e581a..cefd26299a 100644 --- a/arch/x86/cpu/baytrail/fsp_configs.c +++ b/arch/x86/cpu/baytrail/fsp_configs.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015, Kodak Alaris, Inc - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index 9af1bdabbd..3194f8c653 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/Kconfig b/arch/x86/cpu/braswell/Kconfig index 042ad2bf51..2676fe6e17 100644 --- a/arch/x86/cpu/braswell/Kconfig +++ b/arch/x86/cpu/braswell/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_BRASWELL bool diff --git a/arch/x86/cpu/braswell/Makefile b/arch/x86/cpu/braswell/Makefile index 4a639b83f5..277f81e6de 100644 --- a/arch/x86/cpu/braswell/Makefile +++ b/arch/x86/cpu/braswell/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += braswell.o early_uart.o fsp_configs.o diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c index 37099aa3fd..32a6a5e5a8 100644 --- a/arch/x86/cpu/braswell/braswell.c +++ b/arch/x86/cpu/braswell/braswell.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c index c70a8854fd..d78c6b0feb 100644 --- a/arch/x86/cpu/braswell/early_uart.c +++ b/arch/x86/cpu/braswell/early_uart.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 249f851265..7fe6fa7995 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/Kconfig b/arch/x86/cpu/broadwell/Kconfig index 42018dc127..5b015c89d9 100644 --- a/arch/x86/cpu/broadwell/Kconfig +++ b/arch/x86/cpu/broadwell/Kconfig @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 2016 Google Inc. # -# SPDX-License-Identifier: GPL-2.0 config INTEL_BROADWELL bool diff --git a/arch/x86/cpu/broadwell/Makefile b/arch/x86/cpu/broadwell/Makefile index 7edb6f6f19..a032861e57 100644 --- a/arch/x86/cpu/broadwell/Makefile +++ b/arch/x86/cpu/broadwell/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cpu.o obj-y += iobp.o diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c index 294dfa6643..02b3169cf5 100644 --- a/arch/x86/cpu/broadwell/cpu.c +++ b/arch/x86/cpu/broadwell/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Based on code from coreboot src/soc/intel/broadwell/cpu.c */ diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c index 5eed849812..8a3ca6cde7 100644 --- a/arch/x86/cpu/broadwell/iobp.c +++ b/arch/x86/cpu/broadwell/iobp.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * Modified from coreboot - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c index ee3ac1820d..9dc9b63db6 100644 --- a/arch/x86/cpu/broadwell/lpc.c +++ b/arch/x86/cpu/broadwell/lpc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot broadwell support - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c index e03b87c40f..adc656c07a 100644 --- a/arch/x86/cpu/broadwell/me.c +++ b/arch/x86/cpu/broadwell/me.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Based on code from coreboot src/soc/intel/broadwell/me_status.c */ diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c index aa64808e45..3055880bb7 100644 --- a/arch/x86/cpu/broadwell/northbridge.c +++ b/arch/x86/cpu/broadwell/northbridge.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c index 16eac3daae..82506ba35e 100644 --- a/arch/x86/cpu/broadwell/pch.c +++ b/arch/x86/cpu/broadwell/pch.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c index 881413f476..914ecfb314 100644 --- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c +++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/power_state.c b/arch/x86/cpu/broadwell/power_state.c index 2b9a6bf3a1..09fda487d0 100644 --- a/arch/x86/cpu/broadwell/power_state.c +++ b/arch/x86/cpu/broadwell/power_state.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot src/soc/intel/broadwell/romstage/power_state.c * * Copyright (C) 2016 Google, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c index 4fa4de3525..f016489185 100644 --- a/arch/x86/cpu/broadwell/refcode.c +++ b/arch/x86/cpu/broadwell/refcode.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Read a coreboot rmodule and execute it. * The rmodule_header struct is from coreboot. * * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index 10461d99a8..d89e0a1c9b 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot src/soc/intel/broadwell/sata.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index 774aba6359..03a35bcf73 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot src/soc/intel/broadwell/romstage/raminit.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/call32.S b/arch/x86/cpu/call32.S index c517e4a89f..e185b9a42b 100644 --- a/arch/x86/cpu/call32.S +++ b/arch/x86/cpu/call32.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index b519f433ac..22416f39b6 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# CROSS_COMPILE ?= i386-linux- diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile index d663656bf9..35b15bb1da 100644 --- a/arch/x86/cpu/coreboot/Makefile +++ b/arch/x86/cpu/coreboot/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. # @@ -9,9 +10,6 @@ # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o obj-y += coreboot.o diff --git a/arch/x86/cpu/coreboot/car.S b/arch/x86/cpu/coreboot/car.S index 6982106c19..7163b69a49 100644 --- a/arch/x86/cpu/coreboot/car.S +++ b/arch/x86/cpu/coreboot/car.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .text diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index df5ad13821..69025c1537 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 885fc6f5f2..664817feff 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c index 543e51d96a..bc18b710c9 100644 --- a/arch/x86/cpu/coreboot/tables.c +++ b/arch/x86/cpu/coreboot/tables.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * This file is part of the libpayload project. * * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2009 coresystems GmbH - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index b3827951e6..e698200d70 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of the coreboot project. * * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 1c42584e76..db36553d05 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -15,8 +16,6 @@ * * Part of this file is adapted from coreboot * src/arch/x86/lib/cpu.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index b465b14a94..2b6cc9f22d 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index e09163715d..06d0480440 100644 --- a/arch/x86/cpu/efi/Makefile +++ b/arch/x86/cpu/efi/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += efi.o obj-y += sdram.o diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/efi.c index d82147be47..cda4fabe15 100644 --- a/arch/x86/cpu/efi/efi.c +++ b/arch/x86/cpu/efi/efi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 413e55b596..a45525f842 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/call64.S b/arch/x86/cpu/i386/call64.S index 970c461508..8f86728d42 100644 --- a/arch/x86/cpu/i386/call64.S +++ b/arch/x86/cpu/i386/call64.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2014 Google, Inc * Copyright (C) 1991, 1992, 1993 Linus Torvalds * * Parts of this copied from Linux arch/x86/boot/compressed/head_64.S - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index aabdc94bb0..208ef08562 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -15,8 +16,6 @@ * * Part of this file is adapted from coreboot * src/arch/x86/lib/cpu.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index ba576fef3c..ed8423e079 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -7,8 +8,6 @@ * * Portions of this file are derived from the Linux kernel source * Copyright (C) 1991, 1992 Linus Torvalds - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/setjmp.S b/arch/x86/cpu/i386/setjmp.S index 2ea1c6c766..40b10dc8df 100644 --- a/arch/x86/cpu/i386/setjmp.S +++ b/arch/x86/cpu/i386/setjmp.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Written by H. Peter Anvin <hpa@zytor.com> * Brought in from Linux v4.4 and modified for U-Boot * From Linux arch/um/sys-i386/setjmp.S - * - * SPDX-License-Identifier: GPL-2.0 */ #define _REGPARM diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index 1145e7896c..c0fcf0ce78 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_HAVE_MRC obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += car.o diff --git a/arch/x86/cpu/intel_common/car.S b/arch/x86/cpu/intel_common/car.S index 6e0db96c01..fe8dfbc9ca 100644 --- a/arch/x86/cpu/intel_common/car.S +++ b/arch/x86/cpu/intel_common/car.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2014 Google, Inc * @@ -7,8 +8,6 @@ * Copyright (C) 2005 Tyan (written by Yinghai Lu for Tyan) * Copyright (C) 2007-2008 coresystems GmbH * Copyright (C) 2012 Kyösti Mälkki <kyosti.malkki@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c index ae42095f4b..d0ac17808c 100644 --- a/arch/x86/cpu/intel_common/cpu.c +++ b/arch/x86/cpu/intel_common/cpu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c index 696b6304fe..2a538cf12e 100644 --- a/arch/x86/cpu/intel_common/lpc.c +++ b/arch/x86/cpu/intel_common/lpc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/me_status.c b/arch/x86/cpu/intel_common/me_status.c index 130d219bc9..fc9efbf3a9 100644 --- a/arch/x86/cpu/intel_common/me_status.c +++ b/arch/x86/cpu/intel_common/me_status.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/southbridge/intel/bd82x6x/me_status.c * * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index 8813258754..11b1ec8955 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Google, Inc * Copyright (C) 2000 Ronald G. Minnich * * Microcode update for Intel PIII and later CPUs - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index f1a249af72..a5697a62a5 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/pch.c b/arch/x86/cpu/intel_common/pch.c index 1f05b44586..af82b64a13 100644 --- a/arch/x86/cpu/intel_common/pch.c +++ b/arch/x86/cpu/intel_common/pch.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c index 05e1cf9cdb..0f217c1497 100644 --- a/arch/x86/cpu/intel_common/report_platform.c +++ b/arch/x86/cpu/intel_common/report_platform.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/northbridge/intel/sandybridge/report_platform.c * * Copyright (C) 2012 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c index d15e86c1c5..01ade76a58 100644 --- a/arch/x86/cpu/ioapic.c +++ b/arch/x86/cpu/ioapic.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c index f5654eb510..305cd3d237 100644 --- a/arch/x86/cpu/irq.c +++ b/arch/x86/cpu/irq.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig index 85ea6c91f3..82d5489a17 100644 --- a/arch/x86/cpu/ivybridge/Kconfig +++ b/arch/x86/cpu/ivybridge/Kconfig @@ -1,9 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 # # From Coreboot src/northbridge/intel/sandybridge/Kconfig # # Copyright (C) 2010 Google Inc. # -# SPDX-License-Identifier: GPL-2.0 config NORTHBRIDGE_INTEL_IVYBRIDGE bool diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile index 25fbd599db..27cfb26317 100644 --- a/arch/x86/cpu/ivybridge/Makefile +++ b/arch/x86/cpu/ivybridge/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2014 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_HAVE_FSP obj-y += fsp_configs.o ivybridge.o diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index e3eff69cf6..a78bb02544 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c index 099cb94e5d..c8b16e32c0 100644 --- a/arch/x86/cpu/ivybridge/cpu.c +++ b/arch/x86/cpu/ivybridge/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Google, Inc * (C) Copyright 2008 @@ -7,8 +8,6 @@ * and src/cpu/intel/model_206ax/bootblock.c * Copyright (C) 2007-2010 coresystems GmbH * Copyright (C) 2011 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index 5435a92afa..1a15229196 100644 --- a/arch/x86/cpu/ivybridge/early_me.c +++ b/arch/x86/cpu/ivybridge/early_me.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/southbridge/intel/bd82x6x/early_me.c * * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c index c7f475b5a6..2fd06b3bed 100644 --- a/arch/x86/cpu/ivybridge/fsp_configs.c +++ b/arch/x86/cpu/ivybridge/fsp_configs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c index e817eb9cc2..8d10fd6c54 100644 --- a/arch/x86/cpu/ivybridge/ivybridge.c +++ b/arch/x86/cpu/ivybridge/ivybridge.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c index 4e254b3c57..d9ddcdc840 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot southbridge/intel/bd82x6x/lpc.c * * Copyright (C) 2008-2009 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index 81dedee2ec..c5441aafea 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot file of same name * * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c index 442942956b..39bab7bdf3 100644 --- a/arch/x86/cpu/ivybridge/northbridge.c +++ b/arch/x86/cpu/ivybridge/northbridge.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot northbridge/intel/sandybridge/northbridge.c * * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c index 7febb8cf88..fc6c427430 100644 --- a/arch/x86/cpu/ivybridge/sata.c +++ b/arch/x86/cpu/ivybridge/sata.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot * Copyright (C) 2008-2009 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 1cdbe479fd..2f253e813e 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 @@ -6,8 +7,6 @@ * Portions from Coreboot mainboard/google/link/romstage.c * Copyright (C) 2007-2010 coresystems GmbH * Copyright (C) 2011 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c index bd1189e447..c55213ca2d 100644 --- a/arch/x86/cpu/ivybridge/sdram_nop.c +++ b/arch/x86/cpu/ivybridge/sdram_nop.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/lapic.c b/arch/x86/cpu/lapic.c index fbea2d1572..44ed446784 100644 --- a/arch/x86/cpu/lapic.c +++ b/arch/x86/cpu/lapic.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot file of same name * * Copyright (C) 2008-2009 coresystems GmbH * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index cfd9bb447b..ea64c2ee57 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Based on code from the coreboot file of the same name */ diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 5d36b3e020..3094006562 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Memory Type Range Regsters - these are used to tell the CPU whether * memory is cacheable and if so the cache write mode to use. * diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 2728c00227..c6218250e1 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008,2009 @@ -5,8 +6,6 @@ * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index 0a801aabea..31428dd0a0 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config QEMU bool diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index a080c5e2f4..e5ea92545e 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_EFI_STUB obj-y += car.o dram.o diff --git a/arch/x86/cpu/qemu/car.S b/arch/x86/cpu/qemu/car.S index 13b3aea3ff..466b4876ef 100644 --- a/arch/x86/cpu/qemu/car.S +++ b/arch/x86/cpu/qemu/car.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index b53630b099..f40fb4d087 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Miao Yan <yanmiaobest@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 9d84af5ef2..736c4c3ace 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index ec733cb038..0a690fde68 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 35a146c66a..1fdb11cc60 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig index 0ed724813d..76f159243f 100644 --- a/arch/x86/cpu/quark/Kconfig +++ b/arch/x86/cpu/quark/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_QUARK bool diff --git a/arch/x86/cpu/quark/Makefile b/arch/x86/cpu/quark/Makefile index 93ce412166..476e37cfe5 100644 --- a/arch/x86/cpu/quark/Makefile +++ b/arch/x86/cpu/quark/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o dram.o irq.o msg_port.o quark.o obj-y += mrc.o mrc_util.o hte.o smc.o diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c index 5717a620b5..4a0272085c 100644 --- a/arch/x86/cpu/quark/acpi.c +++ b/arch/x86/cpu/quark/acpi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/car.S b/arch/x86/cpu/quark/car.S index 3432ffa081..48d5167c74 100644 --- a/arch/x86/cpu/quark/car.S +++ b/arch/x86/cpu/quark/car.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 47beb86da3..51f9659ab1 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/hte.c b/arch/x86/cpu/quark/hte.c index db601e4efb..df14779357 100644 --- a/arch/x86/cpu/quark/hte.c +++ b/arch/x86/cpu/quark/hte.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/hte.h b/arch/x86/cpu/quark/hte.h index e98c7ef41d..b4ea488f30 100644 --- a/arch/x86/cpu/quark/hte.h +++ b/arch/x86/cpu/quark/hte.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _HTE_H_ diff --git a/arch/x86/cpu/quark/irq.c b/arch/x86/cpu/quark/irq.c index 1f8f90923d..6928c33600 100644 --- a/arch/x86/cpu/quark/irq.c +++ b/arch/x86/cpu/quark/irq.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c index 6e774cbcd8..3e8c0bc28c 100644 --- a/arch/x86/cpu/quark/mrc.c +++ b/arch/x86/cpu/quark/mrc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ /* diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c index fac2d72e0d..8a68ddba97 100644 --- a/arch/x86/cpu/quark/mrc_util.c +++ b/arch/x86/cpu/quark/mrc_util.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h index a63d1f91e9..4a760a9f59 100644 --- a/arch/x86/cpu/quark/mrc_util.h +++ b/arch/x86/cpu/quark/mrc_util.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _MRC_UTIL_H_ diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c index cf828f21c0..d4f8c082ff 100644 --- a/arch/x86/cpu/quark/msg_port.c +++ b/arch/x86/cpu/quark/msg_port.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index c36a5892d5..46141c434d 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c index 0195b56a52..b4b3e1204b 100644 --- a/arch/x86/cpu/quark/smc.c +++ b/arch/x86/cpu/quark/smc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/smc.h b/arch/x86/cpu/quark/smc.h index 1582b87e10..eee27564c8 100644 --- a/arch/x86/cpu/quark/smc.h +++ b/arch/x86/cpu/quark/smc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _SMC_H_ diff --git a/arch/x86/cpu/queensbay/Kconfig b/arch/x86/cpu/queensbay/Kconfig index 460ede00bc..c9e0fda031 100644 --- a/arch/x86/cpu/queensbay/Kconfig +++ b/arch/x86/cpu/queensbay/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_QUEENSBAY bool diff --git a/arch/x86/cpu/queensbay/Makefile b/arch/x86/cpu/queensbay/Makefile index c0681995bd..b535b2a406 100644 --- a/arch/x86/cpu/queensbay/Makefile +++ b/arch/x86/cpu/queensbay/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += fsp_configs.o irq.o obj-y += tnc.o diff --git a/arch/x86/cpu/queensbay/fsp_configs.c b/arch/x86/cpu/queensbay/fsp_configs.c index f83bb5f221..c4d117783c 100644 --- a/arch/x86/cpu/queensbay/fsp_configs.c +++ b/arch/x86/cpu/queensbay/fsp_configs.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/queensbay/irq.c b/arch/x86/cpu/queensbay/irq.c index 63d0f35a29..208cd61b55 100644 --- a/arch/x86/cpu/queensbay/irq.c +++ b/arch/x86/cpu/queensbay/irq.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 94668a4fda..439c14d8bc 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index 183275b9c2..a52225d5ee 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Reset vector, jumps to start16.S */ diff --git a/arch/x86/cpu/sipi_vector.S b/arch/x86/cpu/sipi_vector.S index 94c0f5a702..40cc27f1e1 100644 --- a/arch/x86/cpu/sipi_vector.S +++ b/arch/x86/cpu/sipi_vector.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Taken from coreboot file of the same name */ diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 8de55a0af1..e4e997e3e8 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * @@ -6,8 +7,6 @@ * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 5eb17f15c9..dd659278ff 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * @@ -6,8 +7,6 @@ * * (C) Copyright 2002,2003 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/start64.S b/arch/x86/cpu/start64.S index 651f16ac89..234482b793 100644 --- a/arch/x86/cpu/start64.S +++ b/arch/x86/cpu/start64.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * 64-bit x86 Startup Code * * (C) Copyright 216 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index 2469b1e7c7..a3bd16799d 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_TANGIER bool diff --git a/arch/x86/cpu/tangier/Makefile b/arch/x86/cpu/tangier/Makefile index 92cfa555ed..44ccb3ff91 100644 --- a/arch/x86/cpu/tangier/Makefile +++ b/arch/x86/cpu/tangier/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o tangier.o sdram.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi.o diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 75e777dcd7..0e4f961c53 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation * * Partially based on acpi.c for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/tangier/car.S b/arch/x86/cpu/tangier/car.S index 6982106c19..7163b69a49 100644 --- a/arch/x86/cpu/tangier/car.S +++ b/arch/x86/cpu/tangier/car.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .text diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index f5f412a1e5..b47d896e20 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index ac8733c75e..0a15e64344 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c index c0bff75c4f..a41d511238 100644 --- a/arch/x86/cpu/turbo.c +++ b/arch/x86/cpu/turbo.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot file of the same name * * Copyright (C) 2011 The Chromium Authors. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index 718790c79a..3f38681669 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index 8a38d58f12..574d992aaa 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 186718d8f9..f0719368ba 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S index 066c9b1a55..663b02f27d 100644 --- a/arch/x86/cpu/wakeup.S +++ b/arch/x86/cpu/wakeup.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> * * From coreboot src/arch/x86/wakeup.S - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/acpi_s3.h> diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 693d1a31f3..18b3e94e12 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 3e06173186..15830d6a1a 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/x86_64/setjmp.c b/arch/x86/cpu/x86_64/setjmp.c index 25f8d2804b..5d4a74a571 100644 --- a/arch/x86/cpu/x86_64/setjmp.c +++ b/arch/x86/cpu/x86_64/setjmp.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |