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 | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.bz2 | |
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')
318 files changed, 318 insertions, 656 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 4be1c35..fec1484 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ ifeq ($(CONFIG_EFI_APP),) ifdef CONFIG_$(SPL_)X86_64 diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 69074f4..97db03d 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 94cdff1..d5a17d0 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 f47beda..ac58b03 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 a0216f3..ce5d617 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 7aac634..445e4ba 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 0bb0852..29baf08 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 afab21f..08dbd55 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 6b762e5..cefd262 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 9af1bda..3194f8c 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 042ad2b..2676fe6 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 4a639b8..277f81e 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 37099aa..32a6a5e 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 c70a885..d78c6b0 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 249f851..7fe6fa7 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 42018dc..5b015c8 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 7edb6f6..a032861 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 294dfa6..02b3169 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 5eed849..8a3ca6c 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 ee3ac18..9dc9b63 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 e03b87c..adc656c 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 aa64808..3055880 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 16eac3d..82506ba 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 881413f..914ecfb 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 2b9a6bf..09fda48 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 4fa4de3..f016489 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 10461d9..d89e0a1 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 774aba6..03a35bc 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 c517e4a..e185b9a 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 b519f43..22416f3 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 d663656..35b15bb 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 6982106..7163b69 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 df5ad13..69025c1 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 885fc6f..664817f 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 543e51d..bc18b71 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 b382795..e698200 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 1c42584..db36553 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 b465b14..2b6cc9f 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 e091637..06d0480 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 d82147b..cda4fab 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 413e55b..a45525f 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 970c461..8f86728 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 aabdc94..208ef08 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 ba576fe..ed8423e 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 2ea1c6c..40b10dc 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 1145e78..c0fcf0c 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 6e0db96..fe8dfbc 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 ae42095..d0ac178 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 696b630..2a538cf 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 130d219..fc9efbf 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 8813258..11b1ec8 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 f1a249a..a5697a6 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 1f05b44..af82b64 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 05e1cf9..0f217c1 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 d15e86c..01ade76 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 f5654eb..305cd3d 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 85ea6c9..82d5489 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 25fbd59..27cfb26 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 e3eff69..a78bb02 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 099cb94..c8b16e3 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 5435a92..1a15229 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 c7f475b..2fd06b3 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 e817eb9..8d10fd6 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 4e254b3..d9ddcdc 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 81dedee..c5441aa 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 4429429..39bab7b 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 7febb8c..fc6c427 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 1cdbe47..2f253e8 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 bd1189e..c55213c 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 fbea2d1..44ed446 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 cfd9bb4..ea64c2e 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 5d36b3e..3094006 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 2728c00..c621825 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 0a801aa..31428dd 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 a080c5e..e5ea925 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 13b3aea..466b487 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 b53630b..f40fb4d 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 9d84af5..736c4c3 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 ec733cb..0a690fd 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 35a146c..1fdb11c 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 0ed7248..76f1592 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 93ce412..476e37c 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 5717a62..4a02720 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 3432ffa..48d5167 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 47beb86..51f9659 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 db601e4..df14779 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 e98c7ef..b4ea488 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 1f8f909..6928c33 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 6e774cb..3e8c0bc 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 fac2d72..8a68ddb 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 a63d1f9..4a760a9 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 cf828f2..d4f8c08 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 c36a589..46141c4 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 0195b56..b4b3e12 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 1582b87..eee2756 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 460ede0..c9e0fda 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 c068199..b535b2a 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 f83bb5f..c4d1177 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 63d0f35..208cd61 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 94668a4..439c14d 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 183275b..a52225d 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 94c0f5a..40cc27f 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 8de55a0..e4e997e 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 5eb17f1..dd65927 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 651f16a..234482b 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 2469b1e..a3bd167 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 92cfa55..44ccb3f 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 75e777d..0e4f961 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 6982106..7163b69 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 f5f412a..b47d896 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 ac8733c..0a15e64 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 c0bff75..a41d511 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 718790c..3f38681 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 8a38d58..574d992 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 186718d..f071936 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 066c9b1..663b02f 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 693d1a3..18b3e94 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 3e06173..15830d6 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 25f8d28..5d4a74a 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> diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 6d0c4b6..7379774 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ dtb-y += bayleybay.dtb \ cherryhill.dtb \ diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index 0c314e0..74291a8 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts index 171e7ff..36e6069 100644 --- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts +++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2016, George McCollister <george.mccollister@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/cherryhill.dts b/arch/x86/dts/cherryhill.dts index 41e72f3..c3a6aad 100644 --- a/arch/x86/dts/cherryhill.dts +++ b/arch/x86/dts/cherryhill.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts index 9c06870..c3d1514 100644 --- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts +++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/cougarcanyon2.dts b/arch/x86/dts/cougarcanyon2.dts index d415566..ea836ee 100644 --- a/arch/x86/dts/cougarcanyon2.dts +++ b/arch/x86/dts/cougarcanyon2.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index 78a1ef4..4fe076a 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/dfi-bt700-q7x-151.dts b/arch/x86/dts/dfi-bt700-q7x-151.dts index 31d9679..ca60289 100644 --- a/arch/x86/dts/dfi-bt700-q7x-151.dts +++ b/arch/x86/dts/dfi-bt700-q7x-151.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi index b62e00f..cb96fdf 100644 --- a/arch/x86/dts/dfi-bt700.dtsi +++ b/arch/x86/dts/dfi-bt700.dtsi @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch-baytrail/fsp/fsp_configs.h> diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index 0b04984..9033532 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/efi.dts b/arch/x86/dts/efi.dts index 6cd8116..62ae96a 100644 --- a/arch/x86/dts/efi.dts +++ b/arch/x86/dts/efi.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi index 7714ed0..6b651a3 100644 --- a/arch/x86/dts/emulation-u-boot.dtsi +++ b/arch/x86/dts/emulation-u-boot.dtsi @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <u-boot.dtsi> diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts index da3cbff..d86fdc0 100644 --- a/arch/x86/dts/galileo.dts +++ b/arch/x86/dts/galileo.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index a0ad03c..42ba0c7 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/qemu-x86_i440fx.dts b/arch/x86/dts/qemu-x86_i440fx.dts index afea14e..6565429 100644 --- a/arch/x86/dts/qemu-x86_i440fx.dts +++ b/arch/x86/dts/qemu-x86_i440fx.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts index bc398dd..f1c4cb9 100644 --- a/arch/x86/dts/qemu-x86_q35.dts +++ b/arch/x86/dts/qemu-x86_q35.dts @@ -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+ */ /dts-v1/; diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi index 04eb985..7ebc301 100644 --- a/arch/x86/dts/quark-u-boot.dtsi +++ b/arch/x86/dts/quark-u-boot.dtsi @@ -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 <u-boot.dtsi> diff --git a/arch/x86/dts/theadorable-x86-dfi-bt700.dts b/arch/x86/dts/theadorable-x86-dfi-bt700.dts index 75f9ffa..ea0bff7b 100644 --- a/arch/x86/dts/theadorable-x86-dfi-bt700.dts +++ b/arch/x86/dts/theadorable-x86-dfi-bt700.dts @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 7e37d4f..1253fa5 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/include/asm/acpi/debug.asl b/arch/x86/include/asm/acpi/debug.asl index 8e7b603..6025507 100644 --- a/arch/x86/include/asm/acpi/debug.asl +++ b/arch/x86/include/asm/acpi/debug.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/arch/x86/acpi/debug.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* POST register region */ diff --git a/arch/x86/include/asm/acpi/global_nvs.h b/arch/x86/include/asm/acpi/global_nvs.h index 7f2ffd4..d56d35c 100644 --- a/arch/x86/include/asm/acpi/global_nvs.h +++ b/arch/x86/include/asm/acpi/global_nvs.h @@ -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+ */ #ifndef _ACPI_GNVS_H_ diff --git a/arch/x86/include/asm/acpi/globutil.asl b/arch/x86/include/asm/acpi/globutil.asl index 46381b6..5d50ef3 100644 --- a/arch/x86/include/asm/acpi/globutil.asl +++ b/arch/x86/include/asm/acpi/globutil.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/arch/x86/acpi/globutil.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ Method(MIN, 2) diff --git a/arch/x86/include/asm/acpi/irq_helper.h b/arch/x86/include/asm/acpi/irq_helper.h index f0b3a6b..6e404f4 100644 --- a/arch/x86/include/asm/acpi/irq_helper.h +++ b/arch/x86/include/asm/acpi/irq_helper.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2014 Sage Electronics Engineering, LLC. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/include/soc/irq_helper.h - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/x86/include/asm/acpi/irqlinks.asl b/arch/x86/include/asm/acpi/irqlinks.asl index 84c1e53..9fc83a5 100644 --- a/arch/x86/include/asm/acpi/irqlinks.asl +++ b/arch/x86/include/asm/acpi/irqlinks.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/irqlinks.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/x86/include/asm/acpi/irqroute.asl b/arch/x86/include/asm/acpi/irqroute.asl index 64d3820..0ed7efd 100644 --- a/arch/x86/include/asm/acpi/irqroute.asl +++ b/arch/x86/include/asm/acpi/irqroute.asl @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/irqroute.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ Name(\PICM, 0) diff --git a/arch/x86/include/asm/acpi/sleepstates.asl b/arch/x86/include/asm/acpi/sleepstates.asl index 5600723..32e16a2 100644 --- a/arch/x86/include/asm/acpi/sleepstates.asl +++ b/arch/x86/include/asm/acpi/sleepstates.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/sleepstates.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0}) diff --git a/arch/x86/include/asm/acpi/statdef.asl b/arch/x86/include/asm/acpi/statdef.asl index e8cff10..6697bc4 100644 --- a/arch/x86/include/asm/acpi/statdef.asl +++ b/arch/x86/include/asm/acpi/statdef.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/arch/x86/acpi/statdef.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Status and notification definitions */ diff --git a/arch/x86/include/asm/acpi_s3.h b/arch/x86/include/asm/acpi_s3.h index 86aec0a..baa848d 100644 --- a/arch/x86/include/asm/acpi_s3.h +++ b/arch/x86/include/asm/acpi_s3.h @@ -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+ */ #ifndef __ASM_ACPI_S3_H__ diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index d5d77cc..239bcdc 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Based on acpi.c from coreboot * * Copyright (C) 2015, Saket Sinha <saket.sinha89@gmail.com> * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #define RSDP_SIG "RSD PTR " /* RSDP pointer signature */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl index a28d4df..9b8d189 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl @@ -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 <asm/acpi/global_nvs.h> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl b/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl index ef340f3..abe3756 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/gpio.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* SouthCluster GPIO */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h b/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h index d746314..57921f2 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h +++ b/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h @@ -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 <asm/arch/device.h> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl b/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl index fe34d32..08b2f53 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/lpc.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Intel LPC Bus Device - 0:1f.0 */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl index cf3de7c..5186fe0 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl @@ -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 <asm/acpi/statdef.asl> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl index e89ff26..dfc768c 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/southcluster.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ Device (PCI0) diff --git a/arch/x86/include/asm/arch-baytrail/acpi/usb.asl b/arch/x86/include/asm/arch-baytrail/acpi/usb.asl index 311f471..78a7952 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/usb.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/usb.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/usb.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* EHCI Controller 0:1d.0 */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl b/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl index a5a4404..13cb429 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/acpi/xhci.asl - * - * SPDX-License-Identifier: GPL-2.0+ */ /* XHCI Controller 0:14.0 */ diff --git a/arch/x86/include/asm/arch-baytrail/device.h b/arch/x86/include/asm/arch-baytrail/device.h index 798d35b..a3872cf 100644 --- a/arch/x86/include/asm/arch-baytrail/device.h +++ b/arch/x86/include/asm/arch-baytrail/device.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/include/soc/pci_devs.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DEVICE_H_ diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h index 1c6c247..cd48705 100644 --- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel */ #ifndef __FSP_CONFIGS_H__ diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h index e2f0e39..c6544ea 100644 --- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: Intel */ #ifndef __FSP_VPD_H diff --git a/arch/x86/include/asm/arch-baytrail/global_nvs.h b/arch/x86/include/asm/arch-baytrail/global_nvs.h index 56e3626..1072e3d 100644 --- a/arch/x86/include/asm/arch-baytrail/global_nvs.h +++ b/arch/x86/include/asm/arch-baytrail/global_nvs.h @@ -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+ */ #ifndef _GLOBAL_NVS_H_ diff --git a/arch/x86/include/asm/arch-baytrail/iomap.h b/arch/x86/include/asm/arch-baytrail/iomap.h index ec4e9d5..752dae0 100644 --- a/arch/x86/include/asm/arch-baytrail/iomap.h +++ b/arch/x86/include/asm/arch-baytrail/iomap.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/include/soc/iomap.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BAYTRAIL_IOMAP_H_ diff --git a/arch/x86/include/asm/arch-baytrail/irq.h b/arch/x86/include/asm/arch-baytrail/irq.h index cd66f83..fda3f59 100644 --- a/arch/x86/include/asm/arch-baytrail/irq.h +++ b/arch/x86/include/asm/arch-baytrail/irq.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn@gmail.com> * * Modified from coreboot src/soc/intel/baytrail/include/soc/irq.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _BAYTRAIL_IRQ_H_ diff --git a/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h b/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h index 4b8521d..4425dcb 100644 --- a/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h @@ -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+ */ #ifndef __FSP_CONFIGS_H__ diff --git a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h index 99c4c0a..a3bde3d 100644 --- a/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-braswell/fsp/fsp_vpd.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2015, Intel Corporation * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel */ #ifndef __FSP_VPD_H__ diff --git a/arch/x86/include/asm/arch-braswell/gpio.h b/arch/x86/include/asm/arch-braswell/gpio.h index 5f1252f..e8389e5 100644 --- a/arch/x86/include/asm/arch-braswell/gpio.h +++ b/arch/x86/include/asm/arch-braswell/gpio.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * From coreboot src/soc/intel/braswell/include/soc/gpio.h */ diff --git a/arch/x86/include/asm/arch-braswell/iomap.h b/arch/x86/include/asm/arch-braswell/iomap.h index 7df2dc5..873d331 100644 --- a/arch/x86/include/asm/arch-braswell/iomap.h +++ b/arch/x86/include/asm/arch-braswell/iomap.h @@ -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+ */ #ifndef _BRASWELL_IOMAP_H_ diff --git a/arch/x86/include/asm/arch-broadwell/cpu.h b/arch/x86/include/asm/arch-broadwell/cpu.h index eb2046b..ca22a79 100644 --- a/arch/x86/include/asm/arch-broadwell/cpu.h +++ b/arch/x86/include/asm/arch-broadwell/cpu.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __asm_arch_cpu_h diff --git a/arch/x86/include/asm/arch-broadwell/gpio.h b/arch/x86/include/asm/arch-broadwell/gpio.h index 0ed881b..a32e2db 100644 --- a/arch/x86/include/asm/arch-broadwell/gpio.h +++ b/arch/x86/include/asm/arch-broadwell/gpio.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc * * From Coreboot src/soc/intel/broadwell/include/soc/gpio.h - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_ARCH_GPIO diff --git a/arch/x86/include/asm/arch-broadwell/iomap.h b/arch/x86/include/asm/arch-broadwell/iomap.h index 431bc23..de7f6e5 100644 --- a/arch/x86/include/asm/arch-broadwell/iomap.h +++ b/arch/x86/include/asm/arch-broadwell/iomap.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * From Coreboot soc/intel/broadwell/include/soc/iomap.h * * Copyright (C) 2016 Google Inc. - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __asm_arch_iomap_h diff --git a/arch/x86/include/asm/arch-broadwell/lpc.h b/arch/x86/include/asm/arch-broadwell/lpc.h index a718667..98f928a 100644 --- a/arch/x86/include/asm/arch-broadwell/lpc.h +++ b/arch/x86/include/asm/arch-broadwell/lpc.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot soc/intel/broadwell/include/soc/lpc.h * * Copyright (C) 2016 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_ARCH_LPC_H diff --git a/arch/x86/include/asm/arch-broadwell/me.h b/arch/x86/include/asm/arch-broadwell/me.h index a66a8bb..58f16ba 100644 --- a/arch/x86/include/asm/arch-broadwell/me.h +++ b/arch/x86/include/asm/arch-broadwell/me.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot soc/intel/broadwell/include/soc/me.h * * Copyright (C) 2014 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _asm_arch_me_h diff --git a/arch/x86/include/asm/arch-broadwell/pch.h b/arch/x86/include/asm/arch-broadwell/pch.h index 3e346ad..23ccd68 100644 --- a/arch/x86/include/asm/arch-broadwell/pch.h +++ b/arch/x86/include/asm/arch-broadwell/pch.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_ARCH_PCH_H diff --git a/arch/x86/include/asm/arch-broadwell/pei_data.h b/arch/x86/include/asm/arch-broadwell/pei_data.h index b2cc8b8..4442bea 100644 --- a/arch/x86/include/asm/arch-broadwell/pei_data.h +++ b/arch/x86/include/asm/arch-broadwell/pei_data.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * From Coreboot soc/intel/broadwell/include/soc/pei_data.h * * Copyright (C) 2014 Google Inc. - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef ASM_ARCH_PEI_DATA_H diff --git a/arch/x86/include/asm/arch-broadwell/pm.h b/arch/x86/include/asm/arch-broadwell/pm.h index 36ad842..df35080 100644 --- a/arch/x86/include/asm/arch-broadwell/pm.h +++ b/arch/x86/include/asm/arch-broadwell/pm.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot src/soc/intel/broadwell/include/soc/pm.h * * Copyright (C) 2016 Google, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_ARCH_PM_H diff --git a/arch/x86/include/asm/arch-broadwell/rcb.h b/arch/x86/include/asm/arch-broadwell/rcb.h index 44fcddd..e7340c1 100644 --- a/arch/x86/include/asm/arch-broadwell/rcb.h +++ b/arch/x86/include/asm/arch-broadwell/rcb.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __asm_arch_rcba_h diff --git a/arch/x86/include/asm/arch-broadwell/spi.h b/arch/x86/include/asm/arch-broadwell/spi.h index aeb4926..7820998 100644 --- a/arch/x86/include/asm/arch-broadwell/spi.h +++ b/arch/x86/include/asm/arch-broadwell/spi.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2014 Google Inc. * * This file is from coreboot soc/intel/broadwell/include/soc/spi.h - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _BROADWELL_SPI_H_ diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h index 12b3b5d..dd8d1cb 100644 --- a/arch/x86/include/asm/arch-coreboot/sysinfo.h +++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * This file is part of the libpayload project. * * Copyright (C) 2008 Advanced Micro Devices, Inc. - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef _COREBOOT_SYSINFO_H diff --git a/arch/x86/include/asm/arch-coreboot/timestamp.h b/arch/x86/include/asm/arch-coreboot/timestamp.h index 0cd7a99..9320afb 100644 --- a/arch/x86/include/asm/arch-coreboot/timestamp.h +++ b/arch/x86/include/asm/arch-coreboot/timestamp.h @@ -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 */ #ifndef __COREBOOT_TIMESTAMP_H__ diff --git a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h index 9b0613d..ae9105b 100644 --- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h @@ -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+ */ #ifndef __FSP_CONFIGS_H__ diff --git a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h index 3b255cc..4b0f23a 100644 --- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h @@ -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+ */ #ifndef __FSP_VPD_H__ diff --git a/arch/x86/include/asm/arch-ivybridge/me.h b/arch/x86/include/asm/arch-ivybridge/me.h index bc1bc8e..518c308 100644 --- a/arch/x86/include/asm/arch-ivybridge/me.h +++ b/arch/x86/include/asm/arch-ivybridge/me.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From Coreboot src/southbridge/intel/bd82x6x/me.h * * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_INTEL_ME_H diff --git a/arch/x86/include/asm/arch-ivybridge/model_206ax.h b/arch/x86/include/asm/arch-ivybridge/model_206ax.h index 22f7929..850d96b 100644 --- a/arch/x86/include/asm/arch-ivybridge/model_206ax.h +++ b/arch/x86/include/asm/arch-ivybridge/model_206ax.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From Coreboot file of the same name * * Copyright (C) 2011 The ChromiumOS Authors. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_ARCH_MODEL_206AX_H diff --git a/arch/x86/include/asm/arch-ivybridge/pch.h b/arch/x86/include/asm/arch-ivybridge/pch.h index 9c51f63..8018bc0 100644 --- a/arch/x86/include/asm/arch-ivybridge/pch.h +++ b/arch/x86/include/asm/arch-ivybridge/pch.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2014 Google, Inc * @@ -5,8 +6,6 @@ * * Copyright (C) 2008-2009 coresystems GmbH * Copyright (C) 2012 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_ARCH_PCH_H diff --git a/arch/x86/include/asm/arch-ivybridge/pei_data.h b/arch/x86/include/asm/arch-ivybridge/pei_data.h index 9453336..b8da21b 100644 --- a/arch/x86/include/asm/arch-ivybridge/pei_data.h +++ b/arch/x86/include/asm/arch-ivybridge/pei_data.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2011, Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef ASM_ARCH_PEI_DATA_H diff --git a/arch/x86/include/asm/arch-ivybridge/sandybridge.h b/arch/x86/include/asm/arch-ivybridge/sandybridge.h index 8e0f668..a96c951 100644 --- a/arch/x86/include/asm/arch-ivybridge/sandybridge.h +++ b/arch/x86/include/asm/arch-ivybridge/sandybridge.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2014 Google, Inc * @@ -5,8 +6,6 @@ * * Copyright (C) 2007-2008 coresystems GmbH * Copyright (C) 2011 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ACH_ASM_SANDYBRIDGE_H diff --git a/arch/x86/include/asm/arch-qemu/device.h b/arch/x86/include/asm/arch-qemu/device.h index 38ab798..daafd5d 100644 --- a/arch/x86/include/asm/arch-qemu/device.h +++ b/arch/x86/include/asm/arch-qemu/device.h @@ -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+ */ #ifndef _QEMU_DEVICE_H_ diff --git a/arch/x86/include/asm/arch-qemu/qemu.h b/arch/x86/include/asm/arch-qemu/qemu.h index a85eee8..100eb8e 100644 --- a/arch/x86/include/asm/arch-qemu/qemu.h +++ b/arch/x86/include/asm/arch-qemu/qemu.h @@ -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+ */ #ifndef _ARCH_QEMU_H_ diff --git a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl index 6f0435e..44b9f12 100644 --- a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl @@ -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 <asm/acpi/global_nvs.h> diff --git a/arch/x86/include/asm/arch-quark/acpi/irqroute.h b/arch/x86/include/asm/arch-quark/acpi/irqroute.h index 5ba31da..879b67d 100644 --- a/arch/x86/include/asm/arch-quark/acpi/irqroute.h +++ b/arch/x86/include/asm/arch-quark/acpi/irqroute.h @@ -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 <asm/arch/device.h> diff --git a/arch/x86/include/asm/arch-quark/acpi/lpc.asl b/arch/x86/include/asm/arch-quark/acpi/lpc.asl index c3b0b1d..fc30e0a 100644 --- a/arch/x86/include/asm/arch-quark/acpi/lpc.asl +++ b/arch/x86/include/asm/arch-quark/acpi/lpc.asl @@ -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+ */ /* Intel LPC Bus Device - 0:1f.0 */ diff --git a/arch/x86/include/asm/arch-quark/acpi/platform.asl b/arch/x86/include/asm/arch-quark/acpi/platform.asl index db59c46..5b3e4a5 100644 --- a/arch/x86/include/asm/arch-quark/acpi/platform.asl +++ b/arch/x86/include/asm/arch-quark/acpi/platform.asl @@ -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 <asm/acpi/statdef.asl> diff --git a/arch/x86/include/asm/arch-quark/acpi/southcluster.asl b/arch/x86/include/asm/arch-quark/acpi/southcluster.asl index a89cfaf..fe9edc1 100644 --- a/arch/x86/include/asm/arch-quark/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-quark/acpi/southcluster.asl @@ -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+ */ Device (PCI0) diff --git a/arch/x86/include/asm/arch-quark/device.h b/arch/x86/include/asm/arch-quark/device.h index 4760aa2..0c43916 100644 --- a/arch/x86/include/asm/arch-quark/device.h +++ b/arch/x86/include/asm/arch-quark/device.h @@ -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+ */ #ifndef _QUARK_DEVICE_H_ diff --git a/arch/x86/include/asm/arch-quark/global_nvs.h b/arch/x86/include/asm/arch-quark/global_nvs.h index 0231da0..6e99e67 100644 --- a/arch/x86/include/asm/arch-quark/global_nvs.h +++ b/arch/x86/include/asm/arch-quark/global_nvs.h @@ -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+ */ #ifndef _GLOBAL_NVS_H_ diff --git a/arch/x86/include/asm/arch-quark/iomap.h b/arch/x86/include/asm/arch-quark/iomap.h index fd1ef98..e233252 100644 --- a/arch/x86/include/asm/arch-quark/iomap.h +++ b/arch/x86/include/asm/arch-quark/iomap.h @@ -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+ */ #ifndef _QUARK_IOMAP_H_ diff --git a/arch/x86/include/asm/arch-quark/irq.h b/arch/x86/include/asm/arch-quark/irq.h index 21e6830..2aaa728 100644 --- a/arch/x86/include/asm/arch-quark/irq.h +++ b/arch/x86/include/asm/arch-quark/irq.h @@ -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+ */ #ifndef _QUARK_IRQ_H_ diff --git a/arch/x86/include/asm/arch-quark/mrc.h b/arch/x86/include/asm/arch-quark/mrc.h index 150fbea..2353426 100644 --- a/arch/x86/include/asm/arch-quark/mrc.h +++ b/arch/x86/include/asm/arch-quark/mrc.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_H_ diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h index 313e23f..9527fda 100644 --- a/arch/x86/include/asm/arch-quark/msg_port.h +++ b/arch/x86/include/asm/arch-quark/msg_port.h @@ -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+ */ #ifndef _QUARK_MSG_PORT_H_ diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h index 7a864c7..feca198 100644 --- a/arch/x86/include/asm/arch-quark/quark.h +++ b/arch/x86/include/asm/arch-quark/quark.h @@ -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+ */ #ifndef _QUARK_H_ diff --git a/arch/x86/include/asm/arch-queensbay/device.h b/arch/x86/include/asm/arch-queensbay/device.h index 953b48f..15857bf 100644 --- a/arch/x86/include/asm/arch-queensbay/device.h +++ b/arch/x86/include/asm/arch-queensbay/device.h @@ -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+ */ #ifndef _QUEENSBAY_DEVICE_H_ diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h index e539890..979121c 100644 --- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel */ #ifndef __FSP_CONFIGS_H__ diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h index 9c54ecc..7572fc7 100644 --- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * * This file is automatically generated. Please do NOT modify !!! - * - * SPDX-License-Identifier: Intel */ #ifndef __VPDHEADER_H__ diff --git a/arch/x86/include/asm/arch-queensbay/tnc.h b/arch/x86/include/asm/arch-queensbay/tnc.h index 8477d92..8d15150 100644 --- a/arch/x86/include/asm/arch-queensbay/tnc.h +++ b/arch/x86/include/asm/arch-queensbay/tnc.h @@ -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+ */ #ifndef _X86_ARCH_TNC_H_ diff --git a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl index b1f0f67..a6296c2 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation * * Partially based on global_nvs.asl for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/acpi/global_nvs.h> diff --git a/arch/x86/include/asm/arch-tangier/acpi/platform.asl b/arch/x86/include/asm/arch-tangier/acpi/platform.asl index a57b7cb..7abea4b 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/platform.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/platform.asl @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation * * Partially based on platform.asl for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/acpi/statdef.asl> diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index 5289b14..3c35089 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation * * Partially based on southcluster.asl for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ Device (PCI0) diff --git a/arch/x86/include/asm/arch-tangier/global_nvs.h b/arch/x86/include/asm/arch-tangier/global_nvs.h index 8ab5cf2..a7811a3 100644 --- a/arch/x86/include/asm/arch-tangier/global_nvs.h +++ b/arch/x86/include/asm/arch-tangier/global_nvs.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation * * Partially based on global_nvs.h for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _GLOBAL_NVS_H_ diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h index f6a64ce..bd8ce55 100644 --- a/arch/x86/include/asm/bootm.h +++ b/arch/x86/include/asm/bootm.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2013, Google Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef ARM_BOOTM_H diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 4ff63c3..145b878 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __X86_CACHE_H__ diff --git a/arch/x86/include/asm/cmos_layout.h b/arch/x86/include/asm/cmos_layout.h index 0a0a51e..e2f6d18 100644 --- a/arch/x86/include/asm/cmos_layout.h +++ b/arch/x86/include/asm/cmos_layout.h @@ -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+ */ #ifndef __CMOS_LAYOUT_H diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h index 3a891ba..7ea4436 100644 --- a/arch/x86/include/asm/config.h +++ b/arch/x86/include/asm/config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2009 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CONFIG_H_ diff --git a/arch/x86/include/asm/control_regs.h b/arch/x86/include/asm/control_regs.h index 9e67478..44b8ba2 100644 --- a/arch/x86/include/asm/control_regs.h +++ b/arch/x86/include/asm/control_regs.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2012 The Chromium OS Authors. * @@ -9,8 +10,6 @@ * * Portions of this file are derived from the Linux kernel source * Copyright (C) 1991, 1992 Linus Torvalds - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __X86_CONTROL_REGS_H diff --git a/arch/x86/include/asm/coreboot_tables.h b/arch/x86/include/asm/coreboot_tables.h index e036f74..c42175b 100644 --- a/arch/x86/include/asm/coreboot_tables.h +++ b/arch/x86/include/asm/coreboot_tables.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * This file is part of the libpayload project. * * Copyright (C) 2008 Advanced Micro Devices, Inc. - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef _COREBOOT_TABLES_H diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index bc2c4ff..feee0f9 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2014 The Chromium OS Authors. * * Part of this file is adapted from coreboot * src/arch/x86/include/arch/cpu.h and * src/arch/x86/lib/cpu.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CPU_H diff --git a/arch/x86/include/asm/cpu_common.h b/arch/x86/include/asm/cpu_common.h index 562de3e..4c91a5d 100644 --- a/arch/x86/include/asm/cpu_common.h +++ b/arch/x86/include/asm/cpu_common.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_CPU_COMMON_H diff --git a/arch/x86/include/asm/cpu_x86.h b/arch/x86/include/asm/cpu_x86.h index 74b82ed..19223f2 100644 --- a/arch/x86/include/asm/cpu_x86.h +++ b/arch/x86/include/asm/cpu_x86.h @@ -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+ */ #ifndef _ASM_CPU_X86_H diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 43073ad..b353ff0 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007 * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_X86_DMA_MAPPING_H #define __ASM_X86_DMA_MAPPING_H diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h index cd2634d..543a9e6 100644 --- a/arch/x86/include/asm/early_cmos.h +++ b/arch/x86/include/asm/early_cmos.h @@ -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+ */ #ifndef __EARLY_CMOS_H diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index 3bdcdfe..7ae9c7d 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Brought in from Linux 4.1, removed things not useful to U-Boot. * The definitions perhaps came from the GNU Library which is GPL. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_X86_ELF_H diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h index 43f0cdb..f2d7079 100644 --- a/arch/x86/include/asm/fsp/fsp_api.h +++ b/arch/x86/include/asm/fsp/fsp_api.h @@ -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 */ #ifndef __FSP_API_H__ diff --git a/arch/x86/include/asm/fsp/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h index a1467bf..e59180b 100644 --- a/arch/x86/include/asm/fsp/fsp_azalia.h +++ b/arch/x86/include/asm/fsp/fsp_azalia.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Google, Inc - * - * SPDX-License-Identifier: Intel */ #ifndef _FSP_AZALIA_H_ diff --git a/arch/x86/include/asm/fsp/fsp_bootmode.h b/arch/x86/include/asm/fsp/fsp_bootmode.h index c3f8b49..bc96ec3 100644 --- a/arch/x86/include/asm/fsp/fsp_bootmode.h +++ b/arch/x86/include/asm/fsp/fsp_bootmode.h @@ -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 */ #ifndef __FSP_BOOT_MODE_H__ diff --git a/arch/x86/include/asm/fsp/fsp_ffs.h b/arch/x86/include/asm/fsp/fsp_ffs.h index eaec2b4..61ce63c 100644 --- a/arch/x86/include/asm/fsp/fsp_ffs.h +++ b/arch/x86/include/asm/fsp/fsp_ffs.h @@ -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 */ #ifndef __FSP_FFS_H__ diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h index a024451..190aedc 100644 --- a/arch/x86/include/asm/fsp/fsp_fv.h +++ b/arch/x86/include/asm/fsp/fsp_fv.h @@ -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 */ #ifndef __FSP_FV___ diff --git a/arch/x86/include/asm/fsp/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h index 244f86e..00657b6 100644 --- a/arch/x86/include/asm/fsp/fsp_hob.h +++ b/arch/x86/include/asm/fsp/fsp_hob.h @@ -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 */ #ifndef __FSP_HOB_H__ diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h index 60ce61d..86f7801 100644 --- a/arch/x86/include/asm/fsp/fsp_infoheader.h +++ b/arch/x86/include/asm/fsp/fsp_infoheader.h @@ -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 */ #ifndef _FSP_HEADER_H_ diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h index df3add0..7e51f24 100644 --- a/arch/x86/include/asm/fsp/fsp_support.h +++ b/arch/x86/include/asm/fsp/fsp_support.h @@ -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 */ #ifndef __FSP_SUPPORT_H__ diff --git a/arch/x86/include/asm/fsp/fsp_types.h b/arch/x86/include/asm/fsp/fsp_types.h index 4fe69f2..5247102 100644 --- a/arch/x86/include/asm/fsp/fsp_types.h +++ b/arch/x86/include/asm/fsp/fsp_types.h @@ -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 */ #ifndef __FSP_TYPES_H__ diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index fcb6853..9398ec3 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_GBL_DATA_H diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h index 586ece6..58e4d7b 100644 --- a/arch/x86/include/asm/gpio.h +++ b/arch/x86/include/asm/gpio.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2012, Google Inc. All rights reserved. - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _X86_GPIO_H_ diff --git a/arch/x86/include/asm/i8254.h b/arch/x86/include/asm/i8254.h index 48e4df2..65c9761 100644 --- a/arch/x86/include/asm/i8254.h +++ b/arch/x86/include/asm/i8254.h @@ -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+ */ /* i8254.h Intel 8254 PIT registers */ diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index f216c23..b73052a 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -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+ */ /* i8259.h i8259 PIC Registers */ diff --git a/arch/x86/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h index 1e9058c..4368b6e 100644 --- a/arch/x86/include/asm/ibmpc.h +++ b/arch/x86/include/asm/ibmpc.h @@ -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+ */ #ifndef __ASM_IBMPC_H_ diff --git a/arch/x86/include/asm/intel_regs.h b/arch/x86/include/asm/intel_regs.h index d2a6d26..4e01722 100644 --- a/arch/x86/include/asm/intel_regs.h +++ b/arch/x86/include/asm/intel_regs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_INTEL_REGS_H diff --git a/arch/x86/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h index 95a4de0..fdeb857 100644 --- a/arch/x86/include/asm/interrupt.h +++ b/arch/x86/include/asm/interrupt.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2009 * Graeme Russ, graeme.russ@gmail.com * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_INTERRUPT_H_ diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index d1aaa5f..c05c6bf 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_IO_H diff --git a/arch/x86/include/asm/ioapic.h b/arch/x86/include/asm/ioapic.h index 2feed86..9e004e9 100644 --- a/arch/x86/include/asm/ioapic.h +++ b/arch/x86/include/asm/ioapic.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot file of the same name * * Copyright (C) 2010 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_IOAPIC_H diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index ddb529e..169b281 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -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+ */ #ifndef _ARCH_IRQ_H_ diff --git a/arch/x86/include/asm/ist.h b/arch/x86/include/asm/ist.h index 0cdbb45..80b8597 100644 --- a/arch/x86/include/asm/ist.h +++ b/arch/x86/include/asm/ist.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_X86_IST_H #define _ASM_X86_IST_H /* * Include file for the interface to IST BIOS * Copyright 2002 Andy Grover <andrew.grover@intel.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/x86/include/asm/lapic.h b/arch/x86/include/asm/lapic.h index bc2b2d1..78eef6a 100644 --- a/arch/x86/include/asm/lapic.h +++ b/arch/x86/include/asm/lapic.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot file of same name * * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ARCH_ASM_LAPIC_H diff --git a/arch/x86/include/asm/lpc_common.h b/arch/x86/include/asm/lpc_common.h index a90a22d..d462c2e 100644 --- a/arch/x86/include/asm/lpc_common.h +++ b/arch/x86/include/asm/lpc_common.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_LPC_COMMON_H diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h index 2e2251c..49d8862 100644 --- a/arch/x86/include/asm/me_common.h +++ b/arch/x86/include/asm/me_common.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From Coreboot src/southbridge/intel/bd82x6x/me.h * @@ -6,8 +7,6 @@ * easier to add new platform. * * Copyright (C) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_ME_COMMON_H diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 29bf060..f7b32a5 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARCH_MICROCODE_H diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index 83b99dc..fb59e2f 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -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/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index 30dbdca..a25f8f0 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Adapted from coreboot src/arch/x86/include/arch/smp/mpspec.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_MPSPEC_H diff --git a/arch/x86/include/asm/mrc_common.h b/arch/x86/include/asm/mrc_common.h index cad24f2..d4e56bf 100644 --- a/arch/x86/include/asm/mrc_common.h +++ b/arch/x86/include/asm/mrc_common.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_MRC_COMMON_H diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h index e35b5ed..04783cd 100644 --- a/arch/x86/include/asm/mrccache.h +++ b/arch/x86/include/asm/mrccache.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Google, Inc * Copyright (C) 2015 Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_MRCCACHE_H diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index b2a03f4..9c1dbe6 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Taken from the linux kernel file of the same name * * (C) Copyright 2012 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_X86_MSR_INDEX_H diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 8e8d443..3e613de 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Taken from the linux kernel file of the same name * * (C) Copyright 2012 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_X86_MSR_H diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index f9b30f6..05cd7b7 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2014 Google, Inc * * From Coreboot file of the same name - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_MTRR_H diff --git a/arch/x86/include/asm/pch_common.h b/arch/x86/include/asm/pch_common.h index 924ccc4..c4614d3f 100644 --- a/arch/x86/include/asm/pch_common.h +++ b/arch/x86/include/asm/pch_common.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __asm_pch_common_h diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index f93c840..118ac93 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -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+ */ #ifndef _PCI_I386_H_ diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h index 0afcb46..67e5c44 100644 --- a/arch/x86/include/asm/pirq_routing.h +++ b/arch/x86/include/asm/pirq_routing.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from coreboot src/arch/x86/include/arch/pirq_routing.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PIRQ_ROUTING_H_ diff --git a/arch/x86/include/asm/pmu.h b/arch/x86/include/asm/pmu.h index 96b968f..b76bdf6 100644 --- a/arch/x86/include/asm/pmu.h +++ b/arch/x86/include/asm/pmu.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _X86_ASM_PMU_IPC_H_ #define _X86_ASM_PMU_IPC_H_ diff --git a/arch/x86/include/asm/pnp_def.h b/arch/x86/include/asm/pnp_def.h index 24b038d..0345d19 100644 --- a/arch/x86/include/asm/pnp_def.h +++ b/arch/x86/include/asm/pnp_def.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * * Adapted from coreboot src/include/device/pnp_def.h * and arch/x86/include/arch/io.h - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_PNP_DEF_H_ diff --git a/arch/x86/include/asm/post.h b/arch/x86/include/asm/post.h index f627663..939b6fa 100644 --- a/arch/x86/include/asm/post.h +++ b/arch/x86/include/asm/post.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _post_h diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index cefc633..dd957d2 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -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+ */ #ifndef __ASM_PROCESSOR_H_ diff --git a/arch/x86/include/asm/report_platform.h b/arch/x86/include/asm/report_platform.h index 4607dd3..26e70f1 100644 --- a/arch/x86/include/asm/report_platform.h +++ b/arch/x86/include/asm/report_platform.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ARCH_REPORT_PLATFORM_H diff --git a/arch/x86/include/asm/scu.h b/arch/x86/include/asm/scu.h index 4d40e49..7ce5824 100644 --- a/arch/x86/include/asm/scu.h +++ b/arch/x86/include/asm/scu.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _X86_ASM_SCU_IPC_H_ #define _X86_ASM_SCU_IPC_H_ diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h index 22d7f5a..a6be360 100644 --- a/arch/x86/include/asm/sections.h +++ b/arch/x86/include/asm/sections.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2012 The Chromium OS Authors. - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_X86_SECTIONS_H diff --git a/arch/x86/include/asm/setjmp.h b/arch/x86/include/asm/setjmp.h index 1feaa89..f25975f 100644 --- a/arch/x86/include/asm/setjmp.h +++ b/arch/x86/include/asm/setjmp.h @@ -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 */ #ifndef __setjmp_h diff --git a/arch/x86/include/asm/sipi.h b/arch/x86/include/asm/sipi.h index da91a48..1ab6c28 100644 --- a/arch/x86/include/asm/sipi.h +++ b/arch/x86/include/asm/sipi.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2015 Gooogle, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_SIPI_H diff --git a/arch/x86/include/asm/speedstep.h b/arch/x86/include/asm/speedstep.h index b938b86..43bfabf 100644 --- a/arch/x86/include/asm/speedstep.h +++ b/arch/x86/include/asm/speedstep.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From Coreboot file of same name * * Copyright (C) 2007-2009 coresystems GmbH * 2012 secunet Security Networks AG - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_SPEEDSTEP_H diff --git a/arch/x86/include/asm/spl.h b/arch/x86/include/asm/spl.h index d48a3fc..8cf59d1 100644 --- a/arch/x86/include/asm/spl.h +++ b/arch/x86/include/asm/spl.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017 Google, Inc * Written by Simon Glass <sjg@chromium.org> * - * SPDX-License-Identifier: GPL-2.0+ - * * This file is required for SPL to build, but is empty. */ diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h index c784a2a..f7c72ed 100644 --- a/arch/x86/include/asm/tables.h +++ b/arch/x86/include/asm/tables.h @@ -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+ */ #ifndef _X86_TABLES_H_ diff --git a/arch/x86/include/asm/turbo.h b/arch/x86/include/asm/turbo.h index 21b910b..94a6353 100644 --- a/arch/x86/include/asm/turbo.h +++ b/arch/x86/include/asm/turbo.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot file of the same name * * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_TURBO_H diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 187fe5f..9be4584 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -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+ */ #ifndef _U_BOOT_I386_H_ diff --git a/arch/x86/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h index 4c4527e..432eb35 100644 --- a/arch/x86/include/asm/u-boot.h +++ b/arch/x86/include/asm/u-boot.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> @@ -7,8 +8,6 @@ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Alex Zuepke <azu@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ - * ******************************************************************** * NOTE: This header file defines an interface to U-Boot. Including * this (unmodified) header file in another file is considered normal diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h index 94fa2a7..03bed54 100644 --- a/arch/x86/include/asm/zimage.h +++ b/arch/x86/include/asm/zimage.h @@ -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+ */ #ifndef _ASM_ZIMAGE_H_ diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index f6be13f..51d451f 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_X86_64 obj-y += bios.o diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 182379b..514b92f 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.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/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 0d448cf..7c4321b 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on acpi.c from coreboot * * Copyright (C) 2015, Saket Sinha <saket.sinha89@gmail.com> * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index 9da04dd..90dce22 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c * @@ -8,8 +9,6 @@ * generate asm statements containing #defines, * compile this file to assembler, and then extract the * #defines from the assembly-language output. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index f9092fd..b990f53 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot file device/oprom/realmode/x86.c * * Copyright (C) 2007 Advanced Micro Devices, Inc. * Copyright (C) 2009-2010 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> #include <bios_emul.h> diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h index 668f4b5..2e51b9f 100644 --- a/arch/x86/lib/bios.h +++ b/arch/x86/lib/bios.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From Coreboot file device/oprom/realmode/x86.h * * Copyright (C) 2007 Advanced Micro Devices, Inc. * Copyright (C) 2009-2010 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef _X86_LIB_BIOS_H diff --git a/arch/x86/lib/bios_asm.S b/arch/x86/lib/bios_asm.S index 9dbf969..62dc565 100644 --- a/arch/x86/lib/bios_asm.S +++ b/arch/x86/lib/bios_asm.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * From coreboot x86_asm.S, cleaned up substantially * * Copyright (C) 2009-2010 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <asm/processor.h> diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c index e8ca6e6..fdd966b 100644 --- a/arch/x86/lib/bios_interrupts.c +++ b/arch/x86/lib/bios_interrupts.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot * * Copyright (C) 2001 Ronald G. Minnich * Copyright (C) 2005 Nick.Barker9@btinternet.com * Copyright (C) 2007-2009 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 8e76ba3..533ba07 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> * * Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index a24d3f0..9fce021 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -11,8 +12,6 @@ * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 5e0edd3..2d08a2d 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.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/lib/crt0_ia32_efi.S b/arch/x86/lib/crt0_ia32_efi.S index 30e5eb0..c0a4853 100644 --- a/arch/x86/lib/crt0_ia32_efi.S +++ b/arch/x86/lib/crt0_ia32_efi.S @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * crt0-efi-ia32.S - x86 EFI startup code. * * Copyright (C) 1999 Hewlett-Packard Co. * Contributed by David Mosberger <davidm@hpl.hp.com>. * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause */ .text diff --git a/arch/x86/lib/crt0_x86_64_efi.S b/arch/x86/lib/crt0_x86_64_efi.S index c5cbf41..989799f 100644 --- a/arch/x86/lib/crt0_x86_64_efi.S +++ b/arch/x86/lib/crt0_x86_64_efi.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * crt0-efi-x86_64.S - x86_64 EFI startup code. * Copyright (C) 1999 Hewlett-Packard Co. @@ -6,7 +7,6 @@ * Contributed by Fenghua Yu <fenghua.yu@intel.com>. * * All rights reserved. - * SPDX-License-Identifier: BSD-3-Clause */ .text .align 4 diff --git a/arch/x86/lib/div64.c b/arch/x86/lib/div64.c index 4efed74..2bea205 100644 --- a/arch/x86/lib/div64.c +++ b/arch/x86/lib/div64.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * This file is copied from the coreboot repository as part of * the libpayload project: * * Copyright 2014 Google Inc. - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 84c8fab..9a9ec99 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.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/lib/early_cmos.c b/arch/x86/lib/early_cmos.c index fa0b327..f7b3bb2 100644 --- a/arch/x86/lib/early_cmos.c +++ b/arch/x86/lib/early_cmos.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+ */ /* diff --git a/arch/x86/lib/efi/Makefile b/arch/x86/lib/efi/Makefile index 43aadfc..f6c6523 100644 --- a/arch/x86/lib/efi/Makefile +++ b/arch/x86/lib/efi/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_EFI_STUB) += car.o obj-$(CONFIG_EFI_STUB) += efi.o diff --git a/arch/x86/lib/efi/car.S b/arch/x86/lib/efi/car.S index 613af9a..488dcde 100644 --- a/arch/x86/lib/efi/car.S +++ b/arch/x86/lib/efi/car.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl car_init diff --git a/arch/x86/lib/efi/efi.c b/arch/x86/lib/efi/efi.c index b1746fa..81fb8b5 100644 --- a/arch/x86/lib/efi/efi.c +++ b/arch/x86/lib/efi/efi.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/elf_ia32_efi.lds b/arch/x86/lib/elf_ia32_efi.lds index 174d36f..983fabb 100644 --- a/arch/x86/lib/elf_ia32_efi.lds +++ b/arch/x86/lib/elf_ia32_efi.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ /* * U-Boot EFI linker script * - * SPDX-License-Identifier: BSD-2-Clause - * * Modified from usr/lib32/elf_ia32_efi.lds in gnu-efi */ diff --git a/arch/x86/lib/elf_x86_64_efi.lds b/arch/x86/lib/elf_x86_64_efi.lds index 70c7c52..7cad70a 100644 --- a/arch/x86/lib/elf_x86_64_efi.lds +++ b/arch/x86/lib/elf_x86_64_efi.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ /* * U-Boot EFI linker script * - * SPDX-License-Identifier: BSD-2-Clause - * * Modified from usr/lib32/elf_x86_64_efi.lds in gnu-efi */ diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile index c7a248f..870de71 100644 --- a/arch/x86/lib/fsp/Makefile +++ b/arch/x86/lib/fsp/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += fsp_car.o obj-y += fsp_common.o diff --git a/arch/x86/lib/fsp/fsp_car.S b/arch/x86/lib/fsp/fsp_car.S index fbe8aef..549d863 100644 --- a/arch/x86/lib/fsp/fsp_car.S +++ b/arch/x86/lib/fsp/fsp_car.S @@ -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 <config.h> diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 3397bb8..b4ba129 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.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/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 662d4ac..3a23b70 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.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/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index af71276..91d2d08 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.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/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c index e0c49be..90e4e7d 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp/fsp_support.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/lib/i8254.c b/arch/x86/lib/i8254.c index 46a4245..1f10124 100644 --- a/arch/x86/lib/i8254.c +++ b/arch/x86/lib/i8254.c @@ -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 <common.h> diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c index b9d0614..358cd1e 100644 --- a/arch/x86/lib/i8259.c +++ b/arch/x86/lib/i8259.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Graeme Russ, <graeme.russ@gmail.com> * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 420393b..0481f45 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index d3ae6d9..297067d 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Graeme Russ, <graeme.russ@gmail.com> @@ -16,8 +17,6 @@ * * (C) Copyright 2001 * Josh Huber, Mission Critical Linux, Inc, <huber@mclx.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/x86/lib/lpc-uclass.c b/arch/x86/lib/lpc-uclass.c index 37b0c21..505d7a9 100644 --- a/arch/x86/lib/lpc-uclass.c +++ b/arch/x86/lib/lpc-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index a6e493d..b5ad113 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Adapted from coreboot src/arch/x86/boot/mpspec.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index eca88ac..2a89198 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot src/southbridge/intel/bd82x6x/mrccache.c * * Copyright (C) 2014 Google Inc. * Copyright (C) 2015 Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/lib/northbridge-uclass.c b/arch/x86/lib/northbridge-uclass.c index 64b6257..3838887 100644 --- a/arch/x86/lib/northbridge-uclass.c +++ b/arch/x86/lib/northbridge-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index 406852d..5868d5b 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.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/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index 5df3cab..e5f0e61 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Part of this file is ported from coreboot src/arch/x86/boot/pirq_routing.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c index 4ceab8d..08fbe99 100644 --- a/arch/x86/lib/pmu.c +++ b/arch/x86/lib/pmu.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> #include <dm.h> diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c index c21be03..0338539 100644 --- a/arch/x86/lib/ramtest.c +++ b/arch/x86/lib/ramtest.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Google, Inc * * From Coreboot src/lib/ramtest.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/lib/reloc_ia32_efi.c b/arch/x86/lib/reloc_ia32_efi.c index 4d68255..e838af3 100644 --- a/arch/x86/lib/reloc_ia32_efi.c +++ b/arch/x86/lib/reloc_ia32_efi.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * reloc_ia32.c - position independent x86 ELF shared object relocator * Copyright (C) 1999 Hewlett-Packard Co. * Contributed by David Mosberger <davidm@hpl.hp.com>. * * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/arch/x86/lib/reloc_x86_64_efi.c b/arch/x86/lib/reloc_x86_64_efi.c index 5f71f2a..34c5b2e 100644 --- a/arch/x86/lib/reloc_x86_64_efi.c +++ b/arch/x86/lib/reloc_x86_64_efi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * reloc_x86_64.c - position independent x86_64 ELF shared object relocator * Copyright (C) 1999 Hewlett-Packard Co. @@ -6,8 +7,6 @@ * Contributed by Fenghua Yu <fenghua.yu@intel.com>. * * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 114f602..050f9d0 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -11,8 +12,6 @@ * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index bb23d0b..caa04c6 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation * @@ -7,8 +8,6 @@ * is servicing watchdog and controlling system reset function. * * This driver enables IPC channel to SCU. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/arch/x86/lib/sections.c b/arch/x86/lib/sections.c index 6455e0f..8d17007 100644 --- a/arch/x86/lib/sections.c +++ b/arch/x86/lib/sections.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2013 Albert ARIBAUD <albert.u.boot@aribaud.net> - * - * SPDX-License-Identifier: GPL-2.0+ */ char __efi_runtime_start[0] __attribute__((section(".__efi_runtime_start"))); diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index 507e037..b48bd5d 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 7c32245..7d29074 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.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/lib/string.c b/arch/x86/lib/string.c index 5343c2b..c6263cd 100644 --- a/arch/x86/lib/string.c +++ b/arch/x86/lib/string.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 1991,1992,1993,1997,1998,2003, 2005 Free Software Foundation, Inc. * This file is part of the GNU C Library. * Copyright (c) 2011 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* From glibc-2.14, sysdeps/i386/memset.c */ diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 4f5fe74..99f1429 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.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/lib/zimage.c b/arch/x86/lib/zimage.c index 9932ee6..04ed972 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* |