summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/Makefile4
-rw-r--r--arch/x86/lib/acpi_s3.c3
-rw-r--r--arch/x86/lib/acpi_table.c3
-rw-r--r--arch/x86/lib/asm-offsets.c3
-rw-r--r--arch/x86/lib/bios.c3
-rw-r--r--arch/x86/lib/bios.h3
-rw-r--r--arch/x86/lib/bios_asm.S3
-rw-r--r--arch/x86/lib/bios_interrupts.c3
-rw-r--r--arch/x86/lib/bootm.c3
-rw-r--r--arch/x86/lib/cmd_boot.c3
-rw-r--r--arch/x86/lib/coreboot_table.c3
-rw-r--r--arch/x86/lib/crt0_ia32_efi.S3
-rw-r--r--arch/x86/lib/crt0_x86_64_efi.S2
-rw-r--r--arch/x86/lib/div64.c3
-rw-r--r--arch/x86/lib/e820.c3
-rw-r--r--arch/x86/lib/early_cmos.c3
-rw-r--r--arch/x86/lib/efi/Makefile4
-rw-r--r--arch/x86/lib/efi/car.S3
-rw-r--r--arch/x86/lib/efi/efi.c3
-rw-r--r--arch/x86/lib/elf_ia32_efi.lds3
-rw-r--r--arch/x86/lib/elf_x86_64_efi.lds3
-rw-r--r--arch/x86/lib/fsp/Makefile4
-rw-r--r--arch/x86/lib/fsp/fsp_car.S3
-rw-r--r--arch/x86/lib/fsp/fsp_common.c3
-rw-r--r--arch/x86/lib/fsp/fsp_dram.c3
-rw-r--r--arch/x86/lib/fsp/fsp_graphics.c3
-rw-r--r--arch/x86/lib/fsp/fsp_support.c3
-rw-r--r--arch/x86/lib/i8254.c3
-rw-r--r--arch/x86/lib/i8259.c3
-rw-r--r--arch/x86/lib/init_helpers.c3
-rw-r--r--arch/x86/lib/interrupts.c3
-rw-r--r--arch/x86/lib/lpc-uclass.c3
-rw-r--r--arch/x86/lib/mpspec.c3
-rw-r--r--arch/x86/lib/mrccache.c3
-rw-r--r--arch/x86/lib/northbridge-uclass.c3
-rw-r--r--arch/x86/lib/pinctrl_ich6.c3
-rw-r--r--arch/x86/lib/pirq_routing.c3
-rw-r--r--arch/x86/lib/pmu.c3
-rw-r--r--arch/x86/lib/ramtest.c3
-rw-r--r--arch/x86/lib/reloc_ia32_efi.c3
-rw-r--r--arch/x86/lib/reloc_x86_64_efi.c3
-rw-r--r--arch/x86/lib/relocate.c3
-rw-r--r--arch/x86/lib/scu.c3
-rw-r--r--arch/x86/lib/sections.c3
-rw-r--r--arch/x86/lib/sfi.c3
-rw-r--r--arch/x86/lib/spl.c3
-rw-r--r--arch/x86/lib/string.c3
-rw-r--r--arch/x86/lib/tables.c3
-rw-r--r--arch/x86/lib/zimage.c3
49 files changed, 49 insertions, 100 deletions
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+
*/
/*