diff options
Diffstat (limited to 'arch/x86')
318 files changed, 318 insertions, 656 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 4be1c353cc..fec14847cc 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 69074f4711..97db03deee 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 94cdff18cc..d5a17d08cf 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifeq ($(CONFIG_$(SPL_)X86_64),y) extra-y = start64.o diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index f47bedaf8d..ac58b03810 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_BAYTRAIL bool diff --git a/arch/x86/cpu/baytrail/Makefile b/arch/x86/cpu/baytrail/Makefile index a0216f3059..ce5d6178cd 100644 --- a/arch/x86/cpu/baytrail/Makefile +++ b/arch/x86/cpu/baytrail/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cpu.o obj-y += early_uart.o diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 7aac634d66..445e4ba2d7 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index 0bb08524f8..29baf087aa 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Based on code from coreboot */ diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index afab21f1dd..08dbd5538f 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c index 6b762e581a..cefd26299a 100644 --- a/arch/x86/cpu/baytrail/fsp_configs.c +++ b/arch/x86/cpu/baytrail/fsp_configs.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015, Kodak Alaris, Inc - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index 9af1bdabbd..3194f8c653 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/Kconfig b/arch/x86/cpu/braswell/Kconfig index 042ad2bf51..2676fe6e17 100644 --- a/arch/x86/cpu/braswell/Kconfig +++ b/arch/x86/cpu/braswell/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_BRASWELL bool diff --git a/arch/x86/cpu/braswell/Makefile b/arch/x86/cpu/braswell/Makefile index 4a639b83f5..277f81e6de 100644 --- a/arch/x86/cpu/braswell/Makefile +++ b/arch/x86/cpu/braswell/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += braswell.o early_uart.o fsp_configs.o diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c index 37099aa3fd..32a6a5e5a8 100644 --- a/arch/x86/cpu/braswell/braswell.c +++ b/arch/x86/cpu/braswell/braswell.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c index c70a8854fd..d78c6b0feb 100644 --- a/arch/x86/cpu/braswell/early_uart.c +++ b/arch/x86/cpu/braswell/early_uart.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 249f851265..7fe6fa7995 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/Kconfig b/arch/x86/cpu/broadwell/Kconfig index 42018dc127..5b015c89d9 100644 --- a/arch/x86/cpu/broadwell/Kconfig +++ b/arch/x86/cpu/broadwell/Kconfig @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 2016 Google Inc. # -# SPDX-License-Identifier: GPL-2.0 config INTEL_BROADWELL bool diff --git a/arch/x86/cpu/broadwell/Makefile b/arch/x86/cpu/broadwell/Makefile index 7edb6f6f19..a032861e57 100644 --- a/arch/x86/cpu/broadwell/Makefile +++ b/arch/x86/cpu/broadwell/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cpu.o obj-y += iobp.o diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c index 294dfa6643..02b3169cf5 100644 --- a/arch/x86/cpu/broadwell/cpu.c +++ b/arch/x86/cpu/broadwell/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Based on code from coreboot src/soc/intel/broadwell/cpu.c */ diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c index 5eed849812..8a3ca6cde7 100644 --- a/arch/x86/cpu/broadwell/iobp.c +++ b/arch/x86/cpu/broadwell/iobp.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * Modified from coreboot - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c index ee3ac1820d..9dc9b63db6 100644 --- a/arch/x86/cpu/broadwell/lpc.c +++ b/arch/x86/cpu/broadwell/lpc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot broadwell support - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c index e03b87c40f..adc656c07a 100644 --- a/arch/x86/cpu/broadwell/me.c +++ b/arch/x86/cpu/broadwell/me.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Based on code from coreboot src/soc/intel/broadwell/me_status.c */ diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c index aa64808e45..3055880bb7 100644 --- a/arch/x86/cpu/broadwell/northbridge.c +++ b/arch/x86/cpu/broadwell/northbridge.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c index 16eac3daae..82506ba35e 100644 --- a/arch/x86/cpu/broadwell/pch.c +++ b/arch/x86/cpu/broadwell/pch.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c index 881413f476..914ecfb314 100644 --- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c +++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/power_state.c b/arch/x86/cpu/broadwell/power_state.c index 2b9a6bf3a1..09fda487d0 100644 --- a/arch/x86/cpu/broadwell/power_state.c +++ b/arch/x86/cpu/broadwell/power_state.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot src/soc/intel/broadwell/romstage/power_state.c * * Copyright (C) 2016 Google, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c index 4fa4de3525..f016489185 100644 --- a/arch/x86/cpu/broadwell/refcode.c +++ b/arch/x86/cpu/broadwell/refcode.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Read a coreboot rmodule and execute it. * The rmodule_header struct is from coreboot. * * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index 10461d99a8..d89e0a1c9b 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot src/soc/intel/broadwell/sata.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index 774aba6359..03a35bcf73 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc * * From coreboot src/soc/intel/broadwell/romstage/raminit.c - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/call32.S b/arch/x86/cpu/call32.S index c517e4a89f..e185b9a42b 100644 --- a/arch/x86/cpu/call32.S +++ b/arch/x86/cpu/call32.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index b519f433ac..22416f39b6 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# CROSS_COMPILE ?= i386-linux- diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile index d663656bf9..35b15bb1da 100644 --- a/arch/x86/cpu/coreboot/Makefile +++ b/arch/x86/cpu/coreboot/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. # @@ -9,9 +10,6 @@ # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o obj-y += coreboot.o diff --git a/arch/x86/cpu/coreboot/car.S b/arch/x86/cpu/coreboot/car.S index 6982106c19..7163b69a49 100644 --- a/arch/x86/cpu/coreboot/car.S +++ b/arch/x86/cpu/coreboot/car.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .text diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index df5ad13821..69025c1537 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 885fc6f5f2..664817feff 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c index 543e51d96a..bc18b710c9 100644 --- a/arch/x86/cpu/coreboot/tables.c +++ b/arch/x86/cpu/coreboot/tables.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * This file is part of the libpayload project. * * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2009 coresystems GmbH - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index b3827951e6..e698200d70 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * This file is part of the coreboot project. * * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index 1c42584e76..db36553d05 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -15,8 +16,6 @@ * * Part of this file is adapted from coreboot * src/arch/x86/lib/cpu.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index b465b14a94..2b6cc9f22d 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index e09163715d..06d0480440 100644 --- a/arch/x86/cpu/efi/Makefile +++ b/arch/x86/cpu/efi/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += efi.o obj-y += sdram.o diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/efi.c index d82147be47..cda4fabe15 100644 --- a/arch/x86/cpu/efi/efi.c +++ b/arch/x86/cpu/efi/efi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 413e55b596..a45525f842 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/call64.S b/arch/x86/cpu/i386/call64.S index 970c461508..8f86728d42 100644 --- a/arch/x86/cpu/i386/call64.S +++ b/arch/x86/cpu/i386/call64.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2014 Google, Inc * Copyright (C) 1991, 1992, 1993 Linus Torvalds * * Parts of this copied from Linux arch/x86/boot/compressed/head_64.S - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index aabdc94bb0..208ef08562 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -15,8 +16,6 @@ * * Part of this file is adapted from coreboot * src/arch/x86/lib/cpu.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index ba576fef3c..ed8423e079 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ@gmail.com> @@ -7,8 +8,6 @@ * * Portions of this file are derived from the Linux kernel source * Copyright (C) 1991, 1992 Linus Torvalds - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/i386/setjmp.S b/arch/x86/cpu/i386/setjmp.S index 2ea1c6c766..40b10dc8df 100644 --- a/arch/x86/cpu/i386/setjmp.S +++ b/arch/x86/cpu/i386/setjmp.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Written by H. Peter Anvin <hpa@zytor.com> * Brought in from Linux v4.4 and modified for U-Boot * From Linux arch/um/sys-i386/setjmp.S - * - * SPDX-License-Identifier: GPL-2.0 */ #define _REGPARM diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index 1145e7896c..c0fcf0ce78 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_HAVE_MRC obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += car.o diff --git a/arch/x86/cpu/intel_common/car.S b/arch/x86/cpu/intel_common/car.S index 6e0db96c01..fe8dfbc9ca 100644 --- a/arch/x86/cpu/intel_common/car.S +++ b/arch/x86/cpu/intel_common/car.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2014 Google, Inc * @@ -7,8 +8,6 @@ * Copyright (C) 2005 Tyan (written by Yinghai Lu for Tyan) * Copyright (C) 2007-2008 coresystems GmbH * Copyright (C) 2012 Kyösti Mälkki <kyosti.malkki@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c index ae42095f4b..d0ac17808c 100644 --- a/arch/x86/cpu/intel_common/cpu.c +++ b/arch/x86/cpu/intel_common/cpu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c index 696b6304fe..2a538cf12e 100644 --- a/arch/x86/cpu/intel_common/lpc.c +++ b/arch/x86/cpu/intel_common/lpc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/me_status.c b/arch/x86/cpu/intel_common/me_status.c index 130d219bc9..fc9efbf3a9 100644 --- a/arch/x86/cpu/intel_common/me_status.c +++ b/arch/x86/cpu/intel_common/me_status.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/southbridge/intel/bd82x6x/me_status.c * * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index 8813258754..11b1ec8955 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Google, Inc * Copyright (C) 2000 Ronald G. Minnich * * Microcode update for Intel PIII and later CPUs - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index f1a249af72..a5697a62a5 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/pch.c b/arch/x86/cpu/intel_common/pch.c index 1f05b44586..af82b64a13 100644 --- a/arch/x86/cpu/intel_common/pch.c +++ b/arch/x86/cpu/intel_common/pch.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c index 05e1cf9cdb..0f217c1497 100644 --- a/arch/x86/cpu/intel_common/report_platform.c +++ b/arch/x86/cpu/intel_common/report_platform.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/northbridge/intel/sandybridge/report_platform.c * * Copyright (C) 2012 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c index d15e86c1c5..01ade76a58 100644 --- a/arch/x86/cpu/ioapic.c +++ b/arch/x86/cpu/ioapic.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c index f5654eb510..305cd3d237 100644 --- a/arch/x86/cpu/irq.c +++ b/arch/x86/cpu/irq.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig index 85ea6c91f3..82d5489a17 100644 --- a/arch/x86/cpu/ivybridge/Kconfig +++ b/arch/x86/cpu/ivybridge/Kconfig @@ -1,9 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 # # From Coreboot src/northbridge/intel/sandybridge/Kconfig # # Copyright (C) 2010 Google Inc. # -# SPDX-License-Identifier: GPL-2.0 config NORTHBRIDGE_INTEL_IVYBRIDGE bool diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile index 25fbd599db..27cfb26317 100644 --- a/arch/x86/cpu/ivybridge/Makefile +++ b/arch/x86/cpu/ivybridge/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2014 Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_HAVE_FSP obj-y += fsp_configs.o ivybridge.o diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index e3eff69cf6..a78bb02544 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c index 099cb94e5d..c8b16e32c0 100644 --- a/arch/x86/cpu/ivybridge/cpu.c +++ b/arch/x86/cpu/ivybridge/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2014 Google, Inc * (C) Copyright 2008 @@ -7,8 +8,6 @@ * and src/cpu/intel/model_206ax/bootblock.c * Copyright (C) 2007-2010 coresystems GmbH * Copyright (C) 2011 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index 5435a92afa..1a15229196 100644 --- a/arch/x86/cpu/ivybridge/early_me.c +++ b/arch/x86/cpu/ivybridge/early_me.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot src/southbridge/intel/bd82x6x/early_me.c * * Copyright (C) 2011 The Chromium OS Authors. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c index c7f475b5a6..2fd06b3bed 100644 --- a/arch/x86/cpu/ivybridge/fsp_configs.c +++ b/arch/x86/cpu/ivybridge/fsp_configs.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c index e817eb9cc2..8d10fd6c54 100644 --- a/arch/x86/cpu/ivybridge/ivybridge.c +++ b/arch/x86/cpu/ivybridge/ivybridge.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c index 4e254b3c57..d9ddcdc840 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot southbridge/intel/bd82x6x/lpc.c * * Copyright (C) 2008-2009 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index 81dedee2ec..c5441aafea 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot file of same name * * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c index 442942956b..39bab7bdf3 100644 --- a/arch/x86/cpu/ivybridge/northbridge.c +++ b/arch/x86/cpu/ivybridge/northbridge.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot northbridge/intel/sandybridge/northbridge.c * * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2011 The Chromium Authors - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c index 7febb8cf88..fc6c427430 100644 --- a/arch/x86/cpu/ivybridge/sata.c +++ b/arch/x86/cpu/ivybridge/sata.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot * Copyright (C) 2008-2009 coresystems GmbH - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 1cdbe479fd..2f253e813e 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 @@ -6,8 +7,6 @@ * Portions from Coreboot mainboard/google/link/romstage.c * Copyright (C) 2007-2010 coresystems GmbH * Copyright (C) 2011 Google Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c index bd1189e447..c55213ca2d 100644 --- a/arch/x86/cpu/ivybridge/sdram_nop.c +++ b/arch/x86/cpu/ivybridge/sdram_nop.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/lapic.c b/arch/x86/cpu/lapic.c index fbea2d1572..44ed446784 100644 --- a/arch/x86/cpu/lapic.c +++ b/arch/x86/cpu/lapic.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From coreboot file of same name * * Copyright (C) 2008-2009 coresystems GmbH * Copyright (C) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index cfd9bb447b..ea64c2ee57 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Based on code from the coreboot file of the same name */ diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 5d36b3e020..3094006562 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 Google, Inc * - * SPDX-License-Identifier: GPL-2.0+ - * * Memory Type Range Regsters - these are used to tell the CPU whether * memory is cacheable and if so the cache write mode to use. * diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 2728c00227..c6218250e1 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008,2009 @@ -5,8 +6,6 @@ * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index 0a801aabea..31428dd0a0 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config QEMU bool diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index a080c5e2f4..e5ea92545e 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_EFI_STUB obj-y += car.o dram.o diff --git a/arch/x86/cpu/qemu/car.S b/arch/x86/cpu/qemu/car.S index 13b3aea3ff..466b4876ef 100644 --- a/arch/x86/cpu/qemu/car.S +++ b/arch/x86/cpu/qemu/car.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index b53630b099..f40fb4d087 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Miao Yan <yanmiaobest@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index 9d84af5ef2..736c4c3ace 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index ec733cb038..0a690fde68 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 35a146c66a..1fdb11cc60 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig index 0ed724813d..76f159243f 100644 --- a/arch/x86/cpu/quark/Kconfig +++ b/arch/x86/cpu/quark/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_QUARK bool diff --git a/arch/x86/cpu/quark/Makefile b/arch/x86/cpu/quark/Makefile index 93ce412166..476e37cfe5 100644 --- a/arch/x86/cpu/quark/Makefile +++ b/arch/x86/cpu/quark/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o dram.o irq.o msg_port.o quark.o obj-y += mrc.o mrc_util.o hte.o smc.o diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c index 5717a620b5..4a0272085c 100644 --- a/arch/x86/cpu/quark/acpi.c +++ b/arch/x86/cpu/quark/acpi.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/car.S b/arch/x86/cpu/quark/car.S index 3432ffa081..48d5167c74 100644 --- a/arch/x86/cpu/quark/car.S +++ b/arch/x86/cpu/quark/car.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index 47beb86da3..51f9659ab1 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/hte.c b/arch/x86/cpu/quark/hte.c index db601e4efb..df14779357 100644 --- a/arch/x86/cpu/quark/hte.c +++ b/arch/x86/cpu/quark/hte.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/hte.h b/arch/x86/cpu/quark/hte.h index e98c7ef41d..b4ea488f30 100644 --- a/arch/x86/cpu/quark/hte.h +++ b/arch/x86/cpu/quark/hte.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _HTE_H_ diff --git a/arch/x86/cpu/quark/irq.c b/arch/x86/cpu/quark/irq.c index 1f8f90923d..6928c33600 100644 --- a/arch/x86/cpu/quark/irq.c +++ b/arch/x86/cpu/quark/irq.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c index 6e774cbcd8..3e8c0bc28c 100644 --- a/arch/x86/cpu/quark/mrc.c +++ b/arch/x86/cpu/quark/mrc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ /* diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c index fac2d72e0d..8a68ddba97 100644 --- a/arch/x86/cpu/quark/mrc_util.c +++ b/arch/x86/cpu/quark/mrc_util.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/mrc_util.h b/arch/x86/cpu/quark/mrc_util.h index a63d1f91e9..4a760a9f59 100644 --- a/arch/x86/cpu/quark/mrc_util.h +++ b/arch/x86/cpu/quark/mrc_util.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _MRC_UTIL_H_ diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c index cf828f21c0..d4f8c082ff 100644 --- a/arch/x86/cpu/quark/msg_port.c +++ b/arch/x86/cpu/quark/msg_port.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index c36a5892d5..46141c434d 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c index 0195b56a52..b4b3e1204b 100644 --- a/arch/x86/cpu/quark/smc.c +++ b/arch/x86/cpu/quark/smc.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/quark/smc.h b/arch/x86/cpu/quark/smc.h index 1582b87e10..eee27564c8 100644 --- a/arch/x86/cpu/quark/smc.h +++ b/arch/x86/cpu/quark/smc.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: Intel */ /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> * * Ported from Intel released Quark UEFI BIOS * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei - * - * SPDX-License-Identifier: Intel */ #ifndef _SMC_H_ diff --git a/arch/x86/cpu/queensbay/Kconfig b/arch/x86/cpu/queensbay/Kconfig index 460ede00bc..c9e0fda031 100644 --- a/arch/x86/cpu/queensbay/Kconfig +++ b/arch/x86/cpu/queensbay/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_QUEENSBAY bool diff --git a/arch/x86/cpu/queensbay/Makefile b/arch/x86/cpu/queensbay/Makefile index c0681995bd..b535b2a406 100644 --- a/arch/x86/cpu/queensbay/Makefile +++ b/arch/x86/cpu/queensbay/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += fsp_configs.o irq.o obj-y += tnc.o diff --git a/arch/x86/cpu/queensbay/fsp_configs.c b/arch/x86/cpu/queensbay/fsp_configs.c index f83bb5f221..c4d117783c 100644 --- a/arch/x86/cpu/queensbay/fsp_configs.c +++ b/arch/x86/cpu/queensbay/fsp_configs.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: Intel /* * Copyright (C) 2013, Intel Corporation * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel */ #include <common.h> diff --git a/arch/x86/cpu/queensbay/irq.c b/arch/x86/cpu/queensbay/irq.c index 63d0f35a29..208cd61b55 100644 --- a/arch/x86/cpu/queensbay/irq.c +++ b/arch/x86/cpu/queensbay/irq.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> * Copyright (C) 2015 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 94668a4fda..439c14d8bc 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index 183275b9c2..a52225d5ee 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Reset vector, jumps to start16.S */ diff --git a/arch/x86/cpu/sipi_vector.S b/arch/x86/cpu/sipi_vector.S index 94c0f5a702..40cc27f1e1 100644 --- a/arch/x86/cpu/sipi_vector.S +++ b/arch/x86/cpu/sipi_vector.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * Taken from coreboot file of the same name */ diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 8de55a0af1..e4e997e3e8 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * @@ -6,8 +7,6 @@ * * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 5eb17f15c9..dd659278ff 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - x86 Startup Code * @@ -6,8 +7,6 @@ * * (C) Copyright 2002,2003 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/global_data.h> diff --git a/arch/x86/cpu/start64.S b/arch/x86/cpu/start64.S index 651f16ac89..234482b793 100644 --- a/arch/x86/cpu/start64.S +++ b/arch/x86/cpu/start64.S @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * 64-bit x86 Startup Code * * (C) Copyright 216 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index 2469b1e7c7..a3bd16799d 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# config INTEL_TANGIER bool diff --git a/arch/x86/cpu/tangier/Makefile b/arch/x86/cpu/tangier/Makefile index 92cfa555ed..44ccb3ff91 100644 --- a/arch/x86/cpu/tangier/Makefile +++ b/arch/x86/cpu/tangier/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Intel Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += car.o tangier.o sdram.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi.o diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 75e777dcd7..0e4f961c53 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation * * Partially based on acpi.c for other x86 platforms - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/tangier/car.S b/arch/x86/cpu/tangier/car.S index 6982106c19..7163b69a49 100644 --- a/arch/x86/cpu/tangier/car.S +++ b/arch/x86/cpu/tangier/car.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .text diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index f5f412a1e5..b47d896e20 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index ac8733c75e..0a15e64344 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c index c0bff75c4f..a41d511238 100644 --- a/arch/x86/cpu/turbo.c +++ b/arch/x86/cpu/turbo.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * From Coreboot file of the same name * * Copyright (C) 2011 The Chromium Authors. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index 718790c79a..3f38681669 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index 8a38d58f12..574d992aaa 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 186718d8f9..f0719368ba 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel@omicron.se. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S index 066c9b1a55..663b02f27d 100644 --- a/arch/x86/cpu/wakeup.S +++ b/arch/x86/cpu/wakeup.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com> * * From coreboot src/arch/x86/wakeup.S - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/acpi_s3.h> diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 693d1a31f3..18b3e94e12 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 3e06173186..15830d6a1a 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/x86_64/setjmp.c b/arch/x86/cpu/x86_64/setjmp.c index 25f8d2804b..5d4a74a571 100644 --- a/arch/x86/cpu/x86_64/setjmp.c +++ b/arch/x86/cpu/x86_64/setjmp.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2016 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 6d0c4b65ec..73797746f8 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 0c314e0688..74291a8f09 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 171e7ffee6..36e6069b19 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 41e72f3eb6..c3a6aad77b 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 9c068709ee..c3d15143cf 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 d41556638c..ea836eec95 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 78a1ef415c..4fe076a8e9 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 31d9679059..ca60289370 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 b62e00ff1f..cb96fdf7e7 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 0b04984c6e..9033532294 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 6cd8116afd..62ae96a3f3 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 7714ed0b77..6b651a394f 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 da3cbff5cb..d86fdc06fd 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 a0ad03ce23..42ba0c7714 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 afea14ed32..6565429867 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 bc398dd72c..f1c4cb9c03 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 04eb98547f..7ebc30166d 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 75f9ffa8f3..ea0bff7b92 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 7e37d4f394..1253fa51c2 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 8e7b603ba0..6025507e7c 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 7f2ffd49ec..d56d35ca53 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 46381b687e..5d50ef3673 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 f0b3a6bc0a..6e404f48bb 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 84c1e53c7d..9fc83a511e 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 64d38207d9..0ed7efd85a 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 5600723084..32e16a2c2f 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 e8cff100fc..6697bc455b 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 86aec0abe0..baa848dcd1 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 d5d77cc011..239bcdc576 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 a28d4dfade..9b8d1895ee 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 ef340f3d7b..abe37566cb 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 d7463140f1..57921f283d 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 fe34d3271c..08b2f53132 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 cf3de7cde4..5186fe0adf 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 e89ff26f75..dfc768cf7f 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 311f471843..78a7952cf5 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 a5a4404651..13cb429b9b 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 798d35bccf..a3872cf060 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 1c6c2479f0..cd48705ef2 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 e2f0e39046..c6544ea409 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 56e362633f..1072e3ddf4 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 ec4e9d5212..752dae0e6a 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 cd66f83c41..fda3f590fa 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 4b8521d901..4425dcb365 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 99c4c0aaca..a3bde3d8e7 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 5f1252f5d8..e8389e556f 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 7df2dc5971..873d331f92 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 eb2046b867..ca22a79996 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 0ed881b72d..a32e2db47e 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 431bc23ef2..de7f6e588c 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 a718667400..98f928a811 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 a66a8bbac1..58f16ba54c 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 3e346adfdc..23ccd68484 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 b2cc8b8dc4..4442beac5e 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 36ad842368..df35080837 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 44fcddd9c2..e7340c1e5a 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 aeb492609e..7820998699 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 12b3b5d6ee..dd8d1cba92 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 0cd7a99e2a..9320afba56 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 9b0613daf5..ae9105b6ef 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 3b255ccb81..4b0f23a340 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 bc1bc8e778..518c308d59 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 22f7929a82..850d96bdd9 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 9c51f63ca4..8018bc097d 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 94533368ea..b8da21bed7 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 8e0f668f0b..a96c951c85 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 38ab798994..daafd5d067 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 a85eee8ec6..100eb8e646 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 6f0435e1de..44b9f12c7c 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 5ba31da9ec..879b67d8c5 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 c3b0b1dbe4..fc30e0ab70 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 db59c460e3..5b3e4a5339 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 a89cfaf8af..fe9edc1a87 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 4760aa2f7f..0c43916283 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 0231da0bcd..6e99e6737d 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 fd1ef987d7..e233252dc1 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 21e68307f8..2aaa728e7a 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 150fbea0e0..2353426cd6 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 313e23fe08..9527fdad3f 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 7a864c7c53..feca1983ba 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 953b48f15c..15857bfba5 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 e539890c33..979121cdec 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 9c54ecc726..7572fc7e40 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 8477d92641..8d151509ab 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 b1f0f67979..a6296c2cb6 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 a57b7cb319..7abea4bb96 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 5289b14957..3c35089665 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 8ab5cf2aa2..a7811a331a 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 f6a64ce2c9..bd8ce55729 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 4ff63c3331..145b8784de 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 0a0a51e72d..e2f6d18554 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 3a891ba627..7ea443673a 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 9e67478a3d..44b8ba2554 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 e036f744f6..c42175b94d 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 bc2c4ffd9f..feee0f915f 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 562de3e27f..4c91a5dace 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 74b82edceb..19223f2c3b 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 43073ad252..b353ff0bef 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 cd2634d4cd..543a9e69f0 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 3bdcdfe70b..7ae9c7d6da 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 43f0cdb085..f2d70799f3 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 a1467bf991..e59180bdae 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 c3f8b49471..bc96ec308c 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 eaec2b490e..61ce63c08e 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 a024451a74..190aedcf44 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 244f86ef3d..00657b62c7 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 60ce61d190..86f78014b7 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 df3add008c..7e51f24b12 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 4fe69f2375..5247102f75 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 fcb6853a38..9398ec33b2 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 586ece6c10..58e4d7b831 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 48e4df25b8..65c97614d3 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 f216c23204..b73052a6d2 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 1e9058c0c1..4368b6e3e0 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 d2a6d2690e..4e017227ac 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 95a4de023e..fdeb857113 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 d1aaa5fc78..c05c6bf8a2 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 2feed864fe..9e004e9b5b 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 ddb529e581..169b2819ca 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 0cdbb45ba5..80b8597d54 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 bc2b2d1520..78eef6afd3 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 a90a22db3d..d462c2ec61 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 2e2251cc1c..49d88623ed 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 29bf060889..f7b32a5eb1 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 83b99dcd19..fb59e2f67d 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 30dbdca90d..a25f8f03a1 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 cad24f22ad..d4e56bf37c 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 e35b5ed771..04783cd329 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 b2a03f469a..9c1dbe61d5 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 8e8d4439e2..3e613de6ce 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 f9b30f68bd..05cd7b7f17 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 924ccc4db5..c4614d3f42 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 f93c840244..118ac937d9 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 0afcb4615e..67e5c447ab 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 96b968ff8f..b76bdf64a3 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 24b038d26a..0345d195c6 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 f627663f31..939b6fa57e 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 cefc633910..dd957d2c1b 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 4607dd334e..26e70f14aa 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 4d40e495bb..7ce5824167 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 22d7f5af70..a6be3604e9 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 1feaa892ad..f25975fe1d 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 da91a485d8..1ab6c2874a 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 b938b86ba8..43bfabffcc 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 d48a3fcb74..8cf59d14e7 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 c784a2aeec..f7c72ed3db 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 21b910bbf0..94a6353978 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 187fe5fd8c..9be45846a5 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 4c4527eb38..432eb35b84 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 94fa2a713f..03bed54d0b 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 f6be13fe94..51d451f952 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 182379b439..514b92ffbd 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 0d448cffc9..7c4321b5ae 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 9da04dd875..90dce22b25 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 f9092fdc65..b990f53bfd 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 668f4b5525..2e51b9fbf6 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 9dbf969373..62dc5652db 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 e8ca6e60f2..fdd966b2c8 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 8e76ba35ae..533ba075bb 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 a24d3f0134..9fce021c79 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 5e0edd3214..2d08a2db0d 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 30e5eb0c1a..c0a4853eaa 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 c5cbf4108b..989799fb4a 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 4efed74037..2bea205f60 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 84c8fab189..9a9ec991ca 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 fa0b3273a8..f7b3bb2a8e 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 43aadfc996..f6c65235e2 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 613af9ac8a..488dcde66c 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 b1746fa474..81fb8b5f72 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 174d36f758..983fabbc4d 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 70c7c52332..7cad70a2e4 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 c7a248f7f2..870de71bd7 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 fbe8aef540..549d863070 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 3397bb83ea..b4ba129725 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 662d4ace21..3a23b70410 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 af7127691f..91d2d08557 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 e0c49be635..90e4e7db26 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 46a4245289..1f1012488c 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 b9d06140d4..358cd1e70d 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 420393b843..0481f453ca 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 d3ae6d9694..297067df71 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 37b0c216c2..505d7a943d 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 a6e493d69a..b5ad1135a6 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 eca88ac8b9..2a8919885b 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 64b625770d..3838887248 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 406852d324..5868d5b60a 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 5df3cab6c9..e5f0e61424 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 4ceab8dc64..08fbe99039 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 c21be03848..0338539632 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 4d6825515d..e838af3b70 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 5f71f2ac8a..34c5b2ed3f 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 114f602f7a..050f9d07c2 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 bb23d0b829..caa04c688e 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 6455e0f088..8d1700776d 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 507e037b99..b48bd5d8f3 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 7c32245a09..7d290740bf 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 5343c2b6fd..c6263cd2f5 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 4f5fe74288..99f1429363 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 9932ee69a0..04ed972482 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+ */ /* |