U-Boot

Download

u-boot@lists2.denx.biz

October 2023

224 participants
774 discussions

[PATCH] doc: usage: fix ordering of shell commands
by Tom Fitzhenry 24 Oct '23

24 Oct '23

I initially didn't find the bootz docs when I went looking for them. :) --- doc/usage/index.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 98b4719c408..839589c2147 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -37,8 +37,8 @@ Shell commands cmd/bootm cmd/bootmenu cmd/bootmeth - cmd/button cmd/bootz + cmd/button cmd/cat cmd/cbsysinfo cmd/cedit @@ -56,8 +56,8 @@ Shell commands cmd/env cmd/event cmd/exception - cmd/extension cmd/exit + cmd/extension cmd/false cmd/fatinfo cmd/fatload @@ -93,15 +93,15 @@ Shell commands cmd/rng cmd/saves cmd/sbi - cmd/sf cmd/scp03 cmd/seama cmd/setexpr + cmd/sf cmd/size cmd/sleep + cmd/sm cmd/sound cmd/source - cmd/sm cmd/temperature cmd/tftpput cmd/trace -- 2.42.0

2 1

[PATCH v3 00/32] Tidy up use of CONFIG_CMDLINE
by Simon Glass 24 Oct '23

24 Oct '23

It should be possible to disable CONFIG_CMDLINE and have all commands and related functionality dropped from U-Boot. This is useful when trying to reduce the size of U-Boot. Recent changes have stopped this from working. This series repairs the feature for sandbox and adds a test to stop it breaking again. Note that quite a lot of functionality is lost if CONFIG_CMDLINE is disabled, e.g. networking and most booting options. Further work is needed to make the option more generally useful. Changes in v3: - Reword commit message slightly - Add an explation as to why this patch is here - Fix 'ut' typo - Just drop the condition instead - Add new patch to rearrange the Kconfig for CMD_BOOTEFI_BOOTMGR - Add new patch with a Kconfig for command-line entry - Add new patch with a Kconfig for command-line entry - Reorder the Kconfig options a little - Add new patch to tidy up semicolon after command macros - Rebase on Tom's LONGHELP series - Correct 'of' typo Changes in v2: - Move AUTOBOOT_USE_MENUKEY under AUTOBOOT - Change this to use a Kconfig dependency instead of code failing - Adjust the depends on the commands, instead of EFI_LOADER - Add new patch to update EFI_LOADER to depend on DM_ETH - Add new patch to drop discarding of command linker-lists - Add new patch to unify the U_BOOT_ENV_LOCATION conditions Simon Glass (32): buildman: Use oldconfig when adjusting the config bootstd: Correct dependencies on CMDLINE autoboot: Correct dependencies on CMDLINE cmd: Add a few more dependencies on CMDLINE test: Make UNIT_TEST depend on CMDLINE sifive: Drop an unnecessary #ifdef fastboot: Declare a dependency on CMDLINE cli: Always build cli_getch cmd: Use an #ifdef around run_commandf() Move bootmenu_conv_key() into its own file pxe: Depend on CMDLINE env: Split out non-command code into a new file console: Move SYS_PBSIZE into common/ bootm: Allow building when cleanup functions are missing fdt: Move working_fdt into fdt_support net: Depend on CONFIG_CMDLINE log: Allow use without CONFIG_CMDLINE video: Allow use without CONFIG_CMDLINE video: Dont require the font command efi: Make commands depend on CMDLINE efi: Rearrange the Kconfig for CMD_BOOTEFI_BOOTMGR efi: Update EFI_LOADER to depend on DM_ETH cli: Split command-line-editing into its own file Add a new Kconfig for command-line entry Add a new Kconfig for command-line history sandbox: Disable CONFIG_DISTRO_DEFAULTS cmd: Make all commands depend on CMDLINE sandbox: Avoid requiring cmdline arm: x86: Drop discarding of command linker-lists mmc: env: Unify the U_BOOT_ENV_LOCATION conditions treewide: Tidy up semicolon after command macros sandbox: Add a test for disabling CONFIG_CMDLINE arch/Kconfig | 11 +- arch/arm/cpu/u-boot.lds | 3 - arch/arm/lib/bootm.c | 2 + arch/x86/cpu/u-boot-64.lds | 4 - arch/x86/cpu/u-boot-spl.lds | 4 - arch/x86/cpu/u-boot.lds | 4 - board/freescale/common/vid.c | 2 +- board/xilinx/common/fru.c | 2 +- board/xilinx/versal/cmds.c | 2 +- board/xilinx/zynqmp/cmds.c | 2 +- boot/Kconfig | 58 ++-- boot/bootm.c | 10 +- boot/fdt_support.c | 5 + cmd/Kconfig | 50 ++-- cmd/Makefile | 2 +- cmd/btrfs.c | 2 +- cmd/eeprom.c | 2 +- cmd/ext2.c | 4 +- cmd/fdt.c | 5 - cmd/fs.c | 8 +- cmd/nvedit.c | 122 +-------- cmd/pinmux.c | 2 +- cmd/qfw.c | 2 +- common/Kconfig | 12 + common/Makefile | 10 +- common/cli.c | 2 + common/cli_cread.c | 407 +++++++++++++++++++++++++++++ common/cli_getch.c | 1 + common/cli_readline.c | 384 +-------------------------- common/log.c | 4 +- common/menu.c | 40 --- common/menu_key.c | 49 ++++ configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noinst_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - configs/sandbox_vpl_defconfig | 1 - drivers/fastboot/Kconfig | 1 + drivers/video/Kconfig | 2 +- drivers/video/console_truetype.c | 4 + env/Makefile | 1 + env/env_set.c | 132 ++++++++++ env/mmc.c | 2 +- include/bootm.h | 15 +- include/cli.h | 31 +++ include/command.h | 2 +- include/env_internal.h | 23 ++ include/k210/pll.h | 2 +- lib/efi_loader/Kconfig | 7 +- lib/efi_loader/Makefile | 2 +- net/Kconfig | 1 + test/Kconfig | 1 + test/py/tests/test_sandbox_opts.py | 20 ++ tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 + tools/buildman/func_test.py | 4 +- 57 files changed, 833 insertions(+), 648 deletions(-) create mode 100644 common/cli_cread.c create mode 100644 common/menu_key.c create mode 100644 env/env_set.c create mode 100644 test/py/tests/test_sandbox_opts.py -- 2.42.0.655.g421f12c284-goog

6 97

[PATCH v2 1/1] sandbox: eliminate unused functions from binaries
by Heinrich Schuchardt 24 Oct '23

24 Oct '23

The sandbox should closely mimic other architectures. Place each function or data in a separate section and let the linker eliminate unused ones. This will reduce the binary size. In the linker script mark that u_boot_sandbox_getopt are to be kept. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: mark _u_boot_sandbox_getopt secitons a KEEP() --- arch/sandbox/config.mk | 4 +++- arch/sandbox/cpu/u-boot.lds | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2d184c5f65..c02f0229c2 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -2,7 +2,7 @@ # Copyright (c) 2011 The Chromium OS Authors. PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE -PLATFORM_CPPFLAGS += -fPIC +PLATFORM_CPPFLAGS += -fPIC -ffunction-sections -fdata-sections PLATFORM_LIBS += -lrt SDL_CONFIG ?= sdl2-config @@ -26,6 +26,7 @@ cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \ $(KBUILD_LDFLAGS:%=-Wl,%) \ $(SANITIZERS) \ $(LTO_FINAL_LDFLAGS) \ + -Wl,--gc-section \ -Wl,--whole-archive \ $(u-boot-main) \ $(u-boot-keep-syms-lto) \ @@ -37,6 +38,7 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \ $(SANITIZERS) \ $(LTO_FINAL_LDFLAGS) \ $(patsubst $(obj)/%,%,$(u-boot-spl-init)) \ + -Wl,--gc-section \ -Wl,--whole-archive \ $(patsubst $(obj)/%,%,$(u-boot-spl-main)) \ $(patsubst $(obj)/%,%,$(u-boot-spl-platdata)) \ diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index ba8dee50c7..d896c6f0ec 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -14,9 +14,9 @@ SECTIONS } _u_boot_sandbox_getopt : { - *(_u_boot_sandbox_getopt_start) - *(_u_boot_sandbox_getopt) - *(_u_boot_sandbox_getopt_end) + KEEP(*(_u_boot_sandbox_getopt_start)) + KEEP(*(_u_boot_sandbox_getopt)) + KEEP(*(_u_boot_sandbox_getopt_end)) } efi_runtime_start : { -- 2.40.1

3 4

[ANN] U-Boot v2024.01-rc1 released
by Tom Rini 23 Oct '23

23 Oct '23

Hey all, It's release day and here is -rc1. Looking at my own queue it feels almost small right now, but I both have things to pull in still and I hope for some pull requests from a few areas still as well. In terms of a changelog, git log --merges v2023.10..v2024.01-rc1 contains what I've pulled but as always, better PR messages and tags will provide better results here. I hope to remain on schedule and that means the rest of the rcs every other Monday, and with final release on January 8th, 2024. Thanks all! -- Tom

1 0

[PATCH v5] bootstd: sata: Add bootstd support for ahci sata
by Tony Dinh 23 Oct '23

23 Oct '23

Add ahci sata bootdev and corresponding hunting function. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- Changes in v5: - In bootmeth_script script_boot(), it's unnecessary to check for ret so remove it. While we're here, also initialize ret in declaration. Changes in v4: - Revise logic in bootmeth_script() to set devtype to sata for non-scsi SATA device - Rewrite sata_rescan() logic to properly remove all devices before probing - Add description to sata_rescan() header Changes in v3: - Correct drivers/ata/Makefile to compile sata_bootdev only if ahci sata is enabled. Changes in v2: - set devtype to sata in bootmeth_script for non-scsi SATA device. boot/bootmeth_script.c | 16 +++++++--- drivers/ata/Makefile | 2 +- drivers/ata/sata.c | 32 ++++++++++++++++++++ drivers/ata/sata_bootdev.c | 62 ++++++++++++++++++++++++++++++++++++++ include/sata.h | 6 ++++ 5 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 drivers/ata/sata_bootdev.c diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 345114dabf..06340e43d2 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -188,12 +188,20 @@ static int script_boot(struct udevice *dev, struct bootflow *bflow) { struct blk_desc *desc = dev_get_uclass_plat(bflow->blk); ulong addr; - int ret; + int ret = 0; - if (desc->uclass_id == UCLASS_USB) + if (desc->uclass_id == UCLASS_USB) { ret = env_set("devtype", "usb"); - else - ret = env_set("devtype", blk_get_devtype(bflow->blk)); + } else { + /* If the uclass is AHCI, but the driver is ATA + * (not scsi), set devtype to sata + */ + if (IS_ENABLED(CONFIG_SATA) && + desc->uclass_id == UCLASS_AHCI) + ret = env_set("devtype", "sata"); + else + ret = env_set("devtype", blk_get_devtype(bflow->blk)); + } if (!ret) ret = env_set_hex("devnum", desc->devnum); if (!ret) diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 6e30180b8b..0b6f91098a 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_SCSI_AHCI) += ahci.o obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o obj-$(CONFIG_FSL_SATA) += fsl_sata.o obj-$(CONFIG_LIBATA) += libata.o -obj-$(CONFIG_SATA) += sata.o +obj-$(CONFIG_SATA) += sata.o sata_bootdev.o obj-$(CONFIG_SATA_CEVA) += sata_ceva.o obj-$(CONFIG_SATA_MV) += sata_mv.o obj-$(CONFIG_SATA_SIL) += sata_sil.o diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c index ce3e9b5a40..f126b84e05 100644 --- a/drivers/ata/sata.c +++ b/drivers/ata/sata.c @@ -15,6 +15,8 @@ #include <dm.h> #include <part.h> #include <sata.h> +#include <dm/device-internal.h> +#include <dm/uclass-internal.h> #ifndef CONFIG_AHCI struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE]; @@ -50,6 +52,36 @@ int sata_scan(struct udevice *dev) return ops->scan(dev); } +int sata_rescan(bool verbose) +{ + int ret; + struct udevice *dev; + + if (verbose) + printf("Removing devices on SATA bus...\n"); + + blk_unbind_all(UCLASS_AHCI); + + ret = uclass_find_first_device(UCLASS_AHCI, &dev); + if (ret || !dev) { + printf("Cannot find SATA device (err=%d)\n", ret); + return -ENOSYS; + } + + ret = device_remove(dev, DM_REMOVE_NORMAL); + if (ret) { + printf("Cannot remove SATA device '%s' (err=%d)\n", dev->name, ret); + return -ENOSYS; + } + + if (verbose) + printf("Rescanning SATA bus for devices...\n"); + + ret = uclass_probe_all(UCLASS_AHCI); + + return ret; +} + #ifndef CONFIG_AHCI #ifdef CONFIG_PARTITIONS struct blk_desc *sata_get_dev(int dev) diff --git a/drivers/ata/sata_bootdev.c b/drivers/ata/sata_bootdev.c new file mode 100644 index 0000000000..f638493ce0 --- /dev/null +++ b/drivers/ata/sata_bootdev.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Bootdev for sata + * + * Copyright 2023 Tony Dinh <mibodhi(a)gmail.com> + */ + +#include <common.h> +#include <ahci.h> +#include <bootdev.h> +#include <dm.h> +#include <init.h> +#include <sata.h> + +static int sata_bootdev_bind(struct udevice *dev) +{ + struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev); + + ucp->prio = BOOTDEVP_4_SCAN_FAST; + + return 0; +} + +static int sata_bootdev_hunt(struct bootdev_hunter *info, bool show) +{ + int ret; + + if (IS_ENABLED(CONFIG_PCI)) { + ret = pci_init(); + if (ret) + return ret; + } + + ret = sata_rescan(true); + if (ret) + return ret; + + return 0; +} + +struct bootdev_ops sata_bootdev_ops = { +}; + +static const struct udevice_id sata_bootdev_ids[] = { + { .compatible = "u-boot,bootdev-sata" }, + { } +}; + +U_BOOT_DRIVER(sata_bootdev) = { + .name = "sata_bootdev", + .id = UCLASS_BOOTDEV, + .ops = &sata_bootdev_ops, + .bind = sata_bootdev_bind, + .of_match = sata_bootdev_ids, +}; + +BOOTDEV_HUNTER(sata_bootdev_hunter) = { + .prio = BOOTDEVP_4_SCAN_FAST, + .uclass = UCLASS_AHCI, + .hunt = sata_bootdev_hunt, + .drv = DM_DRIVER_REF(sata_bootdev), +}; diff --git a/include/sata.h b/include/sata.h index d89f7a8a29..6111cf65d9 100644 --- a/include/sata.h +++ b/include/sata.h @@ -21,4 +21,10 @@ extern struct blk_desc sata_dev_desc[]; int sata_probe(int devnum); int sata_remove(int devnum); +/* + * Remove existing AHCI SATA device uclass and all of its children, + * if any, and probe it again. + */ +int sata_rescan(bool verbose); + #endif -- 2.39.2

4 4

[PATCH 1/1] general: fix GPL-2.0-or-later SPDX headers
by Heinrich Schuchardt 23 Oct '23

23 Oct '23

SPDX headers should use GPL-2.0-or-later and not GPL-2.0+. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 2 +- README | 2 +- api/Makefile | 2 +- api/api.c | 2 +- api/api_display.c | 2 +- api/api_net.c | 2 +- api/api_platform-arm.c | 2 +- api/api_platform-mips.c | 2 +- api/api_platform-powerpc.c | 2 +- api/api_private.h | 2 +- api/api_storage.c | 2 +- arch/arc/Makefile | 2 +- arch/arc/config.mk | 2 +- arch/arc/cpu/arcv1/Makefile | 2 +- arch/arc/cpu/arcv1/ivt.S | 2 +- arch/arc/cpu/arcv2/Makefile | 2 +- arch/arc/cpu/arcv2/ivt.S | 2 +- arch/arc/cpu/u-boot.lds | 2 +- arch/arc/dts/Makefile | 2 +- arch/arc/dts/abilis_tb100.dts | 2 +- arch/arc/dts/axc001.dtsi | 2 +- arch/arc/dts/axc003.dtsi | 2 +- arch/arc/dts/axs101.dts | 2 +- arch/arc/dts/axs103.dts | 2 +- arch/arc/dts/axs10x_mb.dtsi | 2 +- arch/arc/dts/emsdp.dts | 2 +- arch/arc/dts/hsdk-4xd.dts | 2 +- arch/arc/dts/hsdk-common.dtsi | 2 +- arch/arc/dts/hsdk.dts | 2 +- arch/arc/dts/iot_devkit.dts | 2 +- arch/arc/dts/nsim.dts | 2 +- arch/arc/include/asm/arcregs.h | 2 +- arch/arc/include/asm/bitops.h | 2 +- arch/arc/include/asm/byteorder.h | 2 +- arch/arc/include/asm/cache.h | 2 +- arch/arc/include/asm/config.h | 2 +- arch/arc/include/asm/global_data.h | 2 +- arch/arc/include/asm/io.h | 2 +- arch/arc/include/asm/linkage.h | 2 +- arch/arc/include/asm/posix_types.h | 2 +- arch/arc/include/asm/processor.h | 2 +- arch/arc/include/asm/ptrace.h | 2 +- arch/arc/include/asm/sections.h | 2 +- arch/arc/include/asm/types.h | 2 +- arch/arc/include/asm/u-boot-arc.h | 2 +- arch/arc/include/asm/u-boot.h | 2 +- arch/arc/lib/Makefile | 2 +- arch/arc/lib/_millicodethunk.S | 2 +- arch/arc/lib/bootm.c | 2 +- arch/arc/lib/cache.c | 2 +- arch/arc/lib/cpu.c | 2 +- arch/arc/lib/init_helpers.c | 2 +- arch/arc/lib/interrupts.c | 2 +- arch/arc/lib/ints_low.S | 2 +- arch/arc/lib/libgcc2.c | 2 +- arch/arc/lib/libgcc2.h | 2 +- arch/arc/lib/relocate.c | 2 +- arch/arc/lib/reset.c | 2 +- arch/arc/lib/start.S | 2 +- arch/arm/Makefile | 2 +- arch/arm/config.mk | 2 +- arch/arm/cpu/Makefile | 2 +- arch/arm/cpu/arm11/Makefile | 2 +- arch/arm/cpu/arm11/cpu.c | 2 +- arch/arm/cpu/arm11/sctlr.S | 2 +- arch/arm/cpu/arm1136/Makefile | 2 +- arch/arm/cpu/arm1136/mx31/Makefile | 2 +- arch/arm/cpu/arm1136/mx31/devices.c | 2 +- arch/arm/cpu/arm1136/mx31/generic.c | 2 +- arch/arm/cpu/arm1136/mx31/relocate.S | 2 +- arch/arm/cpu/arm1136/mx31/timer.c | 2 +- arch/arm/cpu/arm1136/start.S | 2 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 2 +- arch/arm/cpu/arm1176/Makefile | 2 +- arch/arm/cpu/arm1176/start.S | 2 +- arch/arm/cpu/arm720t/Makefile | 2 +- arch/arm/cpu/arm720t/cpu.c | 2 +- arch/arm/cpu/arm720t/interrupts.c | 2 +- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm920t/Makefile | 2 +- arch/arm/cpu/arm920t/cpu.c | 2 +- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/cpu/arm926ejs/Makefile | 2 +- arch/arm/cpu/arm926ejs/cache.c | 2 +- arch/arm/cpu/arm926ejs/cpu.c | 2 +- arch/arm/cpu/arm926ejs/mxs/Makefile | 2 +- arch/arm/cpu/arm926ejs/mxs/clock.c | 2 +- arch/arm/cpu/arm926ejs/mxs/iomux.c | 2 +- arch/arm/cpu/arm926ejs/mxs/mxs.c | 2 +- arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/start.S | 2 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 2 +- arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 2 +- arch/arm/cpu/arm926ejs/start.S | 2 +- arch/arm/cpu/arm926ejs/sunxi/Makefile | 2 +- arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 2 +- arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds | 2 +- arch/arm/cpu/arm946es/Makefile | 2 +- arch/arm/cpu/arm946es/cpu.c | 2 +- arch/arm/cpu/arm946es/start.S | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/arch_timer.c | 2 +- arch/arm/cpu/armv7/bcm235xx/Makefile | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-bsc.c | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-core.c | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-core.h | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-eth.c | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-sdio.c | 2 +- arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c | 2 +- arch/arm/cpu/armv7/bcm281xx/Makefile | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-bsc.c | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-core.c | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-core.h | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-eth.c | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-sdio.c | 2 +- arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c | 2 +- arch/arm/cpu/armv7/bcm281xx/reset.c | 2 +- arch/arm/cpu/armv7/bcmcygnus/Makefile | 2 +- arch/arm/cpu/armv7/bcmcygnus/reset.c | 2 +- arch/arm/cpu/armv7/bcmnsp/Makefile | 2 +- arch/arm/cpu/armv7/bcmnsp/reset.c | 2 +- arch/arm/cpu/armv7/cache_v7.c | 2 +- arch/arm/cpu/armv7/cache_v7_asm.S | 2 +- arch/arm/cpu/armv7/config.mk | 2 +- arch/arm/cpu/armv7/cp15.c | 2 +- arch/arm/cpu/armv7/cpu.c | 2 +- arch/arm/cpu/armv7/exception_level.c | 2 +- arch/arm/cpu/armv7/iproc-common/Makefile | 2 +- arch/arm/cpu/armv7/iproc-common/armpll.c | 2 +- arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 2 +- arch/arm/cpu/armv7/iproc-common/timer.c | 2 +- arch/arm/cpu/armv7/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/ls102xa/Makefile | 2 +- arch/arm/cpu/armv7/ls102xa/clock.c | 2 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 2 +- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_epu.h | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c | 2 +- arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h | 2 +- arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c | 2 +- arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c | 2 +- arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/soc.c | 2 +- arch/arm/cpu/armv7/ls102xa/spl.c | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- arch/arm/cpu/armv7/mpu_v7r.c | 2 +- arch/arm/cpu/armv7/nonsec_virt.S | 2 +- arch/arm/cpu/armv7/s5p-common/Makefile | 2 +- arch/arm/cpu/armv7/s5p-common/cpu_info.c | 2 +- arch/arm/cpu/armv7/s5p-common/pwm.c | 2 +- arch/arm/cpu/armv7/s5p-common/sromc.c | 2 +- arch/arm/cpu/armv7/s5p-common/timer.c | 2 +- arch/arm/cpu/armv7/s5p4418/Makefile | 2 +- arch/arm/cpu/armv7/s5p4418/cpu.c | 2 +- arch/arm/cpu/armv7/sctlr.S | 2 +- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/armv7/stv0991/Makefile | 2 +- arch/arm/cpu/armv7/stv0991/clock.c | 2 +- arch/arm/cpu/armv7/stv0991/lowlevel.S | 2 +- arch/arm/cpu/armv7/stv0991/pinmux.c | 2 +- arch/arm/cpu/armv7/stv0991/reset.c | 2 +- arch/arm/cpu/armv7/stv0991/timer.c | 2 +- arch/arm/cpu/armv7/sunxi/Makefile | 2 +- arch/arm/cpu/armv7/sunxi/fel_utils.S | 2 +- arch/arm/cpu/armv7/sunxi/sram.c | 2 +- arch/arm/cpu/armv7/sunxi/tzpc.c | 2 +- arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 2 +- arch/arm/cpu/armv7/syslib.c | 2 +- arch/arm/cpu/armv7/vf610/Makefile | 2 +- arch/arm/cpu/armv7/vf610/generic.c | 2 +- arch/arm/cpu/armv7/vf610/timer.c | 2 +- arch/arm/cpu/armv7/virt-v7.c | 2 +- arch/arm/cpu/armv7m/Makefile | 2 +- arch/arm/cpu/armv7m/cache.c | 2 +- arch/arm/cpu/armv7m/config.mk | 2 +- arch/arm/cpu/armv7m/cpu.c | 2 +- arch/arm/cpu/armv7m/mpu.c | 2 +- arch/arm/cpu/armv7m/start.S | 2 +- arch/arm/cpu/armv7m/systick-timer.c | 2 +- arch/arm/cpu/armv8/Makefile | 2 +- arch/arm/cpu/armv8/bcmns3/Makefile | 2 +- arch/arm/cpu/armv8/bcmns3/lowlevel.S | 2 +- arch/arm/cpu/armv8/cache.S | 2 +- arch/arm/cpu/armv8/cache_v8.c | 2 +- arch/arm/cpu/armv8/config.mk | 2 +- arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/cpu/armv8/cpu.c | 2 +- arch/arm/cpu/armv8/exception_level.c | 2 +- arch/arm/cpu/armv8/exceptions.S | 2 +- arch/arm/cpu/armv8/fel_utils.S | 2 +- arch/arm/cpu/armv8/fsl-layerscape/Makefile | 2 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.h | 2 +- arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 | 2 +- arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 | 2 +- arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3_2 | 2 +- .../cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/icid.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1043a_psci.S | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spintable.S | 2 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 2 +- arch/arm/cpu/armv8/fwcall.c | 2 +- arch/arm/cpu/armv8/generic_timer.c | 2 +- arch/arm/cpu/armv8/hisilicon/Makefile | 2 +- arch/arm/cpu/armv8/hisilicon/pinmux.c | 2 +- arch/arm/cpu/armv8/psci.S | 2 +- arch/arm/cpu/armv8/sec_firmware.c | 2 +- arch/arm/cpu/armv8/sec_firmware_asm.S | 2 +- arch/arm/cpu/armv8/spin_table.c | 2 +- arch/arm/cpu/armv8/spin_table_v8.S | 2 +- arch/arm/cpu/armv8/spl_data.c | 2 +- arch/arm/cpu/armv8/start.S | 2 +- arch/arm/cpu/armv8/tlb.S | 2 +- arch/arm/cpu/armv8/transition.S | 2 +- arch/arm/cpu/armv8/u-boot-spl.lds | 2 +- arch/arm/cpu/armv8/u-boot.lds | 2 +- arch/arm/cpu/armv8/xen/Makefile | 2 +- arch/arm/cpu/armv8/xen/lowlevel_init.S | 2 +- arch/arm/cpu/u-boot-spl.lds | 2 +- arch/arm/cpu/u-boot.lds | 2 +- arch/arm/dts/Makefile | 2 +- arch/arm/dts/ac5-98dx25xx.dtsi | 2 +- arch/arm/dts/ac5-98dx35xx-atl-x240.dts | 2 +- arch/arm/dts/ac5-98dx35xx-rd.dts | 2 +- arch/arm/dts/ac5-98dx35xx.dtsi | 2 +- arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi | 2 +- arch/arm/dts/am335x-brppt1-mmc.dts | 2 +- arch/arm/dts/am335x-brsmarc1.dts | 2 +- arch/arm/dts/am335x-brxre1.dts | 2 +- arch/arm/dts/am335x-chiliboard-u-boot.dtsi | 2 +- arch/arm/dts/am335x-evm-u-boot.dtsi | 2 +- arch/arm/dts/am335x-evmsk-u-boot.dtsi | 2 +- arch/arm/dts/am335x-guardian-u-boot.dtsi | 2 +- arch/arm/dts/am335x-icev2-u-boot.dtsi | 2 +- arch/arm/dts/am335x-pdu001-u-boot.dtsi | 2 +- arch/arm/dts/am335x-pdu001.dts | 2 +- arch/arm/dts/am335x-pxm50-u-boot.dtsi | 2 +- arch/arm/dts/am335x-rut-u-boot.dtsi | 2 +- arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi | 2 +- arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi | 2 +- arch/arm/dts/am33xx-u-boot.dtsi | 2 +- arch/arm/dts/am3517-evm-u-boot.dtsi | 2 +- arch/arm/dts/am3517-u-boot.dtsi | 2 +- arch/arm/dts/am4372-generic-u-boot.dtsi | 2 +- arch/arm/dts/am4372-generic.dts | 2 +- arch/arm/dts/am4372-u-boot.dtsi | 2 +- arch/arm/dts/am437x-idk-evm-u-boot.dtsi | 2 +- arch/arm/dts/am437x-sk-evm-u-boot.dtsi | 2 +- arch/arm/dts/am571x-idk-u-boot.dtsi | 2 +- arch/arm/dts/am572x-idk-u-boot.dtsi | 2 +- arch/arm/dts/am574x-idk-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-beagle-x15-revb1-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-beagle-x15-revc-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-beagle-x15-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-cl-som-am57x-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-idk-common-u-boot.dtsi | 2 +- arch/arm/dts/am57xx-sbc-am57x-u-boot.dtsi | 2 +- arch/arm/dts/arm_fvp.dts | 2 +- arch/arm/dts/armada-370-xp.dtsi | 2 +- arch/arm/dts/armada-371x.dtsi | 2 +- arch/arm/dts/armada-3720-db.dts | 2 +- arch/arm/dts/armada-3720-eDPU-u-boot.dtsi | 2 +- arch/arm/dts/armada-3720-eDPU.dts | 2 +- arch/arm/dts/armada-3720-espressobin-u-boot.dtsi | 2 +- arch/arm/dts/armada-3720-espressobin.dts | 2 +- arch/arm/dts/armada-3720-espressobin.dtsi | 2 +- arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi | 2 +- arch/arm/dts/armada-3720-turris-mox.dts | 2 +- arch/arm/dts/armada-3720-uDPU-u-boot.dtsi | 2 +- arch/arm/dts/armada-3720-uDPU.dts | 2 +- arch/arm/dts/armada-3720-uDPU.dtsi | 2 +- arch/arm/dts/armada-372x.dtsi | 2 +- arch/arm/dts/armada-37xx.dtsi | 2 +- arch/arm/dts/armada-380.dtsi | 2 +- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 +- arch/arm/dts/armada-385.dtsi | 2 +- arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 2 +- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 2 +- arch/arm/dts/armada-388.dtsi | 2 +- arch/arm/dts/armada-38x-controlcenterdc.dts | 2 +- arch/arm/dts/armada-38x.dtsi | 2 +- arch/arm/dts/armada-7040-db-nand.dts | 2 +- arch/arm/dts/armada-7040-db.dts | 2 +- arch/arm/dts/armada-7040.dtsi | 2 +- arch/arm/dts/armada-8040.dtsi | 2 +- arch/arm/dts/armada-common.dtsi | 2 +- arch/arm/dts/armada-cp110.dtsi | 2 +- arch/arm/dts/armada-xp-98dx3236.dtsi | 2 +- arch/arm/dts/armada-xp-98dx3336.dtsi | 2 +- arch/arm/dts/armada-xp-98dx4251.dtsi | 2 +- arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts | 2 +- arch/arm/dts/armada-xp-crs305-1g-4s.dts | 2 +- arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 2 +- arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts | 2 +- arch/arm/dts/armada-xp-crs326-24g-2s.dts | 2 +- arch/arm/dts/armada-xp-crs326-24g-2s.dtsi | 2 +- arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts | 2 +- arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts | 2 +- arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 2 +- arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 2 +- arch/arm/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- arch/arm/dts/armada-xp-gp.dts | 2 +- arch/arm/dts/armada-xp-mv78230.dtsi | 2 +- arch/arm/dts/armada-xp-mv78260.dtsi | 2 +- arch/arm/dts/armada-xp-mv78460.dtsi | 2 +- arch/arm/dts/armada-xp-synology-ds414.dts | 2 +- arch/arm/dts/armada-xp.dtsi | 2 +- arch/arm/dts/ast2600-evb.dts | 2 +- arch/arm/dts/ast2600-u-boot.dtsi | 2 +- arch/arm/dts/ast2600.dtsi | 2 +- arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi | 2 +- arch/arm/dts/at91-sam9x60_curiosity.dts | 2 +- arch/arm/dts/at91-sama5d27_giantboard.dts | 2 +- arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi | 2 +- arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 2 +- arch/arm/dts/at91-sama5d29_curiosity-u-boot.dtsi | 2 +- arch/arm/dts/at91-sama5d29_curiosity.dts | 2 +- arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi | 2 +- arch/arm/dts/at91-sama5d2_icp.dts | 2 +- arch/arm/dts/at91-sama7g5ek-u-boot.dtsi | 2 +- arch/arm/dts/at91-sama7g5ek.dts | 2 +- arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi | 2 +- arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts | 2 +- arch/arm/dts/at91sam9g45-corvus.dts | 2 +- arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/axp803.dtsi | 2 +- arch/arm/dts/bcm2835-rpi-zero-w.dts | 2 +- arch/arm/dts/bcm2835-rpi-zero.dts | 2 +- arch/arm/dts/bcm283x-u-boot.dtsi | 2 +- arch/arm/dts/bcm47622.dtsi | 2 +- arch/arm/dts/bcm4912.dtsi | 2 +- arch/arm/dts/bcm63146.dtsi | 2 +- arch/arm/dts/bcm63148.dtsi | 2 +- arch/arm/dts/bcm63158.dtsi | 2 +- arch/arm/dts/bcm63178.dtsi | 2 +- arch/arm/dts/bcm6756.dtsi | 2 +- arch/arm/dts/bcm6813.dtsi | 2 +- arch/arm/dts/bcm6846.dtsi | 2 +- arch/arm/dts/bcm6855.dtsi | 2 +- arch/arm/dts/bcm6856.dtsi | 2 +- arch/arm/dts/bcm6858.dtsi | 2 +- arch/arm/dts/bcm6878.dtsi | 2 +- arch/arm/dts/bcm7xxx.dts | 2 +- arch/arm/dts/bcm947622.dts | 2 +- arch/arm/dts/bcm94908.dts | 2 +- arch/arm/dts/bcm94912.dts | 2 +- arch/arm/dts/bcm963138.dts | 2 +- arch/arm/dts/bcm963146.dts | 2 +- arch/arm/dts/bcm963148.dts | 2 +- arch/arm/dts/bcm963158.dts | 2 +- arch/arm/dts/bcm963178.dts | 2 +- arch/arm/dts/bcm96753ref.dts | 2 +- arch/arm/dts/bcm96756.dts | 2 +- arch/arm/dts/bcm96813.dts | 2 +- arch/arm/dts/bcm968360bg.dts | 2 +- arch/arm/dts/bcm96846.dts | 2 +- arch/arm/dts/bcm96855.dts | 2 +- arch/arm/dts/bcm96856.dts | 2 +- arch/arm/dts/bcm96858.dts | 2 +- arch/arm/dts/bcm968580xref.dts | 2 +- arch/arm/dts/bcm96878.dts | 2 +- arch/arm/dts/bubblegum_96.dts | 2 +- arch/arm/dts/ca-presidio-engboard.dts | 2 +- arch/arm/dts/cn9130-crb-A.dts | 2 +- arch/arm/dts/cn9130-crb-B.dts | 2 +- arch/arm/dts/cn9130-crb.dtsi | 2 +- arch/arm/dts/cn9130-db-A.dts | 2 +- arch/arm/dts/cn9130-db-B.dts | 2 +- arch/arm/dts/cn9130-db-dev-info.dtsi | 2 +- arch/arm/dts/cn9130-db.dtsi | 2 +- arch/arm/dts/cn9130.dtsi | 2 +- arch/arm/dts/cn9131-db-A.dts | 2 +- arch/arm/dts/cn9131-db-B.dts | 2 +- arch/arm/dts/cn9131-db.dtsi | 2 +- arch/arm/dts/cn9132-db-A.dts | 2 +- arch/arm/dts/cn9132-db-B.dts | 2 +- arch/arm/dts/cn9132-db.dtsi | 2 +- arch/arm/dts/da850-evm-u-boot.dtsi | 2 +- arch/arm/dts/da850-lcdk-u-boot.dtsi | 2 +- arch/arm/dts/dra7-evm-u-boot.dtsi | 2 +- arch/arm/dts/dra7-ipu-common-early-boot.dtsi | 2 +- arch/arm/dts/dra71-evm-u-boot.dtsi | 2 +- arch/arm/dts/dra72-evm-revc-u-boot.dtsi | 2 +- arch/arm/dts/dra72-evm-u-boot.dtsi | 2 +- arch/arm/dts/dra76-evm-u-boot.dtsi | 2 +- arch/arm/dts/dragonboard410c-uboot.dtsi | 2 +- arch/arm/dts/dragonboard410c.dts | 2 +- arch/arm/dts/dragonboard820c-uboot.dtsi | 2 +- arch/arm/dts/dragonboard820c.dts | 2 +- arch/arm/dts/dragonboard845c-uboot.dtsi | 2 +- arch/arm/dts/dragonboard845c.dts | 2 +- arch/arm/dts/ev-imx280-nano-x-mb.dts | 2 +- arch/arm/dts/exynos4.dtsi | 2 +- arch/arm/dts/exynos4210-origen.dts | 2 +- arch/arm/dts/exynos4210-pinctrl-uboot.dtsi | 2 +- arch/arm/dts/exynos4210-smdkv310.dts | 2 +- arch/arm/dts/exynos4210-trats.dts | 2 +- arch/arm/dts/exynos4210-universal_c210.dts | 2 +- arch/arm/dts/exynos4412-odroid.dts | 2 +- arch/arm/dts/exynos4412-trats2.dts | 2 +- arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 2 +- arch/arm/dts/exynos5.dtsi | 2 +- arch/arm/dts/exynos5250-arndale.dts | 2 +- arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 2 +- arch/arm/dts/exynos5250.dtsi | 2 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 +- arch/arm/dts/exynos5420-smdk5420.dts | 2 +- arch/arm/dts/exynos5422-odroidxu3.dts | 2 +- arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 2 +- arch/arm/dts/exynos54xx.dtsi | 2 +- arch/arm/dts/exynos5800-peach-pi.dts | 2 +- arch/arm/dts/exynos7420-espresso7420.dts | 2 +- arch/arm/dts/exynos7420.dtsi | 2 +- arch/arm/dts/exynos78x0-axy17lte.dts | 2 +- arch/arm/dts/exynos78x0-gpio.dtsi | 2 +- arch/arm/dts/exynos78x0-pinctrl.dtsi | 2 +- arch/arm/dts/exynos78x0.dtsi | 2 +- arch/arm/dts/fsl-imx8-ca35.dtsi | 2 +- arch/arm/dts/fsl-imx8dx.dtsi | 2 +- arch/arm/dts/fsl-imx8dxp.dtsi | 2 +- arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 +- arch/arm/dts/fsl-imx8qm-apalis.dts | 2 +- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 2 +- arch/arm/dts/fsl-imx8qm-mek.dts | 2 +- arch/arm/dts/fsl-imx8qm.dtsi | 2 +- arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi | 2 +- arch/arm/dts/fsl-imx8qxp-ai_ml.dts | 2 +- arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 2 +- arch/arm/dts/fsl-imx8qxp-colibri.dts | 2 +- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 2 +- arch/arm/dts/fsl-imx8qxp-mek.dts | 2 +- arch/arm/dts/fsl-imx8qxp.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-2g5rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dts | 2 +- arch/arm/dts/fsl-ls1012a-frdm.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dts | 2 +- arch/arm/dts/fsl-ls1012a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1012a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 2 +- arch/arm/dts/fsl-ls1012a.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts | 2 +- arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 2 +- arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-duart.dts | 2 +- arch/arm/dts/fsl-ls1028a-qds-lpuart.dts | 2 +- arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1028a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1028a.dtsi | 2 +- arch/arm/dts/fsl-ls1043-post.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-qds-duart.dts | 2 +- arch/arm/dts/fsl-ls1043a-qds-lpuart.dts | 2 +- arch/arm/dts/fsl-ls1043a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1043a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1043a-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1043a.dtsi | 2 +- arch/arm/dts/fsl-ls1046-post.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-frwy.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds-duart.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds-lpuart.dts | 2 +- arch/arm/dts/fsl-ls1046a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1046a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1046a-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1046a.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-qds-21-x.dts | 2 +- arch/arm/dts/fsl-ls1088a-qds-29-x.dts | 2 +- arch/arm/dts/fsl-ls1088a-qds-sd1-21.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-qds-sd1-29.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-qds.dts | 2 +- arch/arm/dts/fsl-ls1088a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-rdb.dts | 2 +- arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1088a-ten64.dts | 2 +- arch/arm/dts/fsl-ls1088a-u-boot.dtsi | 2 +- arch/arm/dts/fsl-ls1088a.dtsi | 2 +- arch/arm/dts/fsl-ls2080a-qds-42-x.dts | 2 +- arch/arm/dts/fsl-ls2080a-qds-sd1-42.dtsi | 2 +- arch/arm/dts/fsl-ls2080a-qds.dts | 2 +- arch/arm/dts/fsl-ls2080a-qds.dtsi | 2 +- arch/arm/dts/fsl-ls2080a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2080a.dtsi | 2 +- arch/arm/dts/fsl-ls2081a-rdb.dts | 2 +- arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-19-11-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-19-x-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-20-11-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-20-x-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-3-11-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-3-x-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-7-11-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-7-x-x.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds-sd1-19.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-qds-sd1-20.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-qds-sd1-3.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-qds-sd1-7.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-qds-sd2-11.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-qds.dts | 2 +- arch/arm/dts/fsl-lx2160a-qds.dtsi | 2 +- arch/arm/dts/fsl-lx2160a-rdb.dts | 2 +- arch/arm/dts/fsl-lx2160a.dtsi | 2 +- arch/arm/dts/fsl-lx2162a-qds-17-x.dts | 2 +- arch/arm/dts/fsl-lx2162a-qds-18-x.dts | 2 +- arch/arm/dts/fsl-lx2162a-qds-20-x.dts | 2 +- arch/arm/dts/fsl-lx2162a-qds-sd1-17.dtsi | 2 +- arch/arm/dts/fsl-lx2162a-qds-sd1-18.dtsi | 2 +- arch/arm/dts/fsl-lx2162a-qds-sd1-20.dtsi | 2 +- arch/arm/dts/fsl-lx2162a-qds.dts | 2 +- arch/arm/dts/fsl-sch-24801.dtsi | 2 +- arch/arm/dts/fsl-sch-28021.dtsi | 2 +- arch/arm/dts/fsl-sch-30841.dtsi | 2 +- arch/arm/dts/fsl-sch-30842.dtsi | 2 +- arch/arm/dts/hi3660-hikey960-u-boot.dtsi | 2 +- arch/arm/dts/hi3798cv200-u-boot.dtsi | 2 +- arch/arm/dts/hi3798mv200-hc2910-2aghd05-u-boot.dtsi | 2 +- arch/arm/dts/hi3798mv200-u-boot.dtsi | 2 +- arch/arm/dts/hi6220-hikey-u-boot.dtsi | 2 +- arch/arm/dts/imx23-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx23-evk.dts | 2 +- arch/arm/dts/imx23-olinuxino-u-boot.dtsi | 2 +- arch/arm/dts/imx23-u-boot.dtsi | 2 +- arch/arm/dts/imx23.dtsi | 2 +- arch/arm/dts/imx28-evk-u-boot.dtsi | 4 ++-- arch/arm/dts/imx28-evk.dts | 2 +- arch/arm/dts/imx28-u-boot.dtsi | 4 ++-- arch/arm/dts/imx28-xea-u-boot.dtsi | 4 ++-- arch/arm/dts/imx28.dtsi | 2 +- arch/arm/dts/imx51-babbage.dts | 2 +- arch/arm/dts/imx51.dtsi | 2 +- arch/arm/dts/imx53-kp-u-boot.dtsi | 2 +- arch/arm/dts/imx53-kp.dts | 2 +- arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 2 +- arch/arm/dts/imx53-m53menlo.dts | 2 +- arch/arm/dts/imx53-ppd-uboot.dtsi | 2 +- arch/arm/dts/imx53-qsb-common.dtsi | 2 +- arch/arm/dts/imx53-qsb.dts | 2 +- arch/arm/dts/imx53.dtsi | 2 +- arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-b1x5v2.dts | 2 +- arch/arm/dts/imx6dl-brppt2.dts | 2 +- arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-dhcom-pdk2.dts | 2 +- arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-dhcom-picoitx.dts | 2 +- arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-icore-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-mamoj-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-mamoj.dts | 2 +- arch/arm/dts/imx6dl-riotboard-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 2 +- arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-bx50v3-uboot.dtsi | 2 +- arch/arm/dts/imx6q-bx50v3.dts | 2 +- arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-dhcom-pdk2.dts | 2 +- arch/arm/dts/imx6q-display5-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-icore-ofcap10.dts | 2 +- arch/arm/dts/imx6q-icore-ofcap12.dts | 2 +- arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-icore-rqs.dts | 2 +- arch/arm/dts/imx6q-icore-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-kp-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6q-kp.dts | 4 ++-- arch/arm/dts/imx6q-logicpd-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-marsboard-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts | 2 +- arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-sabreauto.dts | 2 +- arch/arm/dts/imx6q-sabrelite-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-sabresd.dts | 2 +- arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 2 +- arch/arm/dts/imx6q-tbs2910.dts | 2 +- arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-colibri.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-drc02.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-picoitx.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-som.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-dhcom.dtsi | 2 +- .../arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-icore-1.5.dtsi | 2 +- arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi | 2 +- arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi | 2 +- arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi | 2 +- arch/arm/dts/imx6qdl-phytec-mira.dtsi | 2 +- arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 2 +- arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-sabreauto.dtsi | 2 +- arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-sabresd.dtsi | 2 +- arch/arm/dts/imx6qdl-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl-udoo-u-boot.dtsi | 2 +- arch/arm/dts/imx6qdl.dtsi | 2 +- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 2 +- arch/arm/dts/imx6qp-sabreauto.dts | 2 +- arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 2 +- arch/arm/dts/imx6qp-sabresd.dts | 2 +- arch/arm/dts/imx6qp.dtsi | 2 +- arch/arm/dts/imx6s-dhcom-drc02-u-boot.dtsi | 2 +- arch/arm/dts/imx6s-dhcom-drc02.dts | 2 +- arch/arm/dts/imx6sll-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi | 2 +- arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi | 2 +- arch/arm/dts/imx6sx-udoo-neo-basic.dts | 2 +- arch/arm/dts/imx6sx-udoo-neo-extended.dts | 2 +- arch/arm/dts/imx6sx-udoo-neo-full.dts | 2 +- arch/arm/dts/imx6sx-udoo-neo.dtsi | 2 +- arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-9x9-evk.dts | 2 +- arch/arm/dts/imx6ul-geam-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 2 +- arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi | 2 +- arch/arm/dts/imx6ul-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts | 2 +- arch/arm/dts/imx6ull-dart-6ul.dts | 2 +- arch/arm/dts/imx6ull-dart-6ul.dtsi | 2 +- arch/arm/dts/imx6ull-phytec-phycore-som.dtsi | 2 +- arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts | 2 +- arch/arm/dts/imx6ull-phytec-segin-peb-eval-01.dtsi | 2 +- arch/arm/dts/imx6ull-phytec-segin.dtsi | 2 +- arch/arm/dts/imx6ull-somlabs-visionsom.dts | 2 +- arch/arm/dts/imx6ull-u-boot.dtsi | 2 +- arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx7-cm.dts | 2 +- arch/arm/dts/imx7d-meerkat96.dts | 2 +- arch/arm/dts/imx7d-pico-hobbit.dts | 2 +- arch/arm/dts/imx7d-pico-pi.dts | 2 +- arch/arm/dts/imx7d-pico.dtsi | 2 +- arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi | 2 +- arch/arm/dts/imx7d-sdb-qspi.dts | 2 +- arch/arm/dts/imx7d-sdb-u-boot.dtsi | 2 +- arch/arm/dts/imx7d-sdb.dts | 2 +- arch/arm/dts/imx7d-smegw01-u-boot.dtsi | 2 +- arch/arm/dts/imx7d-smegw01.dts | 2 +- arch/arm/dts/imx7d.dtsi | 2 +- arch/arm/dts/imx7s-u-boot.dtsi | 2 +- arch/arm/dts/imx7s-warp.dts | 2 +- arch/arm/dts/imx7s.dtsi | 2 +- arch/arm/dts/imx7ulp-com-u-boot.dtsi | 2 +- arch/arm/dts/imx7ulp-evk.dts | 2 +- arch/arm/dts/imx7ulp.dtsi | 2 +- arch/arm/dts/imx8-deneb.dts | 2 +- arch/arm/dts/imx8-giedi.dts | 2 +- arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-adc0.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-adc1.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-can0.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-can1.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm0.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm1.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-ied.dtso | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-optee.dts | 2 +- arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-cl-iot-gate.dts | 2 +- arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-data-modul-edm-sbc.dts | 2 +- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-evk.dts | 2 +- arch/arm/dts/imx8mm-evk.dtsi | 2 +- arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts | 2 +- arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts | 2 +- arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-icore-mx8mm.dtsi | 2 +- arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-kontron-bl-osm-s.dts | 2 +- arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-kontron-bl.dts | 2 +- arch/arm/dts/imx8mm-kontron-osm-s.dtsi | 2 +- arch/arm/dts/imx8mm-kontron-sl.dtsi | 2 +- arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-mx8menlo.dts | 2 +- arch/arm/dts/imx8mm-phg-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-phg.dts | 2 +- arch/arm/dts/imx8mm-pinfunc.h | 2 +- arch/arm/dts/imx8mm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw700x.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw71xx-0x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw71xx-0x.dts | 2 +- arch/arm/dts/imx8mm-venice-gw71xx.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw72xx-0x.dts | 2 +- arch/arm/dts/imx8mm-venice-gw72xx.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw73xx-0x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw73xx-0x.dts | 2 +- arch/arm/dts/imx8mm-venice-gw73xx.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7901.dts | 2 +- arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7902.dts | 2 +- arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7903.dts | 2 +- arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7904.dts | 2 +- arch/arm/dts/imx8mm-venice-gw7905-0x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw7905-0x.dts | 2 +- arch/arm/dts/imx8mm-venice-gw7905.dtsi | 2 +- arch/arm/dts/imx8mm-venice-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice.dts | 2 +- arch/arm/dts/imx8mm.dtsi | 2 +- arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2.dts | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-bsh-smm-s2pro.dts | 2 +- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-ddr4-evk.dts | 2 +- arch/arm/dts/imx8mn-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-evk.dts | 2 +- arch/arm/dts/imx8mn-evk.dtsi | 2 +- arch/arm/dts/imx8mn-pinfunc.h | 2 +- arch/arm/dts/imx8mn-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-var-som-symphony.dts | 2 +- arch/arm/dts/imx8mn-var-som.dtsi | 2 +- arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-venice-gw7902.dts | 2 +- arch/arm/dts/imx8mn-venice-u-boot.dtsi | 2 +- arch/arm/dts/imx8mn-venice.dts | 2 +- arch/arm/dts/imx8mn.dtsi | 2 +- arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-beacon-kit.dts | 2 +- arch/arm/dts/imx8mp-beacon-som.dtsi | 2 +- arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-data-modul-edm-sbc.dts | 2 +- arch/arm/dts/imx8mp-dhcom-pdk-overlay-eth2xfast.dts | 2 +- arch/arm/dts/imx8mp-dhcom-pdk2-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-dhcom-pdk2.dts | 2 +- arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts | 2 +- arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-dhcom-pdk3.dts | 2 +- arch/arm/dts/imx8mp-dhcom-som-overlay-eth1xfast.dts | 2 +- arch/arm/dts/imx8mp-dhcom-som-overlay-eth2xfast.dts | 2 +- arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts | 2 +- arch/arm/dts/imx8mp-dhcom-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-evk.dts | 2 +- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +- arch/arm/dts/imx8mp-icore-mx8mp.dtsi | 2 +- arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-pinfunc.h | 2 +- arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-rsb3720-a1.dts | 2 +- arch/arm/dts/imx8mp-venice-gw702x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw702x.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw71xx-2x.dts | 2 +- arch/arm/dts/imx8mp-venice-gw71xx.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw72xx-2x.dts | 2 +- arch/arm/dts/imx8mp-venice-gw72xx.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw73xx-2x.dts | 2 +- arch/arm/dts/imx8mp-venice-gw73xx.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw74xx.dts | 2 +- arch/arm/dts/imx8mp-venice-gw7905-2x-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw7905-2x.dts | 2 +- arch/arm/dts/imx8mp-venice-gw7905.dtsi | 2 +- arch/arm/dts/imx8mp-venice-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice.dts | 2 +- arch/arm/dts/imx8mp.dtsi | 2 +- arch/arm/dts/imx8mq-cm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts | 2 +- arch/arm/dts/imx8mq-librem5-r3.dtsi | 2 +- arch/arm/dts/imx8mq-librem5-r4.dts | 2 +- arch/arm/dts/imx8mq-librem5.dtsi | 2 +- arch/arm/dts/imx8mq-mnt-reform2.dts | 2 +- arch/arm/dts/imx8mq-nitrogen-som.dtsi | 2 +- arch/arm/dts/imx8mq-pico-pi.dts | 2 +- arch/arm/dts/imx8mq-u-boot.dtsi | 2 +- arch/arm/dts/imx8mq.dtsi | 2 +- arch/arm/dts/imx8qm-cgtqmx8.dts | 2 +- arch/arm/dts/imx8qm-rom7720-a1.dts | 2 +- arch/arm/dts/imx8qm-u-boot.dtsi | 2 +- arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi | 2 +- arch/arm/dts/imx8qxp-capricorn.dtsi | 2 +- arch/arm/dts/imx8qxp-u-boot.dtsi | 2 +- arch/arm/dts/imx8ulp-evk.dts | 2 +- arch/arm/dts/imx8ulp-pinfunc.h | 2 +- arch/arm/dts/imx8ulp.dtsi | 2 +- arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 2 +- arch/arm/dts/imx93-11x11-evk.dts | 2 +- arch/arm/dts/imx93-pinfunc.h | 2 +- arch/arm/dts/imx93.dtsi | 2 +- arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 2 +- arch/arm/dts/imxrt1020-evk.dts | 2 +- arch/arm/dts/imxrt1020-pinfunc.h | 2 +- arch/arm/dts/imxrt1020.dtsi | 2 +- arch/arm/dts/imxrt1050-evk-u-boot.dtsi | 2 +- arch/arm/dts/imxrt1050-evk.dts | 2 +- arch/arm/dts/imxrt1050-pinfunc.h | 2 +- arch/arm/dts/imxrt1050.dtsi | 2 +- arch/arm/dts/imxrt1170-evk-u-boot.dtsi | 2 +- arch/arm/dts/imxrt1170-evk.dts | 2 +- arch/arm/dts/imxrt1170-pinfunc.h | 2 +- arch/arm/dts/imxrt1170.dtsi | 2 +- arch/arm/dts/k3-am62-ddr.dtsi | 2 +- arch/arm/dts/k3-am625-beagleplay-ddr4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am62a-ddr-1866mhz-32bit.dtsi | 2 +- arch/arm/dts/k3-am62a-ddr.dtsi | 2 +- arch/arm/dts/k3-am62x-sk-ddr4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am64-ddr.dtsi | 2 +- arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am64-sk-lp4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am64x-binman.dtsi | 2 +- arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi | 2 +- arch/arm/dts/k3-am654-ddr.dtsi | 2 +- arch/arm/dts/k3-j7200-ddr-evm-lp4-2666.dtsi | 2 +- arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi | 2 +- arch/arm/dts/k3-j721e-ddr-sk-lp4-4266.dtsi | 2 +- arch/arm/dts/k3-j721e-ddr.dtsi | 2 +- arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi | 2 +- arch/arm/dts/k3-j721s2-ddr.dtsi | 2 +- arch/arm/dts/keystone-k2e-evm-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2g-evm-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2g-generic-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2g-generic.dts | 2 +- arch/arm/dts/keystone-k2g-ice-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi | 2 +- arch/arm/dts/keystone-k2l-evm-u-boot.dtsi | 2 +- arch/arm/dts/kirkwood-blackarmor-nas220.dts | 2 +- arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi | 2 +- arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi | 2 +- arch/arm/dts/kirkwood-nsa325.dts | 2 +- arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi | 2 +- arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi | 2 +- arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi | 2 +- arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi | 2 +- arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi | 2 +- arch/arm/dts/lpc3250-ea3250-u-boot.dtsi | 2 +- arch/arm/dts/lpc32xx.dtsi | 2 +- arch/arm/dts/ls1021a-iot-duart.dts | 2 +- arch/arm/dts/ls1021a-iot.dtsi | 2 +- arch/arm/dts/ls1021a-pg-wcom-expu1.dts | 2 +- arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 2 +- arch/arm/dts/ls1021a-qds-duart.dts | 2 +- arch/arm/dts/ls1021a-qds-lpuart.dts | 2 +- arch/arm/dts/ls1021a-qds.dtsi | 2 +- arch/arm/dts/ls1021a-twr-duart.dts | 2 +- arch/arm/dts/ls1021a-twr-lpuart.dts | 2 +- arch/arm/dts/ls1021a-twr.dtsi | 2 +- arch/arm/dts/ls1021a.dtsi | 2 +- arch/arm/dts/meson-a1-ad401.dts | 2 +- arch/arm/dts/meson-a1.dtsi | 2 +- arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi | 2 +- arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 2 +- arch/arm/dts/meson-axg-s400-u-boot.dtsi | 2 +- arch/arm/dts/meson-axg-s400.dts | 2 +- arch/arm/dts/meson-axg.dtsi | 2 +- arch/arm/dts/meson-g12-common-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12-common.dtsi | 2 +- arch/arm/dts/meson-g12.dtsi | 2 +- arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12a-radxa-zero.dts | 2 +- arch/arm/dts/meson-g12a-sei510-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12a-sei510.dts | 2 +- arch/arm/dts/meson-g12a-u200-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12a-u200.dts | 2 +- arch/arm/dts/meson-g12a.dtsi | 2 +- arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 2 +- arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 2 +- arch/arm/dts/meson-g12b-a311d.dtsi | 2 +- arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 2 +- arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 2 +- arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-bananapi.dtsi | 2 +- arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-gsking-x.dts | 2 +- arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-gtking-pro.dts | 2 +- arch/arm/dts/meson-g12b-gtking-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-gtking.dts | 2 +- arch/arm/dts/meson-g12b-khadas-vim3.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 2 +- arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 2 +- arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-n2.dts | 2 +- arch/arm/dts/meson-g12b-odroid-n2.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-odroid-n2l.dts | 2 +- arch/arm/dts/meson-g12b-odroid.dtsi | 2 +- arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi | 2 +- arch/arm/dts/meson-g12b-radxa-zero2.dts | 2 +- arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 2 +- arch/arm/dts/meson-g12b-s922x.dtsi | 2 +- arch/arm/dts/meson-g12b-w400.dtsi | 2 +- arch/arm/dts/meson-g12b.dtsi | 2 +- arch/arm/dts/meson-gx-mali450.dtsi | 2 +- arch/arm/dts/meson-gx-p23x-q20x.dtsi | 2 +- arch/arm/dts/meson-gx-u-boot.dtsi | 2 +- arch/arm/dts/meson-gx.dtsi | 2 +- arch/arm/dts/meson-gxbb-kii-pro-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-kii-pro.dts | 2 +- arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-nanopi-k2.dts | 2 +- arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-odroidc2.dts | 2 +- arch/arm/dts/meson-gxbb-p200-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-p200.dts | 2 +- arch/arm/dts/meson-gxbb-p201-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-p201.dts | 2 +- arch/arm/dts/meson-gxbb-p20x.dtsi | 2 +- arch/arm/dts/meson-gxbb-wetek-hub.dts | 2 +- arch/arm/dts/meson-gxbb-wetek-play2.dts | 2 +- arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxbb-wetek.dtsi | 2 +- arch/arm/dts/meson-gxbb.dtsi | 2 +- arch/arm/dts/meson-gxl-mali.dtsi | 2 +- arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 2 +- arch/arm/dts/meson-gxl-s805x.dtsi | 2 +- arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s905d.dtsi | 2 +- arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 2 +- arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc-v2-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 2 +- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 2 +- arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x-p212.dts | 2 +- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 2 +- arch/arm/dts/meson-gxl-s905x.dtsi | 2 +- arch/arm/dts/meson-gxl-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxl.dtsi | 2 +- arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxm-gt1-ultimate.dts | 2 +- arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxm-khadas-vim2.dts | 2 +- arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxm-wetek-core2-u-boot.dtsi | 2 +- arch/arm/dts/meson-gxm-wetek-core2.dts | 2 +- arch/arm/dts/meson-gxm.dtsi | 2 +- arch/arm/dts/meson-khadas-vim3-u-boot.dtsi | 2 +- arch/arm/dts/meson-khadas-vim3.dtsi | 2 +- arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 2 +- arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-bananapi-m5.dts | 2 +- arch/arm/dts/meson-sm1-bananapi.dtsi | 2 +- arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-khadas-vim3l.dts | 2 +- arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-odroid-c4.dts | 2 +- arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-odroid-hc4.dts | 2 +- arch/arm/dts/meson-sm1-odroid.dtsi | 2 +- arch/arm/dts/meson-sm1-sei610-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1-sei610.dts | 2 +- arch/arm/dts/meson-sm1-u-boot.dtsi | 2 +- arch/arm/dts/meson-sm1.dtsi | 2 +- arch/arm/dts/ns-board.dts | 2 +- arch/arm/dts/ns3-board.dts | 2 +- arch/arm/dts/ns3.dtsi | 2 +- arch/arm/dts/nuvoton-npcm845-pincfg.dtsi | 2 +- arch/arm/dts/o4-imx-nano.dts | 2 +- arch/arm/dts/o4-imx6ull-nano.dtsi | 2 +- arch/arm/dts/octeontx.dts | 2 +- arch/arm/dts/omap3-beagle-u-boot.dtsi | 2 +- arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi | 2 +- arch/arm/dts/omap3-beagle-xm-u-boot.dtsi | 2 +- arch/arm/dts/omap3-devkit8000-u-boot.dtsi | 2 +- arch/arm/dts/omap3-evm-37xx-u-boot.dtsi | 2 +- arch/arm/dts/omap3-evm-u-boot.dtsi | 2 +- arch/arm/dts/omap3-igep0020-u-boot.dtsi | 2 +- arch/arm/dts/omap4-u-boot.dtsi | 2 +- arch/arm/dts/phytium-durian.dts | 2 +- arch/arm/dts/phytium-pomelo.dts | 2 +- arch/arm/dts/px30-engicam-common.dtsi | 2 +- arch/arm/dts/px30-engicam-ctouch2.dtsi | 2 +- arch/arm/dts/px30-engicam-edimm2.2.dtsi | 2 +- arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts | 2 +- arch/arm/dts/px30-engicam-px30-core-ctouch2.dts | 2 +- arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts | 2 +- arch/arm/dts/px30-engicam-px30-core.dtsi | 2 +- arch/arm/dts/px30-evb-u-boot.dtsi | 2 +- arch/arm/dts/px30-evb.dts | 2 +- arch/arm/dts/px30-firefly-u-boot.dtsi | 2 +- arch/arm/dts/px30-firefly.dts | 2 +- arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 2 +- arch/arm/dts/px30-ringneck-haikou.dts | 2 +- arch/arm/dts/px30-ringneck.dtsi | 2 +- arch/arm/dts/px30-u-boot.dtsi | 2 +- arch/arm/dts/px30.dtsi | 2 +- arch/arm/dts/qcom-ipq4019.dtsi | 2 +- arch/arm/dts/qcs404-evb-uboot.dtsi | 2 +- arch/arm/dts/qcs404-evb.dts | 2 +- arch/arm/dts/qemu-arm.dts | 2 +- arch/arm/dts/qemu-arm64.dts | 2 +- arch/arm/dts/qoriq-fman3-0-10g-0.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-10g-1.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-0.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-1.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-2.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-3.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-4.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0-1g-5.dtsi | 2 +- arch/arm/dts/qoriq-fman3-0.dtsi | 2 +- arch/arm/dts/r9a06g032-rzn1-snarc-u-boot.dtsi | 2 +- arch/arm/dts/rk3036-sdk.dts | 2 +- arch/arm/dts/rk3036-u-boot.dtsi | 2 +- arch/arm/dts/rk3036.dtsi | 2 +- arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 2 +- arch/arm/dts/rk3066a-mk808.dts | 2 +- arch/arm/dts/rk3066a-u-boot.dtsi | 2 +- arch/arm/dts/rk3066a.dtsi | 2 +- arch/arm/dts/rk3128-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3128-evb.dts | 2 +- arch/arm/dts/rk3128-u-boot.dtsi | 2 +- arch/arm/dts/rk3128.dtsi | 2 +- arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 2 +- arch/arm/dts/rk3188-radxarock.dts | 2 +- arch/arm/dts/rk3188-u-boot.dtsi | 2 +- arch/arm/dts/rk3188.dtsi | 2 +- arch/arm/dts/rk3229-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3229-evb.dts | 2 +- arch/arm/dts/rk3229.dtsi | 2 +- arch/arm/dts/rk322x-u-boot.dtsi | 2 +- arch/arm/dts/rk322x.dtsi | 2 +- arch/arm/dts/rk3288-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-evb.dts | 2 +- arch/arm/dts/rk3288-evb.dtsi | 2 +- arch/arm/dts/rk3288-firefly-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-firefly.dts | 2 +- arch/arm/dts/rk3288-firefly.dtsi | 2 +- arch/arm/dts/rk3288-miqi-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-miqi.dts | 2 +- arch/arm/dts/rk3288-miqi.dtsi | 2 +- arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-popmetal-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-popmetal.dts | 2 +- arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-rock-pi-n8.dts | 2 +- arch/arm/dts/rk3288-rock2-square-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-tinker-s.dts | 2 +- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-tinker.dts | 2 +- arch/arm/dts/rk3288-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-veyron-speedy.dts | 2 +- arch/arm/dts/rk3288-veyron-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-vmarc-som.dtsi | 2 +- arch/arm/dts/rk3288-vyasa-u-boot.dtsi | 2 +- arch/arm/dts/rk3288-vyasa.dts | 2 +- arch/arm/dts/rk3288.dtsi | 2 +- arch/arm/dts/rk3308-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3308-evb.dts | 2 +- arch/arm/dts/rk3308-roc-cc-u-boot.dtsi | 2 +- arch/arm/dts/rk3308-roc-cc.dts | 2 +- arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 2 +- arch/arm/dts/rk3308-rock-pi-s.dts | 2 +- arch/arm/dts/rk3308-u-boot.dtsi | 2 +- arch/arm/dts/rk3308.dtsi | 2 +- arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 2 +- arch/arm/dts/rk3326-odroid-go2.dts | 2 +- arch/arm/dts/rk3326.dtsi | 2 +- arch/arm/dts/rk3328-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-evb.dts | 2 +- arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-nanopi-r2s.dts | 2 +- arch/arm/dts/rk3328-orangepi-r1-plus.dts | 2 +- arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-roc-cc.dts | 2 +- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-rock-pi-e.dts | 2 +- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 2 +- arch/arm/dts/rk3328-rock64.dts | 2 +- arch/arm/dts/rk3328-sdram-ddr3-666.dtsi | 2 +- arch/arm/dts/rk3328-sdram-ddr4-666.dtsi | 2 +- arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi | 2 +- arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi | 2 +- arch/arm/dts/rk3328-u-boot.dtsi | 2 +- arch/arm/dts/rk3328.dtsi | 2 +- arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 2 +- arch/arm/dts/rk3368-geekbox.dts | 2 +- arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi | 2 +- arch/arm/dts/rk3368-lion-haikou.dts | 2 +- arch/arm/dts/rk3368-lion.dtsi | 2 +- arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3368-px5-evb.dts | 2 +- arch/arm/dts/rk3368-sheep-u-boot.dtsi | 2 +- arch/arm/dts/rk3368-sheep.dts | 2 +- arch/arm/dts/rk3368-u-boot.dtsi | 2 +- arch/arm/dts/rk3368.dtsi | 2 +- arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-eaidk-610.dts | 2 +- arch/arm/dts/rk3399-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-evb.dts | 2 +- arch/arm/dts/rk3399-ficus-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-ficus.dts | 2 +- arch/arm/dts/rk3399-firefly-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-firefly.dts | 2 +- arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-gru-bob.dts | 2 +- arch/arm/dts/rk3399-gru-chromebook.dtsi | 2 +- arch/arm/dts/rk3399-gru-kevin-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-gru-kevin.dts | 2 +- arch/arm/dts/rk3399-gru-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-gru.dtsi | 2 +- arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-khadas-edge-captain.dts | 2 +- arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-khadas-edge-v.dts | 2 +- arch/arm/dts/rk3399-khadas-edge.dts | 2 +- arch/arm/dts/rk3399-khadas-edge.dtsi | 2 +- arch/arm/dts/rk3399-leez-p710-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-leez-p710.dts | 2 +- arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopc-t4.dts | 2 +- arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi-m4-2gb.dts | 2 +- arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi-m4.dts | 2 +- arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi-m4b.dts | 2 +- arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi-neo4.dts | 2 +- arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi-r4s.dts | 2 +- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-nanopi4.dtsi | 2 +- arch/arm/dts/rk3399-op1-opp.dtsi | 2 +- arch/arm/dts/rk3399-opp.dtsi | 2 +- arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-orangepi.dts | 2 +- arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-pinebook-pro.dts | 2 +- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-pinephone-pro.dts | 2 +- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-puma-haikou.dts | 2 +- arch/arm/dts/rk3399-puma.dtsi | 2 +- arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-roc-pc-mezzanine.dts | 2 +- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-roc-pc.dts | 2 +- arch/arm/dts/rk3399-roc-pc.dtsi | 2 +- arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-4c-plus.dts | 2 +- arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-4se.dts | 2 +- arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-pi-4.dtsi | 2 +- arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-pi-4a.dts | 2 +- arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock-pi-4c.dts | 2 +- arch/arm/dts/rk3399-rock960-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rock960.dts | 2 +- arch/arm/dts/rk3399-rock960.dtsi | 2 +- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-rockpro64.dts | 2 +- arch/arm/dts/rk3399-rockpro64.dtsi | 2 +- arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi | 2 +- arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi | 2 +- arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi | 2 +- arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi | 2 +- arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi | 2 +- arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi | 2 +- arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi | 2 +- arch/arm/dts/rk3399-t-opp.dtsi | 2 +- arch/arm/dts/rk3399-u-boot.dtsi | 2 +- arch/arm/dts/rk3399.dtsi | 2 +- arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 2 +- arch/arm/dts/rk3399pro-rock-pi-n10.dts | 2 +- arch/arm/dts/rk3399pro-u-boot.dtsi | 2 +- arch/arm/dts/rk3399pro-vmarc-som.dtsi | 2 +- arch/arm/dts/rk3399pro.dtsi | 2 +- arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-anbernic-rgxx3.dts | 2 +- arch/arm/dts/rk3566-anbernic-rgxx3.dtsi | 2 +- arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-quartz64-a.dts | 2 +- arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-quartz64-b.dts | 2 +- arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-radxa-cm3-io.dts | 2 +- arch/arm/dts/rk3566-radxa-cm3.dtsi | 2 +- arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-soquartz-blade.dts | 2 +- arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-soquartz-cm4.dts | 2 +- arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-soquartz-model-a.dts | 2 +- arch/arm/dts/rk3566-soquartz-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-soquartz.dtsi | 2 +- arch/arm/dts/rk3566.dtsi | 2 +- arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-bpi-r2-pro.dts | 2 +- arch/arm/dts/rk3568-evb-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-evb.dts | 2 +- arch/arm/dts/rk3568-generic-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-generic.dts | 2 +- arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-lubancat-2.dts | 2 +- arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-odroid-m1.dts | 2 +- arch/arm/dts/rk3568-pinctrl.dtsi | 2 +- arch/arm/dts/rk3568-radxa-cm3i.dtsi | 2 +- arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-radxa-e25.dts | 2 +- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-rock-3a.dts | 2 +- arch/arm/dts/rk3568.dtsi | 2 +- arch/arm/dts/rk356x-u-boot.dtsi | 2 +- arch/arm/dts/rk356x.dtsi | 2 +- arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3588-edgeble-neu6a-io.dts | 2 +- arch/arm/dts/rk3588-edgeble-neu6a.dtsi | 2 +- arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3588-edgeble-neu6b-io.dts | 2 +- arch/arm/dts/rk3588-edgeble-neu6b.dtsi | 2 +- arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi | 2 +- arch/arm/dts/rk3588-evb1-v10.dts | 2 +- arch/arm/dts/rk3588-pinctrl.dtsi | 2 +- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 2 +- arch/arm/dts/rk3588-rock-5b.dts | 2 +- arch/arm/dts/rk3588-u-boot.dtsi | 2 +- arch/arm/dts/rk3588.dtsi | 2 +- arch/arm/dts/rk3588j-u-boot.dtsi | 2 +- arch/arm/dts/rk3588j.dtsi | 2 +- arch/arm/dts/rk3588s-pinctrl.dtsi | 2 +- arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 2 +- arch/arm/dts/rk3588s-rock-5a.dts | 2 +- arch/arm/dts/rk3588s-u-boot.dtsi | 2 +- arch/arm/dts/rk3588s.dtsi | 2 +- arch/arm/dts/rk3xxx-u-boot.dtsi | 2 +- arch/arm/dts/rk3xxx.dtsi | 2 +- arch/arm/dts/rockchip-pinconf.dtsi | 2 +- arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi | 2 +- arch/arm/dts/rockchip-u-boot.dtsi | 2 +- arch/arm/dts/rv1108-elgin-r1.dts | 2 +- arch/arm/dts/rv1108-evb.dts | 2 +- arch/arm/dts/rv1108-u-boot.dtsi | 2 +- arch/arm/dts/rv1108.dtsi | 2 +- arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi | 2 +- arch/arm/dts/rv1126-edgeble-neu2-io.dts | 2 +- arch/arm/dts/rv1126-edgeble-neu2.dtsi | 2 +- arch/arm/dts/rv1126-pinctrl.dtsi | 2 +- arch/arm/dts/rv1126-u-boot.dtsi | 2 +- arch/arm/dts/rv1126.dtsi | 2 +- arch/arm/dts/s5p4418-nanopi2.dts | 2 +- arch/arm/dts/s5p4418-pinctrl.dtsi | 2 +- arch/arm/dts/s5p4418.dtsi | 2 +- arch/arm/dts/s5pc100-pinctrl.dtsi | 2 +- arch/arm/dts/s5pc110-pinctrl.dtsi | 2 +- arch/arm/dts/s5pc1xx-goni.dts | 2 +- arch/arm/dts/s5pc1xx-smdkc100.dts | 2 +- arch/arm/dts/s700-cubieboard7.dts | 2 +- arch/arm/dts/s700-u-boot.dtsi | 2 +- arch/arm/dts/s700.dtsi | 2 +- arch/arm/dts/s900-u-boot.dtsi | 2 +- arch/arm/dts/s900.dtsi | 2 +- arch/arm/dts/sam9x60.dtsi | 2 +- arch/arm/dts/sam9x60ek-u-boot.dtsi | 2 +- arch/arm/dts/sam9x60ek.dts | 2 +- arch/arm/dts/sama5d27_wlsom1.dtsi | 2 +- arch/arm/dts/sama7g5.dtsi | 2 +- arch/arm/dts/sdm845.dtsi | 2 +- arch/arm/dts/socfpga-common-u-boot.dtsi | 2 +- arch/arm/dts/socfpga.dtsi | 2 +- arch/arm/dts/socfpga_agilex-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_arria10-handoff.dtsi | 2 +- arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi | 2 +- arch/arm/dts/socfpga_arria10_socdk.dtsi | 2 +- arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 2 +- arch/arm/dts/socfpga_arria5_secu1.dts | 2 +- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_arria5_socdk.dts | 2 +- arch/arm/dts/socfpga_cyclone5.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 2 +- arch/arm/dts/socfpga_cyclone5_de10_standard.dts | 2 +- arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 2 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 2 +- arch/arm/dts/socfpga_cyclone5_mcv.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_mcvevk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_mcvevk.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 +- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_sockit.dts | 2 +- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 +- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 2 +- arch/arm/dts/socfpga_n5x-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_stratix10-u-boot.dtsi | 2 +- arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 2 +- arch/arm/dts/starqltechn-uboot.dtsi | 2 +- arch/arm/dts/starqltechn.dts | 2 +- arch/arm/dts/stm32429i-eval-u-boot.dtsi | 2 +- arch/arm/dts/stm32429i-eval.dts | 2 +- arch/arm/dts/stm32746g-eval-u-boot.dtsi | 2 +- arch/arm/dts/stm32746g-eval.dts | 2 +- arch/arm/dts/stm32f4-pinctrl.dtsi | 2 +- arch/arm/dts/stm32f429-disco-u-boot.dtsi | 2 +- arch/arm/dts/stm32f429-disco.dts | 2 +- arch/arm/dts/stm32f429-pinctrl.dtsi | 2 +- arch/arm/dts/stm32f429.dtsi | 2 +- arch/arm/dts/stm32f469-disco-u-boot.dtsi | 2 +- arch/arm/dts/stm32f469-disco.dts | 2 +- arch/arm/dts/stm32f469-pinctrl.dtsi | 2 +- arch/arm/dts/stm32f469.dtsi | 2 +- arch/arm/dts/stm32f7-pinctrl.dtsi | 2 +- arch/arm/dts/stm32f7-u-boot.dtsi | 2 +- arch/arm/dts/stm32f746-disco-u-boot.dtsi | 2 +- arch/arm/dts/stm32f746-disco.dts | 2 +- arch/arm/dts/stm32f746-pinctrl.dtsi | 2 +- arch/arm/dts/stm32f746.dtsi | 2 +- arch/arm/dts/stm32f769-disco-u-boot.dtsi | 2 +- arch/arm/dts/stm32f769-disco.dts | 2 +- arch/arm/dts/stm32f769-pinctrl.dtsi | 2 +- arch/arm/dts/stm32h7-u-boot.dtsi | 2 +- arch/arm/dts/stm32h743.dtsi | 2 +- arch/arm/dts/stm32h743i-disco-u-boot.dtsi | 2 +- arch/arm/dts/stm32h743i-disco.dts | 2 +- arch/arm/dts/stm32h743i-eval-u-boot.dtsi | 2 +- arch/arm/dts/stm32h750.dtsi | 2 +- arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi | 2 +- arch/arm/dts/stm32h750i-art-pi.dts | 2 +- arch/arm/dts/stm32mp13-pinctrl.dtsi | 2 +- arch/arm/dts/stm32mp131.dtsi | 2 +- arch/arm/dts/stm32mp133.dtsi | 2 +- arch/arm/dts/stm32mp135.dtsi | 2 +- arch/arm/dts/stm32mp135f-dk.dts | 2 +- arch/arm/dts/stm32mp13xc.dtsi | 2 +- arch/arm/dts/stm32mp13xf.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-ddr3-icore-1x4Gb-1066-binG.dtsi | 2 +- arch/arm/dts/stm32mp15-pinctrl.dtsi | 2 +- arch/arm/dts/stm32mp15-scmi.dtsi | 2 +- arch/arm/dts/stm32mp15-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp151.dtsi | 2 +- arch/arm/dts/stm32mp153.dtsi | 2 +- arch/arm/dts/stm32mp157.dtsi | 2 +- arch/arm/dts/stm32mp157a-dk1-scmi.dts | 2 +- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-dk1.dts | 2 +- .../arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 +- .../dts/stm32mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 +- arch/arm/dts/stm32mp157a-icore-stm32mp1-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-icore-stm32mp1.dtsi | 2 +- ...m32mp157a-microgea-stm32mp1-microdev2.0-of7-u-boot.dtsi | 2 +- .../dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 2 +- .../stm32mp157a-microgea-stm32mp1-microdev2.0-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 2 +- arch/arm/dts/stm32mp157a-microgea-stm32mp1-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157a-microgea-stm32mp1.dtsi | 2 +- arch/arm/dts/stm32mp157c-dk2-scmi.dts | 2 +- arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157c-dk2.dts | 2 +- arch/arm/dts/stm32mp157c-ed1-scmi.dts | 2 +- arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157c-ed1.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-scmi.dts | 2 +- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157c-ev1.dts | 2 +- arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 2 +- arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp157c-odyssey.dts | 2 +- arch/arm/dts/stm32mp15xc.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-drc02-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-drc02.dts | 2 +- arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-pdk2-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts | 2 +- arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-picoitx-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts | 2 +- arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcor-drc-compact-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dhcor-testbench-u-boot.dtsi | 2 +- arch/arm/dts/stm32mp15xx-dkx.dtsi | 2 +- arch/arm/dts/stm32mp15xxaa-pinctrl.dtsi | 2 +- arch/arm/dts/stm32mp15xxab-pinctrl.dtsi | 2 +- arch/arm/dts/stm32mp15xxac-pinctrl.dtsi | 2 +- arch/arm/dts/stm32mp15xxad-pinctrl.dtsi | 2 +- arch/arm/dts/sun4i-a10-inet-3f.dts | 2 +- arch/arm/dts/sun4i-a10-inet-3w.dts | 2 +- arch/arm/dts/sun4i-a10-topwise-a721.dts | 2 +- arch/arm/dts/sun50i-a64-amarula-relic.dts | 2 +- arch/arm/dts/sun50i-a64-bananapi-m64.dts | 2 +- arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +- arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts | 2 +- arch/arm/dts/sun50i-a64-olinuxino-emmc.dts | 2 +- arch/arm/dts/sun50i-a64-olinuxino.dts | 2 +- arch/arm/dts/sun50i-a64-orangepi-win.dts | 2 +- arch/arm/dts/sun50i-a64-pine64-lts.dts | 2 +- arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +- arch/arm/dts/sun50i-a64-pine64.dts | 2 +- arch/arm/dts/sun50i-a64-pinebook.dts | 2 +- arch/arm/dts/sun50i-a64-pinephone-1.0.dts | 2 +- arch/arm/dts/sun50i-a64-pinephone-1.1.dts | 2 +- arch/arm/dts/sun50i-a64-pinephone-1.2.dts | 2 +- arch/arm/dts/sun50i-a64-pinephone.dtsi | 2 +- arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts | 2 +- arch/arm/dts/sun50i-a64-pinetab.dts | 2 +- arch/arm/dts/sun50i-a64-sopine-baseboard-u-boot.dtsi | 2 +- arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 2 +- arch/arm/dts/sun50i-a64-sopine.dtsi | 2 +- arch/arm/dts/sun50i-a64.dtsi | 2 +- arch/arm/dts/sun50i-h5-bananapi-m2-plus-v1.2.dts | 2 +- arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts | 2 +- arch/arm/dts/sun50i-h5-cpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts | 2 +- arch/arm/dts/sun50i-h5-libretech-all-h3-it.dts | 2 +- arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts | 2 +- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 2 +- arch/arm/dts/sun50i-h5-nanopi-neo2.dts | 2 +- arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts | 2 +- arch/arm/dts/sun50i-h5.dtsi | 2 +- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 2 +- arch/arm/dts/sun50i-h6-cpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-h6-gpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-h6-orangepi-3.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi-lite2.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi-one-plus.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi.dtsi | 2 +- arch/arm/dts/sun50i-h6-pine-h64-model-b.dts | 2 +- arch/arm/dts/sun50i-h6-pine-h64.dts | 2 +- arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts | 2 +- arch/arm/dts/sun50i-h6-tanix-tx6.dts | 2 +- arch/arm/dts/sun50i-h6-tanix.dtsi | 2 +- arch/arm/dts/sun50i-h6.dtsi | 2 +- arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 2 +- arch/arm/dts/sun50i-h616-x96-mate.dts | 2 +- arch/arm/dts/sun50i-h616.dtsi | 2 +- arch/arm/dts/sun5i-a13-ampe-a76.dts | 2 +- arch/arm/dts/sun5i-a13-inet-86vs.dts | 2 +- arch/arm/dts/sun6i-a31-mixtile-loftq.dts | 2 +- arch/arm/dts/sun7i-a20-ainol-aw1.dts | 2 +- arch/arm/dts/sun7i-a20-haoyu-marsboard.dts | 2 +- arch/arm/dts/sun7i-a20-m5.dts | 2 +- arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts | 2 +- arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 2 +- arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts | 2 +- arch/arm/dts/sun7i-a20-wits-pro-a20-dkt-u-boot.dtsi | 2 +- arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts | 2 +- arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts | 2 +- arch/arm/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts | 2 +- arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts | 2 +- arch/arm/dts/sun8i-h3-nanopi-duo2.dts | 2 +- arch/arm/dts/sun8i-h3-nanopi-r1.dts | 2 +- arch/arm/dts/sun8i-h3-rervision-dvk.dts | 2 +- arch/arm/dts/sun8i-r40-feta40i.dtsi | 2 +- arch/arm/dts/sun8i-r40-oka40i-c.dts | 2 +- arch/arm/dts/sun8i-s3-elimo-impetus.dtsi | 2 +- arch/arm/dts/sun8i-s3-elimo-initium.dts | 2 +- arch/arm/dts/sun8i-s3-lichee-zero-plus.dts | 2 +- arch/arm/dts/sun8i-s3-pinecube.dts | 2 +- arch/arm/dts/sun8i-v3-sl631-imx179.dts | 2 +- arch/arm/dts/sun8i-v3-sl631.dtsi | 2 +- arch/arm/dts/sun8i-v3.dtsi | 2 +- arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 2 +- arch/arm/dts/suniv-f1c100s.dtsi | 2 +- arch/arm/dts/suniv-f1c200s-lctech-pi.dts | 2 +- arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts | 2 +- arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 2 +- arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi | 2 +- arch/arm/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- arch/arm/dts/t8103-j274.dts | 2 +- arch/arm/dts/t8103-j293.dts | 2 +- arch/arm/dts/t8103-j313.dts | 2 +- arch/arm/dts/t8103-j456.dts | 2 +- arch/arm/dts/t8103-j457.dts | 2 +- arch/arm/dts/t8103-jxxx.dtsi | 2 +- arch/arm/dts/t8103-pmgr.dtsi | 2 +- arch/arm/dts/t8103-u-boot.dtsi | 2 +- arch/arm/dts/t8103.dtsi | 2 +- arch/arm/dts/tegra124-nyan-big-u-boot.dtsi | 2 +- arch/arm/dts/tegra210-p3450-0000.dts | 2 +- arch/arm/dts/thunderx-88xx.dts | 2 +- arch/arm/dts/thunderx-88xx.dtsi | 2 +- arch/arm/dts/total_compute.dts | 2 +- arch/arm/dts/uniphier-ld11-global.dts | 2 +- arch/arm/dts/uniphier-ld11-ref.dts | 2 +- arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-ld20-akebi96.dts | 2 +- arch/arm/dts/uniphier-ld20-global.dts | 2 +- arch/arm/dts/uniphier-ld20-ref.dts | 2 +- arch/arm/dts/uniphier-ld20.dtsi | 2 +- arch/arm/dts/uniphier-ld4-ref.dts | 2 +- arch/arm/dts/uniphier-ld4.dtsi | 2 +- arch/arm/dts/uniphier-ld6b-ref.dts | 2 +- arch/arm/dts/uniphier-ld6b.dtsi | 2 +- arch/arm/dts/uniphier-pinctrl.dtsi | 2 +- arch/arm/dts/uniphier-pro4-ace.dts | 2 +- arch/arm/dts/uniphier-pro4-ref.dts | 2 +- arch/arm/dts/uniphier-pro4-sanji.dts | 2 +- arch/arm/dts/uniphier-pro4.dtsi | 2 +- arch/arm/dts/uniphier-pro5-4kbox.dts | 2 +- arch/arm/dts/uniphier-pro5.dtsi | 2 +- arch/arm/dts/uniphier-pxs2-gentil.dts | 2 +- arch/arm/dts/uniphier-pxs2-vodka.dts | 2 +- arch/arm/dts/uniphier-pxs2.dtsi | 2 +- arch/arm/dts/uniphier-pxs3-ref.dts | 2 +- arch/arm/dts/uniphier-pxs3.dtsi | 2 +- arch/arm/dts/uniphier-ref-daughter.dtsi | 2 +- arch/arm/dts/uniphier-sld8-ref.dts | 2 +- arch/arm/dts/uniphier-sld8.dtsi | 2 +- arch/arm/dts/uniphier-support-card.dtsi | 2 +- arch/arm/dts/vf-colibri-eval-v3.dtsi | 2 +- arch/arm/dts/vf-colibri.dtsi | 2 +- arch/arm/dts/vf610-bk4r1-u-boot.dtsi | 2 +- arch/arm/dts/vf610-bk4r1.dts | 2 +- arch/arm/dts/vf610-colibri-eval-v3.dts | 2 +- arch/arm/dts/vf610-colibri.dtsi | 2 +- arch/arm/dts/vf610-pcm052.dts | 2 +- arch/arm/dts/vf610-pcm052.dtsi | 2 +- arch/arm/dts/xenguest-arm64.dts | 2 +- arch/arm/dts/xilinx-versal-virt.dts | 2 +- arch/arm/dts/zynq-7000.dtsi | 2 +- arch/arm/dts/zynq-cc108.dts | 2 +- arch/arm/dts/zynq-cse-nand.dts | 2 +- arch/arm/dts/zynq-cse-nor.dts | 2 +- arch/arm/dts/zynq-cse-qspi-single.dts | 2 +- arch/arm/dts/zynq-cse-qspi.dtsi | 2 +- arch/arm/dts/zynq-microzed.dts | 2 +- arch/arm/dts/zynq-minized.dts | 2 +- arch/arm/dts/zynq-picozed.dts | 2 +- arch/arm/dts/zynq-syzygy-hub.dts | 2 +- arch/arm/dts/zynq-topic-miami.dts | 2 +- arch/arm/dts/zynq-topic-miamilite.dts | 2 +- arch/arm/dts/zynq-topic-miamiplus.dts | 2 +- arch/arm/dts/zynq-zc702.dts | 2 +- arch/arm/dts/zynq-zc706.dts | 2 +- arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm011-x16.dts | 2 +- arch/arm/dts/zynq-zc770-xm011.dts | 2 +- arch/arm/dts/zynq-zc770-xm012.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/dts/zynq-zed.dts | 2 +- arch/arm/dts/zynq-zybo-z7.dts | 2 +- arch/arm/dts/zynq-zybo.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 2 +- arch/arm/dts/zynqmp-mini-emmc0.dts | 2 +- arch/arm/dts/zynqmp-mini-emmc1.dts | 2 +- arch/arm/dts/zynqmp-mini-nand.dts | 2 +- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-mini.dts | 2 +- arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.1.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu106-rev1.0.dts | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 2 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 2 +- arch/arm/dts/zynqmp.dtsi | 2 +- arch/arm/include/asm/arch-am33xx/chilisom.h | 2 +- arch/arm/include/asm/arch-am33xx/clk_synthesizer.h | 2 +- arch/arm/include/asm/arch-am33xx/clock.h | 2 +- arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 2 +- arch/arm/include/asm/arch-am33xx/cpu.h | 2 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 2 +- arch/arm/include/asm/arch-am33xx/gpio.h | 2 +- arch/arm/include/asm/arch-am33xx/hardware.h | 2 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 2 +- arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 2 +- arch/arm/include/asm/arch-am33xx/i2c.h | 2 +- arch/arm/include/asm/arch-am33xx/mem-guardian.h | 2 +- arch/arm/include/asm/arch-am33xx/mem.h | 2 +- arch/arm/include/asm/arch-am33xx/mux_am43xx.h | 2 +- arch/arm/include/asm/arch-am33xx/omap.h | 2 +- arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-apple/rtkit.h | 2 +- arch/arm/include/asm/arch-apple/uart.h | 2 +- arch/arm/include/asm/arch-armv7/globaltimer.h | 2 +- arch/arm/include/asm/arch-armv7/sysctrl.h | 2 +- arch/arm/include/asm/arch-armv7/systimer.h | 2 +- arch/arm/include/asm/arch-armv7/wdt.h | 2 +- arch/arm/include/asm/arch-aspeed/boot0.h | 2 +- arch/arm/include/asm/arch-aspeed/pinctrl.h | 2 +- arch/arm/include/asm/arch-aspeed/platform.h | 2 +- arch/arm/include/asm/arch-aspeed/scu_ast2500.h | 2 +- arch/arm/include/asm/arch-aspeed/scu_ast2600.h | 2 +- arch/arm/include/asm/arch-aspeed/sdram_ast2500.h | 2 +- arch/arm/include/asm/arch-aspeed/sdram_ast2600.h | 2 +- arch/arm/include/asm/arch-aspeed/timer.h | 2 +- arch/arm/include/asm/arch-aspeed/wdt.h | 2 +- arch/arm/include/asm/arch-aspeed/wdt_ast2600.h | 2 +- arch/arm/include/asm/arch-bcm235xx/boot0.h | 2 +- arch/arm/include/asm/arch-bcm235xx/gpio.h | 2 +- arch/arm/include/asm/arch-bcm235xx/sysmap.h | 2 +- arch/arm/include/asm/arch-bcm281xx/boot0.h | 2 +- arch/arm/include/asm/arch-bcm281xx/gpio.h | 2 +- arch/arm/include/asm/arch-bcm281xx/sysmap.h | 2 +- arch/arm/include/asm/arch-bcmns3/bl33_info.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/clock.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fdt.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/gpio.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/mmu.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/mp.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/ns_access.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/soc.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/speed.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h | 2 +- arch/arm/include/asm/arch-fsl-layerscape/svr.h | 2 +- arch/arm/include/asm/arch-hi3660/hi3660.h | 2 +- arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h | 2 +- arch/arm/include/asm/arch-hi6220/dwmmc.h | 2 +- arch/arm/include/asm/arch-hi6220/gpio.h | 2 +- arch/arm/include/asm/arch-hi6220/hi6220.h | 2 +- arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h | 2 +- arch/arm/include/asm/arch-hi6220/periph.h | 2 +- arch/arm/include/asm/arch-hi6220/pinmux.h | 2 +- arch/arm/include/asm/arch-imx/cpu.h | 2 +- arch/arm/include/asm/arch-imx8/boot0.h | 2 +- arch/arm/include/asm/arch-imx8/clock.h | 2 +- arch/arm/include/asm/arch-imx8/gpio.h | 2 +- arch/arm/include/asm/arch-imx8/imx-regs.h | 2 +- arch/arm/include/asm/arch-imx8/imx8-pins.h | 2 +- arch/arm/include/asm/arch-imx8/iomux.h | 2 +- arch/arm/include/asm/arch-imx8/snvs_security_sc.h | 2 +- arch/arm/include/asm/arch-imx8/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx8m/clock.h | 2 +- arch/arm/include/asm/arch-imx8m/clock_imx8mm.h | 2 +- arch/arm/include/asm/arch-imx8m/clock_imx8mq.h | 2 +- arch/arm/include/asm/arch-imx8m/crm_regs.h | 2 +- arch/arm/include/asm/arch-imx8m/ddr.h | 2 +- arch/arm/include/asm/arch-imx8m/gpio.h | 2 +- arch/arm/include/asm/arch-imx8m/imx-regs.h | 2 +- arch/arm/include/asm/arch-imx8m/imx8mm_pins.h | 2 +- arch/arm/include/asm/arch-imx8m/imx8mn_pins.h | 2 +- arch/arm/include/asm/arch-imx8m/imx8mp_pins.h | 2 +- arch/arm/include/asm/arch-imx8m/imx8mq_pins.h | 2 +- arch/arm/include/asm/arch-imx8m/lpddr4_define.h | 2 +- arch/arm/include/asm/arch-imx8m/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx8ulp/cgc.h | 2 +- arch/arm/include/asm/arch-imx8ulp/clock.h | 2 +- arch/arm/include/asm/arch-imx8ulp/ddr.h | 2 +- arch/arm/include/asm/arch-imx8ulp/gpio.h | 2 +- arch/arm/include/asm/arch-imx8ulp/imx-regs.h | 2 +- arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h | 2 +- arch/arm/include/asm/arch-imx8ulp/iomux.h | 2 +- arch/arm/include/asm/arch-imx8ulp/pcc.h | 2 +- arch/arm/include/asm/arch-imx8ulp/rdc.h | 2 +- arch/arm/include/asm/arch-imx8ulp/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx8ulp/upower.h | 2 +- arch/arm/include/asm/arch-imx9/ccm_regs.h | 2 +- arch/arm/include/asm/arch-imx9/clock.h | 2 +- arch/arm/include/asm/arch-imx9/ddr.h | 2 +- arch/arm/include/asm/arch-imx9/gpio.h | 2 +- arch/arm/include/asm/arch-imx9/imx-regs.h | 2 +- arch/arm/include/asm/arch-imx9/imx93_pins.h | 2 +- arch/arm/include/asm/arch-imx9/sys_proto.h | 2 +- arch/arm/include/asm/arch-imx9/trdc.h | 2 +- arch/arm/include/asm/arch-imxrt/clock.h | 2 +- arch/arm/include/asm/arch-imxrt/gpio.h | 2 +- arch/arm/include/asm/arch-imxrt/imx-regs.h | 2 +- arch/arm/include/asm/arch-imxrt/sys_proto.h | 2 +- arch/arm/include/asm/arch-lpc32xx/clk.h | 2 +- arch/arm/include/asm/arch-lpc32xx/config.h | 2 +- arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 +- arch/arm/include/asm/arch-lpc32xx/dma.h | 2 +- arch/arm/include/asm/arch-lpc32xx/emc.h | 2 +- arch/arm/include/asm/arch-lpc32xx/gpio.h | 2 +- arch/arm/include/asm/arch-lpc32xx/mux.h | 2 +- arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 2 +- arch/arm/include/asm/arch-lpc32xx/timer.h | 2 +- arch/arm/include/asm/arch-lpc32xx/uart.h | 2 +- arch/arm/include/asm/arch-lpc32xx/wdt.h | 2 +- arch/arm/include/asm/arch-ls102xa/clock.h | 2 +- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/arm/include/asm/arch-ls102xa/fsl_serdes.h | 2 +- arch/arm/include/asm/arch-ls102xa/gpio.h | 2 +- arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 +- arch/arm/include/asm/arch-ls102xa/imx-regs.h | 2 +- arch/arm/include/asm/arch-ls102xa/ls102xa_devdis.h | 2 +- arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h | 2 +- arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h | 2 +- arch/arm/include/asm/arch-ls102xa/ns_access.h | 2 +- arch/arm/include/asm/arch-ls102xa/spl.h | 2 +- arch/arm/include/asm/arch-ls102xa/svr.h | 2 +- arch/arm/include/asm/arch-meson/a1.h | 2 +- arch/arm/include/asm/arch-meson/axg.h | 2 +- arch/arm/include/asm/arch-meson/boot.h | 2 +- arch/arm/include/asm/arch-meson/clock-a1.h | 2 +- arch/arm/include/asm/arch-meson/clock-axg.h | 2 +- arch/arm/include/asm/arch-meson/clock-g12a.h | 2 +- arch/arm/include/asm/arch-meson/clock-gx.h | 2 +- arch/arm/include/asm/arch-meson/eth.h | 2 +- arch/arm/include/asm/arch-meson/g12a.h | 2 +- arch/arm/include/asm/arch-meson/gpio.h | 2 +- arch/arm/include/asm/arch-meson/gx.h | 2 +- arch/arm/include/asm/arch-meson/i2c.h | 2 +- arch/arm/include/asm/arch-meson/mem.h | 2 +- arch/arm/include/asm/arch-meson/meson-vpu.h | 2 +- arch/arm/include/asm/arch-meson/sm.h | 2 +- arch/arm/include/asm/arch-meson/usb-gx.h | 2 +- arch/arm/include/asm/arch-meson/usb.h | 2 +- arch/arm/include/asm/arch-mvebu/spi.h | 2 +- arch/arm/include/asm/arch-mx27/clock.h | 2 +- arch/arm/include/asm/arch-mx27/gpio.h | 2 +- arch/arm/include/asm/arch-mx27/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx27/regs-rtc.h | 2 +- arch/arm/include/asm/arch-mx31/clock.h | 2 +- arch/arm/include/asm/arch-mx31/gpio.h | 2 +- arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx31/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx5/clock.h | 2 +- arch/arm/include/asm/arch-mx5/crm_regs.h | 2 +- arch/arm/include/asm/arch-mx5/gpio.h | 2 +- arch/arm/include/asm/arch-mx5/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx5/iomux-mx51.h | 2 +- arch/arm/include/asm/arch-mx5/iomux-mx53.h | 2 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx6/clock.h | 2 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 2 +- arch/arm/include/asm/arch-mx6/gpio.h | 2 +- arch/arm/include/asm/arch-mx6/imx-rdc.h | 2 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx6/iomux.h | 2 +- arch/arm/include/asm/arch-mx6/litesom.h | 2 +- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6-pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6_plugin.S | 2 +- arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6q_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sl-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sll_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sx-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sx_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sx_rdc.h | 2 +- arch/arm/include/asm/arch-mx6/mx6ul-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6ul_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mx6ull_pins.h | 2 +- arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 2 +- arch/arm/include/asm/arch-mx6/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx7/clock.h | 2 +- arch/arm/include/asm/arch-mx7/clock_slice.h | 2 +- arch/arm/include/asm/arch-mx7/crm_regs.h | 2 +- arch/arm/include/asm/arch-mx7/gpio.h | 2 +- arch/arm/include/asm/arch-mx7/imx-rdc.h | 2 +- arch/arm/include/asm/arch-mx7/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx7/mx7-ddr.h | 2 +- arch/arm/include/asm/arch-mx7/mx7-pins.h | 2 +- arch/arm/include/asm/arch-mx7/mx7_plugin.S | 2 +- arch/arm/include/asm/arch-mx7/mx7d_pins.h | 2 +- arch/arm/include/asm/arch-mx7/mx7d_rdc.h | 2 +- arch/arm/include/asm/arch-mx7/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx7ulp/clock.h | 2 +- arch/arm/include/asm/arch-mx7ulp/gpio.h | 2 +- arch/arm/include/asm/arch-mx7ulp/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx7ulp/iomux.h | 2 +- arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h | 2 +- arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S | 2 +- arch/arm/include/asm/arch-mx7ulp/pcc.h | 2 +- arch/arm/include/asm/arch-mx7ulp/scg.h | 2 +- arch/arm/include/asm/arch-mx7ulp/sys_proto.h | 2 +- arch/arm/include/asm/arch-mxs/clock.h | 2 +- arch/arm/include/asm/arch-mxs/gpio.h | 2 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 +- arch/arm/include/asm/arch-mxs/iomux-mx23.h | 2 +- arch/arm/include/asm/arch-mxs/iomux-mx28.h | 2 +- arch/arm/include/asm/arch-mxs/iomux.h | 2 +- arch/arm/include/asm/arch-mxs/regs-base.h | 2 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h | 2 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h | 2 +- arch/arm/include/asm/arch-mxs/regs-digctl.h | 2 +- arch/arm/include/asm/arch-mxs/regs-i2c.h | 2 +- arch/arm/include/asm/arch-mxs/regs-lradc.h | 2 +- arch/arm/include/asm/arch-mxs/regs-ocotp.h | 2 +- arch/arm/include/asm/arch-mxs/regs-pinctrl.h | 2 +- arch/arm/include/asm/arch-mxs/regs-power-mx23.h | 2 +- arch/arm/include/asm/arch-mxs/regs-power-mx28.h | 2 +- arch/arm/include/asm/arch-mxs/regs-rtc.h | 2 +- arch/arm/include/asm/arch-mxs/regs-ssp.h | 2 +- arch/arm/include/asm/arch-mxs/regs-timrot.h | 2 +- arch/arm/include/asm/arch-mxs/regs-usb.h | 2 +- arch/arm/include/asm/arch-mxs/regs-usbphy.h | 2 +- arch/arm/include/asm/arch-mxs/sys_proto.h | 2 +- arch/arm/include/asm/arch-npcm7xx/aes.h | 2 +- arch/arm/include/asm/arch-npcm7xx/gcr.h | 2 +- arch/arm/include/asm/arch-npcm7xx/otp.h | 2 +- arch/arm/include/asm/arch-npcm8xx/aes.h | 2 +- arch/arm/include/asm/arch-npcm8xx/gcr.h | 2 +- arch/arm/include/asm/arch-npcm8xx/otp.h | 2 +- arch/arm/include/asm/arch-npcm8xx/rng.h | 2 +- arch/arm/include/asm/arch-npcm8xx/rst.h | 2 +- arch/arm/include/asm/arch-npcm8xx/sha.h | 2 +- arch/arm/include/asm/arch-omap3/am35x_def.h | 2 +- arch/arm/include/asm/arch-omap3/clock.h | 2 +- arch/arm/include/asm/arch-omap3/clocks_omap3.h | 2 +- arch/arm/include/asm/arch-omap3/cpu.h | 2 +- arch/arm/include/asm/arch-omap3/dma.h | 2 +- arch/arm/include/asm/arch-omap3/ehci.h | 2 +- arch/arm/include/asm/arch-omap3/emac_defs.h | 2 +- arch/arm/include/asm/arch-omap3/emif4.h | 2 +- arch/arm/include/asm/arch-omap3/i2c.h | 2 +- arch/arm/include/asm/arch-omap3/mem.h | 2 +- arch/arm/include/asm/arch-omap3/musb.h | 2 +- arch/arm/include/asm/arch-omap3/mux.h | 2 +- arch/arm/include/asm/arch-omap3/omap.h | 2 +- arch/arm/include/asm/arch-omap3/spl.h | 2 +- arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap4/clock.h | 2 +- arch/arm/include/asm/arch-omap4/cpu.h | 2 +- arch/arm/include/asm/arch-omap4/hardware.h | 2 +- arch/arm/include/asm/arch-omap4/i2c.h | 2 +- arch/arm/include/asm/arch-omap4/mem.h | 2 +- arch/arm/include/asm/arch-omap4/mux_omap4.h | 2 +- arch/arm/include/asm/arch-omap4/omap.h | 2 +- arch/arm/include/asm/arch-omap4/spl.h | 2 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/cpu.h | 2 +- arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h | 2 +- arch/arm/include/asm/arch-omap5/ehci.h | 2 +- arch/arm/include/asm/arch-omap5/hardware.h | 2 +- arch/arm/include/asm/arch-omap5/i2c.h | 2 +- arch/arm/include/asm/arch-omap5/mem.h | 2 +- arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 2 +- arch/arm/include/asm/arch-omap5/omap.h | 2 +- arch/arm/include/asm/arch-omap5/sata.h | 2 +- arch/arm/include/asm/arch-omap5/spl.h | 2 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 2 +- arch/arm/include/asm/arch-orion5x/spl.h | 2 +- arch/arm/include/asm/arch-owl/regs_s700.h | 2 +- arch/arm/include/asm/arch-owl/regs_s900.h | 2 +- arch/arm/include/asm/arch-px30/boot0.h | 2 +- arch/arm/include/asm/arch-px30/gpio.h | 2 +- arch/arm/include/asm/arch-rk3036/boot0.h | 2 +- arch/arm/include/asm/arch-rk3036/gpio.h | 2 +- arch/arm/include/asm/arch-rk3066/boot0.h | 2 +- arch/arm/include/asm/arch-rk3066/gpio.h | 2 +- arch/arm/include/asm/arch-rk3066/timer.h | 2 +- arch/arm/include/asm/arch-rk3128/boot0.h | 2 +- arch/arm/include/asm/arch-rk3128/gpio.h | 2 +- arch/arm/include/asm/arch-rk3188/boot0.h | 2 +- arch/arm/include/asm/arch-rk3188/gpio.h | 2 +- arch/arm/include/asm/arch-rk322x/boot0.h | 2 +- arch/arm/include/asm/arch-rk322x/gpio.h | 2 +- arch/arm/include/asm/arch-rk3288/boot0.h | 2 +- arch/arm/include/asm/arch-rk3288/gpio.h | 2 +- arch/arm/include/asm/arch-rk3308/boot0.h | 2 +- arch/arm/include/asm/arch-rk3308/cru_rk3308.h | 2 +- arch/arm/include/asm/arch-rk3308/gpio.h | 2 +- arch/arm/include/asm/arch-rk3308/grf_rk3308.h | 2 +- arch/arm/include/asm/arch-rk3328/boot0.h | 2 +- arch/arm/include/asm/arch-rk3328/gpio.h | 2 +- arch/arm/include/asm/arch-rk3368/boot0.h | 2 +- arch/arm/include/asm/arch-rk3368/gpio.h | 2 +- arch/arm/include/asm/arch-rk3399/boot0.h | 2 +- arch/arm/include/asm/arch-rk3399/gpio.h | 2 +- arch/arm/include/asm/arch-rk3568/boot0.h | 2 +- arch/arm/include/asm/arch-rk3568/gpio.h | 2 +- arch/arm/include/asm/arch-rk3588/boot0.h | 2 +- arch/arm/include/asm/arch-rk3588/gpio.h | 2 +- arch/arm/include/asm/arch-rockchip/boot0.h | 2 +- arch/arm/include/asm/arch-rockchip/cpu_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/cru.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_px30.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3036.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3066.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3128.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3188.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk322x.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3328.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3368.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rk3399.h | 2 +- arch/arm/include/asm/arch-rockchip/cru_rv1108.h | 2 +- arch/arm/include/asm/arch-rockchip/dram_spec_timing.h | 2 +- arch/arm/include/asm/arch-rockchip/f_rockusb.h | 2 +- arch/arm/include/asm/arch-rockchip/gpio.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_px30.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3036.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3066.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3128.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk322x.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3328.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3368.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3568.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rk3588.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rv1108.h | 2 +- arch/arm/include/asm/arch-rockchip/grf_rv1126.h | 2 +- arch/arm/include/asm/arch-rockchip/hardware.h | 2 +- arch/arm/include/asm/arch-rockchip/i2c.h | 2 +- arch/arm/include/asm/arch-rockchip/ioc_rk3588.h | 2 +- arch/arm/include/asm/arch-rockchip/lvds_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/misc.h | 2 +- arch/arm/include/asm/arch-rockchip/pmu_rk3188.h | 2 +- arch/arm/include/asm/arch-rockchip/pmu_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/pmu_rk3399.h | 2 +- arch/arm/include/asm/arch-rockchip/pwm.h | 2 +- arch/arm/include/asm/arch-rockchip/qos_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_msch.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h | 2 +- .../arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_px30.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_rk3036.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_rk322x.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_rk3328.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_rk3399.h | 2 +- arch/arm/include/asm/arch-rockchip/sdram_rv1126.h | 2 +- arch/arm/include/asm/arch-rockchip/sys_proto.h | 2 +- arch/arm/include/asm/arch-rockchip/timer.h | 2 +- arch/arm/include/asm/arch-rockchip/uart.h | 2 +- arch/arm/include/asm/arch-rv1108/boot0.h | 2 +- arch/arm/include/asm/arch-rv1108/gpio.h | 2 +- arch/arm/include/asm/arch-rv1126/boot0.h | 2 +- arch/arm/include/asm/arch-rv1126/gpio.h | 2 +- arch/arm/include/asm/arch-stih410/sdhci.h | 2 +- arch/arm/include/asm/arch-stih410/sys_proto.h | 2 +- arch/arm/include/asm/arch-stm32/stm32f.h | 2 +- arch/arm/include/asm/arch-stm32f4/stm32.h | 2 +- arch/arm/include/asm/arch-stm32f4/stm32_pwr.h | 2 +- arch/arm/include/asm/arch-stm32f7/stm32.h | 2 +- arch/arm/include/asm/arch-stm32f7/stm32_pwr.h | 2 +- arch/arm/include/asm/arch-stm32f7/syscfg.h | 2 +- arch/arm/include/asm/arch-stm32h7/stm32.h | 2 +- arch/arm/include/asm/arch-stv0991/gpio.h | 2 +- arch/arm/include/asm/arch-stv0991/hardware.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_cgu.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_creg.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_defs.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_gpt.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_periph.h | 2 +- arch/arm/include/asm/arch-stv0991/stv0991_wdru.h | 2 +- arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun9i.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu_sun9i.h | 2 +- arch/arm/include/asm/arch-sunxi/cpucfg.h | 2 +- arch/arm/include/asm/arch-sunxi/display.h | 2 +- arch/arm/include/asm/arch-sunxi/display2.h | 2 +- arch/arm/include/asm/arch-sunxi/dma.h | 2 +- arch/arm/include/asm/arch-sunxi/dma_sun4i.h | 2 +- arch/arm/include/asm/arch-sunxi/dram.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun4i.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun6i.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sun9i.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_suniv.h | 2 +- arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h | 2 +- arch/arm/include/asm/arch-sunxi/gpio.h | 2 +- arch/arm/include/asm/arch-sunxi/gtbus.h | 2 +- arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h | 2 +- arch/arm/include/asm/arch-sunxi/i2c.h | 2 +- arch/arm/include/asm/arch-sunxi/lcdc.h | 2 +- arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/p2wi.h | 2 +- arch/arm/include/asm/arch-sunxi/pmic_bus.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 2 +- arch/arm/include/asm/arch-sunxi/pwm.h | 2 +- arch/arm/include/asm/arch-sunxi/rsb.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 2 +- arch/arm/include/asm/arch-sunxi/sys_proto.h | 2 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/include/asm/arch-sunxi/tve.h | 2 +- arch/arm/include/asm/arch-sunxi/tzpc.h | 2 +- arch/arm/include/asm/arch-sunxi/watchdog.h | 2 +- arch/arm/include/asm/arch-tegra/ap.h | 2 +- arch/arm/include/asm/arch-tegra/apb_misc.h | 2 +- arch/arm/include/asm/arch-tegra/board.h | 2 +- arch/arm/include/asm/arch-tegra/cboot.h | 2 +- arch/arm/include/asm/arch-tegra/clk_rst.h | 2 +- arch/arm/include/asm/arch-tegra/clock.h | 2 +- arch/arm/include/asm/arch-tegra/crypto.h | 2 +- arch/arm/include/asm/arch-tegra/dc.h | 2 +- arch/arm/include/asm/arch-tegra/fuse.h | 2 +- arch/arm/include/asm/arch-tegra/gp_padctrl.h | 2 +- arch/arm/include/asm/arch-tegra/gpio.h | 2 +- arch/arm/include/asm/arch-tegra/gpu.h | 2 +- arch/arm/include/asm/arch-tegra/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra/pmc.h | 2 +- arch/arm/include/asm/arch-tegra/pmu.h | 2 +- arch/arm/include/asm/arch-tegra/pwm.h | 2 +- arch/arm/include/asm/arch-tegra/scu.h | 2 +- arch/arm/include/asm/arch-tegra/sys_proto.h | 2 +- arch/arm/include/asm/arch-tegra/tegra.h | 2 +- arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 +- arch/arm/include/asm/arch-tegra/timer.h | 2 +- arch/arm/include/asm/arch-tegra/uart.h | 2 +- arch/arm/include/asm/arch-tegra/usb.h | 2 +- arch/arm/include/asm/arch-tegra/warmboot.h | 2 +- arch/arm/include/asm/arch-tegra114/mc.h | 2 +- arch/arm/include/asm/arch-tegra114/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra124/ahb.h | 2 +- arch/arm/include/asm/arch-tegra124/clock-tables.h | 2 +- arch/arm/include/asm/arch-tegra124/clock.h | 2 +- arch/arm/include/asm/arch-tegra124/display.h | 2 +- arch/arm/include/asm/arch-tegra124/flow.h | 2 +- arch/arm/include/asm/arch-tegra124/funcmux.h | 2 +- arch/arm/include/asm/arch-tegra124/gp_padctrl.h | 2 +- arch/arm/include/asm/arch-tegra124/gpio.h | 2 +- arch/arm/include/asm/arch-tegra124/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra124/pwm.h | 2 +- arch/arm/include/asm/arch-tegra124/sysctr.h | 2 +- arch/arm/include/asm/arch-tegra124/tegra.h | 2 +- arch/arm/include/asm/arch-tegra20/clock-tables.h | 2 +- arch/arm/include/asm/arch-tegra20/clock.h | 2 +- arch/arm/include/asm/arch-tegra20/display.h | 2 +- arch/arm/include/asm/arch-tegra20/emc.h | 2 +- arch/arm/include/asm/arch-tegra20/flow.h | 2 +- arch/arm/include/asm/arch-tegra20/funcmux.h | 2 +- arch/arm/include/asm/arch-tegra20/gp_padctrl.h | 2 +- arch/arm/include/asm/arch-tegra20/gpio.h | 2 +- arch/arm/include/asm/arch-tegra20/mc.h | 2 +- arch/arm/include/asm/arch-tegra20/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra20/pwm.h | 2 +- arch/arm/include/asm/arch-tegra20/sdram_param.h | 2 +- arch/arm/include/asm/arch-tegra20/tegra.h | 2 +- arch/arm/include/asm/arch-tegra210/ahb.h | 2 +- arch/arm/include/asm/arch-tegra210/clock-tables.h | 2 +- arch/arm/include/asm/arch-tegra210/clock.h | 2 +- arch/arm/include/asm/arch-tegra210/flow.h | 2 +- arch/arm/include/asm/arch-tegra210/funcmux.h | 2 +- arch/arm/include/asm/arch-tegra210/gp_padctrl.h | 2 +- arch/arm/include/asm/arch-tegra210/gpio.h | 2 +- arch/arm/include/asm/arch-tegra210/mc.h | 2 +- arch/arm/include/asm/arch-tegra210/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra210/powergate.h | 2 +- arch/arm/include/asm/arch-tegra210/sysctr.h | 2 +- arch/arm/include/asm/arch-tegra210/tegra.h | 2 +- arch/arm/include/asm/arch-tegra30/display.h | 2 +- arch/arm/include/asm/arch-tegra30/dsi.h | 2 +- arch/arm/include/asm/arch-tegra30/mc.h | 2 +- arch/arm/include/asm/arch-tegra30/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra30/pwm.h | 2 +- arch/arm/include/asm/arch-vf610/clock.h | 2 +- arch/arm/include/asm/arch-vf610/crm_regs.h | 2 +- arch/arm/include/asm/arch-vf610/ddrmc-vf610.h | 2 +- arch/arm/include/asm/arch-vf610/imx-regs.h | 2 +- arch/arm/include/asm/arch-vf610/iomux-vf610.h | 2 +- arch/arm/include/asm/arm11.h | 2 +- arch/arm/include/asm/armv7.h | 2 +- arch/arm/include/asm/armv7_mpu.h | 2 +- arch/arm/include/asm/armv7m.h | 2 +- arch/arm/include/asm/armv8/cpu.h | 2 +- arch/arm/include/asm/armv8/mmu.h | 2 +- arch/arm/include/asm/armv8/sec_firmware.h | 2 +- arch/arm/include/asm/barriers.h | 2 +- arch/arm/include/asm/bootm.h | 2 +- arch/arm/include/asm/cache.h | 2 +- arch/arm/include/asm/config.h | 2 +- arch/arm/include/asm/dma-mapping.h | 2 +- arch/arm/include/asm/fsl_secure_boot.h | 2 +- arch/arm/include/asm/gic-v3.h | 2 +- arch/arm/include/asm/global_data.h | 2 +- arch/arm/include/asm/handoff.h | 2 +- arch/arm/include/asm/iproc-common/armpll.h | 2 +- arch/arm/include/asm/iproc-common/sysmap.h | 2 +- arch/arm/include/asm/iproc-common/timer.h | 2 +- arch/arm/include/asm/kona-common/clk.h | 2 +- arch/arm/include/asm/mach-imx/ahab.h | 2 +- arch/arm/include/asm/mach-imx/boot_mode.h | 2 +- arch/arm/include/asm/mach-imx/dma.h | 2 +- arch/arm/include/asm/mach-imx/ele_api.h | 2 +- arch/arm/include/asm/mach-imx/gpio.h | 2 +- arch/arm/include/asm/mach-imx/hab.h | 2 +- arch/arm/include/asm/mach-imx/imx-nandbcb.h | 2 +- arch/arm/include/asm/mach-imx/imximage.cfg | 2 +- arch/arm/include/asm/mach-imx/iomux-v3.h | 2 +- arch/arm/include/asm/mach-imx/module_fuse.h | 2 +- arch/arm/include/asm/mach-imx/mu_hal.h | 2 +- arch/arm/include/asm/mach-imx/mx5_video.h | 2 +- arch/arm/include/asm/mach-imx/mxc_i2c.h | 2 +- arch/arm/include/asm/mach-imx/rdc-sema.h | 2 +- arch/arm/include/asm/mach-imx/regs-apbh.h | 2 +- arch/arm/include/asm/mach-imx/regs-bch.h | 2 +- arch/arm/include/asm/mach-imx/regs-common.h | 2 +- arch/arm/include/asm/mach-imx/regs-gpmi.h | 2 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 2 +- arch/arm/include/asm/mach-imx/regs-usbphy.h | 2 +- arch/arm/include/asm/mach-imx/sata.h | 2 +- arch/arm/include/asm/mach-imx/spi.h | 2 +- arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- arch/arm/include/asm/mach-imx/syscounter.h | 2 +- arch/arm/include/asm/mach-imx/video.h | 2 +- arch/arm/include/asm/macro.h | 2 +- arch/arm/include/asm/omap_common.h | 2 +- arch/arm/include/asm/omap_musb.h | 2 +- arch/arm/include/asm/omap_sec_common.h | 2 +- arch/arm/include/asm/opcodes-virt.h | 2 +- arch/arm/include/asm/pl310.h | 2 +- arch/arm/include/asm/sections.h | 2 +- arch/arm/include/asm/setjmp.h | 2 +- arch/arm/include/asm/spin_table.h | 2 +- arch/arm/include/asm/spl.h | 2 +- arch/arm/include/asm/ti-common/keystone_nav.h | 2 +- arch/arm/include/asm/ti-common/keystone_net.h | 2 +- arch/arm/include/asm/ti-common/keystone_serdes.h | 2 +- arch/arm/include/asm/ti-common/omap_wdt.h | 2 +- arch/arm/include/asm/ti-common/sys_proto.h | 2 +- arch/arm/include/asm/ti-common/ti-aemif.h | 2 +- arch/arm/include/asm/ti-common/ti-edma3.h | 2 +- arch/arm/include/asm/u-boot-arm.h | 2 +- arch/arm/include/asm/u-boot.h | 2 +- arch/arm/include/asm/utils.h | 2 +- arch/arm/include/asm/xen.h | 2 +- arch/arm/include/debug/8250.S | 2 +- arch/arm/lib/Makefile | 2 +- arch/arm/lib/ashldi3.S | 2 +- arch/arm/lib/ashrdi3.S | 2 +- arch/arm/lib/asm-offsets.c | 2 +- arch/arm/lib/bdinfo.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- arch/arm/lib/bootm.c | 2 +- arch/arm/lib/cache-cp15.c | 2 +- arch/arm/lib/cache-pl310.c | 2 +- arch/arm/lib/cache.c | 2 +- arch/arm/lib/ccn504.S | 2 +- arch/arm/lib/cmd_boot.c | 2 +- arch/arm/lib/crt0.S | 2 +- arch/arm/lib/crt0_64.S | 2 +- arch/arm/lib/crt0_aarch64_efi.S | 2 +- arch/arm/lib/crt0_arm_efi.S | 2 +- arch/arm/lib/debug.S | 2 +- arch/arm/lib/div0.c | 2 +- arch/arm/lib/eabi_compat.c | 2 +- arch/arm/lib/gic-v3-its.c | 2 +- arch/arm/lib/gic_64.S | 2 +- arch/arm/lib/image.c | 2 +- arch/arm/lib/interrupts.c | 2 +- arch/arm/lib/interrupts_64.c | 2 +- arch/arm/lib/interrupts_m.c | 2 +- arch/arm/lib/lib1funcs.S | 2 +- arch/arm/lib/lshrdi3.S | 2 +- arch/arm/lib/psci-dt.c | 2 +- arch/arm/lib/relocate.S | 2 +- arch/arm/lib/relocate_64.S | 2 +- arch/arm/lib/reset.c | 2 +- arch/arm/lib/save_prev_bl_data.c | 2 +- arch/arm/lib/sections.c | 2 +- arch/arm/lib/semihosting.S | 2 +- arch/arm/lib/setjmp.S | 2 +- arch/arm/lib/setjmp_aarch64.S | 2 +- arch/arm/lib/spl.c | 2 +- arch/arm/lib/stack.c | 2 +- arch/arm/lib/vectors.S | 2 +- arch/arm/lib/vectors_m.S | 2 +- arch/arm/lib/zimage.c | 2 +- arch/arm/mach-apple/Makefile | 2 +- arch/arm/mach-apple/board.c | 2 +- arch/arm/mach-apple/lowlevel_init.S | 2 +- arch/arm/mach-apple/rtkit.c | 2 +- arch/arm/mach-aspeed/Makefile | 2 +- arch/arm/mach-aspeed/ast2500/board_common.c | 2 +- arch/arm/mach-aspeed/ast2500/clk_ast2500.c | 2 +- arch/arm/mach-aspeed/ast2500/lowlevel_init.S | 2 +- arch/arm/mach-aspeed/ast2600/board_common.c | 2 +- arch/arm/mach-aspeed/ast2600/spl.c | 2 +- arch/arm/mach-aspeed/ast2600/u-boot-spl.lds | 2 +- arch/arm/mach-aspeed/ast_wdt.c | 2 +- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/arm920t/Makefile | 2 +- arch/arm/mach-at91/arm920t/at91rm9200_devices.c | 2 +- arch/arm/mach-at91/arm920t/clock.c | 2 +- arch/arm/mach-at91/arm920t/cpu.c | 2 +- arch/arm/mach-at91/arm920t/lowlevel_init.S | 2 +- arch/arm/mach-at91/arm920t/reset.c | 2 +- arch/arm/mach-at91/arm920t/timer.c | 2 +- arch/arm/mach-at91/arm926ejs/Makefile | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/clock.c | 2 +- arch/arm/mach-at91/arm926ejs/cpu.c | 2 +- arch/arm/mach-at91/arm926ejs/eflash.c | 2 +- arch/arm/mach-at91/arm926ejs/lowlevel_init.S | 2 +- arch/arm/mach-at91/arm926ejs/reset.c | 2 +- arch/arm/mach-at91/arm926ejs/sam9x60_devices.c | 2 +- arch/arm/mach-at91/arm926ejs/timer.c | 2 +- arch/arm/mach-at91/arm926ejs/u-boot-spl.lds | 2 +- arch/arm/mach-at91/armv7/Makefile | 2 +- arch/arm/mach-at91/armv7/clock.c | 2 +- arch/arm/mach-at91/armv7/cpu.c | 2 +- arch/arm/mach-at91/armv7/sama5d2_devices.c | 2 +- arch/arm/mach-at91/armv7/sama5d3_devices.c | 2 +- arch/arm/mach-at91/armv7/sama5d4_devices.c | 2 +- arch/arm/mach-at91/armv7/sama7g5_devices.c | 2 +- arch/arm/mach-at91/armv7/timer.c | 2 +- arch/arm/mach-at91/armv7/u-boot-spl.lds | 2 +- arch/arm/mach-at91/atmel_sfr.c | 2 +- arch/arm/mach-at91/bootparams_atmel.S | 2 +- arch/arm/mach-at91/clock.c | 2 +- arch/arm/mach-at91/include/mach/at91_common.h | 2 +- arch/arm/mach-at91/include/mach/at91_dbu.h | 2 +- arch/arm/mach-at91/include/mach/at91_eefc.h | 2 +- arch/arm/mach-at91/include/mach/at91_emac.h | 2 +- arch/arm/mach-at91/include/mach/at91_gpbr.h | 2 +- arch/arm/mach-at91/include/mach/at91_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91_mc.h | 2 +- arch/arm/mach-at91/include/mach/at91_pdc.h | 2 +- arch/arm/mach-at91/include/mach/at91_pio.h | 2 +- arch/arm/mach-at91/include/mach/at91_pit.h | 2 +- arch/arm/mach-at91/include/mach/at91_pmc.h | 2 +- arch/arm/mach-at91/include/mach/at91_rstc.h | 2 +- arch/arm/mach-at91/include/mach/at91_rtc.h | 2 +- arch/arm/mach-at91/include/mach/at91_sck.h | 2 +- arch/arm/mach-at91/include/mach/at91_sfr.h | 2 +- arch/arm/mach-at91/include/mach/at91_spi.h | 2 +- arch/arm/mach-at91/include/mach/at91_st.h | 2 +- arch/arm/mach-at91/include/mach/at91_tc.h | 2 +- arch/arm/mach-at91/include/mach/at91_wdt.h | 2 +- arch/arm/mach-at91/include/mach/at91rm9200.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9260.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9260_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9261.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9261_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9263.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9263_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9_sdramc.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9_smc.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9g45.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9x5.h | 2 +- arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h | 2 +- arch/arm/mach-at91/include/mach/atmel_mpddrc.h | 2 +- arch/arm/mach-at91/include/mach/atmel_pio4.h | 2 +- arch/arm/mach-at91/include/mach/atmel_sdhci.h | 2 +- arch/arm/mach-at91/include/mach/atmel_serial.h | 2 +- arch/arm/mach-at91/include/mach/atmel_usba_udc.h | 2 +- arch/arm/mach-at91/include/mach/clk.h | 2 +- arch/arm/mach-at91/include/mach/gpio.h | 2 +- arch/arm/mach-at91/include/mach/hardware.h | 2 +- arch/arm/mach-at91/include/mach/sam9x60.h | 2 +- arch/arm/mach-at91/include/mach/sama5_boot.h | 2 +- arch/arm/mach-at91/include/mach/sama5_matrix.h | 2 +- arch/arm/mach-at91/include/mach/sama5d2.h | 2 +- arch/arm/mach-at91/include/mach/sama5d2_smc.h | 2 +- arch/arm/mach-at91/include/mach/sama5d3.h | 2 +- arch/arm/mach-at91/include/mach/sama5d3_smc.h | 2 +- arch/arm/mach-at91/include/mach/sama5d4.h | 2 +- arch/arm/mach-at91/include/mach/sama7g5.h | 2 +- arch/arm/mach-at91/matrix.c | 2 +- arch/arm/mach-at91/mpddrc.c | 2 +- arch/arm/mach-at91/phy.c | 2 +- arch/arm/mach-at91/sdram.c | 2 +- arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-at91/spl_at91.c | 2 +- arch/arm/mach-at91/spl_atmel.c | 2 +- arch/arm/mach-bcm283x/include/mach/gpio.h | 2 +- arch/arm/mach-bcm283x/include/mach/mbox.h | 2 +- arch/arm/mach-bcm283x/include/mach/msg.h | 2 +- arch/arm/mach-bcm283x/mbox.c | 2 +- arch/arm/mach-bcm283x/msg.c | 2 +- arch/arm/mach-bcm283x/phys2bus.c | 2 +- arch/arm/mach-bcmbca/Kconfig | 2 +- arch/arm/mach-bcmbca/Makefile | 2 +- arch/arm/mach-bcmbca/bcm47622/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm47622/Makefile | 2 +- arch/arm/mach-bcmbca/bcm4908/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm4908/Makefile | 2 +- arch/arm/mach-bcmbca/bcm4908/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm4912/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm4912/Makefile | 2 +- arch/arm/mach-bcmbca/bcm4912/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm63138/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm63138/Makefile | 2 +- arch/arm/mach-bcmbca/bcm63146/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm63146/Makefile | 2 +- arch/arm/mach-bcmbca/bcm63146/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm63148/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm63148/Makefile | 2 +- arch/arm/mach-bcmbca/bcm63158/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm63158/Makefile | 2 +- arch/arm/mach-bcmbca/bcm63158/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm63178/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm63178/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6756/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6756/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6813/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6813/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6813/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm6846/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6846/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6855/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6855/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6856/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6856/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6856/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm6858/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6858/Makefile | 2 +- arch/arm/mach-bcmbca/bcm6858/mmu_table.c | 2 +- arch/arm/mach-bcmbca/bcm6878/Kconfig | 2 +- arch/arm/mach-bcmbca/bcm6878/Makefile | 2 +- arch/arm/mach-bcmstb/Makefile | 2 +- arch/arm/mach-bcmstb/include/mach/gpio.h | 2 +- arch/arm/mach-bcmstb/include/mach/hardware.h | 2 +- arch/arm/mach-bcmstb/include/mach/sdhci.h | 2 +- arch/arm/mach-bcmstb/include/mach/timer.h | 2 +- arch/arm/mach-bcmstb/lowlevel_init.S | 2 +- arch/arm/mach-cortina/Makefile | 2 +- arch/arm/mach-davinci/Makefile | 2 +- arch/arm/mach-davinci/config.mk | 2 +- arch/arm/mach-davinci/cpu.c | 2 +- arch/arm/mach-davinci/da850_lowlevel.c | 2 +- arch/arm/mach-davinci/da850_pinmux.c | 2 +- arch/arm/mach-davinci/include/mach/da850_lowlevel.h | 2 +- arch/arm/mach-davinci/include/mach/da8xx-usb.h | 2 +- arch/arm/mach-davinci/include/mach/davinci_misc.h | 2 +- arch/arm/mach-davinci/include/mach/ddr2_defs.h | 2 +- arch/arm/mach-davinci/include/mach/dm365_lowlevel.h | 2 +- arch/arm/mach-davinci/include/mach/emac_defs.h | 2 +- arch/arm/mach-davinci/include/mach/gpio.h | 2 +- arch/arm/mach-davinci/include/mach/hardware.h | 2 +- arch/arm/mach-davinci/include/mach/i2c_defs.h | 2 +- arch/arm/mach-davinci/include/mach/pinmux_defs.h | 2 +- arch/arm/mach-davinci/include/mach/pll_defs.h | 2 +- arch/arm/mach-davinci/include/mach/psc_defs.h | 2 +- arch/arm/mach-davinci/include/mach/sdmmc_defs.h | 2 +- arch/arm/mach-davinci/include/mach/timer_defs.h | 2 +- arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-davinci/pinmux.c | 2 +- arch/arm/mach-davinci/psc.c | 2 +- arch/arm/mach-davinci/reset.c | 2 +- arch/arm/mach-davinci/spl.c | 2 +- arch/arm/mach-davinci/timer.c | 2 +- arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/clock.c | 2 +- arch/arm/mach-exynos/clock_init.h | 2 +- arch/arm/mach-exynos/clock_init_exynos5.c | 2 +- arch/arm/mach-exynos/config.mk | 2 +- arch/arm/mach-exynos/dmc_common.c | 2 +- arch/arm/mach-exynos/dmc_init_ddr3.c | 2 +- arch/arm/mach-exynos/exynos4_setup.h | 2 +- arch/arm/mach-exynos/exynos5_setup.h | 2 +- arch/arm/mach-exynos/include/mach/adc.h | 2 +- arch/arm/mach-exynos/include/mach/board.h | 2 +- arch/arm/mach-exynos/include/mach/clk.h | 2 +- arch/arm/mach-exynos/include/mach/clock.h | 2 +- arch/arm/mach-exynos/include/mach/cpu.h | 2 +- arch/arm/mach-exynos/include/mach/dp.h | 2 +- arch/arm/mach-exynos/include/mach/dp_info.h | 2 +- arch/arm/mach-exynos/include/mach/dsim.h | 2 +- arch/arm/mach-exynos/include/mach/dwmmc.h | 2 +- arch/arm/mach-exynos/include/mach/ehci.h | 2 +- arch/arm/mach-exynos/include/mach/fb.h | 2 +- arch/arm/mach-exynos/include/mach/gpio.h | 2 +- arch/arm/mach-exynos/include/mach/i2s-regs.h | 2 +- arch/arm/mach-exynos/include/mach/mipi_dsim.h | 2 +- arch/arm/mach-exynos/include/mach/mmc.h | 2 +- arch/arm/mach-exynos/include/mach/periph.h | 2 +- arch/arm/mach-exynos/include/mach/pinmux.h | 2 +- arch/arm/mach-exynos/include/mach/power.h | 2 +- arch/arm/mach-exynos/include/mach/pwm.h | 2 +- arch/arm/mach-exynos/include/mach/sound.h | 2 +- arch/arm/mach-exynos/include/mach/spi.h | 2 +- arch/arm/mach-exynos/include/mach/spl.h | 2 +- arch/arm/mach-exynos/include/mach/sromc.h | 2 +- arch/arm/mach-exynos/include/mach/sys_proto.h | 2 +- arch/arm/mach-exynos/include/mach/system.h | 2 +- arch/arm/mach-exynos/include/mach/tzpc.h | 2 +- arch/arm/mach-exynos/include/mach/uart.h | 2 +- arch/arm/mach-exynos/include/mach/watchdog.h | 2 +- arch/arm/mach-exynos/include/mach/xhci-exynos.h | 2 +- arch/arm/mach-exynos/mmu-arm64.c | 2 +- arch/arm/mach-exynos/pinmux.c | 2 +- arch/arm/mach-exynos/power.c | 2 +- arch/arm/mach-exynos/sec_boot.S | 2 +- arch/arm/mach-exynos/soc.c | 2 +- arch/arm/mach-exynos/spl_boot.c | 2 +- arch/arm/mach-exynos/system.c | 2 +- arch/arm/mach-exynos/tzpc.c | 2 +- arch/arm/mach-highbank/Makefile | 2 +- arch/arm/mach-highbank/timer.c | 2 +- arch/arm/mach-histb/Makefile | 2 +- arch/arm/mach-histb/board_common.c | 2 +- arch/arm/mach-histb/sysmap-histb.c | 2 +- arch/arm/mach-hpe/gxp/reset.c | 2 +- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/cmd_bmode.c | 2 +- arch/arm/mach-imx/cmd_dek.c | 2 +- arch/arm/mach-imx/cmd_hdmidet.c | 2 +- arch/arm/mach-imx/cmd_mfgprot.c | 2 +- arch/arm/mach-imx/cmd_nandbcb.c | 2 +- arch/arm/mach-imx/cpu.c | 2 +- arch/arm/mach-imx/ddrmc-vf610-calibration.c | 2 +- arch/arm/mach-imx/ddrmc-vf610-calibration.h | 2 +- arch/arm/mach-imx/ddrmc-vf610.c | 2 +- arch/arm/mach-imx/ele_ahab.c | 2 +- arch/arm/mach-imx/hab.c | 2 +- arch/arm/mach-imx/i2c-mxv7.c | 2 +- arch/arm/mach-imx/image-container.c | 2 +- arch/arm/mach-imx/imx8/Makefile | 2 +- arch/arm/mach-imx/imx8/ahab.c | 2 +- arch/arm/mach-imx/imx8/clock.c | 2 +- arch/arm/mach-imx/imx8/cpu.c | 2 +- arch/arm/mach-imx/imx8/fdt.c | 2 +- arch/arm/mach-imx/imx8/iomux.c | 2 +- arch/arm/mach-imx/imx8/lowlevel_init.S | 2 +- arch/arm/mach-imx/imx8/misc.c | 2 +- arch/arm/mach-imx/imx8/snvs_security_sc.c | 2 +- arch/arm/mach-imx/imx8m/Makefile | 2 +- arch/arm/mach-imx/imx8m/clock_imx8mm.c | 2 +- arch/arm/mach-imx/imx8m/clock_imx8mq.c | 2 +- arch/arm/mach-imx/imx8m/clock_slice.c | 2 +- arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg | 2 +- arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg | 2 +- arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg | 2 +- arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg | 2 +- arch/arm/mach-imx/imx8m/imximage.cfg | 2 +- arch/arm/mach-imx/imx8m/lowlevel_init.S | 2 +- arch/arm/mach-imx/imx8m/soc.c | 2 +- arch/arm/mach-imx/imx8ulp/Makefile | 2 +- arch/arm/mach-imx/imx8ulp/cgc.c | 2 +- arch/arm/mach-imx/imx8ulp/clock.c | 2 +- arch/arm/mach-imx/imx8ulp/iomux.c | 2 +- arch/arm/mach-imx/imx8ulp/lowlevel_init.S | 2 +- arch/arm/mach-imx/imx8ulp/pcc.c | 2 +- arch/arm/mach-imx/imx8ulp/rdc.c | 2 +- arch/arm/mach-imx/imx8ulp/soc.c | 2 +- arch/arm/mach-imx/imx8ulp/upower/Makefile | 2 +- arch/arm/mach-imx/imx9/Makefile | 2 +- arch/arm/mach-imx/imx9/clock.c | 2 +- arch/arm/mach-imx/imx9/clock_root.c | 2 +- arch/arm/mach-imx/imx9/imx_bootaux.c | 2 +- arch/arm/mach-imx/imx9/lowlevel_init.S | 2 +- arch/arm/mach-imx/imx9/soc.c | 2 +- arch/arm/mach-imx/imx9/trdc.c | 2 +- arch/arm/mach-imx/imx_bootaux.c | 2 +- arch/arm/mach-imx/imxrt/Makefile | 2 +- arch/arm/mach-imx/imxrt/soc.c | 2 +- arch/arm/mach-imx/init.c | 2 +- arch/arm/mach-imx/iomux-v3.c | 2 +- arch/arm/mach-imx/mac.c | 2 +- arch/arm/mach-imx/misc.c | 2 +- arch/arm/mach-imx/mmc_env.c | 2 +- arch/arm/mach-imx/mmdc_size.c | 2 +- arch/arm/mach-imx/mx5/Makefile | 2 +- arch/arm/mach-imx/mx5/clock.c | 2 +- arch/arm/mach-imx/mx5/lowlevel_init.S | 2 +- arch/arm/mach-imx/mx5/mx53_dram.c | 2 +- arch/arm/mach-imx/mx5/soc.c | 2 +- arch/arm/mach-imx/mx6/Makefile | 2 +- arch/arm/mach-imx/mx6/clock.c | 2 +- arch/arm/mach-imx/mx6/ddr.c | 2 +- arch/arm/mach-imx/mx6/litesom.c | 2 +- arch/arm/mach-imx/mx6/module_fuse.c | 2 +- arch/arm/mach-imx/mx6/mp.c | 2 +- arch/arm/mach-imx/mx6/opos6ul.c | 2 +- arch/arm/mach-imx/mx6/soc.c | 2 +- arch/arm/mach-imx/mx7/Makefile | 2 +- arch/arm/mach-imx/mx7/clock.c | 2 +- arch/arm/mach-imx/mx7/clock_slice.c | 2 +- arch/arm/mach-imx/mx7/ddr.c | 2 +- arch/arm/mach-imx/mx7/psci-mx7.c | 2 +- arch/arm/mach-imx/mx7/psci-suspend.S | 2 +- arch/arm/mach-imx/mx7/snvs.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 2 +- arch/arm/mach-imx/mx7ulp/Makefile | 2 +- arch/arm/mach-imx/mx7ulp/clock.c | 2 +- arch/arm/mach-imx/mx7ulp/iomux.c | 2 +- arch/arm/mach-imx/mx7ulp/pcc.c | 2 +- arch/arm/mach-imx/mx7ulp/scg.c | 2 +- arch/arm/mach-imx/mx7ulp/soc.c | 2 +- arch/arm/mach-imx/priblob.c | 2 +- arch/arm/mach-imx/rdc-sema.c | 2 +- arch/arm/mach-imx/romapi.c | 2 +- arch/arm/mach-imx/sata.c | 2 +- arch/arm/mach-imx/speed.c | 2 +- arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-imx/spl_imx_romapi.c | 2 +- arch/arm/mach-imx/spl_qspi.cfg | 2 +- arch/arm/mach-imx/spl_sd.cfg | 2 +- arch/arm/mach-imx/syscounter.c | 2 +- arch/arm/mach-imx/timer.c | 2 +- arch/arm/mach-imx/video.c | 2 +- arch/arm/mach-ipq40xx/Makefile | 2 +- arch/arm/mach-ipq40xx/clock-ipq4019.c | 2 +- arch/arm/mach-ipq40xx/include/mach/gpio.h | 2 +- arch/arm/mach-ipq40xx/pinctrl-ipq4019.c | 2 +- arch/arm/mach-ipq40xx/pinctrl-snapdragon.c | 2 +- arch/arm/mach-ipq40xx/pinctrl-snapdragon.h | 2 +- arch/arm/mach-k3/Makefile | 2 +- arch/arm/mach-k3/am62ax/Makefile | 2 +- arch/arm/mach-k3/am62ax/am62a_qos_data.c | 2 +- arch/arm/mach-k3/am62ax/clk-data.c | 2 +- arch/arm/mach-k3/am62ax/dev-data.c | 2 +- arch/arm/mach-k3/am62x/Makefile | 2 +- arch/arm/mach-k3/am62x/clk-data.c | 2 +- arch/arm/mach-k3/am62x/dev-data.c | 2 +- arch/arm/mach-k3/am654_init.c | 2 +- arch/arm/mach-k3/arm64-mmu.c | 2 +- arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-k3/common.h | 2 +- arch/arm/mach-k3/include/mach/am62_hardware.h | 2 +- arch/arm/mach-k3/include/mach/am62_spl.h | 2 +- arch/arm/mach-k3/include/mach/am62a_hardware.h | 2 +- arch/arm/mach-k3/include/mach/am62a_qos.h | 2 +- arch/arm/mach-k3/include/mach/am62a_spl.h | 2 +- arch/arm/mach-k3/include/mach/am64_hardware.h | 2 +- arch/arm/mach-k3/include/mach/am64_spl.h | 2 +- arch/arm/mach-k3/include/mach/am6_hardware.h | 2 +- arch/arm/mach-k3/include/mach/am6_spl.h | 2 +- arch/arm/mach-k3/include/mach/clock.h | 2 +- arch/arm/mach-k3/include/mach/hardware.h | 2 +- arch/arm/mach-k3/include/mach/j721e_hardware.h | 2 +- arch/arm/mach-k3/include/mach/j721e_spl.h | 2 +- arch/arm/mach-k3/include/mach/j721s2_hardware.h | 2 +- arch/arm/mach-k3/include/mach/j721s2_spl.h | 2 +- arch/arm/mach-k3/include/mach/spl.h | 2 +- arch/arm/mach-k3/j7200/Makefile | 2 +- arch/arm/mach-k3/j7200/clk-data.c | 2 +- arch/arm/mach-k3/j7200/dev-data.c | 2 +- arch/arm/mach-k3/j721e/Makefile | 2 +- arch/arm/mach-k3/j721e/clk-data.c | 2 +- arch/arm/mach-k3/j721e/dev-data.c | 2 +- arch/arm/mach-k3/j721e_init.c | 2 +- arch/arm/mach-k3/j721s2/Makefile | 2 +- arch/arm/mach-k3/j721s2/clk-data.c | 2 +- arch/arm/mach-k3/j721s2/dev-data.c | 2 +- arch/arm/mach-k3/j721s2_init.c | 2 +- arch/arm/mach-k3/lowlevel_init.S | 2 +- arch/arm/mach-k3/r5_mpu.c | 2 +- arch/arm/mach-k3/sysfw-loader.c | 2 +- arch/arm/mach-k3/sysfw-loader.h | 2 +- arch/arm/mach-keystone/Makefile | 2 +- arch/arm/mach-keystone/clock.c | 2 +- arch/arm/mach-keystone/cmd_clock.c | 2 +- arch/arm/mach-keystone/cmd_mon.c | 2 +- arch/arm/mach-keystone/cmd_poweroff.c | 2 +- arch/arm/mach-keystone/config.mk | 2 +- arch/arm/mach-keystone/ddr3.c | 2 +- arch/arm/mach-keystone/ddr3_spd.c | 2 +- arch/arm/mach-keystone/include/mach/clock-k2e.h | 2 +- arch/arm/mach-keystone/include/mach/clock-k2g.h | 2 +- arch/arm/mach-keystone/include/mach/clock-k2hk.h | 2 +- arch/arm/mach-keystone/include/mach/clock-k2l.h | 2 +- arch/arm/mach-keystone/include/mach/clock.h | 2 +- arch/arm/mach-keystone/include/mach/clock_defs.h | 2 +- arch/arm/mach-keystone/include/mach/ddr3.h | 2 +- arch/arm/mach-keystone/include/mach/hardware-k2e.h | 2 +- arch/arm/mach-keystone/include/mach/hardware-k2g.h | 2 +- arch/arm/mach-keystone/include/mach/hardware-k2hk.h | 2 +- arch/arm/mach-keystone/include/mach/hardware-k2l.h | 2 +- arch/arm/mach-keystone/include/mach/hardware.h | 2 +- arch/arm/mach-keystone/include/mach/i2c_defs.h | 2 +- arch/arm/mach-keystone/include/mach/mmc_host_def.h | 2 +- arch/arm/mach-keystone/include/mach/mon.h | 2 +- arch/arm/mach-keystone/include/mach/msmc.h | 2 +- arch/arm/mach-keystone/include/mach/mux-k2g.h | 2 +- arch/arm/mach-keystone/include/mach/psc_defs.h | 2 +- arch/arm/mach-keystone/init.c | 2 +- arch/arm/mach-keystone/keystone.c | 2 +- arch/arm/mach-keystone/mon.c | 2 +- arch/arm/mach-keystone/msmc.c | 2 +- arch/arm/mach-keystone/psc.c | 2 +- arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/cache.c | 2 +- arch/arm/mach-kirkwood/cpu.c | 2 +- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- arch/arm/mach-kirkwood/include/mach/cpu.h | 2 +- arch/arm/mach-kirkwood/include/mach/gpio.h | 2 +- arch/arm/mach-kirkwood/include/mach/kw88f6192.h | 2 +- arch/arm/mach-kirkwood/include/mach/kw88f6281.h | 2 +- arch/arm/mach-kirkwood/include/mach/mpp.h | 2 +- arch/arm/mach-kirkwood/include/mach/soc.h | 2 +- arch/arm/mach-kirkwood/lowlevel.S | 2 +- arch/arm/mach-lpc32xx/Makefile | 2 +- arch/arm/mach-lpc32xx/clk.c | 2 +- arch/arm/mach-lpc32xx/cpu.c | 2 +- arch/arm/mach-lpc32xx/devices.c | 2 +- arch/arm/mach-lpc32xx/dram.c | 2 +- arch/arm/mach-lpc32xx/lowlevel_init.S | 2 +- arch/arm/mach-lpc32xx/timer.c | 2 +- arch/arm/mach-meson/Makefile | 2 +- arch/arm/mach-meson/board-a1.c | 2 +- arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-common.c | 2 +- arch/arm/mach-meson/board-g12a.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- arch/arm/mach-meson/board-info.c | 2 +- arch/arm/mach-meson/sm.c | 2 +- arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/alleycat5/Makefile | 2 +- arch/arm/mach-mvebu/alleycat5/cpu.c | 2 +- arch/arm/mach-mvebu/alleycat5/soc.c | 2 +- arch/arm/mach-mvebu/alleycat5/soc.h | 2 +- arch/arm/mach-mvebu/arm64-common.c | 2 +- arch/arm/mach-mvebu/armada3700/Makefile | 2 +- arch/arm/mach-mvebu/armada3700/cpu.c | 2 +- arch/arm/mach-mvebu/armada3700/efuse.c | 2 +- arch/arm/mach-mvebu/armada3700/mbox.c | 2 +- arch/arm/mach-mvebu/armada8k/Makefile | 2 +- arch/arm/mach-mvebu/armada8k/cpu.c | 2 +- arch/arm/mach-mvebu/armada8k/dram.c | 2 +- arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/dram.c | 2 +- arch/arm/mach-mvebu/efuse.c | 2 +- arch/arm/mach-mvebu/gpio.c | 2 +- arch/arm/mach-mvebu/include/mach/config.h | 2 +- arch/arm/mach-mvebu/include/mach/cpu.h | 2 +- arch/arm/mach-mvebu/include/mach/efuse.h | 2 +- arch/arm/mach-mvebu/include/mach/gpio.h | 2 +- arch/arm/mach-mvebu/include/mach/mbox.h | 2 +- arch/arm/mach-mvebu/include/mach/soc.h | 2 +- arch/arm/mach-mvebu/lowlevel.S | 2 +- arch/arm/mach-mvebu/lowlevel_spl.S | 2 +- arch/arm/mach-mvebu/serdes/a38x/Makefile | 2 +- arch/arm/mach-mvebu/serdes/axp/Makefile | 2 +- arch/arm/mach-mvebu/spl.c | 2 +- arch/arm/mach-mvebu/system-controller.c | 2 +- arch/arm/mach-nexell/Makefile | 2 +- arch/arm/mach-nexell/clock.c | 2 +- arch/arm/mach-nexell/config.mk | 2 +- arch/arm/mach-nexell/include/mach/boot0.h | 2 +- arch/arm/mach-nexell/include/mach/clk.h | 2 +- arch/arm/mach-nexell/include/mach/display.h | 2 +- arch/arm/mach-nexell/include/mach/display_dev.h | 2 +- arch/arm/mach-nexell/include/mach/ehci.h | 2 +- arch/arm/mach-nexell/include/mach/gpio.h | 2 +- arch/arm/mach-nexell/include/mach/mipi_display.h | 2 +- arch/arm/mach-nexell/include/mach/nexell.h | 2 +- arch/arm/mach-nexell/include/mach/nx_gpio.h | 2 +- arch/arm/mach-nexell/include/mach/pwm.h | 2 +- arch/arm/mach-nexell/include/mach/reset.h | 2 +- arch/arm/mach-nexell/include/mach/sec_reg.h | 2 +- arch/arm/mach-nexell/include/mach/tieoff.h | 2 +- arch/arm/mach-nexell/nx_gpio.c | 2 +- arch/arm/mach-nexell/nx_sec_reg.c | 2 +- arch/arm/mach-nexell/reset.c | 2 +- arch/arm/mach-nexell/tieoff.c | 2 +- arch/arm/mach-nexell/timer.c | 2 +- arch/arm/mach-npcm/npcm7xx/cpu.c | 2 +- arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c | 2 +- arch/arm/mach-npcm/npcm7xx/l2_cache_pl310_init.S | 2 +- arch/arm/mach-npcm/npcm8xx/cpu.c | 2 +- arch/arm/mach-npcm/npcm8xx/reset.c | 2 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/abb.c | 2 +- arch/arm/mach-omap2/am33xx/Makefile | 2 +- arch/arm/mach-omap2/am33xx/board.c | 2 +- arch/arm/mach-omap2/am33xx/chilisom.c | 2 +- arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 2 +- arch/arm/mach-omap2/am33xx/clock.c | 2 +- arch/arm/mach-omap2/am33xx/clock_am33xx.c | 2 +- arch/arm/mach-omap2/am33xx/clock_am43xx.c | 2 +- arch/arm/mach-omap2/am33xx/ddr.c | 2 +- arch/arm/mach-omap2/am33xx/emif4.c | 2 +- arch/arm/mach-omap2/am33xx/fdt.c | 2 +- arch/arm/mach-omap2/am33xx/hw_data.c | 2 +- arch/arm/mach-omap2/am33xx/prcm-regs.c | 2 +- arch/arm/mach-omap2/am33xx/sys_info.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-omap2/clocks-common.c | 2 +- arch/arm/mach-omap2/config.mk | 2 +- arch/arm/mach-omap2/config_secure.mk | 2 +- arch/arm/mach-omap2/emif-common.c | 2 +- arch/arm/mach-omap2/fdt-common.c | 2 +- arch/arm/mach-omap2/hwinit-common.c | 2 +- arch/arm/mach-omap2/lowlevel_init.S | 2 +- arch/arm/mach-omap2/mem-common.c | 2 +- arch/arm/mach-omap2/omap-cache.c | 2 +- arch/arm/mach-omap2/omap3/Makefile | 2 +- arch/arm/mach-omap2/omap3/am35x_musb.c | 2 +- arch/arm/mach-omap2/omap3/board.c | 2 +- arch/arm/mach-omap2/omap3/boot.c | 2 +- arch/arm/mach-omap2/omap3/clock.c | 2 +- arch/arm/mach-omap2/omap3/emac.c | 2 +- arch/arm/mach-omap2/omap3/emif4.c | 2 +- arch/arm/mach-omap2/omap3/hw_data.c | 2 +- arch/arm/mach-omap2/omap3/lowlevel_init.S | 2 +- arch/arm/mach-omap2/omap3/prcm-regs.c | 2 +- arch/arm/mach-omap2/omap3/sdrc.c | 2 +- arch/arm/mach-omap2/omap3/spl_id_nand.c | 2 +- arch/arm/mach-omap2/omap3/sys_info.c | 2 +- arch/arm/mach-omap2/omap4/Makefile | 2 +- arch/arm/mach-omap2/omap4/boot.c | 2 +- arch/arm/mach-omap2/omap4/emif.c | 2 +- arch/arm/mach-omap2/omap4/hw_data.c | 2 +- arch/arm/mach-omap2/omap4/hwinit.c | 2 +- arch/arm/mach-omap2/omap4/prcm-regs.c | 2 +- arch/arm/mach-omap2/omap4/sdram_elpida.c | 2 +- arch/arm/mach-omap2/omap5/Makefile | 2 +- arch/arm/mach-omap2/omap5/abb.c | 2 +- arch/arm/mach-omap2/omap5/boot.c | 2 +- arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 2 +- arch/arm/mach-omap2/omap5/emif.c | 2 +- arch/arm/mach-omap2/omap5/fdt.c | 2 +- arch/arm/mach-omap2/omap5/hw_data.c | 2 +- arch/arm/mach-omap2/omap5/hwinit.c | 2 +- arch/arm/mach-omap2/omap5/prcm-regs.c | 2 +- arch/arm/mach-omap2/omap5/sdram.c | 2 +- arch/arm/mach-omap2/omap5/sec_entry_cpu1.S | 2 +- arch/arm/mach-omap2/pipe3-phy.c | 2 +- arch/arm/mach-omap2/pipe3-phy.h | 2 +- arch/arm/mach-omap2/reset.c | 2 +- arch/arm/mach-omap2/sata.c | 2 +- arch/arm/mach-omap2/sec-common.c | 2 +- arch/arm/mach-omap2/sysinfo-common.c | 2 +- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/mach-omap2/u-boot-spl.lds | 2 +- arch/arm/mach-omap2/utils.c | 2 +- arch/arm/mach-orion5x/Makefile | 2 +- arch/arm/mach-orion5x/cpu.c | 2 +- arch/arm/mach-orion5x/dram.c | 2 +- arch/arm/mach-orion5x/include/mach/cpu.h | 2 +- arch/arm/mach-orion5x/include/mach/mv88f5182.h | 2 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 2 +- arch/arm/mach-orion5x/lowlevel_init.S | 2 +- arch/arm/mach-orion5x/timer.c | 2 +- arch/arm/mach-orion5x/u-boot-spl.lds | 2 +- arch/arm/mach-owl/Makefile | 2 +- arch/arm/mach-owl/soc.c | 2 +- arch/arm/mach-owl/sysmap-owl.c | 2 +- arch/arm/mach-rmobile/Kconfig.rzg2l | 2 +- arch/arm/mach-rmobile/Makefile | 2 +- arch/arm/mach-rmobile/board.c | 2 +- arch/arm/mach-rmobile/cpu_info-r8a7740.c | 2 +- arch/arm/mach-rmobile/cpu_info.c | 2 +- arch/arm/mach-rmobile/emac.c | 2 +- arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h | 2 +- arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h | 2 +- arch/arm/mach-rmobile/include/mach/rzg2l.h | 2 +- arch/arm/mach-rmobile/include/mach/sys_proto.h | 2 +- arch/arm/mach-rmobile/lowlevel_init.S | 2 +- arch/arm/mach-rmobile/lowlevel_init_gen3.S | 2 +- arch/arm/mach-rmobile/memmap-gen3.c | 2 +- arch/arm/mach-rmobile/memmap-rzg2l.c | 2 +- arch/arm/mach-rockchip/Makefile | 2 +- arch/arm/mach-rockchip/board.c | 2 +- arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 2 +- arch/arm/mach-rockchip/cpu-info.c | 2 +- arch/arm/mach-rockchip/misc.c | 2 +- arch/arm/mach-rockchip/px30-board-tpl.c | 2 +- arch/arm/mach-rockchip/px30/Makefile | 2 +- arch/arm/mach-rockchip/rk3036-board-spl.c | 2 +- arch/arm/mach-rockchip/rk3036/Makefile | 2 +- arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3036/rk3036.c | 2 +- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3066/Makefile | 2 +- arch/arm/mach-rockchip/rk3066/clk_rk3066.c | 2 +- arch/arm/mach-rockchip/rk3066/rk3066.c | 2 +- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 2 +- arch/arm/mach-rockchip/rk3128/Makefile | 2 +- arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3128/rk3128.c | 2 +- arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3188/Makefile | 2 +- arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 2 +- arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 2 +- arch/arm/mach-rockchip/rk322x/Makefile | 2 +- arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 2 +- arch/arm/mach-rockchip/rk322x/rk322x.c | 2 +- arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 2 +- arch/arm/mach-rockchip/rk3288/Makefile | 2 +- arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3308/Makefile | 2 +- arch/arm/mach-rockchip/rk3308/rk3308.c | 2 +- arch/arm/mach-rockchip/rk3308/syscon_rk3308.c | 2 +- arch/arm/mach-rockchip/rk3328/Makefile | 2 +- arch/arm/mach-rockchip/rk3328/rk3328.c | 2 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 2 +- arch/arm/mach-rockchip/rk3368/Makefile | 2 +- arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3368/rk3368.c | 2 +- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3399/Makefile | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 2 +- arch/arm/mach-rockchip/rk3568/Makefile | 2 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- arch/arm/mach-rockchip/rk3568/syscon_rk3568.c | 2 +- arch/arm/mach-rockchip/rk3588/Makefile | 2 +- arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 2 +- arch/arm/mach-rockchip/rv1108/Makefile | 2 +- arch/arm/mach-rockchip/rv1108/rv1108.c | 2 +- arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 2 +- arch/arm/mach-rockchip/rv1126/Makefile | 2 +- arch/arm/mach-rockchip/rv1126/syscon_rv1126.c | 2 +- arch/arm/mach-rockchip/sdram.c | 2 +- arch/arm/mach-rockchip/spl-boot-order.c | 2 +- arch/arm/mach-rockchip/spl.c | 2 +- arch/arm/mach-rockchip/tpl.c | 2 +- arch/arm/mach-rockchip/u-boot-tpl-v8.lds | 2 +- arch/arm/mach-s5pc1xx/Makefile | 2 +- arch/arm/mach-s5pc1xx/cache.c | 2 +- arch/arm/mach-s5pc1xx/clock.c | 2 +- arch/arm/mach-s5pc1xx/include/mach/clk.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/clock.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/cpu.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/gpio.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/mmc.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/periph.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/pinmux.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/power.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/pwm.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/sromc.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/sys_proto.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/uart.h | 2 +- arch/arm/mach-s5pc1xx/include/mach/watchdog.h | 2 +- arch/arm/mach-s5pc1xx/pinmux.c | 2 +- arch/arm/mach-s5pc1xx/reset.S | 2 +- arch/arm/mach-snapdragon/Makefile | 2 +- arch/arm/mach-snapdragon/clock-snapdragon.h | 2 +- arch/arm/mach-snapdragon/dram.c | 2 +- arch/arm/mach-snapdragon/include/mach/boot0.h | 2 +- arch/arm/mach-snapdragon/include/mach/dram.h | 2 +- arch/arm/mach-snapdragon/include/mach/gpio.h | 2 +- arch/arm/mach-snapdragon/include/mach/misc.h | 2 +- arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h | 2 +- arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h | 2 +- arch/arm/mach-snapdragon/include/mach/sysmap-qcs404.h | 2 +- arch/arm/mach-snapdragon/include/mach/sysmap-sdm845.h | 2 +- arch/arm/mach-snapdragon/init_sdm845.c | 2 +- arch/arm/mach-snapdragon/misc.c | 2 +- arch/arm/mach-snapdragon/pinctrl-apq8016.c | 2 +- arch/arm/mach-snapdragon/pinctrl-apq8096.c | 2 +- arch/arm/mach-snapdragon/pinctrl-qcs404.c | 2 +- arch/arm/mach-snapdragon/pinctrl-sdm845.c | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 2 +- arch/arm/mach-snapdragon/pinctrl-snapdragon.h | 2 +- arch/arm/mach-snapdragon/sysmap-apq8016.c | 2 +- arch/arm/mach-snapdragon/sysmap-apq8096.c | 2 +- arch/arm/mach-snapdragon/sysmap-qcs404.c | 2 +- arch/arm/mach-snapdragon/sysmap-sdm845.c | 2 +- arch/arm/mach-socfpga/Makefile | 2 +- arch/arm/mach-socfpga/board.c | 2 +- arch/arm/mach-socfpga/clock_manager.c | 2 +- arch/arm/mach-socfpga/clock_manager_gen5.c | 2 +- arch/arm/mach-socfpga/freeze_controller.c | 2 +- arch/arm/mach-socfpga/include/mach/base_addr_a10.h | 2 +- arch/arm/mach-socfpga/include/mach/base_addr_ac5.h | 2 +- arch/arm/mach-socfpga/include/mach/boot0.h | 2 +- arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 +- arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h | 2 +- arch/arm/mach-socfpga/include/mach/freeze_controller.h | 2 +- arch/arm/mach-socfpga/include/mach/gpio.h | 2 +- arch/arm/mach-socfpga/include/mach/nic301.h | 2 +- arch/arm/mach-socfpga/include/mach/reset_manager.h | 2 +- arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h | 2 +- arch/arm/mach-socfpga/include/mach/scan_manager.h | 2 +- arch/arm/mach-socfpga/include/mach/scu.h | 2 +- arch/arm/mach-socfpga/include/mach/sdram.h | 2 +- arch/arm/mach-socfpga/include/mach/sdram_gen5.h | 2 +- arch/arm/mach-socfpga/include/mach/smc_api.h | 2 +- arch/arm/mach-socfpga/include/mach/system_manager.h | 2 +- arch/arm/mach-socfpga/include/mach/system_manager_gen5.h | 2 +- arch/arm/mach-socfpga/include/mach/timer.h | 2 +- arch/arm/mach-socfpga/misc.c | 2 +- arch/arm/mach-socfpga/misc_gen5.c | 2 +- arch/arm/mach-socfpga/reset_manager_gen5.c | 2 +- arch/arm/mach-socfpga/scan_manager.c | 2 +- arch/arm/mach-socfpga/smc_api.c | 2 +- arch/arm/mach-socfpga/spl_a10.c | 2 +- arch/arm/mach-socfpga/spl_gen5.c | 2 +- arch/arm/mach-socfpga/system_manager_gen5.c | 2 +- arch/arm/mach-socfpga/timer.c | 2 +- arch/arm/mach-socfpga/wrap_iocsr_config.c | 2 +- arch/arm/mach-socfpga/wrap_pinmux_config.c | 2 +- arch/arm/mach-socfpga/wrap_pll_config.c | 2 +- arch/arm/mach-socfpga/wrap_sdram_config.c | 2 +- arch/arm/mach-stm32/Makefile | 2 +- arch/arm/mach-stm32/soc.c | 2 +- arch/arm/mach-stm32mp/Makefile | 2 +- arch/arm/mach-stm32mp/boot_params.c | 2 +- arch/arm/mach-stm32mp/bsec.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32key.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/Makefile | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 2 +- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | 2 +- arch/arm/mach-stm32mp/cpu.c | 2 +- arch/arm/mach-stm32mp/dram_init.c | 2 +- arch/arm/mach-stm32mp/ecdsa_romapi.c | 2 +- arch/arm/mach-stm32mp/fdt.c | 2 +- arch/arm/mach-stm32mp/include/mach/bsec.h | 2 +- arch/arm/mach-stm32mp/include/mach/ddr.h | 2 +- arch/arm/mach-stm32mp/include/mach/stm32.h | 2 +- arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h | 2 +- arch/arm/mach-stm32mp/include/mach/stm32prog.h | 2 +- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 2 +- arch/arm/mach-stm32mp/include/mach/tzc.h | 2 +- arch/arm/mach-stm32mp/psci.c | 2 +- arch/arm/mach-stm32mp/pwr_regulator.c | 2 +- arch/arm/mach-stm32mp/spl.c | 2 +- arch/arm/mach-stm32mp/syscon.c | 2 +- arch/arm/mach-stm32mp/tzc400.c | 2 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 2 +- arch/arm/mach-sunxi/clock.c | 2 +- arch/arm/mach-sunxi/clock_sun4i.c | 2 +- arch/arm/mach-sunxi/clock_sun6i.c | 2 +- arch/arm/mach-sunxi/clock_sun8i_a83t.c | 2 +- arch/arm/mach-sunxi/clock_sun9i.c | 2 +- arch/arm/mach-sunxi/cpu_info.c | 2 +- arch/arm/mach-sunxi/dram_helpers.c | 2 +- arch/arm/mach-sunxi/dram_sun4i.c | 2 +- arch/arm/mach-sunxi/dram_sun50i_h6.c | 2 +- arch/arm/mach-sunxi/dram_sun50i_h616.c | 2 +- arch/arm/mach-sunxi/dram_sun6i.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a23.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a33.c | 2 +- arch/arm/mach-sunxi/dram_sun8i_a83t.c | 2 +- arch/arm/mach-sunxi/dram_sun9i.c | 2 +- arch/arm/mach-sunxi/dram_suniv.c | 2 +- arch/arm/mach-sunxi/dram_sunxi_dw.c | 2 +- arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 2 +- arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c | 2 +- arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c | 2 +- arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c | 2 +- arch/arm/mach-sunxi/gtbus_sun9i.c | 2 +- arch/arm/mach-sunxi/pinmux.c | 2 +- arch/arm/mach-sunxi/pmic_bus.c | 2 +- arch/arm/mach-sunxi/prcm.c | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 2 +- arch/arm/mach-sunxi/timer.c | 2 +- arch/arm/mach-tegra/Makefile | 2 +- arch/arm/mach-tegra/ap.c | 2 +- arch/arm/mach-tegra/arm64-mmu.c | 2 +- arch/arm/mach-tegra/board.c | 2 +- arch/arm/mach-tegra/board2.c | 2 +- arch/arm/mach-tegra/cboot.c | 2 +- arch/arm/mach-tegra/cmd_enterrcm.c | 2 +- arch/arm/mach-tegra/cpu.h | 2 +- arch/arm/mach-tegra/crypto.c | 2 +- arch/arm/mach-tegra/dt-setup.c | 2 +- arch/arm/mach-tegra/emc.c | 2 +- arch/arm/mach-tegra/emc.h | 2 +- arch/arm/mach-tegra/fuse.c | 2 +- arch/arm/mach-tegra/pinmux-common.c | 2 +- arch/arm/mach-tegra/psci.S | 2 +- arch/arm/mach-tegra/spl.c | 2 +- arch/arm/mach-tegra/sys_info.c | 2 +- arch/arm/mach-tegra/tegra114/clock.c | 2 +- arch/arm/mach-tegra/tegra114/cpu.c | 2 +- arch/arm/mach-tegra/tegra114/pinmux.c | 2 +- arch/arm/mach-tegra/tegra124/Makefile | 2 +- arch/arm/mach-tegra/tegra124/clock.c | 2 +- arch/arm/mach-tegra/tegra124/cpu.c | 2 +- arch/arm/mach-tegra/tegra124/funcmux.c | 2 +- arch/arm/mach-tegra/tegra124/pinmux.c | 2 +- arch/arm/mach-tegra/tegra124/pmc.c | 2 +- arch/arm/mach-tegra/tegra124/psci.c | 2 +- arch/arm/mach-tegra/tegra20/Makefile | 2 +- arch/arm/mach-tegra/tegra20/bct.h | 2 +- arch/arm/mach-tegra/tegra20/clock.c | 2 +- arch/arm/mach-tegra/tegra20/display.c | 2 +- arch/arm/mach-tegra/tegra20/emc.c | 2 +- arch/arm/mach-tegra/tegra20/funcmux.c | 2 +- arch/arm/mach-tegra/tegra20/pinmux.c | 2 +- arch/arm/mach-tegra/tegra20/pmu.c | 2 +- arch/arm/mach-tegra/tegra20/warmboot.c | 2 +- arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +- arch/arm/mach-tegra/tegra20/warmboot_avp.h | 2 +- arch/arm/mach-tegra/tegra210/Makefile | 2 +- arch/arm/mach-tegra/tegra210/clock.c | 2 +- arch/arm/mach-tegra/tegra210/funcmux.c | 2 +- arch/arm/mach-tegra/tegra30/bct.h | 2 +- arch/arm/mach-tegra/tegra30/clock.c | 2 +- arch/arm/mach-tegra/tegra30/pinmux.c | 2 +- arch/arm/mach-uniphier/Makefile | 2 +- arch/arm/mach-uniphier/arm32/Makefile | 2 +- arch/arm/mach-uniphier/arm32/arm-mpcore.h | 2 +- arch/arm/mach-uniphier/arm32/cache-uniphier.c | 2 +- arch/arm/mach-uniphier/arm32/cache-uniphier.h | 2 +- arch/arm/mach-uniphier/arm32/debug_ll.S | 2 +- arch/arm/mach-uniphier/arm32/late_lowlevel_init.S | 2 +- arch/arm/mach-uniphier/arm32/lowlevel_init.S | 2 +- arch/arm/mach-uniphier/arm32/psci.c | 2 +- arch/arm/mach-uniphier/arm32/psci_smp.S | 2 +- arch/arm/mach-uniphier/arm64/Makefile | 2 +- arch/arm/mach-uniphier/arm64/mem_map.c | 2 +- arch/arm/mach-uniphier/bcu/Makefile | 2 +- arch/arm/mach-uniphier/bcu/bcu-ld4.c | 2 +- arch/arm/mach-uniphier/bcu/bcu-regs.h | 2 +- arch/arm/mach-uniphier/board_init.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 2 +- arch/arm/mach-uniphier/boards.c | 2 +- arch/arm/mach-uniphier/boot-device/Makefile | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-ld11.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-ld4.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-pro5.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device.c | 2 +- arch/arm/mach-uniphier/boot-device/boot-device.h | 2 +- arch/arm/mach-uniphier/clk/Makefile | 2 +- arch/arm/mach-uniphier/clk/clk-dram-ld4.c | 2 +- arch/arm/mach-uniphier/clk/clk-dram-pro5.c | 2 +- arch/arm/mach-uniphier/clk/clk-dram-pxs2.c | 2 +- arch/arm/mach-uniphier/clk/clk-early-ld4.c | 2 +- arch/arm/mach-uniphier/clk/clk-ld11.c | 2 +- arch/arm/mach-uniphier/clk/clk-ld20.c | 2 +- arch/arm/mach-uniphier/clk/clk-pro4.c | 2 +- arch/arm/mach-uniphier/clk/clk-pro5.c | 2 +- arch/arm/mach-uniphier/clk/clk-pxs2.c | 2 +- arch/arm/mach-uniphier/clk/clk-pxs3.c | 2 +- arch/arm/mach-uniphier/clk/dpll-ld4.c | 2 +- arch/arm/mach-uniphier/clk/dpll-pro4.c | 2 +- arch/arm/mach-uniphier/clk/dpll-sld8.c | 2 +- arch/arm/mach-uniphier/clk/dpll-tail.c | 2 +- arch/arm/mach-uniphier/clk/pll-base-ld20.c | 2 +- arch/arm/mach-uniphier/clk/pll-ld11.c | 2 +- arch/arm/mach-uniphier/clk/pll-ld20.c | 2 +- arch/arm/mach-uniphier/clk/pll-ld4.c | 2 +- arch/arm/mach-uniphier/clk/pll-pro4.c | 2 +- arch/arm/mach-uniphier/clk/pll-pxs3.c | 2 +- arch/arm/mach-uniphier/clk/pll.h | 2 +- arch/arm/mach-uniphier/cpu-info.c | 2 +- arch/arm/mach-uniphier/debug-uart/Makefile | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart.c | 2 +- arch/arm/mach-uniphier/debug-uart/debug-uart.h | 2 +- arch/arm/mach-uniphier/debug.h | 2 +- arch/arm/mach-uniphier/dram/Makefile | 2 +- arch/arm/mach-uniphier/dram/cmd_ddrmphy.c | 2 +- arch/arm/mach-uniphier/dram/cmd_ddrphy.c | 2 +- arch/arm/mach-uniphier/dram/ddrmphy-regs.h | 2 +- arch/arm/mach-uniphier/dram/ddrphy-init.h | 2 +- arch/arm/mach-uniphier/dram/ddrphy-ld4.c | 2 +- arch/arm/mach-uniphier/dram/ddrphy-regs.h | 2 +- arch/arm/mach-uniphier/dram/ddrphy-training.c | 2 +- arch/arm/mach-uniphier/dram/umc-ld4.c | 2 +- arch/arm/mach-uniphier/dram/umc-pro4.c | 2 +- arch/arm/mach-uniphier/dram/umc-pro5.c | 2 +- arch/arm/mach-uniphier/dram/umc-pxs2.c | 2 +- arch/arm/mach-uniphier/dram/umc-regs.h | 2 +- arch/arm/mach-uniphier/dram/umc-sld8.c | 2 +- arch/arm/mach-uniphier/dram_init.c | 2 +- arch/arm/mach-uniphier/fdt-fixup.c | 2 +- arch/arm/mach-uniphier/init.h | 2 +- arch/arm/mach-uniphier/memconf.c | 2 +- arch/arm/mach-uniphier/micro-support-card.c | 2 +- arch/arm/mach-uniphier/micro-support-card.h | 2 +- arch/arm/mach-uniphier/mmc-boot-mode.c | 2 +- arch/arm/mach-uniphier/mmc-first-dev.c | 2 +- arch/arm/mach-uniphier/reset.c | 2 +- arch/arm/mach-uniphier/sc-regs.h | 2 +- arch/arm/mach-uniphier/sc64-regs.h | 2 +- arch/arm/mach-uniphier/sg-regs.h | 2 +- arch/arm/mach-uniphier/soc-info.c | 2 +- arch/arm/mach-uniphier/soc-info.h | 2 +- arch/arm/mach-uniphier/spl_board_init.c | 2 +- arch/arm/mach-versal/Kconfig | 2 +- arch/arm/mach-versal/Makefile | 2 +- arch/arm/mach-versal/clk.c | 2 +- arch/arm/mach-versal/cpu.c | 2 +- arch/arm/mach-versal/include/mach/hardware.h | 2 +- arch/arm/mach-versal/include/mach/sys_proto.h | 2 +- arch/arm/mach-versatile/Makefile | 2 +- arch/arm/mach-versatile/reset.S | 2 +- arch/arm/mach-versatile/timer.c | 2 +- arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/clk.c | 2 +- arch/arm/mach-zynq/cpu.c | 2 +- arch/arm/mach-zynq/ddrc.c | 2 +- arch/arm/mach-zynq/include/mach/clk.h | 2 +- arch/arm/mach-zynq/include/mach/hardware.h | 2 +- arch/arm/mach-zynq/include/mach/ps7_init_gpl.h | 2 +- arch/arm/mach-zynq/include/mach/sys_proto.h | 2 +- arch/arm/mach-zynq/lowlevel_init.S | 2 +- arch/arm/mach-zynq/ps7_spl_init.c | 2 +- arch/arm/mach-zynq/slcr.c | 2 +- arch/arm/mach-zynq/spl.c | 2 +- arch/arm/mach-zynq/u-boot-spl.lds | 2 +- arch/arm/mach-zynq/u-boot.lds | 2 +- arch/arm/mach-zynqmp/Makefile | 2 +- arch/arm/mach-zynqmp/clk.c | 2 +- arch/arm/mach-zynqmp/cpu.c | 2 +- arch/arm/mach-zynqmp/handoff.c | 2 +- arch/arm/mach-zynqmp/include/mach/clk.h | 2 +- arch/arm/mach-zynqmp/include/mach/hardware.h | 2 +- arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h | 2 +- arch/arm/mach-zynqmp/include/mach/sys_proto.h | 2 +- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 2 +- arch/arm/mach-zynqmp/mp.c | 2 +- arch/arm/mach-zynqmp/psu_spl_init.c | 2 +- arch/arm/mach-zynqmp/spl.c | 2 +- arch/arm/thumb1/include/asm/proc-armv/system.h | 2 +- arch/m68k/Makefile | 2 +- arch/m68k/config.mk | 2 +- arch/m68k/cpu/mcf523x/Makefile | 2 +- arch/m68k/cpu/mcf523x/cpu.c | 2 +- arch/m68k/cpu/mcf523x/cpu_init.c | 2 +- arch/m68k/cpu/mcf523x/interrupts.c | 2 +- arch/m68k/cpu/mcf523x/speed.c | 2 +- arch/m68k/cpu/mcf523x/start.S | 2 +- arch/m68k/cpu/mcf52x2/Makefile | 2 +- arch/m68k/cpu/mcf52x2/cpu.c | 2 +- arch/m68k/cpu/mcf52x2/cpu.h | 2 +- arch/m68k/cpu/mcf52x2/cpu_init.c | 2 +- arch/m68k/cpu/mcf52x2/interrupts.c | 2 +- arch/m68k/cpu/mcf52x2/speed.c | 2 +- arch/m68k/cpu/mcf52x2/start.S | 2 +- arch/m68k/cpu/mcf530x/Makefile | 2 +- arch/m68k/cpu/mcf530x/cpu.c | 2 +- arch/m68k/cpu/mcf530x/cpu_init.c | 2 +- arch/m68k/cpu/mcf530x/interrupts.c | 2 +- arch/m68k/cpu/mcf530x/speed.c | 2 +- arch/m68k/cpu/mcf530x/start.S | 2 +- arch/m68k/cpu/mcf532x/Makefile | 2 +- arch/m68k/cpu/mcf532x/cpu.c | 2 +- arch/m68k/cpu/mcf532x/cpu_init.c | 2 +- arch/m68k/cpu/mcf532x/interrupts.c | 2 +- arch/m68k/cpu/mcf532x/speed.c | 2 +- arch/m68k/cpu/mcf532x/start.S | 2 +- arch/m68k/cpu/mcf5445x/Makefile | 2 +- arch/m68k/cpu/mcf5445x/cpu.c | 2 +- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- arch/m68k/cpu/mcf5445x/dspi.c | 2 +- arch/m68k/cpu/mcf5445x/interrupts.c | 2 +- arch/m68k/cpu/mcf5445x/speed.c | 2 +- arch/m68k/cpu/mcf5445x/start.S | 2 +- arch/m68k/cpu/u-boot.lds | 2 +- arch/m68k/dts/M5208EVBE.dts | 2 +- arch/m68k/dts/M5235EVB.dts | 2 +- arch/m68k/dts/M5235EVB_Flash32.dts | 2 +- arch/m68k/dts/M5249EVB.dts | 2 +- arch/m68k/dts/M5253DEMO.dts | 2 +- arch/m68k/dts/M5272C3.dts | 2 +- arch/m68k/dts/M5275EVB.dts | 2 +- arch/m68k/dts/M5282EVB.dts | 2 +- arch/m68k/dts/M53017EVB.dts | 2 +- arch/m68k/dts/M5329AFEE.dts | 2 +- arch/m68k/dts/M5329BFEE.dts | 2 +- arch/m68k/dts/M5373EVB.dts | 2 +- arch/m68k/dts/Makefile | 2 +- arch/m68k/dts/amcore.dts | 2 +- arch/m68k/dts/astro_mcf5373l.dts | 2 +- arch/m68k/dts/cobra5272.dts | 2 +- arch/m68k/dts/eb_cpu5282.dts | 2 +- arch/m68k/dts/eb_cpu5282_internal.dts | 2 +- arch/m68k/dts/mcf5208.dtsi | 2 +- arch/m68k/dts/mcf523x.dtsi | 2 +- arch/m68k/dts/mcf5249.dtsi | 2 +- arch/m68k/dts/mcf5253.dtsi | 2 +- arch/m68k/dts/mcf5271.dtsi | 2 +- arch/m68k/dts/mcf5272.dtsi | 2 +- arch/m68k/dts/mcf5275.dtsi | 2 +- arch/m68k/dts/mcf5282.dtsi | 2 +- arch/m68k/dts/mcf5301x.dtsi | 2 +- arch/m68k/dts/mcf5307.dtsi | 2 +- arch/m68k/dts/mcf5329.dtsi | 2 +- arch/m68k/dts/mcf537x.dtsi | 2 +- arch/m68k/dts/mcf5441x.dtsi | 2 +- arch/m68k/dts/mcf54xx.dtsi | 2 +- arch/m68k/dts/stmark2.dts | 2 +- arch/m68k/include/asm/byteorder.h | 2 +- arch/m68k/include/asm/cache.h | 2 +- arch/m68k/include/asm/coldfire/ata.h | 2 +- arch/m68k/include/asm/coldfire/crossbar.h | 2 +- arch/m68k/include/asm/coldfire/dspi.h | 2 +- arch/m68k/include/asm/coldfire/edma.h | 2 +- arch/m68k/include/asm/coldfire/eport.h | 2 +- arch/m68k/include/asm/coldfire/flexbus.h | 2 +- arch/m68k/include/asm/coldfire/flexcan.h | 2 +- arch/m68k/include/asm/coldfire/intctrl.h | 2 +- arch/m68k/include/asm/coldfire/lcd.h | 2 +- arch/m68k/include/asm/coldfire/mdha.h | 2 +- arch/m68k/include/asm/coldfire/pwm.h | 2 +- arch/m68k/include/asm/coldfire/qspi.h | 2 +- arch/m68k/include/asm/coldfire/rng.h | 2 +- arch/m68k/include/asm/coldfire/skha.h | 2 +- arch/m68k/include/asm/coldfire/ssi.h | 2 +- arch/m68k/include/asm/config.h | 2 +- arch/m68k/include/asm/fec.h | 2 +- arch/m68k/include/asm/fsl_mcdmafec.h | 2 +- arch/m68k/include/asm/global_data.h | 2 +- arch/m68k/include/asm/immap.h | 2 +- arch/m68k/include/asm/immap_520x.h | 2 +- arch/m68k/include/asm/immap_5235.h | 2 +- arch/m68k/include/asm/immap_5249.h | 2 +- arch/m68k/include/asm/immap_5253.h | 2 +- arch/m68k/include/asm/immap_5271.h | 2 +- arch/m68k/include/asm/immap_5272.h | 2 +- arch/m68k/include/asm/immap_5275.h | 2 +- arch/m68k/include/asm/immap_5282.h | 2 +- arch/m68k/include/asm/immap_5301x.h | 2 +- arch/m68k/include/asm/immap_5307.h | 2 +- arch/m68k/include/asm/immap_5329.h | 2 +- arch/m68k/include/asm/immap_5441x.h | 2 +- arch/m68k/include/asm/io.h | 2 +- arch/m68k/include/asm/m520x.h | 2 +- arch/m68k/include/asm/m5235.h | 2 +- arch/m68k/include/asm/m5249.h | 2 +- arch/m68k/include/asm/m5253.h | 2 +- arch/m68k/include/asm/m5271.h | 2 +- arch/m68k/include/asm/m5272.h | 2 +- arch/m68k/include/asm/m5275.h | 2 +- arch/m68k/include/asm/m5282.h | 2 +- arch/m68k/include/asm/m5301x.h | 2 +- arch/m68k/include/asm/m5307.h | 2 +- arch/m68k/include/asm/m5329.h | 2 +- arch/m68k/include/asm/m5441x.h | 2 +- arch/m68k/include/asm/ptrace.h | 2 +- arch/m68k/include/asm/rtc.h | 2 +- arch/m68k/include/asm/sections.h | 2 +- arch/m68k/include/asm/timer.h | 2 +- arch/m68k/include/asm/u-boot.h | 2 +- arch/m68k/include/asm/uart.h | 2 +- arch/m68k/lib/Makefile | 2 +- arch/m68k/lib/ashldi3.c | 2 +- arch/m68k/lib/ashrdi3.c | 2 +- arch/m68k/lib/bdinfo.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/m68k/lib/cache.c | 2 +- arch/m68k/lib/fec.c | 2 +- arch/m68k/lib/interrupts.c | 2 +- arch/m68k/lib/lshrdi3.c | 2 +- arch/m68k/lib/muldi3.c | 2 +- arch/m68k/lib/time.c | 2 +- arch/m68k/lib/traps.c | 2 +- arch/microblaze/Makefile | 2 +- arch/microblaze/config.mk | 2 +- arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/cache.c | 2 +- arch/microblaze/cpu/cpuinfo.c | 2 +- arch/microblaze/cpu/exception.c | 2 +- arch/microblaze/cpu/interrupts.c | 2 +- arch/microblaze/cpu/irq.S | 2 +- arch/microblaze/cpu/pvr.c | 2 +- arch/microblaze/cpu/spl.c | 2 +- arch/microblaze/cpu/start.S | 2 +- arch/microblaze/cpu/u-boot-spl.lds | 2 +- arch/microblaze/cpu/u-boot.lds | 2 +- arch/microblaze/dts/Makefile | 2 +- arch/microblaze/include/asm/asm.h | 2 +- arch/microblaze/include/asm/cache.h | 2 +- arch/microblaze/include/asm/config.h | 2 +- arch/microblaze/include/asm/cpuinfo.h | 2 +- arch/microblaze/include/asm/global_data.h | 2 +- arch/microblaze/include/asm/io.h | 2 +- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/include/asm/pvr.h | 2 +- arch/microblaze/include/asm/sections.h | 2 +- arch/microblaze/include/asm/spl.h | 2 +- arch/microblaze/include/asm/u-boot.h | 2 +- arch/microblaze/lib/Makefile | 2 +- arch/microblaze/lib/bdinfo.c | 2 +- arch/microblaze/lib/bootm.c | 2 +- arch/microblaze/lib/muldi3.c | 2 +- arch/mips/Makefile | 2 +- arch/mips/Makefile.postlink | 2 +- arch/mips/config.mk | 2 +- arch/mips/cpu/Makefile | 2 +- arch/mips/cpu/cm_init.S | 2 +- arch/mips/cpu/cpu.c | 2 +- arch/mips/cpu/interrupts.c | 2 +- arch/mips/cpu/start.S | 2 +- arch/mips/cpu/time.c | 2 +- arch/mips/cpu/u-boot-spl.lds | 2 +- arch/mips/cpu/u-boot.lds | 2 +- arch/mips/dts/Makefile | 2 +- arch/mips/dts/ap121.dts | 2 +- arch/mips/dts/ap143.dts | 2 +- arch/mips/dts/ap152.dts | 2 +- arch/mips/dts/ar933x.dtsi | 2 +- arch/mips/dts/ar934x.dtsi | 2 +- arch/mips/dts/brcm,bcm3380.dtsi | 2 +- arch/mips/dts/brcm,bcm6318.dtsi | 2 +- arch/mips/dts/brcm,bcm63268.dtsi | 2 +- arch/mips/dts/brcm,bcm6328.dtsi | 2 +- arch/mips/dts/brcm,bcm6338.dtsi | 2 +- arch/mips/dts/brcm,bcm6348.dtsi | 2 +- arch/mips/dts/brcm,bcm6358.dtsi | 2 +- arch/mips/dts/brcm,bcm6362.dtsi | 2 +- arch/mips/dts/brcm,bcm6368.dtsi | 2 +- arch/mips/dts/brcm,bcm6838.dtsi | 2 +- arch/mips/dts/brcm,bcm968380gerg.dts | 2 +- arch/mips/dts/ci20.dts | 2 +- arch/mips/dts/comtrend,ar-5315u.dts | 2 +- arch/mips/dts/comtrend,ar-5387un.dts | 2 +- arch/mips/dts/comtrend,ct-5361.dts | 2 +- arch/mips/dts/comtrend,vr-3032u.dts | 2 +- arch/mips/dts/comtrend,wap-5813n.dts | 2 +- arch/mips/dts/huawei,hg556a.dts | 2 +- arch/mips/dts/jr2_pcb110.dts | 2 +- arch/mips/dts/jr2_pcb111.dts | 2 +- arch/mips/dts/jz4780.dtsi | 2 +- arch/mips/dts/luton_pcb090.dts | 2 +- arch/mips/dts/luton_pcb091.dts | 2 +- arch/mips/dts/mrvl,cn73xx.dtsi | 2 +- arch/mips/dts/mrvl,octeon-ebb7304.dts | 2 +- arch/mips/dts/mrvl,octeon-nic23.dts | 2 +- arch/mips/dts/mscc,jr2.dtsi | 2 +- arch/mips/dts/mscc,luton.dtsi | 2 +- arch/mips/dts/mscc,ocelot.dtsi | 2 +- arch/mips/dts/mscc,ocelot_pcb.dtsi | 2 +- arch/mips/dts/mscc,serval.dtsi | 2 +- arch/mips/dts/mscc,servalt.dtsi | 2 +- arch/mips/dts/netgear,cg3100d.dts | 2 +- arch/mips/dts/netgear,dgnd3700v2.dts | 2 +- arch/mips/dts/ocelot_pcb120.dts | 2 +- arch/mips/dts/ocelot_pcb123.dts | 2 +- arch/mips/dts/pic32mzda.dtsi | 2 +- arch/mips/dts/pic32mzda_sk.dts | 2 +- arch/mips/dts/qca953x.dtsi | 2 +- arch/mips/dts/qca956x.dtsi | 2 +- arch/mips/dts/sagem,f(a)st1704.dts | 2 +- arch/mips/dts/serval2_pcb112.dts | 2 +- arch/mips/dts/serval_pcb105.dts | 2 +- arch/mips/dts/serval_pcb106.dts | 2 +- arch/mips/dts/servalt_pcb116.dts | 2 +- arch/mips/dts/sfr,nb4-ser.dts | 2 +- arch/mips/dts/skeleton.dtsi | 2 +- arch/mips/dts/tplink_wdr4300.dts | 2 +- arch/mips/dts/vocore_vocore2.dts | 2 +- arch/mips/include/asm/asm-offsets.h | 2 +- arch/mips/include/asm/atomic.h | 2 +- arch/mips/include/asm/cache.h | 2 +- arch/mips/include/asm/cm.h | 2 +- arch/mips/include/asm/config.h | 2 +- arch/mips/include/asm/global_data.h | 2 +- arch/mips/include/asm/relocs.h | 2 +- arch/mips/include/asm/sections.h | 2 +- arch/mips/include/asm/spl.h | 2 +- arch/mips/include/asm/u-boot-mips.h | 2 +- arch/mips/include/asm/u-boot.h | 2 +- arch/mips/lib/Makefile | 2 +- arch/mips/lib/asm-offsets.c | 2 +- arch/mips/lib/boot.c | 2 +- arch/mips/lib/bootm.c | 2 +- arch/mips/lib/cache.c | 2 +- arch/mips/lib/cache_init.S | 2 +- arch/mips/lib/genex.S | 2 +- arch/mips/lib/reloc.c | 2 +- arch/mips/lib/spl.c | 2 +- arch/mips/lib/stack.c | 2 +- arch/mips/lib/traps.c | 2 +- arch/mips/mach-ath79/Makefile | 2 +- arch/mips/mach-ath79/ar933x/Makefile | 2 +- arch/mips/mach-ath79/ar933x/clk.c | 2 +- arch/mips/mach-ath79/ar933x/ddr.c | 2 +- arch/mips/mach-ath79/ar933x/lowlevel_init.S | 2 +- arch/mips/mach-ath79/ar934x/Makefile | 2 +- arch/mips/mach-ath79/ar934x/clk.c | 2 +- arch/mips/mach-ath79/ar934x/cpu.c | 2 +- arch/mips/mach-ath79/ar934x/ddr.c | 2 +- arch/mips/mach-ath79/cpu.c | 2 +- arch/mips/mach-ath79/dram.c | 2 +- arch/mips/mach-ath79/include/mach/ar71xx_regs.h | 2 +- arch/mips/mach-ath79/include/mach/ath79.h | 2 +- arch/mips/mach-ath79/include/mach/ddr.h | 2 +- arch/mips/mach-ath79/qca953x/Makefile | 2 +- arch/mips/mach-ath79/qca953x/clk.c | 2 +- arch/mips/mach-ath79/qca953x/ddr.c | 2 +- arch/mips/mach-ath79/qca953x/lowlevel_init.S | 2 +- arch/mips/mach-ath79/qca956x/Makefile | 2 +- arch/mips/mach-ath79/qca956x/clk.c | 2 +- arch/mips/mach-ath79/qca956x/cpu.c | 2 +- arch/mips/mach-ath79/qca956x/ddr.c | 2 +- arch/mips/mach-ath79/qca956x/qca956x-ddr-tap.S | 2 +- arch/mips/mach-ath79/reset.c | 2 +- arch/mips/mach-bmips/Makefile | 2 +- arch/mips/mach-bmips/dram.c | 2 +- arch/mips/mach-jz47xx/Makefile | 2 +- arch/mips/mach-jz47xx/include/mach/jz4780.h | 2 +- arch/mips/mach-jz47xx/include/mach/jz4780_dram.h | 2 +- arch/mips/mach-jz47xx/include/mach/jz4780_gpio.h | 2 +- arch/mips/mach-jz47xx/jz4780/Makefile | 2 +- arch/mips/mach-jz47xx/jz4780/gpio.c | 2 +- arch/mips/mach-jz47xx/jz4780/jz4780.c | 2 +- arch/mips/mach-jz47xx/jz4780/pll.c | 2 +- arch/mips/mach-jz47xx/jz4780/reset.c | 2 +- arch/mips/mach-jz47xx/jz4780/sdram.c | 2 +- arch/mips/mach-jz47xx/jz4780/timer.c | 2 +- arch/mips/mach-jz47xx/start.S | 2 +- arch/mips/mach-mscc/Kconfig | 2 +- arch/mips/mach-mscc/Makefile | 2 +- arch/mips/mach-mscc/cpu.c | 2 +- arch/mips/mach-mscc/dram.c | 2 +- arch/mips/mach-mscc/gpio.c | 2 +- arch/mips/mach-mscc/include/ioremap.h | 2 +- arch/mips/mach-mscc/include/mach/common.h | 2 +- arch/mips/mach-mscc/include/mach/ddr.h | 2 +- arch/mips/mach-mscc/include/mach/jr2/jr2.h | 2 +- arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h | 2 +- .../mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h | 2 +- arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h | 2 +- arch/mips/mach-mscc/include/mach/luton/luton.h | 2 +- arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h | 2 +- .../include/mach/luton/luton_devcpu_gcb_miim_regs.h | 2 +- arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h | 2 +- arch/mips/mach-mscc/include/mach/ocelot/ocelot.h | 2 +- .../mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h | 2 +- .../include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h | 2 +- arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h | 2 +- arch/mips/mach-mscc/include/mach/serval/serval.h | 2 +- .../mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h | 2 +- .../include/mach/serval/serval_devcpu_gcb_miim_regs.h | 2 +- arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h | 2 +- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 2 +- .../mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h | 2 +- .../include/mach/servalt/servalt_devcpu_gcb_miim_regs.h | 2 +- .../mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h | 2 +- arch/mips/mach-mscc/include/mach/tlb.h | 2 +- arch/mips/mach-mscc/lowlevel_init.S | 2 +- arch/mips/mach-mscc/lowlevel_init_luton.S | 2 +- arch/mips/mach-mscc/phy.c | 2 +- arch/mips/mach-mscc/reset.c | 2 +- arch/mips/mach-mtmips/Makefile | 2 +- arch/mips/mach-mtmips/cpu.c | 2 +- arch/mips/mach-octeon/Makefile | 2 +- arch/mips/mach-octeon/bootoctlinux.c | 2 +- arch/mips/mach-octeon/cache.c | 2 +- arch/mips/mach-octeon/cpu.c | 2 +- arch/mips/mach-octeon/dram.c | 2 +- arch/mips/mach-octeon/include/mach/cvmx-regs.h | 2 +- arch/mips/mach-pic32/Makefile | 2 +- arch/mips/mach-pic32/cpu.c | 2 +- arch/mips/mach-pic32/include/mach/ddr.h | 2 +- arch/mips/mach-pic32/include/mach/pic32.h | 2 +- arch/mips/mach-pic32/lowlevel_init.S | 2 +- arch/mips/mach-pic32/reset.c | 2 +- arch/nios2/Makefile | 2 +- arch/nios2/config.mk | 2 +- arch/nios2/cpu/Makefile | 2 +- arch/nios2/cpu/cpu.c | 2 +- arch/nios2/cpu/exceptions.S | 2 +- arch/nios2/cpu/interrupts.c | 2 +- arch/nios2/cpu/start.S | 2 +- arch/nios2/cpu/traps.c | 2 +- arch/nios2/cpu/u-boot.lds | 2 +- arch/nios2/dts/10m50_devboard.dts | 2 +- arch/nios2/dts/3c120_devboard.dts | 2 +- arch/nios2/dts/Makefile | 2 +- arch/nios2/include/asm/bitops.h | 2 +- arch/nios2/include/asm/byteorder.h | 2 +- arch/nios2/include/asm/cache.h | 2 +- arch/nios2/include/asm/config.h | 2 +- arch/nios2/include/asm/global_data.h | 2 +- arch/nios2/include/asm/io.h | 2 +- arch/nios2/include/asm/nios2.h | 2 +- arch/nios2/include/asm/opcodes.h | 2 +- arch/nios2/include/asm/processor.h | 2 +- arch/nios2/include/asm/ptrace.h | 2 +- arch/nios2/include/asm/string.h | 2 +- arch/nios2/include/asm/system.h | 2 +- arch/nios2/include/asm/u-boot.h | 2 +- arch/nios2/lib/Makefile | 2 +- arch/nios2/lib/bootm.c | 2 +- arch/nios2/lib/cache.c | 2 +- arch/nios2/lib/libgcc.c | 2 +- arch/nios2/lib/longlong.h | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/config.mk | 2 +- arch/powerpc/cpu/Makefile | 2 +- arch/powerpc/cpu/mpc83xx/Makefile | 2 +- arch/powerpc/cpu/mpc83xx/config.mk | 2 +- arch/powerpc/cpu/mpc83xx/cpu.c | 2 +- arch/powerpc/cpu/mpc83xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc83xx/ecc.c | 2 +- arch/powerpc/cpu/mpc83xx/fdt.c | 2 +- arch/powerpc/cpu/mpc83xx/interrupts.c | 2 +- arch/powerpc/cpu/mpc83xx/pci.c | 2 +- arch/powerpc/cpu/mpc83xx/pcie.c | 2 +- arch/powerpc/cpu/mpc83xx/qe_io.c | 2 +- arch/powerpc/cpu/mpc83xx/serdes.c | 2 +- arch/powerpc/cpu/mpc83xx/spd_sdram.c | 2 +- arch/powerpc/cpu/mpc83xx/speed.c | 2 +- arch/powerpc/cpu/mpc83xx/spl_minimal.c | 2 +- arch/powerpc/cpu/mpc83xx/start.S | 2 +- arch/powerpc/cpu/mpc83xx/traps.c | 2 +- arch/powerpc/cpu/mpc83xx/u-boot-spl.lds | 2 +- arch/powerpc/cpu/mpc83xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc85xx/Makefile | 2 +- arch/powerpc/cpu/mpc85xx/b4860_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/b4860_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/c29x_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 2 +- arch/powerpc/cpu/mpc85xx/config.mk | 2 +- arch/powerpc/cpu/mpc85xx/cpu.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h | 2 +- arch/powerpc/cpu/mpc85xx/interrupts.c | 2 +- arch/powerpc/cpu/mpc85xx/liodn.c | 2 +- arch/powerpc/cpu/mpc85xx/mp.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p1010_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p1021_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p1023_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p2020_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p2041_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/p2041_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p3041_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/p3041_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p4080_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/p4080_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/p5040_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/p5040_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/portals.c | 2 +- arch/powerpc/cpu/mpc85xx/qe_io.c | 2 +- arch/powerpc/cpu/mpc85xx/release.S | 2 +- arch/powerpc/cpu/mpc85xx/speed.c | 2 +- arch/powerpc/cpu/mpc85xx/spl_minimal.c | 2 +- arch/powerpc/cpu/mpc85xx/start.S | 2 +- arch/powerpc/cpu/mpc85xx/t1024_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/t1024_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/t1040_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/t1040_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/t2080_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/t4240_ids.c | 2 +- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/tlb.c | 2 +- arch/powerpc/cpu/mpc85xx/traps.c | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 2 +- arch/powerpc/cpu/mpc85xx/u-boot.lds | 2 +- arch/powerpc/cpu/mpc8xx/Makefile | 2 +- arch/powerpc/cpu/mpc8xx/cache.c | 2 +- arch/powerpc/cpu/mpc8xx/config.mk | 2 +- arch/powerpc/cpu/mpc8xx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc8xx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xx/immap.c | 2 +- arch/powerpc/cpu/mpc8xx/interrupts.c | 2 +- arch/powerpc/cpu/mpc8xx/speed.c | 2 +- arch/powerpc/cpu/mpc8xx/start.S | 2 +- arch/powerpc/cpu/mpc8xx/traps.c | 2 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xxx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xxx/fsl_pamu.c | 2 +- arch/powerpc/cpu/mpc8xxx/law.c | 2 +- arch/powerpc/cpu/mpc8xxx/pamu_table.c | 2 +- arch/powerpc/cpu/mpc8xxx/srio.c | 2 +- arch/powerpc/dts/Makefile | 2 +- arch/powerpc/dts/cmpc885.dts | 2 +- arch/powerpc/dts/cmpcpro.dts | 2 +- arch/powerpc/dts/e500mc_power_isa.dtsi | 2 +- arch/powerpc/dts/e500v2_power_isa.dtsi | 2 +- arch/powerpc/dts/e5500_power_isa.dtsi | 2 +- arch/powerpc/dts/e6500_power_isa.dtsi | 2 +- arch/powerpc/dts/km8321-uboot.dtsi | 2 +- arch/powerpc/dts/km8321.dtsi | 2 +- arch/powerpc/dts/km836x-uboot.dtsi | 2 +- arch/powerpc/dts/km836x.dtsi | 2 +- arch/powerpc/dts/kmcoge5ne-uboot.dtsi | 2 +- arch/powerpc/dts/kmcoge5ne.dts | 2 +- arch/powerpc/dts/kmeter1-uboot.dtsi | 2 +- arch/powerpc/dts/kmeter1.dts | 2 +- arch/powerpc/dts/kmopti2.dts | 2 +- arch/powerpc/dts/kmsupc5.dts | 2 +- arch/powerpc/dts/kmsupm5.dts | 2 +- arch/powerpc/dts/kmtepr2.dts | 2 +- arch/powerpc/dts/kmtuge1.dts | 2 +- arch/powerpc/dts/kmtuxa1.dts | 2 +- arch/powerpc/dts/mcr3000.dts | 2 +- arch/powerpc/dts/mpc8379erdb.dts | 2 +- arch/powerpc/dts/mpc8548-post.dtsi | 2 +- arch/powerpc/dts/mpc8548.dtsi | 2 +- arch/powerpc/dts/mpc8548cds.dts | 2 +- arch/powerpc/dts/mpc8548cds_36b.dts | 2 +- arch/powerpc/dts/p1010rdb-pa.dts | 2 +- arch/powerpc/dts/p1010rdb-pa_36b.dts | 2 +- arch/powerpc/dts/p1010rdb-pb.dts | 2 +- arch/powerpc/dts/p1010rdb-pb_36b.dts | 2 +- arch/powerpc/dts/p1010rdb.dtsi | 2 +- arch/powerpc/dts/p1010rdb_32b.dtsi | 2 +- arch/powerpc/dts/p1010rdb_36b.dtsi | 2 +- arch/powerpc/dts/p1010si-post.dtsi | 2 +- arch/powerpc/dts/p1010si-pre.dtsi | 2 +- arch/powerpc/dts/p1020-post.dtsi | 2 +- arch/powerpc/dts/p1020.dtsi | 2 +- arch/powerpc/dts/p1020rdb-pc.dts | 2 +- arch/powerpc/dts/p1020rdb-pc.dtsi | 2 +- arch/powerpc/dts/p1020rdb-pc_36b.dts | 2 +- arch/powerpc/dts/p1020rdb-pd.dts | 2 +- arch/powerpc/dts/p2020-post.dtsi | 2 +- arch/powerpc/dts/p2020.dtsi | 2 +- arch/powerpc/dts/p2020rdb-pc.dts | 2 +- arch/powerpc/dts/p2020rdb-pc.dtsi | 2 +- arch/powerpc/dts/p2020rdb-pc_36b.dts | 2 +- arch/powerpc/dts/p2041.dtsi | 2 +- arch/powerpc/dts/p2041rdb.dts | 2 +- arch/powerpc/dts/p2041si-post.dtsi | 2 +- arch/powerpc/dts/p3041.dtsi | 2 +- arch/powerpc/dts/p3041ds.dts | 2 +- arch/powerpc/dts/p3041si-post.dtsi | 2 +- arch/powerpc/dts/p4080.dtsi | 2 +- arch/powerpc/dts/p4080ds.dts | 2 +- arch/powerpc/dts/p4080si-post.dtsi | 2 +- arch/powerpc/dts/p5040.dtsi | 2 +- arch/powerpc/dts/p5040ds.dts | 2 +- arch/powerpc/dts/p5040si-post.dtsi | 2 +- arch/powerpc/dts/pq3-etsec1-0.dtsi | 2 +- arch/powerpc/dts/pq3-etsec1-1.dtsi | 2 +- arch/powerpc/dts/pq3-etsec1-2.dtsi | 2 +- arch/powerpc/dts/pq3-etsec1-3.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-0.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-1.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-2.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-grp2-0.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-grp2-1.dtsi | 2 +- arch/powerpc/dts/pq3-etsec2-grp2-2.dtsi | 2 +- arch/powerpc/dts/pq3-i2c-0.dtsi | 2 +- arch/powerpc/dts/pq3-i2c-1.dtsi | 2 +- arch/powerpc/dts/qemu-ppce500.dts | 2 +- arch/powerpc/dts/qoriq-clockgen1.dtsi | 2 +- arch/powerpc/dts/qoriq-clockgen2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-10g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-1g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-1g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-1g-2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-1g-3.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0-1g-4.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-10g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-1g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-1g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-1g-2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-1g-3.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1-1g-4.dtsi | 2 +- arch/powerpc/dts/qoriq-fman-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-10g-0-best-effort.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-10g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-10g-1-best-effort.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-10g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-3.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-4.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0-1g-5.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3l-0.dtsi | 2 +- arch/powerpc/dts/qoriq-gpio-0.dtsi | 2 +- arch/powerpc/dts/qoriq-gpio-1.dtsi | 2 +- arch/powerpc/dts/qoriq-gpio-2.dtsi | 2 +- arch/powerpc/dts/qoriq-gpio-3.dtsi | 2 +- arch/powerpc/dts/qoriq-i2c-0.dtsi | 2 +- arch/powerpc/dts/qoriq-i2c-1.dtsi | 2 +- arch/powerpc/dts/socrates-u-boot.dtsi | 2 +- arch/powerpc/dts/socrates.dts | 2 +- arch/powerpc/dts/t1023si-post.dtsi | 2 +- arch/powerpc/dts/t1024rdb-u-boot.dtsi | 2 +- arch/powerpc/dts/t1024rdb.dts | 2 +- arch/powerpc/dts/t1024si-post.dtsi | 2 +- arch/powerpc/dts/t102x.dtsi | 2 +- arch/powerpc/dts/t1042d4rdb-u-boot.dtsi | 2 +- arch/powerpc/dts/t1042d4rdb.dts | 2 +- arch/powerpc/dts/t1042si-post.dtsi | 2 +- arch/powerpc/dts/t104x.dtsi | 2 +- arch/powerpc/dts/t2080.dtsi | 2 +- arch/powerpc/dts/t2080qds.dts | 2 +- arch/powerpc/dts/t2080rdb-u-boot.dtsi | 2 +- arch/powerpc/dts/t2080rdb.dts | 2 +- arch/powerpc/dts/t2080si-post.dtsi | 2 +- arch/powerpc/dts/t4240.dtsi | 2 +- arch/powerpc/dts/t4240rdb-u-boot.dtsi | 2 +- arch/powerpc/dts/t4240rdb.dts | 2 +- arch/powerpc/dts/t4240si-post.dtsi | 2 +- arch/powerpc/dts/u-boot.dtsi | 2 +- arch/powerpc/include/asm/arch-mpc83xx/gpio.h | 2 +- arch/powerpc/include/asm/arch-mpc83xx/soc.h | 2 +- arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 +- arch/powerpc/include/asm/arch-mpc8xx/gpio.h | 2 +- arch/powerpc/include/asm/arch-ppc4xx/gpio.h | 2 +- arch/powerpc/include/asm/config.h | 2 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 +- arch/powerpc/include/asm/fsl_fdt.h | 2 +- arch/powerpc/include/asm/fsl_lbc.h | 2 +- arch/powerpc/include/asm/fsl_liodn.h | 2 +- arch/powerpc/include/asm/fsl_mpc83xx_serdes.h | 2 +- arch/powerpc/include/asm/fsl_pamu.h | 2 +- arch/powerpc/include/asm/fsl_pci.h | 2 +- arch/powerpc/include/asm/fsl_portals.h | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 2 +- arch/powerpc/include/asm/fsl_serdes.h | 2 +- arch/powerpc/include/asm/fsl_srio.h | 2 +- arch/powerpc/include/asm/global_data.h | 2 +- arch/powerpc/include/asm/immap_83xx.h | 2 +- arch/powerpc/include/asm/immap_85xx.h | 2 +- arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/include/asm/iopin_8xx.h | 2 +- arch/powerpc/include/asm/linkage.h | 2 +- arch/powerpc/include/asm/mp.h | 2 +- arch/powerpc/include/asm/mpc85xx_gpio.h | 2 +- arch/powerpc/include/asm/ppc.h | 2 +- arch/powerpc/include/asm/sections.h | 2 +- arch/powerpc/include/asm/spl.h | 2 +- arch/powerpc/include/asm/u-boot.h | 2 +- arch/powerpc/lib/Makefile | 2 +- arch/powerpc/lib/_ashldi3.S | 2 +- arch/powerpc/lib/_ashrdi3.S | 2 +- arch/powerpc/lib/_lshrdi3.S | 2 +- arch/powerpc/lib/bdinfo.c | 2 +- arch/powerpc/lib/bootm.c | 2 +- arch/powerpc/lib/cache.c | 2 +- arch/powerpc/lib/extable.c | 2 +- arch/powerpc/lib/interrupts.c | 2 +- arch/powerpc/lib/ppccache.S | 2 +- arch/powerpc/lib/ppcstring.S | 2 +- arch/powerpc/lib/reloc.S | 2 +- arch/powerpc/lib/spl.c | 2 +- arch/powerpc/lib/stack.c | 2 +- arch/powerpc/lib/ticks.S | 2 +- arch/powerpc/lib/time.c | 2 +- arch/powerpc/lib/traps.c | 2 +- arch/riscv/Makefile | 2 +- arch/riscv/config.mk | 2 +- arch/riscv/cpu/Makefile | 2 +- arch/riscv/cpu/andesv5/Makefile | 2 +- arch/riscv/cpu/andesv5/cache.c | 2 +- arch/riscv/cpu/andesv5/cpu.c | 2 +- arch/riscv/cpu/andesv5/spl.c | 2 +- arch/riscv/cpu/cpu.c | 2 +- arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/fu540/Makefile | 2 +- arch/riscv/cpu/fu540/cpu.c | 2 +- arch/riscv/cpu/fu540/dram.c | 2 +- arch/riscv/cpu/fu540/spl.c | 2 +- arch/riscv/cpu/fu740/Kconfig | 2 +- arch/riscv/cpu/fu740/Makefile | 2 +- arch/riscv/cpu/fu740/cpu.c | 2 +- arch/riscv/cpu/fu740/dram.c | 2 +- arch/riscv/cpu/fu740/spl.c | 2 +- arch/riscv/cpu/generic/Kconfig | 2 +- arch/riscv/cpu/generic/Makefile | 2 +- arch/riscv/cpu/generic/cpu.c | 2 +- arch/riscv/cpu/generic/dram.c | 2 +- arch/riscv/cpu/jh7110/Kconfig | 2 +- arch/riscv/cpu/jh7110/Makefile | 2 +- arch/riscv/cpu/jh7110/cpu.c | 2 +- arch/riscv/cpu/jh7110/dram.c | 2 +- arch/riscv/cpu/jh7110/spl.c | 2 +- arch/riscv/cpu/mtrap.S | 2 +- arch/riscv/cpu/start.S | 2 +- arch/riscv/cpu/u-boot-spl.lds | 2 +- arch/riscv/cpu/u-boot.lds | 2 +- arch/riscv/dts/Makefile | 2 +- arch/riscv/dts/binman.dtsi | 2 +- arch/riscv/dts/k210-maix-bit.dts | 2 +- arch/riscv/dts/k210.dtsi | 2 +- arch/riscv/dts/mpfs-icicle-kit.dts | 2 +- arch/riscv/dts/mpfs.dtsi | 2 +- arch/riscv/dts/qemu-virt32.dts | 2 +- arch/riscv/dts/qemu-virt64.dts | 2 +- arch/riscv/include/asm/arch-andes/csr.h | 2 +- arch/riscv/include/asm/arch-fu540/clk.h | 2 +- arch/riscv/include/asm/arch-fu540/gpio.h | 2 +- arch/riscv/include/asm/arch-fu540/reset.h | 2 +- arch/riscv/include/asm/arch-fu540/spl.h | 2 +- arch/riscv/include/asm/arch-fu740/clk.h | 2 +- arch/riscv/include/asm/arch-fu740/gpio.h | 2 +- arch/riscv/include/asm/arch-fu740/reset.h | 2 +- arch/riscv/include/asm/arch-fu740/spl.h | 2 +- arch/riscv/include/asm/arch-generic/clk.h | 2 +- arch/riscv/include/asm/arch-generic/gpio.h | 2 +- arch/riscv/include/asm/arch-jh7110/eeprom.h | 2 +- arch/riscv/include/asm/arch-jh7110/regs.h | 2 +- arch/riscv/include/asm/arch-jh7110/spl.h | 2 +- arch/riscv/include/asm/atomic.h | 2 +- arch/riscv/include/asm/cache.h | 2 +- arch/riscv/include/asm/config.h | 2 +- arch/riscv/include/asm/dma-mapping.h | 2 +- arch/riscv/include/asm/encoding.h | 2 +- arch/riscv/include/asm/global_data.h | 2 +- arch/riscv/include/asm/gpio.h | 2 +- arch/riscv/include/asm/linkage.h | 2 +- arch/riscv/include/asm/sections.h | 2 +- arch/riscv/include/asm/setjmp.h | 2 +- arch/riscv/include/asm/spl.h | 2 +- arch/riscv/include/asm/syscon.h | 2 +- arch/riscv/include/asm/system.h | 2 +- arch/riscv/include/asm/u-boot-riscv.h | 2 +- arch/riscv/include/asm/u-boot.h | 2 +- arch/riscv/lib/Makefile | 2 +- arch/riscv/lib/aclint_ipi.c | 2 +- arch/riscv/lib/andes_plicsw.c | 2 +- arch/riscv/lib/asm-offsets.c | 2 +- arch/riscv/lib/boot.c | 2 +- arch/riscv/lib/bootm.c | 2 +- arch/riscv/lib/cache.c | 2 +- arch/riscv/lib/crt0_riscv_efi.S | 2 +- arch/riscv/lib/elf_riscv32_efi.lds | 2 +- arch/riscv/lib/elf_riscv64_efi.lds | 2 +- arch/riscv/lib/fdt_fixup.c | 2 +- arch/riscv/lib/image.c | 2 +- arch/riscv/lib/interrupts.c | 2 +- arch/riscv/lib/reloc_riscv_efi.c | 2 +- arch/riscv/lib/reset.c | 2 +- arch/riscv/lib/sbi_ipi.c | 2 +- arch/riscv/lib/semihosting.S | 2 +- arch/riscv/lib/setjmp.S | 2 +- arch/riscv/lib/sifive_cache.c | 2 +- arch/riscv/lib/smp.c | 2 +- arch/riscv/lib/spl.c | 2 +- arch/sandbox/Makefile | 2 +- arch/sandbox/config.mk | 2 +- arch/sandbox/cpu/Makefile | 2 +- arch/sandbox/cpu/cache.c | 2 +- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/cpu/os.c | 2 +- arch/sandbox/cpu/sdl.c | 2 +- arch/sandbox/cpu/spl.c | 2 +- arch/sandbox/cpu/start.c | 2 +- arch/sandbox/cpu/state.c | 2 +- arch/sandbox/cpu/u-boot-spl.lds | 2 +- arch/sandbox/cpu/u-boot.lds | 2 +- arch/sandbox/dts/Makefile | 2 +- arch/sandbox/dts/cedit.dtsi | 2 +- arch/sandbox/dts/other.dts | 2 +- arch/sandbox/dts/overlay0.dtso | 2 +- arch/sandbox/dts/overlay1.dtso | 2 +- arch/sandbox/dts/sandbox.dts | 2 +- arch/sandbox/dts/sandbox.dtsi | 2 +- arch/sandbox/dts/sandbox64.dts | 2 +- arch/sandbox/dts/sandbox_pmic.dtsi | 2 +- arch/sandbox/dts/sandbox_vpl.dtsi | 2 +- arch/sandbox/dts/test.dts | 2 +- arch/sandbox/include/asm/acpi_table.h | 2 +- arch/sandbox/include/asm/axi.h | 2 +- arch/sandbox/include/asm/byteorder.h | 2 +- arch/sandbox/include/asm/cache.h | 2 +- arch/sandbox/include/asm/config.h | 2 +- arch/sandbox/include/asm/cpu.h | 2 +- arch/sandbox/include/asm/fuzzing_engine.h | 2 +- arch/sandbox/include/asm/global_data.h | 2 +- arch/sandbox/include/asm/gpio.h | 2 +- arch/sandbox/include/asm/handoff.h | 2 +- arch/sandbox/include/asm/i2c.h | 2 +- arch/sandbox/include/asm/io.h | 2 +- arch/sandbox/include/asm/main.h | 2 +- arch/sandbox/include/asm/malloc.h | 2 +- arch/sandbox/include/asm/processor.h | 2 +- arch/sandbox/include/asm/ptrace.h | 2 +- arch/sandbox/include/asm/rtc.h | 2 +- arch/sandbox/include/asm/sandbox_arm_ffa.h | 2 +- arch/sandbox/include/asm/sandbox_arm_ffa_priv.h | 2 +- arch/sandbox/include/asm/sdl.h | 2 +- arch/sandbox/include/asm/serial.h | 2 +- arch/sandbox/include/asm/setjmp.h | 2 +- arch/sandbox/include/asm/spl.h | 2 +- arch/sandbox/include/asm/state.h | 2 +- arch/sandbox/include/asm/string.h | 2 +- arch/sandbox/include/asm/system.h | 2 +- arch/sandbox/include/asm/test.h | 2 +- arch/sandbox/include/asm/types.h | 2 +- arch/sandbox/include/asm/u-boot-sandbox.h | 2 +- arch/sandbox/include/asm/u-boot.h | 2 +- arch/sandbox/include/asm/unaligned.h | 2 +- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/bootm.c | 2 +- arch/sandbox/lib/crt0_sandbox_efi.S | 2 +- arch/sandbox/lib/fdt_fixup.c | 2 +- arch/sandbox/lib/interrupts.c | 2 +- arch/sandbox/lib/pci_io.c | 2 +- arch/sandbox/lib/reloc_sandbox_efi.c | 2 +- arch/sandbox/lib/sections.c | 2 +- arch/sh/Makefile | 2 +- arch/sh/config.mk | 2 +- arch/sh/cpu/sh4/Makefile | 2 +- arch/sh/cpu/sh4/cache.c | 2 +- arch/sh/cpu/sh4/config.mk | 2 +- arch/sh/cpu/sh4/cpu.c | 2 +- arch/sh/cpu/sh4/interrupts.c | 2 +- arch/sh/cpu/sh4/watchdog.c | 2 +- arch/sh/cpu/u-boot.lds | 2 +- arch/sh/include/asm/byteorder.h | 2 +- arch/sh/include/asm/config.h | 2 +- arch/sh/include/asm/cpu_sh4.h | 2 +- arch/sh/include/asm/cpu_sh7722.h | 2 +- arch/sh/include/asm/cpu_sh7723.h | 2 +- arch/sh/include/asm/cpu_sh7734.h | 2 +- arch/sh/include/asm/cpu_sh7750.h | 2 +- arch/sh/include/asm/cpu_sh7752.h | 2 +- arch/sh/include/asm/cpu_sh7753.h | 2 +- arch/sh/include/asm/cpu_sh7757.h | 2 +- arch/sh/include/asm/cpu_sh7763.h | 2 +- arch/sh/include/asm/cpu_sh7780.h | 2 +- arch/sh/include/asm/global_data.h | 2 +- arch/sh/include/asm/macro.h | 2 +- arch/sh/include/asm/pci.h | 2 +- arch/sh/include/asm/sections.h | 2 +- arch/sh/include/asm/u-boot.h | 2 +- arch/sh/include/asm/zimage.h | 2 +- arch/sh/lib/Makefile | 2 +- arch/sh/lib/ashiftrt.S | 2 +- arch/sh/lib/ashlsi3.S | 2 +- arch/sh/lib/ashrsi3.S | 2 +- arch/sh/lib/board.c | 2 +- arch/sh/lib/bootm.c | 2 +- arch/sh/lib/lshrsi3.S | 2 +- arch/sh/lib/movmem.S | 2 +- arch/sh/lib/start.S | 2 +- arch/sh/lib/time.c | 2 +- arch/sh/lib/time_sh2.c | 2 +- arch/sh/lib/udiv_qrnnd.S | 2 +- arch/sh/lib/udivsi3.S | 2 +- arch/sh/lib/udivsi3_i4i-Os.S | 2 +- arch/sh/lib/udivsi3_i4i.S | 2 +- arch/sh/lib/zimageboot.c | 2 +- arch/x86/Makefile | 2 +- arch/x86/config.mk | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/cpu/acpi_gpe.c | 2 +- arch/x86/cpu/apollolake/Makefile | 2 +- arch/x86/cpu/apollolake/acpi.c | 2 +- arch/x86/cpu/apollolake/fsp_m.c | 2 +- arch/x86/cpu/apollolake/fsp_s.c | 2 +- arch/x86/cpu/baytrail/Kconfig | 2 +- arch/x86/cpu/baytrail/Makefile | 2 +- arch/x86/cpu/baytrail/acpi.c | 2 +- arch/x86/cpu/baytrail/cpu.c | 2 +- arch/x86/cpu/baytrail/early_uart.c | 2 +- arch/x86/cpu/baytrail/valleyview.c | 2 +- arch/x86/cpu/braswell/Kconfig | 2 +- arch/x86/cpu/braswell/Makefile | 2 +- arch/x86/cpu/braswell/braswell.c | 2 +- arch/x86/cpu/braswell/early_uart.c | 2 +- arch/x86/cpu/braswell/fsp_configs.c | 2 +- arch/x86/cpu/broadwell/Makefile | 2 +- arch/x86/cpu/broadwell/cpu_from_spl.c | 2 +- arch/x86/cpu/broadwell/pinctrl_broadwell.c | 2 +- arch/x86/cpu/call32.S | 2 +- arch/x86/cpu/config.mk | 2 +- arch/x86/cpu/coreboot/Makefile | 2 +- arch/x86/cpu/coreboot/car.S | 2 +- arch/x86/cpu/coreboot/coreboot.c | 2 +- arch/x86/cpu/coreboot/coreboot_spl.c | 2 +- arch/x86/cpu/coreboot/sdram.c | 2 +- arch/x86/cpu/coreboot/timestamp.c | 2 +- arch/x86/cpu/cpu.c | 2 +- arch/x86/cpu/cpu_x86.c | 2 +- arch/x86/cpu/efi/Makefile | 2 +- arch/x86/cpu/efi/app.c | 2 +- arch/x86/cpu/efi/car.S | 2 +- arch/x86/cpu/efi/payload.c | 2 +- arch/x86/cpu/efi/sdram.c | 2 +- arch/x86/cpu/i386/call64.S | 2 +- arch/x86/cpu/i386/cpu.c | 2 +- arch/x86/cpu/i386/interrupt.c | 2 +- arch/x86/cpu/intel_common/Makefile | 2 +- arch/x86/cpu/intel_common/acpi.c | 2 +- arch/x86/cpu/intel_common/generic_wifi.c | 2 +- arch/x86/cpu/intel_common/intel_opregion.c | 2 +- arch/x86/cpu/ioapic.c | 2 +- arch/x86/cpu/irq.c | 2 +- arch/x86/cpu/ivybridge/Makefile | 2 +- arch/x86/cpu/ivybridge/bd82x6x.c | 2 +- arch/x86/cpu/ivybridge/fsp_configs.c | 2 +- arch/x86/cpu/ivybridge/ivybridge.c | 2 +- arch/x86/cpu/mp_init.c | 2 +- arch/x86/cpu/mtrr.c | 2 +- arch/x86/cpu/pci.c | 2 +- arch/x86/cpu/qemu/Kconfig | 2 +- arch/x86/cpu/qemu/Makefile | 2 +- arch/x86/cpu/qemu/car.S | 2 +- arch/x86/cpu/qemu/cpu.c | 2 +- arch/x86/cpu/qemu/dram.c | 2 +- arch/x86/cpu/qemu/e820.c | 2 +- arch/x86/cpu/qemu/qemu.c | 2 +- arch/x86/cpu/qfw_cpu.c | 2 +- arch/x86/cpu/quark/Kconfig | 2 +- arch/x86/cpu/quark/Makefile | 2 +- arch/x86/cpu/quark/acpi.c | 2 +- arch/x86/cpu/quark/car.S | 2 +- arch/x86/cpu/quark/dram.c | 2 +- arch/x86/cpu/quark/msg_port.c | 2 +- arch/x86/cpu/quark/quark.c | 2 +- arch/x86/cpu/queensbay/Kconfig | 2 +- arch/x86/cpu/queensbay/Makefile | 2 +- arch/x86/cpu/queensbay/tnc.c | 2 +- arch/x86/cpu/resetvec.S | 2 +- arch/x86/cpu/slimbootloader/Kconfig | 2 +- arch/x86/cpu/slimbootloader/Makefile | 2 +- arch/x86/cpu/slimbootloader/car.S | 2 +- arch/x86/cpu/slimbootloader/sdram.c | 2 +- arch/x86/cpu/slimbootloader/serial.c | 2 +- arch/x86/cpu/slimbootloader/slimbootloader.c | 2 +- arch/x86/cpu/start.S | 2 +- arch/x86/cpu/start16.S | 2 +- arch/x86/cpu/start64.S | 2 +- arch/x86/cpu/start_from_spl.S | 2 +- arch/x86/cpu/start_from_tpl.S | 2 +- arch/x86/cpu/tangier/Kconfig | 2 +- arch/x86/cpu/tangier/Makefile | 2 +- arch/x86/cpu/tangier/acpi.c | 2 +- arch/x86/cpu/tangier/car.S | 2 +- arch/x86/cpu/tangier/pinmux.c | 2 +- arch/x86/cpu/tangier/sdram.c | 2 +- arch/x86/cpu/tangier/sysreset.c | 2 +- arch/x86/cpu/tangier/tangier.c | 2 +- arch/x86/cpu/u-boot-64.lds | 2 +- arch/x86/cpu/u-boot-spl.lds | 2 +- arch/x86/cpu/u-boot.lds | 2 +- arch/x86/cpu/wakeup.S | 2 +- arch/x86/cpu/x86_64/cpu.c | 2 +- arch/x86/cpu/x86_64/interrupts.c | 2 +- arch/x86/cpu/x86_64/misc.c | 2 +- arch/x86/dts/Makefile | 2 +- arch/x86/dts/bayleybay.dts | 2 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 2 +- arch/x86/dts/cherryhill.dts | 2 +- arch/x86/dts/conga-qeval20-qa3-e3845.dts | 2 +- arch/x86/dts/coreboot-u-boot.dtsi | 2 +- arch/x86/dts/coreboot.dts | 2 +- arch/x86/dts/cougarcanyon2.dts | 2 +- arch/x86/dts/crownbay.dts | 2 +- arch/x86/dts/dfi-bt700-q7x-151.dts | 2 +- arch/x86/dts/dfi-bt700.dtsi | 2 +- arch/x86/dts/edison.dts | 2 +- arch/x86/dts/efi-x86_app.dts | 2 +- arch/x86/dts/efi-x86_payload.dts | 2 +- arch/x86/dts/emulation-u-boot.dtsi | 2 +- arch/x86/dts/galileo.dts | 2 +- arch/x86/dts/minnowmax.dts | 2 +- arch/x86/dts/qemu-x86_i440fx.dts | 2 +- arch/x86/dts/qemu-x86_q35.dts | 2 +- arch/x86/dts/quark-u-boot.dtsi | 2 +- arch/x86/dts/slimbootloader.dts | 2 +- arch/x86/dts/smbios.dtsi | 2 +- arch/x86/dts/theadorable-x86-dfi-bt700.dts | 2 +- arch/x86/dts/u-boot.dtsi | 2 +- arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/acpi/debug.asl | 2 +- arch/x86/include/asm/acpi/global_nvs.h | 2 +- arch/x86/include/asm/acpi/globutil.asl | 2 +- arch/x86/include/asm/acpi/irq_helper.h | 2 +- arch/x86/include/asm/acpi/irqlinks.asl | 2 +- arch/x86/include/asm/acpi/irqroute.asl | 2 +- arch/x86/include/asm/acpi/sleepstates.asl | 2 +- arch/x86/include/asm/acpi/statdef.asl | 2 +- arch/x86/include/asm/acpi_nhlt.h | 2 +- arch/x86/include/asm/acpi_table.h | 2 +- arch/x86/include/asm/acpigen.h | 2 +- arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/gpio.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/lpss.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl | 2 +- arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl | 2 +- .../include/asm/arch-apollolake/acpi/xhci_apl_ports.asl | 2 +- .../include/asm/arch-apollolake/acpi/xhci_glk_ports.asl | 2 +- arch/x86/include/asm/arch-apollolake/global_nvs.h | 2 +- arch/x86/include/asm/arch-apollolake/gpio.h | 2 +- arch/x86/include/asm/arch-apollolake/hostbridge.h | 2 +- arch/x86/include/asm/arch-apollolake/pm.h | 2 +- arch/x86/include/asm/arch-apollolake/pmc.h | 2 +- arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/gpio.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/irqroute.h | 2 +- arch/x86/include/asm/arch-baytrail/acpi/lpc.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/platform.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/usb.asl | 2 +- arch/x86/include/asm/arch-baytrail/acpi/xhci.asl | 2 +- arch/x86/include/asm/arch-baytrail/device.h | 2 +- arch/x86/include/asm/arch-baytrail/global_nvs.h | 2 +- arch/x86/include/asm/arch-baytrail/iomap.h | 2 +- arch/x86/include/asm/arch-baytrail/irq.h | 2 +- arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h | 2 +- arch/x86/include/asm/arch-braswell/gpio.h | 2 +- arch/x86/include/asm/arch-braswell/iomap.h | 2 +- arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h | 2 +- arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h | 2 +- arch/x86/include/asm/arch-qemu/device.h | 2 +- arch/x86/include/asm/arch-qemu/qemu.h | 2 +- arch/x86/include/asm/arch-quark/acpi/global_nvs.asl | 2 +- arch/x86/include/asm/arch-quark/acpi/irqroute.h | 2 +- arch/x86/include/asm/arch-quark/acpi/lpc.asl | 2 +- arch/x86/include/asm/arch-quark/acpi/platform.asl | 2 +- arch/x86/include/asm/arch-quark/acpi/southcluster.asl | 2 +- arch/x86/include/asm/arch-quark/device.h | 2 +- arch/x86/include/asm/arch-quark/global_nvs.h | 2 +- arch/x86/include/asm/arch-quark/iomap.h | 2 +- arch/x86/include/asm/arch-quark/irq.h | 2 +- arch/x86/include/asm/arch-quark/msg_port.h | 2 +- arch/x86/include/asm/arch-quark/quark.h | 2 +- arch/x86/include/asm/arch-queensbay/device.h | 2 +- arch/x86/include/asm/arch-queensbay/tnc.h | 2 +- arch/x86/include/asm/arch-slimbootloader/slimbootloader.h | 2 +- arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl | 2 +- arch/x86/include/asm/arch-tangier/acpi/platform.asl | 2 +- arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 2 +- arch/x86/include/asm/arch-tangier/global_nvs.h | 2 +- arch/x86/include/asm/arch-tangier/iomap.h | 2 +- arch/x86/include/asm/bootm.h | 2 +- arch/x86/include/asm/cache.h | 2 +- arch/x86/include/asm/cmos_layout.h | 2 +- arch/x86/include/asm/config.h | 2 +- arch/x86/include/asm/control_regs.h | 2 +- arch/x86/include/asm/cpu.h | 2 +- arch/x86/include/asm/cpu_x86.h | 2 +- arch/x86/include/asm/dma-mapping.h | 2 +- arch/x86/include/asm/early_cmos.h | 2 +- arch/x86/include/asm/efi.h | 2 +- arch/x86/include/asm/fast_spi.h | 2 +- arch/x86/include/asm/fsp/fsp_api.h | 2 +- arch/x86/include/asm/fsp_arch.h | 2 +- arch/x86/include/asm/global_data.h | 2 +- arch/x86/include/asm/handoff.h | 2 +- arch/x86/include/asm/i8254.h | 2 +- arch/x86/include/asm/i8259.h | 2 +- arch/x86/include/asm/ibmpc.h | 2 +- arch/x86/include/asm/intel_acpi.h | 2 +- arch/x86/include/asm/intel_opregion.h | 2 +- arch/x86/include/asm/interrupt.h | 2 +- arch/x86/include/asm/io.h | 2 +- arch/x86/include/asm/irq.h | 2 +- arch/x86/include/asm/ist.h | 2 +- arch/x86/include/asm/microcode.h | 2 +- arch/x86/include/asm/mpspec.h | 2 +- arch/x86/include/asm/mrccache.h | 2 +- arch/x86/include/asm/msr-index.h | 2 +- arch/x86/include/asm/msr.h | 2 +- arch/x86/include/asm/mtrr.h | 2 +- arch/x86/include/asm/p2sb.h | 2 +- arch/x86/include/asm/pci.h | 2 +- arch/x86/include/asm/pirq_routing.h | 2 +- arch/x86/include/asm/pmu.h | 2 +- arch/x86/include/asm/pnp_def.h | 2 +- arch/x86/include/asm/post.h | 2 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/scu.h | 2 +- arch/x86/include/asm/sections.h | 2 +- arch/x86/include/asm/sfi.h | 2 +- arch/x86/include/asm/sipi.h | 2 +- arch/x86/include/asm/spl.h | 2 +- arch/x86/include/asm/sysreset.h | 2 +- arch/x86/include/asm/tables.h | 2 +- arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/include/asm/u-boot.h | 2 +- arch/x86/include/asm/zimage.h | 2 +- arch/x86/lib/Makefile | 2 +- arch/x86/lib/acpi.c | 2 +- arch/x86/lib/acpi_nhlt.c | 2 +- arch/x86/lib/acpi_s3.c | 2 +- arch/x86/lib/acpi_table.c | 2 +- arch/x86/lib/acpigen.c | 2 +- arch/x86/lib/asm-offsets.c | 2 +- arch/x86/lib/bdinfo.c | 2 +- arch/x86/lib/bootm.c | 2 +- arch/x86/lib/cmd_boot.c | 2 +- arch/x86/lib/coreboot/Makefile | 2 +- arch/x86/lib/coreboot/cb_support.c | 2 +- arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/e820.c | 2 +- arch/x86/lib/early_cmos.c | 2 +- arch/x86/lib/fsp/Makefile | 2 +- arch/x86/lib/fsp/fsp_common.c | 2 +- arch/x86/lib/fsp/fsp_dram.c | 2 +- arch/x86/lib/fsp/fsp_graphics.c | 2 +- arch/x86/lib/fsp1/Makefile | 2 +- arch/x86/lib/fsp1/fsp_car.S | 2 +- arch/x86/lib/fsp1/fsp_common.c | 2 +- arch/x86/lib/fsp1/fsp_dram.c | 2 +- arch/x86/lib/fsp2/Makefile | 2 +- arch/x86/lib/fsp2/fsp_common.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 2 +- arch/x86/lib/i8254.c | 2 +- arch/x86/lib/i8259.c | 2 +- arch/x86/lib/init_helpers.c | 2 +- arch/x86/lib/interrupts.c | 2 +- arch/x86/lib/lpc-uclass.c | 2 +- arch/x86/lib/mpspec.c | 2 +- arch/x86/lib/northbridge-uclass.c | 2 +- arch/x86/lib/pinctrl_ich6.c | 2 +- arch/x86/lib/pirq_routing.c | 2 +- arch/x86/lib/pmu.c | 2 +- arch/x86/lib/relocate.c | 2 +- arch/x86/lib/scu.c | 2 +- arch/x86/lib/sections.c | 2 +- arch/x86/lib/sfi.c | 2 +- arch/x86/lib/string.c | 2 +- arch/x86/lib/tables.c | 2 +- arch/x86/lib/zimage.c | 2 +- arch/xtensa/Makefile | 2 +- arch/xtensa/config.mk | 2 +- arch/xtensa/cpu/Makefile | 2 +- arch/xtensa/cpu/cpu.c | 2 +- arch/xtensa/cpu/exceptions.c | 2 +- arch/xtensa/cpu/start.S | 2 +- arch/xtensa/cpu/u-boot.lds | 2 +- arch/xtensa/dts/Makefile | 2 +- arch/xtensa/include/asm/addrspace.h | 2 +- arch/xtensa/include/asm/arch-dc232b/core.h | 2 +- arch/xtensa/include/asm/arch-dc232b/tie-asm.h | 2 +- arch/xtensa/include/asm/arch-dc232b/tie.h | 2 +- arch/xtensa/include/asm/arch-dc233c/core.h | 2 +- arch/xtensa/include/asm/arch-dc233c/tie-asm.h | 2 +- arch/xtensa/include/asm/arch-dc233c/tie.h | 2 +- arch/xtensa/include/asm/arch-de212/core.h | 2 +- arch/xtensa/include/asm/arch-de212/tie-asm.h | 2 +- arch/xtensa/include/asm/arch-de212/tie.h | 2 +- arch/xtensa/include/asm/asmmacro.h | 2 +- arch/xtensa/include/asm/atomic.h | 2 +- arch/xtensa/include/asm/bitops.h | 2 +- arch/xtensa/include/asm/bootparam.h | 2 +- arch/xtensa/include/asm/byteorder.h | 2 +- arch/xtensa/include/asm/cache.h | 2 +- arch/xtensa/include/asm/cacheasm.h | 2 +- arch/xtensa/include/asm/config.h | 2 +- arch/xtensa/include/asm/global_data.h | 2 +- arch/xtensa/include/asm/io.h | 2 +- arch/xtensa/include/asm/ldscript.h | 2 +- arch/xtensa/include/asm/misc.h | 2 +- arch/xtensa/include/asm/posix_types.h | 2 +- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/include/asm/ptrace.h | 2 +- arch/xtensa/include/asm/regs.h | 2 +- arch/xtensa/include/asm/sections.h | 2 +- arch/xtensa/include/asm/system.h | 2 +- arch/xtensa/include/asm/types.h | 2 +- arch/xtensa/include/asm/u-boot.h | 2 +- arch/xtensa/lib/Makefile | 2 +- arch/xtensa/lib/bootm.c | 2 +- arch/xtensa/lib/cache.c | 2 +- arch/xtensa/lib/misc.S | 2 +- arch/xtensa/lib/relocate.c | 2 +- arch/xtensa/lib/time.c | 2 +- board/AndesTech/ae350/Makefile | 2 +- board/AndesTech/ae350/ae350.c | 2 +- board/BuR/brppt1/Makefile | 2 +- board/BuR/brppt1/board.c | 2 +- board/BuR/brppt1/config.mk | 2 +- board/BuR/brppt1/mux.c | 2 +- board/BuR/brppt2/Makefile | 2 +- board/BuR/brppt2/board.c | 2 +- board/BuR/brppt2/config.mk | 2 +- board/BuR/brsmarc1/Makefile | 2 +- board/BuR/brsmarc1/board.c | 2 +- board/BuR/brsmarc1/config.mk | 2 +- board/BuR/brsmarc1/mux.c | 2 +- board/BuR/brxre1/Makefile | 2 +- board/BuR/brxre1/board.c | 2 +- board/BuR/brxre1/mux.c | 2 +- board/BuR/common/br_resetc.c | 2 +- board/BuR/common/br_resetc.h | 2 +- board/BuR/common/bur_common.h | 2 +- board/BuR/common/common.c | 2 +- board/BuS/eb_cpu5282/Makefile | 2 +- board/BuS/eb_cpu5282/eb_cpu5282.c | 2 +- board/CZ.NIC/turris_atsha_otp.c | 2 +- board/CZ.NIC/turris_atsha_otp.h | 2 +- board/CZ.NIC/turris_mox/Makefile | 2 +- board/CZ.NIC/turris_mox/mox_sp.c | 2 +- board/CZ.NIC/turris_mox/mox_sp.h | 2 +- board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/CZ.NIC/turris_omnia/Makefile | 2 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/LaCie/common/common.c | 2 +- board/LaCie/common/common.h | 2 +- board/LaCie/common/cpld-gpio-bus.c | 2 +- board/LaCie/common/cpld-gpio-bus.h | 2 +- board/LaCie/net2big_v2/Makefile | 2 +- board/LaCie/net2big_v2/kwbimage.cfg | 2 +- board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/net2big_v2/net2big_v2.h | 2 +- board/LaCie/netspace_v2/Makefile | 2 +- board/LaCie/netspace_v2/kwbimage-is2.cfg | 2 +- board/LaCie/netspace_v2/kwbimage-ns2l.cfg | 2 +- board/LaCie/netspace_v2/kwbimage.cfg | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.h | 2 +- board/Marvell/db-88f6720/Makefile | 2 +- board/Marvell/db-88f6720/db-88f6720.c | 2 +- board/Marvell/db-88f6820-amc/Makefile | 2 +- board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- board/Marvell/db-88f6820-gp/Makefile | 2 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- board/Marvell/db-mv784mp-gp/Makefile | 2 +- board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c | 2 +- board/Marvell/db-xc3-24g4xg/Makefile | 2 +- board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c | 2 +- board/Marvell/dreamplug/Makefile | 2 +- board/Marvell/dreamplug/dreamplug.c | 2 +- board/Marvell/dreamplug/kwbimage.cfg | 2 +- board/Marvell/guruplug/Makefile | 2 +- board/Marvell/guruplug/guruplug.c | 2 +- board/Marvell/guruplug/guruplug.h | 2 +- board/Marvell/guruplug/kwbimage.cfg | 2 +- board/Marvell/mvebu_alleycat-5/Makefile | 2 +- board/Marvell/mvebu_alleycat-5/board.c | 2 +- board/Marvell/mvebu_armada-37xx/Makefile | 2 +- board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/Marvell/mvebu_armada-8k/Makefile | 2 +- board/Marvell/mvebu_armada-8k/board.c | 2 +- board/Marvell/octeon_ebb7304/Makefile | 2 +- board/Marvell/octeon_ebb7304/board.c | 2 +- board/Marvell/octeon_nic23/Makefile | 2 +- board/Marvell/octeon_nic23/board.c | 2 +- board/Marvell/octeontx2_cn913x/Makefile | 2 +- board/Marvell/octeontx2_cn913x/board.c | 2 +- board/Marvell/openrd/Makefile | 2 +- board/Marvell/openrd/kwbimage.cfg | 2 +- board/Marvell/openrd/openrd.c | 2 +- board/Marvell/openrd/openrd.h | 2 +- board/Marvell/sheevaplug/Makefile | 2 +- board/Marvell/sheevaplug/kwbimage.cfg | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 2 +- board/Seagate/dockstar/Makefile | 2 +- board/Seagate/dockstar/dockstar.c | 2 +- board/Seagate/dockstar/kwbimage.cfg | 2 +- board/Seagate/goflexhome/Makefile | 2 +- board/Seagate/goflexhome/goflexhome.c | 2 +- board/Seagate/goflexhome/kwbimage.cfg | 2 +- board/Seagate/nas220/Makefile | 2 +- board/Seagate/nas220/kwbimage.cfg | 2 +- board/Seagate/nas220/nas220.c | 2 +- board/Synology/common/Makefile | 2 +- board/Synology/common/legacy.c | 2 +- board/Synology/common/legacy.h | 2 +- board/Synology/ds109/Makefile | 2 +- board/Synology/ds109/ds109.c | 2 +- board/Synology/ds109/ds109.h | 2 +- board/Synology/ds109/kwbimage.cfg | 2 +- board/Synology/ds116/Makefile | 2 +- board/Synology/ds116/ds116.c | 2 +- board/Synology/ds414/Makefile | 2 +- board/Synology/ds414/cmd_syno.c | 2 +- board/Synology/ds414/cmd_syno.h | 2 +- board/Synology/ds414/ds414.c | 2 +- board/abilis/tb100/Makefile | 2 +- board/abilis/tb100/config.mk | 2 +- board/abilis/tb100/tb100.c | 2 +- board/advantech/imx8mp_rsb3720a1/Makefile | 2 +- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 +- board/advantech/imx8mp_rsb3720a1/imximage-8mp-lpddr4.cfg | 2 +- .../imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_4G.c | 2 +- .../imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_6G.c | 2 +- board/advantech/imx8mp_rsb3720a1/spl.c | 2 +- board/advantech/imx8qm_dmsse20_a1/Makefile | 2 +- board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c | 2 +- board/advantech/imx8qm_rom7720_a1/Makefile | 2 +- board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c | 2 +- board/advantech/imx8qm_rom7720_a1/imximage.cfg | 2 +- board/advantech/imx8qm_rom7720_a1/spl.c | 2 +- board/advantech/som-db5800-som-6867/Makefile | 2 +- board/advantech/som-db5800-som-6867/acpi/mainboard.asl | 2 +- board/advantech/som-db5800-som-6867/dsdt.asl | 2 +- board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 2 +- board/alliedtelesis/SBx81LIFKW/Makefile | 2 +- board/alliedtelesis/SBx81LIFKW/kwbimage.cfg | 2 +- board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c | 2 +- board/alliedtelesis/SBx81LIFXCAT/Makefile | 2 +- board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg | 2 +- board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c | 2 +- board/alliedtelesis/common/gpio_hog.c | 2 +- board/alliedtelesis/common/gpio_hog.h | 2 +- board/alliedtelesis/x240/Makefile | 2 +- board/alliedtelesis/x240/x240.c | 2 +- board/alliedtelesis/x530/Makefile | 2 +- board/alliedtelesis/x530/x530.c | 2 +- board/amarula/vyasa-rk3288/Makefile | 2 +- board/amarula/vyasa-rk3288/vyasa-rk3288.c | 2 +- board/amlogic/ad401/Makefile | 2 +- board/amlogic/ad401/ad401.c | 2 +- board/amlogic/beelink-s922x/Makefile | 2 +- board/amlogic/beelink-s922x/beelink-s922x.c | 2 +- board/amlogic/jethub-j100/Makefile | 2 +- board/amlogic/jethub-j100/jethub-j100.c | 2 +- board/amlogic/jethub-j80/Makefile | 2 +- board/amlogic/jethub-j80/jethub-j80.c | 2 +- board/amlogic/odroid-go-ultra/Makefile | 2 +- board/amlogic/odroid-go-ultra/odroid-go-ultra.c | 2 +- board/amlogic/odroid-n2/Makefile | 2 +- board/amlogic/odroid-n2/odroid-n2.c | 2 +- board/amlogic/p200/Makefile | 2 +- board/amlogic/p200/p200.c | 2 +- board/amlogic/p201/Makefile | 2 +- board/amlogic/p201/p201.c | 2 +- board/amlogic/p212/Makefile | 2 +- board/amlogic/p212/p212.c | 2 +- board/amlogic/q200/Makefile | 2 +- board/amlogic/q200/q200.c | 2 +- board/amlogic/s400/Makefile | 2 +- board/amlogic/s400/s400.c | 2 +- board/amlogic/sei510/Makefile | 2 +- board/amlogic/sei510/sei510.c | 2 +- board/amlogic/sei610/Makefile | 2 +- board/amlogic/sei610/sei610.c | 2 +- board/amlogic/u200/Makefile | 2 +- board/amlogic/u200/u200.c | 2 +- board/amlogic/vim3/Makefile | 2 +- board/amlogic/vim3/vim3.c | 2 +- board/amlogic/w400/Makefile | 2 +- board/amlogic/w400/w400.c | 2 +- board/anbernic/rgxx3_rk3566/Makefile | 2 +- board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 2 +- board/aristainetos/Makefile | 2 +- board/aristainetos/aristainetos.c | 2 +- board/aristainetos/aristainetos2.cfg | 2 +- board/aristainetos/axi.cfg | 2 +- board/aristainetos/clocks2.cfg | 2 +- board/aristainetos/ddr-setup2.cfg | 2 +- board/aristainetos/nt5cc256m16cp.cfg | 2 +- board/armadeus/opos6uldev/Makefile | 2 +- board/armadeus/opos6uldev/board.c | 2 +- board/armadeus/opos6uldev/opos6uldev.env | 2 +- board/armltd/corstone1000/Makefile | 2 +- board/armltd/corstone1000/corstone1000.c | 2 +- board/armltd/corstone1000/corstone1000.env | 2 +- board/armltd/integrator/Makefile | 2 +- board/armltd/integrator/arm-ebi.h | 2 +- board/armltd/integrator/integrator-sc.h | 2 +- board/armltd/integrator/integrator.c | 2 +- board/armltd/integrator/lowlevel_init.S | 2 +- board/armltd/integrator/timer.c | 2 +- board/armltd/total_compute/Makefile | 2 +- board/armltd/total_compute/total_compute.c | 2 +- board/armltd/vexpress/Makefile | 2 +- board/armltd/vexpress/vexpress_common.c | 2 +- board/armltd/vexpress64/Makefile | 2 +- board/armltd/vexpress64/pcie.c | 2 +- board/armltd/vexpress64/vexpress64.c | 2 +- board/astro/mcf5373l/Makefile | 2 +- board/astro/mcf5373l/fpga.c | 2 +- board/astro/mcf5373l/mcf5373l.c | 2 +- board/asus/grouper/Makefile | 2 +- board/asus/grouper/grouper-spl-max.c | 2 +- board/asus/grouper/grouper-spl-ti.c | 2 +- board/asus/grouper/grouper.c | 2 +- board/asus/transformer-t30/Makefile | 2 +- board/asus/transformer-t30/transformer-t30-spl.c | 2 +- board/asus/transformer-t30/transformer-t30.c | 2 +- board/atmel/at91sam9260ek/Makefile | 2 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 2 +- board/atmel/at91sam9261ek/Makefile | 2 +- board/atmel/at91sam9261ek/at91sam9261ek.c | 2 +- board/atmel/at91sam9263ek/Makefile | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 2 +- board/atmel/at91sam9m10g45ek/Makefile | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 2 +- board/atmel/at91sam9n12ek/Makefile | 2 +- board/atmel/at91sam9n12ek/at91sam9n12ek.c | 2 +- board/atmel/at91sam9rlek/Makefile | 2 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 2 +- board/atmel/at91sam9x5ek/Makefile | 2 +- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 2 +- board/atmel/common/Makefile | 2 +- board/atmel/common/board.c | 2 +- board/atmel/common/mac-spi-nor.c | 2 +- board/atmel/common/mac_eeprom.c | 2 +- board/atmel/common/video_display.c | 2 +- board/atmel/sam9x60_curiosity/Makefile | 2 +- board/atmel/sam9x60_curiosity/sam9x60_curiosity.c | 2 +- board/atmel/sam9x60ek/Makefile | 2 +- board/atmel/sam9x60ek/sam9x60ek.c | 2 +- board/atmel/sama5d27_som1_ek/Makefile | 2 +- board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 2 +- board/atmel/sama5d27_wlsom1_ek/Makefile | 2 +- board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c | 2 +- board/atmel/sama5d29_curiosity/Makefile | 2 +- board/atmel/sama5d29_curiosity/sama5d29_curiosity.c | 2 +- board/atmel/sama5d2_icp/Makefile | 2 +- board/atmel/sama5d2_icp/sama5d2_icp.c | 2 +- board/atmel/sama5d2_ptc_ek/Makefile | 2 +- board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c | 2 +- board/atmel/sama5d2_xplained/Makefile | 2 +- board/atmel/sama5d2_xplained/sama5d2_xplained.c | 2 +- board/atmel/sama5d3_xplained/Makefile | 2 +- board/atmel/sama5d3_xplained/sama5d3_xplained.c | 2 +- board/atmel/sama5d3xek/Makefile | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 2 +- board/atmel/sama5d4_xplained/Makefile | 2 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 2 +- board/atmel/sama5d4ek/Makefile | 2 +- board/atmel/sama5d4ek/sama5d4ek.c | 2 +- board/atmel/sama7g5ek/Makefile | 2 +- board/atmel/sama7g5ek/sama7g5ek.c | 2 +- board/avionic-design/common/pinmux-config-tamonten-ng.h | 2 +- board/avionic-design/common/tamonten-ng.c | 2 +- board/avionic-design/common/tamonten.c | 2 +- board/avionic-design/medcom-wide/Makefile | 2 +- board/avionic-design/plutux/Makefile | 2 +- board/avionic-design/tec-ng/Makefile | 2 +- board/avionic-design/tec/Makefile | 2 +- board/beacon/beacon-rzg2m/Makefile | 2 +- board/beacon/beacon-rzg2m/beacon-rzg2m.c | 2 +- board/beacon/imx8mm/Makefile | 2 +- board/beacon/imx8mm/imx8mm_beacon.c | 2 +- board/beacon/imx8mm/imximage-8mm-lpddr4.cfg | 2 +- board/beacon/imx8mm/lpddr4_timing.c | 2 +- board/beacon/imx8mm/spl.c | 2 +- board/beacon/imx8mn/Makefile | 2 +- board/beacon/imx8mn/imx8mn_beacon.c | 2 +- board/beacon/imx8mn/imximage-8mn-lpddr4.cfg | 2 +- board/beacon/imx8mn/lpddr4_2g_timing.c | 2 +- board/beacon/imx8mn/lpddr4_timing.c | 2 +- board/beacon/imx8mn/spl.c | 2 +- board/beacon/imx8mp/Makefile | 2 +- board/beacon/imx8mp/imx8mp_beacon.c | 2 +- board/beacon/imx8mp/imximage-8mp-lpddr4.cfg | 2 +- board/beacon/imx8mp/lpddr4_timing.c | 2 +- board/beckhoff/mx53cx9020/Makefile | 2 +- board/beckhoff/mx53cx9020/imximage.cfg | 2 +- board/beckhoff/mx53cx9020/mx53cx9020.c | 2 +- board/beckhoff/mx53cx9020/mx53cx9020_video.c | 2 +- board/bluewater/gurnard/Makefile | 2 +- board/bluewater/gurnard/gurnard.c | 2 +- board/bosch/acc/Makefile | 2 +- board/bosch/acc/acc.c | 2 +- board/bosch/guardian/Makefile | 2 +- board/bosch/guardian/board.c | 2 +- board/bosch/guardian/board.h | 2 +- board/bosch/guardian/mux.c | 2 +- board/bosch/shc/Makefile | 2 +- board/bosch/shc/board.c | 2 +- board/bosch/shc/board.h | 2 +- board/bosch/shc/mux.c | 2 +- board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 2 +- board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 2 +- board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 2 +- board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 2 +- board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 2 +- board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 2 +- board/boundary/nitrogen6x/Makefile | 2 +- board/boundary/nitrogen6x/clocks.cfg | 2 +- board/boundary/nitrogen6x/ddr-setup.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6dl.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6q.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6q2g.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6s.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6s1g.cfg | 2 +- board/boundary/nitrogen6x/nitrogen6x.c | 2 +- board/broadcom/bcmbca/Kconfig | 2 +- board/broadcom/bcmbca/Makefile | 2 +- board/broadcom/bcmbca/board.c | 2 +- board/broadcom/bcmns/ns.c | 2 +- board/broadcom/bcmns3/Makefile | 2 +- board/broadcom/bcmns3/ns3.c | 2 +- board/broadcom/bcmstb/Makefile | 2 +- board/broadcom/bcmstb/bcmstb.c | 2 +- board/bsh/imx6ulz_smm_m2/Makefile | 2 +- board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c | 2 +- board/bsh/imx6ulz_smm_m2/spl.c | 2 +- board/bsh/imx8mn_smm_s2/Makefile | 2 +- board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c | 2 +- board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c | 2 +- board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c | 2 +- board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg | 2 +- board/bsh/imx8mn_smm_s2/spl.c | 2 +- board/bticino/mamoj/Makefile | 2 +- board/bticino/mamoj/mamoj.c | 2 +- board/bticino/mamoj/spl.c | 2 +- board/buffalo/lsxl/Makefile | 2 +- board/buffalo/lsxl/kwbimage-lschl.cfg | 2 +- board/buffalo/lsxl/kwbimage-lsxhl.cfg | 2 +- board/buffalo/lsxl/lsxl.c | 2 +- board/buffalo/lsxl/lsxl.h | 2 +- board/cadence/xtfpga/Makefile | 2 +- board/cadence/xtfpga/xtfpga.c | 2 +- board/calao/usb_a9263/Makefile | 2 +- board/calao/usb_a9263/usb_a9263.c | 2 +- board/cavium/thunderx/Makefile | 2 +- board/cavium/thunderx/atf.c | 2 +- board/cavium/thunderx/thunderx.c | 2 +- board/cei/cei-tk1-som/Makefile | 2 +- board/cei/cei-tk1-som/cei-tk1-som.c | 2 +- board/cei/cei-tk1-som/pinmux-config-cei-tk1-som.h | 2 +- board/chipspark/popmetal_rk3288/Makefile | 2 +- board/chipspark/popmetal_rk3288/popmetal-rk3288.c | 2 +- board/cloos/imx8mm_phg/Makefile | 2 +- board/cloos/imx8mm_phg/imx8mm_phg.c | 2 +- board/cloos/imx8mm_phg/imximage-8mm-lpddr4.cfg | 2 +- board/cloos/imx8mm_phg/spl.c | 2 +- board/cloudengines/pogo_e02/Makefile | 2 +- board/cloudengines/pogo_e02/kwbimage.cfg | 2 +- board/cloudengines/pogo_e02/pogo_e02.c | 2 +- board/cloudengines/pogo_v4/Kconfig | 2 +- board/cloudengines/pogo_v4/Makefile | 2 +- board/cloudengines/pogo_v4/kwbimage.cfg | 2 +- board/cloudengines/pogo_v4/pogo_v4.c | 2 +- board/cobra5272/Makefile | 2 +- board/cobra5272/cobra5272.c | 2 +- board/cobra5272/flash.c | 2 +- board/compulab/cl-som-imx7/Makefile | 2 +- board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/compulab/cl-som-imx7/common.c | 2 +- board/compulab/cl-som-imx7/common.h | 2 +- board/compulab/cl-som-imx7/mux.c | 2 +- board/compulab/cl-som-imx7/spl.c | 2 +- board/compulab/cm_fx6/Makefile | 2 +- board/compulab/cm_fx6/cm_fx6.c | 2 +- board/compulab/cm_fx6/common.c | 2 +- board/compulab/cm_fx6/common.h | 2 +- board/compulab/cm_fx6/spl.c | 2 +- board/compulab/cm_t43/Makefile | 2 +- board/compulab/cm_t43/board.h | 2 +- board/compulab/cm_t43/cm_t43.c | 2 +- board/compulab/cm_t43/mux.c | 2 +- board/compulab/cm_t43/spl.c | 2 +- board/compulab/common/Makefile | 2 +- board/compulab/common/common.c | 2 +- board/compulab/common/common.h | 2 +- board/compulab/common/eeprom.c | 2 +- board/compulab/common/eeprom.h | 2 +- board/compulab/common/omap3_smc911x.c | 2 +- board/compulab/imx8mm-cl-iot-gate/Makefile | 2 +- board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c | 2 +- board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h | 2 +- .../imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c | 2 +- .../imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c | 2 +- .../imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c | 2 +- .../imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c | 2 +- board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c | 2 +- board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 2 +- board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg | 2 +- board/compulab/imx8mm-cl-iot-gate/spl.c | 2 +- board/compulab/trimslice/Makefile | 2 +- board/compulab/trimslice/trimslice.c | 2 +- board/congatec/Kconfig | 2 +- board/congatec/cgtqmx8/Makefile | 2 +- board/congatec/cgtqmx8/cgtqmx8.c | 2 +- board/congatec/cgtqmx8/imximage.cfg | 2 +- board/congatec/cgtqmx8/spl.c | 2 +- board/congatec/common/Makefile | 2 +- board/congatec/common/mmc.c | 2 +- board/congatec/conga-qeval20-qa3-e3845/Makefile | 2 +- board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl | 2 +- board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 2 +- board/congatec/conga-qeval20-qa3-e3845/dsdt.asl | 2 +- board/coreboot/Kconfig | 2 +- board/coreboot/coreboot/Makefile | 2 +- board/coreboot/coreboot/coreboot.c | 2 +- board/coreboot/coreboot/coreboot.env | 2 +- board/cortina/presidio-asic/Makefile | 2 +- board/cortina/presidio-asic/lowlevel_init.S | 2 +- board/cortina/presidio-asic/presidio.c | 2 +- board/cssi/cmpc885/Makefile | 2 +- board/cssi/cmpc885/cmpc885.c | 2 +- board/cssi/cmpc885/nand.c | 2 +- board/cssi/cmpc885/sdram.c | 2 +- board/cssi/cmpc885/u-boot.lds | 2 +- board/cssi/cmpcpro/Makefile | 2 +- board/cssi/cmpcpro/cmpcpro.c | 2 +- board/cssi/cmpcpro/nand.c | 2 +- board/cssi/common/common.c | 2 +- board/cssi/common/common.h | 2 +- board/cssi/mcr3000/Makefile | 2 +- board/cssi/mcr3000/mcr3000.c | 2 +- board/cssi/mcr3000/mcr3000.env | 2 +- board/cssi/mcr3000/nand.c | 2 +- board/cssi/mcr3000/u-boot.lds | 2 +- board/d-link/dns325/Makefile | 2 +- board/d-link/dns325/dns325.c | 2 +- board/d-link/dns325/dns325.h | 2 +- board/d-link/dns325/kwbimage.cfg | 2 +- board/data_modul/common/common.c | 2 +- board/data_modul/common/common.h | 2 +- board/data_modul/imx8mm_edm_sbc/Makefile | 2 +- .../data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c | 2 +- board/data_modul/imx8mm_edm_sbc/imximage.cfg | 2 +- board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h | 2 +- board/data_modul/imx8mm_edm_sbc/lpddr4_timing_2G_32.c | 2 +- board/data_modul/imx8mm_edm_sbc/lpddr4_timing_4G_32.c | 2 +- board/data_modul/imx8mm_edm_sbc/spl.c | 2 +- board/data_modul/imx8mp_edm_sbc/Makefile | 2 +- .../data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c | 2 +- board/data_modul/imx8mp_edm_sbc/imximage.cfg | 2 +- board/data_modul/imx8mp_edm_sbc/lpddr4_timing.h | 2 +- board/data_modul/imx8mp_edm_sbc/lpddr4_timing_4G_32.c | 2 +- board/data_modul/imx8mp_edm_sbc/spl.c | 2 +- board/davinci/da8xxevm/Makefile | 2 +- board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 2 +- board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 2 +- board/dfi/Kconfig | 2 +- board/dfi/dfi-bt700/Makefile | 2 +- board/dfi/dfi-bt700/acpi/mainboard.asl | 2 +- board/dfi/dfi-bt700/dfi-bt700.c | 2 +- board/dfi/dfi-bt700/dsdt.asl | 2 +- board/dhelectronics/common/Makefile | 2 +- board/dhelectronics/common/dh_common.c | 2 +- board/dhelectronics/common/dh_common.h | 2 +- board/dhelectronics/common/dh_imx.c | 2 +- board/dhelectronics/common/dh_imx.h | 2 +- board/dhelectronics/dh_imx6/Makefile | 2 +- board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 2 +- board/dhelectronics/dh_imx8mp/Makefile | 2 +- board/dhelectronics/dh_imx8mp/common.c | 2 +- board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c | 2 +- board/dhelectronics/dh_imx8mp/imximage-lpddr4.cfg | 2 +- board/dhelectronics/dh_imx8mp/lpddr4_timing.h | 2 +- board/dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c | 2 +- board/dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c | 2 +- board/dhelectronics/dh_imx8mp/spl.c | 2 +- board/dhelectronics/dh_stm32mp1/Makefile | 2 +- board/dhelectronics/dh_stm32mp1/board.c | 2 +- board/ea/ea-lpc3250devkitv2/Makefile | 2 +- board/ea/ea-lpc3250devkitv2/README.rst | 2 +- board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c | 2 +- board/ea/mx7ulp_com/Makefile | 2 +- board/ea/mx7ulp_com/imximage.cfg | 2 +- board/ea/mx7ulp_com/mx7ulp_com.c | 2 +- board/eets/pdu001/Kconfig | 2 +- board/eets/pdu001/Makefile | 2 +- board/eets/pdu001/README | 2 +- board/eets/pdu001/board.c | 2 +- board/eets/pdu001/board.h | 2 +- board/eets/pdu001/mux.c | 2 +- board/efi/efi-x86_app/efi-x86_app.env | 2 +- board/efi/efi-x86_payload/Makefile | 2 +- board/efi/efi-x86_payload/efi-x86_payload.env | 2 +- board/efi/efi-x86_payload/payload.c | 2 +- board/egnite/ethernut5/Makefile | 2 +- board/egnite/ethernut5/ethernut5.c | 2 +- board/egnite/ethernut5/ethernut5_pwrman.c | 2 +- board/egnite/ethernut5/ethernut5_pwrman.h | 2 +- board/elgin/elgin_rv1108/Makefile | 2 +- board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- board/embest/mx6boards/Makefile | 2 +- board/embest/mx6boards/mx6boards.c | 2 +- board/emulation/Kconfig | 2 +- board/emulation/common/Makefile | 2 +- board/emulation/common/qemu_dfu.c | 2 +- board/emulation/common/qemu_mtdparts.c | 2 +- board/emulation/qemu-arm/Makefile | 2 +- board/emulation/qemu-arm/qemu-arm.c | 2 +- board/emulation/qemu-arm/qemu-arm.env | 2 +- board/emulation/qemu-ppce500/Makefile | 2 +- board/emulation/qemu-ppce500/qemu-ppce500.c | 2 +- board/emulation/qemu-riscv/Makefile | 2 +- board/emulation/qemu-riscv/qemu-riscv.c | 2 +- board/emulation/qemu-x86/qemu-x86.env | 2 +- board/engicam/common/Makefile | 2 +- board/engicam/common/board.c | 2 +- board/engicam/common/board.h | 2 +- board/engicam/common/spl.c | 2 +- board/engicam/imx6q/Makefile | 2 +- board/engicam/imx6q/imx6q.c | 2 +- board/engicam/imx6ul/Makefile | 2 +- board/engicam/imx6ul/imx6ul.c | 2 +- board/engicam/imx8mm/Makefile | 2 +- board/engicam/imx8mm/icore_mx8mm.c | 2 +- board/engicam/imx8mm/lpddr4_timing.c | 2 +- board/engicam/imx8mm/spl.c | 2 +- board/engicam/imx8mp/Makefile | 2 +- board/engicam/imx8mp/icore_mx8mp.c | 2 +- board/engicam/imx8mp/imximage-lpddr4.cfg | 2 +- board/engicam/imx8mp/lpddr4_timing.c | 2 +- board/engicam/imx8mp/spl.c | 2 +- board/engicam/stm32mp1/Makefile | 2 +- board/engicam/stm32mp1/spl.c | 2 +- board/engicam/stm32mp1/stm32mp1.c | 2 +- board/esd/meesc/Makefile | 2 +- board/esd/meesc/meesc.c | 2 +- board/firefly/firefly-rk3288/Makefile | 2 +- board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- board/firefly/firefly-rk3308/Makefile | 2 +- board/firefly/firefly-rk3308/roc_cc_rk3308.c | 2 +- board/firefly/roc-pc-rk3399/Makefile | 2 +- board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 2 +- board/freescale/common/Makefile | 2 +- board/freescale/common/arm_sleep.c | 2 +- board/freescale/common/cadmus.c | 2 +- board/freescale/common/cadmus.h | 2 +- board/freescale/common/cds_pci_ft.c | 2 +- board/freescale/common/cds_via.c | 2 +- board/freescale/common/cmd_esbc_validate.c | 2 +- board/freescale/common/eeprom.h | 2 +- board/freescale/common/emc2305.c | 2 +- board/freescale/common/emc2305.h | 2 +- board/freescale/common/fman.c | 2 +- board/freescale/common/fman.h | 2 +- board/freescale/common/fsl_chain_of_trust.c | 2 +- board/freescale/common/fsl_validate.c | 2 +- board/freescale/common/i2c_common.c | 2 +- board/freescale/common/i2c_common.h | 2 +- board/freescale/common/i2c_mux.c | 2 +- board/freescale/common/i2c_mux.h | 2 +- board/freescale/common/ics307_clk.c | 2 +- board/freescale/common/ics307_clk.h | 2 +- board/freescale/common/ls102xa_stream_id.c | 2 +- board/freescale/common/mc34vr500.c | 2 +- board/freescale/common/mmc.c | 2 +- board/freescale/common/mpc85xx_sleep.c | 2 +- board/freescale/common/ngpixis.c | 2 +- board/freescale/common/ngpixis.h | 2 +- board/freescale/common/ns_access.c | 2 +- board/freescale/common/p_corenet/Makefile | 2 +- board/freescale/common/p_corenet/law.c | 2 +- board/freescale/common/p_corenet/tlb.c | 2 +- board/freescale/common/pfuze.c | 2 +- board/freescale/common/pfuze.h | 2 +- board/freescale/common/qixis.c | 2 +- board/freescale/common/qixis.h | 2 +- board/freescale/common/sdhc_boot.c | 2 +- board/freescale/common/sleep.h | 2 +- board/freescale/common/spl.h | 2 +- board/freescale/common/sys_eeprom.c | 2 +- board/freescale/common/vid.c | 2 +- board/freescale/common/vid.h | 2 +- board/freescale/common/vsc3316_3308.h | 2 +- board/freescale/imx8mm_evk/Makefile | 2 +- board/freescale/imx8mm_evk/imx8mm_evk.c | 2 +- board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg | 2 +- board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg | 2 +- board/freescale/imx8mm_evk/lpddr4_timing.c | 2 +- board/freescale/imx8mm_evk/spl.c | 2 +- board/freescale/imx8mn_evk/Makefile | 2 +- board/freescale/imx8mn_evk/ddr4_timing.c | 2 +- board/freescale/imx8mn_evk/ddr4_timing_ld.c | 2 +- board/freescale/imx8mn_evk/imx8mn_evk.c | 2 +- board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg | 2 +- board/freescale/imx8mn_evk/lpddr4_timing.c | 2 +- board/freescale/imx8mn_evk/lpddr4_timing_ld.c | 2 +- board/freescale/imx8mp_evk/Makefile | 2 +- board/freescale/imx8mp_evk/imx8mp_evk.c | 2 +- board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg | 2 +- board/freescale/imx8mp_evk/lpddr4_timing.c | 2 +- board/freescale/imx8mq_evk/Makefile | 2 +- board/freescale/imx8mq_evk/imx8mq_evk.c | 2 +- board/freescale/imx8mq_evk/lpddr4_timing.c | 2 +- board/freescale/imx8mq_evk/lpddr4_timing_b0.c | 2 +- board/freescale/imx8mq_evk/spl.c | 2 +- board/freescale/imx8qm_mek/Makefile | 2 +- board/freescale/imx8qm_mek/imx8qm_mek.c | 2 +- board/freescale/imx8qm_mek/imximage.cfg | 2 +- board/freescale/imx8qm_mek/uboot-container.cfg | 2 +- board/freescale/imx8qxp_mek/Makefile | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/imx8qxp_mek/imximage.cfg | 2 +- board/freescale/imx8qxp_mek/uboot-container.cfg | 2 +- board/freescale/imx8ulp_evk/Makefile | 2 +- board/freescale/imx8ulp_evk/imx8ulp_evk.c | 2 +- board/freescale/imx8ulp_evk/lpddr4_timing.c | 2 +- board/freescale/imx8ulp_evk/lpddr4_timing_266.c | 2 +- board/freescale/imx8ulp_evk/spl.c | 2 +- board/freescale/imx93_evk/Makefile | 2 +- board/freescale/imx93_evk/imx93_evk.c | 2 +- board/freescale/imx93_evk/lpddr4x_timing.c | 2 +- board/freescale/imx93_evk/lpddr4x_timing_ld.c | 2 +- board/freescale/imx93_evk/spl.c | 2 +- board/freescale/imxrt1020-evk/Makefile | 2 +- board/freescale/imxrt1020-evk/imximage.cfg | 2 +- board/freescale/imxrt1020-evk/imxrt1020-evk.c | 2 +- board/freescale/imxrt1050-evk/Makefile | 2 +- board/freescale/imxrt1050-evk/imximage.cfg | 2 +- board/freescale/imxrt1050-evk/imxrt1050-evk.c | 2 +- board/freescale/imxrt1170-evk/Makefile | 2 +- board/freescale/imxrt1170-evk/imximage.cfg | 2 +- board/freescale/imxrt1170-evk/imxrt1170-evk.c | 2 +- board/freescale/ls1012afrdm/Makefile | 2 +- board/freescale/ls1012afrdm/eth.c | 2 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 2 +- board/freescale/ls1012aqds/Makefile | 2 +- board/freescale/ls1012aqds/eth.c | 2 +- board/freescale/ls1012aqds/ls1012aqds.c | 2 +- board/freescale/ls1012aqds/ls1012aqds_pfe.h | 2 +- board/freescale/ls1012aqds/ls1012aqds_qixis.h | 2 +- board/freescale/ls1012ardb/Makefile | 2 +- board/freescale/ls1012ardb/eth.c | 2 +- board/freescale/ls1012ardb/ls1012ardb.c | 2 +- board/freescale/ls1021aiot/Makefile | 2 +- board/freescale/ls1021aiot/ls1021aiot.c | 2 +- board/freescale/ls1021aiot/psci.S | 2 +- board/freescale/ls1021aqds/Makefile | 2 +- board/freescale/ls1021aqds/ddr.c | 2 +- board/freescale/ls1021aqds/ddr.h | 2 +- board/freescale/ls1021aqds/ls1021aqds.c | 2 +- board/freescale/ls1021aqds/ls1021aqds_qixis.h | 2 +- board/freescale/ls1021aqds/psci.S | 2 +- board/freescale/ls1021atwr/Makefile | 2 +- board/freescale/ls1021atwr/ls1021atwr.c | 2 +- board/freescale/ls1021atwr/psci.S | 2 +- board/freescale/ls1028a/Makefile | 2 +- board/freescale/ls1028a/ddr.c | 2 +- board/freescale/ls1028a/ls1028a.c | 2 +- board/freescale/ls1043aqds/Makefile | 2 +- board/freescale/ls1043aqds/ddr.c | 2 +- board/freescale/ls1043aqds/ddr.h | 2 +- board/freescale/ls1043aqds/eth.c | 2 +- board/freescale/ls1043aqds/ls1043aqds.c | 2 +- board/freescale/ls1043aqds/ls1043aqds_qixis.h | 2 +- board/freescale/ls1043ardb/Makefile | 2 +- board/freescale/ls1043ardb/cpld.c | 2 +- board/freescale/ls1043ardb/cpld.h | 2 +- board/freescale/ls1043ardb/ddr.c | 2 +- board/freescale/ls1043ardb/ddr.h | 2 +- board/freescale/ls1043ardb/eth.c | 2 +- board/freescale/ls1043ardb/ls1043ardb.c | 2 +- board/freescale/ls1046afrwy/Makefile | 2 +- board/freescale/ls1046afrwy/ddr.c | 2 +- board/freescale/ls1046afrwy/eth.c | 2 +- board/freescale/ls1046afrwy/ls1046afrwy.c | 2 +- board/freescale/ls1046aqds/Makefile | 2 +- board/freescale/ls1046aqds/ddr.c | 2 +- board/freescale/ls1046aqds/ddr.h | 2 +- board/freescale/ls1046aqds/eth.c | 2 +- board/freescale/ls1046aqds/ls1046aqds.c | 2 +- board/freescale/ls1046aqds/ls1046aqds_qixis.h | 2 +- board/freescale/ls1046ardb/Makefile | 2 +- board/freescale/ls1046ardb/cpld.c | 2 +- board/freescale/ls1046ardb/cpld.h | 2 +- board/freescale/ls1046ardb/ddr.c | 2 +- board/freescale/ls1046ardb/ddr.h | 2 +- board/freescale/ls1046ardb/eth.c | 2 +- board/freescale/ls1046ardb/ls1046ardb.c | 2 +- board/freescale/ls1088a/Makefile | 2 +- board/freescale/ls1088a/ddr.c | 2 +- board/freescale/ls1088a/ddr.h | 2 +- board/freescale/ls1088a/eth_ls1088aqds.c | 2 +- board/freescale/ls1088a/eth_ls1088ardb.c | 2 +- board/freescale/ls1088a/ls1088a.c | 2 +- board/freescale/ls1088a/ls1088a_qixis.h | 2 +- board/freescale/ls2080aqds/Makefile | 2 +- board/freescale/ls2080aqds/ddr.c | 2 +- board/freescale/ls2080aqds/ddr.h | 2 +- board/freescale/ls2080aqds/eth.c | 2 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/ls2080aqds/ls2080aqds_qixis.h | 2 +- board/freescale/ls2080ardb/Makefile | 2 +- board/freescale/ls2080ardb/ddr.c | 2 +- board/freescale/ls2080ardb/ddr.h | 2 +- board/freescale/ls2080ardb/eth_ls2080rdb.c | 2 +- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/ls2080ardb/ls2080ardb_qixis.h | 2 +- board/freescale/lx2160a/Makefile | 2 +- board/freescale/lx2160a/ddr.c | 2 +- board/freescale/lx2160a/eth_lx2160aqds.c | 2 +- board/freescale/lx2160a/eth_lx2160ardb.c | 2 +- board/freescale/lx2160a/eth_lx2162aqds.c | 2 +- board/freescale/lx2160a/lx2160a.c | 2 +- board/freescale/lx2160a/lx2160a.h | 2 +- board/freescale/m5208evbe/Makefile | 2 +- board/freescale/m5208evbe/m5208evbe.c | 2 +- board/freescale/m5235evb/Makefile | 2 +- board/freescale/m5235evb/m5235evb.c | 2 +- board/freescale/m5249evb/Makefile | 2 +- board/freescale/m5249evb/m5249evb.c | 2 +- board/freescale/m5253demo/Makefile | 2 +- board/freescale/m5253demo/flash.c | 2 +- board/freescale/m5253demo/m5253demo.c | 2 +- board/freescale/m5272c3/Makefile | 2 +- board/freescale/m5272c3/m5272c3.c | 2 +- board/freescale/m5275evb/Makefile | 2 +- board/freescale/m5275evb/m5275evb.c | 2 +- board/freescale/m5282evb/Makefile | 2 +- board/freescale/m5282evb/m5282evb.c | 2 +- board/freescale/m53017evb/Makefile | 2 +- board/freescale/m53017evb/m53017evb.c | 2 +- board/freescale/m5329evb/Makefile | 2 +- board/freescale/m5329evb/m5329evb.c | 2 +- board/freescale/m5329evb/nand.c | 2 +- board/freescale/m5373evb/Makefile | 2 +- board/freescale/m5373evb/m5373evb.c | 2 +- board/freescale/m5373evb/nand.c | 2 +- board/freescale/mpc837xerdb/Makefile | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- board/freescale/mpc8548cds/Makefile | 2 +- board/freescale/mpc8548cds/law.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8548cds/tlb.c | 2 +- board/freescale/mx23evk/Makefile | 2 +- board/freescale/mx23evk/mx23evk.c | 2 +- board/freescale/mx23evk/spl_boot.c | 2 +- board/freescale/mx28evk/Makefile | 2 +- board/freescale/mx28evk/iomux.c | 2 +- board/freescale/mx28evk/mx28evk.c | 2 +- board/freescale/mx51evk/Makefile | 2 +- board/freescale/mx51evk/imximage.cfg | 2 +- board/freescale/mx51evk/mx51evk.c | 2 +- board/freescale/mx53loco/Makefile | 2 +- board/freescale/mx53loco/imximage.cfg | 2 +- board/freescale/mx53loco/mx53loco.c | 2 +- board/freescale/mx6memcal/Makefile | 2 +- board/freescale/mx6memcal/mx6memcal.c | 2 +- board/freescale/mx6memcal/spl.c | 2 +- board/freescale/mx6sabreauto/Makefile | 2 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 2 +- board/freescale/mx6sabresd/Makefile | 2 +- board/freescale/mx6sabresd/mx6sabresd.c | 2 +- board/freescale/mx6slevk/Makefile | 2 +- board/freescale/mx6slevk/imximage.cfg | 2 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sllevk/Makefile | 2 +- board/freescale/mx6sllevk/imximage.cfg | 2 +- board/freescale/mx6sllevk/mx6sllevk.c | 2 +- board/freescale/mx6sllevk/plugin.S | 2 +- board/freescale/mx6sxsabreauto/Makefile | 2 +- board/freescale/mx6sxsabreauto/imximage.cfg | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/Makefile | 2 +- board/freescale/mx6sxsabresd/imximage.cfg | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/Makefile | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +- board/freescale/mx6ullevk/Makefile | 2 +- board/freescale/mx6ullevk/imximage.cfg | 2 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/freescale/mx6ullevk/plugin.S | 2 +- board/freescale/mx7dsabresd/Makefile | 2 +- board/freescale/mx7dsabresd/imximage.cfg | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- board/freescale/mx7ulp_evk/Makefile | 2 +- board/freescale/mx7ulp_evk/imximage.cfg | 2 +- board/freescale/mx7ulp_evk/mx7ulp_evk.c | 2 +- board/freescale/mx7ulp_evk/plugin.S | 2 +- board/freescale/p1010rdb/Makefile | 2 +- board/freescale/p1010rdb/ddr.c | 2 +- board/freescale/p1010rdb/law.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1010rdb/spl.c | 2 +- board/freescale/p1010rdb/spl_minimal.c | 2 +- board/freescale/p1010rdb/tlb.c | 2 +- board/freescale/p1_p2_rdb_pc/Makefile | 2 +- board/freescale/p1_p2_rdb_pc/law.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl_minimal.c | 2 +- board/freescale/p1_p2_rdb_pc/tlb.c | 2 +- board/freescale/p2041rdb/Makefile | 2 +- board/freescale/p2041rdb/cpld.c | 2 +- board/freescale/p2041rdb/cpld.h | 2 +- board/freescale/p2041rdb/eth.c | 2 +- board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/p2041rdb/pbi.cfg | 2 +- board/freescale/t102xrdb/Makefile | 2 +- board/freescale/t102xrdb/cpld.c | 2 +- board/freescale/t102xrdb/cpld.h | 2 +- board/freescale/t102xrdb/ddr.c | 2 +- board/freescale/t102xrdb/eth_t102xrdb.c | 2 +- board/freescale/t102xrdb/law.c | 2 +- board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/freescale/t102xrdb/t102xrdb.h | 2 +- board/freescale/t102xrdb/tlb.c | 2 +- board/freescale/t104xrdb/Makefile | 2 +- board/freescale/t104xrdb/cpld.c | 2 +- board/freescale/t104xrdb/cpld.h | 2 +- board/freescale/t104xrdb/ddr.c | 2 +- board/freescale/t104xrdb/ddr.h | 2 +- board/freescale/t104xrdb/eth.c | 2 +- board/freescale/t104xrdb/law.c | 2 +- board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t104xrdb/t104xrdb.h | 2 +- board/freescale/t104xrdb/tlb.c | 2 +- board/freescale/t208xqds/Makefile | 2 +- board/freescale/t208xqds/ddr.h | 2 +- board/freescale/t208xqds/eth_t208xqds.c | 2 +- board/freescale/t208xqds/law.c | 2 +- board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xqds/t208x_pbi.cfg | 2 +- board/freescale/t208xqds/t208xqds.c | 2 +- board/freescale/t208xqds/t208xqds.h | 2 +- board/freescale/t208xqds/t208xqds_qixis.h | 2 +- board/freescale/t208xqds/tlb.c | 2 +- board/freescale/t208xrdb/Makefile | 2 +- board/freescale/t208xrdb/cpld.c | 2 +- board/freescale/t208xrdb/cpld.h | 2 +- board/freescale/t208xrdb/ddr.h | 2 +- board/freescale/t208xrdb/eth_t208xrdb.c | 2 +- board/freescale/t208xrdb/law.c | 2 +- board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t208xrdb/t2080_pbi.cfg | 2 +- board/freescale/t208xrdb/t208xrdb.c | 2 +- board/freescale/t208xrdb/t208xrdb.h | 2 +- board/freescale/t208xrdb/tlb.c | 2 +- board/freescale/t4rdb/Makefile | 2 +- board/freescale/t4rdb/cpld.c | 2 +- board/freescale/t4rdb/cpld.h | 2 +- board/freescale/t4rdb/ddr.c | 2 +- board/freescale/t4rdb/ddr.h | 2 +- board/freescale/t4rdb/eth.c | 2 +- board/freescale/t4rdb/law.c | 2 +- board/freescale/t4rdb/spl.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 2 +- board/freescale/t4rdb/t4_pbi.cfg | 2 +- board/freescale/t4rdb/t4rdb.h | 2 +- board/freescale/t4rdb/tlb.c | 2 +- board/freescale/vf610twr/Makefile | 2 +- board/freescale/vf610twr/imximage.cfg | 2 +- board/freescale/vf610twr/vf610twr.c | 2 +- board/friendlyarm/nanopi2/Makefile | 2 +- board/friendlyarm/nanopi2/board.c | 2 +- board/friendlyarm/nanopi2/hwrev.c | 2 +- board/friendlyarm/nanopi2/hwrev.h | 2 +- board/friendlyarm/nanopi2/lcds.c | 2 +- board/friendlyarm/nanopi2/nxp-fb.h | 2 +- board/friendlyarm/nanopi2/onewire.c | 2 +- board/friendlyarm/nanopi2/onewire.h | 2 +- board/gardena/smart-gateway-at91sam/Makefile | 2 +- board/gardena/smart-gateway-at91sam/board.c | 2 +- board/gardena/smart-gateway-at91sam/spl.c | 2 +- board/gardena/smart-gateway-mt7688/Makefile | 2 +- board/gardena/smart-gateway-mt7688/board.c | 2 +- board/gateworks/gw_ventana/Makefile | 2 +- board/gateworks/gw_ventana/common.c | 2 +- board/gateworks/gw_ventana/common.h | 2 +- board/gateworks/gw_ventana/eeprom.c | 2 +- board/gateworks/gw_ventana/eeprom.h | 2 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/gateworks/gw_ventana/gw_ventana.env | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 2 +- board/gateworks/venice/Makefile | 2 +- board/gateworks/venice/eeprom.c | 2 +- board/gateworks/venice/eeprom.h | 2 +- board/gateworks/venice/imximage-8mm-lpddr4.cfg | 2 +- board/gateworks/venice/imximage-8mn-lpddr4.cfg | 2 +- board/gateworks/venice/imximage-8mp-lpddr4.cfg | 2 +- board/gateworks/venice/lpddr4_timing.h | 2 +- board/gateworks/venice/lpddr4_timing_imx8mm.c | 2 +- board/gateworks/venice/lpddr4_timing_imx8mm_512mb.c | 2 +- board/gateworks/venice/lpddr4_timing_imx8mn.c | 2 +- board/gateworks/venice/lpddr4_timing_imx8mp.c | 2 +- board/gateworks/venice/spl.c | 2 +- board/gateworks/venice/venice.c | 2 +- board/gdsys/a38x/Makefile | 2 +- board/gdsys/a38x/controlcenterdc.c | 2 +- board/gdsys/a38x/dt_helpers.c | 2 +- board/gdsys/a38x/dt_helpers.h | 2 +- board/gdsys/a38x/hre.c | 2 +- board/gdsys/a38x/hre.h | 2 +- board/gdsys/a38x/keyprogram.c | 2 +- board/gdsys/a38x/keyprogram.h | 2 +- board/gdsys/common/Makefile | 2 +- board/gdsys/common/cmd_ioloop.c | 2 +- board/gdsys/common/dp501.c | 2 +- board/gdsys/common/ihs_mdio.c | 2 +- board/gdsys/common/ihs_mdio.h | 2 +- board/gdsys/common/ioep-fpga.c | 2 +- board/gdsys/common/ioep-fpga.h | 2 +- board/gdsys/common/osd.c | 2 +- board/gdsys/common/osd.h | 2 +- board/gdsys/common/osd_cmd.c | 2 +- board/gdsys/mpc8308/Makefile | 2 +- board/gdsys/mpc8308/gazerbeam.c | 2 +- board/gdsys/mpc8308/mpc8308.c | 2 +- board/gdsys/mpc8308/sdram.c | 2 +- board/ge/b1x5v2/Makefile | 2 +- board/ge/b1x5v2/b1x5v2.c | 2 +- board/ge/b1x5v2/spl.c | 2 +- board/ge/bx50v3/Makefile | 2 +- board/ge/bx50v3/bx50v3.c | 2 +- board/ge/bx50v3/bx50v3.cfg | 2 +- board/ge/common/Makefile | 2 +- board/ge/common/ge_rtc.c | 2 +- board/ge/common/ge_rtc.h | 2 +- board/ge/common/vpd_reader.c | 2 +- board/ge/common/vpd_reader.h | 2 +- board/ge/mx53ppd/Makefile | 2 +- board/ge/mx53ppd/imximage.cfg | 2 +- board/ge/mx53ppd/mx53ppd.c | 2 +- board/ge/mx53ppd/mx53ppd_video.c | 2 +- board/ge/mx53ppd/ppd_gpio.h | 2 +- board/google/Kconfig | 2 +- board/google/chromebook_coral/Makefile | 2 +- board/google/chromebook_coral/coral.c | 2 +- board/google/common/Makefile | 2 +- board/google/common/early_init.S | 2 +- board/google/gru/Makefile | 2 +- board/google/gru/gru.c | 2 +- board/google/imx8mq_phanbell/Makefile | 2 +- board/google/imx8mq_phanbell/imx8mq_phanbell.c | 2 +- board/google/imx8mq_phanbell/lpddr4_timing_1g.c | 2 +- board/google/imx8mq_phanbell/spl.c | 2 +- board/google/veyron/Makefile | 2 +- board/google/veyron/veyron.c | 2 +- board/grinn/chiliboard/Makefile | 2 +- board/grinn/chiliboard/board.c | 2 +- board/grinn/liteboard/Makefile | 2 +- board/grinn/liteboard/board.c | 2 +- board/hardkernel/odroid_go2/Makefile | 2 +- board/hardkernel/odroid_go2/go2.c | 2 +- board/highbank/Makefile | 2 +- board/highbank/ahci.c | 2 +- board/highbank/hb_sregs.c | 2 +- board/highbank/highbank.c | 2 +- board/hisilicon/hikey/Makefile | 2 +- board/hisilicon/hikey/hikey.c | 2 +- board/hisilicon/hikey960/Makefile | 2 +- board/hisilicon/hikey960/hikey960.c | 2 +- board/hisilicon/poplar/Makefile | 2 +- board/hisilicon/poplar/poplar.c | 2 +- board/hoperun/hihope-rzg2/Makefile | 2 +- board/hoperun/hihope-rzg2/hihope-rzg2.c | 2 +- board/hpe/gxp/gxp.env | 2 +- board/hpe/gxp/gxp_board.c | 2 +- board/htc/endeavoru/Makefile | 2 +- board/htc/endeavoru/endeavoru-spl.c | 2 +- board/htc/endeavoru/endeavoru.c | 2 +- board/imgtec/boston/config.mk | 2 +- board/imgtec/ci20/Makefile | 2 +- board/imgtec/ci20/ci20.c | 2 +- board/imgtec/malta/Makefile | 2 +- board/imgtec/malta/flash-malta-boot.tcl | 2 +- board/imgtec/malta/superio.c | 2 +- board/imgtec/malta/superio.h | 2 +- board/imgtec/xilfpga/Makefile | 2 +- board/imgtec/xilfpga/xilfpga.c | 2 +- board/intel/Kconfig | 2 +- board/intel/bayleybay/Makefile | 2 +- board/intel/bayleybay/acpi/mainboard.asl | 2 +- board/intel/bayleybay/bayleybay.env | 2 +- board/intel/bayleybay/dsdt.asl | 2 +- board/intel/cherryhill/Makefile | 2 +- board/intel/cherryhill/cherryhill.c | 2 +- board/intel/cherryhill/cherryhill.env | 2 +- board/intel/cougarcanyon2/Makefile | 2 +- board/intel/cougarcanyon2/cougarcanyon2.c | 2 +- board/intel/cougarcanyon2/cougarcanyon2.env | 2 +- board/intel/crownbay/Makefile | 2 +- board/intel/crownbay/crownbay.c | 2 +- board/intel/crownbay/crownbay.env | 2 +- board/intel/edison/Makefile | 2 +- board/intel/edison/config.mk | 2 +- board/intel/edison/dsdt.asl | 2 +- board/intel/edison/edison.c | 2 +- board/intel/edison/edison.env | 2 +- board/intel/galileo/Makefile | 2 +- board/intel/galileo/acpi/mainboard.asl | 2 +- board/intel/galileo/dsdt.asl | 2 +- board/intel/galileo/galileo.c | 2 +- board/intel/galileo/galileo.env | 2 +- board/intel/minnowmax/Makefile | 2 +- board/intel/minnowmax/acpi/mainboard.asl | 2 +- board/intel/minnowmax/dsdt.asl | 2 +- board/intel/minnowmax/minnowmax.c | 2 +- board/intel/minnowmax/minnowmax.env | 2 +- board/intel/slimbootloader/Kconfig | 2 +- board/intel/slimbootloader/Makefile | 2 +- board/intel/slimbootloader/slimbootloader.c | 2 +- board/intel/slimbootloader/slimbootloader.env | 2 +- board/inversepath/usbarmory/Makefile | 2 +- board/inversepath/usbarmory/imximage.cfg | 2 +- board/inversepath/usbarmory/usbarmory.c | 2 +- board/iomega/iconnect/Makefile | 2 +- board/iomega/iconnect/iconnect.c | 2 +- board/iomega/iconnect/kwbimage.cfg | 2 +- board/isee/igep003x/Makefile | 2 +- board/isee/igep003x/board.c | 2 +- board/isee/igep003x/board.h | 2 +- board/isee/igep00x0/Makefile | 2 +- board/isee/igep00x0/common.c | 2 +- board/isee/igep00x0/igep00x0.c | 2 +- board/isee/igep00x0/igep00x0.h | 2 +- board/isee/igep00x0/spl.c | 2 +- board/k+p/bootscripts/tpcboot.cmd | 2 +- board/k+p/kp_imx53/Makefile | 2 +- board/k+p/kp_imx53/kp_id_rev.c | 2 +- board/k+p/kp_imx53/kp_id_rev.h | 2 +- board/k+p/kp_imx53/kp_imx53.c | 2 +- board/k+p/kp_imx6q_tpc/Makefile | 2 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 2 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 2 +- board/keymile/Kconfig | 2 +- board/keymile/common/common.c | 2 +- board/keymile/common/common.h | 2 +- board/keymile/common/ivm.c | 2 +- board/keymile/common/qrio.c | 2 +- board/keymile/common/qrio.h | 2 +- board/keymile/km83xx/Makefile | 2 +- board/keymile/km83xx/km83xx.c | 2 +- board/keymile/kmcent2/Makefile | 2 +- board/keymile/kmcent2/ddr.c | 2 +- board/keymile/kmcent2/kmcent2.c | 2 +- board/keymile/kmcent2/law.c | 2 +- board/keymile/kmcent2/tlb.c | 2 +- board/keymile/pg-wcom-ls102xa/Makefile | 2 +- board/keymile/pg-wcom-ls102xa/ddr.c | 2 +- board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- board/keymile/secu1/Makefile | 2 +- board/keymile/secu1/socfpga.c | 2 +- board/kobol/helios4/Makefile | 2 +- board/kobol/helios4/helios4.c | 2 +- board/kontron/pitx_imx8m/Makefile | 2 +- board/kontron/pitx_imx8m/lpddr4_timing_2gb.c | 2 +- board/kontron/pitx_imx8m/lpddr4_timing_4gb.c | 2 +- board/kontron/pitx_imx8m/pitx_imx8m.c | 2 +- board/kontron/pitx_imx8m/pitx_misc.c | 2 +- board/kontron/pitx_imx8m/spl.c | 2 +- board/kontron/sl-mx6ul/Makefile | 2 +- board/kontron/sl-mx6ul/sl-mx6ul-common.c | 2 +- board/kontron/sl-mx6ul/sl-mx6ul-common.h | 2 +- board/kontron/sl-mx6ul/sl-mx6ul.c | 2 +- board/kontron/sl-mx6ul/spl.c | 2 +- board/kontron/sl-mx8mm/Makefile | 2 +- board/kontron/sl-mx8mm/imximage.cfg | 2 +- board/kontron/sl-mx8mm/lpddr4_timing.c | 2 +- board/kontron/sl-mx8mm/sl-mx8mm.c | 2 +- board/kontron/sl-mx8mm/spl.c | 2 +- board/kontron/sl28/Makefile | 2 +- board/kontron/sl28/cmds.c | 2 +- board/kontron/sl28/common.c | 2 +- board/kontron/sl28/ddr.c | 2 +- board/kontron/sl28/psci.c | 2 +- board/kontron/sl28/sl28.c | 2 +- board/kontron/sl28/sl28.h | 2 +- board/kontron/sl28/spl.c | 2 +- board/kontron/sl28/spl_atf.c | 2 +- board/kosagi/novena/Makefile | 2 +- board/kosagi/novena/novena.c | 2 +- board/kosagi/novena/novena.h | 2 +- board/kosagi/novena/novena_spl.c | 2 +- board/kosagi/novena/video.c | 2 +- board/l+g/vinco/vinco.c | 2 +- board/lego/ev3/Makefile | 2 +- board/lego/ev3/legoev3.c | 2 +- board/lg/sniper/Makefile | 2 +- board/lg/sniper/sniper.c | 2 +- board/lg/sniper/sniper.h | 2 +- board/lg/x3-t30/Makefile | 2 +- board/lg/x3-t30/x3-t30-spl.c | 2 +- board/lg/x3-t30/x3-t30.c | 2 +- board/liebherr/display5/Makefile | 2 +- board/liebherr/display5/common.h | 2 +- board/liebherr/display5/display5.c | 2 +- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/Makefile | 2 +- board/liebherr/mccmon6/mccmon6.c | 2 +- board/liebherr/mccmon6/mon6_imximage_nor.cfg | 2 +- board/liebherr/mccmon6/mon6_imximage_sd.cfg | 2 +- board/liebherr/mccmon6/spl.c | 2 +- board/liebherr/xea/Makefile | 2 +- board/liebherr/xea/spl_xea.c | 2 +- board/liebherr/xea/xea.c | 2 +- board/logicpd/am3517evm/Makefile | 2 +- board/logicpd/am3517evm/am3517evm.c | 2 +- board/logicpd/am3517evm/am3517evm.h | 2 +- board/logicpd/imx6/Makefile | 2 +- board/logicpd/imx6/imx6logic.c | 2 +- board/logicpd/omap3som/Makefile | 2 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/logicpd/omap3som/omap3logic.h | 2 +- board/maxbcm/Makefile | 2 +- board/maxbcm/maxbcm.c | 2 +- board/menlo/m53menlo/Makefile | 2 +- board/menlo/m53menlo/imximage.cfg | 2 +- board/menlo/m53menlo/m53menlo.c | 2 +- board/menlo/mx8menlo/Makefile | 2 +- board/menlo/mx8menlo/mx8menlo.c | 2 +- board/microchip/mpfs_icicle/Makefile | 2 +- board/microchip/mpfs_icicle/mpfs_icicle.c | 2 +- board/microchip/pic32mzda/Makefile | 2 +- board/microchip/pic32mzda/pic32mzda.c | 2 +- board/mikrotik/crs3xx-98dx3236/Makefile | 2 +- board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c | 2 +- board/mntre/imx8mq_reform2/Makefile | 2 +- board/mntre/imx8mq_reform2/imx8mq_reform2.c | 2 +- board/mntre/imx8mq_reform2/lpddr4_timing.c | 2 +- board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h | 2 +- board/mntre/imx8mq_reform2/spl.c | 4 ++-- board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg | 2 +- board/msc/sm2s_imx8mp/lpddr4_timing.c | 2 +- board/mscc/common/Makefile | 2 +- board/mscc/common/spi.c | 2 +- board/mscc/jr2/Kconfig | 2 +- board/mscc/jr2/Makefile | 2 +- board/mscc/jr2/jr2.c | 2 +- board/mscc/luton/Kconfig | 2 +- board/mscc/luton/Makefile | 2 +- board/mscc/luton/luton.c | 2 +- board/mscc/ocelot/Kconfig | 2 +- board/mscc/ocelot/Makefile | 2 +- board/mscc/ocelot/ocelot.c | 2 +- board/mscc/serval/Kconfig | 2 +- board/mscc/serval/Makefile | 2 +- board/mscc/serval/serval.c | 2 +- board/mscc/servalt/Kconfig | 2 +- board/mscc/servalt/Makefile | 2 +- board/mscc/servalt/servalt.c | 2 +- board/myir/mys_6ulx/Makefile | 2 +- board/myir/mys_6ulx/mys_6ulx.c | 2 +- board/myir/mys_6ulx/spl.c | 2 +- board/netgear/dgnd3700v2/Makefile | 2 +- board/netgear/dgnd3700v2/dgnd3700v2.c | 2 +- board/novtech/meerkat96/imximage.cfg | 2 +- board/novtech/meerkat96/meerkat96.c | 2 +- board/nuvoton/arbel_evb/arbel_evb.c | 2 +- board/nuvoton/poleg_evb/poleg_evb.c | 2 +- board/nvidia/cardhu/Makefile | 2 +- board/nvidia/cardhu/cardhu.c | 2 +- board/nvidia/harmony/Makefile | 2 +- board/nvidia/harmony/harmony.c | 2 +- board/nvidia/jetson-tk1/Makefile | 2 +- board/nvidia/jetson-tk1/jetson-tk1.c | 2 +- board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 2 +- board/nvidia/nyan-big/Makefile | 2 +- board/nvidia/nyan-big/README | 2 +- board/nvidia/nyan-big/nyan-big.c | 2 +- board/nvidia/nyan-big/pinmux-config-nyan-big.h | 2 +- board/nvidia/p2371-0000/Makefile | 2 +- board/nvidia/p2371-0000/p2371-0000.c | 2 +- board/nvidia/p2371-2180/Makefile | 2 +- board/nvidia/p2371-2180/p2371-2180.c | 2 +- board/nvidia/p2571/Makefile | 2 +- board/nvidia/p2571/max77620_init.h | 2 +- board/nvidia/p2571/p2571.c | 2 +- board/nvidia/p3450-0000/Makefile | 2 +- board/nvidia/p3450-0000/p3450-0000.c | 2 +- board/nvidia/seaboard/Makefile | 2 +- board/nvidia/seaboard/seaboard.c | 2 +- board/nvidia/venice2/Makefile | 2 +- board/nvidia/venice2/as3722_init.c | 2 +- board/nvidia/venice2/pinmux-config-venice2.h | 2 +- board/nvidia/venice2/venice2.c | 2 +- board/nvidia/ventana/Makefile | 2 +- board/olimex/mx23_olinuxino/Makefile | 2 +- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 2 +- board/olimex/mx23_olinuxino/spl_boot.c | 2 +- board/opalkelly/zynq/Makefile | 2 +- board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c | 2 +- board/openpiton/riscv64/Makefile | 2 +- board/openpiton/riscv64/openpiton-riscv64.c | 2 +- board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg | 2 +- board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg | 2 +- board/out4/o4-imx6ull-nano/Makefile | 2 +- board/out4/o4-imx6ull-nano/o4-imx6ull-nano.c | 2 +- board/phytec/common/Makefile | 2 +- board/phytec/pcl063/Makefile | 2 +- board/phytec/pcl063/pcl063.c | 2 +- board/phytec/pcl063/spl.c | 2 +- board/phytec/pcm052/Makefile | 2 +- board/phytec/pcm052/imximage.cfg | 2 +- board/phytec/pcm052/pcm052.c | 2 +- board/phytec/pcm058/Makefile | 2 +- board/phytec/pcm058/pcm058.c | 2 +- board/phytec/phycore_am335x_r2/Makefile | 2 +- board/phytec/phycore_am335x_r2/board.c | 2 +- board/phytec/phycore_am335x_r2/board.h | 2 +- board/phytec/phycore_am335x_r2/mux.c | 2 +- board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg | 2 +- board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg | 2 +- board/phytec/phycore_rk3288/Makefile | 2 +- board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- board/phytec/phycore_rk3288/som.h | 2 +- board/phytium/durian/Makefile | 2 +- board/phytium/durian/cpu.h | 2 +- board/phytium/durian/durian.c | 2 +- board/phytium/pomelo/Makefile | 2 +- board/phytium/pomelo/cpu.h | 2 +- board/phytium/pomelo/ddr.c | 2 +- board/phytium/pomelo/pcie.c | 2 +- board/phytium/pomelo/pll.c | 2 +- board/phytium/pomelo/pomelo.c | 2 +- board/phytium/pomelo/sec.c | 2 +- board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c | 2 +- board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c | 2 +- board/pine64/rockpro64_rk3399/Makefile | 2 +- board/pine64/rockpro64_rk3399/rockpro64-rk3399.c | 2 +- board/purism/librem5/Makefile | 2 +- board/purism/librem5/imximage-8mq-lpddr4.cfg | 2 +- board/purism/librem5/librem5.c | 2 +- board/purism/librem5/librem5.h | 2 +- board/purism/librem5/lpddr4_timing.c | 2 +- board/purism/librem5/lpddr4_timing_b0.c | 2 +- board/purism/librem5/spl.c | 2 +- board/qca/ap121/Makefile | 2 +- board/qca/ap121/ap121.c | 2 +- board/qca/ap143/Makefile | 2 +- board/qca/ap143/ap143.c | 2 +- board/qca/ap152/Makefile | 2 +- board/qca/ap152/ap152.c | 2 +- board/qualcomm/dragonboard410c/Makefile | 2 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 2 +- board/qualcomm/dragonboard410c/dragonboard410c.env | 2 +- board/qualcomm/dragonboard820c/Makefile | 2 +- board/qualcomm/dragonboard820c/dragonboard820c.c | 2 +- board/qualcomm/dragonboard820c/head.S | 2 +- board/qualcomm/dragonboard820c/readme.txt | 2 +- board/qualcomm/dragonboard820c/u-boot.lds | 2 +- board/qualcomm/qcs404-evb/Makefile | 2 +- board/qualcomm/qcs404-evb/qcs404-evb.c | 2 +- board/radxa/rock5a-rk3588s/Makefile | 2 +- board/radxa/rock5a-rk3588s/rock5a-rk3588s.c | 2 +- board/radxa/rock5b-rk3588/Makefile | 2 +- board/radxa/rock5b-rk3588/rock5b-rk3588.c | 2 +- board/raidsonic/ib62x0/Makefile | 2 +- board/raidsonic/ib62x0/ib62x0.c | 2 +- board/raidsonic/ib62x0/ib62x0.h | 2 +- board/raidsonic/ib62x0/kwbimage.cfg | 2 +- board/raspberrypi/rpi/lowlevel_init.S | 2 +- board/raspberrypi/rpi/rpi.env | 2 +- board/renesas/condor/Makefile | 2 +- board/renesas/draak/Makefile | 2 +- board/renesas/draak/draak.c | 2 +- board/renesas/eagle/Makefile | 2 +- board/renesas/ebisu/Makefile | 2 +- board/renesas/falcon/Makefile | 2 +- board/renesas/falcon/falcon.c | 2 +- board/renesas/grpeach/Makefile | 2 +- board/renesas/grpeach/grpeach.c | 2 +- board/renesas/grpeach/lowlevel_init.S | 2 +- board/renesas/r2dplus/Makefile | 2 +- board/renesas/r2dplus/r2dplus.c | 2 +- board/renesas/rcar-common/v3-common.c | 2 +- board/renesas/rzg2l/Kconfig | 2 +- board/renesas/rzg2l/Makefile | 2 +- board/renesas/rzg2l/rzg2l.c | 2 +- board/renesas/salvator-x/Makefile | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/spider/Makefile | 2 +- board/renesas/spider/spider.c | 2 +- board/renesas/ulcb/Makefile | 2 +- board/renesas/ulcb/cpld.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- board/renesas/v3hsk/Makefile | 2 +- board/renesas/v3hsk/cpld.c | 2 +- board/renesas/v3msk/Makefile | 2 +- board/renesas/v3msk/cpld.c | 2 +- board/renesas/whitehawk/Makefile | 2 +- board/renesas/whitehawk/whitehawk.c | 2 +- board/rockchip/evb_rk3036/Makefile | 2 +- board/rockchip/evb_rk3036/evb_rk3036.c | 2 +- board/rockchip/evb_rk3308/Makefile | 2 +- board/rockchip/evb_rk3308/evb_rk3308.c | 2 +- board/rockchip/evb_rk3399/Makefile | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/rockchip/evb_rk3588/Makefile | 2 +- board/rockchip/evb_rk3588/evb-rk3588.c | 2 +- board/rockchip/evb_rv1108/Makefile | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 2 +- board/rockchip/kylin_rk3036/Makefile | 2 +- board/rockchip/kylin_rk3036/kylin_rk3036.c | 2 +- board/rockchip/tinker_rk3288/Makefile | 2 +- board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 +- board/ronetix/imx7-cm/Makefile | 2 +- board/ronetix/imx7-cm/imx7-cm.c | 2 +- board/ronetix/imx7-cm/spl.c | 2 +- board/ronetix/imx8mq-cm/Makefile | 2 +- board/ronetix/imx8mq-cm/imx8mq_cm.c | 2 +- board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg | 2 +- board/ronetix/imx8mq-cm/lpddr4_timing.c | 2 +- board/ronetix/imx8mq-cm/spl.c | 2 +- board/ronetix/pm9261/Makefile | 2 +- board/ronetix/pm9261/pm9261.c | 2 +- board/ronetix/pm9263/Makefile | 2 +- board/ronetix/pm9263/pm9263.c | 2 +- board/ronetix/pm9g45/Makefile | 2 +- board/ronetix/pm9g45/pm9g45.c | 2 +- board/samsung/arndale/Makefile | 2 +- board/samsung/arndale/arndale.c | 2 +- board/samsung/arndale/arndale_spl.c | 2 +- board/samsung/common/Makefile | 2 +- board/samsung/common/board.c | 2 +- board/samsung/common/exynos-uboot-spl.lds | 2 +- board/samsung/common/exynos5-dt-types.c | 2 +- board/samsung/common/exynos5-dt.c | 2 +- board/samsung/common/gadget.c | 2 +- board/samsung/common/misc.c | 2 +- board/samsung/common/sromc.c | 2 +- board/samsung/goni/Makefile | 2 +- board/samsung/goni/goni.c | 2 +- board/samsung/goni/lowlevel_init.S | 2 +- board/samsung/goni/onenand.c | 2 +- board/samsung/odroid/Makefile | 2 +- board/samsung/odroid/odroid.c | 2 +- board/samsung/odroid/setup.h | 2 +- board/samsung/origen/Makefile | 2 +- board/samsung/origen/origen.c | 2 +- board/samsung/origen/tools/mkorigenspl.c | 2 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250_spl.c | 2 +- board/samsung/smdk5420/Makefile | 2 +- board/samsung/smdk5420/smdk5420_spl.c | 2 +- board/samsung/smdkc100/Makefile | 2 +- board/samsung/smdkc100/lowlevel_init.S | 2 +- board/samsung/smdkc100/onenand.c | 2 +- board/samsung/smdkc100/smdkc100.c | 2 +- board/samsung/smdkv310/Makefile | 2 +- board/samsung/smdkv310/smdkv310.c | 2 +- board/samsung/smdkv310/tools/mksmdkv310spl.c | 2 +- board/samsung/trats/Makefile | 2 +- board/samsung/trats/setup.h | 2 +- board/samsung/trats/trats.c | 2 +- board/samsung/trats2/Makefile | 2 +- board/samsung/trats2/trats2.c | 2 +- board/samsung/universal_c210/Makefile | 2 +- board/samsung/universal_c210/onenand.c | 2 +- board/samsung/universal_c210/universal.c | 2 +- board/sandbox/Makefile | 2 +- board/sandbox/sandbox.c | 2 +- board/schneider/rzn1-snarc/Makefile | 2 +- board/schneider/rzn1-snarc/rzn1.c | 2 +- board/schneider/rzn1-snarc/spkgimage.cfg | 2 +- board/seeed/linkit-smart-7688/Makefile | 2 +- board/seeed/linkit-smart-7688/board.c | 2 +- board/seeed/npi_imx6ull/Makefile | 2 +- board/seeed/npi_imx6ull/npi_imx6ull.c | 2 +- board/seeed/npi_imx6ull/spl.c | 2 +- board/siemens/capricorn/Makefile | 2 +- board/siemens/capricorn/board.c | 2 +- board/siemens/capricorn/imximage.cfg | 2 +- board/siemens/capricorn/spl.c | 2 +- board/siemens/capricorn/uboot-container.cfg | 2 +- board/siemens/common/board.c | 2 +- board/siemens/common/factoryset.c | 2 +- board/siemens/common/factoryset.h | 2 +- board/siemens/corvus/Makefile | 2 +- board/siemens/corvus/board.c | 2 +- board/siemens/draco/Makefile | 2 +- board/siemens/draco/board.c | 2 +- board/siemens/draco/board.h | 2 +- board/siemens/draco/mux.c | 2 +- board/siemens/iot2050/Kconfig | 2 +- board/siemens/iot2050/Makefile | 2 +- board/siemens/iot2050/board.c | 2 +- board/siemens/iot2050/config.mk | 2 +- board/siemens/iot2050/iot2050.env | 2 +- board/siemens/pxm2/Makefile | 2 +- board/siemens/pxm2/board.c | 2 +- board/siemens/pxm2/board.h | 2 +- board/siemens/pxm2/mux.c | 2 +- board/siemens/pxm2/pmic.h | 2 +- board/siemens/rut/Makefile | 2 +- board/siemens/rut/board.c | 2 +- board/siemens/rut/board.h | 2 +- board/siemens/rut/mux.c | 2 +- board/siemens/smartweb/Makefile | 2 +- board/siemens/smartweb/smartweb.c | 2 +- board/siemens/taurus/Makefile | 2 +- board/siemens/taurus/taurus.c | 2 +- board/sifive/unleashed/Makefile | 2 +- board/sifive/unleashed/spl.c | 2 +- board/sifive/unleashed/unleashed.c | 2 +- board/sifive/unmatched/Makefile | 2 +- board/sifive/unmatched/hifive-platform-i2c-eeprom.c | 2 +- board/sifive/unmatched/spl.c | 2 +- board/sifive/unmatched/unmatched.c | 2 +- board/silinux/ek874/Makefile | 2 +- board/silinux/ek874/ek874.c | 2 +- board/sipeed/maix/Kconfig | 2 +- board/sipeed/maix/Makefile | 2 +- board/sipeed/maix/maix.c | 2 +- board/skyworth/hc2910-2aghd05/hc2910-2aghd05.c | 2 +- board/socionext/developerbox/Makefile | 2 +- board/socrates/Makefile | 2 +- board/socrates/law.c | 2 +- board/socrates/nand.c | 2 +- board/socrates/sdram.c | 2 +- board/socrates/socrates.c | 2 +- board/socrates/tlb.c | 2 +- board/socrates/upm_table.h | 2 +- board/softing/vining_2000/Makefile | 2 +- board/softing/vining_2000/imximage.cfg | 2 +- board/softing/vining_2000/vining_2000.c | 2 +- board/softing/vining_fpga/Makefile | 2 +- board/softing/vining_fpga/socfpga.c | 2 +- board/solidrun/clearfog/Makefile | 2 +- board/solidrun/clearfog/clearfog.c | 2 +- board/solidrun/common/Makefile | 2 +- board/solidrun/common/tlv_data.c | 2 +- board/solidrun/common/tlv_data.h | 2 +- board/solidrun/mx6cuboxi/Makefile | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- board/somlabs/visionsom-6ull/Makefile | 2 +- board/somlabs/visionsom-6ull/imximage.cfg | 2 +- board/somlabs/visionsom-6ull/visionsom-6ull.c | 2 +- board/sr1500/Makefile | 2 +- board/sr1500/socfpga.c | 2 +- board/st/common/Makefile | 2 +- board/st/common/cmd_stboard.c | 2 +- board/st/common/stm32mp_dfu.c | 2 +- board/st/common/stpmic1.c | 2 +- board/st/common/stpmic1.h | 2 +- board/st/common/stusb160x.c | 2 +- board/st/stih410-b2260/Makefile | 2 +- board/st/stih410-b2260/board.c | 2 +- board/st/stm32f429-discovery/Makefile | 2 +- board/st/stm32f429-discovery/led.c | 2 +- board/st/stm32f429-discovery/stm32f429-discovery.c | 2 +- board/st/stm32f429-evaluation/Makefile | 2 +- board/st/stm32f429-evaluation/stm32f429-evaluation.c | 2 +- board/st/stm32f469-discovery/Makefile | 2 +- board/st/stm32f469-discovery/stm32f469-discovery.c | 2 +- board/st/stm32f746-disco/Makefile | 2 +- board/st/stm32f746-disco/stm32f746-disco.c | 2 +- board/st/stm32h743-disco/Makefile | 2 +- board/st/stm32h743-disco/stm32h743-disco.c | 2 +- board/st/stm32h743-eval/Makefile | 2 +- board/st/stm32h743-eval/stm32h743-eval.c | 2 +- board/st/stm32h750-art-pi/Makefile | 2 +- board/st/stm32h750-art-pi/stm32h750-art-pi.c | 2 +- board/st/stm32mp1/Makefile | 2 +- board/st/stm32mp1/spl.c | 2 +- board/st/stm32mp1/stm32mp1.c | 2 +- board/st/stv0991/Makefile | 2 +- board/st/stv0991/stv0991.c | 2 +- board/starfive/visionfive2/Makefile | 2 +- board/starfive/visionfive2/spl.c | 2 +- board/starfive/visionfive2/starfive_visionfive2.c | 2 +- board/starfive/visionfive2/visionfive2-i2c-eeprom.c | 2 +- board/storopack/smegw01/Makefile | 2 +- board/storopack/smegw01/smegw01.c | 2 +- board/storopack/smegw01/smegw01.env | 2 +- board/sunxi/Makefile | 2 +- board/sunxi/board.c | 2 +- board/sunxi/chip.c | 2 +- board/synopsys/axs10x/Makefile | 2 +- board/synopsys/axs10x/axs10x.c | 2 +- board/synopsys/axs10x/axs10x.h | 2 +- board/synopsys/axs10x/config.mk | 2 +- board/synopsys/emsdp/Makefile | 2 +- board/synopsys/emsdp/emsdp.c | 2 +- board/synopsys/hsdk/Makefile | 2 +- board/synopsys/hsdk/clk-lib.c | 2 +- board/synopsys/hsdk/clk-lib.h | 2 +- board/synopsys/hsdk/config.mk | 2 +- board/synopsys/hsdk/env-lib.c | 2 +- board/synopsys/hsdk/env-lib.h | 2 +- board/synopsys/hsdk/headerize-hsdk.py | 2 +- board/synopsys/hsdk/hsdk.c | 2 +- board/synopsys/iot_devkit/Makefile | 2 +- board/synopsys/iot_devkit/iot_devkit.c | 2 +- board/synopsys/iot_devkit/u-boot.lds | 2 +- board/synopsys/nsim/Makefile | 2 +- board/synopsys/nsim/config.mk | 2 +- board/synopsys/nsim/nsim.c | 2 +- board/sysam/amcore/Makefile | 2 +- board/sysam/amcore/amcore.c | 2 +- board/sysam/stmark2/Makefile | 2 +- board/sysam/stmark2/sbf_dram_init.S | 2 +- board/sysam/stmark2/stmark2.c | 2 +- board/tbs/tbs2910/Makefile | 2 +- board/tbs/tbs2910/tbs2910.c | 2 +- board/tbs/tbs2910/tbs2910.cfg | 2 +- board/tcl/sl50/Makefile | 2 +- board/tcl/sl50/board.c | 2 +- board/tcl/sl50/board.h | 2 +- board/tcl/sl50/mux.c | 2 +- board/technexion/pico-imx6/Makefile | 2 +- board/technexion/pico-imx6/pico-imx6.c | 2 +- board/technexion/pico-imx6/spl.c | 2 +- board/technexion/pico-imx6ul/Makefile | 2 +- board/technexion/pico-imx6ul/imximage.cfg | 2 +- board/technexion/pico-imx6ul/pico-imx6ul.c | 2 +- board/technexion/pico-imx6ul/spl.c | 2 +- board/technexion/pico-imx7d/Makefile | 2 +- board/technexion/pico-imx7d/pico-imx7d.c | 2 +- board/technexion/pico-imx7d/spl.c | 2 +- board/technexion/pico-imx8mq/Makefile | 2 +- board/technexion/pico-imx8mq/lpddr4_timing.h | 2 +- board/technexion/pico-imx8mq/lpddr4_timing_1gb.c | 2 +- board/technexion/pico-imx8mq/lpddr4_timing_2gb.c | 2 +- board/technexion/pico-imx8mq/lpddr4_timing_3gb.c | 2 +- board/technexion/pico-imx8mq/lpddr4_timing_4gb.c | 2 +- board/technexion/pico-imx8mq/pico-imx8mq.c | 2 +- board/technexion/pico-imx8mq/spl.c | 2 +- board/terasic/de1-soc/Makefile | 2 +- board/terasic/de1-soc/socfpga.c | 2 +- board/thead/th1520_lpi4a/Makefile | 2 +- board/thead/th1520_lpi4a/board.c | 2 +- board/theadorable/Makefile | 2 +- board/theadorable/fpga.c | 2 +- board/theadorable/theadorable.c | 2 +- board/theadorable/theadorable.h | 2 +- board/thecus/n2350/Makefile | 2 +- board/thecus/n2350/n2350.c | 2 +- board/theobroma-systems/puma_rk3399/Makefile | 2 +- board/theobroma-systems/puma_rk3399/puma-rk3399.c | 2 +- board/theobroma-systems/ringneck_px30/Makefile | 2 +- board/theobroma-systems/ringneck_px30/ringneck-px30.c | 2 +- board/ti/am335x/Makefile | 2 +- board/ti/am335x/board.c | 2 +- board/ti/am335x/board.h | 2 +- board/ti/am43xx/Makefile | 2 +- board/ti/am43xx/board.c | 2 +- board/ti/am43xx/board.h | 2 +- board/ti/am43xx/mux.c | 2 +- board/ti/am57xx/Makefile | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/am57xx/mux_data.h | 2 +- board/ti/am62ax/Kconfig | 2 +- board/ti/am62ax/Makefile | 2 +- board/ti/am62ax/board-cfg.yaml | 2 +- board/ti/am62ax/evm.c | 2 +- board/ti/am62ax/pm-cfg.yaml | 2 +- board/ti/am62ax/rm-cfg.yaml | 2 +- board/ti/am62ax/sec-cfg.yaml | 2 +- board/ti/am62ax/tifs-rm-cfg.yaml | 2 +- board/ti/am62x/Kconfig | 2 +- board/ti/am62x/Makefile | 2 +- board/ti/am62x/board-cfg.yaml | 2 +- board/ti/am62x/evm.c | 2 +- board/ti/am62x/pm-cfg.yaml | 2 +- board/ti/am62x/rm-cfg.yaml | 2 +- board/ti/am62x/sec-cfg.yaml | 2 +- board/ti/am64x/Kconfig | 2 +- board/ti/am64x/Makefile | 2 +- board/ti/am64x/board-cfg.yaml | 2 +- board/ti/am64x/evm.c | 2 +- board/ti/am64x/pm-cfg.yaml | 2 +- board/ti/am64x/rm-cfg.yaml | 2 +- board/ti/am64x/sec-cfg.yaml | 2 +- board/ti/am65x/Kconfig | 2 +- board/ti/am65x/Makefile | 2 +- board/ti/am65x/board-cfg.yaml | 2 +- board/ti/am65x/evm.c | 2 +- board/ti/am65x/pm-cfg.yaml | 2 +- board/ti/am65x/rm-cfg.yaml | 2 +- board/ti/am65x/sec-cfg.yaml | 2 +- board/ti/beagle/Makefile | 2 +- board/ti/beagle/beagle.c | 2 +- board/ti/beagle/beagle.h | 2 +- board/ti/beagle/led.c | 2 +- board/ti/common/Makefile | 2 +- board/ti/common/board_detect.c | 2 +- board/ti/common/board_detect.h | 2 +- board/ti/common/cape_detect.c | 2 +- board/ti/common/cape_detect.h | 2 +- board/ti/common/schema.yaml | 2 +- board/ti/dra7xx/Makefile | 2 +- board/ti/dra7xx/evm.c | 2 +- board/ti/dra7xx/mux_data.h | 2 +- board/ti/j721e/Kconfig | 2 +- board/ti/j721e/Makefile | 2 +- board/ti/j721e/board-cfg.yaml | 2 +- board/ti/j721e/board-cfg_j7200.yaml | 2 +- board/ti/j721e/evm.c | 2 +- board/ti/j721e/pm-cfg.yaml | 2 +- board/ti/j721e/pm-cfg_j7200.yaml | 2 +- board/ti/j721e/rm-cfg.yaml | 2 +- board/ti/j721e/rm-cfg_j7200.yaml | 2 +- board/ti/j721e/sec-cfg.yaml | 2 +- board/ti/j721e/sec-cfg_j7200.yaml | 2 +- board/ti/j721s2/Kconfig | 2 +- board/ti/j721s2/Makefile | 2 +- board/ti/j721s2/board-cfg.yaml | 2 +- board/ti/j721s2/evm.c | 2 +- board/ti/j721s2/pm-cfg.yaml | 2 +- board/ti/j721s2/rm-cfg.yaml | 2 +- board/ti/j721s2/sec-cfg.yaml | 2 +- board/ti/ks2_evm/Makefile | 2 +- board/ti/ks2_evm/board.c | 2 +- board/ti/ks2_evm/board.h | 2 +- board/ti/ks2_evm/board_k2e.c | 2 +- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/ks2_evm/board_k2hk.c | 2 +- board/ti/ks2_evm/board_k2l.c | 2 +- board/ti/ks2_evm/ddr3_cfg.c | 2 +- board/ti/ks2_evm/ddr3_cfg.h | 2 +- board/ti/ks2_evm/ddr3_k2e.c | 2 +- board/ti/ks2_evm/ddr3_k2g.c | 2 +- board/ti/ks2_evm/ddr3_k2hk.c | 2 +- board/ti/ks2_evm/ddr3_k2l.c | 2 +- board/ti/ks2_evm/mux-k2g.h | 2 +- board/ti/omap3evm/Makefile | 2 +- board/ti/omap3evm/evm.c | 2 +- board/ti/omap3evm/evm.h | 2 +- board/ti/panda/Makefile | 2 +- board/ti/panda/panda.c | 2 +- board/ti/panda/panda_mux_data.h | 2 +- board/ti/sdp4430/Makefile | 2 +- board/ti/sdp4430/cmd_bat.c | 2 +- board/ti/sdp4430/sdp.c | 2 +- board/ti/sdp4430/sdp4430_mux_data.h | 2 +- board/timll/devkit3250/Makefile | 2 +- board/timll/devkit3250/devkit3250.c | 2 +- board/timll/devkit3250/devkit3250_spl.c | 2 +- board/timll/devkit8000/Makefile | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- board/timll/devkit8000/devkit8000.h | 2 +- board/topic/zynq/Makefile | 2 +- board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c | 2 +- board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 2 +- board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 2 +- board/toradex/apalis-imx8/Makefile | 2 +- board/toradex/apalis-imx8/apalis-imx8-imximage.cfg | 2 +- board/toradex/apalis-imx8/apalis-imx8.c | 2 +- board/toradex/apalis-tk1/Makefile | 2 +- board/toradex/apalis-tk1/apalis-tk1.c | 2 +- board/toradex/apalis-tk1/as3722_init.c | 2 +- board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h | 2 +- board/toradex/apalis_imx6/Makefile | 2 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- board/toradex/apalis_imx6/do_fuse.c | 2 +- board/toradex/apalis_imx6/pf0100.c | 2 +- board/toradex/apalis_imx6/pf0100.h | 2 +- board/toradex/apalis_imx6/pf0100_otp.inc | 2 +- board/toradex/apalis_t30/Makefile | 2 +- board/toradex/apalis_t30/apalis_t30.c | 2 +- board/toradex/colibri-imx6ull/Makefile | 2 +- board/toradex/colibri-imx6ull/colibri-imx6ull.c | 2 +- board/toradex/colibri-imx6ull/imximage.cfg | 2 +- board/toradex/colibri-imx8x/Makefile | 2 +- board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg | 2 +- board/toradex/colibri-imx8x/colibri-imx8x.c | 2 +- board/toradex/colibri_imx6/Makefile | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_imx6/do_fuse.c | 2 +- board/toradex/colibri_imx6/pf0100.c | 2 +- board/toradex/colibri_imx6/pf0100.h | 2 +- board/toradex/colibri_imx6/pf0100_otp.inc | 2 +- board/toradex/colibri_imx7/Makefile | 2 +- board/toradex/colibri_imx7/colibri_imx7.c | 2 +- board/toradex/colibri_imx7/imximage.cfg | 2 +- board/toradex/colibri_t20/Makefile | 2 +- board/toradex/colibri_t20/colibri_t20.c | 2 +- board/toradex/colibri_t30/Makefile | 2 +- board/toradex/colibri_t30/colibri_t30.c | 2 +- board/toradex/colibri_vf/Makefile | 2 +- board/toradex/colibri_vf/colibri_vf.c | 2 +- board/toradex/colibri_vf/imximage.cfg | 2 +- board/toradex/common/Kconfig | 2 +- board/toradex/common/Makefile | 2 +- board/toradex/common/tdx-cfg-block.c | 2 +- board/toradex/common/tdx-cfg-block.h | 2 +- board/toradex/common/tdx-common.c | 2 +- board/toradex/common/tdx-common.h | 2 +- board/toradex/common/tdx-eeprom.c | 2 +- board/toradex/common/tdx-eeprom.h | 2 +- board/toradex/verdin-am62/board-cfg.yaml | 2 +- board/toradex/verdin-am62/pm-cfg.yaml | 2 +- board/toradex/verdin-am62/rm-cfg.yaml | 2 +- board/toradex/verdin-am62/sec-cfg.yaml | 2 +- board/toradex/verdin-imx8mm/Makefile | 2 +- board/toradex/verdin-imx8mm/imximage.cfg | 2 +- board/toradex/verdin-imx8mm/lpddr4_timing.c | 2 +- board/toradex/verdin-imx8mm/spl.c | 2 +- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 2 +- board/tplink/wdr4300/Makefile | 2 +- board/tplink/wdr4300/wdr4300.c | 2 +- board/tq/tqma6/Makefile | 2 +- board/tq/tqma6/clocks.cfg | 2 +- board/tq/tqma6/tqma6.c | 2 +- board/tq/tqma6/tqma6_bb.h | 2 +- board/tq/tqma6/tqma6_mba6.c | 2 +- board/tq/tqma6/tqma6_wru4.c | 2 +- board/tq/tqma6/tqma6dl.cfg | 2 +- board/tq/tqma6/tqma6q.cfg | 2 +- board/tq/tqma6/tqma6s.cfg | 2 +- board/traverse/common/ten64-controller.h | 2 +- board/traverse/common/ten64_controller.c | 2 +- board/traverse/ten64/Makefile | 2 +- board/traverse/ten64/eth_ten64.c | 2 +- board/traverse/ten64/ten64.c | 2 +- board/udoo/Makefile | 2 +- board/udoo/neo/Makefile | 2 +- board/udoo/neo/neo.c | 2 +- board/udoo/udoo.c | 2 +- board/udoo/udoo_spl.c | 2 +- board/vamrs/rock960_rk3399/Makefile | 2 +- board/vamrs/rock960_rk3399/rock960-rk3399.c | 2 +- board/variscite/dart_6ul/Makefile | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- board/variscite/dart_6ul/spl.c | 2 +- board/variscite/imx8mn_var_som/Makefile | 2 +- board/variscite/imx8mn_var_som/ddr4_timing.c | 2 +- board/variscite/imx8mn_var_som/imx8mn_var_som.c | 2 +- board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg | 2 +- board/variscite/imx8mn_var_som/spl.c | 2 +- board/vscom/baltos/Makefile | 2 +- board/vscom/baltos/board.c | 2 +- board/vscom/baltos/board.h | 2 +- board/wandboard/Makefile | 2 +- board/wandboard/spl.c | 2 +- board/wandboard/wandboard.c | 2 +- board/warp7/Makefile | 2 +- board/warp7/warp7.c | 2 +- board/work-microwave/work_92105/Makefile | 2 +- board/work-microwave/work_92105/work_92105.c | 2 +- board/work-microwave/work_92105/work_92105_display.c | 2 +- board/work-microwave/work_92105/work_92105_display.h | 2 +- board/work-microwave/work_92105/work_92105_spl.c | 2 +- board/xen/xenguest_arm64/Makefile | 2 +- board/xilinx/common/board.c | 2 +- board/xilinx/common/cpu-info.c | 2 +- board/xilinx/common/fru.h | 2 +- board/xilinx/microblaze-generic/Makefile | 2 +- board/xilinx/microblaze-generic/config.mk | 2 +- board/xilinx/microblaze-generic/microblaze-generic.c | 2 +- board/xilinx/versal/Makefile | 2 +- board/xilinx/versal/board.c | 2 +- board/xilinx/zynq/Makefile | 2 +- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynq/bootimg.c | 2 +- board/xilinx/zynq/cmds.c | 2 +- board/xilinx/zynq/xil_io.h | 2 +- board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zed/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zturn-v5/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c | 2 +- board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c | 2 +- board/xilinx/zynqmp/Makefile | 2 +- board/xilinx/zynqmp/pm_cfg_obj.S | 2 +- board/xilinx/zynqmp/pm_cfg_obj.h | 2 +- board/xilinx/zynqmp/xil_io.h | 2 +- board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c | 2 +- .../zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu106-rev1.0/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- board/zyxel/nsa310s/Kconfig | 2 +- board/zyxel/nsa310s/Makefile | 2 +- board/zyxel/nsa310s/kwbimage.cfg | 2 +- board/zyxel/nsa310s/nsa310s.c | 2 +- board/zyxel/nsa325/Makefile | 2 +- board/zyxel/nsa325/kwbimage.cfg | 2 +- board/zyxel/nsa325/nsa325.c | 2 +- boot/Makefile | 2 +- boot/boot_fit.c | 2 +- boot/bootdev-uclass.c | 2 +- boot/bootflow.c | 2 +- boot/bootflow_internal.h | 2 +- boot/bootflow_menu.c | 2 +- boot/bootm.c | 2 +- boot/bootm_os.c | 2 +- boot/bootmeth-uclass.c | 2 +- boot/bootmeth_cros.c | 2 +- boot/bootmeth_cros.h | 2 +- boot/bootmeth_efi.c | 2 +- boot/bootmeth_efi_mgr.c | 2 +- boot/bootmeth_extlinux.c | 2 +- boot/bootmeth_pxe.c | 2 +- boot/bootmeth_qfw.c | 2 +- boot/bootmeth_sandbox.c | 2 +- boot/bootmeth_script.c | 2 +- boot/bootretry.c | 2 +- boot/bootstd-uclass.c | 2 +- boot/cedit.c | 2 +- boot/common_fit.c | 2 +- boot/expo.c | 2 +- boot/expo_build.c | 2 +- boot/fdt_region.c | 2 +- boot/fdt_simplefb.c | 2 +- boot/fdt_support.c | 2 +- boot/image-android-dt.c | 2 +- boot/image-android.c | 2 +- boot/image-board.c | 2 +- boot/image-cipher.c | 2 +- boot/image-fdt.c | 2 +- boot/image-fit-sig.c | 2 +- boot/image-fit.c | 2 +- boot/image-host.c | 2 +- boot/image-pre-load.c | 2 +- boot/image-sig.c | 2 +- boot/image.c | 2 +- boot/pxe_utils.c | 2 +- boot/scene.c | 2 +- boot/scene_internal.h | 2 +- boot/scene_menu.c | 2 +- boot/scene_textline.c | 2 +- boot/vbe_simple.c | 2 +- cmd/Makefile | 2 +- cmd/abootimg.c | 2 +- cmd/acpi.c | 2 +- cmd/adc.c | 2 +- cmd/addrmap.c | 2 +- cmd/adtimg.c | 2 +- cmd/aes.c | 2 +- cmd/arm/Makefile | 2 +- cmd/arm/exception.c | 2 +- cmd/arm/exception64.c | 2 +- cmd/armffa.c | 2 +- cmd/armflash.c | 2 +- cmd/avb.c | 2 +- cmd/axi.c | 4 ++-- cmd/bcb.c | 2 +- cmd/bdinfo.c | 2 +- cmd/bind.c | 2 +- cmd/binop.c | 2 +- cmd/blk_common.c | 2 +- cmd/blkcache.c | 2 +- cmd/blkmap.c | 2 +- cmd/blob.c | 2 +- cmd/bloblist.c | 2 +- cmd/bmp.c | 2 +- cmd/boot.c | 2 +- cmd/bootcount.c | 2 +- cmd/bootdev.c | 2 +- cmd/bootefi.c | 2 +- cmd/bootflow.c | 2 +- cmd/booti.c | 2 +- cmd/bootm.c | 2 +- cmd/bootmenu.c | 2 +- cmd/bootmeth.c | 2 +- cmd/bootstage.c | 2 +- cmd/bootz.c | 2 +- cmd/broadcom/Makefile | 2 +- cmd/broadcom/chimp_boot.c | 2 +- cmd/broadcom/chimp_handshake.c | 2 +- cmd/broadcom/nitro_image_load.c | 2 +- cmd/btrfs.c | 2 +- cmd/cache.c | 2 +- cmd/cat.c | 2 +- cmd/cbfs.c | 2 +- cmd/cedit.c | 2 +- cmd/clk.c | 2 +- cmd/clone.c | 2 +- cmd/cls.c | 2 +- cmd/config.c | 2 +- cmd/conitrace.c | 2 +- cmd/console.c | 2 +- cmd/cpu.c | 2 +- cmd/cramfs.c | 2 +- cmd/cros_ec.c | 2 +- cmd/cyclic.c | 2 +- cmd/date.c | 2 +- cmd/demo.c | 2 +- cmd/dfu.c | 2 +- cmd/diag.c | 2 +- cmd/disk.c | 2 +- cmd/dm.c | 2 +- cmd/echo.c | 2 +- cmd/eeprom.c | 2 +- cmd/efi.c | 2 +- cmd/efi_common.c | 2 +- cmd/eficonfig.c | 2 +- cmd/eficonfig_sbkey.c | 2 +- cmd/efidebug.c | 2 +- cmd/erofs.c | 2 +- cmd/ethsw.c | 2 +- cmd/event.c | 2 +- cmd/exit.c | 2 +- cmd/ext2.c | 2 +- cmd/ext4.c | 2 +- cmd/extension_board.c | 2 +- cmd/fastboot.c | 2 +- cmd/fat.c | 2 +- cmd/fdt.c | 2 +- cmd/flash.c | 2 +- cmd/font.c | 2 +- cmd/fpga.c | 2 +- cmd/fpgad.c | 2 +- cmd/fs_uuid.c | 2 +- cmd/fuse.c | 2 +- cmd/gettime.c | 2 +- cmd/gpt.c | 2 +- cmd/hash.c | 2 +- cmd/help.c | 2 +- cmd/history.c | 2 +- cmd/host.c | 2 +- cmd/i2c.c | 2 +- cmd/ide.c | 2 +- cmd/io.c | 2 +- cmd/iotrace.c | 2 +- cmd/irq.c | 2 +- cmd/itest.c | 2 +- cmd/jffs2.c | 2 +- cmd/kaslrseed.c | 2 +- cmd/led.c | 2 +- cmd/legacy-mtd-utils.c | 2 +- cmd/legacy-mtd-utils.h | 2 +- cmd/legacy_led.c | 2 +- cmd/license.c | 2 +- cmd/load.c | 2 +- cmd/log.c | 2 +- cmd/lsblk.c | 2 +- cmd/lzmadec.c | 2 +- cmd/mbr.c | 2 +- cmd/md5sum.c | 2 +- cmd/mdio.c | 2 +- cmd/mem.c | 2 +- cmd/meson/Makefile | 2 +- cmd/meson/sm.c | 2 +- cmd/mii.c | 2 +- cmd/misc.c | 2 +- cmd/mmc.c | 2 +- cmd/mp.c | 2 +- cmd/mtd.c | 2 +- cmd/mtdparts.c | 2 +- cmd/net.c | 2 +- cmd/nvedit.c | 2 +- cmd/nvedit_efi.c | 2 +- cmd/nvme.c | 2 +- cmd/optee_rpmb.c | 2 +- cmd/osd.c | 2 +- cmd/panic.c | 2 +- cmd/part.c | 2 +- cmd/pause.c | 2 +- cmd/pcap.c | 2 +- cmd/pci.c | 2 +- cmd/pci_mps.c | 2 +- cmd/pinmux.c | 2 +- cmd/pmic.c | 2 +- cmd/printf.c | 2 +- cmd/printf.h | 2 +- cmd/pstore.c | 2 +- cmd/pvblock.c | 2 +- cmd/pwm.c | 2 +- cmd/pxe.c | 2 +- cmd/qfw.c | 2 +- cmd/reginfo.c | 2 +- cmd/regulator.c | 2 +- cmd/reiser.c | 2 +- cmd/remoteproc.c | 2 +- cmd/riscv/Makefile | 2 +- cmd/riscv/exception.c | 2 +- cmd/riscv/sbi.c | 2 +- cmd/rng.c | 2 +- cmd/rockusb.c | 2 +- cmd/rtc.c | 2 +- cmd/sandbox/Makefile | 2 +- cmd/sandbox/exception.c | 2 +- cmd/sata.c | 2 +- cmd/sb.c | 2 +- cmd/scp03.c | 2 +- cmd/scsi.c | 2 +- cmd/seama.c | 2 +- cmd/setexpr.c | 2 +- cmd/sf.c | 2 +- cmd/sha1sum.c | 2 +- cmd/sleep.c | 2 +- cmd/smccc.c | 2 +- cmd/sound.c | 2 +- cmd/source.c | 2 +- cmd/spi.c | 2 +- cmd/spl.c | 2 +- cmd/stackprot_test.c | 2 +- cmd/sysboot.c | 2 +- cmd/terminal.c | 2 +- cmd/test.c | 2 +- cmd/thordown.c | 2 +- cmd/ti/Makefile | 2 +- cmd/ti/ddr3.c | 2 +- cmd/ti/pd.c | 2 +- cmd/time.c | 2 +- cmd/timer.c | 2 +- cmd/tlv_eeprom.c | 2 +- cmd/tpm-common.c | 2 +- cmd/tpm-user-utils.h | 2 +- cmd/tpm-v1.c | 2 +- cmd/tpm-v2.c | 2 +- cmd/tpm_test.c | 2 +- cmd/trace.c | 2 +- cmd/tsi148.c | 2 +- cmd/ubifs.c | 2 +- cmd/ufs.c | 2 +- cmd/universe.c | 2 +- cmd/unlz4.c | 2 +- cmd/unzip.c | 2 +- cmd/usb.c | 2 +- cmd/usb_gadget_sdp.c | 2 +- cmd/usb_mass_storage.c | 2 +- cmd/vbe.c | 2 +- cmd/version.c | 2 +- cmd/video.c | 2 +- cmd/virtio.c | 2 +- cmd/w1.c | 2 +- cmd/wdt.c | 2 +- cmd/wol.c | 2 +- cmd/x86/Makefile | 2 +- cmd/x86/cbsysinfo.c | 2 +- cmd/x86/exception.c | 2 +- cmd/x86/fsp.c | 2 +- cmd/x86/hob.c | 2 +- cmd/x86/mtrr.c | 2 +- cmd/ximg.c | 2 +- cmd/xxd.c | 2 +- cmd/zfs.c | 2 +- cmd/zip.c | 2 +- common/Makefile | 2 +- common/autoboot.c | 2 +- common/avb_verify.c | 2 +- common/bloblist.c | 2 +- common/board_f.c | 2 +- common/board_info.c | 2 +- common/board_r.c | 2 +- common/bootstage.c | 2 +- common/bouncebuf.c | 2 +- common/cli.c | 2 +- common/cli_getch.c | 2 +- common/cli_hush.c | 2 +- common/cli_readline.c | 2 +- common/cli_simple.c | 2 +- common/command.c | 2 +- common/console.c | 2 +- common/cyclic.c | 2 +- common/dfu.c | 2 +- common/dlmalloc.c | 2 +- common/edid.c | 2 +- common/eeprom/eeprom_field.c | 2 +- common/eeprom/eeprom_layout.c | 2 +- common/event.c | 2 +- common/flash.c | 2 +- common/hash.c | 2 +- common/hwconfig.c | 2 +- common/init/Makefile | 2 +- common/init/board_init.c | 2 +- common/init/handoff.c | 2 +- common/iomux.c | 2 +- common/iotrace.c | 2 +- common/log.c | 2 +- common/log_console.c | 2 +- common/log_syslog.c | 2 +- common/main.c | 2 +- common/malloc_simple.c | 2 +- common/memsize.c | 2 +- common/menu.c | 2 +- common/miiphyutil.c | 2 +- common/qfw.c | 2 +- common/s_record.c | 2 +- common/scp03.c | 2 +- common/spl/Makefile | 2 +- common/spl/spl.c | 2 +- common/spl/spl_blk_fs.c | 2 +- common/spl/spl_bootrom.c | 2 +- common/spl/spl_dfu.c | 2 +- common/spl/spl_ext.c | 2 +- common/spl/spl_fat.c | 2 +- common/spl/spl_fit.c | 2 +- common/spl/spl_imx_container.c | 2 +- common/spl/spl_legacy.c | 2 +- common/spl/spl_mmc.c | 2 +- common/spl/spl_nand.c | 2 +- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 2 +- common/spl/spl_nvme.c | 2 +- common/spl/spl_onenand.c | 2 +- common/spl/spl_opensbi.c | 2 +- common/spl/spl_optee.S | 2 +- common/spl/spl_ram.c | 2 +- common/spl/spl_sata.c | 2 +- common/spl/spl_sdp.c | 2 +- common/spl/spl_semihosting.c | 2 +- common/spl/spl_spi.c | 2 +- common/spl/spl_ubi.c | 2 +- common/spl/spl_usb.c | 2 +- common/spl/spl_xip.c | 2 +- common/spl/spl_ymodem.c | 2 +- common/splash_source.c | 2 +- common/stackprot.c | 2 +- common/stdio.c | 2 +- common/update.c | 2 +- common/usb.c | 2 +- common/usb_hub.c | 2 +- common/usb_kbd.c | 2 +- common/usb_storage.c | 2 +- config.mk | 2 +- disk/Makefile | 2 +- disk/disk-uclass.c | 2 +- disk/part.c | 2 +- disk/part_amiga.c | 2 +- disk/part_amiga.h | 2 +- disk/part_dos.c | 2 +- disk/part_dos.h | 2 +- disk/part_efi.c | 2 +- disk/part_iso.c | 2 +- disk/part_iso.h | 2 +- disk/part_mac.c | 2 +- disk/part_mac.h | 2 +- doc/README.autoboot | 2 +- doc/README.bootcount | 2 +- doc/README.console | 2 +- doc/README.dfutftp | 2 +- doc/README.esbc_validate | 2 +- doc/README.generic-board | 2 +- doc/README.gpt | 2 +- doc/README.iomux | 2 +- doc/README.mediatek | 2 +- doc/README.nand | 2 +- doc/README.power-framework | 2 +- doc/README.pxe | 2 +- doc/README.rockchip | 2 +- doc/README.usb | 2 +- doc/README.video | 2 +- doc/android/ab.rst | 2 +- doc/android/avb2.rst | 2 +- doc/android/bcb.rst | 2 +- doc/android/boot-image.rst | 2 +- doc/android/fastboot-protocol.rst | 2 +- doc/android/fastboot.rst | 2 +- doc/android/index.rst | 2 +- doc/api/clk.rst | 2 +- doc/api/dfu.rst | 2 +- doc/api/dm.rst | 2 +- doc/api/efi.rst | 2 +- doc/api/event.rst | 2 +- doc/api/getopt.rst | 2 +- doc/api/index.rst | 2 +- doc/api/linker_lists.rst | 2 +- doc/api/lmb.rst | 2 +- doc/api/logging.rst | 2 +- doc/api/nvmem.rst | 2 +- doc/api/part.rst | 2 +- doc/api/pinctrl.rst | 2 +- doc/api/rng.rst | 2 +- doc/api/sandbox.rst | 2 +- doc/api/serial.rst | 2 +- doc/api/sysreset.rst | 2 +- doc/api/timer.rst | 2 +- doc/api/unicode.rst | 2 +- doc/arch/arc.rst | 2 +- doc/arch/arm64.ffa.rst | 2 +- doc/arch/arm64.rst | 2 +- doc/arch/index.rst | 2 +- doc/arch/m68k.rst | 2 +- doc/arch/mips.rst | 2 +- doc/arch/nios2.rst | 2 +- doc/arch/riscv.rst | 2 +- doc/arch/sandbox/block_impl.rst | 2 +- doc/arch/sandbox/index.rst | 2 +- doc/arch/sandbox/sandbox.rst | 2 +- doc/arch/sh.rst | 2 +- doc/arch/x86/index.rst | 2 +- doc/arch/x86/x86.rst | 2 +- doc/arch/xtensa.rst | 2 +- doc/board/AndesTech/adp-ag101p.rst | 2 +- doc/board/AndesTech/ae350.rst | 2 +- doc/board/AndesTech/index.rst | 2 +- doc/board/actions/cubieboard7.rst | 2 +- doc/board/actions/index.rst | 2 +- doc/board/advantech/imx8qm-dmsse20-a1.rst | 2 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 2 +- doc/board/advantech/index.rst | 2 +- doc/board/allwinner/index.rst | 2 +- doc/board/allwinner/sunxi.rst | 2 +- doc/board/amlogic/bananapi-cm4io.rst | 2 +- doc/board/amlogic/bananapi-m2pro.rst | 2 +- doc/board/amlogic/bananapi-m2s.rst | 2 +- doc/board/amlogic/bananapi-m5.rst | 2 +- doc/board/amlogic/beelink-gskingx.rst | 2 +- doc/board/amlogic/beelink-gt1-ultimate.rst | 2 +- doc/board/amlogic/beelink-gtking.rst | 2 +- doc/board/amlogic/beelink-gtkingpro.rst | 2 +- doc/board/amlogic/boot-flow.rst | 2 +- doc/board/amlogic/index.rst | 2 +- doc/board/amlogic/jethub-j100.rst | 2 +- doc/board/amlogic/jethub-j80.rst | 2 +- doc/board/amlogic/khadas-vim.rst | 2 +- doc/board/amlogic/khadas-vim2.rst | 2 +- doc/board/amlogic/khadas-vim3.rst | 2 +- doc/board/amlogic/khadas-vim3l.rst | 2 +- doc/board/amlogic/libretech-ac.rst | 2 +- doc/board/amlogic/libretech-cc.rst | 2 +- doc/board/amlogic/nanopi-k2.rst | 2 +- doc/board/amlogic/odroid-c2.rst | 2 +- doc/board/amlogic/odroid-c4.rst | 2 +- doc/board/amlogic/odroid-go-ultra.rst | 2 +- doc/board/amlogic/odroid-hc4.rst | 2 +- doc/board/amlogic/odroid-n2.rst | 2 +- doc/board/amlogic/odroid-n2l.rst | 2 +- doc/board/amlogic/p200.rst | 2 +- doc/board/amlogic/p201.rst | 2 +- doc/board/amlogic/p212.rst | 2 +- doc/board/amlogic/pre-generated-fip.rst | 7 ++++--- doc/board/amlogic/q200.rst | 2 +- doc/board/amlogic/radxa-zero.rst | 2 +- doc/board/amlogic/radxa-zero2.rst | 2 +- doc/board/amlogic/s400.rst | 2 +- doc/board/amlogic/sei510.rst | 2 +- doc/board/amlogic/sei610.rst | 2 +- doc/board/amlogic/u200.rst | 2 +- doc/board/amlogic/videostrong-kii-pro.rst | 2 +- doc/board/amlogic/w400.rst | 2 +- doc/board/amlogic/wetek-core2.rst | 2 +- doc/board/amlogic/wetek-hub.rst | 2 +- doc/board/amlogic/wetek-play2.rst | 2 +- doc/board/anbernic/index.rst | 2 +- doc/board/anbernic/rgxx3.rst | 2 +- doc/board/apple/index.rst | 2 +- doc/board/apple/m1.rst | 2 +- doc/board/asus/grouper_common.rst | 2 +- doc/board/asus/index.rst | 2 +- doc/board/asus/transformer_t30.rst | 2 +- doc/board/atmel/at91ek.rst | 2 +- doc/board/atmel/index.rst | 2 +- doc/board/beacon/beacon-imx8mm.rst | 2 +- doc/board/beacon/beacon-imx8mn.rst | 2 +- doc/board/beacon/beacon-imx8mp.rst | 2 +- doc/board/beacon/index.rst | 2 +- doc/board/broadcom/bcm7xxx.rst | 2 +- doc/board/broadcom/index.rst | 2 +- doc/board/broadcom/northstar.rst | 2 +- doc/board/broadcom/raspberrypi.rst | 2 +- doc/board/bsh/imx8mn_bsh_smm_s2.rst | 2 +- doc/board/bsh/index.rst | 2 +- doc/board/cloos/imx8mm_phg.rst | 2 +- doc/board/cloos/index.rst | 2 +- doc/board/congatec/cgtqmx8.rst | 2 +- doc/board/congatec/index.rst | 2 +- doc/board/coreboot/coreboot.rst | 2 +- doc/board/coreboot/index.rst | 2 +- doc/board/emulation/blkdev.rst | 2 +- doc/board/emulation/index.rst | 2 +- doc/board/emulation/qemu-arm.rst | 2 +- doc/board/emulation/qemu-mips.rst | 2 +- doc/board/emulation/qemu-ppce500.rst | 2 +- doc/board/emulation/qemu-riscv.rst | 2 +- doc/board/emulation/qemu-x86.rst | 2 +- doc/board/gateworks/imx8mm_venice.rst | 2 +- doc/board/gateworks/imx8mn_venice.rst | 2 +- doc/board/gateworks/imx8mp_venice.rst | 2 +- doc/board/gateworks/index.rst | 2 +- doc/board/google/chromebook_coral.rst | 2 +- doc/board/google/chromebook_link.rst | 2 +- doc/board/google/chromebook_samus.rst | 2 +- doc/board/google/index.rst | 2 +- doc/board/highbank/index.rst | 2 +- doc/board/htc/endeavoru.rst | 2 +- doc/board/htc/index.rst | 2 +- doc/board/index.rst | 2 +- doc/board/intel/bayleybay.rst | 2 +- doc/board/intel/cherryhill.rst | 2 +- doc/board/intel/cougarcanyon2.rst | 2 +- doc/board/intel/crownbay.rst | 2 +- doc/board/intel/edison.rst | 2 +- doc/board/intel/galileo.rst | 2 +- doc/board/intel/index.rst | 2 +- doc/board/intel/minnowmax.rst | 2 +- doc/board/intel/slimbootloader.rst | 2 +- doc/board/kontron/index.rst | 2 +- doc/board/kontron/pitx-imx8m.rst | 2 +- doc/board/kontron/sl-mx6ul.rst | 2 +- doc/board/kontron/sl-mx8mm.rst | 2 +- doc/board/kontron/sl28.rst | 2 +- doc/board/lg/index.rst | 2 +- doc/board/lg/x3_t30.rst | 2 +- doc/board/mediatek/index.rst | 2 +- doc/board/microchip/index.rst | 2 +- doc/board/microchip/mpfs_icicle.rst | 2 +- doc/board/nxp/imx8mm_evk.rst | 2 +- doc/board/nxp/imx8mn_evk.rst | 2 +- doc/board/nxp/imx8mp_evk.rst | 2 +- doc/board/nxp/imx8mq_evk.rst | 2 +- doc/board/nxp/imx8qxp_mek.rst | 2 +- doc/board/nxp/imxrt1020-evk.rst | 2 +- doc/board/nxp/imxrt1050-evk.rst | 2 +- doc/board/nxp/index.rst | 2 +- doc/board/nxp/ls1046ardb.rst | 2 +- doc/board/nxp/mx6sabreauto.rst | 2 +- doc/board/nxp/mx6sabresd.rst | 2 +- doc/board/nxp/mx6ul_14x14_evk.rst | 2 +- doc/board/nxp/mx6ullevk.rst | 2 +- doc/board/openpiton/index.rst | 2 +- doc/board/openpiton/riscv64.rst | 2 +- doc/board/phytec/index.rst | 2 +- doc/board/phytec/phycore-imx8mm.rst | 2 +- doc/board/phytec/phycore-imx8mp.rst | 2 +- doc/board/purism/index.rst | 2 +- doc/board/purism/librem5.rst | 2 +- doc/board/qualcomm/dragonboard410c.rst | 2 +- doc/board/qualcomm/index.rst | 2 +- doc/board/qualcomm/qcs404.rst | 2 +- doc/board/qualcomm/sdm845.rst | 2 +- doc/board/renesas/index.rst | 2 +- doc/board/renesas/renesas.rst | 2 +- doc/board/renesas/rzn1.rst | 2 +- doc/board/rockchip/index.rst | 2 +- doc/board/rockchip/rockchip.rst | 2 +- doc/board/samsung/axy17lte.rst | 2 +- doc/board/samsung/index.rst | 2 +- doc/board/siemens/index.rst | 2 +- doc/board/siemens/iot2050.rst | 2 +- doc/board/sifive/index.rst | 2 +- doc/board/sifive/unleashed.rst | 2 +- doc/board/sifive/unmatched.rst | 2 +- doc/board/sipeed/index.rst | 2 +- doc/board/sipeed/maix.rst | 2 +- doc/board/socionext/developerbox.rst | 2 +- doc/board/socionext/index.rst | 2 +- doc/board/st/index.rst | 2 +- doc/board/st/st-dt.rst | 2 +- doc/board/st/stm32_MCU.rst | 2 +- doc/board/st/stm32mp1.rst | 2 +- doc/board/starfive/index.rst | 2 +- doc/board/starfive/visionfive2.rst | 2 +- doc/board/ste/index.rst | 2 +- doc/board/ste/stemmy.rst | 2 +- doc/board/tbs/index.rst | 2 +- doc/board/thead/index.rst | 2 +- doc/board/thead/lpi4a.rst | 2 +- doc/board/ti/am335x_evm.rst | 2 +- doc/board/ti/am43xx_evm.rst | 2 +- doc/board/ti/am62x_beagleplay.rst | 2 +- doc/board/ti/am62x_sk.rst | 2 +- doc/board/ti/am64x_evm.rst | 2 +- doc/board/ti/am65x_evm.rst | 2 +- doc/board/ti/dra7xx_evm.rst | 2 +- doc/board/ti/index.rst | 2 +- doc/board/ti/j7200_evm.rst | 2 +- doc/board/ti/j721e_evm.rst | 2 +- doc/board/ti/j721s2_evm.rst | 2 +- doc/board/ti/k3.rst | 2 +- doc/board/ti/ks2_evm.rst | 2 +- doc/board/toradex/index.rst | 2 +- doc/board/variscite/imx8mn_var_som.rst | 2 +- doc/board/variscite/index.rst | 2 +- doc/board/xen/index.rst | 2 +- doc/board/xen/xenguest_arm64.rst | 2 +- doc/board/xilinx/index.rst | 2 +- doc/board/xilinx/xilinx.rst | 2 +- doc/board/xilinx/zynq.rst | 2 +- doc/build/documentation.rst | 2 +- doc/build/index.rst | 2 +- doc/build/tools.rst | 2 +- doc/chromium/chainload.rst | 2 +- doc/chromium/index.rst | 2 +- doc/chromium/overview.rst | 2 +- doc/chromium/run_vboot.rst | 2 +- doc/develop/bloblist.rst | 2 +- doc/develop/board_best_practices.rst | 2 +- doc/develop/bootstd.rst | 2 +- doc/develop/cedit.rst | 2 +- doc/develop/ci_testing.rst | 2 +- doc/develop/codingstyle.rst | 2 +- doc/develop/commands.rst | 2 +- doc/develop/config_binding.rst | 2 +- doc/develop/crash_dumps.rst | 2 +- doc/develop/cyclic.rst | 2 +- doc/develop/designprinciples.rst | 2 +- doc/develop/devicetree/control.rst | 2 +- doc/develop/devicetree/dt_qemu.rst | 2 +- doc/develop/devicetree/index.rst | 2 +- doc/develop/devicetree/intro.rst | 2 +- doc/develop/distro.rst | 2 +- doc/develop/docstyle.rst | 2 +- doc/develop/driver-model/bind.rst | 2 +- doc/develop/driver-model/debugging.rst | 2 +- doc/develop/driver-model/design.rst | 2 +- doc/develop/driver-model/fdt-fixup.rst | 2 +- doc/develop/driver-model/fs_firmware_loader.rst | 2 +- doc/develop/driver-model/i2c-howto.rst | 2 +- doc/develop/driver-model/index.rst | 2 +- doc/develop/driver-model/livetree.rst | 2 +- doc/develop/driver-model/migration.rst | 2 +- doc/develop/driver-model/nvme.rst | 2 +- doc/develop/driver-model/nvmxip.rst | 2 +- doc/develop/driver-model/of-plat.rst | 2 +- doc/develop/driver-model/pci-info.rst | 2 +- doc/develop/driver-model/pmic-framework.rst | 2 +- doc/develop/driver-model/remoteproc-framework.rst | 2 +- doc/develop/driver-model/serial-howto.rst | 2 +- doc/develop/driver-model/soc-framework.rst | 2 +- doc/develop/driver-model/spi-howto.rst | 2 +- doc/develop/driver-model/usb-info.rst | 2 +- doc/develop/driver-model/virtio.rst | 2 +- doc/develop/environment.rst | 2 +- doc/develop/event.rst | 2 +- doc/develop/expo.rst | 2 +- doc/develop/global_data.rst | 2 +- doc/develop/index.rst | 2 +- doc/develop/logging.rst | 2 +- doc/develop/menus.rst | 2 +- doc/develop/package/index.rst | 2 +- doc/develop/printf.rst | 2 +- doc/develop/process.rst | 2 +- doc/develop/python_cq.rst | 2 +- doc/develop/qconfig.rst | 2 +- doc/develop/security.rst | 2 +- doc/develop/sending_patches.rst | 6 +++--- doc/develop/smbios.rst | 2 +- doc/develop/system_configuration.rst | 2 +- doc/develop/testing.rst | 2 +- doc/develop/tests_sandbox.rst | 2 +- doc/develop/tests_writing.rst | 2 +- doc/develop/trace.rst | 2 +- doc/develop/uefi/fwu_updates.rst | 2 +- doc/develop/uefi/index.rst | 2 +- doc/develop/uefi/iscsi.rst | 2 +- doc/develop/uefi/u-boot_on_efi.rst | 2 +- doc/develop/uefi/uefi.rst | 2 +- doc/develop/vbe.rst | 2 +- doc/develop/version.rst | 2 +- doc/index.rst | 2 +- doc/learn/index.rst | 2 +- doc/learn/talks.rst | 2 +- doc/mkeficapsule.1 | 2 +- doc/sphinx/parallel-wrapper.sh | 2 +- doc/usage/blkmap.rst | 2 +- doc/usage/cmd/acpi.rst | 2 +- doc/usage/cmd/addrmap.rst | 2 +- doc/usage/cmd/armffa.rst | 2 +- doc/usage/cmd/askenv.rst | 2 +- doc/usage/cmd/base.rst | 2 +- doc/usage/cmd/bdinfo.rst | 2 +- doc/usage/cmd/bind.rst | 2 +- doc/usage/cmd/blkcache.rst | 2 +- doc/usage/cmd/bootd.rst | 2 +- doc/usage/cmd/bootdev.rst | 2 +- doc/usage/cmd/bootefi.rst | 2 +- doc/usage/cmd/bootflow.rst | 2 +- doc/usage/cmd/booti.rst | 2 +- doc/usage/cmd/bootm.rst | 2 +- doc/usage/cmd/bootmenu.rst | 2 +- doc/usage/cmd/bootmeth.rst | 2 +- doc/usage/cmd/bootz.rst | 2 +- doc/usage/cmd/button.rst | 2 +- doc/usage/cmd/cat.rst | 2 +- doc/usage/cmd/cbsysinfo.rst | 2 +- doc/usage/cmd/cedit.rst | 2 +- doc/usage/cmd/cls.rst | 2 +- doc/usage/cmd/cmp.rst | 2 +- doc/usage/cmd/coninfo.rst | 2 +- doc/usage/cmd/cp.rst | 2 +- doc/usage/cmd/cyclic.rst | 2 +- doc/usage/cmd/dm.rst | 2 +- doc/usage/cmd/ebtupdate.rst | 2 +- doc/usage/cmd/efi.rst | 2 +- doc/usage/cmd/eficonfig.rst | 2 +- doc/usage/cmd/event.rst | 2 +- doc/usage/cmd/extension.rst | 2 +- doc/usage/cmd/fatinfo.rst | 2 +- doc/usage/cmd/fatload.rst | 2 +- doc/usage/cmd/fdt.rst | 2 +- doc/usage/cmd/font.rst | 2 +- doc/usage/cmd/fwu_mdata.rst | 2 +- doc/usage/cmd/gpio.rst | 2 +- doc/usage/cmd/gpt.rst | 2 +- doc/usage/cmd/history.rst | 2 +- doc/usage/cmd/host.rst | 2 +- doc/usage/cmd/imxtract.rst | 2 +- doc/usage/cmd/load.rst | 2 +- doc/usage/cmd/loadb.rst | 2 +- doc/usage/cmd/loadm.rst | 2 +- doc/usage/cmd/loads.rst | 2 +- doc/usage/cmd/loadx.rst | 2 +- doc/usage/cmd/loady.rst | 2 +- doc/usage/cmd/mbr.rst | 2 +- doc/usage/cmd/md.rst | 2 +- doc/usage/cmd/mmc.rst | 2 +- doc/usage/cmd/mtest.rst | 2 +- doc/usage/cmd/mtrr.rst | 2 +- doc/usage/cmd/panic.rst | 2 +- doc/usage/cmd/part.rst | 2 +- doc/usage/cmd/pinmux.rst | 2 +- doc/usage/cmd/printenv.rst | 2 +- doc/usage/cmd/pstore.rst | 2 +- doc/usage/cmd/qfw.rst | 2 +- doc/usage/cmd/reset.rst | 2 +- doc/usage/cmd/rng.rst | 2 +- doc/usage/cmd/saves.rst | 2 +- doc/usage/cmd/sbi.rst | 2 +- doc/usage/cmd/scp03.rst | 2 +- doc/usage/cmd/seama.rst | 2 +- doc/usage/cmd/setexpr.rst | 2 +- doc/usage/cmd/sf.rst | 2 +- doc/usage/cmd/size.rst | 2 +- doc/usage/cmd/sleep.rst | 2 +- doc/usage/cmd/sm.rst | 2 +- doc/usage/cmd/sound.rst | 2 +- doc/usage/cmd/source.rst | 2 +- doc/usage/cmd/tftpput.rst | 2 +- doc/usage/cmd/trace.rst | 2 +- doc/usage/cmd/ums.rst | 2 +- doc/usage/cmd/unbind.rst | 2 +- doc/usage/cmd/ut.rst | 2 +- doc/usage/cmd/wdt.rst | 2 +- doc/usage/cmd/wget.rst | 2 +- doc/usage/cmd/xxd.rst | 2 +- doc/usage/cmdline.rst | 2 +- doc/usage/dfu.rst | 2 +- doc/usage/environment.rst | 2 +- doc/usage/fdt_overlays.rst | 2 +- doc/usage/fit/beaglebone_vboot.rst | 2 +- doc/usage/fit/howto.rst | 2 +- doc/usage/fit/index.rst | 2 +- doc/usage/fit/kernel.rst | 2 +- doc/usage/fit/kernel_fdt.rst | 2 +- doc/usage/fit/kernel_fdts_compressed.rst | 2 +- doc/usage/fit/multi-with-fpga.rst | 2 +- doc/usage/fit/multi-with-loadables.rst | 2 +- doc/usage/fit/multi.rst | 2 +- doc/usage/fit/multi_spl.rst | 2 +- doc/usage/fit/overlay-fdt-boot.rst | 2 +- doc/usage/fit/sec_firmware_ppa.rst | 2 +- doc/usage/fit/sign-configs.rst | 2 +- doc/usage/fit/sign-images.rst | 2 +- doc/usage/fit/signature.rst | 2 +- doc/usage/fit/source_file_format.rst | 2 +- doc/usage/fit/uefi.rst | 2 +- doc/usage/fit/update3.rst | 2 +- doc/usage/fit/update_uboot.rst | 2 +- doc/usage/fit/verified-boot.rst | 2 +- doc/usage/fit/x86-fit-boot.rst | 2 +- doc/usage/os/plan9.rst | 2 +- doc/usage/os/vxworks.rst | 2 +- doc/usage/partitions.rst | 2 +- doc/usage/semihosting.rst | 2 +- drivers/Makefile | 2 +- drivers/adc/Makefile | 2 +- drivers/adc/adc-uclass.c | 2 +- drivers/adc/exynos-adc.c | 2 +- drivers/adc/imx93-adc.c | 2 +- drivers/adc/meson-saradc.c | 2 +- drivers/adc/rockchip-saradc.c | 2 +- drivers/adc/sandbox.c | 2 +- drivers/ata/Makefile | 2 +- drivers/ata/ahci-pci.c | 2 +- drivers/ata/ahci-uclass.c | 2 +- drivers/ata/ahci.c | 2 +- drivers/ata/ahci_mvebu.c | 2 +- drivers/ata/dwc_ahci.c | 2 +- drivers/ata/dwc_ahsata.c | 2 +- drivers/ata/dwc_ahsata_priv.h | 2 +- drivers/ata/fsl_sata.c | 2 +- drivers/ata/fsl_sata.h | 2 +- drivers/ata/libata.c | 2 +- drivers/ata/mtk_ahci.c | 2 +- drivers/ata/sata.c | 2 +- drivers/ata/sata_ceva.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sandbox.c | 2 +- drivers/ata/sata_sil.c | 2 +- drivers/ata/sata_sil.h | 2 +- drivers/axi/Makefile | 2 +- drivers/axi/axi-emul-uclass.c | 2 +- drivers/axi/axi-uclass.c | 2 +- drivers/axi/axi_sandbox.c | 2 +- drivers/axi/ihs_axi.c | 2 +- drivers/axi/sandbox_store.c | 2 +- drivers/bios_emulator/Makefile | 2 +- drivers/block/Makefile | 2 +- drivers/block/blk-uclass.c | 2 +- drivers/block/blk_legacy.c | 2 +- drivers/block/blkcache.c | 2 +- drivers/block/blkmap.c | 2 +- drivers/block/efi-media-uclass.c | 2 +- drivers/block/efi_blk.c | 2 +- drivers/block/host-uclass.c | 2 +- drivers/block/host_dev.c | 2 +- drivers/block/ide.c | 2 +- drivers/block/sandbox.c | 2 +- drivers/block/sb_efi_media.c | 2 +- drivers/bootcount/Makefile | 2 +- drivers/bootcount/bootcount-uclass.c | 2 +- drivers/bootcount/bootcount.c | 2 +- drivers/bootcount/bootcount_at91.c | 2 +- drivers/bootcount/bootcount_davinci.c | 2 +- drivers/bootcount/bootcount_env.c | 2 +- drivers/bootcount/bootcount_ext.c | 2 +- drivers/bootcount/bootcount_i2c.c | 2 +- drivers/bootcount/bootcount_nvmem.c | 2 +- drivers/bootcount/bootcount_ram.c | 2 +- drivers/bootcount/i2c-eeprom.c | 2 +- drivers/bootcount/pmic_pfuze100.c | 2 +- drivers/bootcount/rtc.c | 2 +- drivers/bootcount/spi-flash.c | 2 +- drivers/bus/ti-pwmss.c | 2 +- drivers/bus/ti-sysc.c | 2 +- drivers/button/Makefile | 2 +- drivers/button/button-uclass.c | 2 +- drivers/cache/cache-uclass.c | 2 +- drivers/clk/Makefile | 2 +- drivers/clk/altera/Makefile | 2 +- drivers/clk/analogbits/Makefile | 2 +- drivers/clk/aspeed/Makefile | 2 +- drivers/clk/at91/clk-generic.c | 2 +- drivers/clk/at91/clk-main.c | 2 +- drivers/clk/at91/clk-master.c | 2 +- drivers/clk/at91/clk-peripheral.c | 2 +- drivers/clk/at91/clk-sam9x60-pll.c | 2 +- drivers/clk/at91/clk-sam9x60-usb.c | 2 +- drivers/clk/at91/clk-system.c | 2 +- drivers/clk/at91/clk-utmi.c | 2 +- drivers/clk/at91/compat.c | 2 +- drivers/clk/at91/pmc.c | 2 +- drivers/clk/at91/pmc.h | 2 +- drivers/clk/at91/sam9x60.c | 2 +- drivers/clk/at91/sama7g5.c | 2 +- drivers/clk/at91/sckc.c | 2 +- drivers/clk/clk-cdce9xx.c | 2 +- drivers/clk/clk-gpio.c | 2 +- drivers/clk/clk-uclass.c | 2 +- drivers/clk/clk.c | 2 +- drivers/clk/clk_bcm6345.c | 2 +- drivers/clk/clk_fixed_factor.c | 2 +- drivers/clk/clk_fixed_rate.c | 2 +- drivers/clk/clk_k210.c | 2 +- drivers/clk/clk_octeon.c | 2 +- drivers/clk/clk_pic32.c | 2 +- drivers/clk/clk_sandbox_ccf.c | 2 +- drivers/clk/clk_scmi.c | 2 +- drivers/clk/clk_versal.c | 2 +- drivers/clk/clk_vexpress_osc.c | 2 +- drivers/clk/clk_zynq.c | 2 +- drivers/clk/clk_zynqmp.c | 2 +- drivers/clk/exynos/Makefile | 2 +- drivers/clk/exynos/clk-exynos7420.c | 2 +- drivers/clk/exynos/clk-pll.c | 2 +- drivers/clk/exynos/clk-pll.h | 2 +- drivers/clk/ics8n3qv01.c | 2 +- drivers/clk/imx/clk-composite-93.c | 2 +- drivers/clk/imx/clk-gate-93.c | 2 +- drivers/clk/imx/clk-gate2.c | 2 +- drivers/clk/imx/clk-imx8.h | 2 +- drivers/clk/imx/clk-imxrt1020.c | 2 +- drivers/clk/imx/clk-imxrt1050.c | 2 +- drivers/clk/imx/clk-imxrt1170.c | 2 +- drivers/clk/imx/clk-pfd.c | 2 +- drivers/clk/imx/clk-pllv3.c | 2 +- drivers/clk/imx/clk.h | 2 +- drivers/clk/intel/Makefile | 2 +- drivers/clk/intel/clk_intel.c | 2 +- drivers/clk/meson/a1.c | 2 +- drivers/clk/meson/axg-ao.c | 2 +- drivers/clk/meson/axg.c | 2 +- drivers/clk/meson/clk_meson.h | 2 +- drivers/clk/meson/g12a-ao.c | 2 +- drivers/clk/meson/g12a.c | 2 +- drivers/clk/meson/gxbb.c | 2 +- drivers/clk/microchip/mpfs_clk.c | 2 +- drivers/clk/microchip/mpfs_clk.h | 2 +- drivers/clk/microchip/mpfs_clk_cfg.c | 2 +- drivers/clk/microchip/mpfs_clk_msspll.c | 2 +- drivers/clk/microchip/mpfs_clk_periph.c | 2 +- drivers/clk/mpc83xx_clk.c | 2 +- drivers/clk/mpc83xx_clk.h | 2 +- drivers/clk/mvebu/armada-37xx-periph.c | 2 +- drivers/clk/mvebu/armada-37xx-tbg.c | 2 +- drivers/clk/nuvoton/clk_npcm.c | 2 +- drivers/clk/nuvoton/clk_npcm.h | 2 +- drivers/clk/nuvoton/clk_npcm7xx.c | 2 +- drivers/clk/nuvoton/clk_npcm8xx.c | 2 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 2 +- drivers/clk/owl/clk_owl.h | 2 +- drivers/clk/renesas/clk-rcar-gen2.c | 2 +- drivers/clk/renesas/clk-rcar-gen3.c | 2 +- drivers/clk/renesas/rcar-cpg-lib.c | 2 +- drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- drivers/clk/renesas/renesas-cpg-mssr.h | 2 +- drivers/clk/rockchip/Makefile | 2 +- drivers/clk/sifive/Makefile | 2 +- drivers/clk/starfive/Kconfig | 2 +- drivers/clk/starfive/Makefile | 2 +- drivers/clk/starfive/clk-jh7110-pll.c | 2 +- drivers/clk/starfive/clk-jh7110.c | 2 +- drivers/clk/starfive/clk.h | 2 +- drivers/clk/stm32/clk-stm32f.c | 2 +- drivers/clk/stm32/clk-stm32h7.c | 2 +- drivers/clk/stm32/clk-stm32mp1.c | 2 +- drivers/clk/sunxi/Makefile | 2 +- drivers/clk/sunxi/clk_a10.c | 2 +- drivers/clk/sunxi/clk_a10s.c | 2 +- drivers/clk/sunxi/clk_a23.c | 2 +- drivers/clk/sunxi/clk_a31.c | 2 +- drivers/clk/sunxi/clk_a31_r.c | 2 +- drivers/clk/sunxi/clk_a64.c | 2 +- drivers/clk/sunxi/clk_a80.c | 2 +- drivers/clk/sunxi/clk_a83t.c | 2 +- drivers/clk/sunxi/clk_f1c100s.c | 2 +- drivers/clk/sunxi/clk_h3.c | 2 +- drivers/clk/sunxi/clk_h6.c | 2 +- drivers/clk/sunxi/clk_h616.c | 2 +- drivers/clk/sunxi/clk_h6_r.c | 2 +- drivers/clk/sunxi/clk_r40.c | 2 +- drivers/clk/sunxi/clk_sun6i_rtc.c | 2 +- drivers/clk/sunxi/clk_sunxi.c | 2 +- drivers/clk/sunxi/clk_v3s.c | 2 +- drivers/clk/ti/Kconfig | 2 +- drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/clk-am3-dpll-x2.c | 2 +- drivers/clk/ti/clk-am3-dpll.c | 2 +- drivers/clk/ti/clk-ctrl.c | 2 +- drivers/clk/ti/clk-divider.c | 2 +- drivers/clk/ti/clk-gate.c | 2 +- drivers/clk/ti/clk-k3-pll.c | 2 +- drivers/clk/ti/clk-k3.c | 2 +- drivers/clk/ti/clk-mux.c | 2 +- drivers/clk/ti/clk-sci.c | 2 +- drivers/clk/ti/clk.c | 2 +- drivers/clk/ti/clk.h | 2 +- drivers/clk/ti/omap4-cm.c | 2 +- drivers/clk/uniphier/clk-uniphier-core.c | 2 +- drivers/clk/uniphier/clk-uniphier-mio.c | 2 +- drivers/clk/uniphier/clk-uniphier-sys.c | 2 +- drivers/clk/uniphier/clk-uniphier.h | 2 +- drivers/core/Makefile | 2 +- drivers/core/acpi.c | 2 +- drivers/core/device-remove.c | 2 +- drivers/core/device.c | 2 +- drivers/core/devres.c | 2 +- drivers/core/dump.c | 2 +- drivers/core/fdtaddr.c | 2 +- drivers/core/lists.c | 2 +- drivers/core/of_access.c | 2 +- drivers/core/of_addr.c | 2 +- drivers/core/of_extra.c | 2 +- drivers/core/ofnode.c | 2 +- drivers/core/read.c | 2 +- drivers/core/read_extra.c | 2 +- drivers/core/regmap.c | 2 +- drivers/core/root.c | 2 +- drivers/core/simple-bus.c | 2 +- drivers/core/simple-pm-bus.c | 2 +- drivers/core/syscon-uclass.c | 2 +- drivers/core/tag.c | 2 +- drivers/core/uclass.c | 2 +- drivers/core/util.c | 2 +- drivers/cpu/Makefile | 2 +- drivers/cpu/at91_cpu.c | 2 +- drivers/cpu/bmips_cpu.c | 2 +- drivers/cpu/cpu-uclass.c | 2 +- drivers/cpu/cpu_sandbox.c | 2 +- drivers/cpu/imx8_cpu.c | 2 +- drivers/cpu/imx9_cpu.c | 2 +- drivers/cpu/microblaze_cpu.c | 2 +- drivers/cpu/mpc83xx_cpu.c | 2 +- drivers/cpu/mpc83xx_cpu.h | 2 +- drivers/cpu/riscv_cpu.c | 2 +- drivers/crypto/Makefile | 2 +- drivers/crypto/ace_sha.c | 2 +- drivers/crypto/ace_sha.h | 2 +- drivers/crypto/fsl/Makefile | 2 +- drivers/crypto/fsl/desc.h | 2 +- drivers/crypto/fsl/desc_constr.h | 2 +- drivers/crypto/fsl/error.c | 2 +- drivers/crypto/fsl/fsl_blob.c | 2 +- drivers/crypto/fsl/fsl_hash.c | 2 +- drivers/crypto/fsl/fsl_hash.h | 2 +- drivers/crypto/fsl/fsl_mfgprot.c | 2 +- drivers/crypto/fsl/fsl_rsa.c | 2 +- drivers/crypto/fsl/jobdesc.c | 2 +- drivers/crypto/fsl/jobdesc.h | 2 +- drivers/crypto/fsl/jr.c | 2 +- drivers/crypto/fsl/jr.h | 2 +- drivers/crypto/fsl/rsa_caam.h | 2 +- drivers/crypto/fsl/sec.c | 2 +- drivers/crypto/fsl/type.h | 2 +- drivers/crypto/hash/Makefile | 2 +- drivers/crypto/hash/hash-uclass.c | 2 +- drivers/crypto/hash/hash_sw.c | 2 +- drivers/crypto/nuvoton/npcm_aes.c | 2 +- drivers/crypto/nuvoton/npcm_sha.c | 2 +- drivers/crypto/rsa_mod_exp/Makefile | 2 +- drivers/crypto/rsa_mod_exp/mod_exp_sw.c | 2 +- drivers/crypto/rsa_mod_exp/mod_exp_uclass.c | 2 +- drivers/ddr/altera/Makefile | 2 +- drivers/ddr/altera/sdram_gen5.c | 2 +- drivers/ddr/fsl/arm_ddr_gen3.c | 2 +- drivers/ddr/fsl/ctrl_regs.c | 2 +- drivers/ddr/fsl/ddr4_dimm_params.c | 2 +- drivers/ddr/fsl/fsl_ddr_gen4.c | 2 +- drivers/ddr/fsl/fsl_mmdc.c | 2 +- drivers/ddr/fsl/interactive.c | 2 +- drivers/ddr/fsl/options.c | 2 +- drivers/ddr/imx/imx8m/Makefile | 2 +- drivers/ddr/imx/imx8m/ddr_init.c | 2 +- drivers/ddr/imx/imx8ulp/Makefile | 2 +- drivers/ddr/imx/imx8ulp/ddr_init.c | 2 +- drivers/ddr/imx/imx9/Makefile | 2 +- drivers/ddr/imx/imx9/ddr_init.c | 2 +- drivers/ddr/imx/phy/Makefile | 2 +- drivers/ddr/imx/phy/ddrphy_csr.c | 2 +- drivers/ddr/imx/phy/ddrphy_train.c | 2 +- drivers/ddr/imx/phy/ddrphy_utils.c | 2 +- drivers/ddr/imx/phy/helper.c | 2 +- drivers/ddr/marvell/a38x/Makefile | 2 +- drivers/ddr/marvell/axp/Makefile | 2 +- drivers/ddr/microchip/Makefile | 2 +- drivers/ddr/microchip/ddr2.c | 2 +- drivers/ddr/microchip/ddr2_regs.h | 2 +- drivers/ddr/microchip/ddr2_timing.h | 2 +- drivers/demo/Makefile | 2 +- drivers/demo/demo-pdata.c | 2 +- drivers/demo/demo-shape.c | 2 +- drivers/demo/demo-simple.c | 2 +- drivers/demo/demo-uclass.c | 2 +- drivers/dfu/Makefile | 2 +- drivers/dfu/dfu.c | 2 +- drivers/dfu/dfu_alt.c | 2 +- drivers/dfu/dfu_mmc.c | 2 +- drivers/dfu/dfu_mtd.c | 2 +- drivers/dfu/dfu_nand.c | 2 +- drivers/dfu/dfu_ram.c | 2 +- drivers/dfu/dfu_sf.c | 2 +- drivers/dfu/dfu_virt.c | 2 +- drivers/dma/MCD_dmaApi.c | 2 +- drivers/dma/MCD_tasks.c | 2 +- drivers/dma/MCD_tasksInit.c | 2 +- drivers/dma/Makefile | 2 +- drivers/dma/apbh_dma.c | 2 +- drivers/dma/bcm6348-iudma.c | 2 +- drivers/dma/dma-uclass.c | 2 +- drivers/dma/fsl_dma.c | 2 +- drivers/dma/keystone_nav.c | 2 +- drivers/dma/keystone_nav_cfg.c | 2 +- drivers/dma/lpc32xx_dma.c | 2 +- drivers/dma/sandbox-dma-test.c | 2 +- drivers/dma/ti-edma3.c | 2 +- drivers/dma/ti/Kconfig | 2 +- drivers/dma/ti/Makefile | 2 +- drivers/dma/ti/k3-udma-hwdef.h | 2 +- drivers/dma/ti/k3-udma-u-boot.c | 2 +- drivers/dma/ti/k3-udma.c | 2 +- drivers/extcon/Makefile | 2 +- drivers/extcon/extcon-max14526.c | 2 +- drivers/extcon/extcon-sandbox.c | 2 +- drivers/extcon/extcon-uclass.c | 2 +- drivers/fastboot/Makefile | 2 +- drivers/fastboot/fb_common.c | 2 +- drivers/fastboot/fb_mmc.c | 2 +- drivers/fastboot/fb_nand.c | 2 +- drivers/firmware/arm-ffa/Makefile | 2 +- drivers/firmware/arm-ffa/arm-ffa-uclass.c | 2 +- drivers/firmware/arm-ffa/arm-ffa.c | 2 +- drivers/firmware/arm-ffa/ffa-emul-uclass.c | 2 +- drivers/firmware/arm-ffa/sandbox_ffa.c | 2 +- drivers/firmware/firmware-sandbox.c | 2 +- drivers/firmware/firmware-uclass.c | 2 +- drivers/firmware/psci.c | 2 +- drivers/firmware/scmi/base.c | 2 +- drivers/firmware/scmi/mailbox_agent.c | 2 +- drivers/firmware/scmi/optee_agent.c | 2 +- drivers/firmware/scmi/sandbox-scmi_agent.c | 2 +- drivers/firmware/scmi/scmi_agent-uclass.c | 2 +- drivers/firmware/scmi/smccc_agent.c | 2 +- drivers/firmware/ti_sci.c | 2 +- drivers/fpga/ACEX1K.c | 2 +- drivers/fpga/Makefile | 2 +- drivers/fpga/altera.c | 2 +- drivers/fpga/cyclon2.c | 2 +- drivers/fpga/fpga-uclass.c | 2 +- drivers/fpga/fpga.c | 2 +- drivers/fpga/intel_sdm_mb.c | 2 +- drivers/fpga/ivm_core.c | 2 +- drivers/fpga/lattice.c | 2 +- drivers/fpga/sandbox.c | 2 +- drivers/fpga/spartan2.c | 2 +- drivers/fpga/spartan3.c | 2 +- drivers/fpga/stratixII.c | 2 +- drivers/fpga/stratixv.c | 2 +- drivers/fpga/virtex2.c | 2 +- drivers/fpga/xilinx.c | 2 +- drivers/fpga/zynqpl.c | 2 +- drivers/fuzz/Makefile | 2 +- drivers/fuzz/fuzzing_engine-uclass.c | 2 +- drivers/fuzz/sandbox_fuzzing_engine.c | 2 +- drivers/gpio/74x164_gpio.c | 2 +- drivers/gpio/Makefile | 2 +- drivers/gpio/adp5585_gpio.c | 2 +- drivers/gpio/altera_pio.c | 2 +- drivers/gpio/at91_gpio.c | 2 +- drivers/gpio/atmel_pio4.c | 2 +- drivers/gpio/axp_gpio.c | 2 +- drivers/gpio/bcm2835_gpio.c | 2 +- drivers/gpio/bcm6345_gpio.c | 2 +- drivers/gpio/cortina_gpio.c | 2 +- drivers/gpio/da8xx_gpio.c | 2 +- drivers/gpio/da8xx_gpio.h | 2 +- drivers/gpio/dwapb_gpio.c | 2 +- drivers/gpio/ftgpio010.c | 2 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/gpio/gpio-rza1.c | 2 +- drivers/gpio/gpio-uclass.c | 2 +- drivers/gpio/gpio-uniphier.c | 2 +- drivers/gpio/hi6220_gpio.c | 2 +- drivers/gpio/imx_rgpio2p.c | 2 +- drivers/gpio/intel_broadwell_gpio.c | 2 +- drivers/gpio/intel_gpio.c | 2 +- drivers/gpio/intel_ich6_gpio.c | 2 +- drivers/gpio/iproc_gpio.c | 2 +- drivers/gpio/kw_gpio.c | 2 +- drivers/gpio/lpc32xx_gpio.c | 2 +- drivers/gpio/mpc83xx_spisel_boot.c | 2 +- drivers/gpio/mpc8xx_gpio.c | 2 +- drivers/gpio/mpc8xxx_gpio.c | 2 +- drivers/gpio/msm_gpio.c | 2 +- drivers/gpio/mt7621_gpio.c | 2 +- drivers/gpio/mvebu_gpio.c | 2 +- drivers/gpio/mxc_gpio.c | 2 +- drivers/gpio/mxs_gpio.c | 2 +- drivers/gpio/nmk_gpio.c | 2 +- drivers/gpio/npcm_gpio.c | 2 +- drivers/gpio/nx_gpio.c | 2 +- drivers/gpio/pca953x_gpio.c | 2 +- drivers/gpio/pic32_gpio.c | 2 +- drivers/gpio/qcom_pmic_gpio.c | 2 +- drivers/gpio/qe_gpio.c | 2 +- drivers/gpio/rk_gpio.c | 2 +- drivers/gpio/s5p_gpio.c | 2 +- drivers/gpio/sandbox.c | 2 +- drivers/gpio/sifive-gpio.c | 2 +- drivers/gpio/sl28cpld-gpio.c | 2 +- drivers/gpio/stm32_gpio.c | 2 +- drivers/gpio/stm32_gpio_priv.h | 2 +- drivers/gpio/sunxi_gpio.c | 2 +- drivers/gpio/tegra_gpio.c | 2 +- drivers/gpio/turris_omnia_mcu.c | 2 +- drivers/gpio/vybrid_gpio.c | 2 +- drivers/gpio/xilinx_gpio.c | 2 +- drivers/gpio/zynq_gpio.c | 2 +- drivers/hwspinlock/Makefile | 2 +- drivers/hwspinlock/hwspinlock-uclass.c | 2 +- drivers/hwspinlock/sandbox_hwspinlock.c | 2 +- drivers/hwspinlock/stm32_hwspinlock.c | 2 +- drivers/i2c/Makefile | 2 +- drivers/i2c/acpi_i2c.c | 2 +- drivers/i2c/acpi_i2c.h | 2 +- drivers/i2c/ast2600_i2c.c | 2 +- drivers/i2c/ast2600_i2c.h | 2 +- drivers/i2c/ast_i2c.c | 2 +- drivers/i2c/ast_i2c.h | 2 +- drivers/i2c/at91_i2c.c | 2 +- drivers/i2c/cros_ec_ldo.c | 2 +- drivers/i2c/cros_ec_tunnel.c | 2 +- drivers/i2c/davinci_i2c.c | 2 +- drivers/i2c/davinci_i2c.h | 2 +- drivers/i2c/designware_i2c.c | 2 +- drivers/i2c/designware_i2c.h | 2 +- drivers/i2c/designware_i2c_pci.c | 2 +- drivers/i2c/exynos_hs_i2c.c | 2 +- drivers/i2c/i2c-cdns.c | 2 +- drivers/i2c/i2c-cortina.c | 2 +- drivers/i2c/i2c-cortina.h | 2 +- drivers/i2c/i2c-emul-uclass.c | 2 +- drivers/i2c/i2c-microchip.c | 2 +- drivers/i2c/i2c-uclass.c | 2 +- drivers/i2c/i2c-uniphier-f.c | 2 +- drivers/i2c/i2c-uniphier.c | 2 +- drivers/i2c/i2c-versatile.c | 2 +- drivers/i2c/i2c_core.c | 2 +- drivers/i2c/ihs_i2c.c | 2 +- drivers/i2c/imx_lpi2c.c | 2 +- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/iproc_i2c.c | 2 +- drivers/i2c/iproc_i2c.h | 2 +- drivers/i2c/lpc32xx_i2c.c | 2 +- drivers/i2c/meson_i2c.c | 2 +- drivers/i2c/mtk_i2c.c | 2 +- drivers/i2c/muxes/Makefile | 2 +- drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +- drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- drivers/i2c/muxes/i2c-mux-uclass.c | 2 +- drivers/i2c/muxes/pca954x.c | 2 +- drivers/i2c/mv_i2c.c | 2 +- drivers/i2c/mv_i2c.h | 2 +- drivers/i2c/mvtwsi.c | 2 +- drivers/i2c/mxc_i2c.c | 2 +- drivers/i2c/npcm_i2c.c | 2 +- drivers/i2c/ocores_i2c.c | 2 +- drivers/i2c/omap24xx_i2c.h | 2 +- drivers/i2c/rcar_i2c.c | 2 +- drivers/i2c/rcar_iic.c | 2 +- drivers/i2c/rk_i2c.c | 2 +- drivers/i2c/s3c24x0_i2c.c | 2 +- drivers/i2c/s3c24x0_i2c.h | 2 +- drivers/i2c/sandbox_i2c.c | 2 +- drivers/i2c/sh_i2c.c | 2 +- drivers/i2c/soft_i2c.c | 2 +- drivers/i2c/stm32f7_i2c.c | 2 +- drivers/i2c/sun6i_p2wi.c | 2 +- drivers/i2c/sun8i_rsb.c | 2 +- drivers/i2c/synquacer_i2c.c | 2 +- drivers/i2c/tegra_i2c.c | 2 +- drivers/i2c/xilinx_xiic.c | 2 +- drivers/input/Makefile | 2 +- drivers/input/apple_spi_kbd.c | 2 +- drivers/input/button_kbd.c | 2 +- drivers/input/cros_ec_keyb.c | 2 +- drivers/input/i8042.c | 2 +- drivers/input/input.c | 2 +- drivers/input/key_matrix.c | 2 +- drivers/input/keyboard-uclass.c | 2 +- drivers/input/tegra-kbc.c | 2 +- drivers/input/twl4030.c | 2 +- drivers/iommu/Makefile | 2 +- drivers/iommu/apple_dart.c | 2 +- drivers/iommu/iommu-uclass.c | 2 +- drivers/iommu/sandbox_iommu.c | 2 +- drivers/led/Makefile | 2 +- drivers/led/led-uclass.c | 2 +- drivers/led/led_bcm6328.c | 2 +- drivers/led/led_bcm6358.c | 2 +- drivers/led/led_bcm6753.c | 2 +- drivers/led/led_bcm6858.c | 2 +- drivers/led/led_cortina.c | 2 +- drivers/led/led_gpio.c | 2 +- drivers/led/led_pwm.c | 2 +- drivers/mailbox/apple-mbox.c | 2 +- drivers/mailbox/k3-sec-proxy.c | 2 +- drivers/mailbox/zynqmp-ipi.c | 2 +- drivers/memory/memory-sandbox.c | 2 +- drivers/memory/memory-uclass.c | 2 +- drivers/memory/stm32-fmc2-ebi.c | 2 +- drivers/memory/ti-aemif.c | 2 +- drivers/memory/ti-gpmc.c | 2 +- drivers/memory/ti-gpmc.h | 2 +- drivers/misc/Makefile | 2 +- drivers/misc/altera_sysid.c | 2 +- drivers/misc/cros_ec.c | 2 +- drivers/misc/cros_ec_i2c.c | 2 +- drivers/misc/cros_ec_lpc.c | 2 +- drivers/misc/cros_ec_sandbox.c | 2 +- drivers/misc/cros_ec_spi.c | 2 +- drivers/misc/esm_pmic.c | 2 +- drivers/misc/fsl_devdis.c | 2 +- drivers/misc/fsl_ifc.c | 2 +- drivers/misc/fsl_iim.c | 2 +- drivers/misc/fsl_portals.c | 2 +- drivers/misc/fsl_sec_mon.c | 2 +- drivers/misc/gdsys_ioep.c | 4 ++-- drivers/misc/gdsys_ioep.h | 2 +- drivers/misc/gdsys_rxaui_ctrl.c | 2 +- drivers/misc/gdsys_soc.c | 2 +- drivers/misc/gdsys_soc.h | 2 +- drivers/misc/gsc.c | 2 +- drivers/misc/i2c_eeprom.c | 2 +- drivers/misc/i2c_eeprom_emul.c | 2 +- drivers/misc/ihs_fpga.c | 2 +- drivers/misc/ihs_fpga.h | 2 +- drivers/misc/imx8/Makefile | 2 +- drivers/misc/imx_ele/Makefile | 2 +- drivers/misc/irq-uclass.c | 2 +- drivers/misc/jz4780_efuse.c | 2 +- drivers/misc/k3_avs.c | 2 +- drivers/misc/k3_esm.c | 2 +- drivers/misc/ls2_sfp.c | 2 +- drivers/misc/microchip_flexcom.c | 2 +- drivers/misc/misc-uclass.c | 2 +- drivers/misc/misc_sandbox.c | 2 +- drivers/misc/mpc83xx_serdes.c | 2 +- drivers/misc/mpc83xx_serdes.h | 2 +- drivers/misc/mxc_ocotp.c | 2 +- drivers/misc/mxs_ocotp.c | 2 +- drivers/misc/npcm_host_intf.c | 2 +- drivers/misc/npcm_otp.c | 2 +- drivers/misc/nuvoton_nct6102d.c | 2 +- drivers/misc/nvmem.c | 2 +- drivers/misc/p2sb-uclass.c | 2 +- drivers/misc/p2sb_emul.c | 2 +- drivers/misc/pca9551_led.c | 2 +- drivers/misc/pwrseq-uclass.c | 2 +- drivers/misc/qcom-geni-se.c | 2 +- drivers/misc/qfw.c | 2 +- drivers/misc/qfw_mmio.c | 2 +- drivers/misc/qfw_pio.c | 2 +- drivers/misc/qfw_sandbox.c | 2 +- drivers/misc/rockchip-efuse.c | 2 +- drivers/misc/sl28cpld.c | 2 +- drivers/misc/smsc_lpc47m.c | 2 +- drivers/misc/smsc_sio1007.c | 2 +- drivers/misc/spltest_sandbox.c | 2 +- drivers/misc/status_led.c | 2 +- drivers/misc/stm32_rcc.c | 2 +- drivers/misc/stm32mp_fuse.c | 2 +- drivers/misc/swap_case.c | 2 +- drivers/misc/syscon_sandbox.c | 2 +- drivers/misc/test_drv.c | 2 +- drivers/misc/twl4030_led.c | 2 +- drivers/misc/usb251xb.c | 2 +- drivers/misc/vexpress_config.c | 2 +- drivers/misc/winbond_w83627.c | 2 +- drivers/mmc/Makefile | 2 +- drivers/mmc/am654_sdhci.c | 2 +- drivers/mmc/arm_pl180_mmci.c | 2 +- drivers/mmc/arm_pl180_mmci.h | 2 +- drivers/mmc/aspeed_sdhci.c | 2 +- drivers/mmc/atmel_sdhci.c | 2 +- drivers/mmc/bcmstb_sdhci.c | 2 +- drivers/mmc/ca_dw_mmc.c | 2 +- drivers/mmc/davinci_mmc.c | 2 +- drivers/mmc/dw_mmc.c | 2 +- drivers/mmc/exynos_dw_mmc.c | 2 +- drivers/mmc/f_sdh30.c | 2 +- drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/fsl_esdhc_imx.c | 2 +- drivers/mmc/fsl_esdhc_spl.c | 2 +- drivers/mmc/ftsdc010_mci.c | 2 +- drivers/mmc/ftsdc010_mci.h | 2 +- drivers/mmc/gen_atmel_mci.c | 2 +- drivers/mmc/hi6220_dw_mmc.c | 2 +- drivers/mmc/iproc_sdhci.c | 2 +- drivers/mmc/jz_mmc.c | 2 +- drivers/mmc/kona_sdhci.c | 2 +- drivers/mmc/meson_gx_mmc.c | 2 +- drivers/mmc/meson_gx_mmc.h | 2 +- drivers/mmc/mmc-pwrseq.c | 2 +- drivers/mmc/mmc-uclass.c | 2 +- drivers/mmc/mmc.c | 2 +- drivers/mmc/mmc_boot.c | 2 +- drivers/mmc/mmc_bootdev.c | 2 +- drivers/mmc/mmc_legacy.c | 2 +- drivers/mmc/mmc_private.h | 2 +- drivers/mmc/mmc_write.c | 2 +- drivers/mmc/msm_sdhci.c | 2 +- drivers/mmc/mv_sdhci.c | 2 +- drivers/mmc/mvebu_mmc.c | 2 +- drivers/mmc/mxsmmc.c | 2 +- drivers/mmc/nexell_dw_mmc.c | 2 +- drivers/mmc/npcm_sdhci.c | 2 +- drivers/mmc/owl_mmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mmc/pic32_sdhci.c | 2 +- drivers/mmc/piton_mmc.c | 2 +- drivers/mmc/renesas-sdhi.c | 2 +- drivers/mmc/rockchip_dw_mmc.c | 2 +- drivers/mmc/rockchip_sdhci.c | 2 +- drivers/mmc/rpmb.c | 2 +- drivers/mmc/s5p_sdhci.c | 2 +- drivers/mmc/sandbox_mmc.c | 2 +- drivers/mmc/sdhci-adma.c | 2 +- drivers/mmc/sdhci-cadence.c | 2 +- drivers/mmc/sdhci.c | 2 +- drivers/mmc/snps_dw_mmc.c | 2 +- drivers/mmc/socfpga_dw_mmc.c | 2 +- drivers/mmc/sti_sdhci.c | 2 +- drivers/mmc/stm32_sdmmc2.c | 2 +- drivers/mmc/sunxi_mmc.c | 2 +- drivers/mmc/tangier_sdhci.c | 2 +- drivers/mmc/tegra_mmc.c | 2 +- drivers/mmc/tmio-common.c | 2 +- drivers/mmc/tmio-common.h | 2 +- drivers/mmc/uniphier-sd.c | 2 +- drivers/mmc/zynq_sdhci.c | 2 +- drivers/mtd/Makefile | 2 +- drivers/mtd/altera_qspi.c | 2 +- drivers/mtd/cfi_flash.c | 2 +- drivers/mtd/cfi_mtd.c | 2 +- drivers/mtd/jedec_flash.c | 2 +- drivers/mtd/mtd-uclass.c | 2 +- drivers/mtd/mtd_uboot.c | 2 +- drivers/mtd/mtdconcat.c | 2 +- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/mtdpart.c | 2 +- drivers/mtd/nand/Makefile | 2 +- drivers/mtd/nand/raw/Makefile | 2 +- drivers/mtd/nand/raw/am335x_spl_bch.c | 2 +- drivers/mtd/nand/raw/arasan_nfc.c | 2 +- drivers/mtd/nand/raw/atmel_nand.c | 2 +- drivers/mtd/nand/raw/atmel_nand_ecc.h | 2 +- drivers/mtd/nand/raw/brcmnand/Makefile | 2 +- drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h | 2 +- drivers/mtd/nand/raw/cortina_nand.c | 2 +- drivers/mtd/nand/raw/cortina_nand.h | 2 +- drivers/mtd/nand/raw/davinci_nand.c | 2 +- drivers/mtd/nand/raw/denali.c | 2 +- drivers/mtd/nand/raw/denali.h | 2 +- drivers/mtd/nand/raw/denali_dt.c | 2 +- drivers/mtd/nand/raw/denali_spl.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/raw/fsl_elbc_spl.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_spl.c | 2 +- drivers/mtd/nand/raw/kirkwood_nand.c | 2 +- drivers/mtd/nand/raw/kmeter1_nand.c | 2 +- drivers/mtd/nand/raw/lpc32xx_nand_mlc.c | 2 +- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- drivers/mtd/nand/raw/mxc_nand.c | 2 +- drivers/mtd/nand/raw/mxc_nand.h | 2 +- drivers/mtd/nand/raw/mxc_nand_spl.c | 2 +- drivers/mtd/nand/raw/mxs_nand.c | 2 +- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 +- drivers/mtd/nand/raw/mxs_nand_spl.c | 2 +- drivers/mtd/nand/raw/nand_amd.c | 2 +- drivers/mtd/nand/raw/nand_bch.c | 2 +- drivers/mtd/nand/raw/nand_ecc.c | 2 +- drivers/mtd/nand/raw/nand_hynix.c | 2 +- drivers/mtd/nand/raw/nand_macronix.c | 2 +- drivers/mtd/nand/raw/nand_micron.c | 2 +- drivers/mtd/nand/raw/nand_samsung.c | 2 +- drivers/mtd/nand/raw/nand_spl_load.c | 2 +- drivers/mtd/nand/raw/nand_spl_simple.c | 2 +- drivers/mtd/nand/raw/nand_toshiba.c | 2 +- drivers/mtd/nand/raw/omap_elm.c | 2 +- drivers/mtd/nand/raw/omap_elm.h | 2 +- drivers/mtd/nand/raw/omap_gpmc.c | 2 +- drivers/mtd/nand/raw/rockchip_nfc.c | 2 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 +- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- drivers/mtd/nand/raw/sunxi_nand_spl.c | 2 +- drivers/mtd/nand/raw/tegra_nand.c | 2 +- drivers/mtd/nand/raw/tegra_nand.h | 2 +- drivers/mtd/nand/raw/vf610_nfc.c | 2 +- drivers/mtd/nand/raw/zynq_nand.c | 2 +- drivers/mtd/nvmxip/Kconfig | 2 +- drivers/mtd/nvmxip/Makefile | 2 +- drivers/mtd/nvmxip/nvmxip-uclass.c | 2 +- drivers/mtd/nvmxip/nvmxip.c | 2 +- drivers/mtd/nvmxip/nvmxip_qspi.c | 2 +- drivers/mtd/onenand/Makefile | 2 +- drivers/mtd/onenand/onenand_spl.c | 2 +- drivers/mtd/onenand/samsung.c | 2 +- drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/fsl_espi_spl.c | 2 +- drivers/mtd/spi/sf-uclass.c | 2 +- drivers/mtd/spi/sf_bootdev.c | 2 +- drivers/mtd/spi/sf_dataflash.c | 2 +- drivers/mtd/spi/sf_internal.h | 2 +- drivers/mtd/spi/sf_mtd.c | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi-nor-ids.c | 2 +- drivers/mtd/stm32_flash.c | 2 +- drivers/mtd/ubi/Makefile | 2 +- drivers/mtd/ubi/attach.c | 2 +- drivers/mtd/ubi/build.c | 2 +- drivers/mtd/ubi/debug.c | 2 +- drivers/mtd/ubi/debug.h | 2 +- drivers/mtd/ubi/eba.c | 2 +- drivers/mtd/ubi/fastmap-wl.c | 2 +- drivers/mtd/ubi/fastmap.c | 2 +- drivers/mtd/ubi/io.c | 2 +- drivers/mtd/ubi/kapi.c | 2 +- drivers/mtd/ubi/misc.c | 2 +- drivers/mtd/ubi/ubi-media.h | 2 +- drivers/mtd/ubi/ubi.h | 2 +- drivers/mtd/ubi/upd.c | 2 +- drivers/mtd/ubi/vmt.c | 2 +- drivers/mtd/ubi/vtbl.c | 2 +- drivers/mtd/ubi/wl.c | 2 +- drivers/mtd/ubispl/ubispl.c | 2 +- drivers/mux/Makefile | 2 +- drivers/net/Makefile | 2 +- drivers/net/ag7xxx.c | 2 +- drivers/net/aspeed_mdio.c | 2 +- drivers/net/bcm-sf2-eth-gmac.c | 2 +- drivers/net/bcm-sf2-eth-gmac.h | 2 +- drivers/net/bcm-sf2-eth.c | 2 +- drivers/net/bcm-sf2-eth.h | 2 +- drivers/net/bcm6348-eth.c | 2 +- drivers/net/bcm6368-eth.c | 2 +- drivers/net/bcmgenet.c | 2 +- drivers/net/bnxt/Makefile | 2 +- drivers/net/bnxt/bnxt.c | 2 +- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_dbg.h | 2 +- drivers/net/bnxt/bnxt_hsi.h | 2 +- drivers/net/calxedaxgmac.c | 2 +- drivers/net/cortina_ni.c | 2 +- drivers/net/cortina_ni.h | 2 +- drivers/net/dc2114x.c | 2 +- drivers/net/designware.c | 2 +- drivers/net/designware.h | 2 +- drivers/net/dm9000x.c | 2 +- drivers/net/dsa_sandbox.c | 2 +- drivers/net/dwc_eth_qos.h | 2 +- drivers/net/dwc_eth_qos_qcom.c | 2 +- drivers/net/dwc_eth_qos_starfive.c | 2 +- drivers/net/dwmac_meson8b.c | 2 +- drivers/net/dwmac_s700.c | 2 +- drivers/net/dwmac_socfpga.c | 2 +- drivers/net/e1000.c | 2 +- drivers/net/e1000.h | 2 +- drivers/net/eepro100.c | 2 +- drivers/net/eth-phy-uclass.c | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fec_mxc.h | 2 +- drivers/net/fm/Makefile | 2 +- drivers/net/fm/b4860.c | 2 +- drivers/net/fm/dtsec.c | 2 +- drivers/net/fm/eth.c | 2 +- drivers/net/fm/fdt.c | 2 +- drivers/net/fm/fm.c | 2 +- drivers/net/fm/fm.h | 2 +- drivers/net/fm/ls1043.c | 2 +- drivers/net/fm/ls1046.c | 2 +- drivers/net/fm/memac.c | 2 +- drivers/net/fm/memac_phy.c | 2 +- drivers/net/fm/p1023.c | 2 +- drivers/net/fm/p4080.c | 2 +- drivers/net/fm/p5020.c | 2 +- drivers/net/fm/p5040.c | 2 +- drivers/net/fm/t1024.c | 2 +- drivers/net/fm/t1040.c | 2 +- drivers/net/fm/t2080.c | 2 +- drivers/net/fm/t4240.c | 2 +- drivers/net/fm/tgec.c | 2 +- drivers/net/fm/tgec_phy.c | 2 +- drivers/net/fsl-mc/Makefile | 2 +- drivers/net/fsl-mc/dpbp.c | 2 +- drivers/net/fsl-mc/dpio/Makefile | 2 +- drivers/net/fsl-mc/dpio/dpio.c | 2 +- drivers/net/fsl-mc/dpio/qbman_portal.c | 2 +- drivers/net/fsl-mc/dpio/qbman_portal.h | 2 +- drivers/net/fsl-mc/dpio/qbman_private.h | 2 +- drivers/net/fsl-mc/dpio/qbman_sys.h | 2 +- drivers/net/fsl-mc/dpmac.c | 2 +- drivers/net/fsl-mc/dpmng.c | 2 +- drivers/net/fsl-mc/dpni.c | 2 +- drivers/net/fsl-mc/dprc.c | 2 +- drivers/net/fsl-mc/dpsparser.c | 2 +- drivers/net/fsl-mc/fsl_dpmng_cmd.h | 2 +- drivers/net/fsl-mc/mc.c | 2 +- drivers/net/fsl-mc/mc_sys.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc.h | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/fsl_ls_mdio.c | 2 +- drivers/net/fsl_mcdmafec.c | 2 +- drivers/net/fsl_mdio.c | 2 +- drivers/net/ftgmac100.c | 2 +- drivers/net/ftgmac100.h | 2 +- drivers/net/ftmac100.c | 2 +- drivers/net/ftmac100.h | 2 +- drivers/net/gmac_rockchip.c | 2 +- drivers/net/ks8851_mll.c | 2 +- drivers/net/ksz9477.c | 2 +- drivers/net/ldpaa_eth/Makefile | 2 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 2 +- drivers/net/ldpaa_eth/ldpaa_eth.h | 2 +- drivers/net/ldpaa_eth/ldpaa_wriop.c | 2 +- drivers/net/ldpaa_eth/ls1088a.c | 2 +- drivers/net/ldpaa_eth/ls2080a.c | 2 +- drivers/net/ldpaa_eth/lx2160a.c | 2 +- drivers/net/macb.c | 2 +- drivers/net/macb.h | 2 +- drivers/net/mcffec.c | 2 +- drivers/net/mcfmii.c | 2 +- drivers/net/mdio-ipq4019.c | 2 +- drivers/net/mdio_mux_i2creg.c | 2 +- drivers/net/mdio_mux_sandbox.c | 2 +- drivers/net/mdio_sandbox.c | 2 +- drivers/net/mpc8xx_fec.c | 2 +- drivers/net/mscc_eswitch/Kconfig | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 2 +- drivers/net/mscc_eswitch/jr2_switch.c | 2 +- drivers/net/mscc_eswitch/luton_switch.c | 2 +- drivers/net/mscc_eswitch/mscc_mac_table.c | 2 +- drivers/net/mscc_eswitch/mscc_mac_table.h | 2 +- drivers/net/mscc_eswitch/mscc_miim.c | 2 +- drivers/net/mscc_eswitch/mscc_miim.h | 2 +- drivers/net/mscc_eswitch/mscc_xfer.c | 2 +- drivers/net/mscc_eswitch/mscc_xfer.h | 2 +- drivers/net/mscc_eswitch/ocelot_switch.c | 2 +- drivers/net/mscc_eswitch/serval_switch.c | 2 +- drivers/net/mscc_eswitch/servalt_switch.c | 2 +- drivers/net/mt7628-eth.c | 2 +- drivers/net/mv88e6xxx.c | 2 +- drivers/net/mvgbe.c | 2 +- drivers/net/mvgbe.h | 2 +- drivers/net/mvmdio.c | 2 +- drivers/net/netconsole.c | 2 +- drivers/net/npcm750_eth.c | 2 +- drivers/net/octeon/Makefile | 2 +- drivers/net/pch_gbe.c | 2 +- drivers/net/pch_gbe.h | 2 +- drivers/net/pcnet.c | 2 +- drivers/net/pfe_eth/Makefile | 2 +- drivers/net/pfe_eth/pfe_cmd.c | 2 +- drivers/net/pfe_eth/pfe_driver.c | 2 +- drivers/net/pfe_eth/pfe_eth.c | 2 +- drivers/net/pfe_eth/pfe_firmware.c | 2 +- drivers/net/pfe_eth/pfe_hw.c | 2 +- drivers/net/pfe_eth/pfe_mdio.c | 2 +- drivers/net/phy/Makefile | 2 +- drivers/net/phy/adin.c | 2 +- drivers/net/phy/aquantia.c | 2 +- drivers/net/phy/atheros.c | 2 +- drivers/net/phy/b53.c | 2 +- drivers/net/phy/broadcom.c | 2 +- drivers/net/phy/ca_phy.c | 2 +- drivers/net/phy/cortina.c | 2 +- drivers/net/phy/davicom.c | 2 +- drivers/net/phy/et1011c.c | 2 +- drivers/net/phy/ethernet_id.c | 2 +- drivers/net/phy/fixed.c | 2 +- drivers/net/phy/generic_10g.c | 2 +- drivers/net/phy/intel_xway.c | 2 +- drivers/net/phy/lxt.c | 2 +- drivers/net/phy/marvell.c | 2 +- drivers/net/phy/marvell10g.c | 2 +- drivers/net/phy/meson-gxl.c | 2 +- drivers/net/phy/micrel_ksz8xxx.c | 2 +- drivers/net/phy/micrel_ksz90x1.c | 2 +- drivers/net/phy/miiphybb.c | 2 +- drivers/net/phy/motorcomm.c | 2 +- drivers/net/phy/mv88e61xx.c | 2 +- drivers/net/phy/mv88e6352.c | 2 +- drivers/net/phy/natsemi.c | 2 +- drivers/net/phy/ncsi.c | 2 +- drivers/net/phy/nxp-c45-tja11xx.c | 2 +- drivers/net/phy/phy.c | 2 +- drivers/net/phy/realtek.c | 2 +- drivers/net/phy/smsc.c | 2 +- drivers/net/phy/teranetics.c | 2 +- drivers/net/phy/vitesse.c | 2 +- drivers/net/phy/xilinx_phy.c | 2 +- drivers/net/pic32_eth.c | 2 +- drivers/net/pic32_eth.h | 2 +- drivers/net/pic32_mdio.c | 2 +- drivers/net/qe/Kconfig | 2 +- drivers/net/qe/Makefile | 2 +- drivers/net/qe/dm_qe_uec.c | 2 +- drivers/net/qe/dm_qe_uec.h | 2 +- drivers/net/qe/dm_qe_uec_phy.c | 2 +- drivers/net/qe/uccf.c | 2 +- drivers/net/qe/uccf.h | 2 +- drivers/net/qe/uec.h | 2 +- drivers/net/ravb.c | 2 +- drivers/net/rswitch.c | 2 +- drivers/net/rtl8169.c | 2 +- drivers/net/sandbox-raw-bus.c | 2 +- drivers/net/sh_eth.c | 2 +- drivers/net/sh_eth.h | 2 +- drivers/net/smc911x.c | 2 +- drivers/net/smc911x.h | 2 +- drivers/net/sni_ave.c | 2 +- drivers/net/sni_netsec.c | 2 +- drivers/net/sun8i_emac.c | 2 +- drivers/net/sunxi_emac.c | 2 +- drivers/net/ti/Kconfig | 2 +- drivers/net/ti/Makefile | 2 +- drivers/net/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ti/cpsw-common.c | 2 +- drivers/net/ti/cpsw.c | 2 +- drivers/net/ti/cpsw_mdio.c | 2 +- drivers/net/ti/cpsw_mdio.h | 2 +- drivers/net/ti/davinci_emac.c | 2 +- drivers/net/ti/davinci_emac.h | 2 +- drivers/net/ti/keystone_net.c | 2 +- drivers/net/tsec.c | 2 +- drivers/net/xilinx_axi_emac.c | 2 +- drivers/net/xilinx_emaclite.c | 2 +- drivers/net/zynq_gem.c | 2 +- drivers/nvme/Kconfig | 2 +- drivers/nvme/Makefile | 2 +- drivers/nvme/nvme-uclass.c | 2 +- drivers/nvme/nvme.c | 2 +- drivers/nvme/nvme.h | 2 +- drivers/nvme/nvme_apple.c | 2 +- drivers/nvme/nvme_pci.c | 2 +- drivers/nvme/nvme_show.c | 2 +- drivers/pch/Makefile | 2 +- drivers/pch/pch-uclass.c | 2 +- drivers/pch/pch7.c | 2 +- drivers/pch/pch9.c | 2 +- drivers/pch/sandbox_pch.c | 2 +- drivers/pci/Makefile | 2 +- drivers/pci/pci-emul-uclass.c | 2 +- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_auto.c | 2 +- drivers/pci/pci_auto_common.c | 2 +- drivers/pci/pci_common.c | 2 +- drivers/pci/pci_compat.c | 2 +- drivers/pci/pci_internal.h | 2 +- drivers/pci/pci_msc01.c | 2 +- drivers/pci/pci_sandbox.c | 2 +- drivers/pci/pci_sh7751.c | 2 +- drivers/pci/pci_x86.c | 2 +- drivers/pci/pcie_dw_common.c | 2 +- drivers/pci/pcie_dw_common.h | 2 +- drivers/pci/pcie_dw_meson.c | 2 +- drivers/pci/pcie_dw_mvebu.c | 2 +- drivers/pci/pcie_dw_rockchip.c | 2 +- drivers/pci/pcie_dw_sifive.c | 2 +- drivers/pci/pcie_dw_ti.c | 2 +- drivers/pci/pcie_fsl.c | 2 +- drivers/pci/pcie_fsl.h | 2 +- drivers/pci/pcie_fsl_fixup.c | 2 +- drivers/pci/pcie_iproc.c | 2 +- drivers/pci/pcie_layerscape.c | 2 +- drivers/pci/pcie_layerscape.h | 2 +- drivers/pci/pcie_layerscape_ep.c | 2 +- drivers/pci/pcie_layerscape_fixup.c | 2 +- drivers/pci/pcie_layerscape_fixup_common.c | 2 +- drivers/pci/pcie_layerscape_fixup_common.h | 2 +- drivers/pci/pcie_layerscape_gen4.c | 2 +- drivers/pci/pcie_layerscape_gen4.h | 2 +- drivers/pci/pcie_layerscape_gen4_fixup.c | 2 +- drivers/pci/pcie_layerscape_rc.c | 2 +- drivers/pci/pcie_octeon.c | 2 +- drivers/pci/pcie_plda_common.c | 2 +- drivers/pci/pcie_plda_common.h | 2 +- drivers/pci/pcie_rockchip.c | 2 +- drivers/pci/pcie_starfive_jh7110.c | 2 +- drivers/pci_endpoint/Makefile | 2 +- drivers/pci_endpoint/pci_ep-uclass.c | 2 +- drivers/pci_endpoint/pcie-cadence-ep.c | 2 +- drivers/pci_endpoint/pcie-cadence.h | 2 +- drivers/pci_endpoint/sandbox-pci_ep.c | 2 +- drivers/phy/Makefile | 2 +- drivers/phy/allwinner/Makefile | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/phy/allwinner/phy-sun50i-usb3.c | 2 +- drivers/phy/bcm6318-usbh-phy.c | 2 +- drivers/phy/bcm6348-usbh-phy.c | 2 +- drivers/phy/bcm6358-usbh-phy.c | 2 +- drivers/phy/bcm6368-usbh-phy.c | 2 +- drivers/phy/keystone-usb-phy.c | 2 +- drivers/phy/marvell/Makefile | 2 +- drivers/phy/marvell/comphy_a3700.c | 2 +- drivers/phy/marvell/comphy_a3700.h | 2 +- drivers/phy/marvell/comphy_core.c | 2 +- drivers/phy/marvell/comphy_core.h | 2 +- drivers/phy/marvell/comphy_cp110.c | 2 +- drivers/phy/marvell/comphy_mux.c | 2 +- drivers/phy/marvell/sata.h | 2 +- drivers/phy/marvell/utmi_phy.h | 2 +- drivers/phy/meson-axg-mipi-dphy.c | 2 +- drivers/phy/meson-axg-mipi-pcie-analog.c | 2 +- drivers/phy/meson-g12a-usb2.c | 2 +- drivers/phy/meson-g12a-usb3-pcie.c | 2 +- drivers/phy/meson-gxbb-usb2.c | 2 +- drivers/phy/meson-gxl-usb2.c | 2 +- drivers/phy/mt76x8-usb-phy.c | 2 +- drivers/phy/nop-phy.c | 2 +- drivers/phy/omap-usb2-phy.c | 2 +- drivers/phy/phy-ab8500-usb.c | 2 +- drivers/phy/phy-apple-atc.c | 2 +- drivers/phy/phy-da8xx-usb.c | 2 +- drivers/phy/phy-imx8mq-usb.c | 2 +- drivers/phy/phy-npcm-usb.c | 2 +- drivers/phy/phy-stm32-usbphyc.c | 2 +- drivers/phy/phy-ti-am654.c | 2 +- drivers/phy/phy-uclass.c | 2 +- drivers/phy/qcom/msm8916-usbh-phy.c | 2 +- drivers/phy/qcom/phy-qcom-usb-hs-28nm.c | 2 +- drivers/phy/qcom/phy-qcom-usb-ss.c | 2 +- drivers/phy/rockchip/Makefile | 2 +- drivers/phy/sandbox-phy.c | 2 +- drivers/phy/socionext/phy-uniphier-pcie.c | 2 +- drivers/phy/socionext/phy-uniphier-usb3.c | 2 +- drivers/phy/sti_usb_phy.c | 2 +- drivers/phy/ti-pipe3-phy.c | 2 +- drivers/phy/ti/phy-j721e-wiz.c | 2 +- drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/aspeed/pinctrl_ast2500.c | 2 +- drivers/pinctrl/ath79/Makefile | 2 +- drivers/pinctrl/ath79/pinctrl_ar933x.c | 2 +- drivers/pinctrl/ath79/pinctrl_qca953x.c | 2 +- drivers/pinctrl/exynos/Makefile | 2 +- drivers/pinctrl/exynos/pinctrl-exynos.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos.h | 2 +- drivers/pinctrl/exynos/pinctrl-exynos7420.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos78x0.c | 2 +- drivers/pinctrl/intel/Makefile | 2 +- drivers/pinctrl/meson/Makefile | 2 +- drivers/pinctrl/meson/pinctrl-meson-a1.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gx.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 2 +- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- drivers/pinctrl/meson/pinctrl-meson.h | 2 +- drivers/pinctrl/mscc/Kconfig | 2 +- drivers/pinctrl/mscc/Makefile | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 +- drivers/pinctrl/nexell/Makefile | 2 +- drivers/pinctrl/nexell/pinctrl-nexell.c | 2 +- drivers/pinctrl/nexell/pinctrl-nexell.h | 2 +- drivers/pinctrl/nexell/pinctrl-s5pxx18.c | 2 +- drivers/pinctrl/nexell/pinctrl-s5pxx18.h | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx.h | 2 +- drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx93.c | 2 +- drivers/pinctrl/nxp/pinctrl-imxrt.c | 2 +- drivers/pinctrl/nxp/pinctrl-mxs.c | 2 +- drivers/pinctrl/nxp/pinctrl-mxs.h | 2 +- drivers/pinctrl/nxp/pinctrl-scu.c | 2 +- drivers/pinctrl/nxp/pinctrl-vf610.c | 2 +- drivers/pinctrl/pinctrl-apple.c | 2 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 +- drivers/pinctrl/pinctrl-at91.c | 2 +- drivers/pinctrl/pinctrl-generic.c | 2 +- drivers/pinctrl/pinctrl-k210.c | 2 +- drivers/pinctrl/pinctrl-qe-io.c | 2 +- drivers/pinctrl/pinctrl-sandbox.c | 2 +- drivers/pinctrl/pinctrl-single.c | 2 +- drivers/pinctrl/pinctrl-sti.c | 2 +- drivers/pinctrl/pinctrl-stmfx.c | 2 +- drivers/pinctrl/pinctrl-uclass.c | 2 +- drivers/pinctrl/pinctrl_pic32.c | 2 +- drivers/pinctrl/pinctrl_stm32.c | 2 +- drivers/pinctrl/renesas/pinctrl-rza1.c | 2 +- drivers/pinctrl/rockchip/Makefile | 2 +- drivers/pinctrl/rockchip/pinctrl-px30.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3036.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3066.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3128.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3188.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk322x.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3288.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3308.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3328.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3368.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3399.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3568.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rk3588.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rockchip.h | 2 +- drivers/pinctrl/rockchip/pinctrl-rv1108.c | 2 +- drivers/pinctrl/rockchip/pinctrl-rv1126.c | 2 +- drivers/pinctrl/uniphier/Makefile | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 2 +- drivers/pinctrl/uniphier/pinctrl-uniphier.h | 2 +- drivers/power/Makefile | 2 +- drivers/power/acpi_pmc/Makefile | 2 +- drivers/power/acpi_pmc/pmc_emul.c | 2 +- drivers/power/axp152.c | 2 +- drivers/power/axp209.c | 2 +- drivers/power/axp221.c | 2 +- drivers/power/axp305.c | 2 +- drivers/power/axp809.c | 2 +- drivers/power/axp818.c | 2 +- drivers/power/domain/apple-pmgr.c | 2 +- drivers/power/domain/bcm6328-power-domain.c | 2 +- drivers/power/domain/meson-ee-pwrc.c | 2 +- drivers/power/domain/meson-secure-pwrc.c | 2 +- drivers/power/domain/ti-power-domain.c | 2 +- drivers/power/domain/ti-sci-power-domain.c | 2 +- drivers/power/mt6323.c | 2 +- drivers/power/palmas.c | 2 +- drivers/power/pmic/Makefile | 2 +- drivers/power/pmic/ab8500.c | 2 +- drivers/power/pmic/act8846.c | 2 +- drivers/power/pmic/as3722.c | 2 +- drivers/power/pmic/as3722_gpio.c | 2 +- drivers/power/pmic/axp.c | 2 +- drivers/power/pmic/bd71837.c | 2 +- drivers/power/pmic/da9063.c | 2 +- drivers/power/pmic/fan53555.c | 2 +- drivers/power/pmic/i2c_pmic_emul.c | 2 +- drivers/power/pmic/lp873x.c | 2 +- drivers/power/pmic/lp87565.c | 2 +- drivers/power/pmic/max77686.c | 2 +- drivers/power/pmic/max8997.c | 2 +- drivers/power/pmic/max8998.c | 2 +- drivers/power/pmic/mc34708.c | 2 +- drivers/power/pmic/mp5416.c | 2 +- drivers/power/pmic/palmas.c | 2 +- drivers/power/pmic/pca9450.c | 2 +- drivers/power/pmic/pfuze100.c | 2 +- drivers/power/pmic/pmic-uclass.c | 2 +- drivers/power/pmic/pmic_hi6553.c | 2 +- drivers/power/pmic/pmic_ltc3676.c | 2 +- drivers/power/pmic/pmic_mc34vr500.c | 2 +- drivers/power/pmic/pmic_pca9450.c | 2 +- drivers/power/pmic/pmic_pfuze100.c | 2 +- drivers/power/pmic/pmic_pfuze3000.c | 2 +- drivers/power/pmic/pmic_qcom.c | 2 +- drivers/power/pmic/pmic_tps62362.c | 2 +- drivers/power/pmic/pmic_tps65217.c | 2 +- drivers/power/pmic/pmic_tps65218.c | 2 +- drivers/power/pmic/pmic_tps65910.c | 2 +- drivers/power/pmic/pmic_tps65910_dm.c | 2 +- drivers/power/pmic/rk8xx.c | 2 +- drivers/power/pmic/rn5t567.c | 2 +- drivers/power/pmic/s2mps11.c | 2 +- drivers/power/pmic/s5m8767.c | 2 +- drivers/power/pmic/sandbox.c | 2 +- drivers/power/pmic/stpmic1.c | 2 +- drivers/power/pmic/tps65090.c | 2 +- drivers/power/pmic/tps65219.c | 2 +- drivers/power/pmic/tps65941.c | 2 +- drivers/power/power_core.c | 2 +- drivers/power/power_dialog.c | 2 +- drivers/power/power_fsl.c | 2 +- drivers/power/power_i2c.c | 2 +- drivers/power/power_spi.c | 2 +- drivers/power/regulator/Makefile | 2 +- drivers/power/regulator/act8846.c | 2 +- drivers/power/regulator/anatop_regulator.c | 2 +- drivers/power/regulator/as3722_regulator.c | 2 +- drivers/power/regulator/axp_usb_power.c | 2 +- drivers/power/regulator/da9063.c | 2 +- drivers/power/regulator/fan53555.c | 2 +- drivers/power/regulator/fixed.c | 2 +- drivers/power/regulator/gpio-regulator.c | 2 +- drivers/power/regulator/lp873x_regulator.c | 2 +- drivers/power/regulator/lp87565_regulator.c | 2 +- drivers/power/regulator/max77686.c | 2 +- drivers/power/regulator/npcm8xx_regulator.c | 2 +- drivers/power/regulator/palmas_regulator.c | 2 +- drivers/power/regulator/pbias_regulator.c | 2 +- drivers/power/regulator/pfuze100.c | 2 +- drivers/power/regulator/pwm_regulator.c | 2 +- drivers/power/regulator/regulator-uclass.c | 2 +- drivers/power/regulator/regulator_common.c | 2 +- drivers/power/regulator/regulator_common.h | 2 +- drivers/power/regulator/rk8xx.c | 2 +- drivers/power/regulator/s5m8767.c | 2 +- drivers/power/regulator/sandbox.c | 2 +- drivers/power/regulator/scmi_regulator.c | 2 +- drivers/power/regulator/stm32-vrefbuf.c | 2 +- drivers/power/regulator/stpmic1.c | 2 +- drivers/power/regulator/tps62360_regulator.c | 2 +- drivers/power/regulator/tps65090_regulator.c | 2 +- drivers/power/regulator/tps65219_regulator.c | 2 +- drivers/power/regulator/tps65910_regulator.c | 2 +- drivers/power/regulator/tps65941_regulator.c | 2 +- drivers/power/sy8106a.c | 2 +- drivers/power/tps6586x.c | 2 +- drivers/power/twl4030.c | 2 +- drivers/power/twl6030.c | 2 +- drivers/pwm/Makefile | 2 +- drivers/pwm/cros_ec_pwm.c | 2 +- drivers/pwm/exynos_pwm.c | 2 +- drivers/pwm/pwm-aspeed.c | 2 +- drivers/pwm/pwm-at91.c | 2 +- drivers/pwm/pwm-imx.c | 2 +- drivers/pwm/pwm-mtk.c | 2 +- drivers/pwm/pwm-sifive.c | 2 +- drivers/pwm/pwm-ti-ehrpwm.c | 2 +- drivers/pwm/pwm-uclass.c | 2 +- drivers/pwm/rk_pwm.c | 2 +- drivers/pwm/sandbox_pwm.c | 2 +- drivers/pwm/sunxi_pwm.c | 2 +- drivers/pwm/tegra_pwm.c | 2 +- drivers/qe/Makefile | 2 +- drivers/qe/fdt.c | 2 +- drivers/qe/qe.c | 2 +- drivers/ram/Makefile | 2 +- drivers/ram/aspeed/Makefile | 2 +- drivers/ram/bmips_ram.c | 2 +- drivers/ram/imxrt_sdram.c | 2 +- drivers/ram/k3-am654-ddrss.c | 2 +- drivers/ram/k3-am654-ddrss.h | 2 +- drivers/ram/k3-ddrss/Makefile | 2 +- drivers/ram/k3-ddrss/k3-ddrss.c | 2 +- drivers/ram/mpc83xx_sdram.c | 2 +- drivers/ram/ram-uclass.c | 2 +- drivers/ram/renesas/Makefile | 2 +- drivers/ram/renesas/rzn1/Makefile | 2 +- drivers/ram/rockchip/Makefile | 2 +- drivers/ram/rockchip/sdram_rk3066.c | 2 +- drivers/ram/rockchip/sdram_rk3128.c | 2 +- drivers/ram/rockchip/sdram_rk3188.c | 2 +- drivers/ram/rockchip/sdram_rk322x.c | 2 +- drivers/ram/rockchip/sdram_rk3288.c | 2 +- drivers/ram/rockchip/sdram_rk3308.c | 2 +- drivers/ram/rockchip/sdram_rk3328.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 2 +- drivers/ram/rockchip/sdram_rk3568.c | 2 +- drivers/ram/rockchip/sdram_rk3588.c | 2 +- drivers/ram/sandbox_ram.c | 2 +- drivers/ram/sifive/Makefile | 2 +- drivers/ram/sifive/sifive_ddr.c | 2 +- drivers/ram/starfive/Makefile | 2 +- drivers/ram/starfive/ddrcsr_boot.c | 2 +- drivers/ram/starfive/ddrphy_start.c | 2 +- drivers/ram/starfive/ddrphy_train.c | 2 +- drivers/ram/starfive/ddrphy_utils.c | 2 +- drivers/ram/starfive/starfive_ddr.c | 2 +- drivers/ram/starfive/starfive_ddr.h | 2 +- drivers/ram/stm32_sdram.c | 2 +- drivers/ram/stm32mp1/Makefile | 2 +- drivers/ram/stm32mp1/stm32mp1_ddr.c | 2 +- drivers/ram/stm32mp1/stm32mp1_ddr.h | 2 +- drivers/ram/stm32mp1/stm32mp1_ddr_regs.h | 2 +- drivers/ram/stm32mp1/stm32mp1_interactive.c | 2 +- drivers/ram/stm32mp1/stm32mp1_ram.c | 2 +- drivers/ram/stm32mp1/stm32mp1_tests.c | 2 +- drivers/ram/stm32mp1/stm32mp1_tests.h | 2 +- drivers/reboot-mode/Kconfig | 2 +- drivers/reboot-mode/Makefile | 2 +- drivers/reboot-mode/reboot-mode-gpio.c | 2 +- drivers/reboot-mode/reboot-mode-nvmem.c | 2 +- drivers/reboot-mode/reboot-mode-rtc.c | 2 +- drivers/reboot-mode/reboot-mode-uclass.c | 2 +- drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/Makefile | 2 +- drivers/remoteproc/k3_system_controller.c | 2 +- drivers/remoteproc/rproc-elf-loader.c | 2 +- drivers/remoteproc/rproc-uclass.c | 2 +- drivers/remoteproc/sandbox_testproc.c | 2 +- drivers/remoteproc/stm32_copro.c | 2 +- drivers/remoteproc/ti_k3_arm64_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_rproc.c | 2 +- drivers/remoteproc/ti_k3_r5f_rproc.c | 2 +- drivers/remoteproc/ti_power_proc.c | 2 +- drivers/reset/reset-at91.c | 2 +- drivers/reset/reset-bcm6345.c | 2 +- drivers/reset/reset-hsdk.c | 2 +- drivers/reset/reset-jh7110.c | 2 +- drivers/reset/reset-scmi.c | 2 +- drivers/reset/reset-sifive.c | 2 +- drivers/reset/reset-socfpga.c | 2 +- drivers/reset/reset-sunxi.c | 2 +- drivers/reset/reset-ti-sci.c | 2 +- drivers/reset/reset-uniphier.c | 2 +- drivers/reset/sti-reset.c | 2 +- drivers/reset/stm32-reset.c | 2 +- drivers/rng/Makefile | 2 +- drivers/rng/msm_rng.c | 2 +- drivers/rng/npcm_rng.c | 2 +- drivers/rng/rng-uclass.c | 2 +- drivers/rtc/Makefile | 2 +- drivers/rtc/armada38x.c | 2 +- drivers/rtc/davinci.c | 2 +- drivers/rtc/ds1307.c | 2 +- drivers/rtc/ds1337.c | 2 +- drivers/rtc/ds1374.c | 2 +- drivers/rtc/ds3231.c | 2 +- drivers/rtc/ds3232.c | 2 +- drivers/rtc/emul_rtc.c | 2 +- drivers/rtc/ht1380.c | 2 +- drivers/rtc/i2c_rtc_emul.c | 2 +- drivers/rtc/isl1208.c | 2 +- drivers/rtc/m41t62.c | 2 +- drivers/rtc/mc13xxx-rtc.c | 2 +- drivers/rtc/mc146818.c | 2 +- drivers/rtc/mcfrtc.c | 2 +- drivers/rtc/mvrtc.c | 2 +- drivers/rtc/mvrtc.h | 2 +- drivers/rtc/mxsrtc.c | 2 +- drivers/rtc/pcf8563.c | 2 +- drivers/rtc/pl031.c | 2 +- drivers/rtc/pt7c4338.c | 2 +- drivers/rtc/rtc-uclass.c | 2 +- drivers/rtc/rv3028.c | 2 +- drivers/rtc/rv3029.c | 2 +- drivers/rtc/rv8803.c | 2 +- drivers/rtc/rx8025.c | 2 +- drivers/rtc/sandbox_rtc.c | 2 +- drivers/rtc/stm32_rtc.c | 2 +- drivers/scsi/Makefile | 2 +- drivers/scsi/sandbox_scsi.c | 2 +- drivers/scsi/scsi-uclass.c | 2 +- drivers/scsi/scsi.c | 2 +- drivers/scsi/scsi_bootdev.c | 2 +- drivers/scsi/scsi_emul.c | 2 +- drivers/serial/Makefile | 2 +- drivers/serial/altera_jtag_uart.c | 2 +- drivers/serial/altera_uart.c | 2 +- drivers/serial/atmel_usart.c | 2 +- drivers/serial/atmel_usart.h | 2 +- drivers/serial/sandbox.c | 2 +- drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial.c | 2 +- drivers/serial/serial_ar933x.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- drivers/serial/serial_bcm6345.c | 2 +- drivers/serial/serial_coreboot.c | 2 +- drivers/serial/serial_cortina.c | 2 +- drivers/serial/serial_efi.c | 2 +- drivers/serial/serial_htif.c | 2 +- drivers/serial/serial_intel_mid.c | 2 +- drivers/serial/serial_linflexuart.c | 2 +- drivers/serial/serial_lpuart.c | 2 +- drivers/serial/serial_mcf.c | 2 +- drivers/serial/serial_meson.c | 2 +- drivers/serial/serial_mpc8xx.c | 2 +- drivers/serial/serial_msm.c | 2 +- drivers/serial/serial_msm_geni.c | 2 +- drivers/serial/serial_mvebu_a3700.c | 2 +- drivers/serial/serial_mxc.c | 2 +- drivers/serial/serial_mxs.c | 2 +- drivers/serial/serial_npcm.c | 2 +- drivers/serial/serial_ns16550.c | 2 +- drivers/serial/serial_nulldev.c | 2 +- drivers/serial/serial_octeon_bootcmd.c | 2 +- drivers/serial/serial_octeon_pcie_console.c | 2 +- drivers/serial/serial_omap.c | 2 +- drivers/serial/serial_owl.c | 2 +- drivers/serial/serial_pic32.c | 2 +- drivers/serial/serial_pl01x.c | 2 +- drivers/serial/serial_pl01x_internal.h | 2 +- drivers/serial/serial_rockchip.c | 2 +- drivers/serial/serial_s5p.c | 2 +- drivers/serial/serial_s5p4418_pl011.c | 2 +- drivers/serial/serial_sbi.c | 2 +- drivers/serial/serial_semihosting.c | 2 +- drivers/serial/serial_sh.c | 2 +- drivers/serial/serial_sifive.c | 2 +- drivers/serial/serial_sti_asc.c | 2 +- drivers/serial/serial_stm32.c | 2 +- drivers/serial/serial_stm32.h | 2 +- drivers/serial/serial_uniphier.c | 2 +- drivers/serial/serial_xuartlite.c | 2 +- drivers/serial/serial_zynq.c | 2 +- drivers/serial/usbtty.c | 2 +- drivers/serial/usbtty.h | 2 +- drivers/sm/meson-sm.c | 2 +- drivers/sm/sandbox-sm.c | 2 +- drivers/sm/sm-uclass.c | 2 +- drivers/smem/Makefile | 2 +- drivers/smem/msm_smem.c | 2 +- drivers/smem/sandbox_smem.c | 2 +- drivers/smem/smem-uclass.c | 2 +- drivers/soc/Makefile | 2 +- drivers/soc/soc-uclass.c | 2 +- drivers/soc/soc_sandbox.c | 2 +- drivers/soc/soc_ti_k3.c | 2 +- drivers/soc/ti/Kconfig | 2 +- drivers/soc/ti/Makefile | 2 +- drivers/soc/ti/k3-navss-ringacc-u-boot.c | 2 +- drivers/soc/ti/k3-navss-ringacc.c | 2 +- drivers/soc/ti/keystone_serdes.c | 2 +- drivers/sound/Makefile | 2 +- drivers/sound/broadwell_i2s.c | 2 +- drivers/sound/broadwell_i2s.h | 2 +- drivers/sound/codec-uclass.c | 2 +- drivers/sound/da7219.c | 2 +- drivers/sound/i2s-uclass.c | 2 +- drivers/sound/i8254_beep.c | 2 +- drivers/sound/max98088.c | 2 +- drivers/sound/max98088.h | 2 +- drivers/sound/max98090.c | 2 +- drivers/sound/max98090.h | 2 +- drivers/sound/max98095.c | 2 +- drivers/sound/max98095.h | 2 +- drivers/sound/rockchip_i2s.c | 2 +- drivers/sound/rockchip_sound.c | 2 +- drivers/sound/rt5677.c | 2 +- drivers/sound/rt5677.h | 2 +- drivers/sound/samsung-i2s.c | 2 +- drivers/sound/samsung_sound.c | 2 +- drivers/sound/sandbox.c | 2 +- drivers/sound/sound-uclass.c | 2 +- drivers/sound/sound.c | 2 +- drivers/sound/tegra_ahub.c | 2 +- drivers/sound/tegra_i2s.c | 2 +- drivers/sound/tegra_i2s_priv.h | 2 +- drivers/sound/tegra_sound.c | 2 +- drivers/sound/wm8994.c | 2 +- drivers/sound/wm8994.h | 2 +- drivers/sound/wm8994_registers.h | 2 +- drivers/spi/Makefile | 2 +- drivers/spi/altera_spi.c | 2 +- drivers/spi/apple_spi.c | 2 +- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/ath79_spi.c | 2 +- drivers/spi/atmel_spi.c | 2 +- drivers/spi/bcm63xx_hsspi.c | 2 +- drivers/spi/bcm63xx_spi.c | 2 +- drivers/spi/bcmbca_hsspi.c | 2 +- drivers/spi/bcmstb_spi.c | 2 +- drivers/spi/ca_sflash.c | 2 +- drivers/spi/cadence_qspi.c | 2 +- drivers/spi/cadence_qspi.h | 2 +- drivers/spi/cf_spi.c | 2 +- drivers/spi/davinci_spi.c | 2 +- drivers/spi/exynos_spi.c | 2 +- drivers/spi/fsl_dspi.c | 2 +- drivers/spi/fsl_espi.c | 2 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 2 +- drivers/spi/ich.h | 2 +- drivers/spi/iproc_qspi.c | 2 +- drivers/spi/kirkwood_spi.c | 2 +- drivers/spi/meson_spifc.c | 2 +- drivers/spi/microchip_coreqspi.c | 2 +- drivers/spi/mpc8xx_spi.c | 2 +- drivers/spi/mpc8xxx_spi.c | 2 +- drivers/spi/mt7621_spi.c | 2 +- drivers/spi/mtk_snfi_spi.c | 2 +- drivers/spi/mvebu_a3700_spi.c | 2 +- drivers/spi/mxc_spi.c | 2 +- drivers/spi/mxs_spi.c | 2 +- drivers/spi/npcm_fiu_spi.c | 2 +- drivers/spi/npcm_pspi.c | 2 +- drivers/spi/nxp_fspi.c | 2 +- drivers/spi/omap3_spi.c | 2 +- drivers/spi/pic32_spi.c | 2 +- drivers/spi/pl022_spi.c | 2 +- drivers/spi/renesas_rpc_spi.c | 2 +- drivers/spi/rk_spi.c | 2 +- drivers/spi/rk_spi.h | 2 +- drivers/spi/soft_spi.c | 2 +- drivers/spi/spi-aspeed-smc.c | 2 +- drivers/spi/spi-emul-uclass.c | 2 +- drivers/spi/spi-mem-nodm.c | 2 +- drivers/spi/spi-mem.c | 2 +- drivers/spi/spi-qup.c | 2 +- drivers/spi/spi-sifive.c | 2 +- drivers/spi/spi-sunxi.c | 2 +- drivers/spi/spi-synquacer.c | 2 +- drivers/spi/spi-uclass.c | 2 +- drivers/spi/spi.c | 2 +- drivers/spi/stm32_qspi.c | 2 +- drivers/spi/stm32_spi.c | 2 +- drivers/spi/tegra20_sflash.c | 2 +- drivers/spi/tegra210_qspi.c | 2 +- drivers/spi/tegra_spi.h | 2 +- drivers/spi/ti_qspi.c | 2 +- drivers/spi/uniphier_spi.c | 2 +- drivers/spi/xilinx_spi.c | 2 +- drivers/spi/zynq_qspi.c | 2 +- drivers/spi/zynq_spi.c | 2 +- drivers/spi/zynqmp_gqspi.c | 2 +- drivers/spmi/Makefile | 2 +- drivers/spmi/spmi-sandbox.c | 2 +- drivers/spmi/spmi-uclass.c | 2 +- drivers/sysinfo/Makefile | 2 +- drivers/sysinfo/gazerbeam.c | 2 +- drivers/sysinfo/gazerbeam.h | 2 +- drivers/sysinfo/gpio.c | 2 +- drivers/sysinfo/rcar3.c | 2 +- drivers/sysinfo/sandbox.c | 2 +- drivers/sysinfo/sandbox.h | 2 +- drivers/sysinfo/smbios.c | 2 +- drivers/sysinfo/sysinfo-uclass.c | 2 +- drivers/sysreset/Makefile | 2 +- drivers/sysreset/poweroff_gpio.c | 2 +- drivers/sysreset/sysreset-ti-sci.c | 2 +- drivers/sysreset/sysreset-uclass.c | 2 +- drivers/sysreset/sysreset_mpc83xx.c | 2 +- drivers/sysreset/sysreset_mpc83xx.h | 2 +- drivers/sysreset/sysreset_psci.c | 2 +- drivers/sysreset/sysreset_sandbox.c | 2 +- drivers/sysreset/sysreset_sbi.c | 2 +- drivers/sysreset/sysreset_sti.c | 2 +- drivers/sysreset/sysreset_syscon.c | 2 +- drivers/sysreset/sysreset_watchdog.c | 2 +- drivers/sysreset/sysreset_x86.c | 2 +- drivers/sysreset/sysreset_xtfpga.c | 2 +- drivers/tee/Makefile | 2 +- drivers/tee/broadcom/Makefile | 2 +- drivers/tee/optee/Makefile | 2 +- drivers/tee/optee/core.c | 2 +- drivers/tee/optee/optee_private.h | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 2 +- drivers/thermal/Makefile | 2 +- drivers/thermal/imx_scu_thermal.c | 2 +- drivers/thermal/imx_thermal.c | 2 +- drivers/thermal/imx_tmu.c | 2 +- drivers/thermal/thermal-uclass.c | 2 +- drivers/timer/Makefile | 2 +- drivers/timer/altera_timer.c | 2 +- drivers/timer/andes_plmt_timer.c | 2 +- drivers/timer/arc_timer.c | 2 +- drivers/timer/arm_global_timer.c | 2 +- drivers/timer/arm_twd_timer.c | 2 +- drivers/timer/ast_timer.c | 2 +- drivers/timer/atmel_pit_timer.c | 2 +- drivers/timer/atmel_tcb_timer.c | 2 +- drivers/timer/dw-apb-timer.c | 2 +- drivers/timer/fttmr010_timer.c | 2 +- drivers/timer/imx-gpt-timer.c | 2 +- drivers/timer/mchp-pit64b-timer.c | 2 +- drivers/timer/mpc83xx_timer.c | 2 +- drivers/timer/npcm-timer.c | 2 +- drivers/timer/omap-timer.c | 2 +- drivers/timer/orion-timer.c | 2 +- drivers/timer/ostm_timer.c | 2 +- drivers/timer/riscv_aclint_timer.c | 2 +- drivers/timer/riscv_timer.c | 2 +- drivers/timer/rockchip_timer.c | 2 +- drivers/timer/sandbox_timer.c | 2 +- drivers/timer/sp804_timer.c | 2 +- drivers/timer/starfive-timer.c | 2 +- drivers/timer/stm32_timer.c | 2 +- drivers/timer/tegra-timer.c | 2 +- drivers/timer/timer-uclass.c | 2 +- drivers/timer/tsc_timer.c | 2 +- drivers/timer/xilinx-timer.c | 2 +- drivers/tpm/Makefile | 2 +- drivers/tpm/sandbox_common.c | 2 +- drivers/tpm/sandbox_common.h | 2 +- drivers/tpm/tpm-uclass.c | 2 +- drivers/tpm/tpm2_tis_sandbox.c | 2 +- drivers/tpm/tpm_atmel_twi.c | 2 +- drivers/tpm/tpm_internal.h | 2 +- drivers/tpm/tpm_tis_lpc.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 2 +- drivers/tpm/tpm_tis_st33zp24_i2c.c | 2 +- drivers/tpm/tpm_tis_st33zp24_spi.c | 2 +- drivers/ufs/cdns-platform.c | 2 +- drivers/ufs/ti-j721e-ufs.c | 2 +- drivers/ufs/ufs.c | 2 +- drivers/ufs/ufs.h | 2 +- drivers/ufs/unipro.h | 2 +- drivers/usb/common/Makefile | 2 +- drivers/usb/common/common.c | 2 +- drivers/usb/common/fsl-dt-fixup.c | 2 +- drivers/usb/common/fsl-errata.c | 2 +- drivers/usb/dwc3/Makefile | 2 +- drivers/usb/dwc3/dwc3-uniphier.c | 2 +- drivers/usb/dwc3/ti_usb_phy.c | 2 +- drivers/usb/emul/Makefile | 2 +- drivers/usb/emul/sandbox_flash.c | 2 +- drivers/usb/emul/sandbox_hub.c | 2 +- drivers/usb/emul/sandbox_keyb.c | 2 +- drivers/usb/emul/usb-emul-uclass.c | 2 +- drivers/usb/eth/Makefile | 2 +- drivers/usb/eth/asix.c | 2 +- drivers/usb/eth/asix88179.c | 2 +- drivers/usb/eth/lan75xx.c | 2 +- drivers/usb/eth/lan78xx.c | 2 +- drivers/usb/eth/lan7x.c | 2 +- drivers/usb/eth/lan7x.h | 2 +- drivers/usb/eth/mcs7830.c | 2 +- drivers/usb/eth/smsc95xx.c | 2 +- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/gadget/Makefile | 2 +- drivers/usb/gadget/at91_udc.c | 2 +- drivers/usb/gadget/at91_udc.h | 2 +- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/gadget/atmel_usba_udc.h | 2 +- drivers/usb/gadget/bcm_udc_otg.h | 2 +- drivers/usb/gadget/bcm_udc_otg_phy.c | 2 +- drivers/usb/gadget/ci_udc.c | 2 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/config.c | 2 +- drivers/usb/gadget/core.c | 2 +- drivers/usb/gadget/dwc2_udc_otg.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_phy.c | 2 +- drivers/usb/gadget/dwc2_udc_otg_priv.h | 2 +- drivers/usb/gadget/dwc2_udc_otg_regs.h | 2 +- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 2 +- drivers/usb/gadget/ep0.c | 2 +- drivers/usb/gadget/ep0.h | 2 +- drivers/usb/gadget/epautoconf.c | 2 +- drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/f_acm.c | 2 +- drivers/usb/gadget/f_dfu.c | 2 +- drivers/usb/gadget/f_dfu.h | 2 +- drivers/usb/gadget/f_fastboot.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 2 +- drivers/usb/gadget/f_rockusb.c | 2 +- drivers/usb/gadget/f_sdp.c | 2 +- drivers/usb/gadget/f_thor.c | 2 +- drivers/usb/gadget/f_thor.h | 2 +- drivers/usb/gadget/g_dnl.c | 2 +- drivers/usb/gadget/max3420_udc.c | 2 +- drivers/usb/gadget/storage_common.c | 2 +- drivers/usb/gadget/udc/Makefile | 2 +- drivers/usb/gadget/udc/udc-uclass.c | 2 +- drivers/usb/host/Makefile | 2 +- drivers/usb/host/dwc2.c | 2 +- drivers/usb/host/dwc2.h | 2 +- drivers/usb/host/dwc3-of-simple.c | 2 +- drivers/usb/host/dwc3-sti-glue.c | 2 +- drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-exynos.c | 2 +- drivers/usb/host/ehci-fsl.c | 2 +- drivers/usb/host/ehci-generic.c | 2 +- drivers/usb/host/ehci-marvell.c | 2 +- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-mx5.c | 2 +- drivers/usb/host/ehci-mx6.c | 2 +- drivers/usb/host/ehci-mxs.c | 2 +- drivers/usb/host/ehci-npcm.c | 2 +- drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/host/ehci-tegra.c | 2 +- drivers/usb/host/ehci-vf.c | 2 +- drivers/usb/host/ehci-zynq.c | 2 +- drivers/usb/host/ohci-at91.c | 2 +- drivers/usb/host/ohci-da8xx.c | 2 +- drivers/usb/host/ohci-generic.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/ohci-lpc32xx.c | 2 +- drivers/usb/host/ohci-npcm.c | 2 +- drivers/usb/host/usb-sandbox.c | 2 +- drivers/usb/host/usb-uclass.c | 2 +- drivers/usb/host/usb_bootdev.c | 2 +- drivers/usb/host/xhci-brcm.c | 2 +- drivers/usb/host/xhci-dwc3.c | 2 +- drivers/usb/host/xhci-exynos5.c | 2 +- drivers/usb/host/xhci-fsl.c | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci-mtk.c | 2 +- drivers/usb/host/xhci-mvebu.c | 2 +- drivers/usb/host/xhci-omap.c | 2 +- drivers/usb/host/xhci-rcar.c | 2 +- drivers/usb/host/xhci-ring.c | 2 +- drivers/usb/host/xhci.c | 2 +- drivers/usb/musb-new/Makefile | 2 +- drivers/usb/musb-new/musb_uboot.h | 2 +- drivers/usb/musb-new/pic32.c | 2 +- drivers/usb/musb-new/ti-musb.c | 2 +- drivers/usb/musb-new/ux500.c | 2 +- drivers/usb/musb/Kconfig | 2 +- drivers/usb/musb/Makefile | 2 +- drivers/usb/musb/am35x.c | 2 +- drivers/usb/musb/am35x.h | 2 +- drivers/usb/musb/musb_core.c | 2 +- drivers/usb/musb/musb_debug.h | 2 +- drivers/usb/musb/musb_hcd.c | 2 +- drivers/usb/musb/musb_hcd.h | 2 +- drivers/usb/musb/musb_udc.c | 2 +- drivers/usb/musb/omap3.c | 2 +- drivers/usb/musb/omap3.h | 2 +- drivers/usb/phy/Kconfig | 2 +- drivers/usb/phy/Makefile | 2 +- drivers/usb/phy/rockchip_usb2_phy.c | 2 +- drivers/usb/phy/twl4030.c | 2 +- drivers/usb/ulpi/Makefile | 2 +- drivers/usb/ulpi/ulpi.c | 2 +- drivers/video/Makefile | 2 +- drivers/video/anx9804.c | 2 +- drivers/video/anx9804.h | 2 +- drivers/video/anx98xx-edp.h | 2 +- drivers/video/atmel_hlcdfb.c | 2 +- drivers/video/atmel_lcdfb.c | 2 +- drivers/video/backlight-uclass.c | 2 +- drivers/video/backlight_gpio.c | 2 +- drivers/video/bcm2835.c | 2 +- drivers/video/bmp.c | 2 +- drivers/video/bridge/Makefile | 2 +- drivers/video/bridge/anx6345.c | 2 +- drivers/video/bridge/ps862x.c | 2 +- drivers/video/bridge/ptn3460.c | 2 +- drivers/video/bridge/ssd2825.c | 2 +- drivers/video/bridge/video-bridge-uclass.c | 2 +- drivers/video/console_core.c | 2 +- drivers/video/console_normal.c | 2 +- drivers/video/console_rotate.c | 2 +- drivers/video/console_truetype.c | 2 +- drivers/video/coreboot.c | 2 +- drivers/video/display-uclass.c | 2 +- drivers/video/dsi-host-uclass.c | 2 +- drivers/video/dw_hdmi.c | 2 +- drivers/video/dw_mipi_dsi.c | 2 +- drivers/video/efi.c | 2 +- drivers/video/endeavoru-panel.c | 2 +- drivers/video/exynos/Makefile | 2 +- drivers/video/exynos/exynos_dp.c | 2 +- drivers/video/exynos/exynos_dp_lowlevel.c | 2 +- drivers/video/exynos/exynos_dp_lowlevel.h | 2 +- drivers/video/exynos/exynos_fb.c | 2 +- drivers/video/exynos/exynos_mipi_dsi.c | 2 +- drivers/video/exynos/exynos_mipi_dsi_common.c | 2 +- drivers/video/exynos/exynos_mipi_dsi_common.h | 2 +- drivers/video/exynos/exynos_mipi_dsi_lowlevel.c | 2 +- drivers/video/exynos/exynos_mipi_dsi_lowlevel.h | 2 +- drivers/video/fonts/Makefile | 2 +- drivers/video/himax-hx8394.c | 2 +- drivers/video/hitachi_tx18d42vm_lcd.c | 2 +- drivers/video/hitachi_tx18d42vm_lcd.h | 2 +- drivers/video/hx8238d.c | 2 +- drivers/video/ihs_video_out.c | 2 +- drivers/video/imx/Makefile | 2 +- drivers/video/imx/ipu.h | 2 +- drivers/video/imx/ipu_common.c | 2 +- drivers/video/imx/ipu_disp.c | 2 +- drivers/video/imx/ipu_regs.h | 2 +- drivers/video/imx/mxc_ipuv3_fb.c | 2 +- drivers/video/imx/mxcfb.h | 2 +- drivers/video/lm3533_backlight.c | 2 +- drivers/video/logicore_dp_dpcd.h | 2 +- drivers/video/logicore_dp_tx.c | 2 +- drivers/video/logicore_dp_tx.h | 2 +- drivers/video/logicore_dp_tx_regif.h | 2 +- drivers/video/mali_dp.c | 2 +- drivers/video/mcde_simple.c | 2 +- drivers/video/meson/Kconfig | 2 +- drivers/video/meson/Makefile | 2 +- drivers/video/meson/simplefb_common.c | 2 +- drivers/video/meson/simplefb_common.h | 2 +- drivers/video/mvebu_lcd.c | 2 +- drivers/video/mxsfb.c | 2 +- drivers/video/nexell/Makefile | 2 +- drivers/video/nexell/s5pxx18_dp.c | 2 +- drivers/video/nexell/s5pxx18_dp_hdmi.c | 2 +- drivers/video/nexell/s5pxx18_dp_lvds.c | 2 +- drivers/video/nexell/s5pxx18_dp_mipi.c | 2 +- drivers/video/nexell/s5pxx18_dp_rgb.c | 2 +- drivers/video/nexell/soc/Makefile | 2 +- drivers/video/nexell/soc/s5pxx18_soc_disptop.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_disptop.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_disptype.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_dpc.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_dpc.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_hdmi.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_hdmi.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_lvds.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_lvds.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_mipi.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_mipi.h | 2 +- drivers/video/nexell/soc/s5pxx18_soc_mlc.c | 2 +- drivers/video/nexell/soc/s5pxx18_soc_mlc.h | 2 +- drivers/video/nexell_display.c | 2 +- drivers/video/orisetech_otm8009a.c | 2 +- drivers/video/panel-uclass.c | 2 +- drivers/video/pwm_backlight.c | 2 +- drivers/video/raydium-rm68200.c | 2 +- drivers/video/renesas-r61307.c | 2 +- drivers/video/renesas-r69328.c | 2 +- drivers/video/rockchip/Makefile | 2 +- drivers/video/rockchip/dw_mipi_dsi_rockchip.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 2 +- drivers/video/rockchip/rk3399_hdmi.c | 2 +- drivers/video/rockchip/rk_hdmi.c | 2 +- drivers/video/rockchip/rk_hdmi.h | 2 +- drivers/video/rockchip/rk_lvds.c | 2 +- drivers/video/sandbox_dsi_host.c | 2 +- drivers/video/sandbox_osd.c | 2 +- drivers/video/sandbox_osd.h | 2 +- drivers/video/sandbox_sdl.c | 2 +- drivers/video/simple_panel.c | 2 +- drivers/video/simplefb.c | 2 +- drivers/video/ssd2828.c | 2 +- drivers/video/ssd2828.h | 2 +- drivers/video/stm32/Kconfig | 2 +- drivers/video/stm32/Makefile | 2 +- drivers/video/stm32/stm32_dsi.c | 2 +- drivers/video/stm32/stm32_ltdc.c | 2 +- drivers/video/sunxi/Makefile | 2 +- drivers/video/sunxi/lcdc.c | 2 +- drivers/video/sunxi/simplefb_common.c | 2 +- drivers/video/sunxi/simplefb_common.h | 2 +- drivers/video/sunxi/sunxi_de2.c | 2 +- drivers/video/sunxi/sunxi_display.c | 2 +- drivers/video/sunxi/sunxi_dw_hdmi.c | 2 +- drivers/video/sunxi/sunxi_lcd.c | 2 +- drivers/video/sunxi/tve_common.c | 2 +- drivers/video/tda19988.c | 2 +- drivers/video/tdo-tl070wsh30.c | 2 +- drivers/video/tegra124/Makefile | 2 +- drivers/video/tegra124/display.c | 2 +- drivers/video/tegra20/Makefile | 2 +- drivers/video/tegra20/tegra-dc.c | 2 +- drivers/video/tegra20/tegra-dsi.c | 2 +- drivers/video/tegra20/tegra-pwm-backlight.c | 2 +- drivers/video/ti/Kconfig | 2 +- drivers/video/ti/Makefile | 2 +- drivers/video/ti/tilcdc-panel.c | 2 +- drivers/video/ti/tilcdc-panel.h | 2 +- drivers/video/ti/tilcdc.c | 2 +- drivers/video/ti/tilcdc.h | 2 +- drivers/video/tidss/Kconfig | 2 +- drivers/video/tidss/Makefile | 2 +- drivers/video/tidss/tidss_drv.c | 2 +- drivers/video/tidss/tidss_drv.h | 2 +- drivers/video/tidss/tidss_regs.h | 2 +- drivers/video/vesa.c | 2 +- drivers/video/vidconsole-uclass.c | 2 +- drivers/video/vidconsole_internal.h | 2 +- drivers/video/video-uclass.c | 2 +- drivers/video/video_bmp.c | 2 +- drivers/video/video_osd-uclass.c | 2 +- drivers/video/videomodes.c | 2 +- drivers/video/videomodes.h | 2 +- drivers/virtio/Kconfig | 2 +- drivers/virtio/Makefile | 2 +- drivers/virtio/virtio-uclass.c | 2 +- drivers/virtio/virtio_blk.c | 2 +- drivers/virtio/virtio_mmio.c | 2 +- drivers/virtio/virtio_mmio.h | 2 +- drivers/virtio/virtio_net.c | 2 +- drivers/virtio/virtio_pci_legacy.c | 2 +- drivers/virtio/virtio_pci_modern.c | 2 +- drivers/virtio/virtio_ring.c | 2 +- drivers/virtio/virtio_rng.c | 2 +- drivers/virtio/virtio_sandbox.c | 2 +- drivers/w1-eeprom/ds24xxx.c | 2 +- drivers/w1-eeprom/ds2502.c | 2 +- drivers/w1-eeprom/eep_sandbox.c | 2 +- drivers/w1-eeprom/w1-eeprom-uclass.c | 2 +- drivers/w1/mxc_w1.c | 2 +- drivers/w1/w1-gpio.c | 2 +- drivers/w1/w1-uclass.c | 2 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/apple_wdt.c | 2 +- drivers/watchdog/armada-37xx-wdt.c | 2 +- drivers/watchdog/ast2600_wdt.c | 2 +- drivers/watchdog/ast_wdt.c | 2 +- drivers/watchdog/at91sam9_wdt.c | 2 +- drivers/watchdog/bcm2835_wdt.c | 2 +- drivers/watchdog/bcm6345_wdt.c | 2 +- drivers/watchdog/cortina_wdt.c | 2 +- drivers/watchdog/designware_wdt.c | 2 +- drivers/watchdog/ftwdt010_wdt.c | 2 +- drivers/watchdog/gpio_wdt.c | 2 +- drivers/watchdog/max6370_wdt.c | 2 +- drivers/watchdog/meson_gxbb_wdt.c | 2 +- drivers/watchdog/mpc8xxx_wdt.c | 2 +- drivers/watchdog/mt7621_wdt.c | 2 +- drivers/watchdog/npcm_wdt.c | 2 +- drivers/watchdog/octeontx_wdt.c | 2 +- drivers/watchdog/rti_wdt.c | 2 +- drivers/watchdog/s5p_wdt.c | 2 +- drivers/watchdog/sandbox_wdt.c | 2 +- drivers/watchdog/sbsa_gwdt.c | 2 +- drivers/watchdog/sl28cpld-wdt.c | 2 +- drivers/watchdog/sp805_wdt.c | 2 +- drivers/watchdog/stm32mp_wdt.c | 2 +- drivers/watchdog/sunxi_wdt.c | 2 +- drivers/watchdog/tangier_wdt.c | 2 +- drivers/watchdog/ulp_wdog.c | 2 +- drivers/watchdog/wdt-uclass.c | 2 +- drivers/watchdog/xilinx_tb_wdt.c | 2 +- drivers/xen/Makefile | 2 +- drivers/xen/pvblock.c | 2 +- dts/Makefile | 2 +- env/Makefile | 2 +- env/attr.c | 2 +- env/callback.c | 2 +- env/common.c | 2 +- env/eeprom.c | 2 +- env/embedded.c | 2 +- env/env.c | 2 +- env/ext4.c | 2 +- env/fat.c | 2 +- env/flags.c | 2 +- env/flash.c | 2 +- env/mmc.c | 2 +- env/nand.c | 2 +- env/nowhere.c | 2 +- env/nvram.c | 2 +- env/onenand.c | 2 +- env/remote.c | 2 +- env/sf.c | 2 +- env/ubi.c | 2 +- examples/Makefile | 2 +- examples/api/Makefile | 2 +- examples/api/crt0.S | 2 +- examples/api/demo.c | 2 +- examples/api/glue.c | 2 +- examples/api/glue.h | 2 +- examples/api/libgenwrap.c | 2 +- examples/standalone/Makefile | 2 +- examples/standalone/hello_world.c | 2 +- examples/standalone/sched.c | 2 +- examples/standalone/sparc.lds | 2 +- fs/Makefile | 2 +- fs/btrfs/Makefile | 2 +- fs/btrfs/btrfs.c | 2 +- fs/btrfs/btrfs.h | 2 +- fs/btrfs/compat.h | 2 +- fs/btrfs/compression.c | 2 +- fs/btrfs/conv-funcs.h | 2 +- fs/btrfs/crypto/hash.c | 2 +- fs/btrfs/ctree.c | 2 +- fs/btrfs/ctree.h | 2 +- fs/btrfs/dev.c | 2 +- fs/btrfs/dir-item.c | 2 +- fs/btrfs/disk-io.c | 2 +- fs/btrfs/disk-io.h | 2 +- fs/btrfs/extent-cache.c | 2 +- fs/btrfs/extent-cache.h | 2 +- fs/btrfs/extent-io.c | 2 +- fs/btrfs/extent-io.h | 2 +- fs/btrfs/inode.c | 2 +- fs/btrfs/root-tree.c | 2 +- fs/btrfs/subvolume.c | 2 +- fs/btrfs/volumes.c | 2 +- fs/btrfs/volumes.h | 2 +- fs/cbfs/Makefile | 2 +- fs/cbfs/cbfs.c | 2 +- fs/cramfs/Makefile | 2 +- fs/erofs/Makefile | 2 +- fs/erofs/data.c | 2 +- fs/erofs/decompress.c | 2 +- fs/erofs/decompress.h | 2 +- fs/erofs/fs.c | 2 +- fs/erofs/internal.h | 2 +- fs/erofs/namei.c | 2 +- fs/erofs/super.c | 2 +- fs/erofs/zmap.c | 2 +- fs/ext4/Makefile | 2 +- fs/ext4/dev.c | 2 +- fs/ext4/ext4_common.c | 2 +- fs/ext4/ext4_common.h | 2 +- fs/ext4/ext4_journal.c | 2 +- fs/ext4/ext4_journal.h | 2 +- fs/ext4/ext4_write.c | 2 +- fs/ext4/ext4fs.c | 2 +- fs/fat/Makefile | 2 +- fs/fat/fat.c | 2 +- fs/fat/fat_write.c | 2 +- fs/jffs2/Makefile | 2 +- fs/jffs2/mini_inflate.c | 2 +- fs/reiserfs/Makefile | 2 +- fs/reiserfs/dev.c | 2 +- fs/reiserfs/mode_string.c | 2 +- fs/reiserfs/reiserfs.c | 2 +- fs/reiserfs/reiserfs_private.h | 2 +- fs/sandbox/Kconfig | 2 +- fs/sandbox/Makefile | 2 +- fs/sandbox/host_bootdev.c | 2 +- fs/sandbox/sandboxfs.c | 2 +- fs/semihostingfs.c | 2 +- fs/squashfs/Makefile | 2 +- fs/ubifs/Makefile | 2 +- fs/ubifs/budget.c | 2 +- fs/ubifs/debug.c | 2 +- fs/ubifs/debug.h | 2 +- fs/ubifs/io.c | 2 +- fs/ubifs/key.h | 2 +- fs/ubifs/log.c | 2 +- fs/ubifs/lprops.c | 2 +- fs/ubifs/lpt.c | 2 +- fs/ubifs/lpt_commit.c | 2 +- fs/ubifs/master.c | 2 +- fs/ubifs/misc.h | 2 +- fs/ubifs/orphan.c | 2 +- fs/ubifs/recovery.c | 2 +- fs/ubifs/replay.c | 2 +- fs/ubifs/sb.c | 2 +- fs/ubifs/scan.c | 2 +- fs/ubifs/super.c | 2 +- fs/ubifs/tnc.c | 2 +- fs/ubifs/tnc_misc.c | 2 +- fs/ubifs/ubifs-media.h | 2 +- fs/ubifs/ubifs.h | 2 +- fs/zfs/Makefile | 2 +- fs/zfs/dev.c | 2 +- fs/zfs/zfs.c | 2 +- fs/zfs/zfs_fletcher.c | 2 +- fs/zfs/zfs_lzjb.c | 2 +- fs/zfs/zfs_sha256.c | 2 +- include/ACEX1K.h | 2 +- include/MCD_dma.h | 2 +- include/MCD_progCheck.h | 2 +- include/MCD_tasksInit.h | 2 +- include/abuf.h | 2 +- include/acpi/acpi_s3.h | 2 +- include/acpi/acpi_table.h | 2 +- include/adc.h | 2 +- include/ahci.h | 2 +- include/altera.h | 2 +- include/ansi.h | 2 +- include/api.h | 2 +- include/api_public.h | 2 +- include/arm_ffa.h | 2 +- include/arm_ffa_priv.h | 2 +- include/armcoremodule.h | 2 +- include/asm-generic/atomic.h | 2 +- include/asm-generic/global_data.h | 2 +- include/asm-generic/gpio.h | 2 +- include/asm-generic/io.h | 2 +- include/asm-generic/pe.h | 2 +- include/asm-generic/sections.h | 2 +- include/asm-generic/u-boot.h | 2 +- include/ata.h | 2 +- include/atmel_hlcdc.h | 2 +- include/atmel_lcd.h | 2 +- include/atmel_lcdc.h | 2 +- include/atmel_mci.h | 2 +- include/audio_codec.h | 2 +- include/autoboot.h | 2 +- include/avb_verify.h | 2 +- include/axi.h | 2 +- include/axp152.h | 2 +- include/axp209.h | 2 +- include/axp221.h | 2 +- include/axp305.h | 2 +- include/axp809.h | 2 +- include/axp818.h | 2 +- include/axp_pmic.h | 2 +- include/backlight.h | 2 +- include/bcb.h | 2 +- include/binman_sym.h | 2 +- include/bitfield.h | 2 +- include/blk.h | 2 +- include/blkmap.h | 2 +- include/bloblist.h | 2 +- include/bmp_layout.h | 2 +- include/boot_fit.h | 2 +- include/bootcount.h | 2 +- include/bootdev.h | 2 +- include/bootflow.h | 2 +- include/bootm.h | 2 +- include/bootmeth.h | 2 +- include/bootretry.h | 2 +- include/bootstage.h | 2 +- include/bootstd.h | 2 +- include/bouncebuf.h | 2 +- include/broadcom/chimp.h | 2 +- include/btrfs.h | 2 +- include/bus_vcxk.h | 2 +- include/button.h | 2 +- include/cavium/atf.h | 2 +- include/cavium/atf_part.h | 2 +- include/cavium/thunderx_svc.h | 2 +- include/cbfs.h | 2 +- include/cedit.h | 2 +- include/charset.h | 2 +- include/circbuf.h | 2 +- include/cli.h | 2 +- include/cli_hush.h | 2 +- include/clk-uclass.h | 2 +- include/clk.h | 2 +- include/clk/sunxi.h | 2 +- include/clock_legacy.h | 2 +- include/cmd_spl.h | 2 +- include/command.h | 2 +- include/common.h | 2 +- include/config_distro_bootcmd.h | 2 +- include/config_fsl_chain_trust.h | 2 +- include/configs/10m50_devboard.h | 2 +- include/configs/3c120_devboard.h | 2 +- include/configs/M5208EVBE.h | 2 +- include/configs/M5235EVB.h | 2 +- include/configs/M5249EVB.h | 2 +- include/configs/M5253DEMO.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5275EVB.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/M53017EVB.h | 2 +- include/configs/M5329EVB.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/MPC837XERDB.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/P1010RDB.h | 2 +- include/configs/P2041RDB.h | 2 +- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240RDB.h | 2 +- include/configs/ae350.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/am57xx_evm.h | 2 +- include/configs/am62ax_evm.h | 2 +- include/configs/am62x_evm.h | 2 +- include/configs/am64x_evm.h | 2 +- include/configs/am65x_evm.h | 2 +- include/configs/amcore.h | 2 +- include/configs/anbernic-rgxx3-rk3566.h | 2 +- include/configs/ap121.h | 2 +- include/configs/ap143.h | 2 +- include/configs/ap152.h | 2 +- include/configs/apalis-imx8.h | 2 +- include/configs/apalis-tk1.h | 2 +- include/configs/apalis_imx6.h | 2 +- include/configs/apalis_t30.h | 2 +- include/configs/arbel.h | 2 +- include/configs/aristainetos2.h | 2 +- include/configs/arndale.h | 2 +- include/configs/aspeed-common.h | 2 +- include/configs/astro_mcf5373l.h | 2 +- include/configs/at91-sama5_common.h | 2 +- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9261ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- include/configs/at91sam9x5ek.h | 2 +- include/configs/axs10x.h | 2 +- include/configs/bayleybay.h | 2 +- include/configs/bcm7260.h | 2 +- include/configs/bcm7445.h | 2 +- include/configs/bcm947622.h | 2 +- include/configs/bcm94908.h | 2 +- include/configs/bcm94912.h | 2 +- include/configs/bcm963138.h | 2 +- include/configs/bcm963146.h | 2 +- include/configs/bcm963148.h | 2 +- include/configs/bcm963158.h | 2 +- include/configs/bcm963178.h | 2 +- include/configs/bcm96756.h | 2 +- include/configs/bcm96813.h | 2 +- include/configs/bcm96846.h | 2 +- include/configs/bcm96855.h | 2 +- include/configs/bcm96856.h | 2 +- include/configs/bcm96858.h | 2 +- include/configs/bcm96878.h | 2 +- include/configs/bcm_ns3.h | 2 +- include/configs/bcmns.h | 2 +- include/configs/bcmstb.h | 2 +- include/configs/beacon-rzg2m.h | 2 +- include/configs/bk4r1.h | 2 +- include/configs/bmips_bcm3380.h | 2 +- include/configs/bmips_bcm6318.h | 2 +- include/configs/bmips_bcm63268.h | 2 +- include/configs/bmips_bcm6328.h | 2 +- include/configs/bmips_bcm6338.h | 2 +- include/configs/bmips_bcm6348.h | 2 +- include/configs/bmips_bcm6358.h | 2 +- include/configs/bmips_bcm6362.h | 2 +- include/configs/bmips_bcm6368.h | 2 +- include/configs/bmips_bcm6838.h | 2 +- include/configs/bmips_common.h | 2 +- include/configs/broadcom_bcm968380gerg.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/brsmarc1.h | 2 +- include/configs/brxre1.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/bur_cfg_common.h | 2 +- include/configs/capricorn-common.h | 2 +- include/configs/cgtqmx8.h | 2 +- include/configs/cherryhill.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/chromebook_coral.h | 2 +- include/configs/chromebook_link.h | 2 +- include/configs/chromebook_samus.h | 2 +- include/configs/chromebox_panther.h | 2 +- include/configs/ci20.h | 2 +- include/configs/cl-som-imx7.h | 2 +- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/cmpc885.h | 2 +- include/configs/cmpcpro.h | 2 +- include/configs/cobra5272.h | 2 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri-imx8x.h | 2 +- include/configs/colibri_imx6.h | 2 +- include/configs/colibri_imx7.h | 2 +- include/configs/colibri_t20.h | 2 +- include/configs/colibri_t30.h | 2 +- include/configs/colibri_vf.h | 2 +- include/configs/comtrend_ar5315u.h | 2 +- include/configs/comtrend_ar5387un.h | 2 +- include/configs/comtrend_ct5361.h | 2 +- include/configs/comtrend_vr3032u.h | 2 +- include/configs/comtrend_wap5813n.h | 2 +- include/configs/condor.h | 2 +- include/configs/conga-qeval20-qa3-e3845.h | 2 +- include/configs/controlcenterdc.h | 2 +- include/configs/coreboot.h | 2 +- include/configs/corstone1000.h | 2 +- include/configs/corvus.h | 2 +- include/configs/cougarcanyon2.h | 2 +- include/configs/crownbay.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/dart_6ul.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/deneb.h | 2 +- include/configs/devkit3250.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/dfi-bt700.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/display5.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/draak.h | 2 +- include/configs/draco.h | 2 +- include/configs/dragonboard410c.h | 2 +- include/configs/dragonboard820c.h | 2 +- include/configs/dragonboard845c.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/ds116.h | 2 +- include/configs/ds414.h | 2 +- include/configs/durian.h | 2 +- include/configs/ea-lpc3250devkitv2.h | 2 +- include/configs/eb_cpu5282.h | 2 +- include/configs/ebisu.h | 2 +- include/configs/edison.h | 2 +- include/configs/efi-x86_app.h | 2 +- include/configs/efi-x86_payload.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/elgin_rv1108.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/emsdp.h | 2 +- include/configs/espresso7420.h | 2 +- include/configs/etamin.h | 2 +- include/configs/ethernut5.h | 2 +- include/configs/evb_ast2500.h | 2 +- include/configs/evb_ast2600.h | 2 +- include/configs/evb_px30.h | 2 +- include/configs/evb_px5.h | 2 +- include/configs/evb_rk3036.h | 2 +- include/configs/evb_rk3128.h | 2 +- include/configs/evb_rk3229.h | 2 +- include/configs/evb_rk3288.h | 2 +- include/configs/evb_rk3328.h | 2 +- include/configs/evb_rk3399.h | 2 +- include/configs/evb_rk3568.h | 2 +- include/configs/evb_rk3588.h | 2 +- include/configs/evb_rv1108.h | 2 +- include/configs/exynos-common.h | 2 +- include/configs/exynos4-common.h | 2 +- include/configs/exynos5-common.h | 2 +- include/configs/exynos5-dt-common.h | 2 +- include/configs/exynos5250-common.h | 2 +- include/configs/exynos5420-common.h | 2 +- include/configs/exynos7420-common.h | 2 +- include/configs/exynos78x0-common.h | 2 +- include/configs/falcon.h | 2 +- include/configs/firefly-rk3288.h | 2 +- include/configs/firefly_rk3308.h | 2 +- include/configs/galileo.h | 2 +- include/configs/gardena-smart-gateway-at91sam.h | 2 +- include/configs/gardena-smart-gateway-mt7688.h | 2 +- include/configs/gazerbeam.h | 2 +- include/configs/ge_b1x5v2.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/geekbox.h | 2 +- include/configs/giedi.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/grpeach.h | 2 +- include/configs/gru.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/gw_ventana.h | 2 +- include/configs/gxp.h | 2 +- include/configs/harmony.h | 2 +- include/configs/hc2910-2aghd05.h | 2 +- include/configs/helios4.h | 2 +- include/configs/highbank.h | 2 +- include/configs/hihope-rzg2.h | 2 +- include/configs/hikey.h | 2 +- include/configs/hikey960.h | 2 +- include/configs/hsdk-4xd.h | 2 +- include/configs/hsdk.h | 2 +- include/configs/huawei_hg556a.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/imgtec_xilfpga.h | 2 +- include/configs/imx6-engicam.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/imx6dl-mamoj.h | 2 +- include/configs/imx6q-bosch-acc.h | 2 +- include/configs/imx6ulz_smm_m2.h | 2 +- include/configs/imx7-cm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mm-mx8menlo.h | 2 +- include/configs/imx8mm_beacon.h | 2 +- include/configs/imx8mm_data_modul_edm_sbc.h | 2 +- include/configs/imx8mm_evk.h | 2 +- include/configs/imx8mm_icore_mx8mm.h | 2 +- include/configs/imx8mm_phg.h | 2 +- include/configs/imx8mm_venice.h | 2 +- include/configs/imx8mn_beacon.h | 2 +- include/configs/imx8mn_bsh_smm_s2.h | 2 +- include/configs/imx8mn_bsh_smm_s2_common.h | 2 +- include/configs/imx8mn_bsh_smm_s2pro.h | 2 +- include/configs/imx8mn_evk.h | 2 +- include/configs/imx8mn_var_som.h | 2 +- include/configs/imx8mn_venice.h | 2 +- include/configs/imx8mp_beacon.h | 2 +- include/configs/imx8mp_data_modul_edm_sbc.h | 2 +- include/configs/imx8mp_dhcom_pdk2.h | 2 +- include/configs/imx8mp_evk.h | 2 +- include/configs/imx8mp_icore_mx8mp.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/imx8mp_venice.h | 2 +- include/configs/imx8mq_cm.h | 2 +- include/configs/imx8mq_evk.h | 2 +- include/configs/imx8mq_phanbell.h | 2 +- include/configs/imx8mq_reform2.h | 2 +- include/configs/imx8qm_dmsse20.h | 2 +- include/configs/imx8qm_mek.h | 2 +- include/configs/imx8qm_rom7720.h | 2 +- include/configs/imx8qxp_mek.h | 2 +- include/configs/imx8ulp_evk.h | 2 +- include/configs/imx93_evk.h | 2 +- include/configs/imxrt1020-evk.h | 2 +- include/configs/imxrt1050-evk.h | 2 +- include/configs/imxrt1170-evk.h | 2 +- include/configs/integrator-common.h | 2 +- include/configs/integratorap.h | 2 +- include/configs/integratorcp.h | 2 +- include/configs/iot2050.h | 2 +- include/configs/iot_devkit.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/j721s2_evm.h | 2 +- include/configs/jethub.h | 2 +- include/configs/k2e_evm.h | 2 +- include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- include/configs/khadas-vim3_android.h | 2 +- include/configs/khadas-vim3l_android.h | 2 +- include/configs/km/pg-wcom-ls102xa.h | 2 +- include/configs/km832x.h | 2 +- include/configs/kmcent2.h | 2 +- include/configs/kmcoge5ne.h | 2 +- include/configs/kmeter1.h | 2 +- include/configs/kontron-sl-mx6ul.h | 2 +- include/configs/kontron-sl-mx8mm.h | 2 +- include/configs/kontron_pitx_imx8m.h | 2 +- include/configs/kontron_sl28.h | 2 +- include/configs/kp_imx53.h | 2 +- include/configs/kp_imx6q_tpc.h | 2 +- include/configs/kylin_rk3036.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/legoev3.h | 2 +- include/configs/librem5.h | 2 +- include/configs/libretech-ac.h | 2 +- include/configs/linkit-smart-7688.h | 2 +- include/configs/lion_rk3368.h | 2 +- include/configs/liteboard.h | 2 +- include/configs/ls1012a2g5rdb.h | 2 +- include/configs/ls1012a_common.h | 2 +- include/configs/ls1012afrdm.h | 2 +- include/configs/ls1012afrwy.h | 2 +- include/configs/ls1012aqds.h | 2 +- include/configs/ls1012ardb.h | 2 +- include/configs/ls1021aiot.h | 2 +- include/configs/ls1021aqds.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/ls1028a_common.h | 2 +- include/configs/ls1028aqds.h | 2 +- include/configs/ls1028ardb.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1043aqds.h | 2 +- include/configs/ls1043ardb.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1046afrwy.h | 2 +- include/configs/ls1046aqds.h | 2 +- include/configs/ls1046ardb.h | 2 +- include/configs/ls1088a_common.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/ls2080aqds.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/lsxl.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/lx2160aqds.h | 2 +- include/configs/lx2160ardb.h | 2 +- include/configs/lx2162aqds.h | 2 +- include/configs/m53menlo.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/mcr3000.h | 2 +- include/configs/medcom-wide.h | 2 +- include/configs/meerkat96.h | 2 +- include/configs/meesc.h | 2 +- include/configs/meson64.h | 2 +- include/configs/meson64_android.h | 2 +- include/configs/microblaze-generic.h | 2 +- include/configs/microchip_mpfs_icicle.h | 2 +- include/configs/minnowmax.h | 2 +- include/configs/miqi_rk3288.h | 2 +- include/configs/mk808.h | 2 +- include/configs/mt8183.h | 2 +- include/configs/mt8516.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/mvebu_alleycat-5.h | 2 +- include/configs/mvebu_armada-37xx.h | 2 +- include/configs/mvebu_armada-8k.h | 2 +- include/configs/mx23_olinuxino.h | 2 +- include/configs/mx23evk.h | 2 +- include/configs/mx28evk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53cx9020.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53ppd.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6sabreauto.h | 2 +- include/configs/mx6sabresd.h | 2 +- include/configs/mx6slevk.h | 2 +- include/configs/mx6sllevk.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mx7_common.h | 2 +- include/configs/mx7dsabresd.h | 2 +- include/configs/mx7ulp_com.h | 2 +- include/configs/mx7ulp_evk.h | 2 +- include/configs/mys_6ulx.h | 2 +- include/configs/n2350.h | 2 +- include/configs/nas220.h | 2 +- include/configs/netgear_cg3100d.h | 2 +- include/configs/netgear_dgnd3700v2.h | 2 +- include/configs/neural-compute-module-2.h | 2 +- include/configs/neural-compute-module-6.h | 2 +- include/configs/nitrogen6x.h | 2 +- include/configs/novena.h | 2 +- include/configs/npi_imx6ull.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/nsa325.h | 2 +- include/configs/nsim.h | 2 +- include/configs/nyan-big.h | 2 +- include/configs/o4-imx6ull-nano.h | 2 +- include/configs/octeon_common.h | 2 +- include/configs/octeon_ebb7304.h | 2 +- include/configs/octeon_nic23.h | 2 +- include/configs/odroid.h | 2 +- include/configs/odroid_go2.h | 2 +- include/configs/odroid_m1.h | 2 +- include/configs/odroid_xu3.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_igep00x0.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omap4_panda.h | 2 +- include/configs/omap4_sdp4430.h | 2 +- include/configs/openpiton-riscv64.h | 2 +- include/configs/openrd.h | 2 +- include/configs/opos6uldev.h | 2 +- include/configs/origen.h | 2 +- include/configs/owl-common.h | 2 +- include/configs/p1_p2_bootsrc.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/p2371-0000.h | 2 +- include/configs/p2371-2180.h | 2 +- include/configs/p2571.h | 2 +- include/configs/p3450-0000.h | 2 +- include/configs/pcl063.h | 2 +- include/configs/pcl063_ull.h | 2 +- include/configs/pcm052.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pdu001.h | 2 +- include/configs/peach-pi.h | 2 +- include/configs/peach-pit.h | 2 +- include/configs/pg-wcom-expu1.h | 2 +- include/configs/pg-wcom-seli8.h | 2 +- include/configs/phycore_am335x_r2.h | 2 +- include/configs/phycore_rk3288.h | 2 +- include/configs/pic32mzdask.h | 2 +- include/configs/pico-imx6.h | 2 +- include/configs/pico-imx6ul.h | 2 +- include/configs/pico-imx7d.h | 2 +- include/configs/pico-imx8mq.h | 2 +- include/configs/pinebook-pro-rk3399.h | 2 +- include/configs/pinephone-pro-rk3399.h | 2 +- include/configs/plutux.h | 2 +- include/configs/pm9261.h | 2 +- include/configs/pm9263.h | 2 +- include/configs/pm9g45.h | 2 +- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/poleg.h | 2 +- include/configs/pomelo.h | 2 +- include/configs/poplar.h | 2 +- include/configs/popmetal_rk3288.h | 2 +- include/configs/presidio_asic.h | 2 +- include/configs/puma_rk3399.h | 2 +- include/configs/px30_common.h | 2 +- include/configs/px30_core.h | 2 +- include/configs/pxm2.h | 2 +- include/configs/qcs404-evb.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/qemu-ppce500.h | 2 +- include/configs/qemu-riscv.h | 2 +- include/configs/qemu-x86.h | 2 +- include/configs/quartz64_rk3566.h | 2 +- include/configs/rastaban.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/rcar-gen4-common.h | 2 +- include/configs/ringneck_px30.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3066_common.h | 2 +- include/configs/rk3128_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3308_common.h | 2 +- include/configs/rk3328_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rk3399_common.h | 2 +- include/configs/rk3568_common.h | 2 +- include/configs/rk3588_common.h | 2 +- include/configs/roc-pc-rk3399.h | 2 +- include/configs/rock.h | 2 +- include/configs/rock2.h | 2 +- include/configs/rock5a-rk3588s.h | 2 +- include/configs/rock5b-rk3588.h | 2 +- include/configs/rock960_rk3399.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rockpro64_rk3399.h | 2 +- include/configs/rut.h | 2 +- include/configs/rv1108_common.h | 2 +- include/configs/rv1126_common.h | 2 +- include/configs/rzg2l-smarc.h | 2 +- include/configs/rzn1-snarc.h | 2 +- include/configs/s5p4418_nanopi2.h | 2 +- include/configs/s5p_goni.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/sagem_f(a)st1704.h | 2 +- include/configs/salvator-x.h | 2 +- include/configs/sam9x60_curiosity.h | 2 +- include/configs/sam9x60ek.h | 2 +- include/configs/sama5d27_som1_ek.h | 2 +- include/configs/sama5d27_wlsom1_ek.h | 2 +- include/configs/sama5d29_curiosity.h | 2 +- include/configs/sama5d2_icp.h | 2 +- include/configs/sama5d2_ptc_ek.h | 2 +- include/configs/sama5d2_xplained.h | 2 +- include/configs/sama5d3_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- include/configs/sama5d4_xplained.h | 2 +- include/configs/sama5d4ek.h | 2 +- include/configs/sama7g5ek.h | 2 +- include/configs/sandbox.h | 2 +- include/configs/sandbox_spl.h | 2 +- include/configs/sdm845.h | 2 +- include/configs/seaboard.h | 2 +- include/configs/sei510.h | 2 +- include/configs/sei610.h | 2 +- include/configs/sfr_nb4_ser.h | 2 +- include/configs/sheep_rk3368.h | 2 +- include/configs/sheevaplug.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/siemens-env-common.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/sifive-unmatched.h | 2 +- include/configs/silinux-ek874.h | 2 +- include/configs/sipeed-maix.h | 2 +- include/configs/slimbootloader.h | 2 +- include/configs/smartweb.h | 2 +- include/configs/smdk5250.h | 2 +- include/configs/smdk5420.h | 2 +- include/configs/smdkc100.h | 2 +- include/configs/smdkv310.h | 2 +- include/configs/smegw01.h | 2 +- include/configs/snapper9g45.h | 2 +- include/configs/sniper.h | 2 +- include/configs/snow.h | 2 +- include/configs/socfpga_arria5_secu1.h | 2 +- include/configs/socfpga_arria5_socdk.h | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/socfpga_cyclone5_socdk.h | 2 +- include/configs/socfpga_dbm_soc1.h | 2 +- include/configs/socfpga_de0_nano_soc.h | 2 +- include/configs/socfpga_de10_nano.h | 2 +- include/configs/socfpga_de10_standard.h | 2 +- include/configs/socfpga_de1_soc.h | 2 +- include/configs/socfpga_is1.h | 2 +- include/configs/socfpga_mcvevk.h | 2 +- include/configs/socfpga_sockit.h | 2 +- include/configs/socfpga_socrates.h | 2 +- include/configs/socfpga_sr1500.h | 2 +- include/configs/socfpga_vining_fpga.h | 2 +- include/configs/socrates.h | 2 +- include/configs/som-db5800-som-6867.h | 2 +- include/configs/somlabs_visionsom_6ull.h | 2 +- include/configs/spider.h | 2 +- include/configs/spring.h | 2 +- include/configs/starfive-visionfive2.h | 2 +- include/configs/stih410-b2260.h | 2 +- include/configs/stm32f429-discovery.h | 2 +- include/configs/stm32f429-evaluation.h | 2 +- include/configs/stm32f469-discovery.h | 2 +- include/configs/stm32f746-disco.h | 2 +- include/configs/stm32h743-disco.h | 2 +- include/configs/stm32h743-eval.h | 2 +- include/configs/stm32h750-art-pi.h | 2 +- include/configs/stm32mp15_common.h | 2 +- include/configs/stm32mp15_dh_dhsom.h | 2 +- include/configs/stm32mp15_st_common.h | 2 +- include/configs/stmark2.h | 2 +- include/configs/stv0991.h | 2 +- include/configs/sun4i.h | 2 +- include/configs/sun50i.h | 2 +- include/configs/sun5i.h | 2 +- include/configs/sun6i.h | 2 +- include/configs/sun7i.h | 2 +- include/configs/sun8i.h | 2 +- include/configs/sun9i.h | 2 +- include/configs/suniv.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/syzygy_hub.h | 2 +- include/configs/taurus.h | 2 +- include/configs/tb100.h | 2 +- include/configs/tbs2910.h | 2 +- include/configs/tec-ng.h | 2 +- include/configs/tec.h | 2 +- include/configs/tegra-common-post.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra210-common.h | 2 +- include/configs/tegra30-common.h | 2 +- include/configs/ten64.h | 2 +- include/configs/th1520_lpi4a.h | 2 +- include/configs/theadorable-x86-common.h | 2 +- include/configs/theadorable-x86-conga-qa3-e3845.h | 2 +- include/configs/theadorable-x86-dfi-bt700.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/thuban.h | 2 +- include/configs/thunderx_88xx.h | 2 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/ti_armv7_omap.h | 2 +- include/configs/ti_omap3_common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- include/configs/tinker_rk3288.h | 2 +- include/configs/topic_miami.h | 2 +- include/configs/total_compute.h | 2 +- include/configs/tplink_wdr4300.h | 2 +- include/configs/tqma6.h | 2 +- include/configs/tqma6_mba6.h | 2 +- include/configs/tqma6_wru4.h | 2 +- include/configs/trats.h | 2 +- include/configs/trats2.h | 2 +- include/configs/trimslice.h | 2 +- include/configs/turris_mox.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/ulcb.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/usb_a9263.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/v3hsk.h | 2 +- include/configs/vcoreiii.h | 2 +- include/configs/venice2.h | 2 +- include/configs/ventana.h | 2 +- include/configs/verdin-imx8mm.h | 2 +- include/configs/vexpress_aemv8.h | 2 +- include/configs/vexpress_ca9x4.h | 2 +- include/configs/vexpress_common.h | 2 +- include/configs/veyron.h | 2 +- include/configs/vf610twr.h | 2 +- include/configs/vinco.h | 2 +- include/configs/vining_2000.h | 2 +- include/configs/vocore2.h | 2 +- include/configs/vyasa-rk3288.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/warp7.h | 2 +- include/configs/whitehawk.h | 2 +- include/configs/work_92105.h | 2 +- include/configs/x240.h | 2 +- include/configs/x530.h | 2 +- include/configs/x86-chromebook.h | 2 +- include/configs/x86-common.h | 2 +- include/configs/xea.h | 2 +- include/configs/xenguest_arm64.h | 2 +- include/configs/xilinx_versal.h | 2 +- include/configs/xilinx_zynqmp.h | 2 +- include/configs/xilinx_zynqmp_mini.h | 2 +- include/configs/xilinx_zynqmp_mini_nand.h | 2 +- include/configs/xpress.h | 2 +- include/configs/xtfpga.h | 2 +- include/configs/zynq-common.h | 2 +- include/configs/zynq_cse.h | 2 +- include/console.h | 2 +- include/cortina.h | 2 +- include/cp1250.h | 2 +- include/cp437.h | 2 +- include/cpu.h | 2 +- include/cpu_func.h | 2 +- include/cros_ec.h | 2 +- include/cros_ec_message.h | 2 +- include/crypt.h | 2 +- include/crypto/ecdsa-uclass.h | 2 +- include/cyclic.h | 2 +- include/debug_uart.h | 2 +- include/dfu.h | 2 +- include/dialog_pmic.h | 2 +- include/display.h | 2 +- include/display_options.h | 2 +- include/dm-demo.h | 2 +- include/dm.h | 2 +- include/dm/acpi.h | 2 +- include/dm/device-internal.h | 2 +- include/dm/device.h | 2 +- include/dm/device_compat.h | 2 +- include/dm/devres.h | 2 +- include/dm/fdtaddr.h | 2 +- include/dm/lists.h | 2 +- include/dm/of.h | 2 +- include/dm/of_access.h | 2 +- include/dm/of_addr.h | 2 +- include/dm/of_extra.h | 2 +- include/dm/ofnode.h | 2 +- include/dm/ofnode_decl.h | 2 +- include/dm/pci.h | 2 +- include/dm/pinctrl.h | 2 +- include/dm/platdata.h | 2 +- include/dm/platform_data/fsl_espi.h | 2 +- include/dm/platform_data/pfe_dm_eth.h | 2 +- include/dm/platform_data/serial_bcm283x_mu.h | 2 +- include/dm/platform_data/serial_coldfire.h | 2 +- include/dm/platform_data/serial_mxc.h | 2 +- include/dm/platform_data/serial_pl01x.h | 2 +- include/dm/platform_data/serial_sh.h | 2 +- include/dm/platform_data/spi_coldfire.h | 2 +- include/dm/platform_data/spi_davinci.h | 2 +- include/dm/read.h | 2 +- include/dm/root.h | 2 +- include/dm/simple_bus.h | 2 +- include/dm/tag.h | 2 +- include/dm/test.h | 2 +- include/dm/uclass-id.h | 2 +- include/dm/uclass-internal.h | 2 +- include/dm/uclass.h | 2 +- include/dm/util.h | 2 +- include/dma-uclass.h | 2 +- include/dma.h | 2 +- include/dsi_host.h | 2 +- include/dt-bindings/clk/mpc83xx-clk.h | 2 +- include/dt-bindings/clock/actions,s900-cmu.h | 2 +- include/dt-bindings/clock/ast2600-clock.h | 2 +- include/dt-bindings/clock/axg-aoclkc.h | 2 +- include/dt-bindings/clock/axg-clkc.h | 2 +- include/dt-bindings/clock/bcm3380-clock.h | 2 +- include/dt-bindings/clock/bcm6318-clock.h | 2 +- include/dt-bindings/clock/bcm63268-clock.h | 2 +- include/dt-bindings/clock/bcm6328-clock.h | 2 +- include/dt-bindings/clock/bcm6338-clock.h | 2 +- include/dt-bindings/clock/bcm6348-clock.h | 2 +- include/dt-bindings/clock/bcm6358-clock.h | 2 +- include/dt-bindings/clock/bcm6362-clock.h | 2 +- include/dt-bindings/clock/bcm6368-clock.h | 2 +- include/dt-bindings/clock/g12a-aoclkc.h | 2 +- include/dt-bindings/clock/g12a-clkc.h | 2 +- include/dt-bindings/clock/imx7ulp-clock.h | 2 +- include/dt-bindings/clock/imx8qm-clock.h | 2 +- include/dt-bindings/clock/imx8qxp-clock.h | 2 +- include/dt-bindings/clock/imx8ulp-clock.h | 2 +- include/dt-bindings/clock/imx93-clock.h | 2 +- include/dt-bindings/clock/imxrt1020-clock.h | 2 +- include/dt-bindings/clock/imxrt1050-clock.h | 2 +- include/dt-bindings/clock/imxrt1170-clock.h | 2 +- include/dt-bindings/clock/intel-clock.h | 2 +- include/dt-bindings/clock/jz4780-cgu.h | 2 +- include/dt-bindings/clock/k210-sysctl.h | 2 +- include/dt-bindings/clock/microchip,clock.h | 2 +- include/dt-bindings/clock/octeon-clock.h | 2 +- include/dt-bindings/clock/r8a7790-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7791-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7792-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7793-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7794-clock.h | 2 +- include/dt-bindings/clock/r8a7794-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7795-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a7796-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a77961-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a77970-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a77980-cpg-mssr.h | 2 +- include/dt-bindings/clock/r8a77995-cpg-mssr.h | 2 +- include/dt-bindings/clock/rk3036-cru.h | 2 +- include/dt-bindings/clock/rk3066a-cru.h | 2 +- include/dt-bindings/clock/rk3188-cru.h | 2 +- include/dt-bindings/clock/rk3399-cru.h | 2 +- include/dt-bindings/clock/rockchip,rv1126-cru.h | 2 +- include/dt-bindings/clock/rv1108-cru.h | 2 +- include/dt-bindings/clock/starfive,jh7110-crg.h | 2 +- include/dt-bindings/clock/stm32mp1-clksrc.h | 2 +- include/dt-bindings/clock/sun50i-h6-ccu.h | 2 +- include/dt-bindings/clock/sun50i-h616-ccu.h | 2 +- include/dt-bindings/clock/sun6i-rtc.h | 2 +- include/dt-bindings/clock/sun8i-de2.h | 2 +- include/dt-bindings/clock/sun8i-tcon-top.h | 2 +- include/dt-bindings/clock/suniv-ccu-f1c100s.h | 2 +- include/dt-bindings/comphy/comphy_data.h | 2 +- include/dt-bindings/dma/bcm6318-dma.h | 2 +- include/dt-bindings/dma/bcm63268-dma.h | 2 +- include/dt-bindings/dma/bcm6328-dma.h | 2 +- include/dt-bindings/dma/bcm6338-dma.h | 2 +- include/dt-bindings/dma/bcm6348-dma.h | 2 +- include/dt-bindings/dma/bcm6358-dma.h | 2 +- include/dt-bindings/dma/bcm6362-dma.h | 2 +- include/dt-bindings/dma/bcm6368-dma.h | 2 +- include/dt-bindings/gpio/aspeed-gpio.h | 2 +- include/dt-bindings/gpio/meson-a1-gpio.h | 2 +- include/dt-bindings/gpio/meson-axg-gpio.h | 2 +- include/dt-bindings/gpio/meson-g12a-gpio.h | 2 +- include/dt-bindings/interrupt-router/intel-irq.h | 2 +- include/dt-bindings/memory/bcm-ns3-mc.h | 2 +- include/dt-bindings/memory/imxrt-sdram.h | 2 +- include/dt-bindings/memory/mpc83xx-sdram.h | 2 +- include/dt-bindings/mfd/k210-sysctl.h | 2 +- include/dt-bindings/mrc/quark.h | 2 +- include/dt-bindings/mscc/jr2_data.h | 2 +- include/dt-bindings/mscc/luton_data.h | 2 +- include/dt-bindings/mscc/ocelot_data.h | 2 +- include/dt-bindings/mscc/serval_data.h | 2 +- include/dt-bindings/net/mscc-phy-vsc8531.h | 2 +- include/dt-bindings/pci/pci.h | 2 +- include/dt-bindings/phy/phy-imx8-pcie.h | 2 +- include/dt-bindings/pinctrl/apple.h | 2 +- include/dt-bindings/pinctrl/brcm,pinctrl-ns3.h | 2 +- include/dt-bindings/pinctrl/k210-pinctrl.h | 2 +- include/dt-bindings/pinctrl/pads-imx8qm.h | 2 +- include/dt-bindings/pinctrl/pads-imx8qxp.h | 2 +- include/dt-bindings/pinctrl/rockchip.h | 2 +- include/dt-bindings/pinctrl/stm32-pinfunc.h | 2 +- include/dt-bindings/pmic/sandbox_pmic.h | 2 +- include/dt-bindings/power-domain/bcm6318-power-domain.h | 2 +- include/dt-bindings/power-domain/bcm63268-power-domain.h | 2 +- include/dt-bindings/power-domain/bcm6328-power-domain.h | 2 +- include/dt-bindings/power-domain/bcm6362-power-domain.h | 2 +- include/dt-bindings/power/meson-a1-power.h | 2 +- include/dt-bindings/power/meson-axg-power.h | 2 +- include/dt-bindings/power/meson-g12a-power.h | 2 +- include/dt-bindings/power/meson-gxbb-power.h | 2 +- include/dt-bindings/power/meson-sm1-power.h | 2 +- include/dt-bindings/power/owl-s700-powergate.h | 2 +- include/dt-bindings/reset/amlogic,meson-a1-reset.h | 2 +- include/dt-bindings/reset/amlogic,meson-axg-reset.h | 2 +- include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 2 +- include/dt-bindings/reset/ast2500-reset.h | 2 +- include/dt-bindings/reset/ast2600-reset.h | 2 +- include/dt-bindings/reset/axg-aoclkc.h | 2 +- include/dt-bindings/reset/bcm3380-reset.h | 2 +- include/dt-bindings/reset/bcm6318-reset.h | 2 +- include/dt-bindings/reset/bcm63268-reset.h | 2 +- include/dt-bindings/reset/bcm6328-reset.h | 2 +- include/dt-bindings/reset/bcm6338-reset.h | 2 +- include/dt-bindings/reset/bcm6348-reset.h | 2 +- include/dt-bindings/reset/bcm6358-reset.h | 2 +- include/dt-bindings/reset/bcm6362-reset.h | 2 +- include/dt-bindings/reset/bcm6368-reset.h | 2 +- include/dt-bindings/reset/g12a-aoclkc.h | 2 +- include/dt-bindings/reset/k210-sysctl.h | 2 +- include/dt-bindings/reset/starfive,jh7110-crg.h | 2 +- include/dt-bindings/reset/sun50i-h6-ccu.h | 2 +- include/dt-bindings/reset/sun50i-h6-r-ccu.h | 2 +- include/dt-bindings/reset/sun50i-h616-ccu.h | 2 +- include/dt-bindings/reset/sun8i-de2.h | 2 +- include/dt-bindings/reset/suniv-ccu-f1c100s.h | 2 +- include/dt-bindings/soc/bcm2835-pm.h | 2 +- include/dt-bindings/soc/imx8_pd.h | 2 +- include/dt-bindings/soc/imx_rsrc.h | 2 +- include/dt-bindings/sound/azalia.h | 2 +- include/dt-structs.h | 2 +- include/dw_hdmi.h | 2 +- include/dwc3-sti-glue.h | 2 +- include/dwc_ahsata.h | 2 +- include/dwmmc.h | 2 +- include/edid.h | 2 +- include/eeprom.h | 2 +- include/eeprom_field.h | 2 +- include/eeprom_layout.h | 2 +- include/efi_config.h | 2 +- include/efi_default_filename.h | 2 +- include/efi_driver.h | 2 +- include/efi_dt_fixup.h | 2 +- include/efi_load_initrd.h | 2 +- include/efi_loader.h | 2 +- include/efi_riscv.h | 2 +- include/efi_rng.h | 2 +- include/efi_selftest.h | 2 +- include/efi_tcg2.h | 2 +- include/efi_variable.h | 2 +- include/env.h | 2 +- include/env/distro/sf.h | 2 +- include/env/ti/dfu.h | 2 +- include/env/ti/k3_dfu.h | 2 +- include/env/ti/k3_rproc.h | 2 +- include/env/ti/mmc.h | 2 +- include/env/ti/nand.h | 2 +- include/env/ti/ufs.h | 2 +- include/env/x86.env | 2 +- include/env_attr.h | 2 +- include/env_callback.h | 2 +- include/env_default.h | 2 +- include/env_flags.h | 2 +- include/env_internal.h | 2 +- include/errno.h | 2 +- include/eth_phy.h | 2 +- include/ethsw.h | 2 +- include/event.h | 2 +- include/event_internal.h | 2 +- include/exception.h | 2 +- include/expo.h | 2 +- include/ext_common.h | 2 +- include/extcon.h | 2 +- include/extension_board.h | 2 +- include/extlinux.h | 2 +- include/faraday/ftsdc010.h | 2 +- include/faraday/ftsmc020.h | 2 +- include/faraday/fttmr010.h | 2 +- include/faraday/ftwdt010_wdt.h | 2 +- include/fastboot-internal.h | 2 +- include/fastboot.h | 2 +- include/fat.h | 2 +- include/fb_mmc.h | 2 +- include/fb_nand.h | 2 +- include/fdt_simplefb.h | 2 +- include/fdt_support.h | 2 +- include/fdtdec.h | 2 +- include/firmware/imx/sci/rpc.h | 2 +- include/firmware/imx/sci/sci.h | 2 +- include/firmware/imx/sci/svc/misc/api.h | 2 +- include/firmware/imx/sci/svc/pad/api.h | 2 +- include/firmware/imx/sci/svc/pm/api.h | 2 +- include/firmware/imx/sci/svc/rm/api.h | 2 +- include/firmware/imx/sci/svc/seco/api.h | 2 +- include/firmware/imx/sci/svc/timer/api.h | 2 +- include/firmware/imx/sci/types.h | 2 +- include/fis.h | 2 +- include/flash.h | 2 +- include/fm_eth.h | 2 +- include/fpga.h | 2 +- include/fsl-mc/fsl_dpaa_fd.h | 2 +- include/fsl-mc/fsl_dpbp.h | 2 +- include/fsl-mc/fsl_dpio.h | 2 +- include/fsl-mc/fsl_dpmac.h | 2 +- include/fsl-mc/fsl_dpmng.h | 2 +- include/fsl-mc/fsl_dpni.h | 2 +- include/fsl-mc/fsl_dprc.h | 2 +- include/fsl-mc/fsl_dpsparser.h | 2 +- include/fsl-mc/fsl_mc.h | 2 +- include/fsl-mc/fsl_mc_cmd.h | 2 +- include/fsl-mc/fsl_mc_private.h | 2 +- include/fsl-mc/fsl_mc_sys.h | 2 +- include/fsl-mc/fsl_qbman_base.h | 2 +- include/fsl-mc/fsl_qbman_portal.h | 2 +- include/fsl-mc/ldpaa_wriop.h | 2 +- include/fsl_csu.h | 2 +- include/fsl_ddrc_version.h | 2 +- include/fsl_devdis.h | 2 +- include/fsl_dspi.h | 2 +- include/fsl_dtsec.h | 2 +- include/fsl_errata.h | 2 +- include/fsl_esdhc.h | 2 +- include/fsl_esdhc_imx.h | 2 +- include/fsl_fman.h | 2 +- include/fsl_ifc.h | 2 +- include/fsl_immap.h | 2 +- include/fsl_lpuart.h | 2 +- include/fsl_mdio.h | 2 +- include/fsl_memac.h | 2 +- include/fsl_mmdc.h | 2 +- include/fsl_pmic.h | 2 +- include/fsl_qbman.h | 2 +- include/fsl_qe.h | 2 +- include/fsl_sec.h | 2 +- include/fsl_sec_mon.h | 2 +- include/fsl_secboot_err.h | 2 +- include/fsl_sfp.h | 2 +- include/fsl_tgec.h | 2 +- include/fsl_usb.h | 2 +- include/fsl_validate.h | 2 +- include/fsl_wdog.h | 2 +- include/fuse.h | 2 +- include/fuzzing_engine.h | 2 +- include/g_dnl.h | 2 +- include/gdsys_fpga.h | 2 +- include/generic-phy.h | 2 +- include/gsc.h | 2 +- include/gzip.h | 2 +- include/handoff.h | 2 +- include/hang.h | 2 +- include/hash.h | 2 +- include/hexdump.h | 2 +- include/host_arch.h | 2 +- include/hw_sha.h | 2 +- include/hwconfig.h | 2 +- include/hwspinlock.h | 2 +- include/i2c.h | 2 +- include/i2c_eeprom.h | 2 +- include/i2s.h | 2 +- include/i8042.h | 2 +- include/ide.h | 2 +- include/image-android-dt.h | 2 +- include/image-sparse.h | 2 +- include/image.h | 2 +- include/imx8image.h | 2 +- include/imx_container.h | 2 +- include/imx_lpi2c.h | 2 +- include/imx_sip.h | 2 +- include/imx_thermal.h | 2 +- include/imximage.h | 2 +- include/init.h | 2 +- include/initcall.h | 2 +- include/input.h | 2 +- include/inttypes.h | 2 +- include/iomux.h | 2 +- include/iotrace.h | 2 +- include/ipu_pixfmt.h | 2 +- include/irq_func.h | 2 +- include/jffs2/load_kernel.h | 2 +- include/jffs2/mini_inflate.h | 2 +- include/k210/pll.h | 2 +- include/k3-avs.h | 2 +- include/k3-clk.h | 2 +- include/k3-ddrss.h | 2 +- include/k3-dev.h | 2 +- include/key_matrix.h | 2 +- include/lattice.h | 2 +- include/led.h | 2 +- include/libata.h | 2 +- include/libtizen.h | 2 +- include/linker_lists.h | 2 +- include/linux/apm_bios.h | 2 +- include/linux/bitmap.h | 2 +- include/linux/clk-provider.h | 2 +- include/linux/delay.h | 2 +- include/linux/if_ether.h | 2 +- include/linux/immap_qe.h | 2 +- include/linux/io.h | 2 +- include/linux/linkage.h | 2 +- include/linux/log2.h | 2 +- include/linux/mfd/syscon/atmel-matrix.h | 2 +- include/linux/mtd/bbm.h | 2 +- include/linux/mtd/concat.h | 2 +- include/linux/mtd/flashchip.h | 2 +- include/linux/mtd/mtd.h | 2 +- include/linux/mtd/omap_gpmc.h | 2 +- include/linux/mtd/rawnand.h | 2 +- include/linux/mtd/samsung_onenand.h | 2 +- include/linux/mtd/ubi.h | 2 +- include/linux/netdevice.h | 2 +- include/linux/pruss_driver.h | 2 +- include/linux/rbtree.h | 2 +- include/linux/rbtree_augmented.h | 2 +- include/linux/serial_reg.h | 2 +- include/linux/soc/ti/k3-navss-ringacc.h | 2 +- include/linux/soc/ti/k3-sec-proxy.h | 2 +- include/linux/soc/ti/ti_sci_protocol.h | 2 +- include/linux/usb/at91_udc.h | 2 +- include/linux/usb/atmel_usba_udc.h | 2 +- include/linux/usb/composite.h | 2 +- include/linux/usb/dwc3-omap.h | 2 +- include/linux/usb/dwc3.h | 2 +- include/linux/usb/otg.h | 2 +- include/linux/usb/usb_urb_compat.h | 2 +- include/linux/usb/xhci-fsl.h | 2 +- include/linux/usb/xhci-omap.h | 2 +- include/linux/zstd.h | 2 +- include/lmb.h | 2 +- include/log.h | 2 +- include/lzma/LzmaDec.h | 2 +- include/lzma/LzmaTools.h | 2 +- include/lzma/LzmaTypes.h | 2 +- include/malloc.h | 2 +- include/mc13892.h | 2 +- include/memalign.h | 2 +- include/membuff.h | 2 +- include/menu.h | 2 +- include/meson/sm.h | 2 +- include/misc.h | 2 +- include/mm_communication.h | 2 +- include/mmc.h | 2 +- include/mpc83xx.h | 2 +- include/mpc8xx.h | 2 +- include/msc01.h | 2 +- include/mtd.h | 2 +- include/mtd/cfi_flash.h | 2 +- include/mtd/mtd-abi.h | 2 +- include/mtd/ubi-user.h | 2 +- include/mux-internal.h | 2 +- include/mux.h | 2 +- include/mv88e6352.h | 2 +- include/mvebu/comphy.h | 2 +- include/mvebu_mmc.h | 2 +- include/mxs_nand.h | 2 +- include/ndisc.h | 2 +- include/net/dsa.h | 2 +- include/net/ldpaa_eth.h | 2 +- include/net/ncsi.h | 2 +- include/net/pfe_eth/pfe/cbus.h | 2 +- include/net/pfe_eth/pfe/cbus/bmu.h | 2 +- include/net/pfe_eth/pfe/cbus/class_csr.h | 2 +- include/net/pfe_eth/pfe/cbus/emac.h | 2 +- include/net/pfe_eth/pfe/cbus/gpi.h | 2 +- include/net/pfe_eth/pfe/cbus/hif.h | 2 +- include/net/pfe_eth/pfe/cbus/hif_nocpy.h | 2 +- include/net/pfe_eth/pfe/cbus/tmu_csr.h | 2 +- include/net/pfe_eth/pfe/cbus/util_csr.h | 2 +- include/net/pfe_eth/pfe/pfe_hw.h | 2 +- include/net/pfe_eth/pfe_driver.h | 2 +- include/net/pfe_eth/pfe_eth.h | 2 +- include/net/pfe_eth/pfe_firmware.h | 2 +- include/net/pfe_eth/pfe_mdio.h | 2 +- include/net/sntp.h | 2 +- include/net/udp.h | 2 +- include/net6.h | 2 +- include/netdev.h | 2 +- include/nuvoton_nct6102d.h | 2 +- include/nvme.h | 2 +- include/nvmem.h | 2 +- include/nvmxip.h | 2 +- include/of_live.h | 2 +- include/omap3_spi.h | 2 +- include/os.h | 2 +- include/p2sb.h | 2 +- include/palmas.h | 2 +- include/panel.h | 2 +- include/part.h | 2 +- include/part_efi.h | 2 +- include/pch.h | 2 +- include/pci.h | 2 +- include/pci_ep.h | 2 +- include/pci_msc01.h | 2 +- include/pci_rom.h | 2 +- include/pci_tegra.h | 2 +- include/pe.h | 2 +- include/phy-sun4i-usb.h | 2 +- include/phy.h | 2 +- include/phy_interface.h | 2 +- include/phys2bus.h | 2 +- include/post.h | 2 +- include/power/act8846_pmic.h | 2 +- include/power/as3722.h | 2 +- include/power/battery.h | 2 +- include/power/da9063_pmic.h | 2 +- include/power/fan53555.h | 2 +- include/power/hi6553_pmic.h | 2 +- include/power/ltc3676_pmic.h | 2 +- include/power/max17042_fg.h | 2 +- include/power/max77686_pmic.h | 2 +- include/power/max77693_fg.h | 2 +- include/power/max77693_muic.h | 2 +- include/power/max77693_pmic.h | 2 +- include/power/max8997_muic.h | 2 +- include/power/max8997_pmic.h | 2 +- include/power/max8998_pmic.h | 2 +- include/power/mc34vr500_pmic.h | 2 +- include/power/pca9450.h | 2 +- include/power/pfuze100_pmic.h | 2 +- include/power/pfuze3000_pmic.h | 2 +- include/power/pmic.h | 2 +- include/power/power_chrg.h | 2 +- include/power/regulator.h | 2 +- include/power/rk8xx_pmic.h | 2 +- include/power/rn5t567_pmic.h | 2 +- include/power/s5m8767.h | 2 +- include/power/sandbox_pmic.h | 2 +- include/power/stpmic1.h | 2 +- include/power/tps62362.h | 2 +- include/power/tps65090.h | 2 +- include/power/tps65217.h | 2 +- include/power/tps65218.h | 2 +- include/power/tps65219.h | 2 +- include/power/tps65910.h | 2 +- include/power/tps65910_pmic.h | 2 +- include/ppc_asm.tmpl | 2 +- include/ppc_defs.h | 2 +- include/pvblock.h | 2 +- include/pwm.h | 2 +- include/pwrseq.h | 2 +- include/pxe_utils.h | 2 +- include/qfw.h | 2 +- include/ram.h | 2 +- include/rand.h | 2 +- include/rc4.h | 2 +- include/reboot-mode/reboot-mode-gpio.h | 2 +- include/reboot-mode/reboot-mode-rtc.h | 2 +- include/reboot-mode/reboot-mode.h | 2 +- include/regmap.h | 2 +- include/reiserfs.h | 2 +- include/relocate.h | 2 +- include/rng.h | 2 +- include/rtc.h | 2 +- include/rtc_def.h | 2 +- include/s_record.h | 2 +- include/samsung-usb-phy-uboot.h | 2 +- include/sandbox-adc.h | 2 +- include/sandbox-clk.h | 2 +- include/sandbox-sm.h | 2 +- include/sandbox_efi_capsule.h | 2 +- include/sandbox_host.h | 2 +- include/sandboxtee.h | 2 +- include/scmi_agent-uclass.h | 2 +- include/scp03.h | 2 +- include/scsi.h | 2 +- include/scsi_emul.h | 2 +- include/sdhci.h | 2 +- include/sdp.h | 2 +- include/semihosting.h | 2 +- include/semihostingfs.h | 2 +- include/sl28cpld.h | 2 +- include/sm-uclass.h | 2 +- include/sm.h | 2 +- include/smbios.h | 2 +- include/smem.h | 2 +- include/smsc_lpc47m.h | 2 +- include/smsc_sio1007.h | 2 +- include/soc.h | 2 +- include/sort.h | 2 +- include/sound.h | 2 +- include/sparse_defs.h | 2 +- include/spartan2.h | 2 +- include/spartan3.h | 2 +- include/spd.h | 2 +- include/spi-mem.h | 2 +- include/spi.h | 2 +- include/spl.h | 2 +- include/spl_gpio.h | 2 +- include/status_led.h | 2 +- include/stdint.h | 2 +- include/stdio_dev.h | 2 +- include/stdlib.h | 2 +- include/stm32_rcc.h | 2 +- include/stratixII.h | 2 +- include/sunxi_image.h | 2 +- include/sy8106a.h | 2 +- include/syscon.h | 2 +- include/sysinfo.h | 2 +- include/sysreset.h | 2 +- include/system-constants.h | 2 +- include/tables_csum.h | 2 +- include/tee.h | 2 +- include/test/cedit-test.h | 2 +- include/test/compression.h | 2 +- include/test/export.h | 2 +- include/test/fuzz.h | 2 +- include/test/optee.h | 2 +- include/test/overlay.h | 2 +- include/test/spl.h | 2 +- include/test/test.h | 2 +- include/test/ut.h | 2 +- include/thermal.h | 2 +- include/thor.h | 2 +- include/ti-usb-phy-uboot.h | 2 +- include/time.h | 2 +- include/timer.h | 2 +- include/timestamp.h | 2 +- include/tlv_eeprom.h | 2 +- include/tpm-common.h | 2 +- include/tpm-v1.h | 2 +- include/tpm-v2.h | 2 +- include/tpm_api.h | 2 +- include/tps6586x.h | 2 +- include/trace.h | 2 +- include/tsec.h | 2 +- include/tsi148.h | 2 +- include/twl4030.h | 2 +- include/twl6030.h | 2 +- include/u-boot/aes.h | 2 +- include/u-boot/crc.h | 2 +- include/u-boot/ecdsa.h | 2 +- include/u-boot/fdt-libcrypto.h | 2 +- include/u-boot/hash-checksum.h | 2 +- include/u-boot/hash.h | 2 +- include/u-boot/lz4.h | 2 +- include/u-boot/rsa-mod-exp.h | 2 +- include/u-boot/rsa.h | 2 +- include/u-boot/variadic-macro.h | 2 +- include/ubifs_uboot.h | 2 +- include/uboot_aes.h | 2 +- include/ufs.h | 2 +- include/universe.h | 2 +- include/usb.h | 2 +- include/usb/ci_udc.h | 2 +- include/usb/dwc2_udc.h | 2 +- include/usb/ehci-ci.h | 2 +- include/usb/udc.h | 2 +- include/usb/xhci.h | 2 +- include/usb_cdc_acm.h | 2 +- include/usb_defs.h | 2 +- include/usb_ether.h | 2 +- include/usb_mass_storage.h | 2 +- include/usbdescriptors.h | 2 +- include/usbdevice.h | 2 +- include/usbroothubdes.h | 2 +- include/uuid.h | 2 +- include/valgrind/valgrind.h | 2 +- include/vbe.h | 2 +- include/version.h | 2 +- include/version_string.h | 2 +- include/video_bridge.h | 2 +- include/video_console.h | 2 +- include/video_font.h | 2 +- include/video_font_8x16.h | 2 +- include/video_font_data.h | 2 +- include/video_osd.h | 2 +- include/virtex2.h | 2 +- include/virtio.h | 2 +- include/vsc9953.h | 2 +- include/vsprintf.h | 2 +- include/vxworks.h | 2 +- include/w1-eeprom.h | 2 +- include/w1.h | 2 +- include/wait_bit.h | 2 +- include/watchdog.h | 2 +- include/wdt.h | 2 +- include/winbond_w83627.h | 2 +- include/xilinx.h | 2 +- include/zfs/dmu.h | 2 +- include/zfs/dmu_objset.h | 2 +- include/zfs/dnode.h | 2 +- include/zfs/dsl_dataset.h | 2 +- include/zfs/dsl_dir.h | 2 +- include/zfs/sa_impl.h | 2 +- include/zfs/spa.h | 2 +- include/zfs/uberblock_impl.h | 2 +- include/zfs/vdev_impl.h | 2 +- include/zfs/zap_impl.h | 2 +- include/zfs/zap_leaf.h | 2 +- include/zfs/zfs.h | 2 +- include/zfs/zfs_acl.h | 2 +- include/zfs/zfs_znode.h | 2 +- include/zfs/zil.h | 2 +- include/zfs/zio.h | 2 +- include/zfs/zio_checksum.h | 2 +- include/zynq_bootimg.h | 2 +- include/zynqpl.h | 2 +- lib/Makefile | 2 +- lib/abuf.c | 2 +- lib/acpi/Makefile | 2 +- lib/acpi/acpi_table.c | 2 +- lib/acpi/acpi_writer.c | 2 +- lib/acpi/base.c | 2 +- lib/acpi/csrt.c | 2 +- lib/acpi/dsdt.c | 2 +- lib/acpi/facs.c | 2 +- lib/acpi/mcfg.c | 2 +- lib/acpi/ssdt.c | 2 +- lib/aes.c | 2 +- lib/aes/Makefile | 2 +- lib/aes/aes-decrypt.c | 2 +- lib/aes/aes-encrypt.c | 2 +- lib/asm-offsets.c | 2 +- lib/at91/Makefile | 2 +- lib/at91/at91.c | 2 +- lib/at91/atmel_logo_8bpp.h | 2 +- lib/at91/microchip_logo_8bpp.h | 2 +- lib/bzip2/Makefile | 2 +- lib/charset.c | 2 +- lib/circbuf.c | 2 +- lib/crc32c.c | 2 +- lib/crc8.c | 2 +- lib/crypt/Makefile | 2 +- lib/crypt/alg-sha256.h | 2 +- lib/crypt/alg-sha512.h | 2 +- lib/crypt/crypt-port.h | 2 +- lib/crypt/crypt.c | 2 +- lib/crypto/Makefile | 2 +- lib/ctype.c | 2 +- lib/date.c | 2 +- lib/dhry/Makefile | 2 +- lib/dhry/cmd_dhry.c | 2 +- lib/dhry/dhry.h | 2 +- lib/dhry/dhry_1.c | 2 +- lib/dhry/dhry_2.c | 2 +- lib/display_options.c | 2 +- lib/ecdsa/ecdsa-libcrypto.c | 2 +- lib/ecdsa/ecdsa-verify.c | 2 +- lib/efi/Makefile | 2 +- lib/efi/efi.c | 2 +- lib/efi/efi_app.c | 2 +- lib/efi/efi_info.c | 2 +- lib/efi/efi_stub.c | 2 +- lib/efi_driver/Makefile | 2 +- lib/efi_driver/efi_block_device.c | 2 +- lib/efi_driver/efi_uclass.c | 2 +- lib/efi_loader/Makefile | 2 +- lib/efi_loader/boothart.c | 2 +- lib/efi_loader/capsule_esl.dtsi.in | 2 +- lib/efi_loader/dtbdump.c | 2 +- lib/efi_loader/efi_acpi.c | 2 +- lib/efi_loader/efi_bootmgr.c | 2 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 2 +- lib/efi_loader/efi_console.c | 2 +- lib/efi_loader/efi_device_path.c | 2 +- lib/efi_loader/efi_device_path_to_text.c | 2 +- lib/efi_loader/efi_device_path_utilities.c | 2 +- lib/efi_loader/efi_disk.c | 2 +- lib/efi_loader/efi_dt_fixup.c | 2 +- lib/efi_loader/efi_file.c | 2 +- lib/efi_loader/efi_firmware.c | 2 +- lib/efi_loader/efi_freestanding.c | 2 +- lib/efi_loader/efi_gop.c | 2 +- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_hii.c | 2 +- lib/efi_loader/efi_hii_config.c | 2 +- lib/efi_loader/efi_image_loader.c | 2 +- lib/efi_loader/efi_load_initrd.c | 2 +- lib/efi_loader/efi_load_options.c | 2 +- lib/efi_loader/efi_memory.c | 2 +- lib/efi_loader/efi_net.c | 2 +- lib/efi_loader/efi_riscv.c | 2 +- lib/efi_loader/efi_rng.c | 2 +- lib/efi_loader/efi_root_node.c | 2 +- lib/efi_loader/efi_runtime.c | 2 +- lib/efi_loader/efi_setup.c | 2 +- lib/efi_loader/efi_signature.c | 2 +- lib/efi_loader/efi_smbios.c | 2 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_tcg2.c | 2 +- lib/efi_loader/efi_unicode_collation.c | 2 +- lib/efi_loader/efi_var_common.c | 2 +- lib/efi_loader/efi_var_file.c | 2 +- lib/efi_loader/efi_var_mem.c | 2 +- lib/efi_loader/efi_var_seed.S | 2 +- lib/efi_loader/efi_variable.c | 2 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/efi_watchdog.c | 2 +- lib/efi_loader/helloworld.c | 2 +- lib/efi_loader/initrddump.c | 2 +- lib/efi_selftest/Makefile | 2 +- lib/efi_selftest/efi_freestanding.c | 2 +- lib/efi_selftest/efi_miniapp_tcg2_arm.h | 2 +- lib/efi_selftest/efi_miniapp_tcg2_arm64.h | 2 +- lib/efi_selftest/efi_miniapp_tcg2_ia32.h | 2 +- lib/efi_selftest/efi_miniapp_tcg2_riscv32.h | 2 +- lib/efi_selftest/efi_miniapp_tcg2_riscv64.h | 2 +- lib/efi_selftest/efi_miniapp_tcg2_x86_64.h | 2 +- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_bitblt.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 2 +- lib/efi_selftest/efi_selftest_config_table.c | 2 +- lib/efi_selftest/efi_selftest_console.c | 2 +- lib/efi_selftest/efi_selftest_controllers.c | 2 +- lib/efi_selftest/efi_selftest_crc32.c | 2 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_devicepath_util.c | 2 +- lib/efi_selftest/efi_selftest_disk_image.h | 2 +- lib/efi_selftest/efi_selftest_ecpt.c | 2 +- lib/efi_selftest/efi_selftest_event_groups.c | 2 +- lib/efi_selftest/efi_selftest_events.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_exitbootservices.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 2 +- lib/efi_selftest/efi_selftest_gop.c | 2 +- lib/efi_selftest/efi_selftest_hii.c | 2 +- lib/efi_selftest/efi_selftest_hii_data.c | 2 +- lib/efi_selftest/efi_selftest_load_file.c | 2 +- lib/efi_selftest/efi_selftest_loaded_image.c | 2 +- lib/efi_selftest/efi_selftest_loadimage.c | 2 +- lib/efi_selftest/efi_selftest_manageprotocols.c | 2 +- lib/efi_selftest/efi_selftest_mem.c | 2 +- lib/efi_selftest/efi_selftest_memory.c | 2 +- lib/efi_selftest/efi_selftest_miniapp_exception.c | 2 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 2 +- lib/efi_selftest/efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_open_protocol.c | 2 +- lib/efi_selftest/efi_selftest_register_notify.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_rng.c | 2 +- lib/efi_selftest/efi_selftest_rtc.c | 2 +- lib/efi_selftest/efi_selftest_set_virtual_address_map.c | 2 +- lib/efi_selftest/efi_selftest_snp.c | 2 +- lib/efi_selftest/efi_selftest_startimage_exit.c | 2 +- lib/efi_selftest/efi_selftest_startimage_return.c | 2 +- lib/efi_selftest/efi_selftest_tcg2.c | 2 +- lib/efi_selftest/efi_selftest_textinput.c | 2 +- lib/efi_selftest/efi_selftest_textinputex.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 2 +- lib/efi_selftest/efi_selftest_tpl.c | 2 +- lib/efi_selftest/efi_selftest_unaligned.c | 2 +- lib/efi_selftest/efi_selftest_unicode_collation.c | 2 +- lib/efi_selftest/efi_selftest_util.c | 2 +- lib/efi_selftest/efi_selftest_variables.c | 2 +- lib/efi_selftest/efi_selftest_variables_runtime.c | 2 +- lib/efi_selftest/efi_selftest_watchdog.c | 2 +- lib/errno_str.c | 3 +-- lib/fdt-libcrypto.c | 2 +- lib/fdtdec.c | 2 +- lib/fdtdec_common.c | 2 +- lib/fdtdec_test.c | 2 +- lib/gunzip.c | 2 +- lib/gzip.c | 2 +- lib/hang.c | 2 +- lib/hash-checksum.c | 2 +- lib/hexdump.c | 2 +- lib/initcall.c | 2 +- lib/ldiv.c | 2 +- lib/libavb/Makefile | 2 +- lib/libfdt/Makefile | 2 +- lib/lmb.c | 2 +- lib/lzma/LzmaTools.c | 2 +- lib/lzma/LzmaTools.h | 2 +- lib/lzma/Makefile | 2 +- lib/lzo/Makefile | 2 +- lib/membuff.c | 2 +- lib/net_utils.c | 2 +- lib/of_live.c | 2 +- lib/optee/Makefile | 2 +- lib/optee/optee.c | 2 +- lib/rand.c | 2 +- lib/rbtree.c | 2 +- lib/rc4.c | 2 +- lib/rsa/Makefile | 2 +- lib/rsa/rsa-keyprop.c | 2 +- lib/rsa/rsa-mod-exp.c | 2 +- lib/rsa/rsa-sign.c | 2 +- lib/rsa/rsa-verify.c | 2 +- lib/semihosting.c | 2 +- lib/sha256.c | 2 +- lib/sha512.c | 2 +- lib/smbios-parser.c | 2 +- lib/smbios.c | 2 +- lib/tables_csum.c | 2 +- lib/time.c | 2 +- lib/tpm-common.c | 2 +- lib/tpm-utils.h | 2 +- lib/tpm-v1.c | 2 +- lib/tpm-v2.c | 2 +- lib/tpm_api.c | 2 +- lib/trace.c | 2 +- lib/uuid.c | 2 +- lib/zlib/Makefile | 2 +- lib/zstd/Makefile | 2 +- lib/zstd/common/mem.h | 2 +- lib/zstd/common/zstd_deps.h | 2 +- lib/zstd/decompress_sources.h | 2 +- lib/zstd/zstd.c | 2 +- lib/zstd/zstd_common_module.c | 2 +- lib/zstd/zstd_decompress_module.c | 2 +- net/Makefile | 2 +- net/dhcpv6.c | 2 +- net/dhcpv6.h | 2 +- net/dns.h | 2 +- net/dsa-uclass.c | 2 +- net/eth-uclass.c | 2 +- net/eth_bootdev.c | 2 +- net/eth_common.c | 2 +- net/eth_internal.h | 2 +- net/mdio-mux-uclass.c | 2 +- net/mdio-uclass.c | 2 +- net/ndisc.c | 2 +- net/net6.c | 2 +- net/nfs.h | 2 +- net/ping6.c | 2 +- net/rarp.c | 2 +- net/rarp.h | 2 +- net/udp.c | 2 +- net/wol.c | 2 +- net/wol.h | 2 +- post/Makefile | 2 +- post/cpu/mpc83xx/Makefile | 2 +- post/cpu/mpc83xx/ecc.c | 2 +- post/drivers/Makefile | 2 +- post/drivers/i2c.c | 2 +- post/drivers/memory.c | 2 +- post/drivers/rtc.c | 2 +- post/lib_powerpc/Makefile | 2 +- post/lib_powerpc/andi.c | 2 +- post/lib_powerpc/asm.S | 2 +- post/lib_powerpc/b.c | 2 +- post/lib_powerpc/cmp.c | 2 +- post/lib_powerpc/cmpi.c | 2 +- post/lib_powerpc/complex.c | 2 +- post/lib_powerpc/cpu.c | 2 +- post/lib_powerpc/cpu_asm.h | 2 +- post/lib_powerpc/cr.c | 2 +- post/lib_powerpc/fpu/20001122-1.c | 2 +- post/lib_powerpc/fpu/20010114-2.c | 2 +- post/lib_powerpc/fpu/20010226-1.c | 2 +- post/lib_powerpc/fpu/980619-1.c | 2 +- post/lib_powerpc/fpu/Makefile | 2 +- post/lib_powerpc/fpu/acc1.c | 2 +- post/lib_powerpc/fpu/compare-fp-1.c | 2 +- post/lib_powerpc/fpu/darwin-ldouble.c | 2 +- post/lib_powerpc/fpu/fpu.c | 2 +- post/lib_powerpc/fpu/mul-subnormal-single-1.c | 2 +- post/lib_powerpc/load.c | 2 +- post/lib_powerpc/multi.c | 2 +- post/lib_powerpc/rlwimi.c | 2 +- post/lib_powerpc/rlwinm.c | 2 +- post/lib_powerpc/rlwnm.c | 2 +- post/lib_powerpc/srawi.c | 2 +- post/lib_powerpc/store.c | 2 +- post/lib_powerpc/string.c | 2 +- post/lib_powerpc/three.c | 2 +- post/lib_powerpc/threei.c | 2 +- post/lib_powerpc/threex.c | 2 +- post/lib_powerpc/two.c | 2 +- post/lib_powerpc/twox.c | 2 +- post/post.c | 2 +- post/tests.c | 2 +- scripts/Makefile.dts | 2 +- scripts/Makefile.spl | 2 +- scripts/build-cb.sh | 2 +- scripts/build-efi.sh | 2 +- scripts/coreboot.sed | 2 +- scripts/dtc-version.sh | 2 +- scripts/dtc/pylibfdt/libfdt.i_shipped | 2 +- scripts/env2string.awk | 4 ++-- scripts/event_dump.py | 2 +- scripts/gcc-stack-usage.sh | 2 +- scripts/gen_ll_addressable_symbols.sh | 2 +- scripts/get_default_envs.sh | 2 +- scripts/kconfig/lxdialog/checklist.c | 2 +- scripts/kconfig/lxdialog/dialog.h | 2 +- scripts/kconfig/lxdialog/inputbox.c | 2 +- scripts/kconfig/lxdialog/menubox.c | 2 +- scripts/kconfig/lxdialog/textbox.c | 2 +- scripts/kconfig/lxdialog/util.c | 2 +- scripts/kconfig/lxdialog/yesno.c | 2 +- scripts/mailmapper | 2 +- scripts/make_pip.sh | 2 +- scripts/show-gnu-make | 2 +- scripts/style.py | 2 +- test/Makefile | 2 +- test/bloblist.c | 2 +- test/boot/Makefile | 2 +- test/boot/bootdev.c | 2 +- test/boot/bootflow.c | 2 +- test/boot/bootmeth.c | 2 +- test/boot/bootstd_common.c | 2 +- test/boot/bootstd_common.h | 2 +- test/boot/cedit.c | 2 +- test/boot/expo.c | 2 +- test/boot/files/expo_ids.h | 2 +- test/boot/files/expo_layout.dts | 2 +- test/boot/image.c | 2 +- test/boot/vbe_fixup.c | 2 +- test/boot/vbe_simple.c | 2 +- test/bootm.c | 2 +- test/cmd/Makefile | 2 +- test/cmd/addrmap.c | 2 +- test/cmd/armffa.c | 2 +- test/cmd/bdinfo.c | 2 +- test/cmd/exit.c | 2 +- test/cmd/fdt.c | 2 +- test/cmd/font.c | 2 +- test/cmd/history.c | 2 +- test/cmd/loadm.c | 2 +- test/cmd/mem.c | 2 +- test/cmd/mem_search.c | 2 +- test/cmd/pci_mps.c | 2 +- test/cmd/pinmux.c | 2 +- test/cmd/pwm.c | 2 +- test/cmd/seama.c | 2 +- test/cmd/setexpr.c | 2 +- test/cmd/test_echo.c | 2 +- test/cmd/test_pause.c | 2 +- test/command_ut.c | 2 +- test/common/Makefile | 2 +- test/common/cread.c | 2 +- test/common/cyclic.c | 2 +- test/common/event.c | 2 +- test/common/test_autoboot.c | 2 +- test/compression.c | 2 +- test/dm/Makefile | 2 +- test/dm/acpi.c | 2 +- test/dm/acpi.h | 2 +- test/dm/acpi_dp.c | 2 +- test/dm/acpigen.c | 2 +- test/dm/adc.c | 2 +- test/dm/audio.c | 2 +- test/dm/axi.c | 2 +- test/dm/blk.c | 2 +- test/dm/blkmap.c | 2 +- test/dm/bootcount.c | 2 +- test/dm/bus.c | 2 +- test/dm/button.c | 2 +- test/dm/clk.c | 2 +- test/dm/clk_ccf.c | 2 +- test/dm/core.c | 2 +- test/dm/cpu.c | 2 +- test/dm/cros_ec_pwm.c | 2 +- test/dm/devres.c | 2 +- test/dm/dma.c | 2 +- test/dm/dsi_host.c | 2 +- test/dm/efi_media.c | 2 +- test/dm/extcon.c | 2 +- test/dm/fastboot.c | 2 +- test/dm/fdtdec.c | 2 +- test/dm/ffa.c | 2 +- test/dm/firmware.c | 2 +- test/dm/fpga.c | 2 +- test/dm/fwu_mdata_disk_image.h | 2 +- test/dm/gpio.c | 2 +- test/dm/host.c | 2 +- test/dm/hwspinlock.c | 2 +- test/dm/i2c.c | 2 +- test/dm/i2s.c | 2 +- test/dm/iommu.c | 2 +- test/dm/irq.c | 2 +- test/dm/led.c | 2 +- test/dm/mdio.c | 2 +- test/dm/mdio_mux.c | 2 +- test/dm/memory.c | 2 +- test/dm/misc.c | 2 +- test/dm/mmc.c | 2 +- test/dm/mux-emul.c | 2 +- test/dm/mux-mmio.c | 2 +- test/dm/nop.c | 2 +- test/dm/nvmxip.c | 2 +- test/dm/of_extra.c | 2 +- test/dm/of_platdata.c | 2 +- test/dm/ofnode.c | 2 +- test/dm/ofread.c | 2 +- test/dm/osd.c | 2 +- test/dm/p2sb.c | 2 +- test/dm/panel.c | 2 +- test/dm/part.c | 2 +- test/dm/pch.c | 2 +- test/dm/pci.c | 2 +- test/dm/pci_ep.c | 2 +- test/dm/phy.c | 2 +- test/dm/phys2bus.c | 2 +- test/dm/pinmux.c | 2 +- test/dm/pmc.c | 2 +- test/dm/pmic.c | 2 +- test/dm/pwm.c | 2 +- test/dm/qfw.c | 2 +- test/dm/ram.c | 2 +- test/dm/read.c | 2 +- test/dm/reboot-mode.c | 2 +- test/dm/regmap.c | 2 +- test/dm/regulator.c | 2 +- test/dm/remoteproc.c | 2 +- test/dm/rtc.c | 2 +- test/dm/scsi.c | 2 +- test/dm/sf.c | 2 +- test/dm/simple-bus.c | 2 +- test/dm/sm.c | 2 +- test/dm/smem.c | 2 +- test/dm/soc.c | 2 +- test/dm/sound.c | 2 +- test/dm/spi.c | 2 +- test/dm/spmi.c | 2 +- test/dm/syscon-reset.c | 2 +- test/dm/syscon.c | 2 +- test/dm/sysinfo-gpio.c | 2 +- test/dm/sysinfo.c | 2 +- test/dm/sysreset.c | 2 +- test/dm/tag.c | 2 +- test/dm/tee.c | 2 +- test/dm/test-dm.c | 2 +- test/dm/test-driver.c | 2 +- test/dm/test-fdt.c | 2 +- test/dm/test-uclass.c | 2 +- test/dm/timer.c | 2 +- test/dm/tpm.c | 2 +- test/dm/usb.c | 2 +- test/dm/video.c | 2 +- test/dm/virtio.c | 2 +- test/dm/virtio_device.c | 2 +- test/dm/virtio_rng.c | 2 +- test/dm/wdt.c | 2 +- test/env/Makefile | 2 +- test/fs/fat-noncontig-test.sh | 2 +- test/fs/fs-test.sh | 2 +- test/fuzz/Makefile | 2 +- test/fuzz/cmd_fuzz.c | 2 +- test/fuzz/virtio.c | 2 +- test/image/Kconfig | 2 +- test/image/Makefile | 2 +- test/image/spl_load.c | 2 +- test/image/spl_load_fs.c | 2 +- test/image/spl_load_net.c | 2 +- test/image/spl_load_nor.c | 2 +- test/image/spl_load_os.c | 2 +- test/image/spl_load_spi.c | 2 +- test/image/test-imagetools.sh | 2 +- test/lib/Kconfig | 2 +- test/lib/Makefile | 2 +- test/lib/abuf.c | 2 +- test/lib/asn1.c | 2 +- test/lib/efi_device_path.c | 2 +- test/lib/efi_image_region.c | 2 +- test/lib/getopt.c | 2 +- test/lib/hexdump.c | 2 +- test/lib/kconfig.c | 2 +- test/lib/kconfig_spl.c | 2 +- test/lib/lmb.c | 2 +- test/lib/longjmp.c | 2 +- test/lib/rsa.c | 2 +- test/lib/sscanf.c | 2 +- test/lib/string.c | 2 +- test/lib/test_aes.c | 2 +- test/lib/test_crc8.c | 2 +- test/lib/test_crypt.c | 2 +- test/lib/test_errno_str.c | 2 +- test/lib/test_print.c | 2 +- test/lib/uuid.c | 2 +- test/log/Makefile | 2 +- test/log/cont_test.c | 2 +- test/log/log_filter.c | 2 +- test/log/log_test.c | 2 +- test/log/log_ut.c | 2 +- test/log/nolog_ndebug.c | 2 +- test/log/nolog_test.c | 2 +- test/log/pr_cont_test.c | 2 +- test/log/syslog_test.c | 2 +- test/log/syslog_test.h | 2 +- test/log/syslog_test_ndebug.c | 2 +- test/optee/Makefile | 2 +- test/optee/cmd_ut_optee.c | 2 +- test/optee/test-optee-base.dts | 2 +- test/optee/test-optee-no-optee.dts | 2 +- test/optee/test-optee-optee.dts | 2 +- test/overlay/Makefile | 2 +- test/overlay/cmd_ut_overlay.c | 2 +- test/overlay/test-fdt-base.dts | 2 +- test/overlay/test-fdt-overlay-stacked.dts | 2 +- test/overlay/test-fdt-overlay.dts | 2 +- test/print_ut.c | 2 +- test/py/tests/fit_util.py | 2 +- test/py/tests/fs_helper.py | 2 +- test/py/tests/test_android/test_abootimg.py | 2 +- test/py/tests/test_android/test_avb.py | 2 +- test/py/tests/test_bootmenu.py | 2 +- test/py/tests/test_button.py | 2 +- test/py/tests/test_cat/conftest.py | 2 +- test/py/tests/test_cat/test_cat.py | 2 +- test/py/tests/test_efi_bootmgr/conftest.py | 2 +- test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py | 2 +- test/py/tests/test_efi_capsule/capsule_common.py | 2 +- test/py/tests/test_efi_capsule/capsule_defs.py | 2 +- test/py/tests/test_efi_capsule/capsule_gen_binman.dts | 2 +- test/py/tests/test_efi_capsule/conftest.py | 2 +- .../py/tests/test_efi_capsule/test_capsule_firmware_fit.py | 2 +- .../py/tests/test_efi_capsule/test_capsule_firmware_raw.py | 2 +- .../test_efi_capsule/test_capsule_firmware_signed_fit.py | 2 +- .../test_efi_capsule/test_capsule_firmware_signed_raw.py | 2 +- test/py/tests/test_efi_capsule/version.dts | 2 +- test/py/tests/test_efi_secboot/conftest.py | 2 +- test/py/tests/test_efi_secboot/defs.py | 2 +- test/py/tests/test_efi_secboot/test_authvar.py | 2 +- test/py/tests/test_efi_secboot/test_signed.py | 2 +- test/py/tests/test_efi_secboot/test_signed_intca.py | 2 +- test/py/tests/test_efi_secboot/test_unsigned.py | 2 +- test/py/tests/test_eficonfig/conftest.py | 2 +- test/py/tests/test_eficonfig/test_eficonfig.py | 2 +- test/py/tests/test_event_dump.py | 2 +- test/py/tests/test_extension.py | 2 +- test/py/tests/test_fit.py | 2 +- test/py/tests/test_fit_auto_signed.py | 2 +- test/py/tests/test_fit_ecdsa.py | 2 +- test/py/tests/test_fit_hashes.py | 2 +- test/py/tests/test_fs/conftest.py | 2 +- test/py/tests/test_fs/fstest_defs.py | 2 +- test/py/tests/test_fs/fstest_helpers.py | 2 +- test/py/tests/test_fs/test_basic.py | 2 +- test/py/tests/test_fs/test_erofs.py | 2 +- test/py/tests/test_fs/test_ext.py | 2 +- test/py/tests/test_fs/test_mkdir.py | 2 +- test/py/tests/test_fs/test_symlink.py | 2 +- test/py/tests/test_fs/test_unlink.py | 2 +- test/py/tests/test_gpio.py | 2 +- test/py/tests/test_handoff.py | 2 +- test/py/tests/test_log.py | 2 +- test/py/tests/test_lsblk.py | 2 +- test/py/tests/test_ofplatdata.py | 2 +- test/py/tests/test_pstore.py | 2 +- test/py/tests/test_qfw.py | 2 +- test/py/tests/test_scp03.py | 2 +- test/py/tests/test_semihosting/test_hostfs.py | 2 +- test/py/tests/test_source.py | 2 +- test/py/tests/test_tpm2.py | 2 +- test/py/tests/test_vbe.py | 2 +- test/py/tests/test_vbe_vpl.py | 2 +- test/py/tests/test_vboot.py | 2 +- test/py/tests/test_xxd/conftest.py | 2 +- test/py/tests/test_xxd/test_xxd.py | 2 +- test/py/tests/vboot/sandbox-binman-pss.dts | 2 +- test/py/tests/vboot/sandbox-binman.dts | 2 +- test/py/tests/vboot/sandbox-u-boot-global-pss.dts | 2 +- test/py/tests/vboot/sandbox-u-boot-global.dts | 2 +- test/py/tests/vboot/simple-images.its | 2 +- test/str_ut.c | 2 +- test/test-main.c | 2 +- test/time_ut.c | 2 +- test/trace/test-trace.sh | 2 +- test/unicode_ut.c | 2 +- test/ut.c | 2 +- tools/Makefile | 2 +- tools/aisimage.c | 2 +- tools/aisimage.h | 2 +- tools/atmel_pmecc_params.c | 2 +- tools/atmelimage.c | 2 +- tools/binman/binman.rst | 2 +- tools/binman/bintool.py | 4 ++-- tools/binman/bintool_test.py | 2 +- tools/binman/bintools.rst | 2 +- tools/binman/btool/_testing.py | 2 +- tools/binman/btool/bootgen.py | 2 +- tools/binman/btool/btool_gzip.py | 2 +- tools/binman/btool/bzip2.py | 2 +- tools/binman/btool/cbfstool.py | 2 +- tools/binman/btool/fdt_add_pubkey.py | 2 +- tools/binman/btool/fiptool.py | 2 +- tools/binman/btool/futility.py | 2 +- tools/binman/btool/ifwitool.py | 2 +- tools/binman/btool/lz4.py | 2 +- tools/binman/btool/lzma_alone.py | 2 +- tools/binman/btool/lzop.py | 2 +- tools/binman/btool/mkeficapsule.py | 2 +- tools/binman/btool/mkimage.py | 2 +- tools/binman/btool/openssl.py | 2 +- tools/binman/btool/xz.py | 2 +- tools/binman/btool/zstd.py | 2 +- tools/binman/cbfs_util.py | 2 +- tools/binman/cbfs_util_test.py | 2 +- tools/binman/cmdline.py | 2 +- tools/binman/control.py | 2 +- tools/binman/elf.py | 2 +- tools/binman/elf_test.py | 2 +- tools/binman/entry.py | 2 +- tools/binman/entry_test.py | 2 +- tools/binman/etype/_testing.py | 2 +- tools/binman/etype/atf_bl31.py | 2 +- tools/binman/etype/atf_fip.py | 2 +- tools/binman/etype/blob.py | 2 +- tools/binman/etype/blob_dtb.py | 2 +- tools/binman/etype/blob_ext.py | 2 +- tools/binman/etype/blob_ext_list.py | 2 +- tools/binman/etype/blob_named_by_arg.py | 2 +- tools/binman/etype/blob_phase.py | 2 +- tools/binman/etype/cbfs.py | 2 +- tools/binman/etype/collection.py | 2 +- tools/binman/etype/cros_ec_rw.py | 2 +- tools/binman/etype/efi_capsule.py | 2 +- tools/binman/etype/efi_empty_capsule.py | 2 +- tools/binman/etype/encrypted.py | 2 +- tools/binman/etype/fdtmap.py | 2 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fill.py | 2 +- tools/binman/etype/fit.py | 2 +- tools/binman/etype/fmap.py | 2 +- tools/binman/etype/gbb.py | 2 +- tools/binman/etype/image_header.py | 2 +- tools/binman/etype/intel_cmc.py | 2 +- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/etype/intel_fit.py | 2 +- tools/binman/etype/intel_fit_ptr.py | 2 +- tools/binman/etype/intel_fsp.py | 2 +- tools/binman/etype/intel_fsp_m.py | 2 +- tools/binman/etype/intel_fsp_s.py | 2 +- tools/binman/etype/intel_fsp_t.py | 2 +- tools/binman/etype/intel_ifwi.py | 2 +- tools/binman/etype/intel_me.py | 2 +- tools/binman/etype/intel_mrc.py | 2 +- tools/binman/etype/intel_refcode.py | 2 +- tools/binman/etype/intel_vbt.py | 2 +- tools/binman/etype/intel_vga.py | 2 +- tools/binman/etype/mkimage.py | 2 +- tools/binman/etype/null.py | 2 +- tools/binman/etype/opensbi.py | 2 +- tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py | 2 +- tools/binman/etype/pre_load.py | 2 +- tools/binman/etype/rockchip_tpl.py | 2 +- tools/binman/etype/scp.py | 2 +- tools/binman/etype/section.py | 2 +- tools/binman/etype/tee_os.py | 2 +- tools/binman/etype/text.py | 2 +- tools/binman/etype/ti_board_config.py | 2 +- tools/binman/etype/ti_secure.py | 2 +- tools/binman/etype/ti_secure_rom.py | 2 +- tools/binman/etype/u_boot.py | 2 +- tools/binman/etype/u_boot_dtb.py | 2 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 2 +- tools/binman/etype/u_boot_elf.py | 2 +- tools/binman/etype/u_boot_env.py | 2 +- tools/binman/etype/u_boot_expanded.py | 2 +- tools/binman/etype/u_boot_img.py | 2 +- tools/binman/etype/u_boot_nodtb.py | 2 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_spl_bss_pad.py | 2 +- tools/binman/etype/u_boot_spl_dtb.py | 2 +- tools/binman/etype/u_boot_spl_elf.py | 2 +- tools/binman/etype/u_boot_spl_expanded.py | 2 +- tools/binman/etype/u_boot_spl_nodtb.py | 2 +- tools/binman/etype/u_boot_spl_pubkey_dtb.py | 2 +- tools/binman/etype/u_boot_spl_with_ucode_ptr.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/u_boot_tpl_bss_pad.py | 2 +- tools/binman/etype/u_boot_tpl_dtb.py | 2 +- tools/binman/etype/u_boot_tpl_dtb_with_ucode.py | 2 +- tools/binman/etype/u_boot_tpl_elf.py | 2 +- tools/binman/etype/u_boot_tpl_expanded.py | 2 +- tools/binman/etype/u_boot_tpl_nodtb.py | 2 +- tools/binman/etype/u_boot_tpl_with_ucode_ptr.py | 2 +- tools/binman/etype/u_boot_ucode.py | 2 +- tools/binman/etype/u_boot_vpl.py | 2 +- tools/binman/etype/u_boot_vpl_bss_pad.py | 2 +- tools/binman/etype/u_boot_vpl_dtb.py | 2 +- tools/binman/etype/u_boot_vpl_elf.py | 2 +- tools/binman/etype/u_boot_vpl_expanded.py | 2 +- tools/binman/etype/u_boot_vpl_nodtb.py | 2 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/etype/vblock.py | 2 +- tools/binman/etype/x509_cert.py | 2 +- tools/binman/etype/x86_reset16.py | 2 +- tools/binman/etype/x86_reset16_spl.py | 2 +- tools/binman/etype/x86_reset16_tpl.py | 2 +- tools/binman/etype/x86_start16.py | 2 +- tools/binman/etype/x86_start16_spl.py | 2 +- tools/binman/etype/x86_start16_tpl.py | 2 +- tools/binman/etype/xilinx_bootgen.py | 2 +- tools/binman/fdt_test.py | 2 +- tools/binman/fip_util.py | 2 +- tools/binman/fip_util_test.py | 2 +- tools/binman/fmap_util.py | 2 +- tools/binman/ftest.py | 2 +- tools/binman/image.py | 2 +- tools/binman/image_test.py | 2 +- tools/binman/index.rst | 2 +- tools/binman/main.py | 2 +- tools/binman/setup.py | 4 ++-- tools/binman/state.py | 2 +- tools/binman/test/054_unit_address.dts | 2 +- tools/binman/test/055_sections.dts | 2 +- tools/binman/test/056_name_prefix.dts | 2 +- tools/binman/test/057_unknown_contents.dts | 2 +- tools/binman/test/058_x86_ucode_spl_needs_retry.dts | 2 +- tools/binman/test/059_change_size.dts | 2 +- tools/binman/test/060_fdt_update.dts | 2 +- tools/binman/test/061_fdt_update_bad.dts | 2 +- tools/binman/test/062_entry_args.dts | 2 +- tools/binman/test/063_entry_args_missing.dts | 2 +- tools/binman/test/064_entry_args_required.dts | 2 +- tools/binman/test/065_entry_args_unknown_datatype.dts | 2 +- tools/binman/test/066_text.dts | 2 +- tools/binman/test/067_fmap.dts | 2 +- tools/binman/test/068_blob_named_by_arg.dts | 2 +- tools/binman/test/069_fill.dts | 2 +- tools/binman/test/070_fill_no_size.dts | 2 +- tools/binman/test/071_gbb.dts | 2 +- tools/binman/test/072_gbb_too_small.dts | 2 +- tools/binman/test/073_gbb_no_size.dts | 2 +- tools/binman/test/074_vblock.dts | 2 +- tools/binman/test/075_vblock_no_content.dts | 2 +- tools/binman/test/076_vblock_bad_phandle.dts | 2 +- tools/binman/test/077_vblock_bad_entry.dts | 2 +- tools/binman/test/078_u_boot_tpl.dts | 2 +- tools/binman/test/079_uses_pos.dts | 2 +- tools/binman/test/080_fill_empty.dts | 2 +- tools/binman/test/081_x86_start16_tpl.dts | 2 +- tools/binman/test/082_fdt_update_all.dts | 2 +- tools/binman/test/083_compress.dts | 2 +- tools/binman/test/084_files.dts | 2 +- tools/binman/test/085_files_compress.dts | 2 +- tools/binman/test/086_files_none.dts | 2 +- tools/binman/test/087_files_no_pattern.dts | 2 +- tools/binman/test/088_extend_size.dts | 2 +- tools/binman/test/089_extend_size_bad.dts | 2 +- tools/binman/test/090_hash.dts | 2 +- tools/binman/test/091_hash_no_algo.dts | 2 +- tools/binman/test/092_hash_bad_algo.dts | 2 +- tools/binman/test/094_fmap_x86.dts | 2 +- tools/binman/test/095_fmap_x86_section.dts | 2 +- tools/binman/test/096_elf.dts | 2 +- tools/binman/test/097_elf_strip.dts | 2 +- tools/binman/test/098_4gb_and_skip_at_start_together.dts | 2 +- tools/binman/test/099_hash_section.dts | 2 +- tools/binman/test/101_sections_offset.dts | 2 +- tools/binman/test/102_cbfs_raw.dts | 2 +- tools/binman/test/103_cbfs_raw_ppc.dts | 2 +- tools/binman/test/104_cbfs_stage.dts | 2 +- tools/binman/test/105_cbfs_raw_compress.dts | 2 +- tools/binman/test/106_cbfs_bad_arch.dts | 2 +- tools/binman/test/107_cbfs_no_size.dts | 2 +- tools/binman/test/108_cbfs_no_contents.dts | 2 +- tools/binman/test/109_cbfs_bad_compress.dts | 2 +- tools/binman/test/110_cbfs_name.dts | 2 +- tools/binman/test/111_x86_rom_ifwi.dts | 2 +- tools/binman/test/112_x86_rom_ifwi_nodesc.dts | 2 +- tools/binman/test/113_x86_rom_ifwi_nodata.dts | 2 +- tools/binman/test/114_cbfs_offset.dts | 2 +- tools/binman/test/125_cbfs_update.dts | 2 +- tools/binman/test/126_cbfs_bad_type.dts | 2 +- tools/binman/test/127_list.dts | 2 +- tools/binman/test/128_decode_image.dts | 2 +- tools/binman/test/129_decode_image_nohdr.dts | 2 +- tools/binman/test/130_list_fdtmap.dts | 2 +- tools/binman/test/132_replace.dts | 2 +- tools/binman/test/133_replace_multi.dts | 2 +- tools/binman/test/134_fdt_update_all_repack.dts | 2 +- tools/binman/test/139_replace_repack.dts | 2 +- tools/binman/test/141_descriptor_offset.dts | 2 +- tools/binman/test/142_replace_cbfs.dts | 2 +- tools/binman/test/143_replace_all.dts | 2 +- tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts | 2 +- tools/binman/test/151_x86_rom_ifwi_section.dts | 2 +- tools/binman/test/155_symbols_tpl_x86.dts | 2 +- tools/binman/test/156_mkimage.dts | 2 +- tools/binman/test/157_blob_ext.dts | 2 +- tools/binman/test/158_blob_ext_missing.dts | 2 +- tools/binman/test/159_blob_ext_missing_sect.dts | 2 +- tools/binman/test/160_pack_overlap_zero.dts | 2 +- tools/binman/test/161_fit.dts | 2 +- tools/binman/test/162_fit_external.dts | 2 +- tools/binman/test/163_x86_rom_me_empty.dts | 2 +- tools/binman/test/164_x86_rom_me_missing.dts | 2 +- tools/binman/test/165_section_ignore_hash_signature.dts | 2 +- tools/binman/test/166_pad_in_sections.dts | 2 +- tools/binman/test/167_fit_image_subentry_alignment.dts | 2 +- tools/binman/test/168_fit_missing_blob.dts | 2 +- tools/binman/test/169_atf_bl31.dts | 2 +- tools/binman/test/170_fit_fdt.dts | 2 +- tools/binman/test/171_fit_fdt_missing_prop.dts | 2 +- tools/binman/test/172_scp.dts | 2 +- tools/binman/test/173_missing_blob.dts | 2 +- tools/binman/test/174_env.dts | 2 +- tools/binman/test/175_env_no_size.dts | 2 +- tools/binman/test/176_env_too_small.dts | 2 +- tools/binman/test/177_skip_at_start.dts | 2 +- tools/binman/test/178_skip_at_start_pad.dts | 2 +- tools/binman/test/179_skip_at_start_section_pad.dts | 2 +- tools/binman/test/180_section_pad.dts | 2 +- tools/binman/test/181_section_align.dts | 2 +- tools/binman/test/182_compress_image.dts | 2 +- tools/binman/test/183_compress_image_less.dts | 2 +- tools/binman/test/184_compress_section_size.dts | 2 +- tools/binman/test/185_compress_section.dts | 2 +- tools/binman/test/186_compress_extra.dts | 2 +- tools/binman/test/188_image_entryarg.dts | 2 +- tools/binman/test/189_vblock_content.dts | 2 +- tools/binman/test/190_files_align.dts | 2 +- tools/binman/test/191_read_image_skip.dts | 2 +- tools/binman/test/192_u_boot_tpl_nodtb.dts | 2 +- tools/binman/test/193_tpl_bss_pad.dts | 2 +- tools/binman/test/194_fdt_incl.dts | 2 +- tools/binman/test/195_fdt_incl_tpl.dts | 2 +- tools/binman/test/196_symbols_nodtb.dts | 2 +- tools/binman/test/197_symbols_expand.dts | 2 +- tools/binman/test/198_collection.dts | 2 +- tools/binman/test/199_collection_section.dts | 2 +- tools/binman/test/200_align_default.dts | 2 +- tools/binman/test/201_opensbi.dts | 2 +- tools/binman/test/202_section_timeout.dts | 2 +- tools/binman/test/203_fip.dts | 2 +- tools/binman/test/204_fip_other.dts | 2 +- tools/binman/test/205_fip_no_type.dts | 2 +- tools/binman/test/206_fip_uuid.dts | 2 +- tools/binman/test/207_fip_ls.dts | 2 +- tools/binman/test/208_fip_replace.dts | 2 +- tools/binman/test/209_fip_missing.dts | 2 +- tools/binman/test/210_fip_size.dts | 2 +- tools/binman/test/211_fip_bad_align.dts | 2 +- tools/binman/test/212_fip_collection.dts | 2 +- tools/binman/test/213_fdtmap_alt_format.dts | 2 +- tools/binman/test/214_no_alt_format.dts | 2 +- tools/binman/test/215_blob_ext_list.dts | 2 +- tools/binman/test/216_blob_ext_list_missing.dts | 2 +- tools/binman/test/217_fake_blob.dts | 2 +- tools/binman/test/218_blob_ext_list_fake.dts | 2 +- tools/binman/test/219_fit_gennode.dts | 2 +- tools/binman/test/220_fit_subentry_bintool.dts | 2 +- tools/binman/test/221_fit_subentry_hash.dts | 2 +- tools/binman/test/222_tee_os.dts | 2 +- tools/binman/test/223_fit_fdt_oper.dts | 2 +- tools/binman/test/224_fit_bad_oper.dts | 2 +- tools/binman/test/225_expand_size_bad.dts | 2 +- tools/binman/test/226_fit_split_elf.dts | 2 +- tools/binman/test/227_fit_bad_dir.dts | 2 +- tools/binman/test/228_fit_bad_dir_config.dts | 2 +- tools/binman/test/229_mkimage_missing.dts | 2 +- tools/binman/test/230_pre_load.dts | 2 +- tools/binman/test/231_pre_load_pkcs.dts | 2 +- tools/binman/test/232_pre_load_pss.dts | 2 +- tools/binman/test/233_pre_load_invalid_padding.dts | 2 +- tools/binman/test/234_pre_load_invalid_sha.dts | 2 +- tools/binman/test/235_pre_load_invalid_algo.dts | 2 +- tools/binman/test/236_pre_load_invalid_key.dts | 2 +- tools/binman/test/237_unique_names.dts | 2 +- tools/binman/test/238_unique_names_multi.dts | 2 +- tools/binman/test/239_replace_with_bintool.dts | 2 +- tools/binman/test/240_fit_extract_replace.dts | 2 +- tools/binman/test/241_replace_section_simple.dts | 2 +- tools/binman/test/242_mkimage_name.dts | 2 +- tools/binman/test/243_mkimage_image.dts | 2 +- tools/binman/test/244_mkimage_image_no_content.dts | 2 +- tools/binman/test/245_mkimage_image_bad.dts | 2 +- tools/binman/test/246_collection_other.dts | 2 +- tools/binman/test/247_mkimage_coll.dts | 2 +- tools/binman/test/248_compress_dtb_prepend_invalid.dts | 2 +- tools/binman/test/249_compress_dtb_prepend_length.dts | 2 +- tools/binman/test/250_compress_dtb_invalid.dts | 2 +- tools/binman/test/251_compress_dtb_zstd.dts | 2 +- tools/binman/test/252_mkimage_mult_data.dts | 2 +- tools/binman/test/253_mkimage_mult_no_content.dts | 2 +- tools/binman/test/254_mkimage_filename.dts | 2 +- tools/binman/test/255_u_boot_vpl.dts | 2 +- tools/binman/test/256_u_boot_vpl_nodtb.dts | 2 +- tools/binman/test/257_fdt_incl_vpl.dts | 2 +- tools/binman/test/258_vpl_bss_pad.dts | 2 +- tools/binman/test/260_symbols_elf.dts | 2 +- tools/binman/test/261_section_fname.dts | 2 +- tools/binman/test/262_absent.dts | 2 +- tools/binman/test/263_tee_os_opt.dts | 2 +- tools/binman/test/264_tee_os_opt_fit.dts | 2 +- tools/binman/test/265_tee_os_opt_fit_bad.dts | 2 +- tools/binman/test/266_blob_ext_opt.dts | 2 +- tools/binman/test/267_section_inner.dts | 2 +- tools/binman/test/268_null.dts | 2 +- tools/binman/test/269_overlap.dts | 2 +- tools/binman/test/270_overlap_null.dts | 2 +- tools/binman/test/271_overlap_bad.dts | 2 +- tools/binman/test/272_overlap_no_size.dts | 2 +- tools/binman/test/273_blob_symbol.dts | 2 +- tools/binman/test/274_offset_from_elf.dts | 2 +- tools/binman/test/275_fit_align.dts | 2 +- tools/binman/test/276_fit_firmware_loadables.dts | 2 +- tools/binman/test/277_replace_fit_sibling.dts | 2 +- tools/binman/test/278_replace_section_deep.dts | 2 +- tools/binman/test/279_x509_cert.dts | 2 +- tools/binman/test/280_fit_sign.dts | 2 +- tools/binman/test/281_sign_non_fit.dts | 2 +- tools/binman/test/282_symbols_disable.dts | 2 +- tools/binman/test/283_mkimage_special.dts | 2 +- tools/binman/test/284_fit_fdt_list.dts | 2 +- tools/binman/test/285_spl_expand.dts | 2 +- tools/binman/test/286_template.dts | 2 +- tools/binman/test/287_template_multi.dts | 2 +- tools/binman/test/288_template_fit.dts | 2 +- tools/binman/test/289_template_section.dts | 2 +- tools/binman/test/290_mkimage_sym.dts | 2 +- tools/binman/test/291_rockchip_tpl.dts | 2 +- tools/binman/test/292_mkimage_missing_multiple.dts | 2 +- tools/binman/test/293_ti_board_cfg.dts | 2 +- tools/binman/test/294_ti_board_cfg_combined.dts | 2 +- tools/binman/test/295_ti_board_cfg_no_type.dts | 2 +- tools/binman/test/296_ti_secure.dts | 2 +- tools/binman/test/297_ti_secure_rom.dts | 2 +- tools/binman/test/298_ti_secure_rom_combined.dts | 2 +- tools/binman/test/299_ti_secure_rom_a.dts | 2 +- tools/binman/test/300_ti_secure_rom_b.dts | 2 +- tools/binman/test/301_encrypted_no_algo.dts | 2 +- tools/binman/test/302_encrypted_invalid_iv_file.dts | 2 +- tools/binman/test/303_encrypted_missing_key.dts | 2 +- tools/binman/test/304_encrypted_key_source.dts | 2 +- tools/binman/test/305_encrypted_key_file.dts | 2 +- tools/binman/test/306_spl_pubkey_dtb.dts | 2 +- tools/binman/test/307_xilinx_bootgen_sign.dts | 2 +- tools/binman/test/308_xilinx_bootgen_sign_enc.dts | 2 +- tools/binman/test/309_template_phandle.dts | 2 +- tools/binman/test/310_template_phandle_dup.dts | 2 +- tools/binman/test/311_capsule.dts | 2 +- tools/binman/test/312_capsule_signed.dts | 2 +- tools/binman/test/313_capsule_version.dts | 2 +- tools/binman/test/314_capsule_signed_ver.dts | 2 +- tools/binman/test/315_capsule_oemflags.dts | 2 +- tools/binman/test/316_capsule_missing_key.dts | 2 +- tools/binman/test/317_capsule_missing_index.dts | 2 +- tools/binman/test/318_capsule_missing_guid.dts | 2 +- tools/binman/test/319_capsule_accept.dts | 2 +- tools/binman/test/320_capsule_revert.dts | 2 +- tools/binman/test/321_capsule_accept_missing_guid.dts | 2 +- tools/binman/test/322_empty_capsule_type_missing.dts | 2 +- tools/binman/test/323_capsule_accept_revert_missing.dts | 2 +- tools/binman/test/Makefile | 2 +- tools/binman/test/blob_syms.c | 2 +- tools/binman/test/blob_syms.lds | 2 +- tools/binman/test/bss_data.c | 2 +- tools/binman/test/bss_data.lds | 2 +- tools/binman/test/bss_data_zero.c | 2 +- tools/binman/test/bss_data_zero.lds | 2 +- tools/binman/test/elf_sections.c | 2 +- tools/binman/test/elf_sections.lds | 2 +- tools/binman/test/embed_data.c | 2 +- tools/binman/test/embed_data.lds | 2 +- tools/binman/test/u_boot_binman_embed.c | 2 +- tools/binman/test/u_boot_binman_embed.lds | 2 +- tools/binman/test/u_boot_binman_embed_sm.c | 2 +- tools/binman/test/u_boot_binman_syms.c | 2 +- tools/binman/test/u_boot_binman_syms.lds | 2 +- tools/binman/test/u_boot_binman_syms_bad.lds | 2 +- tools/binman/test/u_boot_binman_syms_size.c | 2 +- tools/binman/test/u_boot_binman_syms_x86.lds | 2 +- tools/binman/test/u_boot_no_ucode_ptr.c | 2 +- tools/binman/test/u_boot_ucode_ptr.c | 2 +- tools/binman/test/u_boot_ucode_ptr.lds | 2 +- tools/binman/test/yaml/config.yaml | 2 +- tools/binman/test/yaml/schema.yaml | 2 +- tools/binman/test/yaml/schema_notype.yaml | 2 +- tools/buildman/board.py | 2 +- tools/buildman/boards.py | 2 +- tools/buildman/bsettings.py | 2 +- tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 2 +- tools/buildman/buildman.rst | 2 +- tools/buildman/cfgutil.py | 2 +- tools/buildman/cmdline.py | 2 +- tools/buildman/control.py | 2 +- tools/buildman/func_test.py | 2 +- tools/buildman/main.py | 2 +- tools/buildman/test.py | 2 +- tools/buildman/toolchain.py | 2 +- tools/default_image.c | 2 +- tools/docker/Dockerfile | 2 +- tools/dtoc/README.rst | 2 +- tools/dtoc/dtb_platdata.py | 2 +- tools/dtoc/fdt.py | 2 +- tools/dtoc/fdt_util.py | 2 +- tools/dtoc/main.py | 2 +- tools/dtoc/setup.py | 4 ++-- tools/dtoc/src_scan.py | 2 +- tools/dtoc/test/dtoc_test.dts | 2 +- tools/dtoc/test/dtoc_test_add_prop.dts | 2 +- tools/dtoc/test/dtoc_test_addr32.dts | 2 +- tools/dtoc/test/dtoc_test_addr32_64.dts | 2 +- tools/dtoc/test/dtoc_test_addr64.dts | 2 +- tools/dtoc/test/dtoc_test_addr64_32.dts | 2 +- tools/dtoc/test/dtoc_test_alias_bad.dts | 2 +- tools/dtoc/test/dtoc_test_alias_bad_path.dts | 2 +- tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 2 +- tools/dtoc/test/dtoc_test_aliases.dts | 2 +- tools/dtoc/test/dtoc_test_bad_reg.dts | 2 +- tools/dtoc/test/dtoc_test_bad_reg2.dts | 2 +- tools/dtoc/test/dtoc_test_copy.dts | 2 +- tools/dtoc/test/dtoc_test_driver_alias.dts | 2 +- tools/dtoc/test/dtoc_test_empty.dts | 2 +- tools/dtoc/test/dtoc_test_inst.dts | 2 +- tools/dtoc/test/dtoc_test_invalid_driver.dts | 2 +- tools/dtoc/test/dtoc_test_noparent.dts | 2 +- tools/dtoc/test/dtoc_test_noprops.dts | 2 +- tools/dtoc/test/dtoc_test_phandle.dts | 2 +- tools/dtoc/test/dtoc_test_phandle_bad.dts | 2 +- tools/dtoc/test/dtoc_test_phandle_bad2.dts | 2 +- tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts | 2 +- tools/dtoc/test/dtoc_test_phandle_reorder.dts | 2 +- tools/dtoc/test/dtoc_test_phandle_single.dts | 2 +- tools/dtoc/test/dtoc_test_simple.dts | 2 +- tools/dtoc/test/dtoc_test_single_reg.dts | 2 +- tools/dtoc/test_dtoc.py | 2 +- tools/dtoc/test_fdt.py | 2 +- tools/dtoc/test_src_scan.py | 2 +- tools/dumpimage.c | 2 +- tools/dumpimage.h | 2 +- tools/endian-swap.py | 2 +- tools/env/Makefile | 2 +- tools/env/fw_env.c | 2 +- tools/env/fw_env.h | 2 +- tools/env/fw_env_main.c | 2 +- tools/env/fw_env_private.h | 2 +- tools/envcrc.c | 2 +- tools/expo.py | 2 +- tools/fdt_add_pubkey.c | 2 +- tools/fdt_host.h | 2 +- tools/fdtgrep.c | 2 +- tools/file2include.c | 4 ++-- tools/fit_check_sign.c | 2 +- tools/fit_common.c | 2 +- tools/fit_common.h | 2 +- tools/fit_image.c | 2 +- tools/fit_info.c | 2 +- tools/gdb/Makefile | 2 +- tools/gdb/error.c | 2 +- tools/gdb/error.h | 2 +- tools/gdb/gdbcont.c | 2 +- tools/gdb/gdbsend.c | 2 +- tools/gdb/remote.c | 2 +- tools/gdb/remote.h | 2 +- tools/gdb/serial.c | 2 +- tools/gdb/serial.h | 2 +- tools/gen_eth_addr.c | 2 +- tools/gen_ethaddr_crc.c | 2 +- tools/getline.c | 2 +- tools/gpheader.h | 2 +- tools/gpimage-common.c | 2 +- tools/gpimage.c | 2 +- tools/ifdtool.c | 2 +- tools/image-host.c | 2 +- tools/image-sig-host.c | 2 +- tools/imagetool.c | 2 +- tools/imagetool.h | 2 +- tools/imx8image.c | 2 +- tools/imx8m_image.sh | 2 +- tools/imx8mimage.c | 2 +- tools/imx_cntr_image.sh | 2 +- tools/imximage.c | 2 +- tools/kermit/README | 2 +- tools/kwbimage.c | 2 +- tools/kwbimage.h | 2 +- tools/libfdt/fdt_rw.c | 2 +- tools/lpc32xximage.c | 2 +- tools/microcode-tool.py | 2 +- tools/mips-relocs.c | 2 +- tools/mkenvimage.c | 2 +- tools/mkexynosspl.c | 2 +- tools/mkfwumdata.c | 2 +- tools/mkimage.c | 2 +- tools/mkimage.h | 2 +- tools/mksunxiboot.c | 2 +- tools/mtk_image.c | 2 +- tools/mtk_image.h | 2 +- tools/mtk_nand_headers.c | 2 +- tools/mtk_nand_headers.h | 2 +- tools/mxsboot.c | 2 +- tools/mxsimage.c | 2 +- tools/mxsimage.h | 2 +- tools/omap/clocks_get_m_n.c | 2 +- tools/omapimage.c | 2 +- tools/omapimage.h | 2 +- tools/os_support.c | 2 +- tools/os_support.h | 2 +- tools/patman/__init__.py | 2 +- tools/patman/__main__.py | 2 +- tools/patman/checkpatch.py | 2 +- tools/patman/commit.py | 2 +- tools/patman/control.py | 2 +- tools/patman/func_test.py | 2 +- tools/patman/get_maintainer.py | 2 +- tools/patman/gitutil.py | 2 +- tools/patman/patchstream.py | 2 +- tools/patman/patman.rst | 2 +- tools/patman/project.py | 2 +- tools/patman/series.py | 2 +- tools/patman/settings.py | 2 +- tools/patman/setup.py | 4 ++-- tools/patman/status.py | 2 +- tools/patman/test_checkpatch.py | 4 ++-- tools/patman/test_settings.py | 2 +- tools/pbl_crc32.c | 2 +- tools/pbl_crc32.h | 2 +- tools/pblimage.c | 2 +- tools/pblimage.h | 2 +- tools/prelink-riscv.c | 2 +- tools/prelink-riscv.inc | 2 +- tools/printinitialenv.c | 2 +- tools/proftool.c | 2 +- tools/qconfig.py | 2 +- tools/relocate-rela.c | 2 +- tools/rkcommon.c | 2 +- tools/rkcommon.h | 2 +- tools/rkimage.c | 2 +- tools/rksd.c | 2 +- tools/rkspi.c | 2 +- tools/rmboard.py | 2 +- tools/socfpgaimage.c | 2 +- tools/spl_size_limit.c | 2 +- tools/stm32image.c | 2 +- tools/sunxi_egon.c | 2 +- tools/sunxi_toc0.c | 2 +- tools/termios_linux.h | 2 +- tools/u_boot_pylib/README.rst | 2 +- tools/u_boot_pylib/__init__.py | 2 +- tools/u_boot_pylib/__main__.py | 2 +- tools/u_boot_pylib/command.py | 2 +- tools/u_boot_pylib/terminal.py | 2 +- tools/u_boot_pylib/test_util.py | 2 +- tools/u_boot_pylib/tools.py | 2 +- tools/u_boot_pylib/tout.py | 2 +- tools/ublimage.c | 2 +- tools/ublimage.h | 2 +- tools/vybridimage.c | 2 +- tools/zynqimage.c | 2 +- tools/zynqmp_pm_cfg_obj_convert.py | 2 +- tools/zynqmp_psu_init_minimize.sh | 4 ++-- tools/zynqmpbif.c | 2 +- tools/zynqmpimage.c | 2 +- tools/zynqmpimage.h | 2 +- 11487 files changed, 11509 insertions(+), 11509 deletions(-) diff --git a/Makefile b/Makefile index e0040a40d3..d4b276aaf1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later VERSION = 2023 PATCHLEVEL = 10 diff --git a/README b/README index 60c6b8a19d..25fa5cd2c5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000 - 2013 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/api/Makefile b/api/Makefile index bd2d035fcd..05b0d46cb6 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 Semihalf diff --git a/api/api.c b/api/api.c index 89003c161c..1a483755e7 100644 --- a/api/api.c +++ b/api/api.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Semihalf * diff --git a/api/api_display.c b/api/api_display.c index 2e877a85d1..7271aa2167 100644 --- a/api/api_display.c +++ b/api/api_display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/api/api_net.c b/api/api_net.c index 7515c26e8b..95ca589527 100644 --- a/api/api_net.c +++ b/api/api_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Semihalf * diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c index 6cfd9e6cc2..5ebf5d3169 100644 --- a/api/api_platform-arm.c +++ b/api/api_platform-arm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Semihalf * diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c index e1509663af..4285b148fe 100644 --- a/api/api_platform-mips.c +++ b/api/api_platform-mips.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Stanislav Galabov <sgalabov(a)gmail.com> * diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c index 847a4a3015..8ceced03c4 100644 --- a/api/api_platform-powerpc.c +++ b/api/api_platform-powerpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Semihalf * diff --git a/api/api_private.h b/api/api_private.h index bb23821c2c..31b875b2e9 100644 --- a/api/api_private.h +++ b/api/api_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Semihalf * diff --git a/api/api_storage.c b/api/api_storage.c index 997e8727a9..dc30a9c72e 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 Semihalf * diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 44568f8cf8..732c78b727 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later libs-y += arch/arc/cpu/$(CPU)/ libs-y += arch/arc/lib/ diff --git a/arch/arc/config.mk b/arch/arc/config.mk index b110f7deaf..08463c7bc7 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. diff --git a/arch/arc/cpu/arcv1/Makefile b/arch/arc/cpu/arcv1/Makefile index 4d42ac6678..29ce9b9848 100644 --- a/arch/arc/cpu/arcv1/Makefile +++ b/arch/arc/cpu/arcv1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. diff --git a/arch/arc/cpu/arcv1/ivt.S b/arch/arc/cpu/arcv1/ivt.S index 3d63430c2b..20409b6332 100644 --- a/arch/arc/cpu/arcv1/ivt.S +++ b/arch/arc/cpu/arcv1/ivt.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/cpu/arcv2/Makefile b/arch/arc/cpu/arcv2/Makefile index ab740266b4..f18799a691 100644 --- a/arch/arc/cpu/arcv2/Makefile +++ b/arch/arc/cpu/arcv2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. diff --git a/arch/arc/cpu/arcv2/ivt.S b/arch/arc/cpu/arcv2/ivt.S index 3f5b4094f2..e640c89ee0 100644 --- a/arch/arc/cpu/arcv2/ivt.S +++ b/arch/arc/cpu/arcv2/ivt.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/cpu/u-boot.lds b/arch/arc/cpu/u-boot.lds index 6a52ce461e..365de17daf 100644 --- a/arch/arc/cpu/u-boot.lds +++ b/arch/arc/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 532a8131c5..cdb5c67e86 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_AXS101) += axs101.dtb dtb-$(CONFIG_TARGET_AXS103) += axs103.dtb diff --git a/arch/arc/dts/abilis_tb100.dts b/arch/arc/dts/abilis_tb100.dts index 8f72e1aff4..946c39c47c 100644 --- a/arch/arc/dts/abilis_tb100.dts +++ b/arch/arc/dts/abilis_tb100.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Synopsys, Inc. (www.synopsys.com) */ diff --git a/arch/arc/dts/axc001.dtsi b/arch/arc/dts/axc001.dtsi index 93d99186c3..87e77a8400 100644 --- a/arch/arc/dts/axc001.dtsi +++ b/arch/arc/dts/axc001.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/axc003.dtsi b/arch/arc/dts/axc003.dtsi index 7765d8efa7..1a59eee41e 100644 --- a/arch/arc/dts/axc003.dtsi +++ b/arch/arc/dts/axc003.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/axs101.dts b/arch/arc/dts/axs101.dts index fc9fa93b74..871bea0635 100644 --- a/arch/arc/dts/axs101.dts +++ b/arch/arc/dts/axs101.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/axs103.dts b/arch/arc/dts/axs103.dts index 6e2dd00fc3..729453cc24 100644 --- a/arch/arc/dts/axs103.dts +++ b/arch/arc/dts/axs103.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 3a7f939a00..9a8730312c 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/emsdp.dts b/arch/arc/dts/emsdp.dts index 8222d3ea66..4aa8daa726 100644 --- a/arch/arc/dts/emsdp.dts +++ b/arch/arc/dts/emsdp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/hsdk-4xd.dts b/arch/arc/dts/hsdk-4xd.dts index b245eea769..eeab2142ee 100644 --- a/arch/arc/dts/hsdk-4xd.dts +++ b/arch/arc/dts/hsdk-4xd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi index eef3ee01e8..daedf5be0f 100644 --- a/arch/arc/dts/hsdk-common.dtsi +++ b/arch/arc/dts/hsdk-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2020 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts index 1a2e3d4322..6508d3b6b3 100644 --- a/arch/arc/dts/hsdk.dts +++ b/arch/arc/dts/hsdk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2020 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/arch/arc/dts/iot_devkit.dts b/arch/arc/dts/iot_devkit.dts index a33cf1d408..865fb05dd0 100644 --- a/arch/arc/dts/iot_devkit.dts +++ b/arch/arc/dts/iot_devkit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/dts/nsim.dts b/arch/arc/dts/nsim.dts index 2d3a7ecbc2..e3523367b3 100644 --- a/arch/arc/dts/nsim.dts +++ b/arch/arc/dts/nsim.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016, 2020 Synopsys, Inc. (www.synopsys.com) */ diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index a9f54f61e0..5af7bafa47 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index c6dd28ecef..52fa20e86e 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/byteorder.h b/arch/arc/include/asm/byteorder.h index 8c171bb294..d01f8fa34e 100644 --- a/arch/arc/include/asm/byteorder.h +++ b/arch/arc/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index 74cff716ef..baf9fc31a6 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h index afdfcaa78b..972dc07642 100644 --- a/arch/arc/include/asm/config.h +++ b/arch/arc/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index e35a26f1eb..db4c2cad73 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index c818b8bdae..f5bd39603e 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014, 2020 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h index 2d42ed4098..5ced384bd1 100644 --- a/arch/arc/include/asm/linkage.h +++ b/arch/arc/include/asm/linkage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004, 2007-2010, 2011-2015 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/posix_types.h b/arch/arc/include/asm/posix_types.h index 13838cbc1d..4d094eeeda 100644 --- a/arch/arc/include/asm/posix_types.h +++ b/arch/arc/include/asm/posix_types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 03e31fb4e9..cb8ef5ae33 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h index 6965e89362..1771ac77c2 100644 --- a/arch/arc/include/asm/ptrace.h +++ b/arch/arc/include/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h index ffad4a684e..423eb845b1 100644 --- a/arch/arc/include/asm/sections.h +++ b/arch/arc/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/types.h b/arch/arc/include/asm/types.h index f31dcdf28e..20eab83953 100644 --- a/arch/arc/include/asm/types.h +++ b/arch/arc/include/asm/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/u-boot-arc.h b/arch/arc/include/asm/u-boot-arc.h index dd2c0949c6..bf9bcad370 100644 --- a/arch/arc/include/asm/u-boot-arc.h +++ b/arch/arc/include/asm/u-boot-arc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/include/asm/u-boot.h b/arch/arc/include/asm/u-boot.h index 36c220745f..da9b790771 100644 --- a/arch/arc/include/asm/u-boot.h +++ b/arch/arc/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile index 0eb44bcf33..d05fbaa8f7 100644 --- a/arch/arc/lib/Makefile +++ b/arch/arc/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. diff --git a/arch/arc/lib/_millicodethunk.S b/arch/arc/lib/_millicodethunk.S index 4ad16ae3b6..9719f0935c 100644 --- a/arch/arc/lib/_millicodethunk.S +++ b/arch/arc/lib/_millicodethunk.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1995, 1997, 2007-2013 Free Software Foundation, Inc. */ diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 2dd003445f..d68324a7c5 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index d97a578742..3fd81e768f 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 1567857961..37fb6c9f80 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014, 2018 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c index 023eae1907..7acb88fba8 100644 --- a/arch/arc/lib/init_helpers.c +++ b/arch/arc/lib/init_helpers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c index db21fbb114..23fd34f371 100644 --- a/arch/arc/lib/interrupts.c +++ b/arch/arc/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/ints_low.S b/arch/arc/lib/ints_low.S index fb283f239e..0bf50884dd 100644 --- a/arch/arc/lib/ints_low.S +++ b/arch/arc/lib/ints_low.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/libgcc2.c b/arch/arc/lib/libgcc2.c index ab1dbe1c13..0715d92a05 100644 --- a/arch/arc/lib/libgcc2.c +++ b/arch/arc/lib/libgcc2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 1989-2013 Free Software Foundation, Inc. */ diff --git a/arch/arc/lib/libgcc2.h b/arch/arc/lib/libgcc2.h index 95eb9b0524..e1fe8130b8 100644 --- a/arch/arc/lib/libgcc2.h +++ b/arch/arc/lib/libgcc2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1989-2013 Free Software Foundation, Inc. */ diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c index fd6f4fbc93..5d39b0a65c 100644 --- a/arch/arc/lib/relocate.c +++ b/arch/arc/lib/relocate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c index b8589d0f0a..991691146c 100644 --- a/arch/arc/lib/reset.c +++ b/arch/arc/lib/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index 9f5547e552..11ae99ff2a 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5ebe0619d3..d3be15e2f1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_ARCH_TEGRA),yy) CONFIG_CPU_V7A= diff --git a/arch/arm/config.mk b/arch/arm/config.mk index 5530d02b66..1b151488e5 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index a0e1c2a651..3b2ebcde2b 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj- += dummy.o diff --git a/arch/arm/cpu/arm11/Makefile b/arch/arm/cpu/arm11/Makefile index 5dfa01ae8d..4e8db97203 100644 --- a/arch/arm/cpu/arm11/Makefile +++ b/arch/arm/cpu/arm11/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 1e16b89d00..582be31c3f 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 Texas Insturments * diff --git a/arch/arm/cpu/arm11/sctlr.S b/arch/arm/cpu/arm11/sctlr.S index 8722f8380c..0d787a0057 100644 --- a/arch/arm/cpu/arm11/sctlr.S +++ b/arch/arm/cpu/arm11/sctlr.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Routines to access the system control register * diff --git a/arch/arm/cpu/arm1136/Makefile b/arch/arm/cpu/arm1136/Makefile index 68d686a5dc..b730b24545 100644 --- a/arch/arm/cpu/arm1136/Makefile +++ b/arch/arm/cpu/arm1136/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile index 67799eeb80..356d56478e 100644 --- a/arch/arm/cpu/arm1136/mx31/Makefile +++ b/arch/arm/cpu/arm1136/mx31/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c index 9997e8fc33..18cbc73d5c 100644 --- a/arch/arm/cpu/arm1136/mx31/devices.c +++ b/arch/arm/cpu/arm1136/mx31/devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2009 Magnus Lilja <lilja.magnus(a)gmail.com> diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index a3d4f14796..587de60689 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/cpu/arm1136/mx31/relocate.S b/arch/arm/cpu/arm1136/mx31/relocate.S index 225e5281b8..182dca2d4d 100644 --- a/arch/arm/cpu/arm1136/mx31/relocate.S +++ b/arch/arm/cpu/arm1136/mx31/relocate.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * relocate - i.MX31-specific vector relocation * diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c index a913860491..74e5297932 100644 --- a/arch/arm/cpu/arm1136/mx31/timer.c +++ b/arch/arm/cpu/arm1136/mx31/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index 4bc27f6373..a8cd82e459 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for OMP2420/ARM1136 CPU-core * diff --git a/arch/arm/cpu/arm1136/u-boot-spl.lds b/arch/arm/cpu/arm1136/u-boot-spl.lds index f83988fd7e..6c54d9f00f 100644 --- a/arch/arm/cpu/arm1136/u-boot-spl.lds +++ b/arch/arm/cpu/arm1136/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/arch/arm/cpu/arm1176/Makefile b/arch/arm/cpu/arm1176/Makefile index 32332474fb..ef765b6b1b 100644 --- a/arch/arm/cpu/arm1176/Makefile +++ b/arch/arm/cpu/arm1176/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index 78a9cc173a..dab99f004c 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM1176 CPU-core * diff --git a/arch/arm/cpu/arm720t/Makefile b/arch/arm/cpu/arm720t/Makefile index e70b590612..1652d8b5c1 100644 --- a/arch/arm/cpu/arm720t/Makefile +++ b/arch/arm/cpu/arm720t/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c index ece09c83a4..03cd2b3005 100644 --- a/arch/arm/cpu/arm720t/cpu.c +++ b/arch/arm/cpu/arm720t/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c index f0fc58dead..8889d8848f 100644 --- a/arch/arm/cpu/arm720t/interrupts.c +++ b/arch/arm/cpu/arm720t/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 9ad1f03142..3afb95ade6 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM720 CPU-core * diff --git a/arch/arm/cpu/arm920t/Makefile b/arch/arm/cpu/arm920t/Makefile index 5ac3740621..fc562bb7c6 100644 --- a/arch/arm/cpu/arm920t/Makefile +++ b/arch/arm/cpu/arm920t/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 305713e786..a71e49f525 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index cba4a1f035..59e296aea3 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM920 CPU-core * diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index 8cfe3f0fbb..09a7a30153 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c index 95963d2665..cc7b514c97 100644 --- a/arch/arm/cpu/arm926ejs/cache.c +++ b/arch/arm/cpu/arm926ejs/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Ilya Yanok, EmCraft Systems diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index 2ce413a7f8..e8db33bc9a 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/cpu/arm926ejs/mxs/Makefile b/arch/arm/cpu/arm926ejs/mxs/Makefile index 1638ef8fd8..5eae6b681d 100644 --- a/arch/arm/cpu/arm926ejs/mxs/Makefile +++ b/arch/arm/cpu/arm926ejs/mxs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c index 4e1cf3a1e3..bad97718b2 100644 --- a/arch/arm/cpu/arm926ejs/mxs/clock.c +++ b/arch/arm/cpu/arm926ejs/mxs/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX23/i.MX28 clock setup code * diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c index 381264b8a1..8fcdb592bf 100644 --- a/arch/arm/cpu/arm926ejs/mxs/iomux.c +++ b/arch/arm/cpu/arm926ejs/mxs/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004-2006,2010 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright (C) 2008 by Sascha Hauer <kernel(a)pengutronix.de> diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c index 6d6166cb83..e0f81a5348 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX23/i.MX28 common code * diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h index 062deb7793..3c69d208c4 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxs_init.h +++ b/arch/arm/cpu/arm926ejs/mxs/mxs_init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 SPL functions * diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index 5e7bdb78be..6cd0cbeaea 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 Boot setup * diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c index 2cfbd78095..21bd2cca3b 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 Battery measurement init * diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c index a94803ee93..4ec61b52f8 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 RAM init * diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 7ea029e371..abf3c9115d 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 Boot PMIC init * diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S index 61982e38a1..2a8fdf7e5a 100644 --- a/arch/arm/cpu/arm926ejs/mxs/start.S +++ b/arch/arm/cpu/arm926ejs/mxs/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM926EJS CPU-core * diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c index 3dff3d768d..9aaa34a99f 100644 --- a/arch/arm/cpu/arm926ejs/mxs/timer.c +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 timer driver * diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds index 7e20448f81..13daa01f91 100644 --- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Marek Vasut <marek.vasut(a)gmail.com> * on behalf of DENX Software Engineering GmbH diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index c882bd39ea..130d75c8fd 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM926EJS CPU-core * diff --git a/arch/arm/cpu/arm926ejs/sunxi/Makefile b/arch/arm/cpu/arm926ejs/sunxi/Makefile index 7d8b959dcd..34c9205e70 100644 --- a/arch/arm/cpu/arm926ejs/sunxi/Makefile +++ b/arch/arm/cpu/arm926ejs/sunxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> obj-y += fel_utils.o diff --git a/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S b/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S index 25924033c6..fb02b555a3 100644 --- a/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S +++ b/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Utility functions for FEL mode. * diff --git a/arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds index cf65e8c462..52bce46d5f 100644 --- a/arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Icenowy Zheng <icenowy(a)aosc.io> diff --git a/arch/arm/cpu/arm946es/Makefile b/arch/arm/cpu/arm946es/Makefile index 24cebe3f59..0bccee1b48 100644 --- a/arch/arm/cpu/arm946es/Makefile +++ b/arch/arm/cpu/arm946es/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index 334bb54274..7145d2b481 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 2d5186774a..f32d59a6bf 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM926EJS CPU-core * diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 653eef8ad7..dc059533f0 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c index 17bd53dae8..2c171bce76 100644 --- a/arch/arm/cpu/armv7/arch_timer.c +++ b/arch/arm/cpu/armv7/arch_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2014 * Texas Instruments Incorporated, <www.ti.com> diff --git a/arch/arm/cpu/armv7/bcm235xx/Makefile b/arch/arm/cpu/armv7/bcm235xx/Makefile index 3d09126cab..10cd6738b5 100644 --- a/arch/arm/cpu/armv7/bcm235xx/Makefile +++ b/arch/arm/cpu/armv7/bcm235xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Broadcom Corporation. diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c index 39217c5b2b..9d58bf406b 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c index 1b3f36aebe..5370adb950 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c index d7edefee23..ef0eb9a23d 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.h b/arch/arm/cpu/armv7/bcm235xx/clk-core.h index ace384dea7..c9029b33b2 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-core.h +++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c index 209ceca9a0..6da7d15d64 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c index f2ba354c24..54c1d041bb 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c index f604aec62f..3a140894ac 100644 --- a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c +++ b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/Makefile b/arch/arm/cpu/armv7/bcm281xx/Makefile index e5099975cb..99bf0d5cc8 100644 --- a/arch/arm/cpu/armv7/bcm281xx/Makefile +++ b/arch/arm/cpu/armv7/bcm281xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Broadcom Corporation. diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c index 8f6260e785..0f3310d23a 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c index 1b3f36aebe..5370adb950 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c index 26b673a540..07f2b653a9 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-core.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.h b/arch/arm/cpu/armv7/bcm281xx/clk-core.h index f0fbff081d..b09509f861 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-core.h +++ b/arch/arm/cpu/armv7/bcm281xx/clk-core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c index 209ceca9a0..6da7d15d64 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c index f2ba354c24..54c1d041bb 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c index f604aec62f..3a140894ac 100644 --- a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c +++ b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcm281xx/reset.c b/arch/arm/cpu/armv7/bcm281xx/reset.c index 1491e5c88b..cf0b13ca8b 100644 --- a/arch/arm/cpu/armv7/bcm281xx/reset.c +++ b/arch/arm/cpu/armv7/bcm281xx/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcmcygnus/Makefile b/arch/arm/cpu/armv7/bcmcygnus/Makefile index 3496bcd2e3..17b29ab3f0 100644 --- a/arch/arm/cpu/armv7/bcmcygnus/Makefile +++ b/arch/arm/cpu/armv7/bcmcygnus/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Broadcom Corporation. diff --git a/arch/arm/cpu/armv7/bcmcygnus/reset.c b/arch/arm/cpu/armv7/bcmcygnus/reset.c index 63992fd870..07a151073d 100644 --- a/arch/arm/cpu/armv7/bcmcygnus/reset.c +++ b/arch/arm/cpu/armv7/bcmcygnus/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/bcmnsp/Makefile b/arch/arm/cpu/armv7/bcmnsp/Makefile index 3496bcd2e3..17b29ab3f0 100644 --- a/arch/arm/cpu/armv7/bcmnsp/Makefile +++ b/arch/arm/cpu/armv7/bcmnsp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Broadcom Corporation. diff --git a/arch/arm/cpu/armv7/bcmnsp/reset.c b/arch/arm/cpu/armv7/bcmnsp/reset.c index a3137752e8..ad026d1fa9 100644 --- a/arch/arm/cpu/armv7/bcmnsp/reset.c +++ b/arch/arm/cpu/armv7/bcmnsp/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/cache_v7.c b/arch/arm/cpu/armv7/cache_v7.c index 19ff432352..28edfe4e38 100644 --- a/arch/arm/cpu/armv7/cache_v7.c +++ b/arch/arm/cpu/armv7/cache_v7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/cpu/armv7/cache_v7_asm.S b/arch/arm/cpu/armv7/cache_v7_asm.S index e38d72f87f..b4aea1e946 100644 --- a/arch/arm/cpu/armv7/cache_v7_asm.S +++ b/arch/arm/cpu/armv7/cache_v7_asm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> #include <linux/linkage.h> diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk index 68036d6fbd..0f86ba9a4f 100644 --- a/arch/arm/cpu/armv7/config.mk +++ b/arch/arm/cpu/armv7/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002 # Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/arch/arm/cpu/armv7/cp15.c b/arch/arm/cpu/armv7/cp15.c index 0ac4e7ba8c..700f7fc81f 100644 --- a/arch/arm/cpu/armv7/cp15.c +++ b/arch/arm/cpu/armv7/cp15.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Texas Insturments */ diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 6259ffa510..5fa6ed5875 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Texas Insturments * diff --git a/arch/arm/cpu/armv7/exception_level.c b/arch/arm/cpu/armv7/exception_level.c index f6d25bb682..8a950a00ff 100644 --- a/arch/arm/cpu/armv7/exception_level.c +++ b/arch/arm/cpu/armv7/exception_level.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Switch to non-secure mode * diff --git a/arch/arm/cpu/armv7/iproc-common/Makefile b/arch/arm/cpu/armv7/iproc-common/Makefile index 6f5c837a9b..71605e75f0 100644 --- a/arch/arm/cpu/armv7/iproc-common/Makefile +++ b/arch/arm/cpu/armv7/iproc-common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Broadcom Corporation. diff --git a/arch/arm/cpu/armv7/iproc-common/armpll.c b/arch/arm/cpu/armv7/iproc-common/armpll.c index 8c3a323f06..cb53969cef 100644 --- a/arch/arm/cpu/armv7/iproc-common/armpll.c +++ b/arch/arm/cpu/armv7/iproc-common/armpll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c index 896d2f9569..f49e72b266 100644 --- a/arch/arm/cpu/armv7/iproc-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/iproc-common/hwinit-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c index a4255a44c0..a7932796a5 100644 --- a/arch/arm/cpu/armv7/iproc-common/timer.c +++ b/arch/arm/cpu/armv7/iproc-common/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S index 3c8c07fe01..8de9675469 100644 --- a/arch/arm/cpu/armv7/lowlevel_init.S +++ b/arch/arm/cpu/armv7/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * A lowlevel_init function that sets up the stack to call a C function to * perform further init. diff --git a/arch/arm/cpu/armv7/ls102xa/Makefile b/arch/arm/cpu/armv7/ls102xa/Makefile index 0c1596f330..bc88b092e4 100644 --- a/arch/arm/cpu/armv7/ls102xa/Makefile +++ b/arch/arm/cpu/armv7/ls102xa/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += cpu.o diff --git a/arch/arm/cpu/armv7/ls102xa/clock.c b/arch/arm/cpu/armv7/ls102xa/clock.c index 4e1fe28120..18f9efaaa9 100644 --- a/arch/arm/cpu/armv7/ls102xa/clock.c +++ b/arch/arm/cpu/armv7/ls102xa/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index c455969609..c1f2d339b2 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 1c3d24bcad..840f989efe 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c index e31a4fb6c3..d0637319db 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_epu.h b/arch/arm/cpu/armv7/ls102xa/fsl_epu.h index 711eea5650..cee1e09e87 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_epu.h +++ b/arch/arm/cpu/armv7/ls102xa/fsl_epu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c index f74d819ea1..d2524caf75 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h index 7382aef8ee..09d4c3c8fc 100644 --- a/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h +++ b/arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c index dbb0766a9c..dd67d5fd53 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Author: Hongbo Zhang <hongbo.zhang(a)nxp.com> diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c index 8c030be8b3..bc35458e83 100644 --- a/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c +++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index e7c4fbfb43..2c53e8ac9f 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * Author: Wang Dongsheng <dongsheng.wang(a)freescale.com> diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index 84d4ea3a8f..6b8d99ae8c 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/spl.c b/arch/arm/cpu/armv7/ls102xa/spl.c index a194968623..c029913fe1 100644 --- a/arch/arm/cpu/armv7/ls102xa/spl.c +++ b/arch/arm/cpu/armv7/ls102xa/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index c6126b10c3..9a7aeb2add 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/mpu_v7r.c b/arch/arm/cpu/armv7/mpu_v7r.c index 57ab640e26..d2d04035f3 100644 --- a/arch/arm/cpu/armv7/mpu_v7r.c +++ b/arch/arm/cpu/armv7/mpu_v7r.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cortex-R Memory Protection Unit specific code * diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index bed40fa3d9..3f41564c69 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * code for switching cores into non-secure state and into HYP mode * diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index 0985420fe5..1b7d37fc5c 100644 --- a/arch/arm/cpu/armv7/s5p-common/Makefile +++ b/arch/arm/cpu/armv7/s5p-common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2009 Samsung Electronics # Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index fb2920950d..c9f8803ffe 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c index 5068327d3c..afc97e53e5 100644 --- a/arch/arm/cpu/armv7/s5p-common/pwm.c +++ b/arch/arm/cpu/armv7/s5p-common/pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * diff --git a/arch/arm/cpu/armv7/s5p-common/sromc.c b/arch/arm/cpu/armv7/s5p-common/sromc.c index 0fc170936a..f780e2e5d5 100644 --- a/arch/arm/cpu/armv7/s5p-common/sromc.c +++ b/arch/arm/cpu/armv7/s5p-common/sromc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Samsung Electronics * Naveen Krishna Ch <ch.naveen(a)samsung.com> diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 9d981cce14..e3ccb19aa7 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/arch/arm/cpu/armv7/s5p4418/Makefile b/arch/arm/cpu/armv7/s5p4418/Makefile index 321b257b6d..d41ee8e19c 100644 --- a/arch/arm/cpu/armv7/s5p4418/Makefile +++ b/arch/arm/cpu/armv7/s5p4418/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c index 8febfe5276..97e9cef291 100644 --- a/arch/arm/cpu/armv7/s5p4418/cpu.c +++ b/arch/arm/cpu/armv7/s5p4418/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/cpu/armv7/sctlr.S b/arch/arm/cpu/armv7/sctlr.S index d44b21498f..ca714bf8f5 100644 --- a/arch/arm/cpu/armv7/sctlr.S +++ b/arch/arm/cpu/armv7/sctlr.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Routines to access the system control register * diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 69e281b086..12a11bba9b 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for OMAP3530/ARM Cortex CPU-core * diff --git a/arch/arm/cpu/armv7/stv0991/Makefile b/arch/arm/cpu/armv7/stv0991/Makefile index 3be5eba4b1..d889d07dc8 100644 --- a/arch/arm/cpu/armv7/stv0991/Makefile +++ b/arch/arm/cpu/armv7/stv0991/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, STMicroelectronics - All Rights Reserved # Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7/stv0991/clock.c b/arch/arm/cpu/armv7/stv0991/clock.c index 1e35deed35..146c869557 100644 --- a/arch/arm/cpu/armv7/stv0991/clock.c +++ b/arch/arm/cpu/armv7/stv0991/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7/stv0991/lowlevel.S b/arch/arm/cpu/armv7/stv0991/lowlevel.S index 5733eaa15c..71f3b5236e 100644 --- a/arch/arm/cpu/armv7/stv0991/lowlevel.S +++ b/arch/arm/cpu/armv7/stv0991/lowlevel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 STMicroelectronics */ diff --git a/arch/arm/cpu/armv7/stv0991/pinmux.c b/arch/arm/cpu/armv7/stv0991/pinmux.c index 6c44ffe50e..0aab0b60be 100644 --- a/arch/arm/cpu/armv7/stv0991/pinmux.c +++ b/arch/arm/cpu/armv7/stv0991/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7/stv0991/reset.c b/arch/arm/cpu/armv7/stv0991/reset.c index 77d4477c8d..74157cecd6 100644 --- a/arch/arm/cpu/armv7/stv0991/reset.c +++ b/arch/arm/cpu/armv7/stv0991/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c index f7cc45772f..dcff28bf91 100644 --- a/arch/arm/cpu/armv7/stv0991/timer.c +++ b/arch/arm/cpu/armv7/stv0991/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile index 3e975b366c..48f2d344c1 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> # diff --git a/arch/arm/cpu/armv7/sunxi/fel_utils.S b/arch/arm/cpu/armv7/sunxi/fel_utils.S index 78bb1657fc..6cf799e9b8 100644 --- a/arch/arm/cpu/armv7/sunxi/fel_utils.S +++ b/arch/arm/cpu/armv7/sunxi/fel_utils.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Utility functions for FEL mode. * diff --git a/arch/arm/cpu/armv7/sunxi/sram.c b/arch/arm/cpu/armv7/sunxi/sram.c index 28564c2846..43aa8cd568 100644 --- a/arch/arm/cpu/armv7/sunxi/sram.c +++ b/arch/arm/cpu/armv7/sunxi/sram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/arch/arm/cpu/armv7/sunxi/tzpc.c b/arch/arm/cpu/armv7/sunxi/tzpc.c index 0c86a21a3f..88ba60c6e9 100644 --- a/arch/arm/cpu/armv7/sunxi/tzpc.c +++ b/arch/arm/cpu/armv7/sunxi/tzpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds index fb7a789b28..40febf1dd3 100644 --- a/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/sunxi/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/cpu/armv7/syslib.c b/arch/arm/cpu/armv7/syslib.c index 7e29636972..d49d7a30a5 100644 --- a/arch/arm/cpu/armv7/syslib.c +++ b/arch/arm/cpu/armv7/syslib.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/cpu/armv7/vf610/Makefile b/arch/arm/cpu/armv7/vf610/Makefile index b5b479b496..232972be9a 100644 --- a/arch/arm/cpu/armv7/vf610/Makefile +++ b/arch/arm/cpu/armv7/vf610/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Freescale Semiconductor, Inc. diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c index c23ddc12b4..e338356bd4 100644 --- a/arch/arm/cpu/armv7/vf610/generic.c +++ b/arch/arm/cpu/armv7/vf610/generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c index a9c1a8fceb..5a0059b529 100644 --- a/arch/arm/cpu/armv7/vf610/timer.c +++ b/arch/arm/cpu/armv7/vf610/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c index 5ffeca13d9..d504ad6646 100644 --- a/arch/arm/cpu/armv7/virt-v7.c +++ b/arch/arm/cpu/armv7/virt-v7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Andre Przywara, Linaro <andre.przywara(a)linaro.org> diff --git a/arch/arm/cpu/armv7m/Makefile b/arch/arm/cpu/armv7m/Makefile index baeac9343d..8ffc45326b 100644 --- a/arch/arm/cpu/armv7m/Makefile +++ b/arch/arm/cpu/armv7m/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index d1aecf6a85..fbad3f84fc 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7m/config.mk b/arch/arm/cpu/armv7m/config.mk index f50964cfb9..45907ffdaf 100644 --- a/arch/arm/cpu/armv7m/config.mk +++ b/arch/arm/cpu/armv7m/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 # Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index 65427b5312..f0cea58a2b 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com diff --git a/arch/arm/cpu/armv7m/mpu.c b/arch/arm/cpu/armv7m/mpu.c index 81e7492f1c..f9ded4fa1c 100644 --- a/arch/arm/cpu/armv7m/mpu.c +++ b/arch/arm/cpu/armv7m/mpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/cpu/armv7m/start.S b/arch/arm/cpu/armv7m/start.S index 0c07f2140c..0c00910e1c 100644 --- a/arch/arm/cpu/armv7m/start.S +++ b/arch/arm/cpu/armv7m/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c index c30af4ff7a..be9abdd8f0 100644 --- a/arch/arm/cpu/armv7m/systick-timer.c +++ b/arch/arm/cpu/armv7m/systick-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ARM Cortex M3/M4/M7 SysTick timer driver * (C) Copyright 2017 Renesas Electronics Europe Ltd diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index bba4f570db..e1406ed15c 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/cpu/armv8/bcmns3/Makefile b/arch/arm/cpu/armv8/bcmns3/Makefile index a35e29d11a..1bba4eb883 100644 --- a/arch/arm/cpu/armv8/bcmns3/Makefile +++ b/arch/arm/cpu/armv8/bcmns3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 Broadcom. diff --git a/arch/arm/cpu/armv8/bcmns3/lowlevel.S b/arch/arm/cpu/armv8/bcmns3/lowlevel.S index bf1a17ab03..dcf9ba1656 100644 --- a/arch/arm/cpu/armv8/bcmns3/lowlevel.S +++ b/arch/arm/cpu/armv8/bcmns3/lowlevel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Broadcom. * diff --git a/arch/arm/cpu/armv8/cache.S b/arch/arm/cpu/armv8/cache.S index 3fe935cf28..7582c9f843 100644 --- a/arch/arm/cpu/armv8/cache.S +++ b/arch/arm/cpu/armv8/cache.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index cb1131a048..934bdb3bd2 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/config.mk b/arch/arm/cpu/armv8/config.mk index 4d74b2a533..d829b8cfef 100644 --- a/arch/arm/cpu/armv8/config.mk +++ b/arch/arm/cpu/armv8/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002 # Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9bfe3815e5..350be1babb 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 NXP Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index 3c7f36ad8d..90bb55444c 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Texas Insturments * diff --git a/arch/arm/cpu/armv8/exception_level.c b/arch/arm/cpu/armv8/exception_level.c index b11936548f..2c9ae76702 100644 --- a/arch/arm/cpu/armv8/exception_level.c +++ b/arch/arm/cpu/armv8/exception_level.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Switch to non-secure mode * diff --git a/arch/arm/cpu/armv8/exceptions.S b/arch/arm/cpu/armv8/exceptions.S index 504d566721..094f3cdfea 100644 --- a/arch/arm/cpu/armv8/exceptions.S +++ b/arch/arm/cpu/armv8/exceptions.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/fel_utils.S b/arch/arm/cpu/armv8/fel_utils.S index 2fe38a1a04..e5004d1fab 100644 --- a/arch/arm/cpu/armv8/fel_utils.S +++ b/arch/arm/cpu/armv8/fel_utils.S @@ -3,7 +3,7 @@ * * Copyright (c) 2017 Arm Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <asm-offsets.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index eefdf12369..e40b2ca414 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2016-2018 NXP # Copyright 2014-2015, Freescale Semiconductor diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 12d31184ad..7285733adc 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h index 45da95831e..ea71cc7514 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.h +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2015, Freescale Semiconductor */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 index d7f7b9f111..c21e761e8c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2 @@ -1,7 +1,7 @@ # # Copyright 2015 Freescale Semiconductor # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Freescale LayerScape with Chassis Generation 2 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 index 1ddf9473a3..a09e11e9cd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 @@ -1,7 +1,7 @@ # # Copyright 2014-2015 Freescale Semiconductor # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Freescale LayerScape with Chassis Generation 3 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3_2 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3_2 index 6d4bd0b80a..d91a234e53 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3_2 +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3_2 @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # NXP LayerScape with Chassis Generation 3.2 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra index 43db4d8e94..678d332fe1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.pci_iommu_extra @@ -1,7 +1,7 @@ # # Copyright 2020 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Specifying extra IOMMU mappings for PCI controllers diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 22ce699216..c3984d67aa 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015 Freescale Semiconductor, Inc. * Copyright 2020-2021 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c index 1541dfb3ec..1b60d224c6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c index 4455eb1726..5c2d3f83b1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2019 NXP. diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c index c0efc341af..51fa799c0b 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016-2018, 2020 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c index 137778dc13..e13e4175b2 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015, Freescale Semiconductor, Inc. * Copyright 2019-2020 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/icid.c b/arch/arm/cpu/armv8/fsl-layerscape/icid.c index c22e73253c..62c3b11f78 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/icid.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/icid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index 4358c6ed11..9c2f1c3bda 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014-2015 Freescale Semiconductor * Copyright 2019-2022 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c index 8d7beca7db..c4b79c5786 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c index 86a49b152e..a3e08b3de9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c index 80d2910f67..e76d06b365 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c index e3c3fc6bfb..79b650d1f1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_psci.S b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_psci.S index b4c7d6f855..c4d7cca10f 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_psci.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Author: Hongbo Zhang <hongbo.zhang(a)nxp.com> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c index 6c5e52ebaa..a51719e7b3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c index 333d7e2fa2..fa97b862d4 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c index 9347e516bf..e70c40d813 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c index 23743ae10c..8030cecdbf 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c index fe667f06c3..540c6dde25 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c index 7997422840..6ebc0ad9d4 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c index e6403b7952..2d1b44576e 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c index 3a0ed1fa55..ee742ff9cc 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c index 5941d90e03..048fc02c01 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2020 NXP */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/mp.c b/arch/arm/cpu/armv8/fsl-layerscape/mp.c index ce0c46ad0d..95f450a724 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/mp.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 3bfdc3f774..8a791b2e5d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015 Freescale Semiconductor * Copyright 2019-2021 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S index 1eb0c2d4a7..7719f094c3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014-2015 Freescale Semiconductor * Copyright 2019 NXP diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 232adfa843..ae0ef3a79a 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index 87de09979b..e53c1e16c3 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * (C) Copyright 2014, Cavium Inc. * (C) Copyright 2017, Xilinx Inc. diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index 8f83372cbc..3a48831207 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/hisilicon/Makefile b/arch/arm/cpu/armv8/hisilicon/Makefile index cf2fe05f49..baaefcb829 100644 --- a/arch/arm/cpu/armv8/hisilicon/Makefile +++ b/arch/arm/cpu/armv8/hisilicon/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Linaro # Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/cpu/armv8/hisilicon/pinmux.c b/arch/arm/cpu/armv8/hisilicon/pinmux.c index e14057c0a4..650841d633 100644 --- a/arch/arm/cpu/armv8/hisilicon/pinmux.c +++ b/arch/arm/cpu/armv8/hisilicon/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Linaro. * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/cpu/armv8/psci.S b/arch/arm/cpu/armv8/psci.S index ab8b3df341..90c7f27e4f 100644 --- a/arch/arm/cpu/armv8/psci.S +++ b/arch/arm/cpu/armv8/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Author: Hongbo Zhang <hongbo.zhang(a)nxp.com> diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index c0e8726346..f48723b53e 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 NXP Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/sec_firmware_asm.S b/arch/arm/cpu/armv8/sec_firmware_asm.S index af1b2da072..e67c77b369 100644 --- a/arch/arm/cpu/armv8/sec_firmware_asm.S +++ b/arch/arm/cpu/armv8/sec_firmware_asm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 NXP Semiconductor, Inc. */ diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c index 42a0962fdc..e6b5e6b2a8 100644 --- a/arch/arm/cpu/armv8/spin_table.c +++ b/arch/arm/cpu/armv8/spin_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/cpu/armv8/spin_table_v8.S b/arch/arm/cpu/armv8/spin_table_v8.S index 6d26843270..b08e81d79d 100644 --- a/arch/arm/cpu/armv8/spin_table_v8.S +++ b/arch/arm/cpu/armv8/spin_table_v8.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/cpu/armv8/spl_data.c b/arch/arm/cpu/armv8/spl_data.c index 8f1231c86e..d168e21224 100644 --- a/arch/arm/cpu/armv8/spl_data.c +++ b/arch/arm/cpu/armv8/spl_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 6cc1d26e5e..771ecacfca 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/tlb.S b/arch/arm/cpu/armv8/tlb.S index 46a0d7d8f6..96ecf6e409 100644 --- a/arch/arm/cpu/armv8/tlb.S +++ b/arch/arm/cpu/armv8/tlb.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/transition.S b/arch/arm/cpu/armv8/transition.S index 9dbdff3a4f..9d4870ea58 100644 --- a/arch/arm/cpu/armv8/transition.S +++ b/arch/arm/cpu/armv8/transition.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/u-boot-spl.lds b/arch/arm/cpu/armv8/u-boot-spl.lds index 7cb9d73124..e6f1ddf913 100644 --- a/arch/arm/cpu/armv8/u-boot-spl.lds +++ b/arch/arm/cpu/armv8/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/u-boot.lds b/arch/arm/cpu/armv8/u-boot.lds index fb6a30c922..be17c24e5f 100644 --- a/arch/arm/cpu/armv8/u-boot.lds +++ b/arch/arm/cpu/armv8/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/cpu/armv8/xen/Makefile b/arch/arm/cpu/armv8/xen/Makefile index e3b4ae2bd4..18e223864f 100644 --- a/arch/arm/cpu/armv8/xen/Makefile +++ b/arch/arm/cpu/armv8/xen/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) 2018 NXP # (C) 2020 EPAM Systems Inc. diff --git a/arch/arm/cpu/armv8/xen/lowlevel_init.S b/arch/arm/cpu/armv8/xen/lowlevel_init.S index 760e32ed76..4cb9503b8c 100644 --- a/arch/arm/cpu/armv8/xen/lowlevel_init.S +++ b/arch/arm/cpu/armv8/xen/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) 2017 NXP * (C) 2020 EPAM Systems Inc. diff --git a/arch/arm/cpu/u-boot-spl.lds b/arch/arm/cpu/u-boot-spl.lds index fb2189d50d..472ec0b495 100644 --- a/arch/arm/cpu/u-boot-spl.lds +++ b/arch/arm/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2004-2008 Texas Instruments * diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds index fc4f63d834..a2a5370648 100644 --- a/arch/arm/cpu/u-boot.lds +++ b/arch/arm/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2004-2008 Texas Instruments * diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 4569483d5f..6e9d7bcc7f 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_SMARTWEB) += at91sam9260-smartweb.dtb dtb-$(CONFIG_TARGET_TAURUS) += at91sam9g20-taurus.dtb diff --git a/arch/arm/dts/ac5-98dx25xx.dtsi b/arch/arm/dts/ac5-98dx25xx.dtsi index f53b4781d7..9479246026 100644 --- a/arch/arm/dts/ac5-98dx25xx.dtsi +++ b/arch/arm/dts/ac5-98dx25xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree For AC5. * diff --git a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts index 820ec18b43..e4945696cf 100644 --- a/arch/arm/dts/ac5-98dx35xx-atl-x240.dts +++ b/arch/arm/dts/ac5-98dx35xx-atl-x240.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/ac5-98dx35xx-rd.dts b/arch/arm/dts/ac5-98dx35xx-rd.dts index 1dc85bb7ef..7ad535b507 100644 --- a/arch/arm/dts/ac5-98dx35xx-rd.dts +++ b/arch/arm/dts/ac5-98dx35xx-rd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree For RD-AC5X. * diff --git a/arch/arm/dts/ac5-98dx35xx.dtsi b/arch/arm/dts/ac5-98dx35xx.dtsi index 2ab72f854b..f1509e56d8 100644 --- a/arch/arm/dts/ac5-98dx35xx.dtsi +++ b/arch/arm/dts/ac5-98dx35xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree For AC5X. * diff --git a/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi b/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi index fe28ded757..2539c36daf 100644 --- a/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi +++ b/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 B&R Industrial Automation GmbH - * https://www.br-automation.com/ diff --git a/arch/arm/dts/am335x-brppt1-mmc.dts b/arch/arm/dts/am335x-brppt1-mmc.dts index 4db279b65e..d7da1ce5c7 100644 --- a/arch/arm/dts/am335x-brppt1-mmc.dts +++ b/arch/arm/dts/am335x-brppt1-mmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 B&R Industrial Automation GmbH * http://www.br-automation.com diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts index 2c525c6e62..7cac2bf0d9 100644 --- a/arch/arm/dts/am335x-brsmarc1.dts +++ b/arch/arm/dts/am335x-brsmarc1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 B&R Industrial Automation GmbH * http://www.br-automation.com diff --git a/arch/arm/dts/am335x-brxre1.dts b/arch/arm/dts/am335x-brxre1.dts index 544dc5170f..104bcb93f6 100644 --- a/arch/arm/dts/am335x-brxre1.dts +++ b/arch/arm/dts/am335x-brxre1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 B&R Industrial Automation GmbH * http://www.br-automation.com diff --git a/arch/arm/dts/am335x-chiliboard-u-boot.dtsi b/arch/arm/dts/am335x-chiliboard-u-boot.dtsi index 17333d69bf..b5c947d086 100644 --- a/arch/arm/dts/am335x-chiliboard-u-boot.dtsi +++ b/arch/arm/dts/am335x-chiliboard-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 +// SPDX-License-Identifier: GPL-2.0-or-later or X11 /* * Copyright (C) 2018-2021 Grinn Sp. z o.o. -- http://www.grinn-global.com/ * Author: Marcin Niestroj <m.niestroj(a)grinn-global.com> diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi index 82a483ae3e..5abda4a613 100644 --- a/arch/arm/dts/am335x-evm-u-boot.dtsi +++ b/arch/arm/dts/am335x-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am335x-evmsk-u-boot.dtsi b/arch/arm/dts/am335x-evmsk-u-boot.dtsi index 669cb6bf16..5c55fc4932 100644 --- a/arch/arm/dts/am335x-evmsk-u-boot.dtsi +++ b/arch/arm/dts/am335x-evmsk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am335x-evmsk U-Boot Additions * diff --git a/arch/arm/dts/am335x-guardian-u-boot.dtsi b/arch/arm/dts/am335x-guardian-u-boot.dtsi index 26c011dacd..3a472c04ba 100644 --- a/arch/arm/dts/am335x-guardian-u-boot.dtsi +++ b/arch/arm/dts/am335x-guardian-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 EETS GmbH - https://www.eets.ch/ * Copyright (C) 2018 Robert Bosch Power Tools GmbH diff --git a/arch/arm/dts/am335x-icev2-u-boot.dtsi b/arch/arm/dts/am335x-icev2-u-boot.dtsi index 67bfac916e..9b8fbba923 100644 --- a/arch/arm/dts/am335x-icev2-u-boot.dtsi +++ b/arch/arm/dts/am335x-icev2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am335x-pdu001-u-boot.dtsi b/arch/arm/dts/am335x-pdu001-u-boot.dtsi index 4bb4bed4c0..4053e58ef4 100644 --- a/arch/arm/dts/am335x-pdu001-u-boot.dtsi +++ b/arch/arm/dts/am335x-pdu001-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 EETS GmbH - https://www.eets.ch/ */ diff --git a/arch/arm/dts/am335x-pdu001.dts b/arch/arm/dts/am335x-pdu001.dts index 582032461e..4fb5ca40b2 100644 --- a/arch/arm/dts/am335x-pdu001.dts +++ b/arch/arm/dts/am335x-pdu001.dts @@ -7,7 +7,7 @@ * * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/ * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /dts-v1/; diff --git a/arch/arm/dts/am335x-pxm50-u-boot.dtsi b/arch/arm/dts/am335x-pxm50-u-boot.dtsi index d8c21b6b82..6de2b9844d 100644 --- a/arch/arm/dts/am335x-pxm50-u-boot.dtsi +++ b/arch/arm/dts/am335x-pxm50-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am335x-pxm50 U-Boot Additions * diff --git a/arch/arm/dts/am335x-rut-u-boot.dtsi b/arch/arm/dts/am335x-rut-u-boot.dtsi index 62638c7da9..1e71f9a520 100644 --- a/arch/arm/dts/am335x-rut-u-boot.dtsi +++ b/arch/arm/dts/am335x-rut-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am335x-rut U-Boot Additions * diff --git a/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi index fd47bc23a2..4a7c72158b 100644 --- a/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi +++ b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Copyright (C) 2021 SanCloud Ltd diff --git a/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi index 06e7554a63..6e8c8be4ba 100644 --- a/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi +++ b/arch/arm/dts/am335x-sancloud-bbe-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 SanCloud Ltd */ diff --git a/arch/arm/dts/am33xx-u-boot.dtsi b/arch/arm/dts/am33xx-u-boot.dtsi index 1d09f48bb2..e19d8dffc4 100644 --- a/arch/arm/dts/am33xx-u-boot.dtsi +++ b/arch/arm/dts/am33xx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 B&R Industrial Automation GmbH - * https://www.br-automation.com/ diff --git a/arch/arm/dts/am3517-evm-u-boot.dtsi b/arch/arm/dts/am3517-evm-u-boot.dtsi index 8d486f0020..f89de58ad8 100644 --- a/arch/arm/dts/am3517-evm-u-boot.dtsi +++ b/arch/arm/dts/am3517-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/am3517-u-boot.dtsi b/arch/arm/dts/am3517-u-boot.dtsi index 374499dcb2..c89ad5728d 100644 --- a/arch/arm/dts/am3517-u-boot.dtsi +++ b/arch/arm/dts/am3517-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/am4372-generic-u-boot.dtsi b/arch/arm/dts/am4372-generic-u-boot.dtsi index 1dd0a5dac1..59c49c7202 100644 --- a/arch/arm/dts/am4372-generic-u-boot.dtsi +++ b/arch/arm/dts/am4372-generic-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am4372-generic.dts b/arch/arm/dts/am4372-generic.dts index b8a2bb82ef..b65cb34247 100644 --- a/arch/arm/dts/am4372-generic.dts +++ b/arch/arm/dts/am4372-generic.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree Source for Generic AM4372 EVM * diff --git a/arch/arm/dts/am4372-u-boot.dtsi b/arch/arm/dts/am4372-u-boot.dtsi index 2fac2fcdf9..1f6d219c5b 100644 --- a/arch/arm/dts/am4372-u-boot.dtsi +++ b/arch/arm/dts/am4372-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi index 4e6ad9445b..b513dd2a31 100644 --- a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi +++ b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi index 43e519c4e5..b67ee699a9 100644 --- a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi +++ b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am571x-idk-u-boot.dtsi b/arch/arm/dts/am571x-idk-u-boot.dtsi index 65199200ed..69e9a4fd70 100644 --- a/arch/arm/dts/am571x-idk-u-boot.dtsi +++ b/arch/arm/dts/am571x-idk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am572x-idk-u-boot.dtsi b/arch/arm/dts/am572x-idk-u-boot.dtsi index 65199200ed..69e9a4fd70 100644 --- a/arch/arm/dts/am572x-idk-u-boot.dtsi +++ b/arch/arm/dts/am572x-idk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am574x-idk-u-boot.dtsi b/arch/arm/dts/am574x-idk-u-boot.dtsi index 65199200ed..69e9a4fd70 100644 --- a/arch/arm/dts/am574x-idk-u-boot.dtsi +++ b/arch/arm/dts/am574x-idk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-beagle-x15-revb1-u-boot.dtsi b/arch/arm/dts/am57xx-beagle-x15-revb1-u-boot.dtsi index 49b16215e5..8ea222df4c 100644 --- a/arch/arm/dts/am57xx-beagle-x15-revb1-u-boot.dtsi +++ b/arch/arm/dts/am57xx-beagle-x15-revb1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-beagle-x15-revc-u-boot.dtsi b/arch/arm/dts/am57xx-beagle-x15-revc-u-boot.dtsi index 49b16215e5..8ea222df4c 100644 --- a/arch/arm/dts/am57xx-beagle-x15-revc-u-boot.dtsi +++ b/arch/arm/dts/am57xx-beagle-x15-revc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-beagle-x15-u-boot.dtsi b/arch/arm/dts/am57xx-beagle-x15-u-boot.dtsi index 49b16215e5..8ea222df4c 100644 --- a/arch/arm/dts/am57xx-beagle-x15-u-boot.dtsi +++ b/arch/arm/dts/am57xx-beagle-x15-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-cl-som-am57x-u-boot.dtsi b/arch/arm/dts/am57xx-cl-som-am57x-u-boot.dtsi index 49b16215e5..8ea222df4c 100644 --- a/arch/arm/dts/am57xx-cl-som-am57x-u-boot.dtsi +++ b/arch/arm/dts/am57xx-cl-som-am57x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-idk-common-u-boot.dtsi b/arch/arm/dts/am57xx-idk-common-u-boot.dtsi index b07aea0048..908b4e6a52 100644 --- a/arch/arm/dts/am57xx-idk-common-u-boot.dtsi +++ b/arch/arm/dts/am57xx-idk-common-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/am57xx-sbc-am57x-u-boot.dtsi b/arch/arm/dts/am57xx-sbc-am57x-u-boot.dtsi index 49b16215e5..8ea222df4c 100644 --- a/arch/arm/dts/am57xx-sbc-am57x-u-boot.dtsi +++ b/arch/arm/dts/am57xx-sbc-am57x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/arm_fvp.dts b/arch/arm/dts/arm_fvp.dts index 3a4ad5d180..ccf36d8c70 100644 --- a/arch/arm/dts/arm_fvp.dts +++ b/arch/arm/dts/arm_fvp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Empty device tree for the Arm Ltd FVP platform model diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi index 310f159cd5..92fcee6141 100644 --- a/arch/arm/dts/armada-370-xp.dtsi +++ b/arch/arm/dts/armada-370-xp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 370 and Armada XP SoC * diff --git a/arch/arm/dts/armada-371x.dtsi b/arch/arm/dts/armada-371x.dtsi index dc1182ec9f..9aee83753c 100644 --- a/arch/arm/dts/armada-371x.dtsi +++ b/arch/arm/dts/armada-371x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 371x family of SoCs * (also named 88F3710) diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts index 1ee92406b7..9b3a276ca7 100644 --- a/arch/arm/dts/armada-3720-db.dts +++ b/arch/arm/dts/armada-3720-db.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Marvell Armada 3720 development board * (DB-88F3720-DDR3) diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi index cb02b70e54..73dfd2f16c 100644 --- a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi +++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later / { smbios { diff --git a/arch/arm/dts/armada-3720-eDPU.dts b/arch/arm/dts/armada-3720-eDPU.dts index 57fc698e55..b08f561afa 100644 --- a/arch/arm/dts/armada-3720-eDPU.dts +++ b/arch/arm/dts/armada-3720-eDPU.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi index 07293ab72d..d0bbb9819a 100644 --- a/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi +++ b/arch/arm/dts/armada-3720-espressobin-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) &spi0 { flash@0 { diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts index 1542d836c0..9a1cc604a8 100644 --- a/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Globalscale Marvell ESPRESSOBin Board * Copyright (C) 2016 Marvell diff --git a/arch/arm/dts/armada-3720-espressobin.dtsi b/arch/arm/dts/armada-3720-espressobin.dtsi index 5fc613d241..5ee1f13f06 100644 --- a/arch/arm/dts/armada-3720-espressobin.dtsi +++ b/arch/arm/dts/armada-3720-espressobin.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Globalscale Marvell ESPRESSOBin Board * Copyright (C) 2016 Marvell diff --git a/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi b/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi index 71d5e70ca4..26dc89daf7 100644 --- a/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi +++ b/arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * 2022 by Marek Behún <kabel(a)kernel.org> */ diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index 595b4b5abb..569aa384bb 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for CZ.NIC Turris Mox Board * 2019 by Marek Behún <kabel(a)kernel.org> diff --git a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi index 485f1c5bb0..1c3ccfa4ba 100644 --- a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi +++ b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later / { smbios { diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index a75734d88a..b5f5fbca8d 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/armada-3720-uDPU.dtsi b/arch/arm/dts/armada-3720-uDPU.dtsi index 3f79923376..1b9d89d7d0 100644 --- a/arch/arm/dts/armada-3720-uDPU.dtsi +++ b/arch/arm/dts/armada-3720-uDPU.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device tree for the uDPU board. * Based on Marvell Armada 3720 development board (DB-88F3720-DDR3) diff --git a/arch/arm/dts/armada-372x.dtsi b/arch/arm/dts/armada-372x.dtsi index 5ce55bdbb9..b328c8253e 100644 --- a/arch/arm/dts/armada-372x.dtsi +++ b/arch/arm/dts/armada-372x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 372x family of SoCs * (also named 88F3720) diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi index 0bb4f60763..b81c4dea54 100644 --- a/arch/arm/dts/armada-37xx.dtsi +++ b/arch/arm/dts/armada-37xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 37xx family of SoCs. * diff --git a/arch/arm/dts/armada-380.dtsi b/arch/arm/dts/armada-380.dtsi index f3d7f4b27d..f8512e9718 100644 --- a/arch/arm/dts/armada-380.dtsi +++ b/arch/arm/dts/armada-380.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 380 SoC. * diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi index 509d6ca69c..3ac1a0d73c 100644 --- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Marek Behún <kabel(a)kernel.org> */ diff --git a/arch/arm/dts/armada-385.dtsi b/arch/arm/dts/armada-385.dtsi index 48072fc7fd..c3bfe20a65 100644 --- a/arch/arm/dts/armada-385.dtsi +++ b/arch/arm/dts/armada-385.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 385 SoC. * diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi index 906d8f2e67..eea12de89b 100644 --- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi +++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &spi1 { bootph-pre-ram; diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi index 363056a705..edb2ddb741 100644 --- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi +++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &eth0 { phy-reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/dts/armada-388.dtsi b/arch/arm/dts/armada-388.dtsi index f3a020ff57..30a66fe413 100644 --- a/arch/arm/dts/armada-388.dtsi +++ b/arch/arm/dts/armada-388.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 388 SoC. * diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts index 79ea6f0909..d33e3681a8 100644 --- a/arch/arm/dts/armada-38x-controlcenterdc.dts +++ b/arch/arm/dts/armada-38x-controlcenterdc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Guntermann & Drunck ControlCenter-Compact board * diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi index cf7ac4a90c..7452245714 100644 --- a/arch/arm/dts/armada-38x.dtsi +++ b/arch/arm/dts/armada-38x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada 38x family of SoCs. * diff --git a/arch/arm/dts/armada-7040-db-nand.dts b/arch/arm/dts/armada-7040-db-nand.dts index ccf470b317..8202310feb 100644 --- a/arch/arm/dts/armada-7040-db-nand.dts +++ b/arch/arm/dts/armada-7040-db-nand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016- 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts index 9104042359..6d6cd8a3b9 100644 --- a/arch/arm/dts/armada-7040-db.dts +++ b/arch/arm/dts/armada-7040-db.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016- 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-7040.dtsi b/arch/arm/dts/armada-7040.dtsi index 039d30c72a..1cc566745c 100644 --- a/arch/arm/dts/armada-7040.dtsi +++ b/arch/arm/dts/armada-7040.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016- 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi index eec5fa2774..834388ddd9 100644 --- a/arch/arm/dts/armada-8040.dtsi +++ b/arch/arm/dts/armada-8040.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016- 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-common.dtsi b/arch/arm/dts/armada-common.dtsi index b7dfbda392..185a502b11 100644 --- a/arch/arm/dts/armada-common.dtsi +++ b/arch/arm/dts/armada-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-cp110.dtsi b/arch/arm/dts/armada-cp110.dtsi index ddc10d2374..bb49fdd90c 100644 --- a/arch/arm/dts/armada-cp110.dtsi +++ b/arch/arm/dts/armada-cp110.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016- 2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/armada-xp-98dx3236.dtsi b/arch/arm/dts/armada-xp-98dx3236.dtsi index 1a48ff3c61..38829c61e0 100644 --- a/arch/arm/dts/armada-xp-98dx3236.dtsi +++ b/arch/arm/dts/armada-xp-98dx3236.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell 98dx3236 family SoC * diff --git a/arch/arm/dts/armada-xp-98dx3336.dtsi b/arch/arm/dts/armada-xp-98dx3336.dtsi index 1d9d8a8ea6..da8105e9c8 100644 --- a/arch/arm/dts/armada-xp-98dx3336.dtsi +++ b/arch/arm/dts/armada-xp-98dx3336.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell 98dx3336 family SoC * diff --git a/arch/arm/dts/armada-xp-98dx4251.dtsi b/arch/arm/dts/armada-xp-98dx4251.dtsi index 48ffdc72bf..f6f80a3735 100644 --- a/arch/arm/dts/armada-xp-98dx4251.dtsi +++ b/arch/arm/dts/armada-xp-98dx4251.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell 98dx4521 family SoC * diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts b/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts index 059bf48aeb..b954abc45c 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts +++ b/arch/arm/dts/armada-xp-crs305-1g-4s-bit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS305-1G-4S+ Bit board * diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dts b/arch/arm/dts/armada-xp-crs305-1g-4s.dts index 010b83b542..a7ebeacb8f 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s.dts +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS305-1G-4S+ board * diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi index d09cd47742..ed992758c8 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for CRS305-1G-4S board * diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts b/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts index b340eedf71..57afcf0ec7 100644 --- a/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts +++ b/arch/arm/dts/armada-xp-crs326-24g-2s-bit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS326-24G-2S+ Bit board * diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s.dts b/arch/arm/dts/armada-xp-crs326-24g-2s.dts index 83aef43f66..2f26728c61 100644 --- a/arch/arm/dts/armada-xp-crs326-24g-2s.dts +++ b/arch/arm/dts/armada-xp-crs326-24g-2s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS326-24G-2S+ board * diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi index 35b432ffb5..f58acd443d 100644 --- a/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi +++ b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for CRS326-24G-2S board * diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts index d684c895ff..4a1ffe26d9 100644 --- a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-bit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS328-4C-20S-4S+ Bit board * diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts index 665757f6e1..b21ff06c1a 100644 --- a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for MikroTik CRS328-4C-20S-4S+ board * diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi index 63586b63a8..5f84288aba 100644 --- a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi +++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for CRS328-4C-20S-4S+ board * diff --git a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi index dc20643bfa..05bb6b1a7b 100644 --- a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi +++ b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) &nand_controller { compatible="marvell,armada370-nand-controller"; diff --git a/arch/arm/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/dts/armada-xp-db-xc3-24g4xg.dts index d4b52881e6..9a0f5c5e7e 100644 --- a/arch/arm/dts/armada-xp-db-xc3-24g4xg.dts +++ b/arch/arm/dts/armada-xp-db-xc3-24g4xg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for DB-XC3-24G4XG board * diff --git a/arch/arm/dts/armada-xp-gp.dts b/arch/arm/dts/armada-xp-gp.dts index d46475fe22..bf83aca847 100644 --- a/arch/arm/dts/armada-xp-gp.dts +++ b/arch/arm/dts/armada-xp-gp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Marvell Armada XP development board * (DB-MV784MP-GP) diff --git a/arch/arm/dts/armada-xp-mv78230.dtsi b/arch/arm/dts/armada-xp-mv78230.dtsi index 63d7f48cf4..f09f23222b 100644 --- a/arch/arm/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/dts/armada-xp-mv78230.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada XP family SoC * diff --git a/arch/arm/dts/armada-xp-mv78260.dtsi b/arch/arm/dts/armada-xp-mv78260.dtsi index 5dc413dd14..abe0d62d35 100644 --- a/arch/arm/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/dts/armada-xp-mv78260.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada XP family SoC * diff --git a/arch/arm/dts/armada-xp-mv78460.dtsi b/arch/arm/dts/armada-xp-mv78460.dtsi index 6fbd0ce215..613f659239 100644 --- a/arch/arm/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/dts/armada-xp-mv78460.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada XP family SoC * diff --git a/arch/arm/dts/armada-xp-synology-ds414.dts b/arch/arm/dts/armada-xp-synology-ds414.dts index fdc9b47bdd..072b838169 100644 --- a/arch/arm/dts/armada-xp-synology-ds414.dts +++ b/arch/arm/dts/armada-xp-synology-ds414.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Synology DS414 * diff --git a/arch/arm/dts/armada-xp.dtsi b/arch/arm/dts/armada-xp.dtsi index 3bd72f1739..99d9bb4b64 100644 --- a/arch/arm/dts/armada-xp.dtsi +++ b/arch/arm/dts/armada-xp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for Marvell Armada XP family SoC * diff --git a/arch/arm/dts/ast2600-evb.dts b/arch/arm/dts/ast2600-evb.dts index 9aac0e26f2..6d54168695 100644 --- a/arch/arm/dts/ast2600-evb.dts +++ b/arch/arm/dts/ast2600-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/arch/arm/dts/ast2600-u-boot.dtsi b/arch/arm/dts/ast2600-u-boot.dtsi index f06f58204f..2adfd4a69a 100644 --- a/arch/arm/dts/ast2600-u-boot.dtsi +++ b/arch/arm/dts/ast2600-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/clock/ast2600-clock.h> #include <dt-bindings/reset/ast2600-reset.h> diff --git a/arch/arm/dts/ast2600.dtsi b/arch/arm/dts/ast2600.dtsi index beabcf14f8..35955da1ab 100644 --- a/arch/arm/dts/ast2600.dtsi +++ b/arch/arm/dts/ast2600.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/interrupt-controller/arm-gic.h> #include "skeleton.dtsi" diff --git a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi index dd4623311c..84ead995ad 100644 --- a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi +++ b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sam9x60_curiosity-u-boot.dtsi - Device Tree Include file for SAM9X60 * CURIOSITY. diff --git a/arch/arm/dts/at91-sam9x60_curiosity.dts b/arch/arm/dts/at91-sam9x60_curiosity.dts index 99867d2bf8..528587300b 100644 --- a/arch/arm/dts/at91-sam9x60_curiosity.dts +++ b/arch/arm/dts/at91-sam9x60_curiosity.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sam9x60_curiosity.dts - Device Tree file for SAM9X60 CURIOSITY board * diff --git a/arch/arm/dts/at91-sama5d27_giantboard.dts b/arch/arm/dts/at91-sama5d27_giantboard.dts index 767766d4f8..1940d57f76 100644 --- a/arch/arm/dts/at91-sama5d27_giantboard.dts +++ b/arch/arm/dts/at91-sama5d27_giantboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91-sama5d27_giantboard.dts - Device Tree file for Giant Board * diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi index 8254392762..63c8894bf0 100644 --- a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi +++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sama5d27_wlsom1_ek-u-boot.dts - Device Tree file for SAMA5D27 WLSOM1 EK * diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts index 6d4b35ea96..6ded007644 100644 --- a/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts +++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sama5d27_wlsom1_ek.dts - Device Tree file for SAMA5D27 WLSOM1 EK * diff --git a/arch/arm/dts/at91-sama5d29_curiosity-u-boot.dtsi b/arch/arm/dts/at91-sama5d29_curiosity-u-boot.dtsi index 798761c98a..28313d6414 100644 --- a/arch/arm/dts/at91-sama5d29_curiosity-u-boot.dtsi +++ b/arch/arm/dts/at91-sama5d29_curiosity-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * at91-sama5d29_curiosity-u-boot.dtsi - Device Tree file for SAMA5D2 SoC u-boot properties. * diff --git a/arch/arm/dts/at91-sama5d29_curiosity.dts b/arch/arm/dts/at91-sama5d29_curiosity.dts index eff0e9175a..67cdb1b6ec 100644 --- a/arch/arm/dts/at91-sama5d29_curiosity.dts +++ b/arch/arm/dts/at91-sama5d29_curiosity.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sama5d29_curiosity.dts - Device Tree file for SAMA5D29 CURIOSITY board * diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi index cd8976f7e1..8c5593dc22 100644 --- a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi +++ b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * at91-sama5d2_icp-for-uboot.dtsi - Device Tree file for SAMA5D2 ICP board * SAMA5D2 Industrial Connectivity Platform diff --git a/arch/arm/dts/at91-sama5d2_icp.dts b/arch/arm/dts/at91-sama5d2_icp.dts index 4f796c6c94..e8acb1a08e 100644 --- a/arch/arm/dts/at91-sama5d2_icp.dts +++ b/arch/arm/dts/at91-sama5d2_icp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * at91-sama5d2_icp.dts - Device Tree file for SAMA5D2 ICP board * SAMA5D2 Industrial Connectivity Platform diff --git a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi index 8b2e990de7..2872db3085 100644 --- a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi +++ b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sama7g5ek-u-boot.dtsi - Device Tree file for SAMA7G5 SoC u-boot * properties. diff --git a/arch/arm/dts/at91-sama7g5ek.dts b/arch/arm/dts/at91-sama7g5ek.dts index 9b247fcaf6..64e080ffc7 100644 --- a/arch/arm/dts/at91-sama7g5ek.dts +++ b/arch/arm/dts/at91-sama7g5ek.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * at91-sama7g5ek.dts - Device Tree file for SAMA7G5-EK board * diff --git a/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi b/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi index ebb78c5891..8bf6c3777d 100644 --- a/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi +++ b/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &dbgu { bootph-all; diff --git a/arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts b/arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts index e2f8d8047e..b887d77f2a 100644 --- a/arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts +++ b/arch/arm/dts/at91sam9g25-gardena-smart-gateway.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the GARDENA smart Gateway (AT91SAM) * diff --git a/arch/arm/dts/at91sam9g45-corvus.dts b/arch/arm/dts/at91sam9g45-corvus.dts index 67be80bb2b..c68ac5b0d7 100644 --- a/arch/arm/dts/at91sam9g45-corvus.dts +++ b/arch/arm/dts/at91sam9g45-corvus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * at91sam9g45-corvus.dts Device Tree file fir Siemens corvus board * (C) Copyright 2016 Heiko Schocher <hs(a)denx.de> diff --git a/arch/arm/dts/avnet-ultra96-rev1.dts b/arch/arm/dts/avnet-ultra96-rev1.dts index 4c1bd69e75..792ca3fb62 100644 --- a/arch/arm/dts/avnet-ultra96-rev1.dts +++ b/arch/arm/dts/avnet-ultra96-rev1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Avnet Ultra96 rev1 * diff --git a/arch/arm/dts/axp803.dtsi b/arch/arm/dts/axp803.dtsi index a6b4b87f18..55e9b667a5 100644 --- a/arch/arm/dts/axp803.dtsi +++ b/arch/arm/dts/axp803.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright 2017 Icenowy Zheng <icenowy(a)aosc.xyz> /* diff --git a/arch/arm/dts/bcm2835-rpi-zero-w.dts b/arch/arm/dts/bcm2835-rpi-zero-w.dts index 33b2b77aa4..1f8597b399 100644 --- a/arch/arm/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/dts/bcm2835-rpi-zero-w.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Stefan Wahren <stefan.wahren(a)i2se.com> */ diff --git a/arch/arm/dts/bcm2835-rpi-zero.dts b/arch/arm/dts/bcm2835-rpi-zero.dts index 6f9b3a908f..5c4172d335 100644 --- a/arch/arm/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/dts/bcm2835-rpi-zero.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Wahren <stefan.wahren(a)i2se.com> */ diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi index 8c17c6f6a5..f35141f438 100644 --- a/arch/arm/dts/bcm283x-u-boot.dtsi +++ b/arch/arm/dts/bcm283x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to keep baudrate set by firmware * and also initialize before relocation. diff --git a/arch/arm/dts/bcm47622.dtsi b/arch/arm/dts/bcm47622.dtsi index c016e12b73..9b672a4f2e 100644 --- a/arch/arm/dts/bcm47622.dtsi +++ b/arch/arm/dts/bcm47622.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm4912.dtsi b/arch/arm/dts/bcm4912.dtsi index 3d016c2ce6..2c9226f40b 100644 --- a/arch/arm/dts/bcm4912.dtsi +++ b/arch/arm/dts/bcm4912.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm63146.dtsi b/arch/arm/dts/bcm63146.dtsi index 04de96bd0a..acd74f8ca5 100644 --- a/arch/arm/dts/bcm63146.dtsi +++ b/arch/arm/dts/bcm63146.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm63148.dtsi b/arch/arm/dts/bcm63148.dtsi index df5307b6b3..019912e512 100644 --- a/arch/arm/dts/bcm63148.dtsi +++ b/arch/arm/dts/bcm63148.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm63158.dtsi b/arch/arm/dts/bcm63158.dtsi index 4bed1f914a..ec60f1f628 100644 --- a/arch/arm/dts/bcm63158.dtsi +++ b/arch/arm/dts/bcm63158.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Philippe Reynes <philippe.reynes(a)softathome.com> * Copyright 2022 Broadcom Ltd. diff --git a/arch/arm/dts/bcm63178.dtsi b/arch/arm/dts/bcm63178.dtsi index cbd094dde6..825f274573 100644 --- a/arch/arm/dts/bcm63178.dtsi +++ b/arch/arm/dts/bcm63178.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm6756.dtsi b/arch/arm/dts/bcm6756.dtsi index ce1b59faf8..6985c59cab 100644 --- a/arch/arm/dts/bcm6756.dtsi +++ b/arch/arm/dts/bcm6756.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm6813.dtsi b/arch/arm/dts/bcm6813.dtsi index c3e6197be8..12417c1790 100644 --- a/arch/arm/dts/bcm6813.dtsi +++ b/arch/arm/dts/bcm6813.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm6846.dtsi b/arch/arm/dts/bcm6846.dtsi index 8aa47a2583..6fcc40a07f 100644 --- a/arch/arm/dts/bcm6846.dtsi +++ b/arch/arm/dts/bcm6846.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm6855.dtsi b/arch/arm/dts/bcm6855.dtsi index 10c003a57c..db64a328d8 100644 --- a/arch/arm/dts/bcm6855.dtsi +++ b/arch/arm/dts/bcm6855.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2022 Philippe Reynes <philippe.reynes(a)softathome.com> * Copyright 2022 Broadcom Ltd. diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi index 38c88f8399..a467bc7771 100644 --- a/arch/arm/dts/bcm6856.dtsi +++ b/arch/arm/dts/bcm6856.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> * Copyright 2022 Broadcom Ltd. diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi index dc95047a26..9bbf829b60 100644 --- a/arch/arm/dts/bcm6858.dtsi +++ b/arch/arm/dts/bcm6858.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> * Copyright 2022 Broadcom Ltd. diff --git a/arch/arm/dts/bcm6878.dtsi b/arch/arm/dts/bcm6878.dtsi index 1e8b5fa96c..77fa44aeef 100644 --- a/arch/arm/dts/bcm6878.dtsi +++ b/arch/arm/dts/bcm6878.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm7xxx.dts b/arch/arm/dts/bcm7xxx.dts index 786ce3ff95..e3480686f9 100644 --- a/arch/arm/dts/bcm7xxx.dts +++ b/arch/arm/dts/bcm7xxx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Empty devicetre file for bcm7260 board * diff --git a/arch/arm/dts/bcm947622.dts b/arch/arm/dts/bcm947622.dts index 6f083724ab..41f78a5bfb 100644 --- a/arch/arm/dts/bcm947622.dts +++ b/arch/arm/dts/bcm947622.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm94908.dts b/arch/arm/dts/bcm94908.dts index fcbd3c430a..9553142598 100644 --- a/arch/arm/dts/bcm94908.dts +++ b/arch/arm/dts/bcm94908.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm94912.dts b/arch/arm/dts/bcm94912.dts index a3623e6f69..6e3ef7b154 100644 --- a/arch/arm/dts/bcm94912.dts +++ b/arch/arm/dts/bcm94912.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm963138.dts b/arch/arm/dts/bcm963138.dts index 6158a87335..6ff2577ca4 100644 --- a/arch/arm/dts/bcm963138.dts +++ b/arch/arm/dts/bcm963138.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm963146.dts b/arch/arm/dts/bcm963146.dts index e39f1e6d47..7356433b49 100644 --- a/arch/arm/dts/bcm963146.dts +++ b/arch/arm/dts/bcm963146.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm963148.dts b/arch/arm/dts/bcm963148.dts index 98f6a6d09f..40f1e3b729 100644 --- a/arch/arm/dts/bcm963148.dts +++ b/arch/arm/dts/bcm963148.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm963158.dts b/arch/arm/dts/bcm963158.dts index eba07e0b1c..68bf9fc0ca 100644 --- a/arch/arm/dts/bcm963158.dts +++ b/arch/arm/dts/bcm963158.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm963178.dts b/arch/arm/dts/bcm963178.dts index fa096e9cde..14c97ee73c 100644 --- a/arch/arm/dts/bcm963178.dts +++ b/arch/arm/dts/bcm963178.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm96753ref.dts b/arch/arm/dts/bcm96753ref.dts index ebc8c8e4ce..f8d9add314 100644 --- a/arch/arm/dts/bcm96753ref.dts +++ b/arch/arm/dts/bcm96753ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/arch/arm/dts/bcm96756.dts b/arch/arm/dts/bcm96756.dts index 9a4a87ba9c..3ac37ebd19 100644 --- a/arch/arm/dts/bcm96756.dts +++ b/arch/arm/dts/bcm96756.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm96813.dts b/arch/arm/dts/bcm96813.dts index af17091ae7..2b1c191c14 100644 --- a/arch/arm/dts/bcm96813.dts +++ b/arch/arm/dts/bcm96813.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm968360bg.dts b/arch/arm/dts/bcm968360bg.dts index 1335f484ee..d6df20c33a 100644 --- a/arch/arm/dts/bcm968360bg.dts +++ b/arch/arm/dts/bcm968360bg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/arch/arm/dts/bcm96846.dts b/arch/arm/dts/bcm96846.dts index c70ebccabc..f4e630209c 100644 --- a/arch/arm/dts/bcm96846.dts +++ b/arch/arm/dts/bcm96846.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm96855.dts b/arch/arm/dts/bcm96855.dts index e4e740c73e..c32f15cf92 100644 --- a/arch/arm/dts/bcm96855.dts +++ b/arch/arm/dts/bcm96855.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm96856.dts b/arch/arm/dts/bcm96856.dts index 032aeb75c9..accf5ed70a 100644 --- a/arch/arm/dts/bcm96856.dts +++ b/arch/arm/dts/bcm96856.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm96858.dts b/arch/arm/dts/bcm96858.dts index 0cbf582f5d..83043713b0 100644 --- a/arch/arm/dts/bcm96858.dts +++ b/arch/arm/dts/bcm96858.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/dts/bcm968580xref.dts b/arch/arm/dts/bcm968580xref.dts index 9aa45877b5..6b912463c4 100644 --- a/arch/arm/dts/bcm968580xref.dts +++ b/arch/arm/dts/bcm968580xref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/arch/arm/dts/bcm96878.dts b/arch/arm/dts/bcm96878.dts index 8fbc175cb4..d68fa07a82 100644 --- a/arch/arm/dts/bcm96878.dts +++ b/arch/arm/dts/bcm96878.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 Broadcom Ltd. */ diff --git a/arch/arm/dts/bubblegum_96.dts b/arch/arm/dts/bubblegum_96.dts index 5b58d15594..bb11318858 100644 --- a/arch/arm/dts/bubblegum_96.dts +++ b/arch/arm/dts/bubblegum_96.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Device Tree Source for Bubblegum-96 // diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts index cbc9213a86..1425a9a78c 100644 --- a/arch/arm/dts/ca-presidio-engboard.dts +++ b/arch/arm/dts/ca-presidio-engboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Cortina Access Inc. */ diff --git a/arch/arm/dts/cn9130-crb-A.dts b/arch/arm/dts/cn9130-crb-A.dts index fcfcd15d8d..7993128ada 100644 --- a/arch/arm/dts/cn9130-crb-A.dts +++ b/arch/arm/dts/cn9130-crb-A.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-crb-B.dts b/arch/arm/dts/cn9130-crb-B.dts index b681b6032d..67e78afeec 100644 --- a/arch/arm/dts/cn9130-crb-B.dts +++ b/arch/arm/dts/cn9130-crb-B.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-crb.dtsi b/arch/arm/dts/cn9130-crb.dtsi index 7dd36cae28..69be224fe1 100644 --- a/arch/arm/dts/cn9130-crb.dtsi +++ b/arch/arm/dts/cn9130-crb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-db-A.dts b/arch/arm/dts/cn9130-db-A.dts index 90d6e4a26f..2811dc044f 100644 --- a/arch/arm/dts/cn9130-db-A.dts +++ b/arch/arm/dts/cn9130-db-A.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-db-B.dts b/arch/arm/dts/cn9130-db-B.dts index fb52aa856b..5672d4cfb8 100644 --- a/arch/arm/dts/cn9130-db-B.dts +++ b/arch/arm/dts/cn9130-db-B.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-db-dev-info.dtsi b/arch/arm/dts/cn9130-db-dev-info.dtsi index 68e9c0bd14..809be4bec7 100644 --- a/arch/arm/dts/cn9130-db-dev-info.dtsi +++ b/arch/arm/dts/cn9130-db-dev-info.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130-db.dtsi b/arch/arm/dts/cn9130-db.dtsi index 4b21ff46d5..55a54a004e 100644 --- a/arch/arm/dts/cn9130-db.dtsi +++ b/arch/arm/dts/cn9130-db.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi index efcb2e906b..949c87855d 100644 --- a/arch/arm/dts/cn9130.dtsi +++ b/arch/arm/dts/cn9130.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9131-db-A.dts b/arch/arm/dts/cn9131-db-A.dts index 81aff17e31..de217fb80b 100644 --- a/arch/arm/dts/cn9131-db-A.dts +++ b/arch/arm/dts/cn9131-db-A.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9131-db-B.dts b/arch/arm/dts/cn9131-db-B.dts index 0269183620..95b6506195 100644 --- a/arch/arm/dts/cn9131-db-B.dts +++ b/arch/arm/dts/cn9131-db-B.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9131-db.dtsi b/arch/arm/dts/cn9131-db.dtsi index 5057605584..b777b663fa 100644 --- a/arch/arm/dts/cn9131-db.dtsi +++ b/arch/arm/dts/cn9131-db.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9132-db-A.dts b/arch/arm/dts/cn9132-db-A.dts index ba9b8a25d1..02f37293d9 100644 --- a/arch/arm/dts/cn9132-db-A.dts +++ b/arch/arm/dts/cn9132-db-A.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9132-db-B.dts b/arch/arm/dts/cn9132-db-B.dts index e126e23ea6..ee7e7302dd 100644 --- a/arch/arm/dts/cn9132-db-B.dts +++ b/arch/arm/dts/cn9132-db-B.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/cn9132-db.dtsi b/arch/arm/dts/cn9132-db.dtsi index d51a4d0b30..f3300b22f7 100644 --- a/arch/arm/dts/cn9132-db.dtsi +++ b/arch/arm/dts/cn9132-db.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2021 Marvell International Ltd. */ diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi index 309130479a..7a3642384c 100644 --- a/arch/arm/dts/da850-evm-u-boot.dtsi +++ b/arch/arm/dts/da850-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * da850-evm U-Boot Additions * diff --git a/arch/arm/dts/da850-lcdk-u-boot.dtsi b/arch/arm/dts/da850-lcdk-u-boot.dtsi index bbaebcb67a..3d7974494b 100644 --- a/arch/arm/dts/da850-lcdk-u-boot.dtsi +++ b/arch/arm/dts/da850-lcdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * da850-lcdk U-Boot Additions * diff --git a/arch/arm/dts/dra7-evm-u-boot.dtsi b/arch/arm/dts/dra7-evm-u-boot.dtsi index 87b2451a8e..afbdbd7505 100644 --- a/arch/arm/dts/dra7-evm-u-boot.dtsi +++ b/arch/arm/dts/dra7-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dra7-ipu-common-early-boot.dtsi b/arch/arm/dts/dra7-ipu-common-early-boot.dtsi index 90fc4cb36d..fdf980de61 100644 --- a/arch/arm/dts/dra7-ipu-common-early-boot.dtsi +++ b/arch/arm/dts/dra7-ipu-common-early-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dra71-evm-u-boot.dtsi b/arch/arm/dts/dra71-evm-u-boot.dtsi index 8e7dc719bf..0253077b42 100644 --- a/arch/arm/dts/dra71-evm-u-boot.dtsi +++ b/arch/arm/dts/dra71-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dra72-evm-revc-u-boot.dtsi b/arch/arm/dts/dra72-evm-revc-u-boot.dtsi index 8e7dc719bf..0253077b42 100644 --- a/arch/arm/dts/dra72-evm-revc-u-boot.dtsi +++ b/arch/arm/dts/dra72-evm-revc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dra72-evm-u-boot.dtsi b/arch/arm/dts/dra72-evm-u-boot.dtsi index 91a3b6b742..3e877f9560 100644 --- a/arch/arm/dts/dra72-evm-u-boot.dtsi +++ b/arch/arm/dts/dra72-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dra76-evm-u-boot.dtsi b/arch/arm/dts/dra76-evm-u-boot.dtsi index 1216d93bdc..8243008834 100644 --- a/arch/arm/dts/dra76-evm-u-boot.dtsi +++ b/arch/arm/dts/dra76-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi b/arch/arm/dts/dragonboard410c-uboot.dtsi index 3b0bd0ed0a..db6ac1e6ed 100644 --- a/arch/arm/dts/dragonboard410c-uboot.dtsi +++ b/arch/arm/dts/dragonboard410c-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to handle Dragonboard 410c pins * diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 9230dd3fd9..7b8f13bbd1 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8016 based Dragonboard 410C board device tree source * diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi index 457728a43e..f1c905cfc8 100644 --- a/arch/arm/dts/dragonboard820c-uboot.dtsi +++ b/arch/arm/dts/dragonboard820c-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to handle Dragonboard 820c pins * diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts index ad201d4874..2bc0d55274 100644 --- a/arch/arm/dts/dragonboard820c.dts +++ b/arch/arm/dts/dragonboard820c.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8096 based Dragonboard 820C board device tree source * diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi b/arch/arm/dts/dragonboard845c-uboot.dtsi index 7106db8a73..d9d3d1ecf4 100644 --- a/arch/arm/dts/dragonboard845c-uboot.dtsi +++ b/arch/arm/dts/dragonboard845c-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to handle Qualcomm Robotics RB3 Development Platform * (dragonboard845c) pins diff --git a/arch/arm/dts/dragonboard845c.dts b/arch/arm/dts/dragonboard845c.dts index b4f057ac65..831811b76d 100644 --- a/arch/arm/dts/dragonboard845c.dts +++ b/arch/arm/dts/dragonboard845c.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm Robotics RB3 Development (dragonboard845c) board device * tree source diff --git a/arch/arm/dts/ev-imx280-nano-x-mb.dts b/arch/arm/dts/ev-imx280-nano-x-mb.dts index 7aec076af3..2e41fa2122 100644 --- a/arch/arm/dts/ev-imx280-nano-x-mb.dts +++ b/arch/arm/dts/ev-imx280-nano-x-mb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> /dts-v1/; diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi index 61ade443b1..7fb05857a5 100644 --- a/arch/arm/dts/exynos4.dtsi +++ b/arch/arm/dts/exynos4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4 SoC common device tree source * diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts index 65a5fcd67e..21e5547964 100644 --- a/arch/arm/dts/exynos4210-origen.dts +++ b/arch/arm/dts/exynos4210-origen.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4210 based Origen board device tree source * diff --git a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi index aeeecd6283..b685439bb2 100644 --- a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/exynos4210-smdkv310.dts b/arch/arm/dts/exynos4210-smdkv310.dts index fa488c151c..fc5eb2e531 100644 --- a/arch/arm/dts/exynos4210-smdkv310.dts +++ b/arch/arm/dts/exynos4210-smdkv310.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4210-based SMDKV310 board device tree source * diff --git a/arch/arm/dts/exynos4210-trats.dts b/arch/arm/dts/exynos4210-trats.dts index 05989ee97e..2a025d3cd5 100644 --- a/arch/arm/dts/exynos4210-trats.dts +++ b/arch/arm/dts/exynos4210-trats.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4210 based Trats board device tree source * diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts index 610a8ad2e7..3604dbf06d 100644 --- a/arch/arm/dts/exynos4210-universal_c210.dts +++ b/arch/arm/dts/exynos4210-universal_c210.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4210 based Universal C210 board device tree source * diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts index ce08e8dc1e..dffa4c8d72 100644 --- a/arch/arm/dts/exynos4412-odroid.dts +++ b/arch/arm/dts/exynos4412-odroid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Odroid-U3/X2 board device tree source * diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts index c4db137e01..d7883f6d70 100644 --- a/arch/arm/dts/exynos4412-trats2.dts +++ b/arch/arm/dts/exynos4412-trats2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4412 based Trats2 board device tree source * diff --git a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi index 955e14ef8f..af37659295 100644 --- a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi index 14251764e6..c2963bcf7a 100644 --- a/arch/arm/dts/exynos5.dtsi +++ b/arch/arm/dts/exynos5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors * SAMSUNG EXYNOS5 SoC device tree source diff --git a/arch/arm/dts/exynos5250-arndale.dts b/arch/arm/dts/exynos5250-arndale.dts index 60309c61f3..6e0cce46ba 100644 --- a/arch/arm/dts/exynos5250-arndale.dts +++ b/arch/arm/dts/exynos5250-arndale.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG Arndale board device tree source * diff --git a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi index b414805319..59ce264786 100644 --- a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index 66c5b6dca9..ab593648c8 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 SAMSUNG Electronics * SAMSUNG EXYNOS5250 SoC device tree source diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts index a68c3b5174..e1560cd89a 100644 --- a/arch/arm/dts/exynos5420-peach-pit.dts +++ b/arch/arm/dts/exynos5420-peach-pit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG/GOOGLE Peach-Pit board device tree source * diff --git a/arch/arm/dts/exynos5420-smdk5420.dts b/arch/arm/dts/exynos5420-smdk5420.dts index 7a5da674fb..4ef36730f0 100644 --- a/arch/arm/dts/exynos5420-smdk5420.dts +++ b/arch/arm/dts/exynos5420-smdk5420.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG SMDK5420 board device tree source * diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts index 9d055d066f..ecfd614321 100644 --- a/arch/arm/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/dts/exynos5422-odroidxu3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Odroid XU3 device tree source * diff --git a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi index 4fcbe71fe5..48a6448a11 100644 --- a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi +++ b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi index 221da8b485..15a7a28788 100644 --- a/arch/arm/dts/exynos54xx.dtsi +++ b/arch/arm/dts/exynos54xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 SAMSUNG Electronics * SAMSUNG EXYNOS5420 SoC device tree source diff --git a/arch/arm/dts/exynos5800-peach-pi.dts b/arch/arm/dts/exynos5800-peach-pi.dts index 63c0b186e4..91977ab32c 100644 --- a/arch/arm/dts/exynos5800-peach-pi.dts +++ b/arch/arm/dts/exynos5800-peach-pi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG/GOOGLE Peach-Pit board device tree source * diff --git a/arch/arm/dts/exynos7420-espresso7420.dts b/arch/arm/dts/exynos7420-espresso7420.dts index c542f25b0e..83bf939d59 100644 --- a/arch/arm/dts/exynos7420-espresso7420.dts +++ b/arch/arm/dts/exynos7420-espresso7420.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung Espresso7420 board device tree source * diff --git a/arch/arm/dts/exynos7420.dtsi b/arch/arm/dts/exynos7420.dtsi index 373f48cf2e..8df0ad8f7f 100644 --- a/arch/arm/dts/exynos7420.dtsi +++ b/arch/arm/dts/exynos7420.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung Exynos7420 SoC device tree source * diff --git a/arch/arm/dts/exynos78x0-axy17lte.dts b/arch/arm/dts/exynos78x0-axy17lte.dts index 7fae8db874..365d6b3427 100644 --- a/arch/arm/dts/exynos78x0-axy17lte.dts +++ b/arch/arm/dts/exynos78x0-axy17lte.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung Exynos78x0 SoC device tree source * diff --git a/arch/arm/dts/exynos78x0-gpio.dtsi b/arch/arm/dts/exynos78x0-gpio.dtsi index a7f75c5ca9..e2d46e4c87 100644 --- a/arch/arm/dts/exynos78x0-gpio.dtsi +++ b/arch/arm/dts/exynos78x0-gpio.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos7880 SoC pin-mux and pin-config device tree source * diff --git a/arch/arm/dts/exynos78x0-pinctrl.dtsi b/arch/arm/dts/exynos78x0-pinctrl.dtsi index 4958c55119..88cf75b820 100644 --- a/arch/arm/dts/exynos78x0-pinctrl.dtsi +++ b/arch/arm/dts/exynos78x0-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos7880 SoC pin-mux and pin-config device tree source * diff --git a/arch/arm/dts/exynos78x0.dtsi b/arch/arm/dts/exynos78x0.dtsi index 11d8396f9c..4609cda5b5 100644 --- a/arch/arm/dts/exynos78x0.dtsi +++ b/arch/arm/dts/exynos78x0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung Exynos7880 SoC device tree source * diff --git a/arch/arm/dts/fsl-imx8-ca35.dtsi b/arch/arm/dts/fsl-imx8-ca35.dtsi index 9af8b1511c..1e0776885d 100644 --- a/arch/arm/dts/fsl-imx8-ca35.dtsi +++ b/arch/arm/dts/fsl-imx8-ca35.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/fsl-imx8dx.dtsi b/arch/arm/dts/fsl-imx8dx.dtsi index 63a56699b5..1d13644398 100644 --- a/arch/arm/dts/fsl-imx8dx.dtsi +++ b/arch/arm/dts/fsl-imx8dx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/dts/fsl-imx8dxp.dtsi b/arch/arm/dts/fsl-imx8dxp.dtsi index cc688f4469..32b2e51ae8 100644 --- a/arch/arm/dts/fsl-imx8dxp.dtsi +++ b/arch/arm/dts/fsl-imx8dxp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi index f2d6b183ed..d3efac758f 100644 --- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Toradex AG */ diff --git a/arch/arm/dts/fsl-imx8qm-apalis.dts b/arch/arm/dts/fsl-imx8qm-apalis.dts index bc7c75d337..5ea4b62043 100644 --- a/arch/arm/dts/fsl-imx8qm-apalis.dts +++ b/arch/arm/dts/fsl-imx8qm-apalis.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017-2019 Toradex */ diff --git a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi index 6e5379e53c..035def153a 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/dts/fsl-imx8qm-mek.dts b/arch/arm/dts/fsl-imx8qm-mek.dts index 63908ba6bf..af5e60f4ea 100644 --- a/arch/arm/dts/fsl-imx8qm-mek.dts +++ b/arch/arm/dts/fsl-imx8qm-mek.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP */ diff --git a/arch/arm/dts/fsl-imx8qm.dtsi b/arch/arm/dts/fsl-imx8qm.dtsi index 517fb13cad..b83a369faf 100644 --- a/arch/arm/dts/fsl-imx8qm.dtsi +++ b/arch/arm/dts/fsl-imx8qm.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi index 79f08ec138..3755315fde 100644 --- a/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Linaro Ltd. */ diff --git a/arch/arm/dts/fsl-imx8qxp-ai_ml.dts b/arch/arm/dts/fsl-imx8qxp-ai_ml.dts index aa85caaff5..08cc75a30e 100644 --- a/arch/arm/dts/fsl-imx8qxp-ai_ml.dts +++ b/arch/arm/dts/fsl-imx8qxp-ai_ml.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Einfochips * Copyright 2019 Linaro Ltd. diff --git a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi index a6af4e5e2b..cb98103edf 100644 --- a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Toradex AG */ diff --git a/arch/arm/dts/fsl-imx8qxp-colibri.dts b/arch/arm/dts/fsl-imx8qxp-colibri.dts index df992ac639..b74d256597 100644 --- a/arch/arm/dts/fsl-imx8qxp-colibri.dts +++ b/arch/arm/dts/fsl-imx8qxp-colibri.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Toradex AG */ diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi index 591eb66604..81d61daae9 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/dts/fsl-imx8qxp-mek.dts b/arch/arm/dts/fsl-imx8qxp-mek.dts index 6a987f0dbb..2f716c9c4e 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek.dts +++ b/arch/arm/dts/fsl-imx8qxp-mek.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP */ diff --git a/arch/arm/dts/fsl-imx8qxp.dtsi b/arch/arm/dts/fsl-imx8qxp.dtsi index 1bffff1314..4a7cfa2f1c 100644 --- a/arch/arm/dts/fsl-imx8qxp.dtsi +++ b/arch/arm/dts/fsl-imx8qxp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts index 6402cf5aca..e45cc1d205 100644 --- a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts +++ b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NXP ls1012a 2G5RDB board device tree source * diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dts b/arch/arm/dts/fsl-ls1012a-frdm.dts index a7e30017f1..a8e2d9c59f 100644 --- a/arch/arm/dts/fsl-ls1012a-frdm.dts +++ b/arch/arm/dts/fsl-ls1012a-frdm.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1012A family SoC. * diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi index 88aa24a6d2..31b811700b 100644 --- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi +++ b/arch/arm/dts/fsl-ls1012a-frdm.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1012A family SoC. * diff --git a/arch/arm/dts/fsl-ls1012a-frwy.dts b/arch/arm/dts/fsl-ls1012a-frwy.dts index 7242af51e4..1509b7f954 100644 --- a/arch/arm/dts/fsl-ls1012a-frwy.dts +++ b/arch/arm/dts/fsl-ls1012a-frwy.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls1012a FRWY board device tree source * diff --git a/arch/arm/dts/fsl-ls1012a-qds.dts b/arch/arm/dts/fsl-ls1012a-qds.dts index 0b0149ba10..c282010826 100644 --- a/arch/arm/dts/fsl-ls1012a-qds.dts +++ b/arch/arm/dts/fsl-ls1012a-qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2016 Freescale Semiconductor */ diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi index 910d2a5c77..5281845e5f 100644 --- a/arch/arm/dts/fsl-ls1012a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2016 Freescale Semiconductor */ diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dts b/arch/arm/dts/fsl-ls1012a-rdb.dts index 8d0d559e53..d9e48f33cb 100644 --- a/arch/arm/dts/fsl-ls1012a-rdb.dts +++ b/arch/arm/dts/fsl-ls1012a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1012A family SoC. * diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi index 3757051b78..6e21a1f382 100644 --- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi +++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1012A family SoC. * diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi index 796d72fc9e..cd922dfcbc 100644 --- a/arch/arm/dts/fsl-ls1012a.dtsi +++ b/arch/arm/dts/fsl-ls1012a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi index aacf181e2d..22b938faf5 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi index a46e07dc6b..17d0c3a9e9 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" / { diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts index 7cd29ab970..bf5f3d4c44 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Kontron SMARC-sAL28 board. * diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi index c010ea0dc7..89736a1a03 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" / { diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts index 330e34f933..2909a0efb4 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Kontron SMARC-sAL28 board. * diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi index 3d6bf5a0bd..0d1410b120 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" / { diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts index 0c8b2af41a..3333728299 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Kontron SMARC-sAL28 board. * diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi index 5d82973bba..7bc3b35e7c 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fsl-ls1028a-kontron-sl28-u-boot.dtsi" / { diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts index 9b5e92fb75..4f311f87f2 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-var4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Kontron SMARC-sAL28 board. * diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts b/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts index ab713b4949..6013d958dc 100644 --- a/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts +++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for the Kontron SMARC-sAL28 board. * diff --git a/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi index f208a02721..fc8c669699 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 1xxx * diff --git a/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi index 69274ee4e9..e5055dc331 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 6xxx * diff --git a/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi b/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi index 90da665a3c..9c04f0e075 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-7777-sch-30841.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 7777 * diff --git a/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi b/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi index 27c3d655bf..2c4bd3a611 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 7xx7 * diff --git a/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi b/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi index 0a09264735..4a82387f04 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 8xxx * diff --git a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi index 94b5e765ae..69849348a0 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 9999 * diff --git a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi index bd46adfd29..4626891389 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-9999-sch-24801.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 9999 * diff --git a/arch/arm/dts/fsl-ls1028a-qds-duart.dts b/arch/arm/dts/fsl-ls1028a-qds-duart.dts index 81db21a947..bc4679f525 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-duart.dts +++ b/arch/arm/dts/fsl-ls1028a-qds-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for Freescale Layerscape-1028AQDS family SoC. * diff --git a/arch/arm/dts/fsl-ls1028a-qds-lpuart.dts b/arch/arm/dts/fsl-ls1028a-qds-lpuart.dts index 063857b2f2..70ff4e3245 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-lpuart.dts +++ b/arch/arm/dts/fsl-ls1028a-qds-lpuart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for Freescale Layerscape-1028AQDS family SoC. * diff --git a/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi index 5909e7635a..67632b97f8 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW x3xx * diff --git a/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi index b652206920..18bfca4c9f 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW x5xx * diff --git a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi index 6c0d8b23ef..210272f339 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 7777 * diff --git a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi index 9af6a5a674..cc53081a31 100644 --- a/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1028A-QDS device tree fragment for RCW 7777 * diff --git a/arch/arm/dts/fsl-ls1028a-qds.dtsi b/arch/arm/dts/fsl-ls1028a-qds.dtsi index 3b063d0257..4fad2aa472 100644 --- a/arch/arm/dts/fsl-ls1028a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1028a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls1028AQDS device tree source * diff --git a/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi index a72b57305d..1caba098ba 100644 --- a/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1028a-rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2021 NXP */ /* diff --git a/arch/arm/dts/fsl-ls1028a-rdb.dts b/arch/arm/dts/fsl-ls1028a-rdb.dts index 639f40740d..d3162fdc2c 100644 --- a/arch/arm/dts/fsl-ls1028a-rdb.dts +++ b/arch/arm/dts/fsl-ls1028a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for NXP LS1028A RDB Board. * diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi index dde0c4091f..a2a594b04c 100644 --- a/arch/arm/dts/fsl-ls1028a.dtsi +++ b/arch/arm/dts/fsl-ls1028a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for NXP Layerscape-1028A family SoC. * diff --git a/arch/arm/dts/fsl-ls1043-post.dtsi b/arch/arm/dts/fsl-ls1043-post.dtsi index e4eab9e5c6..ef0fa38202 100644 --- a/arch/arm/dts/fsl-ls1043-post.dtsi +++ b/arch/arm/dts/fsl-ls1043-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree nodes for ls1043 * diff --git a/arch/arm/dts/fsl-ls1043a-qds-duart.dts b/arch/arm/dts/fsl-ls1043a-qds-duart.dts index f2a9a1d2cd..6383799f51 100644 --- a/arch/arm/dts/fsl-ls1043a-qds-duart.dts +++ b/arch/arm/dts/fsl-ls1043a-qds-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1043A family SoC. * diff --git a/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts b/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts index a9fc931930..6109bdb068 100644 --- a/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts +++ b/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1043A family SoC. * diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi index 5e02cd91d7..c427cd477b 100644 --- a/arch/arm/dts/fsl-ls1043a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1043A family SoC. * diff --git a/arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi index ef31c79fa0..a0e06367b0 100644 --- a/arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1043a-rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ #include "fsl-ls1043a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1043a-rdb.dts b/arch/arm/dts/fsl-ls1043a-rdb.dts index f5b3bb68b3..3d1286812e 100644 --- a/arch/arm/dts/fsl-ls1043a-rdb.dts +++ b/arch/arm/dts/fsl-ls1043a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1043A family SoC. * diff --git a/arch/arm/dts/fsl-ls1043a-u-boot.dtsi b/arch/arm/dts/fsl-ls1043a-u-boot.dtsi index 65a870511c..cd7342c993 100644 --- a/arch/arm/dts/fsl-ls1043a-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1043a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &duart0 { diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi index 21643a1d95..04820cdce1 100644 --- a/arch/arm/dts/fsl-ls1043a.dtsi +++ b/arch/arm/dts/fsl-ls1043a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for NXP Layerscape-1043A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046-post.dtsi b/arch/arm/dts/fsl-ls1046-post.dtsi index 2dac6a05f7..672900d90c 100644 --- a/arch/arm/dts/fsl-ls1046-post.dtsi +++ b/arch/arm/dts/fsl-ls1046-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree nodes for ls1046 * diff --git a/arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi b/arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi index ce204e675b..8851c82cef 100644 --- a/arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1046a-frwy-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ #include "fsl-ls1046a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-frwy.dts index ba10d212f1..168d066a4d 100644 --- a/arch/arm/dts/fsl-ls1046a-frwy.dts +++ b/arch/arm/dts/fsl-ls1046a-frwy.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for NXP Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046a-qds-duart.dts b/arch/arm/dts/fsl-ls1046a-qds-duart.dts index 94f0c674fa..10e54be75d 100644 --- a/arch/arm/dts/fsl-ls1046a-qds-duart.dts +++ b/arch/arm/dts/fsl-ls1046a-qds-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts b/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts index 607ecc6767..369649ba72 100644 --- a/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts +++ b/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree file for Freescale Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi index d66824975c..485585ab69 100644 --- a/arch/arm/dts/fsl-ls1046a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi index ce204e675b..8851c82cef 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1046a-rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ #include "fsl-ls1046a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index 66d718905c..0fd44acac0 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1046a-u-boot.dtsi b/arch/arm/dts/fsl-ls1046a-u-boot.dtsi index 65a870511c..cd7342c993 100644 --- a/arch/arm/dts/fsl-ls1046a-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1046a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &duart0 { diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi index 44ee4c5808..71254dcdf3 100644 --- a/arch/arm/dts/fsl-ls1046a.dtsi +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device Tree Include file for Freescale Layerscape-1046A family SoC. * diff --git a/arch/arm/dts/fsl-ls1088a-qds-21-x.dts b/arch/arm/dts/fsl-ls1088a-qds-21-x.dts index a877964511..9f3f9f3d91 100644 --- a/arch/arm/dts/fsl-ls1088a-qds-21-x.dts +++ b/arch/arm/dts/fsl-ls1088a-qds-21-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1088AQDS device tree source for SERDES protocol 21.x * diff --git a/arch/arm/dts/fsl-ls1088a-qds-29-x.dts b/arch/arm/dts/fsl-ls1088a-qds-29-x.dts index 29c4ec59fe..ee6ae66fb4 100644 --- a/arch/arm/dts/fsl-ls1088a-qds-29-x.dts +++ b/arch/arm/dts/fsl-ls1088a-qds-29-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1088AQDS device tree source for SERDES protocol 29.x * diff --git a/arch/arm/dts/fsl-ls1088a-qds-sd1-21.dtsi b/arch/arm/dts/fsl-ls1088a-qds-sd1-21.dtsi index df39cca696..03dfc6cbf6 100644 --- a/arch/arm/dts/fsl-ls1088a-qds-sd1-21.dtsi +++ b/arch/arm/dts/fsl-ls1088a-qds-sd1-21.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1088AQDS device tree source for SERDES block #1 - protocol 21 (0x15) * diff --git a/arch/arm/dts/fsl-ls1088a-qds-sd1-29.dtsi b/arch/arm/dts/fsl-ls1088a-qds-sd1-29.dtsi index 99f74c2fc4..79e6ba5be1 100644 --- a/arch/arm/dts/fsl-ls1088a-qds-sd1-29.dtsi +++ b/arch/arm/dts/fsl-ls1088a-qds-sd1-29.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS1088AQDS device tree source for SERDES block #1 - protocol 29 (0x1d) * diff --git a/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi index 298adb849b..4275db02c3 100644 --- a/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1088a-qds-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> #include "fsl-ls1088a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts index 8e64e713aa..e0d0ae52dd 100644 --- a/arch/arm/dts/fsl-ls1088a-qds.dts +++ b/arch/arm/dts/fsl-ls1088a-qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls1088a QDS default board device tree source * diff --git a/arch/arm/dts/fsl-ls1088a-qds.dtsi b/arch/arm/dts/fsl-ls1088a-qds.dtsi index 4d21d4fbd5..37fcf0d5da 100644 --- a/arch/arm/dts/fsl-ls1088a-qds.dtsi +++ b/arch/arm/dts/fsl-ls1088a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls1088a QDS common board device tree source * diff --git a/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi index 298adb849b..4275db02c3 100644 --- a/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1088a-rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> #include "fsl-ls1088a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts index c63d4158e4..dd0e9da4be 100644 --- a/arch/arm/dts/fsl-ls1088a-rdb.dts +++ b/arch/arm/dts/fsl-ls1088a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls1088a RDB board device tree source * diff --git a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi index 4e6700d586..03b02bc64d 100644 --- a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> #include "fsl-ls1088a-u-boot.dtsi" diff --git a/arch/arm/dts/fsl-ls1088a-ten64.dts b/arch/arm/dts/fsl-ls1088a-ten64.dts index 0d11440d88..b9bef009da 100644 --- a/arch/arm/dts/fsl-ls1088a-ten64.dts +++ b/arch/arm/dts/fsl-ls1088a-ten64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree file for Traverse Technologies Ten64 * (LS1088A) board diff --git a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi index efcfdd96ae..f903cbd472 100644 --- a/arch/arm/dts/fsl-ls1088a-u-boot.dtsi +++ b/arch/arm/dts/fsl-ls1088a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> /{ diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi index e5fb137ac0..85bc319caf 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Include file for NXP Layerscape-1088A family SoC. * diff --git a/arch/arm/dts/fsl-ls2080a-qds-42-x.dts b/arch/arm/dts/fsl-ls2080a-qds-42-x.dts index bd46c395d4..6e9abb2886 100644 --- a/arch/arm/dts/fsl-ls2080a-qds-42-x.dts +++ b/arch/arm/dts/fsl-ls2080a-qds-42-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS2080AQDS device tree source for SERDES protocol 42.x * diff --git a/arch/arm/dts/fsl-ls2080a-qds-sd1-42.dtsi b/arch/arm/dts/fsl-ls2080a-qds-sd1-42.dtsi index 72297f48ca..0c45cb7c67 100644 --- a/arch/arm/dts/fsl-ls2080a-qds-sd1-42.dtsi +++ b/arch/arm/dts/fsl-ls2080a-qds-sd1-42.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS2080aQDS device tree source for SERDES block #1 - protocol 42 (0x2a) * diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts index a1196f9292..826ec8b15b 100644 --- a/arch/arm/dts/fsl-ls2080a-qds.dts +++ b/arch/arm/dts/fsl-ls2080a-qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Freescale ls2080a QDS defaul board device tree source * diff --git a/arch/arm/dts/fsl-ls2080a-qds.dtsi b/arch/arm/dts/fsl-ls2080a-qds.dtsi index cb7851f2cc..3afc09781e 100644 --- a/arch/arm/dts/fsl-ls2080a-qds.dtsi +++ b/arch/arm/dts/fsl-ls2080a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Freescale ls2080a QDS common device tree source * diff --git a/arch/arm/dts/fsl-ls2080a-rdb.dts b/arch/arm/dts/fsl-ls2080a-rdb.dts index 0a87caeba9..bebd9b762c 100644 --- a/arch/arm/dts/fsl-ls2080a-rdb.dts +++ b/arch/arm/dts/fsl-ls2080a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Freescale ls2080a RDB board device tree source * diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi index d754eb4d5c..f33754944d 100644 --- a/arch/arm/dts/fsl-ls2080a.dtsi +++ b/arch/arm/dts/fsl-ls2080a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls2080a SOC common device tree source * diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts index b0b7ef08a0..1d46fa7788 100644 --- a/arch/arm/dts/fsl-ls2081a-rdb.dts +++ b/arch/arm/dts/fsl-ls2081a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LS2081A RDB board device tree source for QSPI-boot * diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts index a609290000..36da3cf773 100644 --- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts +++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP ls2080a RDB board device tree source for QSPI-boot * diff --git a/arch/arm/dts/fsl-lx2160a-qds-19-11-x.dts b/arch/arm/dts/fsl-lx2160a-qds-19-11-x.dts index 585759162f..0943b898a7 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-19-11-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-19-11-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 19.11.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-19-x-x.dts b/arch/arm/dts/fsl-lx2160a-qds-19-x-x.dts index ebe11396a6..f48441b200 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-19-x-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-19-x-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 19.x.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-20-11-x.dts b/arch/arm/dts/fsl-lx2160a-qds-20-11-x.dts index d9f0918967..a19c23d44b 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-20-11-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-20-11-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 20.11.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-20-x-x.dts b/arch/arm/dts/fsl-lx2160a-qds-20-x-x.dts index 735d440d37..280f85c539 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-20-x-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-20-x-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 20.x.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-3-11-x.dts b/arch/arm/dts/fsl-lx2160a-qds-3-11-x.dts index 3b21c87b93..0ffbfa5eda 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-3-11-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-3-11-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 3.11.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-3-x-x.dts b/arch/arm/dts/fsl-lx2160a-qds-3-x-x.dts index ede40563f7..3d6fa56cb0 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-3-x-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-3-x-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 3.x.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-7-11-x.dts b/arch/arm/dts/fsl-lx2160a-qds-7-11-x.dts index 8100af4727..acac58ba5e 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-7-11-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-7-11-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 7.11.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-7-x-x.dts b/arch/arm/dts/fsl-lx2160a-qds-7-x-x.dts index 15dee3587f..1371eb0380 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-7-x-x.dts +++ b/arch/arm/dts/fsl-lx2160a-qds-7-x-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for SERDES protocol 7.x.x * diff --git a/arch/arm/dts/fsl-lx2160a-qds-sd1-19.dtsi b/arch/arm/dts/fsl-lx2160a-qds-sd1-19.dtsi index a31ff8a1bd..2f2ab61102 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-sd1-19.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds-sd1-19.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for the SERDES block #1 - protocol 19 * diff --git a/arch/arm/dts/fsl-lx2160a-qds-sd1-20.dtsi b/arch/arm/dts/fsl-lx2160a-qds-sd1-20.dtsi index 42e149691d..8e6ffdcd97 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-sd1-20.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds-sd1-20.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for the SERDES block #1 - protocol 20 * diff --git a/arch/arm/dts/fsl-lx2160a-qds-sd1-3.dtsi b/arch/arm/dts/fsl-lx2160a-qds-sd1-3.dtsi index 256d784aca..95e3386750 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-sd1-3.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds-sd1-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for the SERDES block #1 - protocol 3 * diff --git a/arch/arm/dts/fsl-lx2160a-qds-sd1-7.dtsi b/arch/arm/dts/fsl-lx2160a-qds-sd1-7.dtsi index 5fcf846c10..32a0a25e2d 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-sd1-7.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds-sd1-7.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for the SERDES block #1 - protocol 7 * diff --git a/arch/arm/dts/fsl-lx2160a-qds-sd2-11.dtsi b/arch/arm/dts/fsl-lx2160a-qds-sd2-11.dtsi index cf09f98aa6..6d9e1b5bea 100644 --- a/arch/arm/dts/fsl-lx2160a-qds-sd2-11.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds-sd2-11.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS device tree source for the SERDES block #2 - protocol 11 * diff --git a/arch/arm/dts/fsl-lx2160a-qds.dts b/arch/arm/dts/fsl-lx2160a-qds.dts index 332c778d3a..c2dabd5f6d 100644 --- a/arch/arm/dts/fsl-lx2160a-qds.dts +++ b/arch/arm/dts/fsl-lx2160a-qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS default device tree source * diff --git a/arch/arm/dts/fsl-lx2160a-qds.dtsi b/arch/arm/dts/fsl-lx2160a-qds.dtsi index e96605b1b4..6911c884e4 100644 --- a/arch/arm/dts/fsl-lx2160a-qds.dtsi +++ b/arch/arm/dts/fsl-lx2160a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160AQDS common device tree source * diff --git a/arch/arm/dts/fsl-lx2160a-rdb.dts b/arch/arm/dts/fsl-lx2160a-rdb.dts index aaa59598bd..ac31a35dbf 100644 --- a/arch/arm/dts/fsl-lx2160a-rdb.dts +++ b/arch/arm/dts/fsl-lx2160a-rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2160ARDB device tree source * diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi index 680c69c7b7..1e080e0e33 100644 --- a/arch/arm/dts/fsl-lx2160a.dtsi +++ b/arch/arm/dts/fsl-lx2160a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP lx2160a SOC common device tree source * diff --git a/arch/arm/dts/fsl-lx2162a-qds-17-x.dts b/arch/arm/dts/fsl-lx2162a-qds-17-x.dts index 8a8895f023..beaee8ebb8 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-17-x.dts +++ b/arch/arm/dts/fsl-lx2162a-qds-17-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for SERDES protocol 17.x * diff --git a/arch/arm/dts/fsl-lx2162a-qds-18-x.dts b/arch/arm/dts/fsl-lx2162a-qds-18-x.dts index c28e5e2497..b27bc874bd 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-18-x.dts +++ b/arch/arm/dts/fsl-lx2162a-qds-18-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for SERDES protocol 18.x * diff --git a/arch/arm/dts/fsl-lx2162a-qds-20-x.dts b/arch/arm/dts/fsl-lx2162a-qds-20-x.dts index 7882c767e2..ddf738cdb0 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-20-x.dts +++ b/arch/arm/dts/fsl-lx2162a-qds-20-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for SERDES protocol 20.x * diff --git a/arch/arm/dts/fsl-lx2162a-qds-sd1-17.dtsi b/arch/arm/dts/fsl-lx2162a-qds-sd1-17.dtsi index d1e4a8567f..3f3468c6e0 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-sd1-17.dtsi +++ b/arch/arm/dts/fsl-lx2162a-qds-sd1-17.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for the SERDES block #1 - protocol 17 * diff --git a/arch/arm/dts/fsl-lx2162a-qds-sd1-18.dtsi b/arch/arm/dts/fsl-lx2162a-qds-sd1-18.dtsi index e9a743b3a2..0cb0dda68f 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-sd1-18.dtsi +++ b/arch/arm/dts/fsl-lx2162a-qds-sd1-18.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for the SERDES block #1 - protocol 18 * diff --git a/arch/arm/dts/fsl-lx2162a-qds-sd1-20.dtsi b/arch/arm/dts/fsl-lx2162a-qds-sd1-20.dtsi index d9ad1c6a4b..5ae33262dd 100644 --- a/arch/arm/dts/fsl-lx2162a-qds-sd1-20.dtsi +++ b/arch/arm/dts/fsl-lx2162a-qds-sd1-20.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source for the SERDES block #1 - protocol 20 * diff --git a/arch/arm/dts/fsl-lx2162a-qds.dts b/arch/arm/dts/fsl-lx2162a-qds.dts index 0ca30df862..65606d8d1a 100644 --- a/arch/arm/dts/fsl-lx2162a-qds.dts +++ b/arch/arm/dts/fsl-lx2162a-qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * NXP LX2162AQDS device tree source * diff --git a/arch/arm/dts/fsl-sch-24801.dtsi b/arch/arm/dts/fsl-sch-24801.dtsi index d1b43aa002..4db632c006 100644 --- a/arch/arm/dts/fsl-sch-24801.dtsi +++ b/arch/arm/dts/fsl-sch-24801.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device tree fragment for RCW SCH-24801 card * diff --git a/arch/arm/dts/fsl-sch-28021.dtsi b/arch/arm/dts/fsl-sch-28021.dtsi index 61245287b9..2fe3c1df8b 100644 --- a/arch/arm/dts/fsl-sch-28021.dtsi +++ b/arch/arm/dts/fsl-sch-28021.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device tree fragment for RCW SCH-28021 card * diff --git a/arch/arm/dts/fsl-sch-30841.dtsi b/arch/arm/dts/fsl-sch-30841.dtsi index 28b1bec18a..4f66da1e33 100644 --- a/arch/arm/dts/fsl-sch-30841.dtsi +++ b/arch/arm/dts/fsl-sch-30841.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device tree fragment for RCW SCH-30841 card * diff --git a/arch/arm/dts/fsl-sch-30842.dtsi b/arch/arm/dts/fsl-sch-30842.dtsi index bff9e76570..d79a42341a 100644 --- a/arch/arm/dts/fsl-sch-30842.dtsi +++ b/arch/arm/dts/fsl-sch-30842.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Device tree fragment for RCW SCH-30842 card * diff --git a/arch/arm/dts/hi3660-hikey960-u-boot.dtsi b/arch/arm/dts/hi3660-hikey960-u-boot.dtsi index b7ea672739..5a422d2c10 100644 --- a/arch/arm/dts/hi3660-hikey960-u-boot.dtsi +++ b/arch/arm/dts/hi3660-hikey960-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/hi3798cv200-u-boot.dtsi b/arch/arm/dts/hi3798cv200-u-boot.dtsi index 2de06d9529..8688e1f4e4 100644 --- a/arch/arm/dts/hi3798cv200-u-boot.dtsi +++ b/arch/arm/dts/hi3798cv200-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to: * 1) use platform data for the console diff --git a/arch/arm/dts/hi3798mv200-hc2910-2aghd05-u-boot.dtsi b/arch/arm/dts/hi3798mv200-hc2910-2aghd05-u-boot.dtsi index eb320761f2..b4d87d66f7 100644 --- a/arch/arm/dts/hi3798mv200-hc2910-2aghd05-u-boot.dtsi +++ b/arch/arm/dts/hi3798mv200-hc2910-2aghd05-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "hi3798mv200-u-boot.dtsi" diff --git a/arch/arm/dts/hi3798mv200-u-boot.dtsi b/arch/arm/dts/hi3798mv200-u-boot.dtsi index 8917bcf33d..a665e210dc 100644 --- a/arch/arm/dts/hi3798mv200-u-boot.dtsi +++ b/arch/arm/dts/hi3798mv200-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to: * 1) use platform data for the console diff --git a/arch/arm/dts/hi6220-hikey-u-boot.dtsi b/arch/arm/dts/hi6220-hikey-u-boot.dtsi index fcfcb37a10..dad2f3dd82 100644 --- a/arch/arm/dts/hi6220-hikey-u-boot.dtsi +++ b/arch/arm/dts/hi6220-hikey-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/imx23-evk-u-boot.dtsi b/arch/arm/dts/imx23-evk-u-boot.dtsi index 165e220e31..bdb070f6f3 100644 --- a/arch/arm/dts/imx23-evk-u-boot.dtsi +++ b/arch/arm/dts/imx23-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "imx23-u-boot.dtsi" diff --git a/arch/arm/dts/imx23-evk.dts b/arch/arm/dts/imx23-evk.dts index 3b609d987d..d482e244d2 100644 --- a/arch/arm/dts/imx23-evk.dts +++ b/arch/arm/dts/imx23-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx23-olinuxino-u-boot.dtsi b/arch/arm/dts/imx23-olinuxino-u-boot.dtsi index dee8433696..c70bb19b35 100644 --- a/arch/arm/dts/imx23-olinuxino-u-boot.dtsi +++ b/arch/arm/dts/imx23-olinuxino-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &ssp0 { non-removable; diff --git a/arch/arm/dts/imx23-u-boot.dtsi b/arch/arm/dts/imx23-u-boot.dtsi index 5de62bbb90..72324f7244 100644 --- a/arch/arm/dts/imx23-u-boot.dtsi +++ b/arch/arm/dts/imx23-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &gpio0 { gpio-ranges = <&{/apb@80000000/apbh@80000000/pinctrl@80018000} 0 0 32>; diff --git a/arch/arm/dts/imx23.dtsi b/arch/arm/dts/imx23.dtsi index 7f4c602454..f52daf6f17 100644 --- a/arch/arm/dts/imx23.dtsi +++ b/arch/arm/dts/imx23.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx28-evk-u-boot.dtsi b/arch/arm/dts/imx28-evk-u-boot.dtsi index 6adbae68d2..c088fa8636 100644 --- a/arch/arm/dts/imx28-evk-u-boot.dtsi +++ b/arch/arm/dts/imx28-evk-u-boot.dtsi @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ #include "imx28-u-boot.dtsi" diff --git a/arch/arm/dts/imx28-evk.dts b/arch/arm/dts/imx28-evk.dts index 1053b7c584..a4efdd70fd 100644 --- a/arch/arm/dts/imx28-evk.dts +++ b/arch/arm/dts/imx28-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx28-u-boot.dtsi b/arch/arm/dts/imx28-u-boot.dtsi index 9db72a6be3..cbb39c555a 100644 --- a/arch/arm/dts/imx28-u-boot.dtsi +++ b/arch/arm/dts/imx28-u-boot.dtsi @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ &gpio0 { diff --git a/arch/arm/dts/imx28-xea-u-boot.dtsi b/arch/arm/dts/imx28-xea-u-boot.dtsi index bdbeca528c..a5f14937e7 100644 --- a/arch/arm/dts/imx28-xea-u-boot.dtsi +++ b/arch/arm/dts/imx28-xea-u-boot.dtsi @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ /* diff --git a/arch/arm/dts/imx28.dtsi b/arch/arm/dts/imx28.dtsi index 130b4145af..a878c490c7 100644 --- a/arch/arm/dts/imx28.dtsi +++ b/arch/arm/dts/imx28.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx51-babbage.dts b/arch/arm/dts/imx51-babbage.dts index 552196d8a6..0cfe0b6aa1 100644 --- a/arch/arm/dts/imx51-babbage.dts +++ b/arch/arm/dts/imx51-babbage.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx51.dtsi b/arch/arm/dts/imx51.dtsi index 592d9c23a4..33b1f052f8 100644 --- a/arch/arm/dts/imx51.dtsi +++ b/arch/arm/dts/imx51.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx53-kp-u-boot.dtsi b/arch/arm/dts/imx53-kp-u-boot.dtsi index a112db9d1a..fc0bbf7fc3 100644 --- a/arch/arm/dts/imx53-kp-u-boot.dtsi +++ b/arch/arm/dts/imx53-kp-u-boot.dtsi @@ -2,7 +2,7 @@ * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ &fec { diff --git a/arch/arm/dts/imx53-kp.dts b/arch/arm/dts/imx53-kp.dts index c951def82a..4877e80127 100644 --- a/arch/arm/dts/imx53-kp.dts +++ b/arch/arm/dts/imx53-kp.dts @@ -2,7 +2,7 @@ * Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ /dts-v1/; diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi index 62453db62e..261e1e134e 100644 --- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi +++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx53-m53menlo.dts b/arch/arm/dts/imx53-m53menlo.dts index d5c68d1ea7..f7fc29a5c3 100644 --- a/arch/arm/dts/imx53-m53menlo.dts +++ b/arch/arm/dts/imx53-m53menlo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi index f06cd8a3db..1caeef4fd0 100644 --- a/arch/arm/dts/imx53-ppd-uboot.dtsi +++ b/arch/arm/dts/imx53-ppd-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Collabora Ltd * Copyright 2019 General Electric Company diff --git a/arch/arm/dts/imx53-qsb-common.dtsi b/arch/arm/dts/imx53-qsb-common.dtsi index fe4244044a..36264d9546 100644 --- a/arch/arm/dts/imx53-qsb-common.dtsi +++ b/arch/arm/dts/imx53-qsb-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx53-qsb.dts b/arch/arm/dts/imx53-qsb.dts index 6831836bd7..c6352022db 100644 --- a/arch/arm/dts/imx53-qsb.dts +++ b/arch/arm/dts/imx53-qsb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx53.dtsi b/arch/arm/dts/imx53.dtsi index b7a6469d34..3b8f0514d3 100644 --- a/arch/arm/dts/imx53.dtsi +++ b/arch/arm/dts/imx53.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi b/arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi index cb2181d9e2..59f4d057ba 100644 --- a/arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-aristainetos2c_7-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 +// SPDX-License-Identifier: GPL-2.0-or-later or X11 /* * Copyright (C) 2019 Heiko Schocher <hs(a)denx.de> */ diff --git a/arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi b/arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi index b069debc1e..a7da138018 100644 --- a/arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-aristainetos2c_cslb_7-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 +// SPDX-License-Identifier: GPL-2.0-or-later or X11 /* * Copyright (C) 2019 Heiko Schocher <hs(a)denx.de> */ diff --git a/arch/arm/dts/imx6dl-b1x5v2.dts b/arch/arm/dts/imx6dl-b1x5v2.dts index 78baec1e73..bc5c253798 100644 --- a/arch/arm/dts/imx6dl-b1x5v2.dts +++ b/arch/arm/dts/imx6dl-b1x5v2.dts @@ -4,7 +4,7 @@ * Copyright 2018-2020 GE Inc. * Copyright 2018-2020 Collabora Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /dts-v1/; diff --git a/arch/arm/dts/imx6dl-brppt2.dts b/arch/arm/dts/imx6dl-brppt2.dts index 575bfac7bb..59f74b904c 100644 --- a/arch/arm/dts/imx6dl-brppt2.dts +++ b/arch/arm/dts/imx6dl-brppt2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 B&R Industrial Automation GmbH * Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi index fc7dffea2a..f96a53df60 100644 --- a/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> */ diff --git a/arch/arm/dts/imx6dl-dhcom-pdk2.dts b/arch/arm/dts/imx6dl-dhcom-pdk2.dts index d59687490c..7d63566f78 100644 --- a/arch/arm/dts/imx6dl-dhcom-pdk2.dts +++ b/arch/arm/dts/imx6dl-dhcom-pdk2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2019 DH electronics GmbH */ diff --git a/arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi b/arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi index 16669b2533..4bd83f9743 100644 --- a/arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-dhcom-picoitx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2022 Philip Oberfichtner <pro(a)denx.de> */ diff --git a/arch/arm/dts/imx6dl-dhcom-picoitx.dts b/arch/arm/dts/imx6dl-dhcom-picoitx.dts index 038bb00255..36b2a6014b 100644 --- a/arch/arm/dts/imx6dl-dhcom-picoitx.dts +++ b/arch/arm/dts/imx6dl-dhcom-picoitx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 DH electronics GmbH * diff --git a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi index 7fbeb25dcf..424a3bd819 100644 --- a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi index bc5ed941b4..99da6805bc 100644 --- a/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6dl-icore-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-u-boot.dtsi index cfc9f8c741..bccd74accf 100644 --- a/arch/arm/dts/imx6dl-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi index c37aa128fa..f77c5429fe 100644 --- a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6dl-mamoj.dts b/arch/arm/dts/imx6dl-mamoj.dts index 028951955b..4b2d4d63a6 100644 --- a/arch/arm/dts/imx6dl-mamoj.dts +++ b/arch/arm/dts/imx6dl-mamoj.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 BTicino * Copyright (C) 2018 Amarula Solutions B.V. diff --git a/arch/arm/dts/imx6dl-riotboard-u-boot.dtsi b/arch/arm/dts/imx6dl-riotboard-u-boot.dtsi index e51cd24d7e..0ed45f29aa 100644 --- a/arch/arm/dts/imx6dl-riotboard-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-riotboard-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later / { aliases { diff --git a/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi index d75fcc1019..35ca0aa265 100644 --- a/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi index e4d7d2819b..233ff65d70 100644 --- a/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi b/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi index c6cb9a5ac7..899a229cb0 100644 --- a/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi +++ b/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2022 Denx Software Engineering GmbH * Philip Oberfichtner <pro(a)denx.de> diff --git a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi index 0253d2fa6f..bec4e13ff7 100644 --- a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi +++ b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Collabora Ltd * Copyright 2019 General Electric Company diff --git a/arch/arm/dts/imx6q-bx50v3.dts b/arch/arm/dts/imx6q-bx50v3.dts index a44d7004cb..c74bb13f4e 100644 --- a/arch/arm/dts/imx6q-bx50v3.dts +++ b/arch/arm/dts/imx6q-bx50v3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Timesys Corporation. * Copyright 2018 General Electric Company diff --git a/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi index 026342df5a..3169c7ece6 100644 --- a/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2019 Claudius Heine <ch(a)denx.de> */ diff --git a/arch/arm/dts/imx6q-dhcom-pdk2.dts b/arch/arm/dts/imx6q-dhcom-pdk2.dts index d4d5737061..f6db50ea52 100644 --- a/arch/arm/dts/imx6q-dhcom-pdk2.dts +++ b/arch/arm/dts/imx6q-dhcom-pdk2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2021 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi index dbe0ef7a0e..90e011c420 100644 --- a/arch/arm/dts/imx6q-display5-u-boot.dtsi +++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ /* diff --git a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi index 7fbeb25dcf..424a3bd819 100644 --- a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6q-icore-ofcap10.dts b/arch/arm/dts/imx6q-icore-ofcap10.dts index 02aca1e28c..37ecb410d9 100644 --- a/arch/arm/dts/imx6q-icore-ofcap10.dts +++ b/arch/arm/dts/imx6q-icore-ofcap10.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/arch/arm/dts/imx6q-icore-ofcap12.dts b/arch/arm/dts/imx6q-icore-ofcap12.dts index 241811c52b..7ed7e42f19 100644 --- a/arch/arm/dts/imx6q-icore-ofcap12.dts +++ b/arch/arm/dts/imx6q-icore-ofcap12.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi index bc5ed941b4..99da6805bc 100644 --- a/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6q-icore-rqs.dts b/arch/arm/dts/imx6q-icore-rqs.dts index cf6ba724f4..6e53e9c1c6 100644 --- a/arch/arm/dts/imx6q-icore-rqs.dts +++ b/arch/arm/dts/imx6q-icore-rqs.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2015 Amarula Solutions B.V. * Copyright (C) 2015 Engicam S.r.l. diff --git a/arch/arm/dts/imx6q-icore-u-boot.dtsi b/arch/arm/dts/imx6q-icore-u-boot.dtsi index cfc9f8c741..bccd74accf 100644 --- a/arch/arm/dts/imx6q-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6q-kp-u-boot.dtsi b/arch/arm/dts/imx6q-kp-u-boot.dtsi index 83d406a062..b30059d5ba 100644 --- a/arch/arm/dts/imx6q-kp-u-boot.dtsi +++ b/arch/arm/dts/imx6q-kp-u-boot.dtsi @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ #include "imx6qdl-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-kp.dts b/arch/arm/dts/imx6q-kp.dts index 48ade9eeac..6e971fb979 100644 --- a/arch/arm/dts/imx6q-kp.dts +++ b/arch/arm/dts/imx6q-kp.dts @@ -1,9 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de * - * SPDX-License-Identifier: GPL-2.0+ or X11 + * SPDX-License-Identifier: GPL-2.0-or-later or X11 */ /dts-v1/; diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi index 2b28d36ef1..a7b8012627 100644 --- a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Logic PD <aford173(a)gmail.com> */ diff --git a/arch/arm/dts/imx6q-marsboard-u-boot.dtsi b/arch/arm/dts/imx6q-marsboard-u-boot.dtsi index e51cd24d7e..0ed45f29aa 100644 --- a/arch/arm/dts/imx6q-marsboard-u-boot.dtsi +++ b/arch/arm/dts/imx6q-marsboard-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later / { aliases { diff --git a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi index 08b4ee0ab8..ce57c7ed51 100644 --- a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi +++ b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 * Niel Fourie, DENX Software Engineering, lusus(a)denx.de. diff --git a/arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts b/arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts index 3f13726c80..8f28524b6c 100644 --- a/arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts +++ b/arch/arm/dts/imx6q-phytec-mira-rdk-nand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 PHYTEC Messtechnik GmbH * Author: Christian Hemp <c.hemp(a)phytec.de> diff --git a/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi index d75fcc1019..35ca0aa265 100644 --- a/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi +++ b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts index 6e981a3e0a..f64041fdb3 100644 --- a/arch/arm/dts/imx6q-sabreauto.dts +++ b/arch/arm/dts/imx6q-sabreauto.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi b/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi index 9eb1c34b20..41546e478f 100644 --- a/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi +++ b/arch/arm/dts/imx6q-sabrelite-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Collabora */ diff --git a/arch/arm/dts/imx6q-sabresd-u-boot.dtsi b/arch/arm/dts/imx6q-sabresd-u-boot.dtsi index e4d7d2819b..233ff65d70 100644 --- a/arch/arm/dts/imx6q-sabresd-u-boot.dtsi +++ b/arch/arm/dts/imx6q-sabresd-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6q-sabresd.dts b/arch/arm/dts/imx6q-sabresd.dts index eec944673c..bec5800faf 100644 --- a/arch/arm/dts/imx6q-sabresd.dts +++ b/arch/arm/dts/imx6q-sabresd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi index 1d9eaffecd..037203d9b4 100644 --- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &{/soc/bus@2000000} { /* AIPS1 */ bootph-all; diff --git a/arch/arm/dts/imx6q-tbs2910.dts b/arch/arm/dts/imx6q-tbs2910.dts index 8daef65d5b..f93f516499 100644 --- a/arch/arm/dts/imx6q-tbs2910.dts +++ b/arch/arm/dts/imx6q-tbs2910.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2014 Soeren Moch <smoch(a)web.de> diff --git a/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi b/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi index 33c3467b6a..037b23c40c 100644 --- a/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 +// SPDX-License-Identifier: GPL-2.0-or-later or X11 /* * Copyright (C) 2019 Heiko Schocher <hs(a)denx.de> */ diff --git a/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi b/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi index 04ed0c1e15..16267f802b 100644 --- a/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ or X11 +// SPDX-License-Identifier: GPL-2.0-or-later or X11 /* * Copyright (C) 2019 Heiko Schocher <hs(a)denx.de> */ diff --git a/arch/arm/dts/imx6qdl-colibri.dtsi b/arch/arm/dts/imx6qdl-colibri.dtsi index 023e762150..19c8aeb0dc 100644 --- a/arch/arm/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/dts/imx6qdl-colibri.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2014-2022 Toradex * Copyright 2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6qdl-dhcom-drc02.dtsi b/arch/arm/dts/imx6qdl-dhcom-drc02.dtsi index 702cd4a1b2..774db2c6e7 100644 --- a/arch/arm/dts/imx6qdl-dhcom-drc02.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-drc02.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 DH electronics GmbH */ diff --git a/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi index 0673c21e3c..156262dd0b 100644 --- a/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> */ diff --git a/arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi b/arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi index fe72650295..6b96c0a077 100644 --- a/arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-pdk2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2021 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> diff --git a/arch/arm/dts/imx6qdl-dhcom-picoitx.dtsi b/arch/arm/dts/imx6qdl-dhcom-picoitx.dtsi index 4cd4cb9543..20fa48ce0b 100644 --- a/arch/arm/dts/imx6qdl-dhcom-picoitx.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-picoitx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 DH electronics GmbH */ diff --git a/arch/arm/dts/imx6qdl-dhcom-som.dtsi b/arch/arm/dts/imx6qdl-dhcom-som.dtsi index 5befbe13d1..ca7adbd0c6 100644 --- a/arch/arm/dts/imx6qdl-dhcom-som.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2021 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> diff --git a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi index 740a24d96e..22ae4b0315 100644 --- a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> * Copyright (C) 2022 Philip Oberfichtner <pro(a)denx.de> diff --git a/arch/arm/dts/imx6qdl-dhcom.dtsi b/arch/arm/dts/imx6qdl-dhcom.dtsi index 1141b6a562..c4c9f91d9b 100644 --- a/arch/arm/dts/imx6qdl-dhcom.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2015-2019 DH electronics GmbH * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> diff --git a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi index 23a05773b5..9845e7fd79 100644 --- a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "imx6qdl-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-icore-1.5.dtsi b/arch/arm/dts/imx6qdl-icore-1.5.dtsi index 0fd7f2e24d..d78e694985 100644 --- a/arch/arm/dts/imx6qdl-icore-1.5.dtsi +++ b/arch/arm/dts/imx6qdl-icore-1.5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jacopo Mondi <jacopo(a)jmondi.org> */ diff --git a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi index 4476d3cb6f..47630a9d71 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi index e02cd58300..bde00ebfb3 100644 --- a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi b/arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi index 0020dbb172..759b41b36b 100644 --- a/arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-mira-peb-av-02.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 PHYTEC Messtechnik * Author: Christian Hemp <c.hemp(a)phytec.de> diff --git a/arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi b/arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi index 037b601975..3b2b55faea 100644 --- a/arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-mira-peb-eval-01.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 PHYTEC Messtechnik * Author: Christian Hemp <c.hemp(a)phytec.de> diff --git a/arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi b/arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi index 84f884d6e5..6b20955999 100644 --- a/arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-mira-peb-wlbt-05.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2021 PHYTEC Messtechnik GmbH * Author: Yunus Bas <y.bas(a)phytec.de> diff --git a/arch/arm/dts/imx6qdl-phytec-mira.dtsi b/arch/arm/dts/imx6qdl-phytec-mira.dtsi index 120d6e997a..6a60e2d3b7 100644 --- a/arch/arm/dts/imx6qdl-phytec-mira.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-mira.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 PHYTEC Messtechnik GmbH * Author: Christian Hemp <c.hemp(a)phytec.de> diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index 28a8053846..ab3a576fcf 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 PHYTEC Messtechnik GmbH * Author: Christian Hemp <c.hemp(a)phytec.de> diff --git a/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi index cdc721402e..3ec6d7bf94 100644 --- a/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6qdl-sabreauto.dtsi b/arch/arm/dts/imx6qdl-sabreauto.dtsi index 1368a47620..97fc2f249e 100644 --- a/arch/arm/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/dts/imx6qdl-sabreauto.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi index 5c4101b76d..a75fc663af 100644 --- a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6qdl-sabresd.dtsi b/arch/arm/dts/imx6qdl-sabresd.dtsi index 37482a9023..cf5d6004ff 100644 --- a/arch/arm/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/dts/imx6qdl-sabresd.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2012 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi index cab9b6cfc5..49e5218322 100644 --- a/arch/arm/dts/imx6qdl-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6qdl-udoo-u-boot.dtsi b/arch/arm/dts/imx6qdl-udoo-u-boot.dtsi index 749791a13f..f0be9da6af 100644 --- a/arch/arm/dts/imx6qdl-udoo-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-udoo-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later / { aliases { diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index 4f7fefc14d..7d111d9aa1 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Copyright 2011 Freescale Semiconductor, Inc. // Copyright 2011 Linaro Ltd. diff --git a/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi index d75fcc1019..35ca0aa265 100644 --- a/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi +++ b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6qp-sabreauto.dts b/arch/arm/dts/imx6qp-sabreauto.dts index 2bb3bfb18e..21f43c928c 100644 --- a/arch/arm/dts/imx6qp-sabreauto.dts +++ b/arch/arm/dts/imx6qp-sabreauto.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2016 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi index e4d7d2819b..233ff65d70 100644 --- a/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi +++ b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 NXP */ diff --git a/arch/arm/dts/imx6qp-sabresd.dts b/arch/arm/dts/imx6qp-sabresd.dts index f69eec18d8..ebeb4ff36c 100644 --- a/arch/arm/dts/imx6qp-sabresd.dts +++ b/arch/arm/dts/imx6qp-sabresd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2016 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi index 0503655138..0626522ed1 100644 --- a/arch/arm/dts/imx6qp.dtsi +++ b/arch/arm/dts/imx6qp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2016 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6s-dhcom-drc02-u-boot.dtsi b/arch/arm/dts/imx6s-dhcom-drc02-u-boot.dtsi index 16669b2533..4bd83f9743 100644 --- a/arch/arm/dts/imx6s-dhcom-drc02-u-boot.dtsi +++ b/arch/arm/dts/imx6s-dhcom-drc02-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2022 Philip Oberfichtner <pro(a)denx.de> */ diff --git a/arch/arm/dts/imx6s-dhcom-drc02.dts b/arch/arm/dts/imx6s-dhcom-drc02.dts index 4077b607c2..8ac1eabfe2 100644 --- a/arch/arm/dts/imx6s-dhcom-drc02.dts +++ b/arch/arm/dts/imx6s-dhcom-drc02.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 DH electronics GmbH * diff --git a/arch/arm/dts/imx6sll-evk-u-boot.dtsi b/arch/arm/dts/imx6sll-evk-u-boot.dtsi index 0e60906509..0435466702 100644 --- a/arch/arm/dts/imx6sll-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6sll-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi index b619d983aa..36dc041e4a 100644 --- a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi +++ b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi b/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi index b5e1f2b9a1..f20fa52ecc 100644 --- a/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi +++ b/arch/arm/dts/imx6sx-udoo-neo-basic-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &soc { bootph-all; diff --git a/arch/arm/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/dts/imx6sx-udoo-neo-basic.dts index 205ea26484..66d654b3ed 100644 --- a/arch/arm/dts/imx6sx-udoo-neo-basic.dts +++ b/arch/arm/dts/imx6sx-udoo-neo-basic.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/dts/imx6sx-udoo-neo-extended.dts index 5817b49853..67f4ad02b4 100644 --- a/arch/arm/dts/imx6sx-udoo-neo-extended.dts +++ b/arch/arm/dts/imx6sx-udoo-neo-extended.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/imx6sx-udoo-neo-full.dts b/arch/arm/dts/imx6sx-udoo-neo-full.dts index 96f4d89848..302edf3d87 100644 --- a/arch/arm/dts/imx6sx-udoo-neo-full.dts +++ b/arch/arm/dts/imx6sx-udoo-neo-full.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/imx6sx-udoo-neo.dtsi b/arch/arm/dts/imx6sx-udoo-neo.dtsi index c84ea1fac5..4f69b212c1 100644 --- a/arch/arm/dts/imx6sx-udoo-neo.dtsi +++ b/arch/arm/dts/imx6sx-udoo-neo.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi index eaa2a45fed..b2ef85d0a8 100644 --- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi index 77cb461a21..4119419a10 100644 --- a/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-9x9-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/imx6ul-9x9-evk.dts b/arch/arm/dts/imx6ul-9x9-evk.dts index 2270451121..dcdf1a6331 100644 --- a/arch/arm/dts/imx6ul-9x9-evk.dts +++ b/arch/arm/dts/imx6ul-9x9-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP diff --git a/arch/arm/dts/imx6ul-geam-u-boot.dtsi b/arch/arm/dts/imx6ul-geam-u-boot.dtsi index 014b6bdd13..13f35f58d5 100644 --- a/arch/arm/dts/imx6ul-geam-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-geam-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi index a177acad9a..067fe76901 100644 --- a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi index 8f58886478..f101ded2ae 100644 --- a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi b/arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi index 04477fd4b9..6b94719acb 100644 --- a/arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi +++ b/arch/arm/dts/imx6ul-phytec-segin-peb-wlbt-05.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2021 PHYTEC Messtechnik GmbH * Author: Yunus Bas <y.bas(a)phytec.de> diff --git a/arch/arm/dts/imx6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-u-boot.dtsi index cad2261922..c006c40c03 100644 --- a/arch/arm/dts/imx6ul-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi index 0b185712f9..c0c7a60a3b 100644 --- a/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts b/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts index 61b93cb040..d5bcd3abf8 100644 --- a/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts +++ b/arch/arm/dts/imx6ull-colibri-emmc-eval-v3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021 Toradex */ diff --git a/arch/arm/dts/imx6ull-dart-6ul.dts b/arch/arm/dts/imx6ull-dart-6ul.dts index 9e217ba09f..7cd24bcea0 100644 --- a/arch/arm/dts/imx6ull-dart-6ul.dts +++ b/arch/arm/dts/imx6ull-dart-6ul.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> * Copyright (C) 2021 Marc Ferland, Amotus Solutions Inc., <ferlandm(a)amotus.ca> diff --git a/arch/arm/dts/imx6ull-dart-6ul.dtsi b/arch/arm/dts/imx6ull-dart-6ul.dtsi index d2a74ddaf0..e9bbedb3fc 100644 --- a/arch/arm/dts/imx6ull-dart-6ul.dtsi +++ b/arch/arm/dts/imx6ull-dart-6ul.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> * Copyright (C) 2021 Marc Ferland, Amotus Solutions Inc., <ferlandm(a)amotus.ca> diff --git a/arch/arm/dts/imx6ull-phytec-phycore-som.dtsi b/arch/arm/dts/imx6ull-phytec-phycore-som.dtsi index 56cd16e5a7..d73edffdbf 100644 --- a/arch/arm/dts/imx6ull-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6ull-phytec-phycore-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 PHYTEC Messtechnik GmbH * Author: Stefan Riedmueller <s.riedmueller(a)phytec.de> diff --git a/arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts b/arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts index 8e2a4c5d77..dd1279cd29 100644 --- a/arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts +++ b/arch/arm/dts/imx6ull-phytec-segin-ff-rdk-emmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 PHYTEC Messtechnik GmbH * Author: Stefan Riedmueller <s.riedmueller(a)phytec.de> diff --git a/arch/arm/dts/imx6ull-phytec-segin-peb-eval-01.dtsi b/arch/arm/dts/imx6ull-phytec-segin-peb-eval-01.dtsi index ff08d95a1a..849c6ef715 100644 --- a/arch/arm/dts/imx6ull-phytec-segin-peb-eval-01.dtsi +++ b/arch/arm/dts/imx6ull-phytec-segin-peb-eval-01.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 PHYTEC Messtechnik GmbH * Author: Stefan Riedmueller <s.riedmueller(a)phytec.de> diff --git a/arch/arm/dts/imx6ull-phytec-segin.dtsi b/arch/arm/dts/imx6ull-phytec-segin.dtsi index e287a0453b..b624a508a0 100644 --- a/arch/arm/dts/imx6ull-phytec-segin.dtsi +++ b/arch/arm/dts/imx6ull-phytec-segin.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 PHYTEC Messtechnik GmbH * Author: Stefan Riedmueller <s.riedmueller(a)phytec.de> diff --git a/arch/arm/dts/imx6ull-somlabs-visionsom.dts b/arch/arm/dts/imx6ull-somlabs-visionsom.dts index 868f3f8440..abe820d888 100644 --- a/arch/arm/dts/imx6ull-somlabs-visionsom.dts +++ b/arch/arm/dts/imx6ull-somlabs-visionsom.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2019 SoMLabs * Copyright (C) 2016 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx6ull-u-boot.dtsi b/arch/arm/dts/imx6ull-u-boot.dtsi index 0d7679634d..a1f26c6324 100644 --- a/arch/arm/dts/imx6ull-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> */ diff --git a/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi index a6c2cc8c1a..80690f5030 100644 --- a/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi +++ b/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imx7-cm.dts b/arch/arm/dts/imx7-cm.dts index 6fde55ad02..a9ace71c49 100644 --- a/arch/arm/dts/imx7-cm.dts +++ b/arch/arm/dts/imx7-cm.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // // Copyright 2021 Ronetix GmbH diff --git a/arch/arm/dts/imx7d-meerkat96.dts b/arch/arm/dts/imx7d-meerkat96.dts index dd8003bd1f..cfbfc30e70 100644 --- a/arch/arm/dts/imx7d-meerkat96.dts +++ b/arch/arm/dts/imx7d-meerkat96.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2019 Linaro Ltd. */ diff --git a/arch/arm/dts/imx7d-pico-hobbit.dts b/arch/arm/dts/imx7d-pico-hobbit.dts index d917dc4f2f..fd65c0d55c 100644 --- a/arch/arm/dts/imx7d-pico-hobbit.dts +++ b/arch/arm/dts/imx7d-pico-hobbit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // // Copyright 2017 NXP diff --git a/arch/arm/dts/imx7d-pico-pi.dts b/arch/arm/dts/imx7d-pico-pi.dts index f263e391e2..035578fd9a 100644 --- a/arch/arm/dts/imx7d-pico-pi.dts +++ b/arch/arm/dts/imx7d-pico-pi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // // Copyright 2017 NXP diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi index e0bff39e8d..83fa6e6d39 100644 --- a/arch/arm/dts/imx7d-pico.dtsi +++ b/arch/arm/dts/imx7d-pico.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // // Copyright 2017 NXP diff --git a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi index 896c8bcaa5..749a32c48a 100644 --- a/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-qspi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/dts/imx7d-sdb-qspi.dts b/arch/arm/dts/imx7d-sdb-qspi.dts index 9215d7c616..65c0b24949 100644 --- a/arch/arm/dts/imx7d-sdb-qspi.dts +++ b/arch/arm/dts/imx7d-sdb-qspi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * Copyright 2018 NXP diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi index 71bfd80aab..c9c3144596 100644 --- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT #include "imx7s-u-boot.dtsi" diff --git a/arch/arm/dts/imx7d-sdb.dts b/arch/arm/dts/imx7d-sdb.dts index 78f4224a9b..dbf9272650 100644 --- a/arch/arm/dts/imx7d-sdb.dts +++ b/arch/arm/dts/imx7d-sdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright (C) 2015 Freescale Semiconductor, Inc. diff --git a/arch/arm/dts/imx7d-smegw01-u-boot.dtsi b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi index 611bfe52fd..52f6d764c4 100644 --- a/arch/arm/dts/imx7d-smegw01-u-boot.dtsi +++ b/arch/arm/dts/imx7d-smegw01-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "imx7s-u-boot.dtsi" diff --git a/arch/arm/dts/imx7d-smegw01.dts b/arch/arm/dts/imx7d-smegw01.dts index 546268b8d0..ec37e24a23 100644 --- a/arch/arm/dts/imx7d-smegw01.dts +++ b/arch/arm/dts/imx7d-smegw01.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // // Copyright (C) 2020 PHYTEC Messtechnik GmbH // Author: Jens Lang <J.Lang(a)phytec.de> diff --git a/arch/arm/dts/imx7d.dtsi b/arch/arm/dts/imx7d.dtsi index 7ceb7c09f7..6e8ee64672 100644 --- a/arch/arm/dts/imx7d.dtsi +++ b/arch/arm/dts/imx7d.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2015 Freescale Semiconductor, Inc. // Copyright 2016 Toradex AG diff --git a/arch/arm/dts/imx7s-u-boot.dtsi b/arch/arm/dts/imx7s-u-boot.dtsi index c4c1da3c64..4187f61dbc 100644 --- a/arch/arm/dts/imx7s-u-boot.dtsi +++ b/arch/arm/dts/imx7s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT &crypto { sec_jr0: jr@1000 { diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index e8734d218b..ff01a2342c 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2016 NXP Semiconductors. * Author: Fabio Estevam <fabio.estevam(a)nxp.com> diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi index 29148285f9..becdc13d29 100644 --- a/arch/arm/dts/imx7s.dtsi +++ b/arch/arm/dts/imx7s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Copyright 2015 Freescale Semiconductor, Inc. // Copyright 2016 Toradex AG diff --git a/arch/arm/dts/imx7ulp-com-u-boot.dtsi b/arch/arm/dts/imx7ulp-com-u-boot.dtsi index f6d34e1b63..365f2cbe3a 100644 --- a/arch/arm/dts/imx7ulp-com-u-boot.dtsi +++ b/arch/arm/dts/imx7ulp-com-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 Foundries.io */ diff --git a/arch/arm/dts/imx7ulp-evk.dts b/arch/arm/dts/imx7ulp-evk.dts index eff51e113d..53d65d2735 100644 --- a/arch/arm/dts/imx7ulp-evk.dts +++ b/arch/arm/dts/imx7ulp-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP diff --git a/arch/arm/dts/imx7ulp.dtsi b/arch/arm/dts/imx7ulp.dtsi index bcec98b964..8c68aa18ac 100644 --- a/arch/arm/dts/imx7ulp.dtsi +++ b/arch/arm/dts/imx7ulp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP diff --git a/arch/arm/dts/imx8-deneb.dts b/arch/arm/dts/imx8-deneb.dts index 04c764aa94..c48cdcb996 100644 --- a/arch/arm/dts/imx8-deneb.dts +++ b/arch/arm/dts/imx8-deneb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Siemens AG */ diff --git a/arch/arm/dts/imx8-giedi.dts b/arch/arm/dts/imx8-giedi.dts index 0dbfef2ee9..adc711e47c 100644 --- a/arch/arm/dts/imx8-giedi.dts +++ b/arch/arm/dts/imx8-giedi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Siemens AG */ diff --git a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi index 00abbeb22f..dfce4ca99f 100644 --- a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc0.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc0.dtso index 3f2201e4ee..a996827520 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc0.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc0.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc1.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc1.dtso index bb0f848718..079e740080 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc1.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-adc1.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-can0.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-can0.dtso index 0e46300142..87cfe6ddc7 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-can0.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-can0.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-can1.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-can1.dtso index fd7274eb7a..a4b1479ff5 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-can1.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-can1.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm0.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm0.dtso index 06fa77c0e8..a49d6f200e 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm0.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm0.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm1.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm1.dtso index c9676a3a00..280a0146da 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm1.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied-tpm1.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-ied.dtso b/arch/arm/dts/imx8mm-cl-iot-gate-ied.dtso index b85485126e..24ad233476 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-ied.dtso +++ b/arch/arm/dts/imx8mm-cl-iot-gate-ied.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Linaro */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi index c4327d3187..cad74bbcca 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee.dts b/arch/arm/dts/imx8mm-cl-iot-gate-optee.dts index 4d0ef46997..e8465456c7 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee.dts +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi index 219504f611..c9a996509a 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mm-cl-iot-gate.dts b/arch/arm/dts/imx8mm-cl-iot-gate.dts index 425701204a..a442adbbd5 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate.dts +++ b/arch/arm/dts/imx8mm-cl-iot-gate.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi index 144c42b210..95b5db71b9 100644 --- a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mm-data-modul-edm-sbc.dts b/arch/arm/dts/imx8mm-data-modul-edm-sbc.dts index 778bdbe228..80e124e800 100644 --- a/arch/arm/dts/imx8mm-data-modul-edm-sbc.dts +++ b/arch/arm/dts/imx8mm-data-modul-edm-sbc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 9a5b079513..3cbd9f0cc8 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/arch/arm/dts/imx8mm-evk.dts b/arch/arm/dts/imx8mm-evk.dts index a2b24d4d4e..2a8a41f9e5 100644 --- a/arch/arm/dts/imx8mm-evk.dts +++ b/arch/arm/dts/imx8mm-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019-2020 NXP */ diff --git a/arch/arm/dts/imx8mm-evk.dtsi b/arch/arm/dts/imx8mm-evk.dtsi index 7d6317d95b..6de6c31319 100644 --- a/arch/arm/dts/imx8mm-evk.dtsi +++ b/arch/arm/dts/imx8mm-evk.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 NXP */ diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi index a009880bdf..f68a478298 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts index 5027454028..3b28faa222 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts +++ b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 NXP * Copyright (c) 2019 Engicam srl diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi index a009880bdf..f68a478298 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts index ddac8bc7ae..944464d53b 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts +++ b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 NXP * Copyright (c) 2019 Engicam srl diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi index bc4e434cc7..5f605effcc 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/imx8mm-icore-mx8mm.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm.dtsi index def7bb5d37..50cf93707c 100644 --- a/arch/arm/dts/imx8mm-icore-mx8mm.dtsi +++ b/arch/arm/dts/imx8mm-icore-mx8mm.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 NXP * Copyright (c) 2019 Engicam srl diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi index ae542fdcff..991a824c85 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi index fac24a21fb..5e1065b0d4 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-osm-s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-bl-osm-s.dts b/arch/arm/dts/imx8mm-kontron-bl-osm-s.dts index 8b16bd6857..f2c45d4f51 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-osm-s.dts +++ b/arch/arm/dts/imx8mm-kontron-bl-osm-s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi index e9fa8d7b2a..fe76b96c7b 100644 --- a/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-bl-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-bl.dts b/arch/arm/dts/imx8mm-kontron-bl.dts index dcec57c203..22bb6f9819 100644 --- a/arch/arm/dts/imx8mm-kontron-bl.dts +++ b/arch/arm/dts/imx8mm-kontron-bl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-osm-s.dtsi b/arch/arm/dts/imx8mm-kontron-osm-s.dtsi index 695da2fa7c..ea3acfb64a 100644 --- a/arch/arm/dts/imx8mm-kontron-osm-s.dtsi +++ b/arch/arm/dts/imx8mm-kontron-osm-s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-kontron-sl.dtsi b/arch/arm/dts/imx8mm-kontron-sl.dtsi index 0679728d24..7e29b86899 100644 --- a/arch/arm/dts/imx8mm-kontron-sl.dtsi +++ b/arch/arm/dts/imx8mm-kontron-sl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi index a16ce54926..ddaad32a96 100644 --- a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021-2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mm-mx8menlo.dts b/arch/arm/dts/imx8mm-mx8menlo.dts index 0b123a8401..c93500d7d7 100644 --- a/arch/arm/dts/imx8mm-mx8menlo.dts +++ b/arch/arm/dts/imx8mm-mx8menlo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021-2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mm-phg-u-boot.dtsi b/arch/arm/dts/imx8mm-phg-u-boot.dtsi index c9e0b44205..568d820b98 100644 --- a/arch/arm/dts/imx8mm-phg-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-phg-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mm-phg.dts b/arch/arm/dts/imx8mm-phg.dts index e9447738b1..03b781b4be 100644 --- a/arch/arm/dts/imx8mm-phg.dts +++ b/arch/arm/dts/imx8mm-phg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Fabio Estevam <festevam(a)denx.de> */ diff --git a/arch/arm/dts/imx8mm-pinfunc.h b/arch/arm/dts/imx8mm-pinfunc.h index 83c8f715cd..bf10967269 100644 --- a/arch/arm/dts/imx8mm-pinfunc.h +++ b/arch/arm/dts/imx8mm-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2018 NXP */ diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 06f2f73a03..3abbda7776 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi index 6ab21fd938..e9d0868b78 100644 --- a/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw700x.dtsi b/arch/arm/dts/imx8mm-venice-gw700x.dtsi index c305e325d0..42df784d8b 100644 --- a/arch/arm/dts/imx8mm-venice-gw700x.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw700x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw71xx-0x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw71xx-0x-u-boot.dtsi index b3592331c7..c24ca519bf 100644 --- a/arch/arm/dts/imx8mm-venice-gw71xx-0x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw71xx-0x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw71xx-0x.dts b/arch/arm/dts/imx8mm-venice-gw71xx-0x.dts index 3f88c4ad57..26f4b82aa9 100644 --- a/arch/arm/dts/imx8mm-venice-gw71xx-0x.dts +++ b/arch/arm/dts/imx8mm-venice-gw71xx-0x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw71xx.dtsi b/arch/arm/dts/imx8mm-venice-gw71xx.dtsi index c557dbf4dc..913e662911 100644 --- a/arch/arm/dts/imx8mm-venice-gw71xx.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw71xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi index 92e44d4ba9..9e3ae5e766 100644 --- a/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw72xx-0x.dts b/arch/arm/dts/imx8mm-venice-gw72xx-0x.dts index 641be3af98..851196d79a 100644 --- a/arch/arm/dts/imx8mm-venice-gw72xx-0x.dts +++ b/arch/arm/dts/imx8mm-venice-gw72xx-0x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw72xx.dtsi b/arch/arm/dts/imx8mm-venice-gw72xx.dtsi index 41d0de6a70..8872a98a69 100644 --- a/arch/arm/dts/imx8mm-venice-gw72xx.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw72xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw73xx-0x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw73xx-0x-u-boot.dtsi index 92e44d4ba9..9e3ae5e766 100644 --- a/arch/arm/dts/imx8mm-venice-gw73xx-0x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw73xx-0x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw73xx-0x.dts b/arch/arm/dts/imx8mm-venice-gw73xx-0x.dts index 6905437ff2..8e650fd2ba 100644 --- a/arch/arm/dts/imx8mm-venice-gw73xx-0x.dts +++ b/arch/arm/dts/imx8mm-venice-gw73xx-0x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw73xx.dtsi b/arch/arm/dts/imx8mm-venice-gw73xx.dtsi index 244ef8d6cc..578376e014 100644 --- a/arch/arm/dts/imx8mm-venice-gw73xx.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw73xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi index e68030e7b2..32b2be418d 100644 --- a/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7901.dts b/arch/arm/dts/imx8mm-venice-gw7901.dts index 826627bd45..7d9c8a2863 100644 --- a/arch/arm/dts/imx8mm-venice-gw7901.dts +++ b/arch/arm/dts/imx8mm-venice-gw7901.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2020 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi index 91b33a9e24..1649f501c9 100644 --- a/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7902.dts b/arch/arm/dts/imx8mm-venice-gw7902.dts index 11481e09c7..fb3faf2590 100644 --- a/arch/arm/dts/imx8mm-venice-gw7902.dts +++ b/arch/arm/dts/imx8mm-venice-gw7902.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi index 9590d0924b..db9b374b0b 100644 --- a/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7903.dts b/arch/arm/dts/imx8mm-venice-gw7903.dts index 1ec91c5c6a..a38377900e 100644 --- a/arch/arm/dts/imx8mm-venice-gw7903.dts +++ b/arch/arm/dts/imx8mm-venice-gw7903.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi index 4171c6be00..84e2cd1989 100644 --- a/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7904.dts b/arch/arm/dts/imx8mm-venice-gw7904.dts index 93c9651c31..1dc58d192f 100644 --- a/arch/arm/dts/imx8mm-venice-gw7904.dts +++ b/arch/arm/dts/imx8mm-venice-gw7904.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7905-0x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7905-0x-u-boot.dtsi index c259026d1a..0429fff252 100644 --- a/arch/arm/dts/imx8mm-venice-gw7905-0x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7905-0x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7905-0x.dts b/arch/arm/dts/imx8mm-venice-gw7905-0x.dts index 914753f062..9be443f7b1 100644 --- a/arch/arm/dts/imx8mm-venice-gw7905-0x.dts +++ b/arch/arm/dts/imx8mm-venice-gw7905-0x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-gw7905.dtsi b/arch/arm/dts/imx8mm-venice-gw7905.dtsi index 9646eb9e49..491b4af561 100644 --- a/arch/arm/dts/imx8mm-venice-gw7905.dtsi +++ b/arch/arm/dts/imx8mm-venice-gw7905.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi index 8337c4aea8..7acf5fa141 100644 --- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm-venice.dts b/arch/arm/dts/imx8mm-venice.dts index d0929908ce..63bbccfd56 100644 --- a/arch/arm/dts/imx8mm-venice.dts +++ b/arch/arm/dts/imx8mm-venice.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mm.dtsi b/arch/arm/dts/imx8mm.dtsi index afb90f59c8..bc8e3d3cf9 100644 --- a/arch/arm/dts/imx8mm.dtsi +++ b/arch/arm/dts/imx8mm.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index 4be0098b2c..88f04cbac7 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi index c11895d9d5..2784839968 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi index 19b0d89775..a81b41aae7 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi index fb86657f0f..5292b1d32a 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2.dts b/arch/arm/dts/imx8mn-bsh-smm-s2.dts index 33f98582ea..ca81a6842c 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2.dts +++ b/arch/arm/dts/imx8mn-bsh-smm-s2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi index f6f8313c56..53e28e2931 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts b/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts index fbbb336703..b5f6a605f8 100644 --- a/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts +++ b/arch/arm/dts/imx8mn-bsh-smm-s2pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2021 BSH Hausgeraete GmbH diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index c31f3dec3d..4aa9cae118 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/arch/arm/dts/imx8mn-ddr4-evk.dts b/arch/arm/dts/imx8mn-ddr4-evk.dts index d8ce217c60..9d93b07c21 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk.dts +++ b/arch/arm/dts/imx8mn-ddr4-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi index 056ab31045..5d637dd097 100644 --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mn-evk.dts b/arch/arm/dts/imx8mn-evk.dts index 4eb467df5b..52d3b93418 100644 --- a/arch/arm/dts/imx8mn-evk.dts +++ b/arch/arm/dts/imx8mn-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mn-evk.dtsi b/arch/arm/dts/imx8mn-evk.dtsi index 261c365400..6cb4c3cd9b 100644 --- a/arch/arm/dts/imx8mn-evk.dtsi +++ b/arch/arm/dts/imx8mn-evk.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mn-pinfunc.h b/arch/arm/dts/imx8mn-pinfunc.h index faf1e69e74..3448443f72 100644 --- a/arch/arm/dts/imx8mn-pinfunc.h +++ b/arch/arm/dts/imx8mn-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP */ diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 96b1a1bc80..eaec0bc482 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks */ diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi index e0caf3179e..16660d6f2e 100644 --- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. */ diff --git a/arch/arm/dts/imx8mn-var-som-symphony.dts b/arch/arm/dts/imx8mn-var-som-symphony.dts index 5c8e4e8175..2b2449240e 100644 --- a/arch/arm/dts/imx8mn-var-som-symphony.dts +++ b/arch/arm/dts/imx8mn-var-som-symphony.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019-2020 Variscite Ltd. * Copyright (C) 2020 Krzysztof Kozlowski <krzk(a)kernel.org> diff --git a/arch/arm/dts/imx8mn-var-som.dtsi b/arch/arm/dts/imx8mn-var-som.dtsi index 4eb578a03f..40d5bfbe49 100644 --- a/arch/arm/dts/imx8mn-var-som.dtsi +++ b/arch/arm/dts/imx8mn-var-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP * Copyright 2019-2020 Variscite Ltd. diff --git a/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi index 53a5ac0717..ac054a5f52 100644 --- a/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mn-venice-gw7902.dts b/arch/arm/dts/imx8mn-venice-gw7902.dts index 97582db71c..1d4f281faa 100644 --- a/arch/arm/dts/imx8mn-venice-gw7902.dts +++ b/arch/arm/dts/imx8mn-venice-gw7902.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index 4109d26874..845614f366 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mn-venice.dts b/arch/arm/dts/imx8mn-venice.dts index 9e31b37f24..3107acc212 100644 --- a/arch/arm/dts/imx8mn-venice.dts +++ b/arch/arm/dts/imx8mn-venice.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mn.dtsi b/arch/arm/dts/imx8mn.dtsi index cb2836bfbd..7300c8cde7 100644 --- a/arch/arm/dts/imx8mn.dtsi +++ b/arch/arm/dts/imx8mn.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi index 393fd8ec2e..a608720076 100644 --- a/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-beacon-kit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Logic PD, Inc DBA Beacon EmbeddedWorks */ diff --git a/arch/arm/dts/imx8mp-beacon-kit.dts b/arch/arm/dts/imx8mp-beacon-kit.dts index cdae45a48c..3ef6938b2c 100644 --- a/arch/arm/dts/imx8mp-beacon-kit.dts +++ b/arch/arm/dts/imx8mp-beacon-kit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Logic PD, Inc dba Beacon EmbeddedWorks */ diff --git a/arch/arm/dts/imx8mp-beacon-som.dtsi b/arch/arm/dts/imx8mp-beacon-som.dtsi index e5da908047..a8ff1e3d8a 100644 --- a/arch/arm/dts/imx8mp-beacon-som.dtsi +++ b/arch/arm/dts/imx8mp-beacon-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 LogicPD, Inc. dba Beacon EmbeddedWorks */ diff --git a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi index eafe9b9308..363ab1165f 100644 --- a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-data-modul-edm-sbc.dts b/arch/arm/dts/imx8mp-data-modul-edm-sbc.dts index 8066f7fb64..6914ef5fb2 100644 --- a/arch/arm/dts/imx8mp-data-modul-edm-sbc.dts +++ b/arch/arm/dts/imx8mp-data-modul-edm-sbc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-pdk-overlay-eth2xfast.dts b/arch/arm/dts/imx8mp-dhcom-pdk-overlay-eth2xfast.dts index 3b39777692..e29337c83e 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk-overlay-eth2xfast.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk-overlay-eth2xfast.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-pdk2-u-boot.dtsi index be2d4fb184..98b5cd2a3b 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-dhcom-pdk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-pdk2.dts b/arch/arm/dts/imx8mp-dhcom-pdk2.dts index 8f4eff37c4..ece65fd103 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk2.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> * diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts index f27e6429ab..cdaceb9324 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi index 040f333c52..ecb5cdea70 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3.dts b/arch/arm/dts/imx8mp-dhcom-pdk3.dts index 867d238f2b..187649cbc4 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> * diff --git a/arch/arm/dts/imx8mp-dhcom-som-overlay-eth1xfast.dts b/arch/arm/dts/imx8mp-dhcom-som-overlay-eth1xfast.dts index bb5a2b6817..0cd5a6ec4d 100644 --- a/arch/arm/dts/imx8mp-dhcom-som-overlay-eth1xfast.dts +++ b/arch/arm/dts/imx8mp-dhcom-som-overlay-eth1xfast.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-som-overlay-eth2xfast.dts b/arch/arm/dts/imx8mp-dhcom-som-overlay-eth2xfast.dts index 82dadcea96..26df5aa6d3 100644 --- a/arch/arm/dts/imx8mp-dhcom-som-overlay-eth2xfast.dts +++ b/arch/arm/dts/imx8mp-dhcom-som-overlay-eth2xfast.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts index 5d9a00c942..52134e84da 100644 --- a/arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi index b05be57e71..fe168698a9 100644 --- a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index 9ed62f1bb0..8e9a34d751 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/arch/arm/dts/imx8mp-evk.dts b/arch/arm/dts/imx8mp-evk.dts index 9f1469db55..414530b419 100644 --- a/arch/arm/dts/imx8mp-evk.dts +++ b/arch/arm/dts/imx8mp-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi index cf2a87a9b9..4e4636cec2 100644 --- a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * Copyright (c) 2020 Amarula Solutons(India) diff --git a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts index a02b31c42d..9ebdbc9efa 100644 --- a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts +++ b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 NXP * Copyright (c) 2019 Engicam srl diff --git a/arch/arm/dts/imx8mp-icore-mx8mp.dtsi b/arch/arm/dts/imx8mp-icore-mx8mp.dtsi index a6319824ea..d24a18d076 100644 --- a/arch/arm/dts/imx8mp-icore-mx8mp.dtsi +++ b/arch/arm/dts/imx8mp-icore-mx8mp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 NXP * Copyright (c) 2019 Engicam srl diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi index c398a743f7..00c66a47d3 100644 --- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mp-pinfunc.h b/arch/arm/dts/imx8mp-pinfunc.h index 0fef066471..df8a03010f 100644 --- a/arch/arm/dts/imx8mp-pinfunc.h +++ b/arch/arm/dts/imx8mp-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi index 22171bd344..59fd835b6b 100644 --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * Copyright 2022 Linaro diff --git a/arch/arm/dts/imx8mp-rsb3720-a1.dts b/arch/arm/dts/imx8mp-rsb3720-a1.dts index 2d8dc19647..e96d42ef8e 100644 --- a/arch/arm/dts/imx8mp-rsb3720-a1.dts +++ b/arch/arm/dts/imx8mp-rsb3720-a1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP * Copyright 2022 Linaro diff --git a/arch/arm/dts/imx8mp-venice-gw702x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw702x-u-boot.dtsi index b9e3db7de9..d9633f2db0 100644 --- a/arch/arm/dts/imx8mp-venice-gw702x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw702x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw702x.dtsi b/arch/arm/dts/imx8mp-venice-gw702x.dtsi index 560c68e4da..2ebb1af968 100644 --- a/arch/arm/dts/imx8mp-venice-gw702x.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw702x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi index 5c33f8c9cd..51d4858bec 100644 --- a/arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw71xx-2x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw71xx-2x.dts b/arch/arm/dts/imx8mp-venice-gw71xx-2x.dts index 53120fc9cd..75b7c936e4 100644 --- a/arch/arm/dts/imx8mp-venice-gw71xx-2x.dts +++ b/arch/arm/dts/imx8mp-venice-gw71xx-2x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw71xx.dtsi b/arch/arm/dts/imx8mp-venice-gw71xx.dtsi index 86999f52d4..afa9796198 100644 --- a/arch/arm/dts/imx8mp-venice-gw71xx.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw71xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi index 7f2609ab54..b798c37f51 100644 --- a/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw72xx-2x.dts b/arch/arm/dts/imx8mp-venice-gw72xx-2x.dts index 255e36f66b..833be19bd1 100644 --- a/arch/arm/dts/imx8mp-venice-gw72xx-2x.dts +++ b/arch/arm/dts/imx8mp-venice-gw72xx-2x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw72xx.dtsi b/arch/arm/dts/imx8mp-venice-gw72xx.dtsi index e05fdecdaf..42c05e90ba 100644 --- a/arch/arm/dts/imx8mp-venice-gw72xx.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw72xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi index 70433c0732..48c4205c5b 100644 --- a/arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw73xx-2x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw73xx-2x.dts b/arch/arm/dts/imx8mp-venice-gw73xx-2x.dts index 000fd15e0c..16ba9d4160 100644 --- a/arch/arm/dts/imx8mp-venice-gw73xx-2x.dts +++ b/arch/arm/dts/imx8mp-venice-gw73xx-2x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw73xx.dtsi b/arch/arm/dts/imx8mp-venice-gw73xx.dtsi index 1c05398c86..e24838b384 100644 --- a/arch/arm/dts/imx8mp-venice-gw73xx.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw73xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi index 240fbc1b56..d98f04dde5 100644 --- a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw74xx.dts b/arch/arm/dts/imx8mp-venice-gw74xx.dts index 7eb2853157..6f009b33dc 100644 --- a/arch/arm/dts/imx8mp-venice-gw74xx.dts +++ b/arch/arm/dts/imx8mp-venice-gw74xx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw7905-2x-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw7905-2x-u-boot.dtsi index 981841cee0..35d6bf9970 100644 --- a/arch/arm/dts/imx8mp-venice-gw7905-2x-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw7905-2x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw7905-2x.dts b/arch/arm/dts/imx8mp-venice-gw7905-2x.dts index 4a1bbbbe19..82ddac10e1 100644 --- a/arch/arm/dts/imx8mp-venice-gw7905-2x.dts +++ b/arch/arm/dts/imx8mp-venice-gw7905-2x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-gw7905.dtsi b/arch/arm/dts/imx8mp-venice-gw7905.dtsi index 0d40cb0f05..acf01c1192 100644 --- a/arch/arm/dts/imx8mp-venice-gw7905.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw7905.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2023 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-u-boot.dtsi index 07813d0306..16a4a48a07 100644 --- a/arch/arm/dts/imx8mp-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp-venice.dts b/arch/arm/dts/imx8mp-venice.dts index 372db26cc0..1263ce7d2a 100644 --- a/arch/arm/dts/imx8mp-venice.dts +++ b/arch/arm/dts/imx8mp-venice.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Gateworks Corporation */ diff --git a/arch/arm/dts/imx8mp.dtsi b/arch/arm/dts/imx8mp.dtsi index 428c60462e..be78b41f82 100644 --- a/arch/arm/dts/imx8mp.dtsi +++ b/arch/arm/dts/imx8mp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi index e23998f5ab..34d3de9e47 100644 --- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts b/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts index a91c136797..e1295e0e7f 100644 --- a/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts +++ b/arch/arm/dts/imx8mq-kontron-pitx-imx8m.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree File for the Kontron pitx-imx8m board. * diff --git a/arch/arm/dts/imx8mq-librem5-r3.dtsi b/arch/arm/dts/imx8mq-librem5-r3.dtsi index e4f8b47cce..b8ff2ee1dd 100644 --- a/arch/arm/dts/imx8mq-librem5-r3.dtsi +++ b/arch/arm/dts/imx8mq-librem5-r3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2021 Purism SPC <kernel(a)puri.sm> /dts-v1/; diff --git a/arch/arm/dts/imx8mq-librem5-r4.dts b/arch/arm/dts/imx8mq-librem5-r4.dts index 1056b7981b..317e75483d 100644 --- a/arch/arm/dts/imx8mq-librem5-r4.dts +++ b/arch/arm/dts/imx8mq-librem5-r4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2021 Purism SPC <kernel(a)puri.sm> /dts-v1/; diff --git a/arch/arm/dts/imx8mq-librem5.dtsi b/arch/arm/dts/imx8mq-librem5.dtsi index ae08556b2e..4a54c1de4a 100644 --- a/arch/arm/dts/imx8mq-librem5.dtsi +++ b/arch/arm/dts/imx8mq-librem5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2020 Purism SPC */ diff --git a/arch/arm/dts/imx8mq-mnt-reform2.dts b/arch/arm/dts/imx8mq-mnt-reform2.dts index 055031bba8..dca0c94577 100644 --- a/arch/arm/dts/imx8mq-mnt-reform2.dts +++ b/arch/arm/dts/imx8mq-mnt-reform2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019-2021 MNT Research GmbH diff --git a/arch/arm/dts/imx8mq-nitrogen-som.dtsi b/arch/arm/dts/imx8mq-nitrogen-som.dtsi index 395f77b5ac..fffd8ec568 100644 --- a/arch/arm/dts/imx8mq-nitrogen-som.dtsi +++ b/arch/arm/dts/imx8mq-nitrogen-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2018 Boundary Devices * Copyright 2021 Lucas Stach <dev(a)lynxeye.de> diff --git a/arch/arm/dts/imx8mq-pico-pi.dts b/arch/arm/dts/imx8mq-pico-pi.dts index 89cbec5c41..5631b1b003 100644 --- a/arch/arm/dts/imx8mq-pico-pi.dts +++ b/arch/arm/dts/imx8mq-pico-pi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Wandboard, Org. * Copyright 2017 NXP diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 90b2274754..fa03549663 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/dts/imx8mq.dtsi b/arch/arm/dts/imx8mq.dtsi index 19eaa52356..1a5138f690 100644 --- a/arch/arm/dts/imx8mq.dtsi +++ b/arch/arm/dts/imx8mq.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2017 NXP * Copyright (C) 2017-2018 Pengutronix, Lucas Stach <kernel(a)pengutronix.de> diff --git a/arch/arm/dts/imx8qm-cgtqmx8.dts b/arch/arm/dts/imx8qm-cgtqmx8.dts index 919d00644f..990d49f5d9 100644 --- a/arch/arm/dts/imx8qm-cgtqmx8.dts +++ b/arch/arm/dts/imx8qm-cgtqmx8.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720-a1.dts index 332d441c6d..201af1fe75 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi index d316e86951..fbb4cd70ff 100644 --- a/arch/arm/dts/imx8qm-u-boot.dtsi +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi b/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi index cba56188f8..24bf7a9bd9 100644 --- a/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi +++ b/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Siemens AG */ diff --git a/arch/arm/dts/imx8qxp-capricorn.dtsi b/arch/arm/dts/imx8qxp-capricorn.dtsi index db5653ea1f..aa746802b3 100644 --- a/arch/arm/dts/imx8qxp-capricorn.dtsi +++ b/arch/arm/dts/imx8qxp-capricorn.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * diff --git a/arch/arm/dts/imx8qxp-u-boot.dtsi b/arch/arm/dts/imx8qxp-u-boot.dtsi index 7622c40906..ef6542c0ee 100644 --- a/arch/arm/dts/imx8qxp-u-boot.dtsi +++ b/arch/arm/dts/imx8qxp-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/dts/imx8ulp-evk.dts b/arch/arm/dts/imx8ulp-evk.dts index f1c6d933a1..daeb66e9b7 100644 --- a/arch/arm/dts/imx8ulp-evk.dts +++ b/arch/arm/dts/imx8ulp-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 NXP */ diff --git a/arch/arm/dts/imx8ulp-pinfunc.h b/arch/arm/dts/imx8ulp-pinfunc.h index b204ac79b4..dac950752a 100644 --- a/arch/arm/dts/imx8ulp-pinfunc.h +++ b/arch/arm/dts/imx8ulp-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/dts/imx8ulp.dtsi b/arch/arm/dts/imx8ulp.dtsi index 06ce5f19aa..51c6324eea 100644 --- a/arch/arm/dts/imx8ulp.dtsi +++ b/arch/arm/dts/imx8ulp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 NXP */ diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi index 93b4d91e4c..cc4b1022b3 100644 --- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi +++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imx93-11x11-evk.dts b/arch/arm/dts/imx93-11x11-evk.dts index 4322cc3e11..b2fc299b94 100644 --- a/arch/arm/dts/imx93-11x11-evk.dts +++ b/arch/arm/dts/imx93-11x11-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imx93-pinfunc.h b/arch/arm/dts/imx93-pinfunc.h index 4298a145f8..afc1ce05e6 100644 --- a/arch/arm/dts/imx93-pinfunc.h +++ b/arch/arm/dts/imx93-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imx93.dtsi b/arch/arm/dts/imx93.dtsi index 90de635481..9531b07bd7 100644 --- a/arch/arm/dts/imx93.dtsi +++ b/arch/arm/dts/imx93.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 NXP */ diff --git a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi index 46928c07e9..64bc740edd 100644 --- a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1020-evk.dts b/arch/arm/dts/imxrt1020-evk.dts index d4d1de4ea8..c18a1a4c01 100644 --- a/arch/arm/dts/imxrt1020-evk.dts +++ b/arch/arm/dts/imxrt1020-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1020-pinfunc.h b/arch/arm/dts/imxrt1020-pinfunc.h index b3a833bde2..647a7842be 100644 --- a/arch/arm/dts/imxrt1020-pinfunc.h +++ b/arch/arm/dts/imxrt1020-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1020.dtsi b/arch/arm/dts/imxrt1020.dtsi index 13511ebb18..c753211e57 100644 --- a/arch/arm/dts/imxrt1020.dtsi +++ b/arch/arm/dts/imxrt1020.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi index a9095e736b..ea8334cf07 100644 --- a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1050-evk.dts b/arch/arm/dts/imxrt1050-evk.dts index 6a9c10decf..cb0d7deaad 100644 --- a/arch/arm/dts/imxrt1050-evk.dts +++ b/arch/arm/dts/imxrt1050-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1050-pinfunc.h b/arch/arm/dts/imxrt1050-pinfunc.h index 22c14a3262..922e80974b 100644 --- a/arch/arm/dts/imxrt1050-pinfunc.h +++ b/arch/arm/dts/imxrt1050-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1050.dtsi b/arch/arm/dts/imxrt1050.dtsi index 03e6a858a7..b0ec6c0c2f 100644 --- a/arch/arm/dts/imxrt1050.dtsi +++ b/arch/arm/dts/imxrt1050.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/dts/imxrt1170-evk-u-boot.dtsi b/arch/arm/dts/imxrt1170-evk-u-boot.dtsi index f923a14301..aff82399b2 100644 --- a/arch/arm/dts/imxrt1170-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1170-evk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/arch/arm/dts/imxrt1170-evk.dts b/arch/arm/dts/imxrt1170-evk.dts index c2fd0c0392..ceda45f163 100644 --- a/arch/arm/dts/imxrt1170-evk.dts +++ b/arch/arm/dts/imxrt1170-evk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/arch/arm/dts/imxrt1170-pinfunc.h b/arch/arm/dts/imxrt1170-pinfunc.h index fba5483a08..b343921fa2 100644 --- a/arch/arm/dts/imxrt1170-pinfunc.h +++ b/arch/arm/dts/imxrt1170-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/arch/arm/dts/imxrt1170.dtsi b/arch/arm/dts/imxrt1170.dtsi index 2de775f043..85df314522 100644 --- a/arch/arm/dts/imxrt1170.dtsi +++ b/arch/arm/dts/imxrt1170.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/arch/arm/dts/k3-am62-ddr.dtsi b/arch/arm/dts/k3-am62-ddr.dtsi index 0a8ced8f38..f54958c9f2 100644 --- a/arch/arm/dts/k3-am62-ddr.dtsi +++ b/arch/arm/dts/k3-am62-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm/dts/k3-am625-beagleplay-ddr4-1600MTs.dtsi b/arch/arm/dts/k3-am625-beagleplay-ddr4-1600MTs.dtsi index 3d7a41c27d..6129f9d46b 100644 --- a/arch/arm/dts/k3-am625-beagleplay-ddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am625-beagleplay-ddr4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * https://beagleboard.org/play * diff --git a/arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi b/arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi index 9bad4309b4..8d8fe40f76 100644 --- a/arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am625-verdin-lpddr4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file was generated with the * AM62x SysConfig DDR Subsystem Register Configuration Tool v0.09.08 diff --git a/arch/arm/dts/k3-am62a-ddr-1866mhz-32bit.dtsi b/arch/arm/dts/k3-am62a-ddr-1866mhz-32bit.dtsi index 9f50d7eae6..89bc48ae9e 100644 --- a/arch/arm/dts/k3-am62a-ddr-1866mhz-32bit.dtsi +++ b/arch/arm/dts/k3-am62a-ddr-1866mhz-32bit.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file was generated with the * AM62A SysConfig DDR Subsystem Register Configuration Tool v0.09.01 diff --git a/arch/arm/dts/k3-am62a-ddr.dtsi b/arch/arm/dts/k3-am62a-ddr.dtsi index 8629ea45b8..1449e76cb8 100644 --- a/arch/arm/dts/k3-am62a-ddr.dtsi +++ b/arch/arm/dts/k3-am62a-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm/dts/k3-am62x-sk-ddr4-1600MTs.dtsi b/arch/arm/dts/k3-am62x-sk-ddr4-1600MTs.dtsi index d92e3ce048..6bdeec2725 100644 --- a/arch/arm/dts/k3-am62x-sk-ddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am62x-sk-ddr4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file was generated with the * AM62x SysConfig DDR Subsystem Register Configuration Tool v0.08.60 diff --git a/arch/arm/dts/k3-am64-ddr.dtsi b/arch/arm/dts/k3-am64-ddr.dtsi index bd95a7866d..6a90a9f900 100644 --- a/arch/arm/dts/k3-am64-ddr.dtsi +++ b/arch/arm/dts/k3-am64-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi b/arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi index 491412119b..8aba46f9a7 100644 --- a/arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am64-evm-ddr4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file was generated with the * AM64x SysConfig DDR Subsystem Register Configuration Tool v0.08.40 diff --git a/arch/arm/dts/k3-am64-sk-lp4-1600MTs.dtsi b/arch/arm/dts/k3-am64-sk-lp4-1600MTs.dtsi index f225c1f067..0841ac275b 100644 --- a/arch/arm/dts/k3-am64-sk-lp4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am64-sk-lp4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file was generated with the * AM64x SysConfig DDR Subsystem Register Configuration Tool v0.08.40 diff --git a/arch/arm/dts/k3-am64x-binman.dtsi b/arch/arm/dts/k3-am64x-binman.dtsi index a5e54006b4..d6d12a674c 100644 --- a/arch/arm/dts/k3-am64x-binman.dtsi +++ b/arch/arm/dts/k3-am64x-binman.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ #include "k3-binman.dtsi" diff --git a/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi b/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi index 5638321903..dd9ffda095 100644 --- a/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi +++ b/arch/arm/dts/k3-am654-base-board-ddr4-1600MTs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ * This file was generated by AM65x_DRA80xM_EMIF_Tool_2.02.xlsm diff --git a/arch/arm/dts/k3-am654-ddr.dtsi b/arch/arm/dts/k3-am654-ddr.dtsi index 48698cdddc..7793f6301a 100644 --- a/arch/arm/dts/k3-am654-ddr.dtsi +++ b/arch/arm/dts/k3-am654-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/k3-j7200-ddr-evm-lp4-2666.dtsi b/arch/arm/dts/k3-j7200-ddr-evm-lp4-2666.dtsi index 9ec8dff44b..268ada0941 100644 --- a/arch/arm/dts/k3-j7200-ddr-evm-lp4-2666.dtsi +++ b/arch/arm/dts/k3-j7200-ddr-evm-lp4-2666.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * This file was generated by the Jacinto7_DDRSS_RegConfigTool, Revision: 0.6.0 diff --git a/arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi b/arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi index 5a6f9b11b8..0457e3a569 100644 --- a/arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi +++ b/arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * This file was generated by the Jacinto7_DDRSS_RegConfigTool, Revision: 0.9.1 diff --git a/arch/arm/dts/k3-j721e-ddr-sk-lp4-4266.dtsi b/arch/arm/dts/k3-j721e-ddr-sk-lp4-4266.dtsi index 6c7328e8db..4f261aa3f9 100644 --- a/arch/arm/dts/k3-j721e-ddr-sk-lp4-4266.dtsi +++ b/arch/arm/dts/k3-j721e-ddr-sk-lp4-4266.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * This file was generated by the Jacinto7_DDRSS_RegConfigTool, Revision: 0.6.1 diff --git a/arch/arm/dts/k3-j721e-ddr.dtsi b/arch/arm/dts/k3-j721e-ddr.dtsi index 3a9ea42fe5..823a9e20e1 100644 --- a/arch/arm/dts/k3-j721e-ddr.dtsi +++ b/arch/arm/dts/k3-j721e-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi b/arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi index c91576bf09..71cbb7591c 100644 --- a/arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi +++ b/arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/ * This file was generated by the Jacinto7_DDRSS_RegConfigTool, Revision: 0.7.0 diff --git a/arch/arm/dts/k3-j721s2-ddr.dtsi b/arch/arm/dts/k3-j721s2-ddr.dtsi index 345e2b84f9..e2ef03dbe8 100644 --- a/arch/arm/dts/k3-j721s2-ddr.dtsi +++ b/arch/arm/dts/k3-j721s2-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi index 970d452f08..ab8621fa13 100644 --- a/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi index 05653afc7e..908265b928 100644 --- a/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi b/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi index 8e4b36c2de..43936d8297 100644 --- a/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2g-generic.dts b/arch/arm/dts/keystone-k2g-generic.dts index fc938a4baa..17353b5282 100644 --- a/arch/arm/dts/keystone-k2g-generic.dts +++ b/arch/arm/dts/keystone-k2g-generic.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree Source for Generic 66AK2G0X EVM * diff --git a/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi b/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi index 8e4b36c2de..43936d8297 100644 --- a/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi index 22df84ba93..74fea6548e 100644 --- a/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/keystone-k2l-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2l-evm-u-boot.dtsi index 0a507d0210..ed595006f8 100644 --- a/arch/arm/dts/keystone-k2l-evm-u-boot.dtsi +++ b/arch/arm/dts/keystone-k2l-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/arch/arm/dts/kirkwood-blackarmor-nas220.dts b/arch/arm/dts/kirkwood-blackarmor-nas220.dts index 07fbfca444..d687e44dac 100644 --- a/arch/arm/dts/kirkwood-blackarmor-nas220.dts +++ b/arch/arm/dts/kirkwood-blackarmor-nas220.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree file for Seagate Blackarmor NAS220 * diff --git a/arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi b/arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi index 7fc2d7d3b4..7299647660 100644 --- a/arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi +++ b/arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &eth0 { status = "disabled"; diff --git a/arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi b/arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi index 7fc2d7d3b4..7299647660 100644 --- a/arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi +++ b/arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later &eth0 { status = "disabled"; diff --git a/arch/arm/dts/kirkwood-nsa325.dts b/arch/arm/dts/kirkwood-nsa325.dts index efc57cfa41..d81c68e91b 100644 --- a/arch/arm/dts/kirkwood-nsa325.dts +++ b/arch/arm/dts/kirkwood-nsa325.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Device tree file for the Zyxel NSA 325 NAS box. * * Copyright (c) 2015, Hans Ulli Kroll <ulli.kroll(a)googlemail.com> diff --git a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi index 26a6e6b38c..74048fd749 100644 --- a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi +++ b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> */ diff --git a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi index 6f11852a33..dd07953515 100644 --- a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi index 6f11852a33..dd07953515 100644 --- a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi index 4744872f7c..88d73d4a86 100644 --- a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi index 2c34344504..332349338f 100644 --- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Logic PD - http://www.logicpd.com diff --git a/arch/arm/dts/lpc3250-ea3250-u-boot.dtsi b/arch/arm/dts/lpc3250-ea3250-u-boot.dtsi index 0c82e512c6..e101463285 100644 --- a/arch/arm/dts/lpc3250-ea3250-u-boot.dtsi +++ b/arch/arm/dts/lpc3250-ea3250-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Trevor Woerner <twoerner(a)gmail.com> */ diff --git a/arch/arm/dts/lpc32xx.dtsi b/arch/arm/dts/lpc32xx.dtsi index c87066d6c9..ca3a80a3cc 100644 --- a/arch/arm/dts/lpc32xx.dtsi +++ b/arch/arm/dts/lpc32xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NXP LPC32xx SoC * diff --git a/arch/arm/dts/ls1021a-iot-duart.dts b/arch/arm/dts/ls1021a-iot-duart.dts index d144c05af1..d3e79709d7 100644 --- a/arch/arm/dts/ls1021a-iot-duart.dts +++ b/arch/arm/dts/ls1021a-iot-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a IOT board device tree source * diff --git a/arch/arm/dts/ls1021a-iot.dtsi b/arch/arm/dts/ls1021a-iot.dtsi index 44dd9b61d3..51af6586ec 100644 --- a/arch/arm/dts/ls1021a-iot.dtsi +++ b/arch/arm/dts/ls1021a-iot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a IOT board device tree source * diff --git a/arch/arm/dts/ls1021a-pg-wcom-expu1.dts b/arch/arm/dts/ls1021a-pg-wcom-expu1.dts index ec8e7dee27..293ef48d98 100644 --- a/arch/arm/dts/ls1021a-pg-wcom-expu1.dts +++ b/arch/arm/dts/ls1021a-pg-wcom-expu1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi ABB Power Grids EXPU1 board device tree source * diff --git a/arch/arm/dts/ls1021a-pg-wcom-seli8.dts b/arch/arm/dts/ls1021a-pg-wcom-seli8.dts index 03ce3ab4e4..c97c840406 100644 --- a/arch/arm/dts/ls1021a-pg-wcom-seli8.dts +++ b/arch/arm/dts/ls1021a-pg-wcom-seli8.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013-2015 Freescale Semiconductor, Inc. * Copyright 2020 Hitachi Power Grids. All rights reserved. diff --git a/arch/arm/dts/ls1021a-qds-duart.dts b/arch/arm/dts/ls1021a-qds-duart.dts index 9fabf27f8c..c06f4485a4 100644 --- a/arch/arm/dts/ls1021a-qds-duart.dts +++ b/arch/arm/dts/ls1021a-qds-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a QDS board common device tree source * diff --git a/arch/arm/dts/ls1021a-qds-lpuart.dts b/arch/arm/dts/ls1021a-qds-lpuart.dts index 405e915d70..f6c52a2fcc 100644 --- a/arch/arm/dts/ls1021a-qds-lpuart.dts +++ b/arch/arm/dts/ls1021a-qds-lpuart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a QDS board common device tree source * diff --git a/arch/arm/dts/ls1021a-qds.dtsi b/arch/arm/dts/ls1021a-qds.dtsi index b12102abfa..b56e82fcbd 100644 --- a/arch/arm/dts/ls1021a-qds.dtsi +++ b/arch/arm/dts/ls1021a-qds.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a QDS board common device tree source * diff --git a/arch/arm/dts/ls1021a-twr-duart.dts b/arch/arm/dts/ls1021a-twr-duart.dts index e58fbfbc2a..4fb4ebfdb7 100644 --- a/arch/arm/dts/ls1021a-twr-duart.dts +++ b/arch/arm/dts/ls1021a-twr-duart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a TWR board device tree source * diff --git a/arch/arm/dts/ls1021a-twr-lpuart.dts b/arch/arm/dts/ls1021a-twr-lpuart.dts index eb97611e99..a4b7a4f7cb 100644 --- a/arch/arm/dts/ls1021a-twr-lpuart.dts +++ b/arch/arm/dts/ls1021a-twr-lpuart.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a TWR board device tree source * diff --git a/arch/arm/dts/ls1021a-twr.dtsi b/arch/arm/dts/ls1021a-twr.dtsi index 82df2f11bb..0e769dbda0 100644 --- a/arch/arm/dts/ls1021a-twr.dtsi +++ b/arch/arm/dts/ls1021a-twr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a TWR board common device tree source * diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi index 4f65ee765e..befedc023f 100644 --- a/arch/arm/dts/ls1021a.dtsi +++ b/arch/arm/dts/ls1021a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale ls1021a SOC common device tree source * diff --git a/arch/arm/dts/meson-a1-ad401.dts b/arch/arm/dts/meson-a1-ad401.dts index 69c25c68c3..be5f0f2117 100644 --- a/arch/arm/dts/meson-a1-ad401.dts +++ b/arch/arm/dts/meson-a1-ad401.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-a1.dtsi b/arch/arm/dts/meson-a1.dtsi index e3a42c5b24..82de01bf9a 100644 --- a/arch/arm/dts/meson-a1.dtsi +++ b/arch/arm/dts/meson-a1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi b/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi index 3ecb233f8e..8d407082c6 100644 --- a/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi +++ b/arch/arm/dts/meson-axg-jethome-jethub-j100-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Vyacheslav Bocharov <adeep(a)lexina.in> * Author: Vyacheslav Bocharov <adeep(a)lexina.in> diff --git a/arch/arm/dts/meson-axg-jethome-jethub-j100.dts b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts index 5783732dc6..080d332a97 100644 --- a/arch/arm/dts/meson-axg-jethome-jethub-j100.dts +++ b/arch/arm/dts/meson-axg-jethome-jethub-j100.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Vyacheslav Bocharov <adeep(a)lexina.in> * Copyright (c) 2020 JetHome diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi index 334650d610..6061f63736 100644 --- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi +++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts index 359589d1df..034211cc09 100644 --- a/arch/arm/dts/meson-axg-s400.dts +++ b/arch/arm/dts/meson-axg-s400.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi index 3f5254eeb4..edfe36bbb7 100644 --- a/arch/arm/dts/meson-axg.dtsi +++ b/arch/arm/dts/meson-axg.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi index 8070b62af5..3e5a1eead3 100644 --- a/arch/arm/dts/meson-g12-common-u-boot.dtsi +++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Maxime Jourdan <mjourdan(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12-common.dtsi b/arch/arm/dts/meson-g12-common.dtsi index 9dbd50820b..b503ee1c0f 100644 --- a/arch/arm/dts/meson-g12-common.dtsi +++ b/arch/arm/dts/meson-g12-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12.dtsi b/arch/arm/dts/meson-g12.dtsi index 6a1f4dcf64..59ab49577a 100644 --- a/arch/arm/dts/meson-g12.dtsi +++ b/arch/arm/dts/meson-g12.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Jerome Brunet <jbrunet(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi b/arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi +++ b/arch/arm/dts/meson-g12a-radxa-zero-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12a-radxa-zero.dts b/arch/arm/dts/meson-g12a-radxa-zero.dts index e3bb6df42f..aca2f87d36 100644 --- a/arch/arm/dts/meson-g12a-radxa-zero.dts +++ b/arch/arm/dts/meson-g12a-radxa-zero.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 BayLibre SAS. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi +++ b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12a-sei510.dts b/arch/arm/dts/meson-g12a-sei510.dts index 81269ccc24..c6dde387d6 100644 --- a/arch/arm/dts/meson-g12a-sei510.dts +++ b/arch/arm/dts/meson-g12a-sei510.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre SAS. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi +++ b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12a-u200.dts b/arch/arm/dts/meson-g12a-u200.dts index a26bfe7255..5b3a65ad95 100644 --- a/arch/arm/dts/meson-g12a-u200.dts +++ b/arch/arm/dts/meson-g12a-u200.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12a.dtsi b/arch/arm/dts/meson-g12a.dtsi index 7677764eee..0bef217c08 100644 --- a/arch/arm/dts/meson-g12a.dtsi +++ b/arch/arm/dts/meson-g12a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Amlogic, Inc. All rights reserved. */ diff --git a/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts index 31365316b2..9c61e1147d 100644 --- a/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts +++ b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Christian Hewitt <christianshewitt(a)gmail.com> */ diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi index b0909cf25f..cdc793b7ab 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts b/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts index 124a809010..aa0127b346 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-a311d.dtsi b/arch/arm/dts/meson-g12b-a311d.dtsi index d61f43052a..82f8e3b9ce 100644 --- a/arch/arm/dts/meson-g12b-a311d.dtsi +++ b/arch/arm/dts/meson-g12b-a311d.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi index a60ba27806..52183c8a5c 100644 --- a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts index 1b0c3881c6..10a7f4e87e 100644 --- a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts +++ b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi b/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi index 97e522921b..e95bc0e493 100644 --- a/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi +++ b/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-bananapi.dtsi b/arch/arm/dts/meson-g12b-bananapi.dtsi index 83709787eb..82c94e2522 100644 --- a/arch/arm/dts/meson-g12b-bananapi.dtsi +++ b/arch/arm/dts/meson-g12b-bananapi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi b/arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-gsking-x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gsking-x.dts b/arch/arm/dts/meson-g12b-gsking-x.dts index 6c7bfacbad..e4043ef1d5 100644 --- a/arch/arm/dts/meson-g12b-gsking-x.dts +++ b/arch/arm/dts/meson-g12b-gsking-x.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi b/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gtking-pro.dts b/arch/arm/dts/meson-g12b-gtking-pro.dts index 707daf9278..1b3f2f4258 100644 --- a/arch/arm/dts/meson-g12b-gtking-pro.dts +++ b/arch/arm/dts/meson-g12b-gtking-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi b/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-gtking.dts b/arch/arm/dts/meson-g12b-gtking.dts index 5d96c14490..670c8b4f9a 100644 --- a/arch/arm/dts/meson-g12b-gtking.dts +++ b/arch/arm/dts/meson-g12b-gtking.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-khadas-vim3.dtsi b/arch/arm/dts/meson-g12b-khadas-vim3.dtsi index f42cf4b8af..30d83202c7 100644 --- a/arch/arm/dts/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm/dts/meson-g12b-khadas-vim3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi index 1c0f9765eb..c99f8b7b68 100644 --- a/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/arch/arm/dts/meson-g12b-odroid-go-ultra.dts b/arch/arm/dts/meson-g12b-odroid-go-ultra.dts index 1e40709610..5edfe3ab49 100644 --- a/arch/arm/dts/meson-g12b-odroid-go-ultra.dts +++ b/arch/arm/dts/meson-g12b-odroid-go-ultra.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/arch/arm/dts/meson-g12b-odroid-n2-plus.dts b/arch/arm/dts/meson-g12b-odroid-n2-plus.dts index ce1198ad34..fba867f09e 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2-plus.dts +++ b/arch/arm/dts/meson-g12b-odroid-n2-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi index a92f9e9ff1..61ce65ca33 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-n2.dts b/arch/arm/dts/meson-g12b-odroid-n2.dts index a198a91259..f026951b12 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2.dts +++ b/arch/arm/dts/meson-g12b-odroid-n2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-n2.dtsi b/arch/arm/dts/meson-g12b-odroid-n2.dtsi index 24d0442dff..b281ac1807 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-n2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-odroid-n2l.dts b/arch/arm/dts/meson-g12b-odroid-n2l.dts index 70919f40d5..ffaaee3ee8 100644 --- a/arch/arm/dts/meson-g12b-odroid-n2l.dts +++ b/arch/arm/dts/meson-g12b-odroid-n2l.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Dongjin Kim <tobetter(a)gmail.com> */ diff --git a/arch/arm/dts/meson-g12b-odroid.dtsi b/arch/arm/dts/meson-g12b-odroid.dtsi index 9e12a34b28..946990a409 100644 --- a/arch/arm/dts/meson-g12b-odroid.dtsi +++ b/arch/arm/dts/meson-g12b-odroid.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi index 236f2468dc..6d032d4a82 100644 --- a/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-radxa-zero2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-radxa-zero2.dts b/arch/arm/dts/meson-g12b-radxa-zero2.dts index 890f5bfebb..05e65ba9cb 100644 --- a/arch/arm/dts/meson-g12b-radxa-zero2.dts +++ b/arch/arm/dts/meson-g12b-radxa-zero2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts index 7f66f263a2..27d5af1afc 100644 --- a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts +++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Christian Hewitt <christianshewitt(a)gmail.com> */ diff --git a/arch/arm/dts/meson-g12b-s922x.dtsi b/arch/arm/dts/meson-g12b-s922x.dtsi index 1e5d0ee5d5..02f6a5a735 100644 --- a/arch/arm/dts/meson-g12b-s922x.dtsi +++ b/arch/arm/dts/meson-g12b-s922x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b-w400.dtsi b/arch/arm/dts/meson-g12b-w400.dtsi index feb0885047..ab65c4f6d6 100644 --- a/arch/arm/dts/meson-g12b-w400.dtsi +++ b/arch/arm/dts/meson-g12b-w400.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-g12b.dtsi b/arch/arm/dts/meson-g12b.dtsi index 75ff00fb2e..15e89f0361 100644 --- a/arch/arm/dts/meson-g12b.dtsi +++ b/arch/arm/dts/meson-g12b.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gx-mali450.dtsi b/arch/arm/dts/meson-gx-mali450.dtsi index f9771b51c8..9020de1fdf 100644 --- a/arch/arm/dts/meson-gx-mali450.dtsi +++ b/arch/arm/dts/meson-gx-mali450.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gx-p23x-q20x.dtsi b/arch/arm/dts/meson-gx-p23x-q20x.dtsi index dafc841f7c..501a1e102b 100644 --- a/arch/arm/dts/meson-gx-p23x-q20x.dtsi +++ b/arch/arm/dts/meson-gx-p23x-q20x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-gx-u-boot.dtsi b/arch/arm/dts/meson-gx-u-boot.dtsi index 9e0620f395..d51227398c 100644 --- a/arch/arm/dts/meson-gx-u-boot.dtsi +++ b/arch/arm/dts/meson-gx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Maxime Jourdan <mjourdan(a)baylibre.com> diff --git a/arch/arm/dts/meson-gx.dtsi b/arch/arm/dts/meson-gx.dtsi index 6b457b2c30..b1470415af 100644 --- a/arch/arm/dts/meson-gx.dtsi +++ b/arch/arm/dts/meson-gx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * diff --git a/arch/arm/dts/meson-gxbb-kii-pro-u-boot.dtsi b/arch/arm/dts/meson-gxbb-kii-pro-u-boot.dtsi index 191c5192c6..5e1d48eabc 100644 --- a/arch/arm/dts/meson-gxbb-kii-pro-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-kii-pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-kii-pro.dts b/arch/arm/dts/meson-gxbb-kii-pro.dts index e238f1f101..9121b9e66b 100644 --- a/arch/arm/dts/meson-gxbb-kii-pro.dts +++ b/arch/arm/dts/meson-gxbb-kii-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Mohammad Rasim <mohammad.rasim96(a)gmail.com> */ diff --git a/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi index 2a245bbe7f..21466a9e08 100644 --- a/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-nanopi-k2.dts b/arch/arm/dts/meson-gxbb-nanopi-k2.dts index 7273eed529..b79377245b 100644 --- a/arch/arm/dts/meson-gxbb-nanopi-k2.dts +++ b/arch/arm/dts/meson-gxbb-nanopi-k2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Andreas Färber */ diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi index 5a2be8171e..a864e2b472 100644 --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-odroidc2.dts b/arch/arm/dts/meson-gxbb-odroidc2.dts index 201596247f..15971ab112 100644 --- a/arch/arm/dts/meson-gxbb-odroidc2.dts +++ b/arch/arm/dts/meson-gxbb-odroidc2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * Copyright (c) 2016 BayLibre, Inc. diff --git a/arch/arm/dts/meson-gxbb-p200-u-boot.dtsi b/arch/arm/dts/meson-gxbb-p200-u-boot.dtsi index c35158d7e9..06ab0e47c2 100644 --- a/arch/arm/dts/meson-gxbb-p200-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-p200-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-p200.dts b/arch/arm/dts/meson-gxbb-p200.dts index 3c93d1898b..ba4efef336 100644 --- a/arch/arm/dts/meson-gxbb-p200.dts +++ b/arch/arm/dts/meson-gxbb-p200.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * Copyright (c) 2016 BayLibre, Inc. diff --git a/arch/arm/dts/meson-gxbb-p201-u-boot.dtsi b/arch/arm/dts/meson-gxbb-p201-u-boot.dtsi index c35158d7e9..06ab0e47c2 100644 --- a/arch/arm/dts/meson-gxbb-p201-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-p201-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-p201.dts b/arch/arm/dts/meson-gxbb-p201.dts index 150a82f3b2..cfe2a908c1 100644 --- a/arch/arm/dts/meson-gxbb-p201.dts +++ b/arch/arm/dts/meson-gxbb-p201.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * Copyright (c) 2016 BayLibre, Inc. diff --git a/arch/arm/dts/meson-gxbb-p20x.dtsi b/arch/arm/dts/meson-gxbb-p20x.dtsi index e803a466fe..86bff57411 100644 --- a/arch/arm/dts/meson-gxbb-p20x.dtsi +++ b/arch/arm/dts/meson-gxbb-p20x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * Copyright (c) 2016 BayLibre, Inc. diff --git a/arch/arm/dts/meson-gxbb-wetek-hub.dts b/arch/arm/dts/meson-gxbb-wetek-hub.dts index 58733017ed..b5318c4d0d 100644 --- a/arch/arm/dts/meson-gxbb-wetek-hub.dts +++ b/arch/arm/dts/meson-gxbb-wetek-hub.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 BayLibre, Inc. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-wetek-play2.dts b/arch/arm/dts/meson-gxbb-wetek-play2.dts index 505ffcd8eb..9a2823f5a6 100644 --- a/arch/arm/dts/meson-gxbb-wetek-play2.dts +++ b/arch/arm/dts/meson-gxbb-wetek-play2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 BayLibre, Inc. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi index 3743053eb9..03a5860e86 100644 --- a/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxbb-wetek.dtsi b/arch/arm/dts/meson-gxbb-wetek.dtsi index 94dafb9553..f72718c60d 100644 --- a/arch/arm/dts/meson-gxbb-wetek.dtsi +++ b/arch/arm/dts/meson-gxbb-wetek.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber * Copyright (c) 2016 BayLibre, Inc. diff --git a/arch/arm/dts/meson-gxbb.dtsi b/arch/arm/dts/meson-gxbb.dtsi index 7c029f552a..a80fdbcb61 100644 --- a/arch/arm/dts/meson-gxbb.dtsi +++ b/arch/arm/dts/meson-gxbb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/meson-gxl-mali.dtsi b/arch/arm/dts/meson-gxl-mali.dtsi index 478e755cc8..eb42fb02e5 100644 --- a/arch/arm/dts/meson-gxl-mali.dtsi +++ b/arch/arm/dts/meson-gxl-mali.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s805x-libretech-ac-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s805x-libretech-ac.dts b/arch/arm/dts/meson-gxl-s805x-libretech-ac.dts index 2d769203f6..f244143dfe 100644 --- a/arch/arm/dts/meson-gxl-s805x-libretech-ac.dts +++ b/arch/arm/dts/meson-gxl-s805x-libretech-ac.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s805x.dtsi b/arch/arm/dts/meson-gxl-s805x.dtsi index 2997584982..1de660f82d 100644 --- a/arch/arm/dts/meson-gxl-s805x.dtsi +++ b/arch/arm/dts/meson-gxl-s805x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905d.dtsi b/arch/arm/dts/meson-gxl-s905d.dtsi index 4332191954..9ce7648388 100644 --- a/arch/arm/dts/meson-gxl-s905d.dtsi +++ b/arch/arm/dts/meson-gxl-s905d.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts index 6eafb90869..92bc9f0f4a 100644 --- a/arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts +++ b/arch/arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Vyacheslav Bocharov <adeep(a)lexina.in> * Copyright (c) 2020 JetHome diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi index 6109088afa..29b748229d 100644 --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts b/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts index 60feac0179..02cd255136 100644 --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl(a)googlemail.com>. */ diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-libretech-cc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2-u-boot.dtsi index 8ff5a0ef2b..70c75f1019 100644 --- a/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS. * Author: Jerome Brunet <jbrunet(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts index 93d8f8aff7..0a2c075f98 100644 --- a/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts +++ b/arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS. * Author: Jerome Brunet <jbrunet(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts b/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts index 82bfabfbd3..d1aea1217c 100644 --- a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-p212-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl-s905x-p212.dts b/arch/arm/dts/meson-gxl-s905x-p212.dts index 2602940c20..86a8a3b705 100644 --- a/arch/arm/dts/meson-gxl-s905x-p212.dts +++ b/arch/arm/dts/meson-gxl-s905x-p212.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-gxl-s905x-p212.dtsi b/arch/arm/dts/meson-gxl-s905x-p212.dtsi index 05cb2f5e5c..2292c99052 100644 --- a/arch/arm/dts/meson-gxl-s905x-p212.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-p212.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Martin Blumenstingl <martin.blumenstingl(a)googlemail.com>. * Based on meson-gx-p23x-q20x.dtsi: diff --git a/arch/arm/dts/meson-gxl-s905x.dtsi b/arch/arm/dts/meson-gxl-s905x.dtsi index 40c19f69e9..c9d6fb2437 100644 --- a/arch/arm/dts/meson-gxl-s905x.dtsi +++ b/arch/arm/dts/meson-gxl-s905x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-gxl-u-boot.dtsi b/arch/arm/dts/meson-gxl-u-boot.dtsi index c35158d7e9..06ab0e47c2 100644 --- a/arch/arm/dts/meson-gxl-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxl.dtsi b/arch/arm/dts/meson-gxl.dtsi index c3ac531c4f..46d4a79dc2 100644 --- a/arch/arm/dts/meson-gxl.dtsi +++ b/arch/arm/dts/meson-gxl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi b/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxm-gt1-ultimate.dts b/arch/arm/dts/meson-gxm-gt1-ultimate.dts index 2c267884cc..c2c7314e49 100644 --- a/arch/arm/dts/meson-gxm-gt1-ultimate.dts +++ b/arch/arm/dts/meson-gxm-gt1-ultimate.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) Christian Hewitt <christianshewitt(a)gmail.com> */ diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi index e906bcaa78..c254cfe569 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxm-khadas-vim2.dts b/arch/arm/dts/meson-gxm-khadas-vim2.dts index 18a4b7a6c5..105ab7b9f8 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2.dts +++ b/arch/arm/dts/meson-gxm-khadas-vim2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl(a)googlemail.com>. * Copyright (c) 2017 BayLibre, SAS diff --git a/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi b/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxm-wetek-core2-u-boot.dtsi b/arch/arm/dts/meson-gxm-wetek-core2-u-boot.dtsi index 39270ea71c..9e563571f9 100644 --- a/arch/arm/dts/meson-gxm-wetek-core2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-wetek-core2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-gxm-wetek-core2.dts b/arch/arm/dts/meson-gxm-wetek-core2.dts index 1e7f77f9b5..53caf21a0c 100644 --- a/arch/arm/dts/meson-gxm-wetek-core2.dts +++ b/arch/arm/dts/meson-gxm-wetek-core2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Christian Hewitt <christianshewitt(a)gmail.com> */ diff --git a/arch/arm/dts/meson-gxm.dtsi b/arch/arm/dts/meson-gxm.dtsi index 411cc312fc..37f3185ce6 100644 --- a/arch/arm/dts/meson-gxm.dtsi +++ b/arch/arm/dts/meson-gxm.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Endless Computers, Inc. * Author: Carlo Caione <carlo(a)endlessm.com> diff --git a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi index 24dbf8ca2c..a1fe4201ef 100644 --- a/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-khadas-vim3-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-khadas-vim3.dtsi b/arch/arm/dts/meson-khadas-vim3.dtsi index 3cf4ecb6d5..f8853957b7 100644 --- a/arch/arm/dts/meson-khadas-vim3.dtsi +++ b/arch/arm/dts/meson-khadas-vim3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi index 4a1aeda565..9130300c61 100644 --- a/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts index 586034316e..d8785a0908 100644 --- a/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts +++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi b/arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi index a86fdb5668..5fb799f807 100644 --- a/arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-bananapi-m5-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-bananapi-m5.dts b/arch/arm/dts/meson-sm1-bananapi-m5.dts index f045bf8516..cf45bd39c1 100644 --- a/arch/arm/dts/meson-sm1-bananapi-m5.dts +++ b/arch/arm/dts/meson-sm1-bananapi-m5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-bananapi.dtsi b/arch/arm/dts/meson-sm1-bananapi.dtsi index 17045ff81c..dfec6006f4 100644 --- a/arch/arm/dts/meson-sm1-bananapi.dtsi +++ b/arch/arm/dts/meson-sm1-bananapi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi index 4b8ea3d21a..5b8d3002ea 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l.dts b/arch/arm/dts/meson-sm1-khadas-vim3l.dts index f2c0981435..5c73eea515 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l.dts +++ b/arch/arm/dts/meson-sm1-khadas-vim3l.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi index 963bf96b25..d2ac489274 100644 --- a/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-odroid-c4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-odroid-c4.dts b/arch/arm/dts/meson-sm1-odroid-c4.dts index 8c30ce6368..0819134ccf 100644 --- a/arch/arm/dts/meson-sm1-odroid-c4.dts +++ b/arch/arm/dts/meson-sm1-odroid-c4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Dongjin Kim <tobetter(a)gmail.com> */ diff --git a/arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi b/arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi index 963bf96b25..d2ac489274 100644 --- a/arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-odroid-hc4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-odroid-hc4.dts b/arch/arm/dts/meson-sm1-odroid-hc4.dts index f3f953225b..4c57e4c481 100644 --- a/arch/arm/dts/meson-sm1-odroid-hc4.dts +++ b/arch/arm/dts/meson-sm1-odroid-hc4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Dongjin Kim <tobetter(a)gmail.com> */ diff --git a/arch/arm/dts/meson-sm1-odroid.dtsi b/arch/arm/dts/meson-sm1-odroid.dtsi index fd0ad85c16..5504349b8c 100644 --- a/arch/arm/dts/meson-sm1-odroid.dtsi +++ b/arch/arm/dts/meson-sm1-odroid.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Dongjin Kim <tobetter(a)gmail.com> */ diff --git a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi index 8ebc1caa4a..d56a8972e8 100644 --- a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1-sei610.dts b/arch/arm/dts/meson-sm1-sei610.dts index 2194a77897..64e720ebd4 100644 --- a/arch/arm/dts/meson-sm1-sei610.dts +++ b/arch/arm/dts/meson-sm1-sei610.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre SAS. All rights reserved. */ diff --git a/arch/arm/dts/meson-sm1-u-boot.dtsi b/arch/arm/dts/meson-sm1-u-boot.dtsi index e05d4c369a..ab0e4fb177 100644 --- a/arch/arm/dts/meson-sm1-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/meson-sm1.dtsi b/arch/arm/dts/meson-sm1.dtsi index 56ca0ba224..9aad7f939f 100644 --- a/arch/arm/dts/meson-sm1.dtsi +++ b/arch/arm/dts/meson-sm1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/ns-board.dts b/arch/arm/dts/ns-board.dts index bc2a0dd1c9..502a70c9a7 100644 --- a/arch/arm/dts/ns-board.dts +++ b/arch/arm/dts/ns-board.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/arch/arm/dts/ns3-board.dts b/arch/arm/dts/ns3-board.dts index 4e0966a132..af87795865 100644 --- a/arch/arm/dts/ns3-board.dts +++ b/arch/arm/dts/ns3-board.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Broadcom */ diff --git a/arch/arm/dts/ns3.dtsi b/arch/arm/dts/ns3.dtsi index 09098aac3a..34f6b34a23 100644 --- a/arch/arm/dts/ns3.dtsi +++ b/arch/arm/dts/ns3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Broadcom */ diff --git a/arch/arm/dts/nuvoton-npcm845-pincfg.dtsi b/arch/arm/dts/nuvoton-npcm845-pincfg.dtsi index 65de96b1f5..d3d4acc6e1 100644 --- a/arch/arm/dts/nuvoton-npcm845-pincfg.dtsi +++ b/arch/arm/dts/nuvoton-npcm845-pincfg.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (c) 2021 Nuvoton Technology tomer.maimon(a)nuvoton.com / { diff --git a/arch/arm/dts/o4-imx-nano.dts b/arch/arm/dts/o4-imx-nano.dts index 54d32f9dd4..5d7e7770a5 100644 --- a/arch/arm/dts/o4-imx-nano.dts +++ b/arch/arm/dts/o4-imx-nano.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> /dts-v1/; diff --git a/arch/arm/dts/o4-imx6ull-nano.dtsi b/arch/arm/dts/o4-imx6ull-nano.dtsi index 3fefa80eae..163a7bbdb9 100644 --- a/arch/arm/dts/o4-imx6ull-nano.dtsi +++ b/arch/arm/dts/o4-imx6ull-nano.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> /dts-v1/; diff --git a/arch/arm/dts/octeontx.dts b/arch/arm/dts/octeontx.dts index 60a15f5df2..cbfdd04ece 100644 --- a/arch/arm/dts/octeontx.dts +++ b/arch/arm/dts/octeontx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Dummy devicetre file for octeontx2 boards * diff --git a/arch/arm/dts/omap3-beagle-u-boot.dtsi b/arch/arm/dts/omap3-beagle-u-boot.dtsi index 2c03701c89..b2f40c906f 100644 --- a/arch/arm/dts/omap3-beagle-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi index 2c03701c89..b2f40c906f 100644 --- a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi index 2c03701c89..b2f40c906f 100644 --- a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi +++ b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-devkit8000-u-boot.dtsi b/arch/arm/dts/omap3-devkit8000-u-boot.dtsi index a5768b7281..553723a7d6 100644 --- a/arch/arm/dts/omap3-devkit8000-u-boot.dtsi +++ b/arch/arm/dts/omap3-devkit8000-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi index 97a8141c8a..c64397fd79 100644 --- a/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-37xx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-evm-u-boot.dtsi b/arch/arm/dts/omap3-evm-u-boot.dtsi index 97a8141c8a..c64397fd79 100644 --- a/arch/arm/dts/omap3-evm-u-boot.dtsi +++ b/arch/arm/dts/omap3-evm-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap3-igep0020-u-boot.dtsi b/arch/arm/dts/omap3-igep0020-u-boot.dtsi index 41beaf0900..68620e3e50 100644 --- a/arch/arm/dts/omap3-igep0020-u-boot.dtsi +++ b/arch/arm/dts/omap3-igep0020-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/omap4-u-boot.dtsi b/arch/arm/dts/omap4-u-boot.dtsi index d476bfbc50..9dae03a5a2 100644 --- a/arch/arm/dts/omap4-u-boot.dtsi +++ b/arch/arm/dts/omap4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/phytium-durian.dts b/arch/arm/dts/phytium-durian.dts index 3b76949a26..79f63d3014 100644 --- a/arch/arm/dts/phytium-durian.dts +++ b/arch/arm/dts/phytium-durian.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Phytium Ltd. * shuyiqi <shuyiqi(a)phytium.com.cn> diff --git a/arch/arm/dts/phytium-pomelo.dts b/arch/arm/dts/phytium-pomelo.dts index 3f809c0dbb..39cacd8628 100644 --- a/arch/arm/dts/phytium-pomelo.dts +++ b/arch/arm/dts/phytium-pomelo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Phytium Pomelo board * Copyright (C) 2021, Phytium Ltd. diff --git a/arch/arm/dts/px30-engicam-common.dtsi b/arch/arm/dts/px30-engicam-common.dtsi index 3429e124d9..7abb730e6e 100644 --- a/arch/arm/dts/px30-engicam-common.dtsi +++ b/arch/arm/dts/px30-engicam-common.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions diff --git a/arch/arm/dts/px30-engicam-ctouch2.dtsi b/arch/arm/dts/px30-engicam-ctouch2.dtsi index bf10a3d29f..f07ba43913 100644 --- a/arch/arm/dts/px30-engicam-ctouch2.dtsi +++ b/arch/arm/dts/px30-engicam-ctouch2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions diff --git a/arch/arm/dts/px30-engicam-edimm2.2.dtsi b/arch/arm/dts/px30-engicam-edimm2.2.dtsi index 449b8eb645..c0375c8545 100644 --- a/arch/arm/dts/px30-engicam-edimm2.2.dtsi +++ b/arch/arm/dts/px30-engicam-edimm2.2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts b/arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts index 47aa30505a..f5ca72835b 100644 --- a/arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts +++ b/arch/arm/dts/px30-engicam-px30-core-ctouch2-of10.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/px30-engicam-px30-core-ctouch2.dts b/arch/arm/dts/px30-engicam-px30-core-ctouch2.dts index 5a0ecb8fae..d8a3d41567 100644 --- a/arch/arm/dts/px30-engicam-px30-core-ctouch2.dts +++ b/arch/arm/dts/px30-engicam-px30-core-ctouch2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts b/arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts index d759478e1c..886cd7f41c 100644 --- a/arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts +++ b/arch/arm/dts/px30-engicam-px30-core-edimm2.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/px30-engicam-px30-core.dtsi b/arch/arm/dts/px30-engicam-px30-core.dtsi index 7249871530..9ae15bdc60 100644 --- a/arch/arm/dts/px30-engicam-px30-core.dtsi +++ b/arch/arm/dts/px30-engicam-px30-core.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/px30-evb-u-boot.dtsi b/arch/arm/dts/px30-evb-u-boot.dtsi index 61b1433af9..b953d20f7d 100644 --- a/arch/arm/dts/px30-evb-u-boot.dtsi +++ b/arch/arm/dts/px30-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2020 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/px30-evb.dts b/arch/arm/dts/px30-evb.dts index 848bc39cf8..81facebea4 100644 --- a/arch/arm/dts/px30-evb.dts +++ b/arch/arm/dts/px30-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/px30-firefly-u-boot.dtsi b/arch/arm/dts/px30-firefly-u-boot.dtsi index aea9f4d6e5..08ed050ad3 100644 --- a/arch/arm/dts/px30-firefly-u-boot.dtsi +++ b/arch/arm/dts/px30-firefly-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2020 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/px30-firefly.dts b/arch/arm/dts/px30-firefly.dts index c0a8e3009a..3211b26b08 100644 --- a/arch/arm/dts/px30-firefly.dts +++ b/arch/arm/dts/px30-firefly.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi b/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi index e04766ad09..6e08776ca5 100644 --- a/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi +++ b/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "px30-u-boot.dtsi" diff --git a/arch/arm/dts/px30-ringneck-haikou.dts b/arch/arm/dts/px30-ringneck-haikou.dts index 08a3ad3e7a..e39c48231a 100644 --- a/arch/arm/dts/px30-ringneck-haikou.dts +++ b/arch/arm/dts/px30-ringneck-haikou.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/px30-ringneck.dtsi b/arch/arm/dts/px30-ringneck.dtsi index 1239775583..f51e61f8da 100644 --- a/arch/arm/dts/px30-ringneck.dtsi +++ b/arch/arm/dts/px30-ringneck.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi index 046da022ff..2bd45bc162 100644 --- a/arch/arm/dts/px30-u-boot.dtsi +++ b/arch/arm/dts/px30-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/px30.dtsi b/arch/arm/dts/px30.dtsi index 3152bf107d..caa58ed699 100644 --- a/arch/arm/dts/px30.dtsi +++ b/arch/arm/dts/px30.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi index 0850ae56e9..5a29925e04 100644 --- a/arch/arm/dts/qcom-ipq4019.dtsi +++ b/arch/arm/dts/qcom-ipq4019.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Sartura Ltd. * diff --git a/arch/arm/dts/qcs404-evb-uboot.dtsi b/arch/arm/dts/qcs404-evb-uboot.dtsi index b4c5f3fa43..76b313ffc2 100644 --- a/arch/arm/dts/qcs404-evb-uboot.dtsi +++ b/arch/arm/dts/qcs404-evb-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to handle QCS404 EVB pre-relocation devices * diff --git a/arch/arm/dts/qcs404-evb.dts b/arch/arm/dts/qcs404-evb.dts index 8d7893c116..a7f1fa2502 100644 --- a/arch/arm/dts/qcs404-evb.dts +++ b/arch/arm/dts/qcs404-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm QCS404 based evaluation board device tree source * diff --git a/arch/arm/dts/qemu-arm.dts b/arch/arm/dts/qemu-arm.dts index 230c630f04..011c94c23e 100644 --- a/arch/arm/dts/qemu-arm.dts +++ b/arch/arm/dts/qemu-arm.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Empty device tree for qemu_arm diff --git a/arch/arm/dts/qemu-arm64.dts b/arch/arm/dts/qemu-arm64.dts index 096b391072..8ae1f592f1 100644 --- a/arch/arm/dts/qemu-arm64.dts +++ b/arch/arm/dts/qemu-arm64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Empty device tree for qemu_arm64 diff --git a/arch/arm/dts/qoriq-fman3-0-10g-0.dtsi b/arch/arm/dts/qoriq-fman3-0-10g-0.dtsi index 8f4776e883..ac02be5050 100644 --- a/arch/arm/dts/qoriq-fman3-0-10g-0.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-10g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #0 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-10g-1.dtsi b/arch/arm/dts/qoriq-fman3-0-10g-1.dtsi index b5eb22f6a9..480aa08f92 100644 --- a/arch/arm/dts/qoriq-fman3-0-10g-1.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-10g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #1 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-0.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-0.dtsi index 4264d47709..ecde6354f3 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-0.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #0 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-1.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-1.dtsi index d60f8c77ac..21ed73f25d 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-1.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #1 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-2.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-2.dtsi index 7c5edc01dc..8af6f07d42 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-2.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #2 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-3.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-3.dtsi index 2d2de58c52..7326da8991 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-3.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #3 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-4.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-4.dtsi index f5a73dc733..182a95bd2c 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-4.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #4 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0-1g-5.dtsi b/arch/arm/dts/qoriq-fman3-0-1g-5.dtsi index baa5751191..42a7316028 100644 --- a/arch/arm/dts/qoriq-fman3-0-1g-5.dtsi +++ b/arch/arm/dts/qoriq-fman3-0-1g-5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #5 device tree * diff --git a/arch/arm/dts/qoriq-fman3-0.dtsi b/arch/arm/dts/qoriq-fman3-0.dtsi index 82fe796f4b..2481c441f6 100644 --- a/arch/arm/dts/qoriq-fman3-0.dtsi +++ b/arch/arm/dts/qoriq-fman3-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree * diff --git a/arch/arm/dts/r9a06g032-rzn1-snarc-u-boot.dtsi b/arch/arm/dts/r9a06g032-rzn1-snarc-u-boot.dtsi index 794e711103..fdb3f5253f 100644 --- a/arch/arm/dts/r9a06g032-rzn1-snarc-u-boot.dtsi +++ b/arch/arm/dts/r9a06g032-rzn1-snarc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Configuration file for binman * diff --git a/arch/arm/dts/rk3036-sdk.dts b/arch/arm/dts/rk3036-sdk.dts index 3493150df9..2a4f7cceef 100644 --- a/arch/arm/dts/rk3036-sdk.dts +++ b/arch/arm/dts/rk3036-sdk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3036-u-boot.dtsi b/arch/arm/dts/rk3036-u-boot.dtsi index 41ac054b81..b7cbea41eb 100644 --- a/arch/arm/dts/rk3036-u-boot.dtsi +++ b/arch/arm/dts/rk3036-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3036.dtsi b/arch/arm/dts/rk3036.dtsi index 75588de486..0e5254021f 100644 --- a/arch/arm/dts/rk3036.dtsi +++ b/arch/arm/dts/rk3036.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> diff --git a/arch/arm/dts/rk3066a-mk808-u-boot.dtsi b/arch/arm/dts/rk3066a-mk808-u-boot.dtsi index 4474be962d..9f1a77199f 100644 --- a/arch/arm/dts/rk3066a-mk808-u-boot.dtsi +++ b/arch/arm/dts/rk3066a-mk808-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "rk3066a-u-boot.dtsi" diff --git a/arch/arm/dts/rk3066a-mk808.dts b/arch/arm/dts/rk3066a-mk808.dts index 06790f05b3..76d7ca8537 100644 --- a/arch/arm/dts/rk3066a-mk808.dts +++ b/arch/arm/dts/rk3066a-mk808.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Paweł Jarosz <paweljarosz3691(a)gmail.com> */ diff --git a/arch/arm/dts/rk3066a-u-boot.dtsi b/arch/arm/dts/rk3066a-u-boot.dtsi index 06f405ca2c..0e3c1d4d76 100644 --- a/arch/arm/dts/rk3066a-u-boot.dtsi +++ b/arch/arm/dts/rk3066a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rockchip-u-boot.dtsi" #include "rk3xxx-u-boot.dtsi" diff --git a/arch/arm/dts/rk3066a.dtsi b/arch/arm/dts/rk3066a.dtsi index de9915d946..16a20907da 100644 --- a/arch/arm/dts/rk3066a.dtsi +++ b/arch/arm/dts/rk3066a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2013 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/arch/arm/dts/rk3128-evb-u-boot.dtsi b/arch/arm/dts/rk3128-evb-u-boot.dtsi index 2f20cacc7a..6563d4a014 100644 --- a/arch/arm/dts/rk3128-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3128-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3128-u-boot.dtsi" diff --git a/arch/arm/dts/rk3128-evb.dts b/arch/arm/dts/rk3128-evb.dts index 93291d7873..0a464d2c0a 100644 --- a/arch/arm/dts/rk3128-evb.dts +++ b/arch/arm/dts/rk3128-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3128-u-boot.dtsi b/arch/arm/dts/rk3128-u-boot.dtsi index 6d1965e6b5..ded3cc36c0 100644 --- a/arch/arm/dts/rk3128-u-boot.dtsi +++ b/arch/arm/dts/rk3128-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rockchip-u-boot.dtsi" diff --git a/arch/arm/dts/rk3128.dtsi b/arch/arm/dts/rk3128.dtsi index 3253c64034..effdc0f894 100644 --- a/arch/arm/dts/rk3128.dtsi +++ b/arch/arm/dts/rk3128.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi index 7bcbc2967a..fc19301b60 100644 --- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts index 118deacd38..517d13cad2 100644 --- a/arch/arm/dts/rk3188-radxarock.dts +++ b/arch/arm/dts/rk3188-radxarock.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2013 Heiko Stuebner <heiko(a)sntech.de> */ diff --git a/arch/arm/dts/rk3188-u-boot.dtsi b/arch/arm/dts/rk3188-u-boot.dtsi index 176f9e65c2..0fad7558e4 100644 --- a/arch/arm/dts/rk3188-u-boot.dtsi +++ b/arch/arm/dts/rk3188-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3188.dtsi b/arch/arm/dts/rk3188.dtsi index 44b54af0bb..e1c4f9a767 100644 --- a/arch/arm/dts/rk3188.dtsi +++ b/arch/arm/dts/rk3188.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2013 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/arch/arm/dts/rk3229-evb-u-boot.dtsi b/arch/arm/dts/rk3229-evb-u-boot.dtsi index 4a4e4cc0c9..396a6d309b 100644 --- a/arch/arm/dts/rk3229-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3229-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "rk322x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3229-evb.dts b/arch/arm/dts/rk3229-evb.dts index 797476e8be..230ad3c004 100644 --- a/arch/arm/dts/rk3229-evb.dts +++ b/arch/arm/dts/rk3229-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3229.dtsi b/arch/arm/dts/rk3229.dtsi index c340fb30e7..69f133e68d 100644 --- a/arch/arm/dts/rk3229.dtsi +++ b/arch/arm/dts/rk3229.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk322x-u-boot.dtsi b/arch/arm/dts/rk322x-u-boot.dtsi index aea917544b..fe678be8f0 100644 --- a/arch/arm/dts/rk322x-u-boot.dtsi +++ b/arch/arm/dts/rk322x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rockchip-u-boot.dtsi" diff --git a/arch/arm/dts/rk322x.dtsi b/arch/arm/dts/rk322x.dtsi index 8eed9e3a92..3aa7adc483 100644 --- a/arch/arm/dts/rk322x.dtsi +++ b/arch/arm/dts/rk322x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> diff --git a/arch/arm/dts/rk3288-evb-u-boot.dtsi b/arch/arm/dts/rk3288-evb-u-boot.dtsi index 686ed2cd5d..cf614c4b41 100644 --- a/arch/arm/dts/rk3288-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3288-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-evb.dts b/arch/arm/dts/rk3288-evb.dts index bb24a96cdd..9b1e3b0887 100644 --- a/arch/arm/dts/rk3288-evb.dts +++ b/arch/arm/dts/rk3288-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi index 72da884734..3663b1b394 100644 --- a/arch/arm/dts/rk3288-evb.dtsi +++ b/arch/arm/dts/rk3288-evb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-firefly-u-boot.dtsi b/arch/arm/dts/rk3288-firefly-u-boot.dtsi index 644198a4a2..9a4c394191 100644 --- a/arch/arm/dts/rk3288-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3288-firefly-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts index 72982efdf6..2325a8baf0 100644 --- a/arch/arm/dts/rk3288-firefly.dts +++ b/arch/arm/dts/rk3288-firefly.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd(a)gmail.com> */ diff --git a/arch/arm/dts/rk3288-firefly.dtsi b/arch/arm/dts/rk3288-firefly.dtsi index 1117d3913e..1f41634b9d 100644 --- a/arch/arm/dts/rk3288-firefly.dtsi +++ b/arch/arm/dts/rk3288-firefly.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd(a)gmail.com> */ diff --git a/arch/arm/dts/rk3288-miqi-u-boot.dtsi b/arch/arm/dts/rk3288-miqi-u-boot.dtsi index 43cb48bd03..f72c70aa58 100644 --- a/arch/arm/dts/rk3288-miqi-u-boot.dtsi +++ b/arch/arm/dts/rk3288-miqi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-miqi.dts b/arch/arm/dts/rk3288-miqi.dts index 4a2f249e1b..a94191cafd 100644 --- a/arch/arm/dts/rk3288-miqi.dts +++ b/arch/arm/dts/rk3288-miqi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi index 00c8613d6d..d247b56102 100644 --- a/arch/arm/dts/rk3288-miqi.dtsi +++ b/arch/arm/dts/rk3288-miqi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright (c) 2016 Heiko Stuebner <heiko(a)sntech.de> */ diff --git a/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi b/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi index 383b383acc..7c2ca215fe 100644 --- a/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi +++ b/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3288-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-popmetal-u-boot.dtsi b/arch/arm/dts/rk3288-popmetal-u-boot.dtsi index 57d602619d..4d4fb2d049 100644 --- a/arch/arm/dts/rk3288-popmetal-u-boot.dtsi +++ b/arch/arm/dts/rk3288-popmetal-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-popmetal.dts b/arch/arm/dts/rk3288-popmetal.dts index 736dc51e26..67c4250332 100644 --- a/arch/arm/dts/rk3288-popmetal.dts +++ b/arch/arm/dts/rk3288-popmetal.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi b/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi index 86da1f4c06..9e34b3417f 100644 --- a/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi +++ b/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3288-rock-pi-n8.dts b/arch/arm/dts/rk3288-rock-pi-n8.dts index c9894a60e7..4011493a61 100644 --- a/arch/arm/dts/rk3288-rock-pi-n8.dts +++ b/arch/arm/dts/rk3288-rock-pi-n8.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Vamrs Limited diff --git a/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi b/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi index ea4a6e0046..41af7e1d02 100644 --- a/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi +++ b/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3288-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi index b4c5483146..550f11a9e9 100644 --- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Amarula Solutions SRO */ diff --git a/arch/arm/dts/rk3288-tinker-s.dts b/arch/arm/dts/rk3288-tinker-s.dts index cc7ac5f881..b7a1c5a3ba 100644 --- a/arch/arm/dts/rk3288-tinker-s.dts +++ b/arch/arm/dts/rk3288-tinker-s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 0cf1b696d1..53fb506e63 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 8b1848c310..94fc16b43f 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi index c4c5a2d225..9d702e8a8e 100644 --- a/arch/arm/dts/rk3288-u-boot.dtsi +++ b/arch/arm/dts/rk3288-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi index 2cc6b090ac..95d068d5bd 100644 --- a/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3288-veyron-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi index 213a46babf..2ab7486988 100644 --- a/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3288-veyron-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi index 8211da41fc..b055f2791b 100644 --- a/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3288-veyron-u-boot.dtsi" diff --git a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi index 6bfa84906e..f6f069c0ef 100644 --- a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2015 Google, Inc */ diff --git a/arch/arm/dts/rk3288-veyron-speedy.dts b/arch/arm/dts/rk3288-veyron-speedy.dts index 58c1fe96ee..f2c7b85062 100644 --- a/arch/arm/dts/rk3288-veyron-speedy.dts +++ b/arch/arm/dts/rk3288-veyron-speedy.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Google Veyron Speedy Rev 1+ board device tree source * diff --git a/arch/arm/dts/rk3288-veyron-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-u-boot.dtsi index 4f9c59c675..b4ae6626e8 100644 --- a/arch/arm/dts/rk3288-veyron-u-boot.dtsi +++ b/arch/arm/dts/rk3288-veyron-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2015 Google, Inc */ diff --git a/arch/arm/dts/rk3288-vmarc-som.dtsi b/arch/arm/dts/rk3288-vmarc-som.dtsi index 717cb3dc81..87b645f4fe 100644 --- a/arch/arm/dts/rk3288-vmarc-som.dtsi +++ b/arch/arm/dts/rk3288-vmarc-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Vamrs Limited diff --git a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi index 8f50bfe898..89edb2d65a 100644 --- a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi +++ b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts index 4193f7208c..89b1073d2f 100644 --- a/arch/arm/dts/rk3288-vyasa.dts +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index dd1d989793..4e78f730b5 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> diff --git a/arch/arm/dts/rk3308-evb-u-boot.dtsi b/arch/arm/dts/rk3308-evb-u-boot.dtsi index d15ba94d37..069bb185a3 100644 --- a/arch/arm/dts/rk3308-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3308-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3308-evb.dts b/arch/arm/dts/rk3308-evb.dts index 124a240866..50ad1c755a 100644 --- a/arch/arm/dts/rk3308-evb.dts +++ b/arch/arm/dts/rk3308-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * diff --git a/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi index 97d922c435..63767b04c0 100644 --- a/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi +++ b/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3308-roc-cc.dts b/arch/arm/dts/rk3308-roc-cc.dts index b4a54a852c..fa22a182ff 100644 --- a/arch/arm/dts/rk3308-roc-cc.dts +++ b/arch/arm/dts/rk3308-roc-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi index d88dee8057..3076d643c5 100644 --- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi +++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3308-rock-pi-s.dts b/arch/arm/dts/rk3308-rock-pi-s.dts index b5a8691b3f..8ad45eb637 100644 --- a/arch/arm/dts/rk3308-rock-pi-s.dts +++ b/arch/arm/dts/rk3308-rock-pi-s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (C) 2023 Akash Gajjar <gajjar04akash(a)gmail.com> diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi index db2c20a705..daee0212ea 100644 --- a/arch/arm/dts/rk3308-u-boot.dtsi +++ b/arch/arm/dts/rk3308-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* *(C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3308.dtsi b/arch/arm/dts/rk3308.dtsi index 9a152a8a90..be83d18000 100644 --- a/arch/arm/dts/rk3308.dtsi +++ b/arch/arm/dts/rk3308.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi index 04028bf649..fe6d31dcb6 100644 --- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi +++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3326-odroid-go2.dts b/arch/arm/dts/rk3326-odroid-go2.dts index ea0695b51e..c249d6e507 100644 --- a/arch/arm/dts/rk3326-odroid-go2.dts +++ b/arch/arm/dts/rk3326-odroid-go2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Hardkernel Co., Ltd * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH diff --git a/arch/arm/dts/rk3326.dtsi b/arch/arm/dts/rk3326.dtsi index 2ba6da1251..45ae97a8d2 100644 --- a/arch/arm/dts/rk3326.dtsi +++ b/arch/arm/dts/rk3326.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 12b68df1ac..2d0dfb8f2c 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index ff6b466e0e..646dd5c43f 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi index 78d37ab475..9227fd41e0 100644 --- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd * (C) Copyright 2020 David Bauer diff --git a/arch/arm/dts/rk3328-nanopi-r2s.dts b/arch/arm/dts/rk3328-nanopi-r2s.dts index 3857d487ab..fc98f37d36 100644 --- a/arch/arm/dts/rk3328-nanopi-r2s.dts +++ b/arch/arm/dts/rk3328-nanopi-r2s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 David Bauer <mail(a)david-bauer.net> */ diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus.dts b/arch/arm/dts/rk3328-orangepi-r1-plus.dts index dc83d74045..6ab6c74074 100644 --- a/arch/arm/dts/rk3328-orangepi-r1-plus.dts +++ b/arch/arm/dts/rk3328-orangepi-r1-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Based on rk3328-nanopi-r2s.dts, which is: * Copyright (c) 2020 David Bauer <mail(a)david-bauer.net> diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi index 2062f34bf8..e58e38c2ef 100644 --- a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi +++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328-roc-cc.dts b/arch/arm/dts/rk3328-roc-cc.dts index aa22a0c222..9b17784ebc 100644 --- a/arch/arm/dts/rk3328-roc-cc.dts +++ b/arch/arm/dts/rk3328-roc-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd */ diff --git a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi index 1f220c6dcd..647f9c43c5 100644 --- a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Radxa */ diff --git a/arch/arm/dts/rk3328-rock-pi-e.dts b/arch/arm/dts/rk3328-rock-pi-e.dts index 018a3a5075..9b55126347 100644 --- a/arch/arm/dts/rk3328-rock-pi-e.dts +++ b/arch/arm/dts/rk3328-rock-pi-e.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2020 Chen-Yu Tsai <wens(a)csie.org> * diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi index 6904515b96..4e4ea43a14 100644 --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts index f69a38f42d..5b8b80b216 100644 --- a/arch/arm/dts/rk3328-rock64.dts +++ b/arch/arm/dts/rk3328-rock64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 PINE64 */ diff --git a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi index c5acfe4ac2..a9ef76bac2 100644 --- a/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi +++ b/arch/arm/dts/rk3328-sdram-ddr3-666.dtsi @@ -1,7 +1,7 @@ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ &dmc { diff --git a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi index c5fa2903c5..d579f341f7 100644 --- a/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi +++ b/arch/arm/dts/rk3328-sdram-ddr4-666.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. &dmc { diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi index 07f27b2b7b..6a1dd6c803 100644 --- a/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi +++ b/arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi @@ -1,7 +1,7 @@ /* * (C) 2017 Theobroma Systems Design und Consulting GmbH * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ &dmc { diff --git a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi index d53d3a0fdf..cce4d01311 100644 --- a/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi +++ b/arch/arm/dts/rk3328-sdram-lpddr3-666.dtsi @@ -1,7 +1,7 @@ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ &dmc { diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index a9f2536de2..03fe617d14 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index e8d8f00be8..625b1a1f24 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3368-geekbox-u-boot.dtsi b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi index cfc8b9340a..8971d65487 100644 --- a/arch/arm/dts/rk3368-geekbox-u-boot.dtsi +++ b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-geekbox.dts b/arch/arm/dts/rk3368-geekbox.dts index 62aa97a0b8..9d7f9baea8 100644 --- a/arch/arm/dts/rk3368-geekbox.dts +++ b/arch/arm/dts/rk3368-geekbox.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Andreas Färber */ diff --git a/arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi b/arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi index a3c2b707e9..539b8db703 100644 --- a/arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi +++ b/arch/arm/dts/rk3368-lion-haikou-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-lion-haikou.dts b/arch/arm/dts/rk3368-lion-haikou.dts index cae01d35b9..cbedcebdfc 100644 --- a/arch/arm/dts/rk3368-lion-haikou.dts +++ b/arch/arm/dts/rk3368-lion-haikou.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-lion.dtsi b/arch/arm/dts/rk3368-lion.dtsi index bcd7977fb0..4c4033eff8 100644 --- a/arch/arm/dts/rk3368-lion.dtsi +++ b/arch/arm/dts/rk3368-lion.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi index 0ddb0d8f25..e00ddf2fcd 100644 --- a/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-px5-evb.dts b/arch/arm/dts/rk3368-px5-evb.dts index 5ccaa5f7a3..8009b59d6b 100644 --- a/arch/arm/dts/rk3368-px5-evb.dts +++ b/arch/arm/dts/rk3368-px5-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3368-sheep-u-boot.dtsi b/arch/arm/dts/rk3368-sheep-u-boot.dtsi index cfc8b9340a..8971d65487 100644 --- a/arch/arm/dts/rk3368-sheep-u-boot.dtsi +++ b/arch/arm/dts/rk3368-sheep-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368-sheep.dts b/arch/arm/dts/rk3368-sheep.dts index 120dec1a3d..e5b9f3a76b 100644 --- a/arch/arm/dts/rk3368-sheep.dts +++ b/arch/arm/dts/rk3368-sheep.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3368-u-boot.dtsi b/arch/arm/dts/rk3368-u-boot.dtsi index 811d59ac34..530cc53f61 100644 --- a/arch/arm/dts/rk3368-u-boot.dtsi +++ b/arch/arm/dts/rk3368-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3368.dtsi b/arch/arm/dts/rk3368.dtsi index 4c64fbefb4..9ebfb41643 100644 --- a/arch/arm/dts/rk3368.dtsi +++ b/arch/arm/dts/rk3368.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2015 Heiko Stuebner <heiko(a)sntech.de> */ diff --git a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi index a3f27566e4..cb2c845013 100644 --- a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi +++ b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Andy Yan <andy.yan(a)gmail.com> */ diff --git a/arch/arm/dts/rk3399-eaidk-610.dts b/arch/arm/dts/rk3399-eaidk-610.dts index d1f343345f..7dca422112 100644 --- a/arch/arm/dts/rk3399-eaidk-610.dts +++ b/arch/arm/dts/rk3399-eaidk-610.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi index dfce63e4d4..4843d1a394 100644 --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 7b717ebec8..c198ee741f 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi index 38e0897db9..ba4a3dd8f4 100644 --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts index 1ce85a5816..159a64f306 100644 --- a/arch/arm/dts/rk3399-ficus.dts +++ b/arch/arm/dts/rk3399-ficus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Collabora Ltd. * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi index c58ad95d12..f4d1a138da 100644 --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts index c4dd2a6b48..89a5e6608e 100644 --- a/arch/arm/dts/rk3399-firefly.dts +++ b/arch/arm/dts/rk3399-firefly.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi index 726f396f32..0ca1e3e1af 100644 --- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-gru-bob.dts b/arch/arm/dts/rk3399-gru-bob.dts index e6c1c94c8d..f5e1280304 100644 --- a/arch/arm/dts/rk3399-gru-bob.dts +++ b/arch/arm/dts/rk3399-gru-bob.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Google Gru-Bob Rev 4+ board device tree source * diff --git a/arch/arm/dts/rk3399-gru-chromebook.dtsi b/arch/arm/dts/rk3399-gru-chromebook.dtsi index 1384dabbdf..5be991bf95 100644 --- a/arch/arm/dts/rk3399-gru-chromebook.dtsi +++ b/arch/arm/dts/rk3399-gru-chromebook.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Google Gru-Chromebook shared properties * diff --git a/arch/arm/dts/rk3399-gru-kevin-u-boot.dtsi b/arch/arm/dts/rk3399-gru-kevin-u-boot.dtsi index c03bd48e95..ea47fbc8bb 100644 --- a/arch/arm/dts/rk3399-gru-kevin-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-kevin-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-gru-kevin.dts b/arch/arm/dts/rk3399-gru-kevin.dts index 2bbef9fcbe..2bd3a7260c 100644 --- a/arch/arm/dts/rk3399-gru-kevin.dts +++ b/arch/arm/dts/rk3399-gru-kevin.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Google Gru-Kevin Rev 6+ board device tree source * diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi index b1604a6872..d375479533 100644 --- a/arch/arm/dts/rk3399-gru-u-boot.dtsi +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi index b80f19066b..5d9a850449 100644 --- a/arch/arm/dts/rk3399-gru.dtsi +++ b/arch/arm/dts/rk3399-gru.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Google Gru (and derivatives) board device tree source * diff --git a/arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi b/arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi index ca1bbffb50..f9f21c8cf9 100644 --- a/arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi +++ b/arch/arm/dts/rk3399-khadas-edge-captain-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Nick Xie <nick(a)khadas.com> */ diff --git a/arch/arm/dts/rk3399-khadas-edge-captain.dts b/arch/arm/dts/rk3399-khadas-edge-captain.dts index 8302e51def..bc7aaa1bbc 100644 --- a/arch/arm/dts/rk3399-khadas-edge-captain.dts +++ b/arch/arm/dts/rk3399-khadas-edge-captain.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Shenzhen Wesion Technology Co., Ltd. * (https://www.khadas.com) diff --git a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi index a7039d74a0..44abcd502d 100644 --- a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi +++ b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Nick Xie <nick(a)khadas.com> */ diff --git a/arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi b/arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi index ca1bbffb50..f9f21c8cf9 100644 --- a/arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi +++ b/arch/arm/dts/rk3399-khadas-edge-v-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Nick Xie <nick(a)khadas.com> */ diff --git a/arch/arm/dts/rk3399-khadas-edge-v.dts b/arch/arm/dts/rk3399-khadas-edge-v.dts index f5dcb99dc3..e2998bc2a9 100644 --- a/arch/arm/dts/rk3399-khadas-edge-v.dts +++ b/arch/arm/dts/rk3399-khadas-edge-v.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Shenzhen Wesion Technology Co., Ltd. * (https://www.khadas.com) diff --git a/arch/arm/dts/rk3399-khadas-edge.dts b/arch/arm/dts/rk3399-khadas-edge.dts index 31616e7ad8..eda925f96b 100644 --- a/arch/arm/dts/rk3399-khadas-edge.dts +++ b/arch/arm/dts/rk3399-khadas-edge.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Shenzhen Wesion Technology Co., Ltd. * (https://www.khadas.com) diff --git a/arch/arm/dts/rk3399-khadas-edge.dtsi b/arch/arm/dts/rk3399-khadas-edge.dtsi index d5c7648c84..2747b87e3f 100644 --- a/arch/arm/dts/rk3399-khadas-edge.dtsi +++ b/arch/arm/dts/rk3399-khadas-edge.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Shenzhen Wesion Technology Co., Ltd. * (https://www.khadas.com) diff --git a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi index c638ce2597..05f95dba96 100644 --- a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi +++ b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Andy Yan <andy.yan(a)gmail.com> */ diff --git a/arch/arm/dts/rk3399-leez-p710.dts b/arch/arm/dts/rk3399-leez-p710.dts index 7c93f840bc..c645aed9b5 100644 --- a/arch/arm/dts/rk3399-leez-p710.dts +++ b/arch/arm/dts/rk3399-leez-p710.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Andy Yan <andy.yan(a)gmail.com> */ diff --git a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi index 17201bcf41..6f05e75147 100644 --- a/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopc-t4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-nanopc-t4.dts b/arch/arm/dts/rk3399-nanopc-t4.dts index 452728b82e..ee88149c8a 100644 --- a/arch/arm/dts/rk3399-nanopc-t4.dts +++ b/arch/arm/dts/rk3399-nanopc-t4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * FriendlyElec NanoPC-T4 board device tree source * diff --git a/arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi index a2f9786473..2b2f20eeb1 100644 --- a/arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-m4-2gb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> * Copyright (C) 2020 Deepak Das <deepakdas.linux(a)gmail.com> diff --git a/arch/arm/dts/rk3399-nanopi-m4-2gb.dts b/arch/arm/dts/rk3399-nanopi-m4-2gb.dts index 60358ab8c7..a372216221 100644 --- a/arch/arm/dts/rk3399-nanopi-m4-2gb.dts +++ b/arch/arm/dts/rk3399-nanopi-m4-2gb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * FriendlyElec NanoPi M4 board device tree source * diff --git a/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi index 17201bcf41..6f05e75147 100644 --- a/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-m4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-nanopi-m4.dts b/arch/arm/dts/rk3399-nanopi-m4.dts index 60358ab8c7..a372216221 100644 --- a/arch/arm/dts/rk3399-nanopi-m4.dts +++ b/arch/arm/dts/rk3399-nanopi-m4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * FriendlyElec NanoPi M4 board device tree source * diff --git a/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi index 9c3c1ef810..bdac57515d 100644 --- a/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-m4b-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Alexandre Vicenzi <linux(a)alxd.me> */ diff --git a/arch/arm/dts/rk3399-nanopi-m4b.dts b/arch/arm/dts/rk3399-nanopi-m4b.dts index 72182c58cc..525f11ce43 100644 --- a/arch/arm/dts/rk3399-nanopi-m4b.dts +++ b/arch/arm/dts/rk3399-nanopi-m4b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * FriendlyElec NanoPi M4B board device tree source * diff --git a/arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi index eb0aca4758..abe80d32be 100644 --- a/arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-neo4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-nanopi-neo4.dts b/arch/arm/dts/rk3399-nanopi-neo4.dts index 195410b089..8d2e9052ee 100644 --- a/arch/arm/dts/rk3399-nanopi-neo4.dts +++ b/arch/arm/dts/rk3399-nanopi-neo4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Amarula Solutions B.V. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi index 69800cc368..2ec3faf8d8 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi-r4s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RK3399-based FriendlyElec boards device tree source * diff --git a/arch/arm/dts/rk3399-nanopi-r4s.dts b/arch/arm/dts/rk3399-nanopi-r4s.dts index cef4d18b59..d2594fae2f 100644 --- a/arch/arm/dts/rk3399-nanopi-r4s.dts +++ b/arch/arm/dts/rk3399-nanopi-r4s.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * FriendlyElec NanoPC-T4 board device tree source * diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi index a9d10592d5..5b79ee63b9 100644 --- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-nanopi4.dtsi b/arch/arm/dts/rk3399-nanopi4.dtsi index 8c0ff6c96e..2667d8738f 100644 --- a/arch/arm/dts/rk3399-nanopi4.dtsi +++ b/arch/arm/dts/rk3399-nanopi4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * RK3399-based FriendlyElec boards device tree source * diff --git a/arch/arm/dts/rk3399-op1-opp.dtsi b/arch/arm/dts/rk3399-op1-opp.dtsi index 69cc9b05ba..5e211e5d3e 100644 --- a/arch/arm/dts/rk3399-op1-opp.dtsi +++ b/arch/arm/dts/rk3399-op1-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399-opp.dtsi b/arch/arm/dts/rk3399-opp.dtsi index da41cd81eb..02196c8f57 100644 --- a/arch/arm/dts/rk3399-opp.dtsi +++ b/arch/arm/dts/rk3399-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi index d4327ea607..8a2a210c64 100644 --- a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi +++ b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-orangepi.dts b/arch/arm/dts/rk3399-orangepi.dts index 04b54abea3..0e9e08193f 100644 --- a/arch/arm/dts/rk3399-orangepi.dts +++ b/arch/arm/dts/rk3399-orangepi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi index 88a77cad8d..1d3db39afb 100644 --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Peter Robinson <pbrobinson at gmail.com> */ diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts index d6b68d77d6..1777eb6cc4 100644 --- a/arch/arm/dts/rk3399-pinebook-pro.dts +++ b/arch/arm/dts/rk3399-pinebook-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. * Copyright (c) 2018 Akash Gajjar <Akash_Gajjar(a)mentor.com> diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi index cabf0a9dae..fcc0d5d419 100644 --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com> */ diff --git a/arch/arm/dts/rk3399-pinephone-pro.dts b/arch/arm/dts/rk3399-pinephone-pro.dts index 04403a7623..990451145c 100644 --- a/arch/arm/dts/rk3399-pinephone-pro.dts +++ b/arch/arm/dts/rk3399-pinephone-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Martijn Braam <martijn(a)brixit.nl> * Copyright (c) 2021 Kamil Trzciński <ayufan(a)ayufan.eu> diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi index 2b3ea6da88..d9d636f158 100644 --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3399-u-boot.dtsi" diff --git a/arch/arm/dts/rk3399-puma-haikou.dts b/arch/arm/dts/rk3399-puma-haikou.dts index 115c14c0a3..5fd0beb532 100644 --- a/arch/arm/dts/rk3399-puma-haikou.dts +++ b/arch/arm/dts/rk3399-puma-haikou.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index aa3e21bd6c..7573adb095 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi index f50c18dd3d..f989798dfd 100644 --- a/arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi +++ b/arch/arm/dts/rk3399-roc-pc-mezzanine-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Amarula Solutions(India) */ diff --git a/arch/arm/dts/rk3399-roc-pc-mezzanine.dts b/arch/arm/dts/rk3399-roc-pc-mezzanine.dts index 9447c8724b..dd847da928 100644 --- a/arch/arm/dts/rk3399-roc-pc-mezzanine.dts +++ b/arch/arm/dts/rk3399-roc-pc-mezzanine.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd * Copyright (c) 2019 Markus Reichl <m.reichl(a)fivetechno.de> diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi index c8f4418a73..b6953c0774 100644 --- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi +++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Levin Du <djw(a)t-chip.com.cn> */ diff --git a/arch/arm/dts/rk3399-roc-pc.dts b/arch/arm/dts/rk3399-roc-pc.dts index cd41954253..3d011c2279 100644 --- a/arch/arm/dts/rk3399-roc-pc.dts +++ b/arch/arm/dts/rk3399-roc-pc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd */ diff --git a/arch/arm/dts/rk3399-roc-pc.dtsi b/arch/arm/dts/rk3399-roc-pc.dtsi index d1aaf8e833..c94804ae13 100644 --- a/arch/arm/dts/rk3399-roc-pc.dtsi +++ b/arch/arm/dts/rk3399-roc-pc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd */ diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi index 5c1c451b8f..0a2abae900 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Radxa Limited */ diff --git a/arch/arm/dts/rk3399-rock-4c-plus.dts b/arch/arm/dts/rk3399-rock-4c-plus.dts index 8bfd5f88d1..ff07891583 100644 --- a/arch/arm/dts/rk3399-rock-4c-plus.dts +++ b/arch/arm/dts/rk3399-rock-4c-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Radxa Limited diff --git a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi index 85ee5770ad..7bfe21ce84 100644 --- a/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-4se-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rock-4se.dts b/arch/arm/dts/rk3399-rock-4se.dts index 7cfc198bba..25a5c0cda6 100644 --- a/arch/arm/dts/rk3399-rock-4se.dts +++ b/arch/arm/dts/rk3399-rock-4se.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar(a)mentor.com> * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel(a)mentor.com> diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi index 60122f3bcd..8713aba1cb 100644 --- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rock-pi-4.dtsi b/arch/arm/dts/rk3399-rock-pi-4.dtsi index b1b7f4ffb1..33ee257671 100644 --- a/arch/arm/dts/rk3399-rock-pi-4.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar(a)mentor.com> * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel(a)mentor.com> diff --git a/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi index 85ee5770ad..7bfe21ce84 100644 --- a/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rock-pi-4a.dts b/arch/arm/dts/rk3399-rock-pi-4a.dts index 931334aa3d..711e5fbfa3 100644 --- a/arch/arm/dts/rk3399-rock-pi-4a.dts +++ b/arch/arm/dts/rk3399-rock-pi-4a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar(a)mentor.com> * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel(a)mentor.com> diff --git a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi index 85ee5770ad..7bfe21ce84 100644 --- a/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock-pi-4c-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rock-pi-4c.dts b/arch/arm/dts/rk3399-rock-pi-4c.dts index d32efab74e..41a41a33a3 100644 --- a/arch/arm/dts/rk3399-rock-pi-4c.dts +++ b/arch/arm/dts/rk3399-rock-pi-4c.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Radxa Limited diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi index c190089e26..9e0e5b7b6b 100644 --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts index 1a23e8f3cd..adc8bd9529 100644 --- a/arch/arm/dts/rk3399-rock960.dts +++ b/arch/arm/dts/rk3399-rock960.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Linaro Ltd. */ diff --git a/arch/arm/dts/rk3399-rock960.dtsi b/arch/arm/dts/rk3399-rock960.dtsi index 25dc61c26a..c047eb9946 100644 --- a/arch/arm/dts/rk3399-rock960.dtsi +++ b/arch/arm/dts/rk3399-rock960.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Collabora Ltd. * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd. diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi index 732727d9b0..77682bf296 100644 --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399-rockpro64.dts b/arch/arm/dts/rk3399-rockpro64.dts index 4b42717800..81b96dda7e 100644 --- a/arch/arm/dts/rk3399-rockpro64.dts +++ b/arch/arm/dts/rk3399-rockpro64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. * Copyright (c) 2018 Akash Gajjar <Akash_Gajjar(a)mentor.com> diff --git a/arch/arm/dts/rk3399-rockpro64.dtsi b/arch/arm/dts/rk3399-rockpro64.dtsi index 6bff8db7d3..22280b3369 100644 --- a/arch/arm/dts/rk3399-rockpro64.dtsi +++ b/arch/arm/dts/rk3399-rockpro64.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. * Copyright (c) 2018 Akash Gajjar <Akash_Gajjar(a)mentor.com> diff --git a/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi b/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi index 7fae249536..cf17f6be9a 100644 --- a/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi +++ b/arch/arm/dts/rk3399-sdram-ddr3-1333.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi b/arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi index 23c7c34a9a..6ed7f5c57e 100644 --- a/arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi +++ b/arch/arm/dts/rk3399-sdram-ddr3-1600.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi b/arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi index ea029ca90a..444888ffb2 100644 --- a/arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi +++ b/arch/arm/dts/rk3399-sdram-ddr3-1866.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi b/arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi index 7296dbb80e..d8fb716cb0 100644 --- a/arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi +++ b/arch/arm/dts/rk3399-sdram-lpddr3-2GB-1600.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * (C) Copyright 2018 Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> diff --git a/arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi b/arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi index bf429c21e4..b84abd7e52 100644 --- a/arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi +++ b/arch/arm/dts/rk3399-sdram-lpddr3-4GB-1600.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi b/arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi index 96f459fd0b..38dbf4f528 100644 --- a/arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi +++ b/arch/arm/dts/rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi b/arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi index f0c478d189..44e4d5b8fa 100644 --- a/arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi +++ b/arch/arm/dts/rk3399-sdram-lpddr4-100.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd * (C) Copyright 2019 Amarula Solutions. diff --git a/arch/arm/dts/rk3399-t-opp.dtsi b/arch/arm/dts/rk3399-t-opp.dtsi index 1ababadda9..d57bf1443a 100644 --- a/arch/arm/dts/rk3399-t-opp.dtsi +++ b/arch/arm/dts/rk3399-t-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2022 Radxa Limited diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 3423b882c4..7be88afdc4 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399.dtsi b/arch/arm/dts/rk3399.dtsi index 3871c7fd83..e449702e46 100644 --- a/arch/arm/dts/rk3399.dtsi +++ b/arch/arm/dts/rk3399.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi b/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi index 7c66e1145a..9f17821194 100644 --- a/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi +++ b/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10.dts b/arch/arm/dts/rk3399pro-rock-pi-n10.dts index bf026786fa..2fe587b0ac 100644 --- a/arch/arm/dts/rk3399pro-rock-pi-n10.dts +++ b/arch/arm/dts/rk3399pro-rock-pi-n10.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Radxa Limited diff --git a/arch/arm/dts/rk3399pro-u-boot.dtsi b/arch/arm/dts/rk3399pro-u-boot.dtsi index 7bddc3acdb..091ac39943 100644 --- a/arch/arm/dts/rk3399pro-u-boot.dtsi +++ b/arch/arm/dts/rk3399pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi index e1cb426f2a..ad739032f9 100644 --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi +++ b/arch/arm/dts/rk3399pro-vmarc-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Vamrs Limited diff --git a/arch/arm/dts/rk3399pro.dtsi b/arch/arm/dts/rk3399pro.dtsi index bb5ebf6608..ae63e3de7b 100644 --- a/arch/arm/dts/rk3399pro.dtsi +++ b/arch/arm/dts/rk3399pro.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd. #include "rk3399.dtsi" diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi index f986e1941e..518d2cecd7 100644 --- a/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi +++ b/arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3.dts b/arch/arm/dts/rk3566-anbernic-rgxx3.dts index 404dddfafb..6c7737345e 100644 --- a/arch/arm/dts/rk3566-anbernic-rgxx3.dts +++ b/arch/arm/dts/rk3566-anbernic-rgxx3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi b/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi index ad43fa199c..4d5225786e 100644 --- a/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi +++ b/arch/arm/dts/rk3566-anbernic-rgxx3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi index 06cc15ed21..26c14c9f35 100644 --- a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi +++ b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-quartz64-a.dts b/arch/arm/dts/rk3566-quartz64-a.dts index 25a8c781f4..042bba1eff 100644 --- a/arch/arm/dts/rk3566-quartz64-a.dts +++ b/arch/arm/dts/rk3566-quartz64-a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi index 3c2c54e941..9b2367c555 100644 --- a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi +++ b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-quartz64-b.dts b/arch/arm/dts/rk3566-quartz64-b.dts index b276eb0810..f96d90a9de 100644 --- a/arch/arm/dts/rk3566-quartz64-b.dts +++ b/arch/arm/dts/rk3566-quartz64-b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi index c925439f71..ef771f45ce 100644 --- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi +++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3566-radxa-cm3-io.dts b/arch/arm/dts/rk3566-radxa-cm3-io.dts index 5e4236af4f..e3296024f9 100644 --- a/arch/arm/dts/rk3566-radxa-cm3-io.dts +++ b/arch/arm/dts/rk3566-radxa-cm3-io.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Radxa Limited * Copyright (c) 2022 Amarula Solutions(India) diff --git a/arch/arm/dts/rk3566-radxa-cm3.dtsi b/arch/arm/dts/rk3566-radxa-cm3.dtsi index 45de2630bb..68d8ecbab1 100644 --- a/arch/arm/dts/rk3566-radxa-cm3.dtsi +++ b/arch/arm/dts/rk3566-radxa-cm3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Radxa Limited * Copyright (c) 2022 Amarula Solutions(India) diff --git a/arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi index 0e662eafa4..5c06dd4880 100644 --- a/arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi +++ b/arch/arm/dts/rk3566-soquartz-blade-u-boot.dtsi @@ -1,3 +1,3 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3566-soquartz-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-soquartz-blade.dts b/arch/arm/dts/rk3566-soquartz-blade.dts index 4e49bebf54..22f0e3a4d4 100644 --- a/arch/arm/dts/rk3566-soquartz-blade.dts +++ b/arch/arm/dts/rk3566-soquartz-blade.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi index 0e662eafa4..5c06dd4880 100644 --- a/arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi +++ b/arch/arm/dts/rk3566-soquartz-cm4-u-boot.dtsi @@ -1,3 +1,3 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3566-soquartz-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-soquartz-cm4.dts b/arch/arm/dts/rk3566-soquartz-cm4.dts index cddf6cd2fe..e42770f19f 100644 --- a/arch/arm/dts/rk3566-soquartz-cm4.dts +++ b/arch/arm/dts/rk3566-soquartz-cm4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi index 0e662eafa4..5c06dd4880 100644 --- a/arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi +++ b/arch/arm/dts/rk3566-soquartz-model-a-u-boot.dtsi @@ -1,3 +1,3 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk3566-soquartz-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-soquartz-model-a.dts b/arch/arm/dts/rk3566-soquartz-model-a.dts index 2208dbfb7f..d115ad9744 100644 --- a/arch/arm/dts/rk3566-soquartz-model-a.dts +++ b/arch/arm/dts/rk3566-soquartz-model-a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi index 793cca2cea..505c133c10 100644 --- a/arch/arm/dts/rk3566-soquartz-u-boot.dtsi +++ b/arch/arm/dts/rk3566-soquartz-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3566-soquartz.dtsi b/arch/arm/dts/rk3566-soquartz.dtsi index 31aa2b8efe..2118cd794d 100644 --- a/arch/arm/dts/rk3566-soquartz.dtsi +++ b/arch/arm/dts/rk3566-soquartz.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3566.dtsi b/arch/arm/dts/rk3566.dtsi index 6c4b17d27b..0ffa820f83 100644 --- a/arch/arm/dts/rk3566.dtsi +++ b/arch/arm/dts/rk3566.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "rk356x.dtsi" diff --git a/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi b/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi index 60a3b21f2d..19d1403e98 100644 --- a/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi +++ b/arch/arm/dts/rk3568-bpi-r2-pro-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3568-bpi-r2-pro.dts b/arch/arm/dts/rk3568-bpi-r2-pro.dts index f9127ddfbb..4fa0f2b418 100644 --- a/arch/arm/dts/rk3568-bpi-r2-pro.dts +++ b/arch/arm/dts/rk3568-bpi-r2-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Author: Frank Wunderlich <frank-w(a)public-files.de> * diff --git a/arch/arm/dts/rk3568-evb-u-boot.dtsi b/arch/arm/dts/rk3568-evb-u-boot.dtsi index 382a52a28b..b9e84c6714 100644 --- a/arch/arm/dts/rk3568-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3568-evb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk3568-evb.dts b/arch/arm/dts/rk3568-evb.dts index 674792567f..3b7b238ccd 100644 --- a/arch/arm/dts/rk3568-evb.dts +++ b/arch/arm/dts/rk3568-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. * diff --git a/arch/arm/dts/rk3568-generic-u-boot.dtsi b/arch/arm/dts/rk3568-generic-u-boot.dtsi index 90022580a1..1ed4f9872c 100644 --- a/arch/arm/dts/rk3568-generic-u-boot.dtsi +++ b/arch/arm/dts/rk3568-generic-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3568-generic.dts b/arch/arm/dts/rk3568-generic.dts index 1006ea55bb..bf2a29d2d5 100644 --- a/arch/arm/dts/rk3568-generic.dts +++ b/arch/arm/dts/rk3568-generic.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Minimal generic DT for RK3566/RK3568 with eMMC and SD-card enabled */ diff --git a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi index 27c6277523..395eecb17b 100644 --- a/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi +++ b/arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 Rockchip Electronics Co., Ltd * (C) Copyright 2023 Andy Yan <andyshrk(a)163.com> diff --git a/arch/arm/dts/rk3568-lubancat-2.dts b/arch/arm/dts/rk3568-lubancat-2.dts index e653b067aa..590aaa265d 100644 --- a/arch/arm/dts/rk3568-lubancat-2.dts +++ b/arch/arm/dts/rk3568-lubancat-2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi index 0fc360b06d..dcf76d17db 100644 --- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi +++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3568-odroid-m1.dts b/arch/arm/dts/rk3568-odroid-m1.dts index 59ecf868db..10ebb4ef32 100644 --- a/arch/arm/dts/rk3568-odroid-m1.dts +++ b/arch/arm/dts/rk3568-odroid-m1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Hardkernel Co., Ltd. * diff --git a/arch/arm/dts/rk3568-pinctrl.dtsi b/arch/arm/dts/rk3568-pinctrl.dtsi index 0a979bfb63..1edc4cd6e5 100644 --- a/arch/arm/dts/rk3568-pinctrl.dtsi +++ b/arch/arm/dts/rk3568-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3568-radxa-cm3i.dtsi b/arch/arm/dts/rk3568-radxa-cm3i.dtsi index c50fbdd486..3e783d029d 100644 --- a/arch/arm/dts/rk3568-radxa-cm3i.dtsi +++ b/arch/arm/dts/rk3568-radxa-cm3i.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/leds/common.h> diff --git a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi index 572bdc5665..f05534ab70 100644 --- a/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi +++ b/arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "rk356x-u-boot.dtsi" diff --git a/arch/arm/dts/rk3568-radxa-e25.dts b/arch/arm/dts/rk3568-radxa-e25.dts index 72ad74c38a..b0103e336e 100644 --- a/arch/arm/dts/rk3568-radxa-e25.dts +++ b/arch/arm/dts/rk3568-radxa-e25.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; #include "rk3568-radxa-cm3i.dtsi" diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index b05b7151e6..fd7876c9a1 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd * (C) Copyright 2023 Akash Gajjar <gajjar04akash(a)gmail.com> diff --git a/arch/arm/dts/rk3568-rock-3a.dts b/arch/arm/dts/rk3568-rock-3a.dts index 917f5b2b8a..804a3dfefd 100644 --- a/arch/arm/dts/rk3568-rock-3a.dts +++ b/arch/arm/dts/rk3568-rock-3a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; #include <dt-bindings/gpio/gpio.h> diff --git a/arch/arm/dts/rk3568.dtsi b/arch/arm/dts/rk3568.dtsi index f1be76a54c..b3ae8f81a2 100644 --- a/arch/arm/dts/rk3568.dtsi +++ b/arch/arm/dts/rk3568.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 354b6958e5..7dcb17d4f4 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rk356x.dtsi b/arch/arm/dts/rk356x.dtsi index 61680c7ac4..b978090d6c 100644 --- a/arch/arm/dts/rk356x.dtsi +++ b/arch/arm/dts/rk356x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi index dd0058262b..e336200e48 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi +++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6a-io.dts b/arch/arm/dts/rk3588-edgeble-neu6a-io.dts index b515438920..676847e908 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6a-io.dts +++ b/arch/arm/dts/rk3588-edgeble-neu6a-io.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6a.dtsi b/arch/arm/dts/rk3588-edgeble-neu6a.dtsi index 727580aaa1..2414a31d7b 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6a.dtsi +++ b/arch/arm/dts/rk3588-edgeble-neu6a.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi index a45b3f5e86..d6bb5aeefb 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi +++ b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6b-io.dts b/arch/arm/dts/rk3588-edgeble-neu6b-io.dts index 9933765e40..ff7fe67d06 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6b-io.dts +++ b/arch/arm/dts/rk3588-edgeble-neu6b-io.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-edgeble-neu6b.dtsi b/arch/arm/dts/rk3588-edgeble-neu6b.dtsi index 017559bba3..2ffdacb7e7 100644 --- a/arch/arm/dts/rk3588-edgeble-neu6b.dtsi +++ b/arch/arm/dts/rk3588-edgeble-neu6b.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi b/arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi index bd2e259486..e015ba8934 100644 --- a/arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi +++ b/arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3588-evb1-v10.dts b/arch/arm/dts/rk3588-evb1-v10.dts index 229a9111f5..d0d70ac2ad 100644 --- a/arch/arm/dts/rk3588-evb1-v10.dts +++ b/arch/arm/dts/rk3588-evb1-v10.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. * diff --git a/arch/arm/dts/rk3588-pinctrl.dtsi b/arch/arm/dts/rk3588-pinctrl.dtsi index 244c66faa1..2ef02626d8 100644 --- a/arch/arm/dts/rk3588-pinctrl.dtsi +++ b/arch/arm/dts/rk3588-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 96cc84e5aa..b25ae8b73d 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Collabora Ltd. */ diff --git a/arch/arm/dts/rk3588-rock-5b.dts b/arch/arm/dts/rk3588-rock-5b.dts index 8ab60968f2..1e7bb31636 100644 --- a/arch/arm/dts/rk3588-rock-5b.dts +++ b/arch/arm/dts/rk3588-rock-5b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3588-u-boot.dtsi b/arch/arm/dts/rk3588-u-boot.dtsi index 68b419f3ab..426c464705 100644 --- a/arch/arm/dts/rk3588-u-boot.dtsi +++ b/arch/arm/dts/rk3588-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588.dtsi b/arch/arm/dts/rk3588.dtsi index 5519c1430c..f99cdf3ca2 100644 --- a/arch/arm/dts/rk3588.dtsi +++ b/arch/arm/dts/rk3588.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3588j-u-boot.dtsi b/arch/arm/dts/rk3588j-u-boot.dtsi index f5c9e329a5..320431b277 100644 --- a/arch/arm/dts/rk3588j-u-boot.dtsi +++ b/arch/arm/dts/rk3588j-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588j.dtsi b/arch/arm/dts/rk3588j.dtsi index 38b9dbf38a..24dd1218e8 100644 --- a/arch/arm/dts/rk3588j.dtsi +++ b/arch/arm/dts/rk3588j.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Rockchip Electronics Co., Ltd. * diff --git a/arch/arm/dts/rk3588s-pinctrl.dtsi b/arch/arm/dts/rk3588s-pinctrl.dtsi index 48181671ea..bbe7158dea 100644 --- a/arch/arm/dts/rk3588s-pinctrl.dtsi +++ b/arch/arm/dts/rk3588s-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi index c47b0a7112..3e975810cb 100644 --- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2023 Collabora Ltd. */ diff --git a/arch/arm/dts/rk3588s-rock-5a.dts b/arch/arm/dts/rk3588s-rock-5a.dts index 8347adcbd0..742a2adb75 100644 --- a/arch/arm/dts/rk3588s-rock-5a.dts +++ b/arch/arm/dts/rk3588s-rock-5a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /dts-v1/; diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index 27b2d7eff8..e66570aca3 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rk3588s.dtsi b/arch/arm/dts/rk3588s.dtsi index 5544f66c6f..c0d6e2eaa8 100644 --- a/arch/arm/dts/rk3588s.dtsi +++ b/arch/arm/dts/rk3588s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rk3xxx-u-boot.dtsi b/arch/arm/dts/rk3xxx-u-boot.dtsi index 6af6a451ea..56d6df91b2 100644 --- a/arch/arm/dts/rk3xxx-u-boot.dtsi +++ b/arch/arm/dts/rk3xxx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) / { noc: syscon@10128000 { diff --git a/arch/arm/dts/rk3xxx.dtsi b/arch/arm/dts/rk3xxx.dtsi index cb4e42ede5..3a4ff4ac1f 100644 --- a/arch/arm/dts/rk3xxx.dtsi +++ b/arch/arm/dts/rk3xxx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2013 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/arch/arm/dts/rockchip-pinconf.dtsi b/arch/arm/dts/rockchip-pinconf.dtsi index 5c645437b5..c93e0343b4 100644 --- a/arch/arm/dts/rockchip-pinconf.dtsi +++ b/arch/arm/dts/rockchip-pinconf.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi index 26b53eac47..6d242dd449 100644 --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2019 Radxa Limited diff --git a/arch/arm/dts/rockchip-u-boot.dtsi b/arch/arm/dts/rockchip-u-boot.dtsi index c8c928c7e5..ce20b9d299 100644 --- a/arch/arm/dts/rockchip-u-boot.dtsi +++ b/arch/arm/dts/rockchip-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rv1108-elgin-r1.dts b/arch/arm/dts/rv1108-elgin-r1.dts index 83e8b31838..2e73d5021c 100644 --- a/arch/arm/dts/rv1108-elgin-r1.dts +++ b/arch/arm/dts/rv1108-elgin-r1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rv1108-evb.dts b/arch/arm/dts/rv1108-evb.dts index c91776bc10..b3624b5d0d 100644 --- a/arch/arm/dts/rv1108-evb.dts +++ b/arch/arm/dts/rv1108-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi index ccf2d8bd83..8cde7a7032 100644 --- a/arch/arm/dts/rv1108-u-boot.dtsi +++ b/arch/arm/dts/rv1108-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/rv1108.dtsi b/arch/arm/dts/rv1108.dtsi index 215d885225..8059a7206b 100644 --- a/arch/arm/dts/rv1108.dtsi +++ b/arch/arm/dts/rv1108.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi b/arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi index 51a1617708..1fe2ad05de 100644 --- a/arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi +++ b/arch/arm/dts/rv1126-edgeble-neu2-io-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rv1126-edgeble-neu2-io.dts b/arch/arm/dts/rv1126-edgeble-neu2-io.dts index dded0a12f0..61344f6821 100644 --- a/arch/arm/dts/rv1126-edgeble-neu2-io.dts +++ b/arch/arm/dts/rv1126-edgeble-neu2-io.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Rockchip Electronics Co., Ltd. * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. diff --git a/arch/arm/dts/rv1126-edgeble-neu2.dtsi b/arch/arm/dts/rv1126-edgeble-neu2.dtsi index cc64ba4be3..42ea1667aa 100644 --- a/arch/arm/dts/rv1126-edgeble-neu2.dtsi +++ b/arch/arm/dts/rv1126-edgeble-neu2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Rockchip Electronics Co., Ltd. * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. diff --git a/arch/arm/dts/rv1126-pinctrl.dtsi b/arch/arm/dts/rv1126-pinctrl.dtsi index 28d8d29942..8f277c7427 100644 --- a/arch/arm/dts/rv1126-pinctrl.dtsi +++ b/arch/arm/dts/rv1126-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/dts/rv1126-u-boot.dtsi b/arch/arm/dts/rv1126-u-boot.dtsi index 5e348278f2..f00e88f271 100644 --- a/arch/arm/dts/rv1126-u-boot.dtsi +++ b/arch/arm/dts/rv1126-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/arch/arm/dts/rv1126.dtsi b/arch/arm/dts/rv1126.dtsi index 1cb43147e9..2436266419 100644 --- a/arch/arm/dts/rv1126.dtsi +++ b/arch/arm/dts/rv1126.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/dts/s5p4418-nanopi2.dts b/arch/arm/dts/s5p4418-nanopi2.dts index 42251e0a05..eeb7b3029a 100644 --- a/arch/arm/dts/s5p4418-nanopi2.dts +++ b/arch/arm/dts/s5p4418-nanopi2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Stefan Bosch <stefan_b(a)posteo.net> * diff --git a/arch/arm/dts/s5p4418-pinctrl.dtsi b/arch/arm/dts/s5p4418-pinctrl.dtsi index 0768d80fc9..3b20337cf1 100644 --- a/arch/arm/dts/s5p4418-pinctrl.dtsi +++ b/arch/arm/dts/s5p4418-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Nexell's s5p6818 SoC pin-mux and pin-config device tree source * diff --git a/arch/arm/dts/s5p4418.dtsi b/arch/arm/dts/s5p4418.dtsi index d83eb52109..f0ebb8568b 100644 --- a/arch/arm/dts/s5p4418.dtsi +++ b/arch/arm/dts/s5p4418.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Stefan Bosch <stefan_b(a)posteo.net> * diff --git a/arch/arm/dts/s5pc100-pinctrl.dtsi b/arch/arm/dts/s5pc100-pinctrl.dtsi index 290f4cfd03..13befb2ae9 100644 --- a/arch/arm/dts/s5pc100-pinctrl.dtsi +++ b/arch/arm/dts/s5pc100-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/s5pc110-pinctrl.dtsi b/arch/arm/dts/s5pc110-pinctrl.dtsi index ea97ca6a92..9d85711fdf 100644 --- a/arch/arm/dts/s5pc110-pinctrl.dtsi +++ b/arch/arm/dts/s5pc110-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions to enable a generic Exynos GPIO driver * diff --git a/arch/arm/dts/s5pc1xx-goni.dts b/arch/arm/dts/s5pc1xx-goni.dts index 90e3405040..6e6957dc69 100644 --- a/arch/arm/dts/s5pc1xx-goni.dts +++ b/arch/arm/dts/s5pc1xx-goni.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's S5PC110-based Goni board device tree source * diff --git a/arch/arm/dts/s5pc1xx-smdkc100.dts b/arch/arm/dts/s5pc1xx-smdkc100.dts index d36d662cce..71eb19ab16 100644 --- a/arch/arm/dts/s5pc1xx-smdkc100.dts +++ b/arch/arm/dts/s5pc1xx-smdkc100.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung's Exynos4210-based SMDKV310 board device tree source * diff --git a/arch/arm/dts/s700-cubieboard7.dts b/arch/arm/dts/s700-cubieboard7.dts index 63e375cd9e..e76a4c9608 100644 --- a/arch/arm/dts/s700-cubieboard7.dts +++ b/arch/arm/dts/s700-cubieboard7.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Andreas Färber */ diff --git a/arch/arm/dts/s700-u-boot.dtsi b/arch/arm/dts/s700-u-boot.dtsi index d21baf1053..991080c98b 100644 --- a/arch/arm/dts/s700-u-boot.dtsi +++ b/arch/arm/dts/s700-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Amit Singh Tomar <amittomer25(a)gmail.com> */ diff --git a/arch/arm/dts/s700.dtsi b/arch/arm/dts/s700.dtsi index 2c78caebf5..09f42fac76 100644 --- a/arch/arm/dts/s700.dtsi +++ b/arch/arm/dts/s700.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Andreas Färber */ diff --git a/arch/arm/dts/s900-u-boot.dtsi b/arch/arm/dts/s900-u-boot.dtsi index 4f47486aac..d2b79c2b8f 100644 --- a/arch/arm/dts/s900-u-boot.dtsi +++ b/arch/arm/dts/s900-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* */ diff --git a/arch/arm/dts/s900.dtsi b/arch/arm/dts/s900.dtsi index eb35cf78ab..fb32a67a79 100644 --- a/arch/arm/dts/s900.dtsi +++ b/arch/arm/dts/s900.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2017 Andreas Färber */ diff --git a/arch/arm/dts/sam9x60.dtsi b/arch/arm/dts/sam9x60.dtsi index 3b684fc63d..d99a9e8c34 100644 --- a/arch/arm/dts/sam9x60.dtsi +++ b/arch/arm/dts/sam9x60.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * sam9x60.dtsi - Device Tree Include file for SAM9X60 SoC. * diff --git a/arch/arm/dts/sam9x60ek-u-boot.dtsi b/arch/arm/dts/sam9x60ek-u-boot.dtsi index fd2afa8a2f..eec00cc4d3 100644 --- a/arch/arm/dts/sam9x60ek-u-boot.dtsi +++ b/arch/arm/dts/sam9x60ek-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * sam9x60-u-boot.dts - Device Tree file for SAM9X60 SoC. * diff --git a/arch/arm/dts/sam9x60ek.dts b/arch/arm/dts/sam9x60ek.dts index 74016f5e28..67bddcb172 100644 --- a/arch/arm/dts/sam9x60ek.dts +++ b/arch/arm/dts/sam9x60ek.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * sam9x60ek.dts - Device Tree file for SAM9X60 EK board * diff --git a/arch/arm/dts/sama5d27_wlsom1.dtsi b/arch/arm/dts/sama5d27_wlsom1.dtsi index 1c23b8c737..1b31bf5bcd 100644 --- a/arch/arm/dts/sama5d27_wlsom1.dtsi +++ b/arch/arm/dts/sama5d27_wlsom1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * sama5d27_wlsom1.dtsi - Device Tree file for SAMA5D27 WLSOM1 * diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi index 746a5ba347..c220274d32 100644 --- a/arch/arm/dts/sama7g5.dtsi +++ b/arch/arm/dts/sama7g5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * sama7g5.dtsi - Device Tree Include file for SAMA7G5 family SoC * diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi index 3b86b9328f..e488d1c036 100644 --- a/arch/arm/dts/sdm845.dtsi +++ b/arch/arm/dts/sdm845.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm SDM845 chip device tree source * diff --git a/arch/arm/dts/socfpga-common-u-boot.dtsi b/arch/arm/dts/socfpga-common-u-boot.dtsi index eb3d103931..a13ebd7cc5 100644 --- a/arch/arm/dts/socfpga-common-u-boot.dtsi +++ b/arch/arm/dts/socfpga-common-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index ff79d335ac..fba71dd03c 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_agilex-u-boot.dtsi b/arch/arm/dts/socfpga_agilex-u-boot.dtsi index 4d7680455b..626dec63f4 100644 --- a/arch/arm/dts/socfpga_agilex-u-boot.dtsi +++ b/arch/arm/dts/socfpga_agilex-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi index 63df28e836..5448a993e9 100644 --- a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_arria10-handoff.dtsi b/arch/arm/dts/socfpga_arria10-handoff.dtsi index a3afb4d9df..7f8cb2f403 100644 --- a/arch/arm/dts/socfpga_arria10-handoff.dtsi +++ b/arch/arm/dts/socfpga_arria10-handoff.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 / { clocks { diff --git a/arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi b/arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi index 3396fb8003..9ac0e7e34d 100644 --- a/arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi +++ b/arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 / { chosen { diff --git a/arch/arm/dts/socfpga_arria10_socdk.dtsi b/arch/arm/dts/socfpga_arria10_socdk.dtsi index 0efbeccc5c..ad16cadb21 100644 --- a/arch/arm/dts/socfpga_arria10_socdk.dtsi +++ b/arch/arm/dts/socfpga_arria10_socdk.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts b/arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts index 64dc0799f3..a4ff2d4f30 100644 --- a/arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +++ b/arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_arria5_secu1.dts b/arch/arm/dts/socfpga_arria5_secu1.dts index 8e9c3bbdf9..29a40fbd3f 100644 --- a/arch/arm/dts/socfpga_arria5_secu1.dts +++ b/arch/arm/dts/socfpga_arria5_secu1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2020 Hitachi Power Grids */ diff --git a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi index 62116faafa..10530a6883 100644 --- a/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts index fa972e287f..f8950d7457 100644 --- a/arch/arm/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/dts/socfpga_arria5_socdk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_cyclone5.dtsi b/arch/arm/dts/socfpga_cyclone5.dtsi index 319a71e41e..65756186c6 100644 --- a/arch/arm/dts/socfpga_cyclone5.dtsi +++ b/arch/arm/dts/socfpga_cyclone5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts b/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts index ca030c8c41..1593442236 100644 --- a/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts +++ b/arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi index 8d2caf69dd..20cf72b5b9 100644 --- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_de10_nano.dts b/arch/arm/dts/socfpga_cyclone5_de10_nano.dts index 34886ec1ad..6deb28db7a 100644 --- a/arch/arm/dts/socfpga_cyclone5_de10_nano.dts +++ b/arch/arm/dts/socfpga_cyclone5_de10_nano.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Intel Corporation * diff --git a/arch/arm/dts/socfpga_cyclone5_de10_standard.dts b/arch/arm/dts/socfpga_cyclone5_de10_standard.dts index b38f072382..673ee8751f 100644 --- a/arch/arm/dts/socfpga_cyclone5_de10_standard.dts +++ b/arch/arm/dts/socfpga_cyclone5_de10_standard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Intel Corporation * diff --git a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts index e9de72429f..37cc867905 100644 --- a/arch/arm/dts/socfpga_cyclone5_de1_soc.dts +++ b/arch/arm/dts/socfpga_cyclone5_de1_soc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright Altera Corporation (C) 2015 */ diff --git a/arch/arm/dts/socfpga_cyclone5_is1.dts b/arch/arm/dts/socfpga_cyclone5_is1.dts index 58a5faf6ea..d499986212 100644 --- a/arch/arm/dts/socfpga_cyclone5_is1.dts +++ b/arch/arm/dts/socfpga_cyclone5_is1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_cyclone5_mcv.dtsi b/arch/arm/dts/socfpga_cyclone5_mcv.dtsi index bd92806ffc..0ffa00daad 100644 --- a/arch/arm/dts/socfpga_cyclone5_mcv.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_mcv.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_mcvevk-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_mcvevk-u-boot.dtsi index 4cadfcd4f1..3695c7ebf5 100644 --- a/arch/arm/dts/socfpga_cyclone5_mcvevk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_mcvevk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts index ceaec29770..dc8ade1cd0 100644 --- a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts +++ b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi index bca4b0887b..f8e1d5fff4 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts index 95c7619b8d..ed803c262e 100644 --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi index 4b99a24701..b3fa75af5d 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts index 90669cde45..cb039058f4 100644 --- a/arch/arm/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Steffen Trumtrar <s.trumtrar(a)pengutronix.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi index 12c70c1537..daefe1a32c 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts index 8d5d3996f6..b743b95b9d 100644 --- a/arch/arm/dts/socfpga_cyclone5_socrates.dts +++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Steffen Trumtrar <s.trumtrar(a)pengutronix.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_sr1500.dts b/arch/arm/dts/socfpga_cyclone5_sr1500.dts index 56031e576f..a9e43f3403 100644 --- a/arch/arm/dts/socfpga_cyclone5_sr1500.dts +++ b/arch/arm/dts/socfpga_cyclone5_sr1500.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi index 330949c018..62728a487a 100644 --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts index 3fb6e14372..66653034af 100644 --- a/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts +++ b/arch/arm/dts/socfpga_cyclone5_vining_fpga.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright (C) 2015-2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/socfpga_n5x-u-boot.dtsi b/arch/arm/dts/socfpga_n5x-u-boot.dtsi index e27a64651e..bf89b7b6e7 100644 --- a/arch/arm/dts/socfpga_n5x-u-boot.dtsi +++ b/arch/arm/dts/socfpga_n5x-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi index 840537c9d0..e9888f0082 100644 --- a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi index 84b91e8df0..ab960531b3 100644 --- a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +++ b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_stratix10-u-boot.dtsi b/arch/arm/dts/socfpga_stratix10-u-boot.dtsi index 3e3a378046..bab6a737ac 100644 --- a/arch/arm/dts/socfpga_stratix10-u-boot.dtsi +++ b/arch/arm/dts/socfpga_stratix10-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi index ef0df76976..d48ac06347 100755 --- a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot additions * diff --git a/arch/arm/dts/starqltechn-uboot.dtsi b/arch/arm/dts/starqltechn-uboot.dtsi index d81a22ffe4..523c9b9889 100644 --- a/arch/arm/dts/starqltechn-uboot.dtsi +++ b/arch/arm/dts/starqltechn-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot addition to handle Samsung S9 SM-G9600 (starqltechn) pins * diff --git a/arch/arm/dts/starqltechn.dts b/arch/arm/dts/starqltechn.dts index eec51d165f..b99ed60616 100644 --- a/arch/arm/dts/starqltechn.dts +++ b/arch/arm/dts/starqltechn.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung S9 SM-G9600 (starqltechn) board device tree source * diff --git a/arch/arm/dts/stm32429i-eval-u-boot.dtsi b/arch/arm/dts/stm32429i-eval-u-boot.dtsi index e909653137..5d82ad882f 100644 --- a/arch/arm/dts/stm32429i-eval-u-boot.dtsi +++ b/arch/arm/dts/stm32429i-eval-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32429i-eval.dts b/arch/arm/dts/stm32429i-eval.dts index 592b182c1a..046d9d1a48 100644 --- a/arch/arm/dts/stm32429i-eval.dts +++ b/arch/arm/dts/stm32429i-eval.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, STMicroelectronics - All Rights Reserved * Author: Maxime Coquelin <mcoquelin.stm32(a)gmail.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32746g-eval-u-boot.dtsi b/arch/arm/dts/stm32746g-eval-u-boot.dtsi index 1c288acec9..b4faa94ed4 100644 --- a/arch/arm/dts/stm32746g-eval-u-boot.dtsi +++ b/arch/arm/dts/stm32746g-eval-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32f7-u-boot.dtsi> /{ diff --git a/arch/arm/dts/stm32746g-eval.dts b/arch/arm/dts/stm32746g-eval.dts index 0e6445a539..cd4a90c3c5 100644 --- a/arch/arm/dts/stm32746g-eval.dts +++ b/arch/arm/dts/stm32746g-eval.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32(a)gmail.com> * diff --git a/arch/arm/dts/stm32f4-pinctrl.dtsi b/arch/arm/dts/stm32f4-pinctrl.dtsi index 0adc41b2a4..3f32dc739f 100644 --- a/arch/arm/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/dts/stm32f4-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Alexandre Torgue <alexandre.torgue(a)st.com> * diff --git a/arch/arm/dts/stm32f429-disco-u-boot.dtsi b/arch/arm/dts/stm32f429-disco-u-boot.dtsi index 9a3b4acfb1..34f6272817 100644 --- a/arch/arm/dts/stm32f429-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f429-disco-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32f429-disco.dts b/arch/arm/dts/stm32f429-disco.dts index 30daabd10a..c6d3086ca2 100644 --- a/arch/arm/dts/stm32f429-disco.dts +++ b/arch/arm/dts/stm32f429-disco.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32(a)gmail.com> */ diff --git a/arch/arm/dts/stm32f429-pinctrl.dtsi b/arch/arm/dts/stm32f429-pinctrl.dtsi index 5be171eea5..e1905534f5 100644 --- a/arch/arm/dts/stm32f429-pinctrl.dtsi +++ b/arch/arm/dts/stm32f429-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Alexandre Torgue <alexandre.torgue(a)st.com> * diff --git a/arch/arm/dts/stm32f429.dtsi b/arch/arm/dts/stm32f429.dtsi index 8133ea15b0..f6d3334c11 100644 --- a/arch/arm/dts/stm32f429.dtsi +++ b/arch/arm/dts/stm32f429.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32(a)gmail.com> * diff --git a/arch/arm/dts/stm32f469-disco-u-boot.dtsi b/arch/arm/dts/stm32f469-disco-u-boot.dtsi index c07e2022e4..ae59e4f50f 100644 --- a/arch/arm/dts/stm32f469-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f469-disco-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32f469-disco.dts b/arch/arm/dts/stm32f469-disco.dts index 6e0ffc1903..8ebe4caccf 100644 --- a/arch/arm/dts/stm32f469-disco.dts +++ b/arch/arm/dts/stm32f469-disco.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2016 - Lee Jones <lee.jones(a)linaro.org> * diff --git a/arch/arm/dts/stm32f469-pinctrl.dtsi b/arch/arm/dts/stm32f469-pinctrl.dtsi index 0610407c7b..1f2d162ed7 100644 --- a/arch/arm/dts/stm32f469-pinctrl.dtsi +++ b/arch/arm/dts/stm32f469-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Alexandre Torgue <alexandre.torgue(a)st.com> */ diff --git a/arch/arm/dts/stm32f469.dtsi b/arch/arm/dts/stm32f469.dtsi index 5f6a7976bb..6f8e38b748 100644 --- a/arch/arm/dts/stm32f469.dtsi +++ b/arch/arm/dts/stm32f469.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* Copyright (C) STMicroelectronics 2017 - All Rights Reserved */ #include "stm32f429.dtsi" diff --git a/arch/arm/dts/stm32f7-pinctrl.dtsi b/arch/arm/dts/stm32f7-pinctrl.dtsi index d3706ee33b..ac9100bebe 100644 --- a/arch/arm/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/dts/stm32f7-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi index efc4e2afe1..866a3b240d 100644 --- a/arch/arm/dts/stm32f7-u-boot.dtsi +++ b/arch/arm/dts/stm32f7-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/memory/stm32-sdram.h> /{ diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi index 1b42d6cbbc..02513b57e7 100644 --- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32f7-u-boot.dtsi> /{ diff --git a/arch/arm/dts/stm32f746-disco.dts b/arch/arm/dts/stm32f746-disco.dts index 4312751340..25b6f2add0 100644 --- a/arch/arm/dts/stm32f746-disco.dts +++ b/arch/arm/dts/stm32f746-disco.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Vikas MANOCHA <vikas.manocha(a)st.com> * diff --git a/arch/arm/dts/stm32f746-pinctrl.dtsi b/arch/arm/dts/stm32f746-pinctrl.dtsi index fcfd2ac723..b84d6a1409 100644 --- a/arch/arm/dts/stm32f746-pinctrl.dtsi +++ b/arch/arm/dts/stm32f746-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi index 79dad3192e..ad54c893fb 100644 --- a/arch/arm/dts/stm32f746.dtsi +++ b/arch/arm/dts/stm32f746.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32(a)gmail.com> * diff --git a/arch/arm/dts/stm32f769-disco-u-boot.dtsi b/arch/arm/dts/stm32f769-disco-u-boot.dtsi index 2c823cce98..cb43f4f80c 100644 --- a/arch/arm/dts/stm32f769-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f769-disco-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32f7-u-boot.dtsi> /{ diff --git a/arch/arm/dts/stm32f769-disco.dts b/arch/arm/dts/stm32f769-disco.dts index 6f93fc7bcf..887c035e2e 100644 --- a/arch/arm/dts/stm32f769-disco.dts +++ b/arch/arm/dts/stm32f769-disco.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Vikas MANOCHA <vikas.manocha(a)st.com> * diff --git a/arch/arm/dts/stm32f769-pinctrl.dtsi b/arch/arm/dts/stm32f769-pinctrl.dtsi index 31005dd992..ab4bfaf844 100644 --- a/arch/arm/dts/stm32f769-pinctrl.dtsi +++ b/arch/arm/dts/stm32f769-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32h7-u-boot.dtsi b/arch/arm/dts/stm32h7-u-boot.dtsi index dea4db396c..dc42fdca47 100644 --- a/arch/arm/dts/stm32h7-u-boot.dtsi +++ b/arch/arm/dts/stm32h7-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/memory/stm32-sdram.h> diff --git a/arch/arm/dts/stm32h743.dtsi b/arch/arm/dts/stm32h743.dtsi index c490d0a571..15c61042e5 100644 --- a/arch/arm/dts/stm32h743.dtsi +++ b/arch/arm/dts/stm32h743.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Alexandre Torgue <alexandre.torgue(a)st.com> * diff --git a/arch/arm/dts/stm32h743i-disco-u-boot.dtsi b/arch/arm/dts/stm32h743i-disco-u-boot.dtsi index 02e28c63f2..c5ced34340 100644 --- a/arch/arm/dts/stm32h743i-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32h743i-disco-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32h7-u-boot.dtsi> diff --git a/arch/arm/dts/stm32h743i-disco.dts b/arch/arm/dts/stm32h743i-disco.dts index b31188f8b9..f5839185ac 100644 --- a/arch/arm/dts/stm32h743i-disco.dts +++ b/arch/arm/dts/stm32h743i-disco.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2017 - Patrice Chotard <patrice.chotard(a)foss.st.com> * diff --git a/arch/arm/dts/stm32h743i-eval-u-boot.dtsi b/arch/arm/dts/stm32h743i-eval-u-boot.dtsi index 02e28c63f2..c5ced34340 100644 --- a/arch/arm/dts/stm32h743i-eval-u-boot.dtsi +++ b/arch/arm/dts/stm32h743i-eval-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32h7-u-boot.dtsi> diff --git a/arch/arm/dts/stm32h750.dtsi b/arch/arm/dts/stm32h750.dtsi index 99533f356b..3676150946 100644 --- a/arch/arm/dts/stm32h750.dtsi +++ b/arch/arm/dts/stm32h750.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* Copyright (C) STMicroelectronics 2021 - All Rights Reserved */ #include "stm32h743.dtsi" diff --git a/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi b/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi index 326a5533b7..2b7a18d867 100644 --- a/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi +++ b/arch/arm/dts/stm32h750i-art-pi-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stm32h7-u-boot.dtsi> diff --git a/arch/arm/dts/stm32h750i-art-pi.dts b/arch/arm/dts/stm32h750i-art-pi.dts index c7c7132f22..29d9d74806 100644 --- a/arch/arm/dts/stm32h750i-art-pi.dts +++ b/arch/arm/dts/stm32h750i-art-pi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2021 - Dillon Min <dillon.minfei(a)gmail.com> * diff --git a/arch/arm/dts/stm32mp13-pinctrl.dtsi b/arch/arm/dts/stm32mp13-pinctrl.dtsi index 27e0c38267..a9f195c2f3 100644 --- a/arch/arm/dts/stm32mp13-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp13-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi index 215ad9298d..d33e9630bb 100644 --- a/arch/arm/dts/stm32mp131.dtsi +++ b/arch/arm/dts/stm32mp131.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp133.dtsi b/arch/arm/dts/stm32mp133.dtsi index df451c3c2a..7d8237faec 100644 --- a/arch/arm/dts/stm32mp133.dtsi +++ b/arch/arm/dts/stm32mp133.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp135.dtsi b/arch/arm/dts/stm32mp135.dtsi index abf2acd37b..d74e2d1c90 100644 --- a/arch/arm/dts/stm32mp135.dtsi +++ b/arch/arm/dts/stm32mp135.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp135f-dk.dts b/arch/arm/dts/stm32mp135f-dk.dts index eea740d097..3c169a7e4d 100644 --- a/arch/arm/dts/stm32mp135f-dk.dts +++ b/arch/arm/dts/stm32mp135f-dk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp13xc.dtsi b/arch/arm/dts/stm32mp13xc.dtsi index 4d00e75928..7411cd9f80 100644 --- a/arch/arm/dts/stm32mp13xc.dtsi +++ b/arch/arm/dts/stm32mp13xc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp13xf.dtsi b/arch/arm/dts/stm32mp13xf.dtsi index 4d00e75928..7411cd9f80 100644 --- a/arch/arm/dts/stm32mp13xf.dtsi +++ b/arch/arm/dts/stm32mp13xf.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2021 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15-ddr.dtsi b/arch/arm/dts/stm32mp15-ddr.dtsi index 48b0828828..85d07bf0ef 100644 --- a/arch/arm/dts/stm32mp15-ddr.dtsi +++ b/arch/arm/dts/stm32mp15-ddr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi index e60d0ae606..73f9d71777 100644 --- a/arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-1x4Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi index 1a6fa80edf..7daf9b6012 100644 --- a/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi index 0a277cd675..0b65482728 100644 --- a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, DH electronics - All Rights Reserved * diff --git a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi index 92774fffb9..ab8a9027df 100644 --- a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, DH electronics - All Rights Reserved * diff --git a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi index e53ab18a69..a1659ba4f7 100644 --- a/arch/arm/dts/stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, DH electronics - All Rights Reserved * diff --git a/arch/arm/dts/stm32mp15-ddr3-icore-1x4Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-icore-1x4Gb-1066-binG.dtsi index ff582ac6af..f8b8a7c8af 100644 --- a/arch/arm/dts/stm32mp15-ddr3-icore-1x4Gb-1066-binG.dtsi +++ b/arch/arm/dts/stm32mp15-ddr3-icore-1x4Gb-1066-binG.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/dts/stm32mp15-pinctrl.dtsi b/arch/arm/dts/stm32mp15-pinctrl.dtsi index 098153ee99..fb261c5c47 100644 --- a/arch/arm/dts/stm32mp15-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp15-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Ludovic Barre <ludovic.barre(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15-scmi.dtsi b/arch/arm/dts/stm32mp15-scmi.dtsi index dc3b09f2f2..3dbc7e8d6a 100644 --- a/arch/arm/dts/stm32mp15-scmi.dtsi +++ b/arch/arm/dts/stm32mp15-scmi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2022 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi b/arch/arm/dts/stm32mp15-u-boot.dtsi index 573dd4d3ed..ae9586e448 100644 --- a/arch/arm/dts/stm32mp15-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi index e277140d36..da3189e5ff 100644 --- a/arch/arm/dts/stm32mp151.dtsi +++ b/arch/arm/dts/stm32mp151.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Ludovic Barre <ludovic.barre(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp153.dtsi b/arch/arm/dts/stm32mp153.dtsi index 486084e0b8..108d220b16 100644 --- a/arch/arm/dts/stm32mp153.dtsi +++ b/arch/arm/dts/stm32mp153.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157.dtsi b/arch/arm/dts/stm32mp157.dtsi index 6197d87889..ee05218b9e 100644 --- a/arch/arm/dts/stm32mp157.dtsi +++ b/arch/arm/dts/stm32mp157.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157a-dk1-scmi.dts b/arch/arm/dts/stm32mp157a-dk1-scmi.dts index afcd628589..d5a600ebcd 100644 --- a/arch/arm/dts/stm32mp157a-dk1-scmi.dts +++ b/arch/arm/dts/stm32mp157a-dk1-scmi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2022 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi index 2623cebf21..a2d7110c50 100644 --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts index 0da3667ab1..2f290be1b6 100644 --- a/arch/arm/dts/stm32mp157a-dk1.dts +++ b/arch/arm/dts/stm32mp157a-dk1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi index 5547535975..042702db63 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts index 1f75f1d451..ff8977ce45 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi b/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi index 5547535975..042702db63 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts b/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts index 3a1295cfa9..cd60550a0d 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-icore-stm32mp1-u-boot.dtsi index 630c96efd0..14bc725cde 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-icore-stm32mp1.dtsi b/arch/arm/dts/stm32mp157a-icore-stm32mp1.dtsi index 01166ccacf..bf9271ba8d 100644 --- a/arch/arm/dts/stm32mp157a-icore-stm32mp1.dtsi +++ b/arch/arm/dts/stm32mp157a-icore-stm32mp1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7-u-boot.dtsi b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7-u-boot.dtsi index a5e7060922..6f9f473371 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts index f4a4942985..40c093cce8 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-u-boot.dtsi b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-u-boot.dtsi index a5e7060922..6f9f473371 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts index b9d0d3d6ad..e5b59bf762 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-u-boot.dtsi index 7bba28af5b..13e2d21dca 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Amarula Solutions(India) diff --git a/arch/arm/dts/stm32mp157a-microgea-stm32mp1.dtsi b/arch/arm/dts/stm32mp157a-microgea-stm32mp1.dtsi index 0b85175f15..addcacb060 100644 --- a/arch/arm/dts/stm32mp157a-microgea-stm32mp1.dtsi +++ b/arch/arm/dts/stm32mp157a-microgea-stm32mp1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (c) STMicroelectronics 2019 - All Rights Reserved * Copyright (c) 2020 Engicam srl diff --git a/arch/arm/dts/stm32mp157c-dk2-scmi.dts b/arch/arm/dts/stm32mp157c-dk2-scmi.dts index 39358d9020..b5a0325b24 100644 --- a/arch/arm/dts/stm32mp157c-dk2-scmi.dts +++ b/arch/arm/dts/stm32mp157c-dk2-scmi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2022 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi b/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi index 24f86209db..a33e1f2365 100644 --- a/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-dk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk2.dts index 510cca5acb..399fc11546 100644 --- a/arch/arm/dts/stm32mp157c-dk2.dts +++ b/arch/arm/dts/stm32mp157c-dk2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-ed1-scmi.dts b/arch/arm/dts/stm32mp157c-ed1-scmi.dts index 07ea765a45..22c4f2836a 100644 --- a/arch/arm/dts/stm32mp157c-ed1-scmi.dts +++ b/arch/arm/dts/stm32mp157c-ed1-scmi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2022 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi index b8288273dd..ac092762b6 100644 --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts index 66ed5f9921..c1ae014628 100644 --- a/arch/arm/dts/stm32mp157c-ed1.dts +++ b/arch/arm/dts/stm32mp157c-ed1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Ludovic Barre <ludovic.barre(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-ev1-scmi.dts b/arch/arm/dts/stm32mp157c-ev1-scmi.dts index 813086ec24..d3ea270b47 100644 --- a/arch/arm/dts/stm32mp157c-ev1-scmi.dts +++ b/arch/arm/dts/stm32mp157c-ev1-scmi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2022 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi index 1f7fdbce53..f46e779e76 100644 --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright : STMicroelectronics 2018 */ diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev1.dts index cd9c3ff537..4c61a49298 100644 --- a/arch/arm/dts/stm32mp157c-ev1.dts +++ b/arch/arm/dts/stm32mp157c-ev1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Ludovic Barre <ludovic.barre(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi b/arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi index b780dbd95e..508e0c382c 100644 --- a/arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marcin Sloniewski <marcin.sloniewski(a)gmail.com> */ diff --git a/arch/arm/dts/stm32mp157c-odyssey-som.dtsi b/arch/arm/dts/stm32mp157c-odyssey-som.dtsi index 1510a5b364..d029113552 100644 --- a/arch/arm/dts/stm32mp157c-odyssey-som.dtsi +++ b/arch/arm/dts/stm32mp157c-odyssey-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2020 Marcin Sloniewski <marcin.sloniewski(a)gmail.com> */ diff --git a/arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi b/arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi index c1e35f2049..3486d5c941 100644 --- a/arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-odyssey-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marcin Sloniewski <marcin.sloniewski(a)gmail.com> */ diff --git a/arch/arm/dts/stm32mp157c-odyssey.dts b/arch/arm/dts/stm32mp157c-odyssey.dts index 17bcf56f74..6677d86938 100644 --- a/arch/arm/dts/stm32mp157c-odyssey.dts +++ b/arch/arm/dts/stm32mp157c-odyssey.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2020 Marcin Sloniewski <marcin.sloniewski(a)gmail.com> */ diff --git a/arch/arm/dts/stm32mp15xc.dtsi b/arch/arm/dts/stm32mp15xc.dtsi index b06a55a2fa..e0eda2a697 100644 --- a/arch/arm/dts/stm32mp15xc.dtsi +++ b/arch/arm/dts/stm32mp15xc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15xx-dhcom-drc02-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-drc02-u-boot.dtsi index f83cfe90b8..6540e5061d 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-drc02-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-drc02-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-drc02.dts b/arch/arm/dts/stm32mp15xx-dhcom-drc02.dts index 1ef9ac29ce..fb05b9060c 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-drc02.dts +++ b/arch/arm/dts/stm32mp15xx-dhcom-drc02.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi index 35b1034aa3..1ea5395c4f 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-pdk2-u-boot.dtsi index 2324926f9d..8421602fff 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-pdk2-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts b/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts index e2e01e2146..ba8da0969b 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts +++ b/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi index 5f586f0240..0853d11405 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019-2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-picoitx-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-picoitx-u-boot.dtsi index 0bcaec5019..d2676a93bf 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-picoitx-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-picoitx-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts b/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts index 06770b4787..fb435053d9 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts +++ b/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi index abc595350e..e0ff8ce504 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-som.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-som.dtsi index d3b85a8764..324987ae26 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-som.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-som.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) 2019-2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi index f12941b05f..9591856150 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi index ab4d66c961..826251d1cc 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-avenger96-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcor-drc-compact-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-drc-compact-u-boot.dtsi index 038c3a92eb..a5ac7bb346 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-drc-compact-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-drc-compact-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dhcor-testbench-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-testbench-u-boot.dtsi index 31995c058e..1256b73519 100644 --- a/arch/arm/dts/stm32mp15xx-dhcor-testbench-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcor-testbench-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/dts/stm32mp15xx-dkx.dtsi b/arch/arm/dts/stm32mp15xx-dkx.dtsi index 511113f2e3..d0d62c9041 100644 --- a/arch/arm/dts/stm32mp15xx-dkx.dtsi +++ b/arch/arm/dts/stm32mp15xx-dkx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15xxaa-pinctrl.dtsi b/arch/arm/dts/stm32mp15xxaa-pinctrl.dtsi index 04f7a43ad6..3dfb9e4828 100644 --- a/arch/arm/dts/stm32mp15xxaa-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp15xxaa-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15xxab-pinctrl.dtsi b/arch/arm/dts/stm32mp15xxab-pinctrl.dtsi index 328dad140e..f158232ba7 100644 --- a/arch/arm/dts/stm32mp15xxab-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp15xxab-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15xxac-pinctrl.dtsi b/arch/arm/dts/stm32mp15xxac-pinctrl.dtsi index 7eaa245f44..ecd388d9ed 100644 --- a/arch/arm/dts/stm32mp15xxac-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp15xxac-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/stm32mp15xxad-pinctrl.dtsi b/arch/arm/dts/stm32mp15xxad-pinctrl.dtsi index b63e207de2..6e54001151 100644 --- a/arch/arm/dts/stm32mp15xxad-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp15xxad-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/arch/arm/dts/sun4i-a10-inet-3f.dts b/arch/arm/dts/sun4i-a10-inet-3f.dts index 9aa8469a0c..e24d941bf5 100644 --- a/arch/arm/dts/sun4i-a10-inet-3f.dts +++ b/arch/arm/dts/sun4i-a10-inet-3f.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun4i-a10-inet-3w.dts b/arch/arm/dts/sun4i-a10-inet-3w.dts index 33232e94ed..3ca22c0c00 100644 --- a/arch/arm/dts/sun4i-a10-inet-3w.dts +++ b/arch/arm/dts/sun4i-a10-inet-3w.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun4i-a10-topwise-a721.dts b/arch/arm/dts/sun4i-a10-topwise-a721.dts index 3628f12d25..cfa5404bef 100644 --- a/arch/arm/dts/sun4i-a10-topwise-a721.dts +++ b/arch/arm/dts/sun4i-a10-topwise-a721.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Pascal Roeleven <dev(a)pascalroeleven.nl> */ diff --git a/arch/arm/dts/sun50i-a64-amarula-relic.dts b/arch/arm/dts/sun50i-a64-amarula-relic.dts index ce8f6aa164..52d1520011 100644 --- a/arch/arm/dts/sun50i-a64-amarula-relic.dts +++ b/arch/arm/dts/sun50i-a64-amarula-relic.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Amarula Solutions B.V. // Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-a64-bananapi-m64.dts index bf66b64081..ca62c1aa5d 100644 --- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts +++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2016 ARM Ltd. /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-a64-nanopi-a64.dts index ffc3b4c706..0cf61d07f4 100644 --- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts +++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Jagan Teki <jteki(a)openedev.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts index 577f9e1d08..88c4e2efcb 100644 --- a/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts +++ b/arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Oceanic Systems (UK) Ltd. // Copyright (C) 2019 Amarula Solutions B.V. // Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/dts/sun50i-a64-olinuxino-emmc.dts b/arch/arm/dts/sun50i-a64-olinuxino-emmc.dts index efb20846de..36c169b121 100644 --- a/arch/arm/dts/sun50i-a64-olinuxino-emmc.dts +++ b/arch/arm/dts/sun50i-a64-olinuxino-emmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Martin Ayotte <martinayotte(a)gmail.com> // Copyright (C) 2019 Sunil Mohan Adapa <sunil(a)medhas.org> diff --git a/arch/arm/dts/sun50i-a64-olinuxino.dts b/arch/arm/dts/sun50i-a64-olinuxino.dts index 22d350249c..f927908b99 100644 --- a/arch/arm/dts/sun50i-a64-olinuxino.dts +++ b/arch/arm/dts/sun50i-a64-olinuxino.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Jagan Teki <jteki(a)openedev.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-a64-orangepi-win.dts index 714a270a55..54cf186bb6 100644 --- a/arch/arm/dts/sun50i-a64-orangepi-win.dts +++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Jagan Teki <jteki(a)openedev.com> // Copyright (C) 2017-2018 Samuel Holland <samuel(a)sholland.org> diff --git a/arch/arm/dts/sun50i-a64-pine64-lts.dts b/arch/arm/dts/sun50i-a64-pine64-lts.dts index 596a259074..0213568de8 100644 --- a/arch/arm/dts/sun50i-a64-pine64-lts.dts +++ b/arch/arm/dts/sun50i-a64-pine64-lts.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2018 ARM Ltd. #include <dt-bindings/leds/common.h> diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-a64-pine64-plus.dts index b54099b654..4323e2d746 100644 --- a/arch/arm/dts/sun50i-a64-pine64-plus.dts +++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2016 ARM Ltd. #include "sun50i-a64-pine64.dts" diff --git a/arch/arm/dts/sun50i-a64-pine64.dts b/arch/arm/dts/sun50i-a64-pine64.dts index 329cf27656..7513ae1fa3 100644 --- a/arch/arm/dts/sun50i-a64-pine64.dts +++ b/arch/arm/dts/sun50i-a64-pine64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2016 ARM Ltd. /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-pinebook.dts b/arch/arm/dts/sun50i-a64-pinebook.dts index 576eae1322..38885a3c42 100644 --- a/arch/arm/dts/sun50i-a64-pinebook.dts +++ b/arch/arm/dts/sun50i-a64-pinebook.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.xyz> // Copyright (C) 2018 Vasily Khoruzhick <anarsoul(a)gmail.com> diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.0.dts b/arch/arm/dts/sun50i-a64-pinephone-1.0.dts index 219f720b8b..08b928b5a9 100644 --- a/arch/arm/dts/sun50i-a64-pinephone-1.0.dts +++ b/arch/arm/dts/sun50i-a64-pinephone-1.0.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Ondrej Jirman <megous(a)megous.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.1.dts b/arch/arm/dts/sun50i-a64-pinephone-1.1.dts index 723af64a9c..9d104df085 100644 --- a/arch/arm/dts/sun50i-a64-pinephone-1.1.dts +++ b/arch/arm/dts/sun50i-a64-pinephone-1.1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Ondrej Jirman <megous(a)megous.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.2.dts b/arch/arm/dts/sun50i-a64-pinephone-1.2.dts index 4e7e237cb4..248b8d6b91 100644 --- a/arch/arm/dts/sun50i-a64-pinephone-1.2.dts +++ b/arch/arm/dts/sun50i-a64-pinephone-1.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Ondrej Jirman <megous(a)megous.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-a64-pinephone.dtsi b/arch/arm/dts/sun50i-a64-pinephone.dtsi index b25e7913f5..3e0f4e159c 100644 --- a/arch/arm/dts/sun50i-a64-pinephone.dtsi +++ b/arch/arm/dts/sun50i-a64-pinephone.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Icenowy Zheng <icenowy(a)aosc.xyz> // Copyright (C) 2020 Martijn Braam <martijn(a)brixit.nl> // Copyright (C) 2020 Ondrej Jirman <megous(a)megous.com> diff --git a/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts b/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts index 6265360ce6..18b05a878e 100644 --- a/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts +++ b/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2020 Icenowy Zheng <icenowy(a)aosc.io> * diff --git a/arch/arm/dts/sun50i-a64-pinetab.dts b/arch/arm/dts/sun50i-a64-pinetab.dts index 0b2258ef88..6822bb4e36 100644 --- a/arch/arm/dts/sun50i-a64-pinetab.dts +++ b/arch/arm/dts/sun50i-a64-pinetab.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Icenowy Zheng <icenowy(a)aosc.xyz> * diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard-u-boot.dtsi b/arch/arm/dts/sun50i-a64-sopine-baseboard-u-boot.dtsi index 02b1ae046e..3f69ed4472 100644 --- a/arch/arm/dts/sun50i-a64-sopine-baseboard-u-boot.dtsi +++ b/arch/arm/dts/sun50i-a64-sopine-baseboard-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts index 5e66ce1a33..d67471ea46 100644 --- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2017 Icenowy Zheng <icenowy(a)aosc.xyz> // Based on sun50i-a64-pine64.dts, which is: // Copyright (c) 2016 ARM Ltd. diff --git a/arch/arm/dts/sun50i-a64-sopine.dtsi b/arch/arm/dts/sun50i-a64-sopine.dtsi index df62044ff7..5524d24919 100644 --- a/arch/arm/dts/sun50i-a64-sopine.dtsi +++ b/arch/arm/dts/sun50i-a64-sopine.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2017 Icenowy Zheng <icenowy(a)aosc.xyz> // Based on sun50i-a64-pine64.dts, which is: // Copyright (c) 2016 ARM Ltd. diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi index 135762b34f..b4242fed4e 100644 --- a/arch/arm/dts/sun50i-a64.dtsi +++ b/arch/arm/dts/sun50i-a64.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2016 ARM Ltd. // based on the Allwinner H3 dtsi: // Copyright (C) 2015 Jens Kuske <jenskuske(a)gmail.com> diff --git a/arch/arm/dts/sun50i-h5-bananapi-m2-plus-v1.2.dts b/arch/arm/dts/sun50i-h5-bananapi-m2-plus-v1.2.dts index 8857a37915..b2c8a5c56b 100644 --- a/arch/arm/dts/sun50i-h5-bananapi-m2-plus-v1.2.dts +++ b/arch/arm/dts/sun50i-h5-bananapi-m2-plus-v1.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Chen-Yu Tsai <wens(a)csie.org> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts b/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts index 3503767483..a0fcf39d46 100644 --- a/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts +++ b/arch/arm/dts/sun50i-h5-bananapi-m2-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Chen-Yu Tsai <wens(a)csie.org> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5-cpu-opp.dtsi b/arch/arm/dts/sun50i-h5-cpu-opp.dtsi index 1afad8b437..45cf200df2 100644 --- a/arch/arm/dts/sun50i-h5-cpu-opp.dtsi +++ b/arch/arm/dts/sun50i-h5-cpu-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Chen-Yu Tsai <wens(a)csie.org> / { diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts index 016da3ec32..32b1e5c2c9 100644 --- a/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts +++ b/arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 BayLibre, SAS // Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h3-it.dts b/arch/arm/dts/sun50i-h5-libretech-all-h3-it.dts index f6756d1bb0..5ef9dd7d2d 100644 --- a/arch/arm/dts/sun50i-h5-libretech-all-h3-it.dts +++ b/arch/arm/dts/sun50i-h5-libretech-all-h3-it.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Chen-Yu Tsai <wens(a)csie.org> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts index 6e30a564c8..ca7ac8de9f 100644 --- a/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts +++ b/arch/arm/dts/sun50i-h5-libretech-all-h5-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Chen-Yu Tsai <wens(a)csie.org> #include "sun50i-h5-libretech-all-h3-cc.dts" diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts index 4c3921ac23..142c2b55ef 100644 --- a/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts +++ b/arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Antony Antony <antony(a)phenome.org> // Copyright (C) 2016 ARM Ltd. diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts index 05486cccee..935da97dc5 100644 --- a/arch/arm/dts/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm/dts/sun50i-h5-nanopi-neo2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts index a3e040da38..dc49f9037e 100644 --- a/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts +++ b/arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2021 Chukun Pan <amadeus(a)jmu.edu.cn> * diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts index ce3ae19e72..fa0285b5dc 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2016 ARM Ltd. /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5-orangepi-prime.dts b/arch/arm/dts/sun50i-h5-orangepi-prime.dts index d7f8bad6bb..726c2e3cdd 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-prime.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-prime.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.xyz> // Based on sun50i-h5-orangepi-pc2.dts, which is: // Copyright (C) 2016 ARM Ltd. diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts index 7ec5ac850a..19fc6cbdbe 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2016 ARM Ltd. // Copyright (C) 2018 Hauke Mehrtens <hauke(a)hauke-m.de> diff --git a/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts index 22530ace12..667d5557c3 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Jagan Teki <jteki(a)openedev.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h5.dtsi b/arch/arm/dts/sun50i-h5.dtsi index 9b3462b13c..37d57c7bf3 100644 --- a/arch/arm/dts/sun50i-h5.dtsi +++ b/arch/arm/dts/sun50i-h5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2016 ARM Ltd. #include <sunxi-h3-h5.dtsi> diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts index d6897ec979..345c7eba6e 100644 --- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Clément Péron <peron.clem(a)gmail.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6-cpu-opp.dtsi b/arch/arm/dts/sun50i-h6-cpu-opp.dtsi index 0baf0f8e4d..235ed32baf 100644 --- a/arch/arm/dts/sun50i-h6-cpu-opp.dtsi +++ b/arch/arm/dts/sun50i-h6-cpu-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Ondrej Jirman <megous(a)megous.com> // Copyright (C) 2020 Clément Péron <peron.clem(a)gmail.com> diff --git a/arch/arm/dts/sun50i-h6-gpu-opp.dtsi b/arch/arm/dts/sun50i-h6-gpu-opp.dtsi index b48049c4fc..7456cb1f48 100644 --- a/arch/arm/dts/sun50i-h6-gpu-opp.dtsi +++ b/arch/arm/dts/sun50i-h6-gpu-opp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2022 Clément Péron <peron.clem(a)gmail.com> / { diff --git a/arch/arm/dts/sun50i-h6-orangepi-3.dts b/arch/arm/dts/sun50i-h6-orangepi-3.dts index f1957bb1ed..7c0564a0ed 100644 --- a/arch/arm/dts/sun50i-h6-orangepi-3.dts +++ b/arch/arm/dts/sun50i-h6-orangepi-3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Ondřej Jirman <megous(a)megous.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6-orangepi-lite2.dts b/arch/arm/dts/sun50i-h6-orangepi-lite2.dts index fb31dcb1cb..bdefe658c5 100644 --- a/arch/arm/dts/sun50i-h6-orangepi-lite2.dts +++ b/arch/arm/dts/sun50i-h6-orangepi-lite2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Jagan Teki <jagan(a)openedev.com> #include "sun50i-h6-orangepi.dtsi" diff --git a/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts b/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts index 29a081e72a..12c8e7359b 100644 --- a/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts +++ b/arch/arm/dts/sun50i-h6-orangepi-one-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Amarula Solutions // Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/dts/sun50i-h6-orangepi.dtsi b/arch/arm/dts/sun50i-h6-orangepi.dtsi index a5811d55bb..cb4cc6fb81 100644 --- a/arch/arm/dts/sun50i-h6-orangepi.dtsi +++ b/arch/arm/dts/sun50i-h6-orangepi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2018 Amarula Solutions // Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts b/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts index 686f58e770..39c3a89cdd 100644 --- a/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts +++ b/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * Copyright (C) 2019 Corentin LABBE <clabbe(a)baylibre.com> */ diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts index b868ad17af..7db2a6a97b 100644 --- a/arch/arm/dts/sun50i-h6-pine-h64.dts +++ b/arch/arm/dts/sun50i-h6-pine-h64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2017 Icenowy Zheng <icenowy(a)aosc.io> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts b/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts index 08d84160d8..a9c7419b29 100644 --- a/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts +++ b/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2021 Jernej Skrabec <jernej.skrabec(a)gmail.com> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6-tanix-tx6.dts b/arch/arm/dts/sun50i-h6-tanix-tx6.dts index 9a38ff9b3f..55ff8db91f 100644 --- a/arch/arm/dts/sun50i-h6-tanix-tx6.dts +++ b/arch/arm/dts/sun50i-h6-tanix-tx6.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2019 Jernej Skrabec <jernej.skrabec(a)siol.net> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6-tanix.dtsi b/arch/arm/dts/sun50i-h6-tanix.dtsi index 4903d63581..b436a81630 100644 --- a/arch/arm/dts/sun50i-h6-tanix.dtsi +++ b/arch/arm/dts/sun50i-h6-tanix.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (c) 2019 Jernej Skrabec <jernej.skrabec(a)siol.net> /dts-v1/; diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi index 3c85c8cc8e..e1ea0361af 100644 --- a/arch/arm/dts/sun50i-h6.dtsi +++ b/arch/arm/dts/sun50i-h6.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> #include <dt-bindings/interrupt-controller/arm-gic.h> diff --git a/arch/arm/dts/sun50i-h616-orangepi-zero2.dts b/arch/arm/dts/sun50i-h616-orangepi-zero2.dts index cb8600d0ea..7c508094c5 100644 --- a/arch/arm/dts/sun50i-h616-orangepi-zero2.dts +++ b/arch/arm/dts/sun50i-h616-orangepi-zero2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * Copyright (C) 2020 Arm Ltd. */ diff --git a/arch/arm/dts/sun50i-h616-x96-mate.dts b/arch/arm/dts/sun50i-h616-x96-mate.dts index 07424c28b6..87ad5dabd9 100644 --- a/arch/arm/dts/sun50i-h616-x96-mate.dts +++ b/arch/arm/dts/sun50i-h616-x96-mate.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * Copyright (C) 2021 Arm Ltd. */ diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi index 74aed0d232..3d2cbf2e97 100644 --- a/arch/arm/dts/sun50i-h616.dtsi +++ b/arch/arm/dts/sun50i-h616.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2020 Arm Ltd. // based on the H6 dtsi, which is: // Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> diff --git a/arch/arm/dts/sun5i-a13-ampe-a76.dts b/arch/arm/dts/sun5i-a13-ampe-a76.dts index 7bc35329a5..f634024510 100644 --- a/arch/arm/dts/sun5i-a13-ampe-a76.dts +++ b/arch/arm/dts/sun5i-a13-ampe-a76.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun5i-a13-inet-86vs.dts b/arch/arm/dts/sun5i-a13-inet-86vs.dts index 9c43a34d99..fc232a6462 100644 --- a/arch/arm/dts/sun5i-a13-inet-86vs.dts +++ b/arch/arm/dts/sun5i-a13-inet-86vs.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun6i-a31-mixtile-loftq.dts b/arch/arm/dts/sun6i-a31-mixtile-loftq.dts index bd98fb3e6a..af5c5c6fb3 100644 --- a/arch/arm/dts/sun6i-a31-mixtile-loftq.dts +++ b/arch/arm/dts/sun6i-a31-mixtile-loftq.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/dts/sun7i-a20-ainol-aw1.dts index 5914c919d4..cf591927a0 100644 --- a/arch/arm/dts/sun7i-a20-ainol-aw1.dts +++ b/arch/arm/dts/sun7i-a20-ainol-aw1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun7i-a20-haoyu-marsboard.dts b/arch/arm/dts/sun7i-a20-haoyu-marsboard.dts index 097e479c27..a927af4861 100644 --- a/arch/arm/dts/sun7i-a20-haoyu-marsboard.dts +++ b/arch/arm/dts/sun7i-a20-haoyu-marsboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2021 Conley Lee * Conley Lee <conleylee(a)foxmail.com> diff --git a/arch/arm/dts/sun7i-a20-m5.dts b/arch/arm/dts/sun7i-a20-m5.dts index cfbc50d9e5..849c0f125f 100644 --- a/arch/arm/dts/sun7i-a20-m5.dts +++ b/arch/arm/dts/sun7i-a20-m5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts index 20bf09b222..5c0f6dc4e1 100644 --- a/arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts +++ b/arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Source for A20-Olimex-SOM-EVB-eMMC Board * diff --git a/arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts b/arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts index a59755a2e7..0db3e64d37 100644 --- a/arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts +++ b/arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Source for A20-SOM204-EVB-eMMC Board * diff --git a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts index 54af6c1807..a826417ca7 100644 --- a/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts +++ b/arch/arm/dts/sun7i-a20-olimex-som204-evb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Source for A20-SOM204-EVB Board * diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts index 033cab3443..69a24478dd 100644 --- a/arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts +++ b/arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2020 Olimex Ltd. * Author: Stefan Mavrodiev <stefan(a)olimex.com> diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt-u-boot.dtsi b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt-u-boot.dtsi index 8a1c4681d4..9570ef8675 100644 --- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt-u-boot.dtsi +++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> */ diff --git a/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts b/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts index 11142ae6e7..b55c1326ab 100644 --- a/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts +++ b/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts index d729b7c705..f688f9d091 100644 --- a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts +++ b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> * diff --git a/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts b/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts index 4db0d4bb65..e192eccc9b 100644 --- a/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts +++ b/arch/arm/dts/sun8i-h2-plus-libretech-all-h3-cc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts b/arch/arm/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts index fc4a8c3d08..e0bf63ea74 100644 --- a/arch/arm/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts +++ b/arch/arm/dts/sun8i-h3-bananapi-m2-plus-v1.2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts b/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts index a8b2f0f1c1..8076bc7bf6 100644 --- a/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts +++ b/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts @@ -1,7 +1,7 @@ /* * Copyright (C) 2017 Chen-Yu Tsai <wens(a)csie.org> * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) + * SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /dts-v1/; diff --git a/arch/arm/dts/sun8i-h3-nanopi-duo2.dts b/arch/arm/dts/sun8i-h3-nanopi-duo2.dts index 343b02b971..3546d676e8 100644 --- a/arch/arm/dts/sun8i-h3-nanopi-duo2.dts +++ b/arch/arm/dts/sun8i-h3-nanopi-duo2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Karl Palsson <karlp(a)tweak.net.au> */ diff --git a/arch/arm/dts/sun8i-h3-nanopi-r1.dts b/arch/arm/dts/sun8i-h3-nanopi-r1.dts index 42cd1131ad..506fda1dad 100644 --- a/arch/arm/dts/sun8i-h3-nanopi-r1.dts +++ b/arch/arm/dts/sun8i-h3-nanopi-r1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Igor Pecovnik <igor(a)armbian.com> * Copyright (C) 2020 Jayantajit Gogoi <jayanta.gogoi525(a)gmail.com> diff --git a/arch/arm/dts/sun8i-h3-rervision-dvk.dts b/arch/arm/dts/sun8i-h3-rervision-dvk.dts index 4738f3a9ef..0e3864ca8d 100644 --- a/arch/arm/dts/sun8i-h3-rervision-dvk.dts +++ b/arch/arm/dts/sun8i-h3-rervision-dvk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Bootlin * Author: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> diff --git a/arch/arm/dts/sun8i-r40-feta40i.dtsi b/arch/arm/dts/sun8i-r40-feta40i.dtsi index 9f39b5a2bb..926606f6d7 100644 --- a/arch/arm/dts/sun8i-r40-feta40i.dtsi +++ b/arch/arm/dts/sun8i-r40-feta40i.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // Copyright (C) 2021 Ivan Uvarov <i.uvarov(a)cognitivepilot.com> // Based on the sun8i-r40-bananapi-m2-ultra.dts, which is: // Copyright (C) 2017 Chen-Yu Tsai <wens(a)csie.org> diff --git a/arch/arm/dts/sun8i-r40-oka40i-c.dts b/arch/arm/dts/sun8i-r40-oka40i-c.dts index 0bd1336206..06955b75d7 100644 --- a/arch/arm/dts/sun8i-r40-oka40i-c.dts +++ b/arch/arm/dts/sun8i-r40-oka40i-c.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // Copyright (C) 2021 Ivan Uvarov <i.uvarov(a)cognitivepilot.com> // Based on the sun8i-r40-bananapi-m2-ultra.dts, which is: // Copyright (C) 2017 Chen-Yu Tsai <wens(a)csie.org> diff --git a/arch/arm/dts/sun8i-s3-elimo-impetus.dtsi b/arch/arm/dts/sun8i-s3-elimo-impetus.dtsi index 052b010a56..3760a2c812 100644 --- a/arch/arm/dts/sun8i-s3-elimo-impetus.dtsi +++ b/arch/arm/dts/sun8i-s3-elimo-impetus.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2020 Matteo Scordino <matteo(a)elimo.io> */ diff --git a/arch/arm/dts/sun8i-s3-elimo-initium.dts b/arch/arm/dts/sun8i-s3-elimo-initium.dts index 039677c2cc..7a8a26cd6f 100644 --- a/arch/arm/dts/sun8i-s3-elimo-initium.dts +++ b/arch/arm/dts/sun8i-s3-elimo-initium.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2020 Matteo Scordino <matteo(a)elimo.io> */ diff --git a/arch/arm/dts/sun8i-s3-lichee-zero-plus.dts b/arch/arm/dts/sun8i-s3-lichee-zero-plus.dts index d18192d51d..85bcdd019a 100644 --- a/arch/arm/dts/sun8i-s3-lichee-zero-plus.dts +++ b/arch/arm/dts/sun8i-s3-lichee-zero-plus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/arch/arm/dts/sun8i-s3-pinecube.dts b/arch/arm/dts/sun8i-s3-pinecube.dts index 20966e954e..8a565844c4 100644 --- a/arch/arm/dts/sun8i-s3-pinecube.dts +++ b/arch/arm/dts/sun8i-s3-pinecube.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright 2019 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/arch/arm/dts/sun8i-v3-sl631-imx179.dts b/arch/arm/dts/sun8i-v3-sl631-imx179.dts index 117aeece4e..a7339b7299 100644 --- a/arch/arm/dts/sun8i-v3-sl631-imx179.dts +++ b/arch/arm/dts/sun8i-v3-sl631-imx179.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright 2020 Paul Kocialkowski <contact(a)paulk.fr> */ diff --git a/arch/arm/dts/sun8i-v3-sl631.dtsi b/arch/arm/dts/sun8i-v3-sl631.dtsi index 6f93f8c49f..0f6a606258 100644 --- a/arch/arm/dts/sun8i-v3-sl631.dtsi +++ b/arch/arm/dts/sun8i-v3-sl631.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright 2020 Paul Kocialkowski <contact(a)paulk.fr> */ diff --git a/arch/arm/dts/sun8i-v3.dtsi b/arch/arm/dts/sun8i-v3.dtsi index 186c30cbe6..13f45584c9 100644 --- a/arch/arm/dts/sun8i-v3.dtsi +++ b/arch/arm/dts/sun8i-v3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2019 Icenowy Zheng <icenowy(a)aosc.io> * Copyright (C) 2021 Tobias Schramm <t.schramm(a)manjaro.org> diff --git a/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts b/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts index 43896723a9..a204e6d0fd 100644 --- a/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts +++ b/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright 2018 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/arch/arm/dts/suniv-f1c100s.dtsi b/arch/arm/dts/suniv-f1c100s.dtsi index 3c61d59ab5..8c5eed4477 100644 --- a/arch/arm/dts/suniv-f1c100s.dtsi +++ b/arch/arm/dts/suniv-f1c100s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR X11) +// SPDX-License-Identifier: (GPL-2.0-or-later OR X11) /* * Copyright 2018 Icenowy Zheng <icenowy(a)aosc.io> * Copyright 2018 Mesih Kilinc <mesihkilinc(a)gmail.com> diff --git a/arch/arm/dts/suniv-f1c200s-lctech-pi.dts b/arch/arm/dts/suniv-f1c200s-lctech-pi.dts index 2d2a3f026d..d5f0d91159 100644 --- a/arch/arm/dts/suniv-f1c200s-lctech-pi.dts +++ b/arch/arm/dts/suniv-f1c200s-lctech-pi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Arm Ltd, * based on work: diff --git a/arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts b/arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts index 184c245041..87164b862e 100644 --- a/arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts +++ b/arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2022 Icenowy Zheng <uwu(a)icenowy.me> */ diff --git a/arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi index 235994a4a2..45e584bc70 100644 --- a/arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +++ b/arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi b/arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi index 89731bb34c..7b759d4f9e 100644 --- a/arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi +++ b/arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2017 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/dts/sunxi-libretech-all-h3-it.dtsi b/arch/arm/dts/sunxi-libretech-all-h3-it.dtsi index 50d328c2a8..9061c1546a 100644 --- a/arch/arm/dts/sunxi-libretech-all-h3-it.dtsi +++ b/arch/arm/dts/sunxi-libretech-all-h3-it.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) // Copyright (C) 2019 Chen-Yu Tsai <wens(a)csie.org> #include <dt-bindings/gpio/gpio.h> diff --git a/arch/arm/dts/t8103-j274.dts b/arch/arm/dts/t8103-j274.dts index 9bc592bcdb..50b014325a 100644 --- a/arch/arm/dts/t8103-j274.dts +++ b/arch/arm/dts/t8103-j274.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple Mac mini (M1, 2020) * diff --git a/arch/arm/dts/t8103-j293.dts b/arch/arm/dts/t8103-j293.dts index de1a21d97c..497f08e4fe 100644 --- a/arch/arm/dts/t8103-j293.dts +++ b/arch/arm/dts/t8103-j293.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple MacBook Pro (13-inch, M1, 2020) * diff --git a/arch/arm/dts/t8103-j313.dts b/arch/arm/dts/t8103-j313.dts index 5efe8d7a63..db401416f4 100644 --- a/arch/arm/dts/t8103-j313.dts +++ b/arch/arm/dts/t8103-j313.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple MacBook Air (M1, 2020) * diff --git a/arch/arm/dts/t8103-j456.dts b/arch/arm/dts/t8103-j456.dts index 8624168bdb..e806cc5381 100644 --- a/arch/arm/dts/t8103-j456.dts +++ b/arch/arm/dts/t8103-j456.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple iMac (24-inch, 4x USB-C, M1, 2020) * diff --git a/arch/arm/dts/t8103-j457.dts b/arch/arm/dts/t8103-j457.dts index f3eec8d472..391f1a9dc6 100644 --- a/arch/arm/dts/t8103-j457.dts +++ b/arch/arm/dts/t8103-j457.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple iMac (24-inch, 2x USB-C, M1, 2020) * diff --git a/arch/arm/dts/t8103-jxxx.dtsi b/arch/arm/dts/t8103-jxxx.dtsi index b4bd8c4238..34f1d49a14 100644 --- a/arch/arm/dts/t8103-jxxx.dtsi +++ b/arch/arm/dts/t8103-jxxx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple M1 Mac mini, MacBook Air/Pro, iMac 24" (M1, 2020/2021) * diff --git a/arch/arm/dts/t8103-pmgr.dtsi b/arch/arm/dts/t8103-pmgr.dtsi index 82ea4aa322..64db861d49 100644 --- a/arch/arm/dts/t8103-pmgr.dtsi +++ b/arch/arm/dts/t8103-pmgr.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * PMGR Power domains for the Apple T8103 "M1" SoC * diff --git a/arch/arm/dts/t8103-u-boot.dtsi b/arch/arm/dts/t8103-u-boot.dtsi index e9e593a00c..3a4ddc1dbc 100644 --- a/arch/arm/dts/t8103-u-boot.dtsi +++ b/arch/arm/dts/t8103-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT &serial0 { bootph-all; diff --git a/arch/arm/dts/t8103.dtsi b/arch/arm/dts/t8103.dtsi index ed7840f94b..39f76a5c19 100644 --- a/arch/arm/dts/t8103.dtsi +++ b/arch/arm/dts/t8103.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Apple T8103 "M1" SoC * diff --git a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi index 376dcdf68f..d28a627da5 100644 --- a/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi +++ b/arch/arm/dts/tegra124-nyan-big-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/dts/tegra210-p3450-0000.dts b/arch/arm/dts/tegra210-p3450-0000.dts index 9ef744ac8b..028eb6ae77 100644 --- a/arch/arm/dts/tegra210-p3450-0000.dts +++ b/arch/arm/dts/tegra210-p3450-0000.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019-2020 NVIDIA Corporation <www.nvidia.com> */ diff --git a/arch/arm/dts/thunderx-88xx.dts b/arch/arm/dts/thunderx-88xx.dts index 22d8f7efb2..68ba9496e7 100644 --- a/arch/arm/dts/thunderx-88xx.dts +++ b/arch/arm/dts/thunderx-88xx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Cavium Thunder DTS file - Thunder board description * diff --git a/arch/arm/dts/thunderx-88xx.dtsi b/arch/arm/dts/thunderx-88xx.dtsi index b8d6f7b315..4f3c520b80 100644 --- a/arch/arm/dts/thunderx-88xx.dtsi +++ b/arch/arm/dts/thunderx-88xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Cavium Thunder DTS file - Thunder SoC description * diff --git a/arch/arm/dts/total_compute.dts b/arch/arm/dts/total_compute.dts index 96edacda0b..711c359a6d 100644 --- a/arch/arm/dts/total_compute.dts +++ b/arch/arm/dts/total_compute.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Arm Limited */ diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts index da44a15a8a..995ac4f469 100644 --- a/arch/arm/dts/uniphier-ld11-global.dts +++ b/arch/arm/dts/uniphier-ld11-global.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD11 Global Board // diff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts index 414aeb99e6..a8dcf1bd52 100644 --- a/arch/arm/dts/uniphier-ld11-ref.dts +++ b/arch/arm/dts/uniphier-ld11-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD11 Reference Board // diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 7bb36b0714..2a5814a19d 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD11 SoC // diff --git a/arch/arm/dts/uniphier-ld20-akebi96.dts b/arch/arm/dts/uniphier-ld20-akebi96.dts index aa159a1129..2c51fa0be1 100644 --- a/arch/arm/dts/uniphier-ld20-akebi96.dts +++ b/arch/arm/dts/uniphier-ld20-akebi96.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for Akebi96 Development Board // diff --git a/arch/arm/dts/uniphier-ld20-global.dts b/arch/arm/dts/uniphier-ld20-global.dts index a01579cb3b..bb6cb9c279 100644 --- a/arch/arm/dts/uniphier-ld20-global.dts +++ b/arch/arm/dts/uniphier-ld20-global.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD20 Global Board // diff --git a/arch/arm/dts/uniphier-ld20-ref.dts b/arch/arm/dts/uniphier-ld20-ref.dts index 39ee279a1e..ab60843de2 100644 --- a/arch/arm/dts/uniphier-ld20-ref.dts +++ b/arch/arm/dts/uniphier-ld20-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD20 Reference Board // diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index 4e21716302..f3235eff3c 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD20 SoC // diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index e007db0847..f4e58cf73b 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD4 Reference Board // diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index 1baf590a71..e509d55395 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD4 SoC // diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index 08943aa376..9a4223f7cf 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD6b Reference Board // diff --git a/arch/arm/dts/uniphier-ld6b.dtsi b/arch/arm/dts/uniphier-ld6b.dtsi index 4d07a94c6b..0557cb2f5b 100644 --- a/arch/arm/dts/uniphier-ld6b.dtsi +++ b/arch/arm/dts/uniphier-ld6b.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier LD6b SoC // diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi index c0fd029b37..dedeb404f0 100644 --- a/arch/arm/dts/uniphier-pinctrl.dtsi +++ b/arch/arm/dts/uniphier-pinctrl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier SoCs default pinctrl settings // diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index 6baee4410d..4c626e890a 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Pro4 Ace Board // diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts index 202ca84faa..8473d6f06f 100644 --- a/arch/arm/dts/uniphier-pro4-ref.dts +++ b/arch/arm/dts/uniphier-pro4-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Pro4 Reference Board // diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts index 7b6faf2e79..0abf9514a8 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Pro4 Sanji Board // diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index ba55af30e9..0454f6240d 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Pro4 SoC // diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts index b57acc90ce..33b8de649b 100644 --- a/arch/arm/dts/uniphier-pro5-4kbox.dts +++ b/arch/arm/dts/uniphier-pro5-4kbox.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Device Tree Source for UniPhier Pro5 4KBOX Board (EVB-Pro5-4KBOX-M-V0) * diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index c039378942..2197ded5f3 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Pro5 SoC // diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts index 5f18b926c5..f2f24304cf 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier PXs2 Gentil Board // diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts index 7e08a459f7..9fd980be59 100644 --- a/arch/arm/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/dts/uniphier-pxs2-vodka.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier PXs2 Vodka Board // diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index e3a4b6ad1f..06185fd223 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier PXs2 SoC // diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts index 1ced6190ab..cf92e0cb7d 100644 --- a/arch/arm/dts/uniphier-pxs3-ref.dts +++ b/arch/arm/dts/uniphier-pxs3-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier PXs3 Reference Board // diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi index 91d6dde030..416bef6138 100644 --- a/arch/arm/dts/uniphier-pxs3.dtsi +++ b/arch/arm/dts/uniphier-pxs3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier PXs3 SoC // diff --git a/arch/arm/dts/uniphier-ref-daughter.dtsi b/arch/arm/dts/uniphier-ref-daughter.dtsi index a11897669c..fba7f15d77 100644 --- a/arch/arm/dts/uniphier-ref-daughter.dtsi +++ b/arch/arm/dts/uniphier-ref-daughter.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Reference Daughter Board // diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 2446f9e153..d8366e9c65 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier sLD8 Reference Board // diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 4708b2d7a1..1825d12113 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier sLD8 SoC // diff --git a/arch/arm/dts/uniphier-support-card.dtsi b/arch/arm/dts/uniphier-support-card.dtsi index 444802fee9..11324e8be7 100644 --- a/arch/arm/dts/uniphier-support-card.dtsi +++ b/arch/arm/dts/uniphier-support-card.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // // Device Tree Source for UniPhier Support Card (Expansion Board) // diff --git a/arch/arm/dts/vf-colibri-eval-v3.dtsi b/arch/arm/dts/vf-colibri-eval-v3.dtsi index 14c411f146..ce46ab22e6 100644 --- a/arch/arm/dts/vf-colibri-eval-v3.dtsi +++ b/arch/arm/dts/vf-colibri-eval-v3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2014-2020 Toradex */ diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index cc1e069c44..2ac750c87d 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2014-2020 Toradex * diff --git a/arch/arm/dts/vf610-bk4r1-u-boot.dtsi b/arch/arm/dts/vf610-bk4r1-u-boot.dtsi index 1336006e03..222f571e5d 100644 --- a/arch/arm/dts/vf610-bk4r1-u-boot.dtsi +++ b/arch/arm/dts/vf610-bk4r1-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/arch/arm/dts/vf610-bk4r1.dts b/arch/arm/dts/vf610-bk4r1.dts index 55cd53384a..affbcc5f2b 100644 --- a/arch/arm/dts/vf610-bk4r1.dts +++ b/arch/arm/dts/vf610-bk4r1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. diff --git a/arch/arm/dts/vf610-colibri-eval-v3.dts b/arch/arm/dts/vf610-colibri-eval-v3.dts index fb661e8a2d..81de031ef9 100644 --- a/arch/arm/dts/vf610-colibri-eval-v3.dts +++ b/arch/arm/dts/vf610-colibri-eval-v3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2014-2020 Toradex */ diff --git a/arch/arm/dts/vf610-colibri.dtsi b/arch/arm/dts/vf610-colibri.dtsi index 607cec2df8..af9fa5667a 100644 --- a/arch/arm/dts/vf610-colibri.dtsi +++ b/arch/arm/dts/vf610-colibri.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2014-2020 Toradex */ diff --git a/arch/arm/dts/vf610-pcm052.dts b/arch/arm/dts/vf610-pcm052.dts index 22026024ea..1d26c07954 100644 --- a/arch/arm/dts/vf610-pcm052.dts +++ b/arch/arm/dts/vf610-pcm052.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2016 Toradex AG */ diff --git a/arch/arm/dts/vf610-pcm052.dtsi b/arch/arm/dts/vf610-pcm052.dtsi index ccdc0f57e2..fb0c927935 100644 --- a/arch/arm/dts/vf610-pcm052.dtsi +++ b/arch/arm/dts/vf610-pcm052.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * (C) Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. diff --git a/arch/arm/dts/xenguest-arm64.dts b/arch/arm/dts/xenguest-arm64.dts index d873443376..a673b485f2 100644 --- a/arch/arm/dts/xenguest-arm64.dts +++ b/arch/arm/dts/xenguest-arm64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Empty devicetree file for xenguest_arm64 * diff --git a/arch/arm/dts/xilinx-versal-virt.dts b/arch/arm/dts/xilinx-versal-virt.dts index 3ea3cb1bdd..008c7744c3 100644 --- a/arch/arm/dts/xilinx-versal-virt.dts +++ b/arch/arm/dts/xilinx-versal-virt.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Empty device tree for versal-virt board * diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi index fb61fe98e3..f53cb7f54d 100644 --- a/arch/arm/dts/zynq-7000.dtsi +++ b/arch/arm/dts/zynq-7000.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx Zynq 7000 DTSI * Describes the hardware common to all Zynq 7000-based boards. diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index 593ca4a49c..6eed9d83ad 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx CC108 board DTS * diff --git a/arch/arm/dts/zynq-cse-nand.dts b/arch/arm/dts/zynq-cse-nand.dts index 18f627f3d7..974480e530 100644 --- a/arch/arm/dts/zynq-cse-nand.dts +++ b/arch/arm/dts/zynq-cse-nand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx CSE NAND board DTS * diff --git a/arch/arm/dts/zynq-cse-nor.dts b/arch/arm/dts/zynq-cse-nor.dts index a5c8a0813f..af3e1e555e 100644 --- a/arch/arm/dts/zynq-cse-nor.dts +++ b/arch/arm/dts/zynq-cse-nor.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx CSE NOR board DTS * diff --git a/arch/arm/dts/zynq-cse-qspi-single.dts b/arch/arm/dts/zynq-cse-qspi-single.dts index ac6982a74e..08d27b20ae 100644 --- a/arch/arm/dts/zynq-cse-qspi-single.dts +++ b/arch/arm/dts/zynq-cse-qspi-single.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx CSE QSPI single DTS * diff --git a/arch/arm/dts/zynq-cse-qspi.dtsi b/arch/arm/dts/zynq-cse-qspi.dtsi index 2e4afafebf..ac8a39839f 100644 --- a/arch/arm/dts/zynq-cse-qspi.dtsi +++ b/arch/arm/dts/zynq-cse-qspi.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx CSE QSPI board DTS * diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts index 5f280f4d8e..11b5a17500 100644 --- a/arch/arm/dts/zynq-microzed.dts +++ b/arch/arm/dts/zynq-microzed.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx MicroZED board DTS * diff --git a/arch/arm/dts/zynq-minized.dts b/arch/arm/dts/zynq-minized.dts index 96d2937de8..f251531ae9 100644 --- a/arch/arm/dts/zynq-minized.dts +++ b/arch/arm/dts/zynq-minized.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Avnet MiniZed board * diff --git a/arch/arm/dts/zynq-picozed.dts b/arch/arm/dts/zynq-picozed.dts index 640537eeba..1f314db64c 100644 --- a/arch/arm/dts/zynq-picozed.dts +++ b/arch/arm/dts/zynq-picozed.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Avnet PicoZed board DTS * diff --git a/arch/arm/dts/zynq-syzygy-hub.dts b/arch/arm/dts/zynq-syzygy-hub.dts index 99f248d4e5..7f438f4d58 100644 --- a/arch/arm/dts/zynq-syzygy-hub.dts +++ b/arch/arm/dts/zynq-syzygy-hub.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SYZYGY Hub DTS * diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts index 8307a2ef9d..ce315a7b46 100644 --- a/arch/arm/dts/zynq-topic-miami.dts +++ b/arch/arm/dts/zynq-topic-miami.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Topic Miami board DTS * diff --git a/arch/arm/dts/zynq-topic-miamilite.dts b/arch/arm/dts/zynq-topic-miamilite.dts index af0bc7ecf7..b732c04d17 100644 --- a/arch/arm/dts/zynq-topic-miamilite.dts +++ b/arch/arm/dts/zynq-topic-miamilite.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Topic Miami Lite board DTS * diff --git a/arch/arm/dts/zynq-topic-miamiplus.dts b/arch/arm/dts/zynq-topic-miamiplus.dts index 36a7db355e..fb06cf59d4 100644 --- a/arch/arm/dts/zynq-topic-miamiplus.dts +++ b/arch/arm/dts/zynq-topic-miamiplus.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Topic Miami Plus board DTS * diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index 8d47f24b75..e74b3d65ff 100644 --- a/arch/arm/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index 03eb016ed6..4d7455f9a0 100644 --- a/arch/arm/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 17680d7f8e..1f0549c8b8 100644 --- a/arch/arm/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ZC770 XM010 board DTS * diff --git a/arch/arm/dts/zynq-zc770-xm011-x16.dts b/arch/arm/dts/zynq-zc770-xm011-x16.dts index 6ff8393d7e..897bb86bf8 100644 --- a/arch/arm/dts/zynq-zc770-xm011-x16.dts +++ b/arch/arm/dts/zynq-zc770-xm011-x16.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ZC770 XM011 board DTS with NAND x16 * diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts index d1e971254e..0c3ef28d58 100644 --- a/arch/arm/dts/zynq-zc770-xm011.dts +++ b/arch/arm/dts/zynq-zc770-xm011.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ZC770 XM011 board DTS * diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts index 6e36634e3d..37276848d4 100644 --- a/arch/arm/dts/zynq-zc770-xm012.dts +++ b/arch/arm/dts/zynq-zc770-xm012.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ZC770 XM012 board DTS * diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index 21902fbb0c..bab5073757 100644 --- a/arch/arm/dts/zynq-zc770-xm013.dts +++ b/arch/arm/dts/zynq-zc770-xm013.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ZC770 XM013 board DTS * diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts index 5320b4b233..39fb31bae6 100644 --- a/arch/arm/dts/zynq-zed.dts +++ b/arch/arm/dts/zynq-zed.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. diff --git a/arch/arm/dts/zynq-zybo-z7.dts b/arch/arm/dts/zynq-zybo-z7.dts index 83b8413097..c131d0870a 100644 --- a/arch/arm/dts/zynq-zybo-z7.dts +++ b/arch/arm/dts/zynq-zybo-z7.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts index 0ce5238c9a..aac68106b4 100644 --- a/arch/arm/dts/zynq-zybo.dts +++ b/arch/arm/dts/zynq-zybo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 - 2015 Xilinx * Copyright (C) 2012 National Instruments Corp. diff --git a/arch/arm/dts/zynqmp-clk-ccf.dtsi b/arch/arm/dts/zynqmp-clk-ccf.dtsi index 5f1b0b23c1..ab572f754b 100644 --- a/arch/arm/dts/zynqmp-clk-ccf.dtsi +++ b/arch/arm/dts/zynqmp-clk-ccf.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock specification for Xilinx ZynqMP * diff --git a/arch/arm/dts/zynqmp-mini-emmc0.dts b/arch/arm/dts/zynqmp-mini-emmc0.dts index 02e80bd85e..de96937ea7 100644 --- a/arch/arm/dts/zynqmp-mini-emmc0.dts +++ b/arch/arm/dts/zynqmp-mini-emmc0.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP Mini Configuration * diff --git a/arch/arm/dts/zynqmp-mini-emmc1.dts b/arch/arm/dts/zynqmp-mini-emmc1.dts index ce1cdb2075..5e89826f56 100644 --- a/arch/arm/dts/zynqmp-mini-emmc1.dts +++ b/arch/arm/dts/zynqmp-mini-emmc1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP Mini Configuration * diff --git a/arch/arm/dts/zynqmp-mini-nand.dts b/arch/arm/dts/zynqmp-mini-nand.dts index e0517cf460..db61493c38 100644 --- a/arch/arm/dts/zynqmp-mini-nand.dts +++ b/arch/arm/dts/zynqmp-mini-nand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP Mini Configuration * diff --git a/arch/arm/dts/zynqmp-mini-qspi.dts b/arch/arm/dts/zynqmp-mini-qspi.dts index ee8be53600..4e9b9ff3da 100644 --- a/arch/arm/dts/zynqmp-mini-qspi.dts +++ b/arch/arm/dts/zynqmp-mini-qspi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP Mini Configuration * diff --git a/arch/arm/dts/zynqmp-mini.dts b/arch/arm/dts/zynqmp-mini.dts index b9a24f0436..c114b609c4 100644 --- a/arch/arm/dts/zynqmp-mini.dts +++ b/arch/arm/dts/zynqmp-mini.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP Mini Configuration * diff --git a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts index 0d96c6f9f0..12f87977e9 100644 --- a/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts +++ b/arch/arm/dts/zynqmp-topic-miamimp-xilinx-xdp-v1r1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Topic XDP (Xilinx Drone Platform) * diff --git a/arch/arm/dts/zynqmp-zc1232-revA.dts b/arch/arm/dts/zynqmp-zc1232-revA.dts index a288029797..ceb6d5e853 100644 --- a/arch/arm/dts/zynqmp-zc1232-revA.dts +++ b/arch/arm/dts/zynqmp-zc1232-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZC1232 * diff --git a/arch/arm/dts/zynqmp-zc1254-revA.dts b/arch/arm/dts/zynqmp-zc1254-revA.dts index cb9ef37468..40265bfd91 100644 --- a/arch/arm/dts/zynqmp-zc1254-revA.dts +++ b/arch/arm/dts/zynqmp-zc1254-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZC1254 * diff --git a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts index e72ed50b1c..6d0d2f26d2 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP zc1751-xm015-dc1 * diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts index 23a3ff2fed..54d6120bf3 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP zc1751-xm016-dc2 * diff --git a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts index b97f7ee8d4..cc3ff4c1b6 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP zc1751-xm017-dc3 * diff --git a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts index 2b66abc9f7..0246c6685b 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP zc1751-xm018-dc4 * diff --git a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts index b1857e17ab..c1a18af8b9 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP zc1751-xm019-dc5 * diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts index 44d1b24677..893f5a21ba 100644 --- a/arch/arm/dts/zynqmp-zcu100-revC.dts +++ b/arch/arm/dts/zynqmp-zcu100-revC.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU100 revC * diff --git a/arch/arm/dts/zynqmp-zcu102-rev1.0.dts b/arch/arm/dts/zynqmp-zcu102-rev1.0.dts index c8f71a1aec..70fcce1b59 100644 --- a/arch/arm/dts/zynqmp-zcu102-rev1.0.dts +++ b/arch/arm/dts/zynqmp-zcu102-rev1.0.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU102 Rev1.0 * diff --git a/arch/arm/dts/zynqmp-zcu102-rev1.1.dts b/arch/arm/dts/zynqmp-zcu102-rev1.1.dts index 705369766a..87906eb09c 100644 --- a/arch/arm/dts/zynqmp-zcu102-rev1.1.dts +++ b/arch/arm/dts/zynqmp-zcu102-rev1.1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU102 Rev1.1 * diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts index e166c95550..17a3dedfec 100644 --- a/arch/arm/dts/zynqmp-zcu102-revA.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU102 RevA * diff --git a/arch/arm/dts/zynqmp-zcu102-revB.dts b/arch/arm/dts/zynqmp-zcu102-revB.dts index 3c28130909..bdbff0c83f 100644 --- a/arch/arm/dts/zynqmp-zcu102-revB.dts +++ b/arch/arm/dts/zynqmp-zcu102-revB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU102 RevB * diff --git a/arch/arm/dts/zynqmp-zcu104-revA.dts b/arch/arm/dts/zynqmp-zcu104-revA.dts index cdfeea2fdd..631832f675 100644 --- a/arch/arm/dts/zynqmp-zcu104-revA.dts +++ b/arch/arm/dts/zynqmp-zcu104-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU104 * diff --git a/arch/arm/dts/zynqmp-zcu106-rev1.0.dts b/arch/arm/dts/zynqmp-zcu106-rev1.0.dts index a9b5826a77..9e52bac954 100644 --- a/arch/arm/dts/zynqmp-zcu106-rev1.0.dts +++ b/arch/arm/dts/zynqmp-zcu106-rev1.0.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU106 Rev1.0 * diff --git a/arch/arm/dts/zynqmp-zcu106-revA.dts b/arch/arm/dts/zynqmp-zcu106-revA.dts index b90ff61d24..a4d47d58c2 100644 --- a/arch/arm/dts/zynqmp-zcu106-revA.dts +++ b/arch/arm/dts/zynqmp-zcu106-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU106 * diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts index ba9e4891fc..d4d419df8d 100644 --- a/arch/arm/dts/zynqmp-zcu111-revA.dts +++ b/arch/arm/dts/zynqmp-zcu111-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU111 * diff --git a/arch/arm/dts/zynqmp-zcu1275-revA.dts b/arch/arm/dts/zynqmp-zcu1275-revA.dts index 095c972f13..62fe08b362 100644 --- a/arch/arm/dts/zynqmp-zcu1275-revA.dts +++ b/arch/arm/dts/zynqmp-zcu1275-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU1275 * diff --git a/arch/arm/dts/zynqmp-zcu208-revA.dts b/arch/arm/dts/zynqmp-zcu208-revA.dts index 22ad8d33a1..bd50107636 100644 --- a/arch/arm/dts/zynqmp-zcu208-revA.dts +++ b/arch/arm/dts/zynqmp-zcu208-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU208 * diff --git a/arch/arm/dts/zynqmp-zcu216-revA.dts b/arch/arm/dts/zynqmp-zcu216-revA.dts index 575ff5b1b7..4b078e8095 100644 --- a/arch/arm/dts/zynqmp-zcu216-revA.dts +++ b/arch/arm/dts/zynqmp-zcu216-revA.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP ZCU216 * diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index f03c201cae..d9348e746f 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dts file for Xilinx ZynqMP * diff --git a/arch/arm/include/asm/arch-am33xx/chilisom.h b/arch/arm/include/asm/arch-am33xx/chilisom.h index e423c9d071..419a40d11b 100644 --- a/arch/arm/include/asm/arch-am33xx/chilisom.h +++ b/arch/arm/include/asm/arch-am33xx/chilisom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Grinn */ diff --git a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h index 7bcafba6f0..be317a43d6 100644 --- a/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h +++ b/arch/arm/include/asm/arch-am33xx/clk_synthesizer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * clk-synthesizer.h * diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h index 67400c2c63..569e7bacdb 100644 --- a/arch/arm/include/asm/arch-am33xx/clock.h +++ b/arch/arm/include/asm/arch-am33xx/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * clock.h * diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index e5ad50754e..ee06077a56 100644 --- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h +++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * clocks_am33xx.h * diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h index b33e6f7fd1..c05aa290af 100644 --- a/arch/arm/include/asm/arch-am33xx/cpu.h +++ b/arch/arm/include/asm/arch-am33xx/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * cpu.h * diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h index 1a03107107..3d5ed0d9c1 100644 --- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h +++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ddr_defs.h * diff --git a/arch/arm/include/asm/arch-am33xx/gpio.h b/arch/arm/include/asm/arch-am33xx/gpio.h index 24dc4bb1d0..88434db8bb 100644 --- a/arch/arm/include/asm/arch-am33xx/gpio.h +++ b/arch/arm/include/asm/arch-am33xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _GPIO_AM33xx_H #define _GPIO_AM33xx_H diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h index 387f053ce6..7216af20fe 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware.h +++ b/arch/arm/include/asm/arch-am33xx/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * hardware.h * diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h index 878ef3e5d2..2d6398fe87 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am33xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * hardware_am33xx.h * diff --git a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h index 0b73ebdbb4..43b64ed033 100644 --- a/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/hardware_am43xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * hardware_am43xx.h * diff --git a/arch/arm/include/asm/arch-am33xx/i2c.h b/arch/arm/include/asm/arch-am33xx/i2c.h index c2a98500d9..1ba9b7022a 100644 --- a/arch/arm/include/asm/arch-am33xx/i2c.h +++ b/arch/arm/include/asm/arch-am33xx/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-am33xx/mem-guardian.h b/arch/arm/include/asm/arch-am33xx/mem-guardian.h index e864a0fd36..e936723cc9 100644 --- a/arch/arm/include/asm/arch-am33xx/mem-guardian.h +++ b/arch/arm/include/asm/arch-am33xx/mem-guardian.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-am33xx/mem.h b/arch/arm/include/asm/arch-am33xx/mem.h index 0fd52f82f5..d7391b1547 100644 --- a/arch/arm/include/asm/arch-am33xx/mem.h +++ b/arch/arm/include/asm/arch-am33xx/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-am33xx/mux_am43xx.h b/arch/arm/include/asm/arch-am33xx/mux_am43xx.h index f74ae74ff1..2da2fdc8e5 100644 --- a/arch/arm/include/asm/arch-am33xx/mux_am43xx.h +++ b/arch/arm/include/asm/arch-am33xx/mux_am43xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mux_am43xx.h * diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h index 53046deed5..522bdde040 100644 --- a/arch/arm/include/asm/arch-am33xx/omap.h +++ b/arch/arm/include/asm/arch-am33xx/omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * omap.h * diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h index 9ddb346dc9..0f21ab01ff 100644 --- a/arch/arm/include/asm/arch-am33xx/spl.h +++ b/arch/arm/include/asm/arch-am33xx/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h index be17aad29e..6dd39d5a7b 100644 --- a/arch/arm/include/asm/arch-am33xx/sys_proto.h +++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sys_proto.h * diff --git a/arch/arm/include/asm/arch-apple/rtkit.h b/arch/arm/include/asm/arch-apple/rtkit.h index eff18ddb9d..690d757ba3 100644 --- a/arch/arm/include/asm/arch-apple/rtkit.h +++ b/arch/arm/include/asm/arch-apple/rtkit.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/arch/arm/include/asm/arch-apple/uart.h b/arch/arm/include/asm/arch-apple/uart.h index d2a17a221e..1647085042 100644 --- a/arch/arm/include/asm/arch-apple/uart.h +++ b/arch/arm/include/asm/arch-apple/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/include/asm/arch-armv7/globaltimer.h b/arch/arm/include/asm/arch-armv7/globaltimer.h index 2d9cf77980..692ff4b962 100644 --- a/arch/arm/include/asm/arch-armv7/globaltimer.h +++ b/arch/arm/include/asm/arch-armv7/globaltimer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> * (C) Copyright 2012 Renesas Solutions Corp. diff --git a/arch/arm/include/asm/arch-armv7/sysctrl.h b/arch/arm/include/asm/arch-armv7/sysctrl.h index fc72fac8d8..49b0570534 100644 --- a/arch/arm/include/asm/arch-armv7/sysctrl.h +++ b/arch/arm/include/asm/arch-armv7/sysctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Linaro * Matt Waddel, <matt.waddel(a)linaro.org> diff --git a/arch/arm/include/asm/arch-armv7/systimer.h b/arch/arm/include/asm/arch-armv7/systimer.h index 04c4130458..bb09c5a31c 100644 --- a/arch/arm/include/asm/arch-armv7/systimer.h +++ b/arch/arm/include/asm/arch-armv7/systimer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Linaro * Matt Waddel, <matt.waddel(a)linaro.org> diff --git a/arch/arm/include/asm/arch-armv7/wdt.h b/arch/arm/include/asm/arch-armv7/wdt.h index e3fa16ffab..1b94f5d745 100644 --- a/arch/arm/include/asm/arch-armv7/wdt.h +++ b/arch/arm/include/asm/arch-armv7/wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Matt Waddel, <matt.waddel(a)linaro.org> diff --git a/arch/arm/include/asm/arch-aspeed/boot0.h b/arch/arm/include/asm/arch-aspeed/boot0.h index 368becc87a..97c66cc49b 100644 --- a/arch/arm/include/asm/arch-aspeed/boot0.h +++ b/arch/arm/include/asm/arch-aspeed/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/arch/arm/include/asm/arch-aspeed/pinctrl.h b/arch/arm/include/asm/arch-aspeed/pinctrl.h index dd85464ddc..6023f4cb2a 100644 --- a/arch/arm/include/asm/arch-aspeed/pinctrl.h +++ b/arch/arm/include/asm/arch-aspeed/pinctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc */ diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h index 589abd4a3f..9c92d7fce5 100644 --- a/arch/arm/include/asm/arch-aspeed/platform.h +++ b/arch/arm/include/asm/arch-aspeed/platform.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) ASPEED Technology Inc. * Ryan Chen <ryan_chen(a)aspeedtech.com> diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h index 50d6a6bc76..4e68e05606 100644 --- a/arch/arm/include/asm/arch-aspeed/scu_ast2500.h +++ b/arch/arm/include/asm/arch-aspeed/scu_ast2500.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/arm/include/asm/arch-aspeed/scu_ast2600.h b/arch/arm/include/asm/arch-aspeed/scu_ast2600.h index 251bfa269b..7b0024fad8 100644 --- a/arch/arm/include/asm/arch-aspeed/scu_ast2600.h +++ b/arch/arm/include/asm/arch-aspeed/scu_ast2600.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h index 0bc551fbec..482e3f57c5 100644 --- a/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h +++ b/arch/arm/include/asm/arch-aspeed/sdram_ast2500.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/arm/include/asm/arch-aspeed/sdram_ast2600.h b/arch/arm/include/asm/arch-aspeed/sdram_ast2600.h index b0a91ae40d..ff64553060 100644 --- a/arch/arm/include/asm/arch-aspeed/sdram_ast2600.h +++ b/arch/arm/include/asm/arch-aspeed/sdram_ast2600.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/arch/arm/include/asm/arch-aspeed/timer.h b/arch/arm/include/asm/arch-aspeed/timer.h index ff24e2f86e..b81389e7c3 100644 --- a/arch/arm/include/asm/arch-aspeed/timer.h +++ b/arch/arm/include/asm/arch-aspeed/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/arm/include/asm/arch-aspeed/wdt.h b/arch/arm/include/asm/arch-aspeed/wdt.h index 6fac7ffc1d..c3f6daa310 100644 --- a/arch/arm/include/asm/arch-aspeed/wdt.h +++ b/arch/arm/include/asm/arch-aspeed/wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Google, Inc */ diff --git a/arch/arm/include/asm/arch-aspeed/wdt_ast2600.h b/arch/arm/include/asm/arch-aspeed/wdt_ast2600.h index 96e8ca07e3..8dae7b5981 100644 --- a/arch/arm/include/asm/arch-aspeed/wdt_ast2600.h +++ b/arch/arm/include/asm/arch-aspeed/wdt_ast2600.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 Aspeed Technology Inc. */ diff --git a/arch/arm/include/asm/arch-bcm235xx/boot0.h b/arch/arm/include/asm/arch-bcm235xx/boot0.h index 8cde42b89b..82beba8622 100644 --- a/arch/arm/include/asm/arch-bcm235xx/boot0.h +++ b/arch/arm/include/asm/arch-bcm235xx/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcm235xx/gpio.h b/arch/arm/include/asm/arch-bcm235xx/gpio.h index 82c12bb70c..6ec9dcf792 100644 --- a/arch/arm/include/asm/arch-bcm235xx/gpio.h +++ b/arch/arm/include/asm/arch-bcm235xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcm235xx/sysmap.h b/arch/arm/include/asm/arch-bcm235xx/sysmap.h index ff6debc677..38d79d1a6c 100644 --- a/arch/arm/include/asm/arch-bcm235xx/sysmap.h +++ b/arch/arm/include/asm/arch-bcm235xx/sysmap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcm281xx/boot0.h b/arch/arm/include/asm/arch-bcm281xx/boot0.h index 8cde42b89b..82beba8622 100644 --- a/arch/arm/include/asm/arch-bcm281xx/boot0.h +++ b/arch/arm/include/asm/arch-bcm281xx/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcm281xx/gpio.h b/arch/arm/include/asm/arch-bcm281xx/gpio.h index 6716e1a155..1276e541c6 100644 --- a/arch/arm/include/asm/arch-bcm281xx/gpio.h +++ b/arch/arm/include/asm/arch-bcm281xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcm281xx/sysmap.h b/arch/arm/include/asm/arch-bcm281xx/sysmap.h index 477b693880..374529d78b 100644 --- a/arch/arm/include/asm/arch-bcm281xx/sysmap.h +++ b/arch/arm/include/asm/arch-bcm281xx/sysmap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/arch-bcmns3/bl33_info.h b/arch/arm/include/asm/arch-bcmns3/bl33_info.h index bbc95b0186..d1d1418cb9 100644 --- a/arch/arm/include/asm/arch-bcmns3/bl33_info.h +++ b/arch/arm/include/asm/arch-bcmns3/bl33_info.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Broadcom. * diff --git a/arch/arm/include/asm/arch-fsl-layerscape/clock.h b/arch/arm/include/asm/arch-fsl-layerscape/clock.h index d561691437..6623628b8c 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/clock.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2019 NXP Semiconductors diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 516c9eab04..fc06134f59 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016-2018, 2020 NXP * Copyright 2015, Freescale Semiconductor diff --git a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h index 444b56606a..79be0aadde 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2018, 2020 NXP * Copyright 2014-2015, Freescale Semiconductor diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fdt.h b/arch/arm/include/asm/arch-fsl-layerscape/fdt.h index ebc999cd70..11749c3302 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fdt.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h index d5f63f4a7e..89900b144b 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h index 1577e935a6..4d36db92cd 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_portals.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h index 8f43651756..4f5bac7aaa 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP * Copyright 2015 Freescale Semiconductor, Inc. diff --git a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h index 7ae5eee8b6..88bfec55eb 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/gpio.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index 9794db0449..ecd5b81fb9 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index ca5e33379b..6728ff7cf4 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LayerScape Internal Memory Map * diff --git a/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h b/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h index d709af8f77..a1a361eb0e 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-fsl-layerscape/mmu.h b/arch/arm/include/asm/arch-fsl-layerscape/mmu.h index 661cdeafde..14007d265f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/mmu.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/mmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015, Freescale Semiconductor */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/mp.h b/arch/arm/include/asm/arch-fsl-layerscape/mp.h index faac8f1128..35aa9603da 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/mp.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/mp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2015, Freescale Semiconductor */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h index a265106686..8605be092b 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index bd41df1be4..97debae38d 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2021 NXP * Copyright 2015 Freescale Semiconductor diff --git a/arch/arm/include/asm/arch-fsl-layerscape/speed.h b/arch/arm/include/asm/arch-fsl-layerscape/speed.h index 26721699cc..f35b1b1ecf 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/speed.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/speed.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2015, Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h index c18c51ed2c..4980f2e995 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h index 140849d4e1..bc248d284f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/stream_id_lsch3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2021 NXP * Copyright 2014 Freescale Semiconductor, Inc. diff --git a/arch/arm/include/asm/arch-fsl-layerscape/svr.h b/arch/arm/include/asm/arch-fsl-layerscape/svr.h index e37c4a88b5..90be2f3fe8 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/svr.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/svr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-hi3660/hi3660.h b/arch/arm/include/asm/arch-hi3660/hi3660.h index 882262d13c..d4e60fe1db 100644 --- a/arch/arm/include/asm/arch-hi3660/hi3660.h +++ b/arch/arm/include/asm/arch-hi3660/hi3660.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Linaro * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h index b98b45cc81..9939c5b232 100644 --- a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h +++ b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Linaro * Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/dwmmc.h b/arch/arm/include/asm/arch-hi6220/dwmmc.h index cf51c178c3..3d2ec8301c 100644 --- a/arch/arm/include/asm/arch-hi6220/dwmmc.h +++ b/arch/arm/include/asm/arch-hi6220/dwmmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/gpio.h b/arch/arm/include/asm/arch-hi6220/gpio.h index 12717a96aa..9c5af88117 100644 --- a/arch/arm/include/asm/arch-hi6220/gpio.h +++ b/arch/arm/include/asm/arch-hi6220/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/hi6220.h b/arch/arm/include/asm/arch-hi6220/hi6220.h index 55729e306e..9670556f5a 100644 --- a/arch/arm/include/asm/arch-hi6220/hi6220.h +++ b/arch/arm/include/asm/arch-hi6220/hi6220.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h index 4b9a0d44ac..382234c443 100644 --- a/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h +++ b/arch/arm/include/asm/arch-hi6220/hi6220_regs_alwayson.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/periph.h b/arch/arm/include/asm/arch-hi6220/periph.h index edec213880..ae02915d58 100644 --- a/arch/arm/include/asm/arch-hi6220/periph.h +++ b/arch/arm/include/asm/arch-hi6220/periph.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-hi6220/pinmux.h b/arch/arm/include/asm/arch-hi6220/pinmux.h index d18d2142f6..3b04fed8cc 100644 --- a/arch/arm/include/asm/arch-hi6220/pinmux.h +++ b/arch/arm/include/asm/arch-hi6220/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index cbd2717f97..cae22d1f70 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-imx8/boot0.h b/arch/arm/include/asm/arch-imx8/boot0.h index 5ce781adb7..e7ebcf6b91 100644 --- a/arch/arm/include/asm/arch-imx8/boot0.h +++ b/arch/arm/include/asm/arch-imx8/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/clock.h b/arch/arm/include/asm/arch-imx8/clock.h index bea157171f..cc3e4bed76 100644 --- a/arch/arm/include/asm/arch-imx8/clock.h +++ b/arch/arm/include/asm/arch-imx8/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/gpio.h b/arch/arm/include/asm/arch-imx8/gpio.h index 24cfde3c29..0236703bc4 100644 --- a/arch/arm/include/asm/arch-imx8/gpio.h +++ b/arch/arm/include/asm/arch-imx8/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/imx-regs.h b/arch/arm/include/asm/arch-imx8/imx-regs.h index f5691620c4..fb32caff2d 100644 --- a/arch/arm/include/asm/arch-imx8/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/imx8-pins.h b/arch/arm/include/asm/arch-imx8/imx8-pins.h index 2130298163..7fc5077256 100644 --- a/arch/arm/include/asm/arch-imx8/imx8-pins.h +++ b/arch/arm/include/asm/arch-imx8/imx8-pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/iomux.h b/arch/arm/include/asm/arch-imx8/iomux.h index 3acef1ea6b..b9bf80ae55 100644 --- a/arch/arm/include/asm/arch-imx8/iomux.h +++ b/arch/arm/include/asm/arch-imx8/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/snvs_security_sc.h b/arch/arm/include/asm/arch-imx8/snvs_security_sc.h index 0b7ded7ba6..ece4a0d17d 100644 --- a/arch/arm/include/asm/arch-imx8/snvs_security_sc.h +++ b/arch/arm/include/asm/arch-imx8/snvs_security_sc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8/sys_proto.h b/arch/arm/include/asm/arch-imx8/sys_proto.h index e7625c4298..d20bae33f8 100644 --- a/arch/arm/include/asm/arch-imx8/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/clock.h b/arch/arm/include/asm/arch-imx8m/clock.h index a861cd6db3..b2f6392cd3 100644 --- a/arch/arm/include/asm/arch-imx8m/clock.h +++ b/arch/arm/include/asm/arch-imx8m/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h index 63b14b9ca5..cf4053e96d 100644 --- a/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h +++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP * diff --git a/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h b/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h index 340a61e55b..445ec57f5f 100644 --- a/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h +++ b/arch/arm/include/asm/arch-imx8m/clock_imx8mq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * diff --git a/arch/arm/include/asm/arch-imx8m/crm_regs.h b/arch/arm/include/asm/arch-imx8m/crm_regs.h index c42e6685de..85869f8549 100644 --- a/arch/arm/include/asm/arch-imx8m/crm_regs.h +++ b/arch/arm/include/asm/arch-imx8m/crm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/ddr.h b/arch/arm/include/asm/arch-imx8m/ddr.h index c14855d177..e1ba6522ec 100644 --- a/arch/arm/include/asm/arch-imx8m/ddr.h +++ b/arch/arm/include/asm/arch-imx8m/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/gpio.h b/arch/arm/include/asm/arch-imx8m/gpio.h index 2d9fbcb0e4..f639130d94 100644 --- a/arch/arm/include/asm/arch-imx8m/gpio.h +++ b/arch/arm/include/asm/arch-imx8m/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index f1b7526ac7..7811ce29b5 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h b/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h index 210e96e1db..f86956158a 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h +++ b/arch/arm/include/asm/arch-imx8m/imx8mm_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/imx8mn_pins.h b/arch/arm/include/asm/arch-imx8m/imx8mn_pins.h index b4298f2b83..33734ef01e 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8mn_pins.h +++ b/arch/arm/include/asm/arch-imx8m/imx8mn_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/imx8mp_pins.h b/arch/arm/include/asm/arch-imx8m/imx8mp_pins.h index e7f3221823..1f973cabd0 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8mp_pins.h +++ b/arch/arm/include/asm/arch-imx8m/imx8mp_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/imx8mq_pins.h b/arch/arm/include/asm/arch-imx8m/imx8mq_pins.h index 16d418c687..6ae4a5d602 100644 --- a/arch/arm/include/asm/arch-imx8m/imx8mq_pins.h +++ b/arch/arm/include/asm/arch-imx8m/imx8mq_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/lpddr4_define.h b/arch/arm/include/asm/arch-imx8m/lpddr4_define.h index caf5bafb6d..72213a6f2d 100644 --- a/arch/arm/include/asm/arch-imx8m/lpddr4_define.h +++ b/arch/arm/include/asm/arch-imx8m/lpddr4_define.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/arch-imx8m/sys_proto.h b/arch/arm/include/asm/arch-imx8m/sys_proto.h index 4ed8e954e3..50a5345153 100644 --- a/arch/arm/include/asm/arch-imx8m/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8m/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/cgc.h b/arch/arm/include/asm/arch-imx8ulp/cgc.h index 83a246b15a..8118b56423 100644 --- a/arch/arm/include/asm/arch-imx8ulp/cgc.h +++ b/arch/arm/include/asm/arch-imx8ulp/cgc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/clock.h b/arch/arm/include/asm/arch-imx8ulp/clock.h index 2946cc1911..a377728c4f 100644 --- a/arch/arm/include/asm/arch-imx8ulp/clock.h +++ b/arch/arm/include/asm/arch-imx8ulp/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/ddr.h b/arch/arm/include/asm/arch-imx8ulp/ddr.h index 4544431b05..af88804c5d 100644 --- a/arch/arm/include/asm/arch-imx8ulp/ddr.h +++ b/arch/arm/include/asm/arch-imx8ulp/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/gpio.h b/arch/arm/include/asm/arch-imx8ulp/gpio.h index b7563bb401..d9d953188d 100644 --- a/arch/arm/include/asm/arch-imx8ulp/gpio.h +++ b/arch/arm/include/asm/arch-imx8ulp/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h index a038cc1df3..c4521037c0 100644 --- a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h b/arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h index d0eefcbc92..7363646205 100644 --- a/arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h +++ b/arch/arm/include/asm/arch-imx8ulp/imx8ulp-pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/iomux.h b/arch/arm/include/asm/arch-imx8ulp/iomux.h index 0210489b1a..2c78158bac 100644 --- a/arch/arm/include/asm/arch-imx8ulp/iomux.h +++ b/arch/arm/include/asm/arch-imx8ulp/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/pcc.h b/arch/arm/include/asm/arch-imx8ulp/pcc.h index d9b2d7c299..1b7c892b02 100644 --- a/arch/arm/include/asm/arch-imx8ulp/pcc.h +++ b/arch/arm/include/asm/arch-imx8ulp/pcc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/rdc.h b/arch/arm/include/asm/arch-imx8ulp/rdc.h index 5d555c498d..c424f7bb2a 100644 --- a/arch/arm/include/asm/arch-imx8ulp/rdc.h +++ b/arch/arm/include/asm/arch-imx8ulp/rdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h index 95bf753a76..9a11a7d3e6 100644 --- a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx8ulp/upower.h b/arch/arm/include/asm/arch-imx8ulp/upower.h index 0f1875bbd6..3a51a5a7c1 100644 --- a/arch/arm/include/asm/arch-imx8ulp/upower.h +++ b/arch/arm/include/asm/arch-imx8ulp/upower.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/ccm_regs.h b/arch/arm/include/asm/arch-imx9/ccm_regs.h index f6ec8fda3e..390cef0c88 100644 --- a/arch/arm/include/asm/arch-imx9/ccm_regs.h +++ b/arch/arm/include/asm/arch-imx9/ccm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/clock.h b/arch/arm/include/asm/arch-imx9/clock.h index 1169ffd74d..c47b73295c 100644 --- a/arch/arm/include/asm/arch-imx9/clock.h +++ b/arch/arm/include/asm/arch-imx9/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP * diff --git a/arch/arm/include/asm/arch-imx9/ddr.h b/arch/arm/include/asm/arch-imx9/ddr.h index 2b22f3a5be..d3190e0b3a 100644 --- a/arch/arm/include/asm/arch-imx9/ddr.h +++ b/arch/arm/include/asm/arch-imx9/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/gpio.h b/arch/arm/include/asm/arch-imx9/gpio.h index 40732022e7..5a8ffd3657 100644 --- a/arch/arm/include/asm/arch-imx9/gpio.h +++ b/arch/arm/include/asm/arch-imx9/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/imx-regs.h b/arch/arm/include/asm/arch-imx9/imx-regs.h index 76d241eab0..2e7ad4b30d 100644 --- a/arch/arm/include/asm/arch-imx9/imx-regs.h +++ b/arch/arm/include/asm/arch-imx9/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/imx93_pins.h b/arch/arm/include/asm/arch-imx9/imx93_pins.h index f13aef5619..3f284c7fe7 100644 --- a/arch/arm/include/asm/arch-imx9/imx93_pins.h +++ b/arch/arm/include/asm/arch-imx9/imx93_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/sys_proto.h b/arch/arm/include/asm/arch-imx9/sys_proto.h index 2f7a129275..b75aa534af 100644 --- a/arch/arm/include/asm/arch-imx9/sys_proto.h +++ b/arch/arm/include/asm/arch-imx9/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imx9/trdc.h b/arch/arm/include/asm/arch-imx9/trdc.h index 1481ee375b..e65d5ac19e 100644 --- a/arch/arm/include/asm/arch-imx9/trdc.h +++ b/arch/arm/include/asm/arch-imx9/trdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/include/asm/arch-imxrt/clock.h b/arch/arm/include/asm/arch-imxrt/clock.h index 7409028b9a..ea996aa850 100644 --- a/arch/arm/include/asm/arch-imxrt/clock.h +++ b/arch/arm/include/asm/arch-imxrt/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/include/asm/arch-imxrt/gpio.h b/arch/arm/include/asm/arch-imxrt/gpio.h index da31a7438a..8b741cb3c0 100644 --- a/arch/arm/include/asm/arch-imxrt/gpio.h +++ b/arch/arm/include/asm/arch-imxrt/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/include/asm/arch-imxrt/imx-regs.h b/arch/arm/include/asm/arch-imxrt/imx-regs.h index ad739caae9..1fa2027428 100644 --- a/arch/arm/include/asm/arch-imxrt/imx-regs.h +++ b/arch/arm/include/asm/arch-imxrt/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright(C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/include/asm/arch-imxrt/sys_proto.h b/arch/arm/include/asm/arch-imxrt/sys_proto.h index eb878e672e..17800796dc 100644 --- a/arch/arm/include/asm/arch-imxrt/sys_proto.h +++ b/arch/arm/include/asm/arch-imxrt/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP */ diff --git a/arch/arm/include/asm/arch-lpc32xx/clk.h b/arch/arm/include/asm/arch-lpc32xx/clk.h index 5ab48a9d3c..3a8ca25c9e 100644 --- a/arch/arm/include/asm/arch-lpc32xx/clk.h +++ b/arch/arm/include/asm/arch-lpc32xx/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/config.h b/arch/arm/include/asm/arch-lpc32xx/config.h index 41160384a4..ab69405800 100644 --- a/arch/arm/include/asm/arch-lpc32xx/config.h +++ b/arch/arm/include/asm/arch-lpc32xx/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common definitions for LPC32XX board configurations * diff --git a/arch/arm/include/asm/arch-lpc32xx/cpu.h b/arch/arm/include/asm/arch-lpc32xx/cpu.h index 7e0b781e4d..29f2e0e065 100644 --- a/arch/arm/include/asm/arch-lpc32xx/cpu.h +++ b/arch/arm/include/asm/arch-lpc32xx/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/dma.h b/arch/arm/include/asm/arch-lpc32xx/dma.h index d69e3c4664..7bc5d74539 100644 --- a/arch/arm/include/asm/arch-lpc32xx/dma.h +++ b/arch/arm/include/asm/arch-lpc32xx/dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LPC32xx DMA Controller Interface * diff --git a/arch/arm/include/asm/arch-lpc32xx/emc.h b/arch/arm/include/asm/arch-lpc32xx/emc.h index 20698a3d21..88b098deaa 100644 --- a/arch/arm/include/asm/arch-lpc32xx/emc.h +++ b/arch/arm/include/asm/arch-lpc32xx/emc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/gpio.h b/arch/arm/include/asm/arch-lpc32xx/gpio.h index 93e7a88752..e3954fc857 100644 --- a/arch/arm/include/asm/arch-lpc32xx/gpio.h +++ b/arch/arm/include/asm/arch-lpc32xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LPC32xx GPIO interface * diff --git a/arch/arm/include/asm/arch-lpc32xx/mux.h b/arch/arm/include/asm/arch-lpc32xx/mux.h index d661e8236f..7be77b48de 100644 --- a/arch/arm/include/asm/arch-lpc32xx/mux.h +++ b/arch/arm/include/asm/arch-lpc32xx/mux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LPC32xx MUX interface * diff --git a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h index 4675dc3c53..240423d690 100644 --- a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h +++ b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/timer.h b/arch/arm/include/asm/arch-lpc32xx/timer.h index 302bd6baba..d8d9150889 100644 --- a/arch/arm/include/asm/arch-lpc32xx/timer.h +++ b/arch/arm/include/asm/arch-lpc32xx/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/uart.h b/arch/arm/include/asm/arch-lpc32xx/uart.h index 8ffd8676f8..42ef9ca6fe 100644 --- a/arch/arm/include/asm/arch-lpc32xx/uart.h +++ b/arch/arm/include/asm/arch-lpc32xx/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-lpc32xx/wdt.h b/arch/arm/include/asm/arch-lpc32xx/wdt.h index dd0fc1682e..f1c062d85b 100644 --- a/arch/arm/include/asm/arch-lpc32xx/wdt.h +++ b/arch/arm/include/asm/arch-lpc32xx/wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/include/asm/arch-ls102xa/clock.h b/arch/arm/include/asm/arch-ls102xa/clock.h index 01978c08f5..201679ad8d 100644 --- a/arch/arm/include/asm/arch-ls102xa/clock.h +++ b/arch/arm/include/asm/arch-ls102xa/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index d0abbdadf0..3daa653537 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014, Freescale Semiconductor */ diff --git a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h index d99a6f318f..85cd7c4e80 100644 --- a/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h +++ b/arch/arm/include/asm/arch-ls102xa/fsl_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/gpio.h b/arch/arm/include/asm/arch-ls102xa/gpio.h index 517652b5d0..e3c363bfd3 100644 --- a/arch/arm/include/asm/arch-ls102xa/gpio.h +++ b/arch/arm/include/asm/arch-ls102xa/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index a0c3da7f46..ba65c1d364 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/imx-regs.h b/arch/arm/include/asm/arch-ls102xa/imx-regs.h index 64853d897e..258ff3c9fd 100644 --- a/arch/arm/include/asm/arch-ls102xa/imx-regs.h +++ b/arch/arm/include/asm/arch-ls102xa/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_devdis.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_devdis.h index 5d6a4e76bd..a0e733db4b 100644 --- a/arch/arm/include/asm/arch-ls102xa/ls102xa_devdis.h +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_devdis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h index 1fde8bce5d..198e3a43da 100644 --- a/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h index acd8c69f69..bf6e825f9d 100644 --- a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/ns_access.h b/arch/arm/include/asm/arch-ls102xa/ns_access.h index b6daf32e56..2f2b5f063a 100644 --- a/arch/arm/include/asm/arch-ls102xa/ns_access.h +++ b/arch/arm/include/asm/arch-ls102xa/ns_access.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/spl.h b/arch/arm/include/asm/arch-ls102xa/spl.h index 990c74d75a..5e4017bad8 100644 --- a/arch/arm/include/asm/arch-ls102xa/spl.h +++ b/arch/arm/include/asm/arch-ls102xa/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-ls102xa/svr.h b/arch/arm/include/asm/arch-ls102xa/svr.h index 52b27e2d67..ee34b6c548 100644 --- a/arch/arm/include/asm/arch-ls102xa/svr.h +++ b/arch/arm/include/asm/arch-ls102xa/svr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/arch-meson/a1.h b/arch/arm/include/asm/arch-meson/a1.h index 86d1a68de8..2495b2b0f3 100644 --- a/arch/arm/include/asm/arch-meson/a1.h +++ b/arch/arm/include/asm/arch-meson/a1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2023 SberDevices, Inc. * Author: Igor Prusov <ivprusov(a)sberdevices.ru> diff --git a/arch/arm/include/asm/arch-meson/axg.h b/arch/arm/include/asm/arch-meson/axg.h index 12042de935..14dd410a95 100644 --- a/arch/arm/include/asm/arch-meson/axg.h +++ b/arch/arm/include/asm/arch-meson/axg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/boot.h b/arch/arm/include/asm/arch-meson/boot.h index c67d12d06c..d78e5f65ee 100644 --- a/arch/arm/include/asm/arch-meson/boot.h +++ b/arch/arm/include/asm/arch-meson/boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/clock-a1.h b/arch/arm/include/asm/arch-meson/clock-a1.h index f6795f5e0c..0079a368db 100644 --- a/arch/arm/include/asm/arch-meson/clock-a1.h +++ b/arch/arm/include/asm/arch-meson/clock-a1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 - AmLogic, Inc. * Copyright 2023 (C) SberDevices, Inc. diff --git a/arch/arm/include/asm/arch-meson/clock-axg.h b/arch/arm/include/asm/arch-meson/clock-axg.h index 1ef88e4fad..bd4f11ebdf 100644 --- a/arch/arm/include/asm/arch-meson/clock-axg.h +++ b/arch/arm/include/asm/arch-meson/clock-axg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 - AmLogic, Inc. * Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/arch/arm/include/asm/arch-meson/clock-g12a.h b/arch/arm/include/asm/arch-meson/clock-g12a.h index d52e27e008..f60a8d52cb 100644 --- a/arch/arm/include/asm/arch-meson/clock-g12a.h +++ b/arch/arm/include/asm/arch-meson/clock-g12a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 - AmLogic, Inc. * Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/arch/arm/include/asm/arch-meson/clock-gx.h b/arch/arm/include/asm/arch-meson/clock-gx.h index 13a2e7688f..ffb69d7f19 100644 --- a/arch/arm/include/asm/arch-meson/clock-gx.h +++ b/arch/arm/include/asm/arch-meson/clock-gx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 - AmLogic, Inc. * Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/arch/arm/include/asm/arch-meson/eth.h b/arch/arm/include/asm/arch-meson/eth.h index c0070615c2..4571c2947d 100644 --- a/arch/arm/include/asm/arch-meson/eth.h +++ b/arch/arm/include/asm/arch-meson/eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/g12a.h b/arch/arm/include/asm/arch-meson/g12a.h index ef4f301f7d..5c18645697 100644 --- a/arch/arm/include/asm/arch-meson/g12a.h +++ b/arch/arm/include/asm/arch-meson/g12a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/gpio.h b/arch/arm/include/asm/arch-meson/gpio.h index d0142f16ef..50c40d9775 100644 --- a/arch/arm/include/asm/arch-meson/gpio.h +++ b/arch/arm/include/asm/arch-meson/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-meson/gx.h b/arch/arm/include/asm/arch-meson/gx.h index 26ec5d0bc3..a45b1fa3d6 100644 --- a/arch/arm/include/asm/arch-meson/gx.h +++ b/arch/arm/include/asm/arch-meson/gx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-meson/i2c.h b/arch/arm/include/asm/arch-meson/i2c.h index aa474a05b7..11a2f4ef9c 100644 --- a/arch/arm/include/asm/arch-meson/i2c.h +++ b/arch/arm/include/asm/arch-meson/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-meson/mem.h b/arch/arm/include/asm/arch-meson/mem.h index a65100aeb7..3ef6f9a369 100644 --- a/arch/arm/include/asm/arch-meson/mem.h +++ b/arch/arm/include/asm/arch-meson/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/meson-vpu.h b/arch/arm/include/asm/arch-meson/meson-vpu.h index f31dfa6ad8..6f86f36ee9 100644 --- a/arch/arm/include/asm/arch-meson/meson-vpu.h +++ b/arch/arm/include/asm/arch-meson/meson-vpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 BayLibre, SAS * Author: Maxime Jourdan <mjourdan(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index 4b1d564bc4..88d597bf3d 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-meson/usb-gx.h b/arch/arm/include/asm/arch-meson/usb-gx.h index 61f1809df9..6dbd8903a8 100644 --- a/arch/arm/include/asm/arch-meson/usb-gx.h +++ b/arch/arm/include/asm/arch-meson/usb-gx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 BayLibre SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-meson/usb.h b/arch/arm/include/asm/arch-meson/usb.h index b794b5ce77..cba1834b72 100644 --- a/arch/arm/include/asm/arch-meson/usb.h +++ b/arch/arm/include/asm/arch-meson/usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/include/asm/arch-mvebu/spi.h b/arch/arm/include/asm/arch-mvebu/spi.h index 58b6c32c4d..45f8f11590 100644 --- a/arch/arm/include/asm/arch-mvebu/spi.h +++ b/arch/arm/include/asm/arch-mvebu/spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/include/asm/arch-mx27/clock.h b/arch/arm/include/asm/arch-mx27/clock.h index ab96431cbb..3cf314cc7c 100644 --- a/arch/arm/include/asm/arch-mx27/clock.h +++ b/arch/arm/include/asm/arch-mx27/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * (c) 2009 Ilya Yanok, Emcraft Systems <yanok(a)emcraft.com> diff --git a/arch/arm/include/asm/arch-mx27/gpio.h b/arch/arm/include/asm/arch-mx27/gpio.h index 9f342eb7f7..c7da6e4711 100644 --- a/arch/arm/include/asm/arch-mx27/gpio.h +++ b/arch/arm/include/asm/arch-mx27/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 * Philippe Reynes <tremyfr(a)yahoo.fr> diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h index 77794d7d03..c504de1319 100644 --- a/arch/arm/include/asm/arch-mx27/imx-regs.h +++ b/arch/arm/include/asm/arch-mx27/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2007 Pengutronix, Sascha Hauer <s.hauer(a)pengutronix.de> * (c) 2009 Ilya Yanok, Emcraft Systems <yanok(a)emcraft.com> diff --git a/arch/arm/include/asm/arch-mx27/regs-rtc.h b/arch/arm/include/asm/arch-mx27/regs-rtc.h index 8434f4c1cb..311971089c 100644 --- a/arch/arm/include/asm/arch-mx27/regs-rtc.h +++ b/arch/arm/include/asm/arch-mx27/regs-rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX27 RTC Register Definitions * diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h index e99e115f79..37b3cca853 100644 --- a/arch/arm/include/asm/arch-mx31/clock.h +++ b/arch/arm/include/asm/arch-mx31/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * (c) 2007 Pengutronix, Sascha Hauer <s.hauer(a)pengutronix.de> diff --git a/arch/arm/include/asm/arch-mx31/gpio.h b/arch/arm/include/asm/arch-mx31/gpio.h index 45e9fc6193..5cc6c31e01 100644 --- a/arch/arm/include/asm/arch-mx31/gpio.h +++ b/arch/arm/include/asm/arch-mx31/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefano Babic, DENX Software Engineering, <sbabic(a)denx.de> diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h index a0ab3a0e66..50542e4a6b 100644 --- a/arch/arm/include/asm/arch-mx31/imx-regs.h +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2007 Pengutronix, Sascha Hauer <s.hauer(a)pengutronix.de> */ diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h index 29fc0fda0e..a9d70165b7 100644 --- a/arch/arm/include/asm/arch-mx31/sys_proto.h +++ b/arch/arm/include/asm/arch-mx31/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Helmut Raiger, HALE electronic GmbH, helmut.raiger(a)hale.at diff --git a/arch/arm/include/asm/arch-mx5/clock.h b/arch/arm/include/asm/arch-mx5/clock.h index d585b5cf4b..efdcead343 100644 --- a/arch/arm/include/asm/arch-mx5/clock.h +++ b/arch/arm/include/asm/arch-mx5/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/arch/arm/include/asm/arch-mx5/crm_regs.h b/arch/arm/include/asm/arch-mx5/crm_regs.h index 9d54ab7fb0..a7219b4748 100644 --- a/arch/arm/include/asm/arch-mx5/crm_regs.h +++ b/arch/arm/include/asm/arch-mx5/crm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx5/gpio.h b/arch/arm/include/asm/arch-mx5/gpio.h index dad40bd3d7..8a8fe951bc 100644 --- a/arch/arm/include/asm/arch-mx5/gpio.h +++ b/arch/arm/include/asm/arch-mx5/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefano Babic, DENX Software Engineering, <sbabic(a)denx.de> diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index f763749b03..ffd0fa4ac5 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx51.h b/arch/arm/include/asm/arch-mx5/iomux-mx51.h index 7f8a238487..4edc299efd 100644 --- a/arch/arm/include/asm/arch-mx5/iomux-mx51.h +++ b/arch/arm/include/asm/arch-mx5/iomux-mx51.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria(a)canonical.com> * Copyright (C) 2010 Freescale Semiconductor, Inc. diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx53.h b/arch/arm/include/asm/arch-mx5/iomux-mx53.h index cbc08b0a21..b5f4cd95f7 100644 --- a/arch/arm/include/asm/arch-mx5/iomux-mx53.h +++ b/arch/arm/include/asm/arch-mx5/iomux-mx53.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 ADVANSEE * Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h index c8aff2b65d..218c332499 100644 --- a/arch/arm/include/asm/arch-mx5/sys_proto.h +++ b/arch/arm/include/asm/arch-mx5/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index 81af89c631..f8a72382c7 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h index 2a2b8dd806..71d0564ee0 100644 --- a/arch/arm/include/asm/arch-mx6/crm_regs.h +++ b/arch/arm/include/asm/arch-mx6/crm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx6/gpio.h b/arch/arm/include/asm/arch-mx6/gpio.h index b391319933..8bad0d334b 100644 --- a/arch/arm/include/asm/arch-mx6/gpio.h +++ b/arch/arm/include/asm/arch-mx6/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefano Babic, DENX Software Engineering, <sbabic(a)denx.de> diff --git a/arch/arm/include/asm/arch-mx6/imx-rdc.h b/arch/arm/include/asm/arch-mx6/imx-rdc.h index ecdd64d671..e07ce76e7f 100644 --- a/arch/arm/include/asm/arch-mx6/imx-rdc.h +++ b/arch/arm/include/asm/arch-mx6/imx-rdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 8fd3dd2df3..2fdf160b7c 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx6/iomux.h b/arch/arm/include/asm/arch-mx6/iomux.h index bea0bbb02b..867ffd82ee 100644 --- a/arch/arm/include/asm/arch-mx6/iomux.h +++ b/arch/arm/include/asm/arch-mx6/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_ARCH_IOMUX_H__ #define __ASM_ARCH_IOMUX_H__ diff --git a/arch/arm/include/asm/arch-mx6/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h index 37a16d2c30..02a8f4c9a4 100644 --- a/arch/arm/include/asm/arch-mx6/litesom.h +++ b/arch/arm/include/asm/arch-mx6/litesom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Grinn */ diff --git a/arch/arm/include/asm/arch-mx6/mx6-ddr.h b/arch/arm/include/asm/arch-mx6/mx6-ddr.h index dbc97b25df..d23f1355d8 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6-pins.h b/arch/arm/include/asm/arch-mx6/mx6-pins.h index 9a99a6b704..03815073a4 100644 --- a/arch/arm/include/asm/arch-mx6/mx6-pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6-pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S index 4d12c6873b..c3567428b0 100644 --- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S +++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6dl-ddr.h b/arch/arm/include/asm/arch-mx6/mx6dl-ddr.h index 2b2821da21..bedd8b243e 100644 --- a/arch/arm/include/asm/arch-mx6/mx6dl-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6dl-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h index c207a752f0..2f2ae73d33 100644 --- a/arch/arm/include/asm/arch-mx6/mx6dl_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6dl_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6q-ddr.h b/arch/arm/include/asm/arch-mx6/mx6q-ddr.h index c76a920202..9b973b80f4 100644 --- a/arch/arm/include/asm/arch-mx6/mx6q-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6q-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6q_pins.h b/arch/arm/include/asm/arch-mx6/mx6q_pins.h index dce13d07f8..caf5479a05 100644 --- a/arch/arm/include/asm/arch-mx6/mx6q_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6q_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. * diff --git a/arch/arm/include/asm/arch-mx6/mx6sl-ddr.h b/arch/arm/include/asm/arch-mx6/mx6sl-ddr.h index d397c8a061..40806f9dbe 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sl-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6sl-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h index 01b14d73dc..8e8e45c789 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6sll_pins.h b/arch/arm/include/asm/arch-mx6/mx6sll_pins.h index e4bd4ef894..ab2faf2046 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sll_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6sll_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 - 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6sx-ddr.h b/arch/arm/include/asm/arch-mx6/mx6sx-ddr.h index 5ad93ede32..0d3c1cf89b 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sx-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6sx-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h index a18e08f65c..fe052af3de 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sx_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6sx_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6sx_rdc.h b/arch/arm/include/asm/arch-mx6/mx6sx_rdc.h index 7ff2016126..acd5b00650 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sx_rdc.h +++ b/arch/arm/include/asm/arch-mx6/mx6sx_rdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h b/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h index 99779588b5..8200d0b84d 100644 --- a/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h +++ b/arch/arm/include/asm/arch-mx6/mx6ul-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6ul_pins.h b/arch/arm/include/asm/arch-mx6/mx6ul_pins.h index 031b4a0a88..7ac5801049 100644 --- a/arch/arm/include/asm/arch-mx6/mx6ul_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6ul_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h index 842d0caa64..915964a02b 100644 --- a/arch/arm/include/asm/arch-mx6/mx6ull_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6ull_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h index 71ad0e307c..d158818d72 100644 --- a/arch/arm/include/asm/arch-mx6/mxc_hdmi.h +++ b/arch/arm/include/asm/arch-mx6/mxc_hdmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h index 7845fa8e56..86ec8229ad 100644 --- a/arch/arm/include/asm/arch-mx6/sys_proto.h +++ b/arch/arm/include/asm/arch-mx6/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h index 48c7c3367a..8371763f3a 100644 --- a/arch/arm/include/asm/arch-mx7/clock.h +++ b/arch/arm/include/asm/arch-mx7/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-mx7/clock_slice.h b/arch/arm/include/asm/arch-mx7/clock_slice.h index 9a7c1f8237..de725fda1e 100644 --- a/arch/arm/include/asm/arch-mx7/clock_slice.h +++ b/arch/arm/include/asm/arch-mx7/clock_slice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-mx7/crm_regs.h b/arch/arm/include/asm/arch-mx7/crm_regs.h index bfa68a9d2a..7467632ef8 100644 --- a/arch/arm/include/asm/arch-mx7/crm_regs.h +++ b/arch/arm/include/asm/arch-mx7/crm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/include/asm/arch-mx7/gpio.h b/arch/arm/include/asm/arch-mx7/gpio.h index 1da66a4f81..9d857099c5 100644 --- a/arch/arm/include/asm/arch-mx7/gpio.h +++ b/arch/arm/include/asm/arch-mx7/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/imx-rdc.h b/arch/arm/include/asm/arch-mx7/imx-rdc.h index 3512ddb66b..a49f5d8ee6 100644 --- a/arch/arm/include/asm/arch-mx7/imx-rdc.h +++ b/arch/arm/include/asm/arch-mx7/imx-rdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h index 6f5ae5173c..0529800b4e 100644 --- a/arch/arm/include/asm/arch-mx7/imx-regs.h +++ b/arch/arm/include/asm/arch-mx7/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/arch-mx7/mx7-ddr.h b/arch/arm/include/asm/arch-mx7/mx7-ddr.h index 8ac721114c..1e7765db34 100644 --- a/arch/arm/include/asm/arch-mx7/mx7-ddr.h +++ b/arch/arm/include/asm/arch-mx7/mx7-ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * DDR controller registers of the i.MX7 architecture * diff --git a/arch/arm/include/asm/arch-mx7/mx7-pins.h b/arch/arm/include/asm/arch-mx7/mx7-pins.h index bc99a8646d..9c33ed49b6 100644 --- a/arch/arm/include/asm/arch-mx7/mx7-pins.h +++ b/arch/arm/include/asm/arch-mx7/mx7-pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/mx7_plugin.S b/arch/arm/include/asm/arch-mx7/mx7_plugin.S index b552542e28..18fd92eda3 100644 --- a/arch/arm/include/asm/arch-mx7/mx7_plugin.S +++ b/arch/arm/include/asm/arch-mx7/mx7_plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/mx7d_pins.h b/arch/arm/include/asm/arch-mx7/mx7d_pins.h index d54680f174..7b28ea01b7 100644 --- a/arch/arm/include/asm/arch-mx7/mx7d_pins.h +++ b/arch/arm/include/asm/arch-mx7/mx7d_pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/mx7d_rdc.h b/arch/arm/include/asm/arch-mx7/mx7d_rdc.h index 2ea175ceb3..1188314f29 100644 --- a/arch/arm/include/asm/arch-mx7/mx7d_rdc.h +++ b/arch/arm/include/asm/arch-mx7/mx7d_rdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7/sys_proto.h b/arch/arm/include/asm/arch-mx7/sys_proto.h index 634736cc09..90a657171f 100644 --- a/arch/arm/include/asm/arch-mx7/sys_proto.h +++ b/arch/arm/include/asm/arch-mx7/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/clock.h b/arch/arm/include/asm/arch-mx7ulp/clock.h index 92d4463dff..ce3847e61c 100644 --- a/arch/arm/include/asm/arch-mx7ulp/clock.h +++ b/arch/arm/include/asm/arch-mx7ulp/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/gpio.h b/arch/arm/include/asm/arch-mx7ulp/gpio.h index 7c625609ba..f811b2bdda 100644 --- a/arch/arm/include/asm/arch-mx7ulp/gpio.h +++ b/arch/arm/include/asm/arch-mx7ulp/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/imx-regs.h b/arch/arm/include/asm/arch-mx7ulp/imx-regs.h index 33a699ff71..a1ff798a05 100644 --- a/arch/arm/include/asm/arch-mx7ulp/imx-regs.h +++ b/arch/arm/include/asm/arch-mx7ulp/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/iomux.h b/arch/arm/include/asm/arch-mx7ulp/iomux.h index f067c02062..8a90b16f7c 100644 --- a/arch/arm/include/asm/arch-mx7ulp/iomux.h +++ b/arch/arm/include/asm/arch-mx7ulp/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on Linux i.MX iomux-v3.h file: * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH, diff --git a/arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h b/arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h index 139b766c26..c023a87340 100644 --- a/arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h +++ b/arch/arm/include/asm/arch-mx7ulp/mx7ulp-pins.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S b/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S index 5089b1d517..2db597c5df 100644 --- a/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S +++ b/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/include/asm/arch-mx7ulp/pcc.h b/arch/arm/include/asm/arch-mx7ulp/pcc.h index 8f0d700628..281d86d6be 100644 --- a/arch/arm/include/asm/arch-mx7ulp/pcc.h +++ b/arch/arm/include/asm/arch-mx7ulp/pcc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/scg.h b/arch/arm/include/asm/arch-mx7ulp/scg.h index 3b5b7f6803..5293eeaf57 100644 --- a/arch/arm/include/asm/arch-mx7ulp/scg.h +++ b/arch/arm/include/asm/arch-mx7ulp/scg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h index 7adf4720fe..97202702ce 100644 --- a/arch/arm/include/asm/arch-mx7ulp/sys_proto.h +++ b/arch/arm/include/asm/arch-mx7ulp/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-mxs/clock.h b/arch/arm/include/asm/arch-mxs/clock.h index ee56d10fec..04a84234a4 100644 --- a/arch/arm/include/asm/arch-mxs/clock.h +++ b/arch/arm/include/asm/arch-mxs/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23/i.MX28 Clock * diff --git a/arch/arm/include/asm/arch-mxs/gpio.h b/arch/arm/include/asm/arch-mxs/gpio.h index 34fa421945..10bf7b81b2 100644 --- a/arch/arm/include/asm/arch-mxs/gpio.h +++ b/arch/arm/include/asm/arch-mxs/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 GPIO * diff --git a/arch/arm/include/asm/arch-mxs/imx-regs.h b/arch/arm/include/asm/arch-mxs/imx-regs.h index f853c484be..5142cd03ad 100644 --- a/arch/arm/include/asm/arch-mxs/imx-regs.h +++ b/arch/arm/include/asm/arch-mxs/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23/i.MX28 Registers * diff --git a/arch/arm/include/asm/arch-mxs/iomux-mx23.h b/arch/arm/include/asm/arch-mxs/iomux-mx23.h index 2706efa750..f2d1bf3af7 100644 --- a/arch/arm/include/asm/arch-mxs/iomux-mx23.h +++ b/arch/arm/include/asm/arch-mxs/iomux-mx23.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria(a)canonical.com> * Copyright (C) 2010 Freescale Semiconductor, Inc. diff --git a/arch/arm/include/asm/arch-mxs/iomux-mx28.h b/arch/arm/include/asm/arch-mxs/iomux-mx28.h index 00356f0139..25a37cde5c 100644 --- a/arch/arm/include/asm/arch-mxs/iomux-mx28.h +++ b/arch/arm/include/asm/arch-mxs/iomux-mx28.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria(a)canonical.com> * Copyright (C) 2010 Freescale Semiconductor, Inc. diff --git a/arch/arm/include/asm/arch-mxs/iomux.h b/arch/arm/include/asm/arch-mxs/iomux.h index a9896e10bf..294d600de4 100644 --- a/arch/arm/include/asm/arch-mxs/iomux.h +++ b/arch/arm/include/asm/arch-mxs/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH, * <armlinux(a)phytec.de> diff --git a/arch/arm/include/asm/arch-mxs/regs-base.h b/arch/arm/include/asm/arch-mxs/regs-base.h index 44d40cade8..ad919afd36 100644 --- a/arch/arm/include/asm/arch-mxs/regs-base.h +++ b/arch/arm/include/asm/arch-mxs/regs-base.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23/i.MX28 Peripheral Base Addresses * diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h index 50fdc9cd03..ae3efe89f9 100644 --- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h +++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx23.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23 CLKCTRL Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h index caef9e4b1f..1b0ed1139c 100644 --- a/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h +++ b/arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 CLKCTRL Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-digctl.h b/arch/arm/include/asm/arch-mxs/regs-digctl.h index 219f58ba75..603061c073 100644 --- a/arch/arm/include/asm/arch-mxs/regs-digctl.h +++ b/arch/arm/include/asm/arch-mxs/regs-digctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 DIGCTL Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-i2c.h b/arch/arm/include/asm/arch-mxs/regs-i2c.h index 4cc2e0ba59..fd0caf8af1 100644 --- a/arch/arm/include/asm/arch-mxs/regs-i2c.h +++ b/arch/arm/include/asm/arch-mxs/regs-i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 I2C Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-lradc.h b/arch/arm/include/asm/arch-mxs/regs-lradc.h index a48f7a4359..1911331d98 100644 --- a/arch/arm/include/asm/arch-mxs/regs-lradc.h +++ b/arch/arm/include/asm/arch-mxs/regs-lradc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 LRADC Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-ocotp.h b/arch/arm/include/asm/arch-mxs/regs-ocotp.h index 8bfbd19d51..1b22234926 100644 --- a/arch/arm/include/asm/arch-mxs/regs-ocotp.h +++ b/arch/arm/include/asm/arch-mxs/regs-ocotp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 OCOTP Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h index 134d436ee9..0039e85945 100644 --- a/arch/arm/include/asm/arch-mxs/regs-pinctrl.h +++ b/arch/arm/include/asm/arch-mxs/regs-pinctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 PINCTRL Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h index a0dc781023..39409f0e0f 100644 --- a/arch/arm/include/asm/arch-mxs/regs-power-mx23.h +++ b/arch/arm/include/asm/arch-mxs/regs-power-mx23.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23 Power Controller Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h index 39250c506d..063ebdafeb 100644 --- a/arch/arm/include/asm/arch-mxs/regs-power-mx28.h +++ b/arch/arm/include/asm/arch-mxs/regs-power-mx28.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 Power Controller Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-rtc.h b/arch/arm/include/asm/arch-mxs/regs-rtc.h index 8d6ba573d1..08cb247e9f 100644 --- a/arch/arm/include/asm/arch-mxs/regs-rtc.h +++ b/arch/arm/include/asm/arch-mxs/regs-rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 RTC Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-ssp.h b/arch/arm/include/asm/arch-mxs/regs-ssp.h index eeb7e7f44c..1d3a994e27 100644 --- a/arch/arm/include/asm/arch-mxs/regs-ssp.h +++ b/arch/arm/include/asm/arch-mxs/regs-ssp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 SSP Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-timrot.h b/arch/arm/include/asm/arch-mxs/regs-timrot.h index 9e19aabf11..46fa2385d9 100644 --- a/arch/arm/include/asm/arch-mxs/regs-timrot.h +++ b/arch/arm/include/asm/arch-mxs/regs-timrot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 TIMROT Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-usb.h b/arch/arm/include/asm/arch-mxs/regs-usb.h index 8d5168dd8e..856ef15678 100644 --- a/arch/arm/include/asm/arch-mxs/regs-usb.h +++ b/arch/arm/include/asm/arch-mxs/regs-usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 USB OTG Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/regs-usbphy.h b/arch/arm/include/asm/arch-mxs/regs-usbphy.h index 643feab749..aabbe51e20 100644 --- a/arch/arm/include/asm/arch-mxs/regs-usbphy.h +++ b/arch/arm/include/asm/arch-mxs/regs-usbphy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 USB PHY Register Definitions * diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 17afd1b29e..aca6bbe320 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23/i.MX28 specific functions * diff --git a/arch/arm/include/asm/arch-npcm7xx/aes.h b/arch/arm/include/asm/arch-npcm7xx/aes.h index 255efcb5ce..fb3a292dfd 100644 --- a/arch/arm/include/asm/arch-npcm7xx/aes.h +++ b/arch/arm/include/asm/arch-npcm7xx/aes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_AES_H_ #define _NPCM_AES_H_ diff --git a/arch/arm/include/asm/arch-npcm7xx/gcr.h b/arch/arm/include/asm/arch-npcm7xx/gcr.h index 762a0b6d6b..083c6ebdf4 100644 --- a/arch/arm/include/asm/arch-npcm7xx/gcr.h +++ b/arch/arm/include/asm/arch-npcm7xx/gcr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __NPCM750_GCR_H_ #define __NPCM750_GCR_H_ diff --git a/arch/arm/include/asm/arch-npcm7xx/otp.h b/arch/arm/include/asm/arch-npcm7xx/otp.h index 11d1e8550c..47f8c9ea0b 100644 --- a/arch/arm/include/asm/arch-npcm7xx/otp.h +++ b/arch/arm/include/asm/arch-npcm7xx/otp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_OTP_H_ #define _NPCM_OTP_H_ diff --git a/arch/arm/include/asm/arch-npcm8xx/aes.h b/arch/arm/include/asm/arch-npcm8xx/aes.h index 255efcb5ce..fb3a292dfd 100644 --- a/arch/arm/include/asm/arch-npcm8xx/aes.h +++ b/arch/arm/include/asm/arch-npcm8xx/aes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_AES_H_ #define _NPCM_AES_H_ diff --git a/arch/arm/include/asm/arch-npcm8xx/gcr.h b/arch/arm/include/asm/arch-npcm8xx/gcr.h index 20230d64e6..6502546e3c 100644 --- a/arch/arm/include/asm/arch-npcm8xx/gcr.h +++ b/arch/arm/include/asm/arch-npcm8xx/gcr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * System Global Control Register definitions * Copyright (c) 2022 Nuvoton Technology Corp. diff --git a/arch/arm/include/asm/arch-npcm8xx/otp.h b/arch/arm/include/asm/arch-npcm8xx/otp.h index c8d50fb0ad..1dbfcdf3b1 100644 --- a/arch/arm/include/asm/arch-npcm8xx/otp.h +++ b/arch/arm/include/asm/arch-npcm8xx/otp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_OTP_H_ #define _NPCM_OTP_H_ diff --git a/arch/arm/include/asm/arch-npcm8xx/rng.h b/arch/arm/include/asm/arch-npcm8xx/rng.h index 897e8fea82..da6dc7e564 100644 --- a/arch/arm/include/asm/arch-npcm8xx/rng.h +++ b/arch/arm/include/asm/arch-npcm8xx/rng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_RNG_H_ #define _NPCM_RNG_H_ diff --git a/arch/arm/include/asm/arch-npcm8xx/rst.h b/arch/arm/include/asm/arch-npcm8xx/rst.h index 09e1485063..1d82e23a6a 100644 --- a/arch/arm/include/asm/arch-npcm8xx/rst.h +++ b/arch/arm/include/asm/arch-npcm8xx/rst.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_RST_H_ #define _NPCM_RST_H_ diff --git a/arch/arm/include/asm/arch-npcm8xx/sha.h b/arch/arm/include/asm/arch-npcm8xx/sha.h index ec0ec9ce1f..7cdc585473 100644 --- a/arch/arm/include/asm/arch-npcm8xx/sha.h +++ b/arch/arm/include/asm/arch-npcm8xx/sha.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _NPCM_SHA_H_ #define _NPCM_SHA_H_ diff --git a/arch/arm/include/asm/arch-omap3/am35x_def.h b/arch/arm/include/asm/arch-omap3/am35x_def.h index 33f6db1997..4b74c6b78d 100644 --- a/arch/arm/include/asm/arch-omap3/am35x_def.h +++ b/arch/arm/include/asm/arch-omap3/am35x_def.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am35x_def.h - TI's AM35x specific definitions. * diff --git a/arch/arm/include/asm/arch-omap3/clock.h b/arch/arm/include/asm/arch-omap3/clock.h index ac537fcd33..ec5be1b988 100644 --- a/arch/arm/include/asm/arch-omap3/clock.h +++ b/arch/arm/include/asm/arch-omap3/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/clocks_omap3.h b/arch/arm/include/asm/arch-omap3/clocks_omap3.h index 48bb391f30..abd8a68acf 100644 --- a/arch/arm/include/asm/arch-omap3/clocks_omap3.h +++ b/arch/arm/include/asm/arch-omap3/clocks_omap3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h index 3f0182e766..fae3f7ea5f 100644 --- a/arch/arm/include/asm/arch-omap3/cpu.h +++ b/arch/arm/include/asm/arch-omap3/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/dma.h b/arch/arm/include/asm/arch-omap3/dma.h index d26e490d2d..790fc7f7a9 100644 --- a/arch/arm/include/asm/arch-omap3/dma.h +++ b/arch/arm/include/asm/arch-omap3/dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SDMA_H #define __SDMA_H diff --git a/arch/arm/include/asm/arch-omap3/ehci.h b/arch/arm/include/asm/arch-omap3/ehci.h index fa839ef80e..fc49d8f30f 100644 --- a/arch/arm/include/asm/arch-omap3/ehci.h +++ b/arch/arm/include/asm/arch-omap3/ehci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Alexander Holler <holler(a)ahsoftware.de> diff --git a/arch/arm/include/asm/arch-omap3/emac_defs.h b/arch/arm/include/asm/arch-omap3/emac_defs.h index 0f4b934993..cb313ccf0a 100644 --- a/arch/arm/include/asm/arch-omap3/emac_defs.h +++ b/arch/arm/include/asm/arch-omap3/emac_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> * diff --git a/arch/arm/include/asm/arch-omap3/emif4.h b/arch/arm/include/asm/arch-omap3/emif4.h index bac43b231f..6ff2778c86 100644 --- a/arch/arm/include/asm/arch-omap3/emif4.h +++ b/arch/arm/include/asm/arch-omap3/emif4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Auther: * Vaibhav Hiremath <hvaibhav(a)ti.com> diff --git a/arch/arm/include/asm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h index b04c012656..ce879b22e4 100644 --- a/arch/arm/include/asm/arch-omap3/i2c.h +++ b/arch/arm/include/asm/arch-omap3/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h index 569779c55e..0ca2e285f8 100644 --- a/arch/arm/include/asm/arch-omap3/mem.h +++ b/arch/arm/include/asm/arch-omap3/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/musb.h b/arch/arm/include/asm/arch-omap3/musb.h index cb3f5d89da..899e3309ef 100644 --- a/arch/arm/include/asm/arch-omap3/musb.h +++ b/arch/arm/include/asm/arch-omap3/musb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Ilya Yanok, <ilya.yanok(a)gmail.com> diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h index 2ed520d4bf..0ae6c540d7 100644 --- a/arch/arm/include/asm/arch-omap3/mux.h +++ b/arch/arm/include/asm/arch-omap3/mux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/omap.h b/arch/arm/include/asm/arch-omap3/omap.h index 19155a280e..08ed8be8fe 100644 --- a/arch/arm/include/asm/arch-omap3/omap.h +++ b/arch/arm/include/asm/arch-omap3/omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/spl.h b/arch/arm/include/asm/arch-omap3/spl.h index 86b1f46742..50acd6a14e 100644 --- a/arch/arm/include/asm/arch-omap3/spl.h +++ b/arch/arm/include/asm/arch-omap3/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 3e6335c5fa..6cf483edfb 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/clock.h b/arch/arm/include/asm/arch-omap4/clock.h index 4054dd8edc..ac8475038c 100644 --- a/arch/arm/include/asm/arch-omap4/clock.h +++ b/arch/arm/include/asm/arch-omap4/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/cpu.h b/arch/arm/include/asm/arch-omap4/cpu.h index 4c9ed45583..a96878d130 100644 --- a/arch/arm/include/asm/arch-omap4/cpu.h +++ b/arch/arm/include/asm/arch-omap4/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/hardware.h b/arch/arm/include/asm/arch-omap4/hardware.h index 48dc809249..b495c94dfc 100644 --- a/arch/arm/include/asm/arch-omap4/hardware.h +++ b/arch/arm/include/asm/arch-omap4/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * hardware.h * diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index c8f2f9716f..6cd21b5d73 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/mem.h b/arch/arm/include/asm/arch-omap4/mem.h index 3026a002db..111edf6121 100644 --- a/arch/arm/include/asm/arch-omap4/mem.h +++ b/arch/arm/include/asm/arch-omap4/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/mux_omap4.h b/arch/arm/include/asm/arch-omap4/mux_omap4.h index 854203c4e2..6a6619acf7 100644 --- a/arch/arm/include/asm/arch-omap4/mux_omap4.h +++ b/arch/arm/include/asm/arch-omap4/mux_omap4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2009 * Texas Instruments Incorporated diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 8919088a70..309b5b014a 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/spl.h b/arch/arm/include/asm/arch-omap4/spl.h index d24944af0a..4dcf307782 100644 --- a/arch/arm/include/asm/arch-omap4/spl.h +++ b/arch/arm/include/asm/arch-omap4/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index b2a6887658..2b45ac280c 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/clock.h b/arch/arm/include/asm/arch-omap5/clock.h index b18ef459de..2bc054cab5 100644 --- a/arch/arm/include/asm/arch-omap5/clock.h +++ b/arch/arm/include/asm/arch-omap5/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/cpu.h b/arch/arm/include/asm/arch-omap5/cpu.h index 9e5655319c..517b551f73 100644 --- a/arch/arm/include/asm/arch-omap5/cpu.h +++ b/arch/arm/include/asm/arch-omap5/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h index df392a2714..3586c91681 100644 --- a/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h +++ b/arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Texas Instruments Incorporated diff --git a/arch/arm/include/asm/arch-omap5/ehci.h b/arch/arm/include/asm/arch-omap5/ehci.h index 1790b92a24..71faefd57d 100644 --- a/arch/arm/include/asm/arch-omap5/ehci.h +++ b/arch/arm/include/asm/arch-omap5/ehci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com* * Author: Govindraj R <govindraj.raja(a)ti.com> diff --git a/arch/arm/include/asm/arch-omap5/hardware.h b/arch/arm/include/asm/arch-omap5/hardware.h index b6d26e9f0e..e4df62c63d 100644 --- a/arch/arm/include/asm/arch-omap5/hardware.h +++ b/arch/arm/include/asm/arch-omap5/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * hardware.h * diff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h index 9e1edcf2b7..f11621666b 100644 --- a/arch/arm/include/asm/arch-omap5/i2c.h +++ b/arch/arm/include/asm/arch-omap5/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/mem.h b/arch/arm/include/asm/arch-omap5/mem.h index bd72fb611d..811eea9825 100644 --- a/arch/arm/include/asm/arch-omap5/mem.h +++ b/arch/arm/include/asm/arch-omap5/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h index c7c118ec28..eed6057b0f 100644 --- a/arch/arm/include/asm/arch-omap5/mux_dra7xx.h +++ b/arch/arm/include/asm/arch-omap5/mux_dra7xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Texas Instruments Incorporated diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h index a9c0421b14..62d6b330fd 100644 --- a/arch/arm/include/asm/arch-omap5/omap.h +++ b/arch/arm/include/asm/arch-omap5/omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/sata.h b/arch/arm/include/asm/arch-omap5/sata.h index 96c84fca0c..df67d964f2 100644 --- a/arch/arm/include/asm/arch-omap5/sata.h +++ b/arch/arm/include/asm/arch-omap5/sata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SATA Wrapper Register map * diff --git a/arch/arm/include/asm/arch-omap5/spl.h b/arch/arm/include/asm/arch-omap5/spl.h index cda3b46f02..ab9e209c67 100644 --- a/arch/arm/include/asm/arch-omap5/spl.h +++ b/arch/arm/include/asm/arch-omap5/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-omap5/sys_proto.h b/arch/arm/include/asm/arch-omap5/sys_proto.h index 80b0c93b5e..0307e8a4bb 100644 --- a/arch/arm/include/asm/arch-omap5/sys_proto.h +++ b/arch/arm/include/asm/arch-omap5/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/arch-orion5x/spl.h b/arch/arm/include/asm/arch-orion5x/spl.h index dc0a9b9099..d4b4929a74 100644 --- a/arch/arm/include/asm/arch-orion5x/spl.h +++ b/arch/arm/include/asm/arch-orion5x/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Albert ARIBAUD <albert.u.boot(a)aribaud.net> */ diff --git a/arch/arm/include/asm/arch-owl/regs_s700.h b/arch/arm/include/asm/arch-owl/regs_s700.h index 0f79faec69..ed6e24a7e6 100644 --- a/arch/arm/include/asm/arch-owl/regs_s700.h +++ b/arch/arm/include/asm/arch-owl/regs_s700.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Actions Semi S700 Register Definitions * diff --git a/arch/arm/include/asm/arch-owl/regs_s900.h b/arch/arm/include/asm/arch-owl/regs_s900.h index 084bc9b8c3..1e46d73359 100644 --- a/arch/arm/include/asm/arch-owl/regs_s900.h +++ b/arch/arm/include/asm/arch-owl/regs_s900.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Actions Semi S900 Register Definitions * diff --git a/arch/arm/include/asm/arch-px30/boot0.h b/arch/arm/include/asm/arch-px30/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-px30/boot0.h +++ b/arch/arm/include/asm/arch-px30/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-px30/gpio.h b/arch/arm/include/asm/arch-px30/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-px30/gpio.h +++ b/arch/arm/include/asm/arch-px30/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3036/boot0.h b/arch/arm/include/asm/arch-rk3036/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3036/boot0.h +++ b/arch/arm/include/asm/arch-rk3036/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3036/gpio.h b/arch/arm/include/asm/arch-rk3036/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3036/gpio.h +++ b/arch/arm/include/asm/arch-rk3036/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3066/boot0.h b/arch/arm/include/asm/arch-rk3066/boot0.h index 28c0fb9a4c..96a5a6d63c 100644 --- a/arch/arm/include/asm/arch-rk3066/boot0.h +++ b/arch/arm/include/asm/arch-rk3066/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_ARCH_BOOT0_H__ #define __ASM_ARCH_BOOT0_H__ diff --git a/arch/arm/include/asm/arch-rk3066/gpio.h b/arch/arm/include/asm/arch-rk3066/gpio.h index a4a3b3289c..6ef6125fe0 100644 --- a/arch/arm/include/asm/arch-rk3066/gpio.h +++ b/arch/arm/include/asm/arch-rk3066/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_ARCH_GPIO_H__ #define __ASM_ARCH_GPIO_H__ diff --git a/arch/arm/include/asm/arch-rk3066/timer.h b/arch/arm/include/asm/arch-rk3066/timer.h index 3bb39428cd..2474584c28 100644 --- a/arch/arm/include/asm/arch-rk3066/timer.h +++ b/arch/arm/include/asm/arch-rk3066/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_ARCH_TIMER_H__ #define __ASM_ARCH_TIMER_H__ diff --git a/arch/arm/include/asm/arch-rk3128/boot0.h b/arch/arm/include/asm/arch-rk3128/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3128/boot0.h +++ b/arch/arm/include/asm/arch-rk3128/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3128/gpio.h b/arch/arm/include/asm/arch-rk3128/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3128/gpio.h +++ b/arch/arm/include/asm/arch-rk3128/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3188/boot0.h b/arch/arm/include/asm/arch-rk3188/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3188/boot0.h +++ b/arch/arm/include/asm/arch-rk3188/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3188/gpio.h b/arch/arm/include/asm/arch-rk3188/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3188/gpio.h +++ b/arch/arm/include/asm/arch-rk3188/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk322x/boot0.h b/arch/arm/include/asm/arch-rk322x/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk322x/boot0.h +++ b/arch/arm/include/asm/arch-rk322x/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk322x/gpio.h b/arch/arm/include/asm/arch-rk322x/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk322x/gpio.h +++ b/arch/arm/include/asm/arch-rk322x/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3288/boot0.h b/arch/arm/include/asm/arch-rk3288/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3288/boot0.h +++ b/arch/arm/include/asm/arch-rk3288/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3288/gpio.h b/arch/arm/include/asm/arch-rk3288/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3288/gpio.h +++ b/arch/arm/include/asm/arch-rk3288/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3308/boot0.h b/arch/arm/include/asm/arch-rk3308/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3308/boot0.h +++ b/arch/arm/include/asm/arch-rk3308/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h index 84b63e4d56..ba8be6f761 100644 --- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h +++ b/arch/arm/include/asm/arch-rk3308/cru_rk3308.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rk3308/gpio.h b/arch/arm/include/asm/arch-rk3308/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3308/gpio.h +++ b/arch/arm/include/asm/arch-rk3308/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h index a995bb950d..0e4e99eb6e 100644 --- a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h +++ b/arch/arm/include/asm/arch-rk3308/grf_rk3308.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* *Copyright 2019 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rk3328/boot0.h b/arch/arm/include/asm/arch-rk3328/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3328/boot0.h +++ b/arch/arm/include/asm/arch-rk3328/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3328/gpio.h b/arch/arm/include/asm/arch-rk3328/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3328/gpio.h +++ b/arch/arm/include/asm/arch-rk3328/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3368/boot0.h b/arch/arm/include/asm/arch-rk3368/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3368/boot0.h +++ b/arch/arm/include/asm/arch-rk3368/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3368/gpio.h b/arch/arm/include/asm/arch-rk3368/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3368/gpio.h +++ b/arch/arm/include/asm/arch-rk3368/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3399/boot0.h b/arch/arm/include/asm/arch-rk3399/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rk3399/boot0.h +++ b/arch/arm/include/asm/arch-rk3399/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3399/gpio.h b/arch/arm/include/asm/arch-rk3399/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rk3399/gpio.h +++ b/arch/arm/include/asm/arch-rk3399/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3568/boot0.h b/arch/arm/include/asm/arch-rk3568/boot0.h index dea2b20252..409e190e5b 100644 --- a/arch/arm/include/asm/arch-rk3568/boot0.h +++ b/arch/arm/include/asm/arch-rk3568/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3568/gpio.h b/arch/arm/include/asm/arch-rk3568/gpio.h index b48c0a5cf8..b64be92146 100644 --- a/arch/arm/include/asm/arch-rk3568/gpio.h +++ b/arch/arm/include/asm/arch-rk3568/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3588/boot0.h b/arch/arm/include/asm/arch-rk3588/boot0.h index dea2b20252..409e190e5b 100644 --- a/arch/arm/include/asm/arch-rk3588/boot0.h +++ b/arch/arm/include/asm/arch-rk3588/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rk3588/gpio.h b/arch/arm/include/asm/arch-rk3588/gpio.h index b48c0a5cf8..b64be92146 100644 --- a/arch/arm/include/asm/arch-rk3588/gpio.h +++ b/arch/arm/include/asm/arch-rk3588/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/boot0.h b/arch/arm/include/asm/arch-rockchip/boot0.h index 0c375e543a..f9a7df443e 100644 --- a/arch/arm/include/asm/arch-rockchip/boot0.h +++ b/arch/arm/include/asm/arch-rockchip/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h index 7445e64b8c..f73414967c 100644 --- a/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/cpu_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h index 9778790f34..75462e03a6 100644 --- a/arch/arm/include/asm/arch-rockchip/cru.h +++ b/arch/arm/include/asm/arch-rockchip/cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * (C) Copyright 2019 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/include/asm/arch-rockchip/cru_px30.h b/arch/arm/include/asm/arch-rockchip/cru_px30.h index b66277fc7f..7079631ed2 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_px30.h +++ b/arch/arm/include/asm/arch-rockchip/cru_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h index 5db0407baa..b3cf9813fd 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3036.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3036.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3066.h b/arch/arm/include/asm/arch-rockchip/cru_rk3066.h index 76a715a8e6..45fcc04289 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3066.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3066.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Paweł Jarosz <paweljarosz3691(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h index cca812d29e..6e3ba54ae4 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3128.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3128.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h index eec4815bbc..2837af9030 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3188.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3188.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Heiko Stuebner <heiko(a)sntech.de> */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h index ee12fa831f..d2938e78e1 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk322x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h index 412b73e55f..03e3eea8b8 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc * diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h index 226744d67d..5b64f4e8e5 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3328.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3328.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h index ed2a612185..5ce91e70c3 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd * Author: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h index d941a129f3..f7de27b42a 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h index 0ba5ff6a04..80222300f6 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rv1108.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rv1108.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * Author: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/arch/arm/include/asm/arch-rockchip/dram_spec_timing.h b/arch/arm/include/asm/arch-rockchip/dram_spec_timing.h index a691e97a8b..6c60f99538 100644 --- a/arch/arm/include/asm/arch-rockchip/dram_spec_timing.h +++ b/arch/arm/include/asm/arch-rockchip/dram_spec_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/f_rockusb.h b/arch/arm/include/asm/arch-rockchip/f_rockusb.h index e9c7f79339..96a3e49070 100644 --- a/arch/arm/include/asm/arch-rockchip/f_rockusb.h +++ b/arch/arm/include/asm/arch-rockchip/f_rockusb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 * diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h index 1aaec5faec..7cd089dc07 100644 --- a/arch/arm/include/asm/arch-rockchip/gpio.h +++ b/arch/arm/include/asm/arch-rockchip/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_px30.h b/arch/arm/include/asm/arch-rockchip/grf_px30.h index d51e29b19e..e21ab84597 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_px30.h +++ b/arch/arm/include/asm/arch-rockchip/grf_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h index 08348d8228..fc6b644f11 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3036.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3036.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3066.h b/arch/arm/include/asm/arch-rockchip/grf_rk3066.h index d8e0812cee..f7cbb363cf 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3066.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3066.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 Paweł Jarosz <paweljarosz3691(a)gmail.com> */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h index fe07d69b42..8db9d8a69e 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3128.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3128.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h index 5f4d9d8224..b7593aab33 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk322x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h index d8a46800fd..b624f46dc7 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h index 0079d20078..215d822d75 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3368.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3368.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h index dd89cd2050..eefbfc34dd 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3568.h b/arch/arm/include/asm/arch-rockchip/grf_rk3568.h index d4e9b56292..18062155a8 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3568.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3568.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3588.h b/arch/arm/include/asm/arch-rockchip/grf_rk3588.h index e0694068bb..f02c727e20 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3588.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3588.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h index 92bbe34af6..1a031dbf7f 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rv1108.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rv1108.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/grf_rv1126.h b/arch/arm/include/asm/arch-rockchip/grf_rv1126.h index 4e0488b91a..8d4ff0c352 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rv1126.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rv1126.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/hardware.h b/arch/arm/include/asm/arch-rockchip/hardware.h index 62e8bed8f3..e985a4c42f 100644 --- a/arch/arm/include/asm/arch-rockchip/hardware.h +++ b/arch/arm/include/asm/arch-rockchip/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Google, Inc */ diff --git a/arch/arm/include/asm/arch-rockchip/i2c.h b/arch/arm/include/asm/arch-rockchip/i2c.h index b0e1936f60..ead129eb7a 100644 --- a/arch/arm/include/asm/arch-rockchip/i2c.h +++ b/arch/arm/include/asm/arch-rockchip/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/arch/arm/include/asm/arch-rockchip/ioc_rk3588.h b/arch/arm/include/asm/arch-rockchip/ioc_rk3588.h index 5a656f850c..74176cbdce 100644 --- a/arch/arm/include/asm/arch-rockchip/ioc_rk3588.h +++ b/arch/arm/include/asm/arch-rockchip/ioc_rk3588.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h b/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h index fb25504b12..4a8bcefe40 100644 --- a/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/lvds_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Rockchip Inc. */ diff --git a/arch/arm/include/asm/arch-rockchip/misc.h b/arch/arm/include/asm/arch-rockchip/misc.h index 4155af8c3b..25d3206b55 100644 --- a/arch/arm/include/asm/arch-rockchip/misc.h +++ b/arch/arm/include/asm/arch-rockchip/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RK3399: Architecture common definitions * diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h index f7b9a0674c..42dd646f77 100644 --- a/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h +++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3188.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Heiko Stuebner <heiko(a)sntech.de> */ diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h index 8553d2eee4..b6bda70c95 100644 --- a/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * diff --git a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h index f1096dccce..f741713346 100644 --- a/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/pmu_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Rockchip Electronics Co., Ltd. * diff --git a/arch/arm/include/asm/arch-rockchip/pwm.h b/arch/arm/include/asm/arch-rockchip/pwm.h index e8594055cd..5b0f9c0629 100644 --- a/arch/arm/include/asm/arch-rockchip/pwm.h +++ b/arch/arm/include/asm/arch-rockchip/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Google, Inc * (C) Copyright 2008-2014 Rockchip Electronics diff --git a/arch/arm/include/asm/arch-rockchip/qos_rk3288.h b/arch/arm/include/asm/arch-rockchip/qos_rk3288.h index c24b090b0a..717ae370db 100644 --- a/arch/arm/include/asm/arch-rockchip/qos_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/qos_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Rockchip Inc. */ diff --git a/arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h b/arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h index c13957a62e..07816e18ed 100644 --- a/arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h +++ b/arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd * author: Eric Gao <eric.gao(a)rock-chips.com> diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h index 4fb45ac5c7..5a1bc45099 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index e53e5a9ca5..1acad9a2d4 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_msch.h b/arch/arm/include/asm/arch-rockchip/sdram_msch.h index d1926f4bf2..5752641388 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_msch.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_msch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h index 3780dc6ea5..43df067bd8 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_pctl_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h index a033a18538..0d3af3bd70 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h index 9c15232047..1c64d89564 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_ron_rtt_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h b/arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h index 5b64ec3352..fd3c91a281 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_phy_rv1126.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_px30.h b/arch/arm/include/asm/arch-rockchip/sdram_px30.h index 2ab8e97ae1..b592245948 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_px30.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h index 46298165fb..8e8bc41ea0 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3036.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h index 0d29aefb64..b083234c9c 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk322x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h index 10923505d6..899543c105 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3328.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _ASM_ARCH_SDRAM_RK3328_H diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h index c76372ee82..17cbd0e58a 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016-2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rv1126.h b/arch/arm/include/asm/arch-rockchip/sdram_rv1126.h index 6a07436059..280276f648 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rv1126.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rv1126.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/sys_proto.h b/arch/arm/include/asm/arch-rockchip/sys_proto.h index de5a8f11a9..2f9c60add6 100644 --- a/arch/arm/include/asm/arch-rockchip/sys_proto.h +++ b/arch/arm/include/asm/arch-rockchip/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co.,Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/timer.h b/arch/arm/include/asm/arch-rockchip/timer.h index 77b5422044..d7c4e31e10 100644 --- a/arch/arm/include/asm/arch-rockchip/timer.h +++ b/arch/arm/include/asm/arch-rockchip/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rockchip/uart.h b/arch/arm/include/asm/arch-rockchip/uart.h index feede5e555..3b7f0d4c38 100644 --- a/arch/arm/include/asm/arch-rockchip/uart.h +++ b/arch/arm/include/asm/arch-rockchip/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rv1108/boot0.h b/arch/arm/include/asm/arch-rv1108/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rv1108/boot0.h +++ b/arch/arm/include/asm/arch-rv1108/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rv1108/gpio.h b/arch/arm/include/asm/arch-rv1108/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rv1108/gpio.h +++ b/arch/arm/include/asm/arch-rv1108/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rv1126/boot0.h b/arch/arm/include/asm/arch-rv1126/boot0.h index 2e78b074ad..5d289bcd88 100644 --- a/arch/arm/include/asm/arch-rv1126/boot0.h +++ b/arch/arm/include/asm/arch-rv1126/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-rv1126/gpio.h b/arch/arm/include/asm/arch-rv1126/gpio.h index eca79d5159..3d251f1b2d 100644 --- a/arch/arm/include/asm/arch-rv1126/gpio.h +++ b/arch/arm/include/asm/arch-rv1126/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/include/asm/arch-stih410/sdhci.h b/arch/arm/include/asm/arch-stih410/sdhci.h index 1735c0e391..1c03e4a2fb 100644 --- a/arch/arm/include/asm/arch-stih410/sdhci.h +++ b/arch/arm/include/asm/arch-stih410/sdhci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stih410/sys_proto.h b/arch/arm/include/asm/arch-stih410/sys_proto.h index 30e7f398eb..a081bcfbbc 100644 --- a/arch/arm/include/asm/arch-stih410/sys_proto.h +++ b/arch/arm/include/asm/arch-stih410/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stm32/stm32f.h b/arch/arm/include/asm/arch-stm32/stm32f.h index e795d81169..e2e14f1bea 100644 --- a/arch/arm/include/asm/arch-stm32/stm32f.h +++ b/arch/arm/include/asm/arch-stm32/stm32f.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stm32f4/stm32.h b/arch/arm/include/asm/arch-stm32f4/stm32.h index 2094bd7321..3188461a08 100644 --- a/arch/arm/include/asm/arch-stm32f4/stm32.h +++ b/arch/arm/include/asm/arch-stm32f4/stm32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com diff --git a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h index fe6ca03d2d..4eba8d8378 100644 --- a/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h +++ b/arch/arm/include/asm/arch-stm32f4/stm32_pwr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stm32f7/stm32.h b/arch/arm/include/asm/arch-stm32f7/stm32.h index 57db839e8d..90dbe46c08 100644 --- a/arch/arm/include/asm/arch-stm32f7/stm32.h +++ b/arch/arm/include/asm/arch-stm32f7/stm32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h index 5cd6553d04..e2bb25dbcf 100644 --- a/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h +++ b/arch/arm/include/asm/arch-stm32f7/stm32_pwr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stm32f7/syscfg.h b/arch/arm/include/asm/arch-stm32f7/syscfg.h index 985ae2544d..b7ad50ed3e 100644 --- a/arch/arm/include/asm/arch-stm32f7/syscfg.h +++ b/arch/arm/include/asm/arch-stm32f7/syscfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Michael Kurz, michi.kurz(a)gmail.com. diff --git a/arch/arm/include/asm/arch-stm32h7/stm32.h b/arch/arm/include/asm/arch-stm32h7/stm32.h index 2b0a670008..cedda25aa8 100644 --- a/arch/arm/include/asm/arch-stm32h7/stm32.h +++ b/arch/arm/include/asm/arch-stm32h7/stm32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/gpio.h b/arch/arm/include/asm/arch-stv0991/gpio.h index b27f407858..7fdf4ffc56 100644 --- a/arch/arm/include/asm/arch-stv0991/gpio.h +++ b/arch/arm/include/asm/arch-stv0991/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/hardware.h b/arch/arm/include/asm/arch-stv0991/hardware.h index ea8f820630..13053ab07c 100644 --- a/arch/arm/include/asm/arch-stv0991/hardware.h +++ b/arch/arm/include/asm/arch-stv0991/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h index df9dd54e5a..9ad5463e9b 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_cgu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h index 4d444a6df1..431583a4cd 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_creg.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_creg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_defs.h b/arch/arm/include/asm/arch-stv0991/stv0991_defs.h index 98d7cde85b..c1db48fee4 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_defs.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h index eb1ddca600..a83bc724e6 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_gpt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_periph.h b/arch/arm/include/asm/arch-stv0991/stv0991_periph.h index 7a50be183d..e846797996 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_periph.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_periph.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h index 8cb8a8a613..463c62171c 100644 --- a/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h +++ b/arch/arm/include/asm/arch-stv0991/stv0991_wdru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/arch-sunxi/boot0.h b/arch/arm/include/asm/arch-sunxi/boot0.h index 30f5680757..de631fcd98 100644 --- a/arch/arm/include/asm/arch-sunxi/boot0.h +++ b/arch/arm/include/asm/arch-sunxi/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Allwinner A64 (sun50i) CPU */ diff --git a/arch/arm/include/asm/arch-sunxi/clock.h b/arch/arm/include/asm/arch-sunxi/clock.h index 2cfd540742..99d8050016 100644 --- a/arch/arm/include/asm/arch-sunxi/clock.h +++ b/arch/arm/include/asm/arch-sunxi/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h index 2cec91cb20..c34879c81a 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sun4i, sun5i and sun7i clock register definitions * diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h index 37df4410ea..7c2d611261 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h @@ -3,7 +3,7 @@ * * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _SUNXI_CLOCK_SUN50I_H6_H diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index 7fcf340db6..2fd31811f9 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sun6i clock register definitions * diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h index 14df3cc8f4..6830a2a34c 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sun8i a83t clock register definitions * diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h index fe6b8ba273..d872be1fad 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun9i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sun9i clock register definitions * diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h index b08f202374..0d146ec9cc 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> */ diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h index f7ecc790db..dd45f26ec7 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h index d9cf8ae042..6595b90a26 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _SUNXI_CPU_SUN50I_H6_H diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h index 9c2d11b590..f615c07a12 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun9i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * (C) Copyright 2007-2013 diff --git a/arch/arm/include/asm/arch-sunxi/cpucfg.h b/arch/arm/include/asm/arch-sunxi/cpucfg.h index 4aaebe0a97..e880d493ab 100644 --- a/arch/arm/include/asm/arch-sunxi/cpucfg.h +++ b/arch/arm/include/asm/arch-sunxi/cpucfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi A31 CPUCFG register definition. * diff --git a/arch/arm/include/asm/arch-sunxi/display.h b/arch/arm/include/asm/arch-sunxi/display.h index 525f9cb839..c5274ec342 100644 --- a/arch/arm/include/asm/arch-sunxi/display.h +++ b/arch/arm/include/asm/arch-sunxi/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi platform display controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/display2.h b/arch/arm/include/asm/arch-sunxi/display2.h index 7202d2756c..bc8bf0537f 100644 --- a/arch/arm/include/asm/arch-sunxi/display2.h +++ b/arch/arm/include/asm/arch-sunxi/display2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi platform display controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dma.h b/arch/arm/include/asm/arch-sunxi/dma.h index bd4c84f00a..8d0affc654 100644 --- a/arch/arm/include/asm/arch-sunxi/dma.h +++ b/arch/arm/include/asm/arch-sunxi/dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Roy Spliet <rspliet(a)ultimaker.com> */ diff --git a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h index 309dc4f7cf..bf4e75d68f 100644 --- a/arch/arm/include/asm/arch-sunxi/dma_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/dma_sun4i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Roy Spliet <rspliet(a)ultimaker.com> */ diff --git a/arch/arm/include/asm/arch-sunxi/dram.h b/arch/arm/include/asm/arch-sunxi/dram.h index 682daae6b1..2034c16073 100644 --- a/arch/arm/include/asm/arch-sunxi/dram.h +++ b/arch/arm/include/asm/arch-sunxi/dram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h index 69c6600e98..58916a8a04 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun4i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h index be02655cdd..a589b013c4 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h @@ -3,7 +3,7 @@ * * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _SUNXI_DRAM_SUN50I_H6_H diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h index 11774deded..f93a5d5a55 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h @@ -6,7 +6,7 @@ * Based on H6 one, which is: * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _SUNXI_DRAM_SUN50I_H616_H diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h index b66d58cd73..7932b68bc9 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun6i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sun6i platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h index ca98597f1f..e37cb4ed3d 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a23.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sun8i platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h index 3f65306cc6..7f42d36f5f 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a33.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sun8i platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h index 2a87996354..8c64598cf1 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sun8i platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h index 41df5fe5b6..bb21f65e65 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun9i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sun8i platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/dram_suniv.h b/arch/arm/include/asm/arch-sunxi/dram_suniv.h index 6f4c0512d6..255032a3c4 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_suniv.h +++ b/arch/arm/include/asm/arch-sunxi/dram_suniv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * suniv DRAM controller register definition * diff --git a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h index e843c14202..a81b79a55e 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sunxi_dw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sun8i H3 platform dram controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h index 6eaeece4e2..0633915cf8 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/gtbus.h b/arch/arm/include/asm/arch-sunxi/gtbus.h index a89102ecc6..950bc4808c 100644 --- a/arch/arm/include/asm/arch-sunxi/gtbus.h +++ b/arch/arm/include/asm/arch-sunxi/gtbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GTBUS initialisation * diff --git a/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h b/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h index f9629923af..53ed43f952 100644 --- a/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h +++ b/arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GTBUS initialisation for sun9i * diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h index f0da46d863..975ed9a936 100644 --- a/arch/arm/include/asm/arch-sunxi/i2c.h +++ b/arch/arm/include/asm/arch-sunxi/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 - Hans de Goede <hdegoede(a)redhat.com> */ diff --git a/arch/arm/include/asm/arch-sunxi/lcdc.h b/arch/arm/include/asm/arch-sunxi/lcdc.h index 90216bcfd5..65237638e9 100644 --- a/arch/arm/include/asm/arch-sunxi/lcdc.h +++ b/arch/arm/include/asm/arch-sunxi/lcdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi platform timing controller register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h index 5daacf10eb..22e5022c18 100644 --- a/arch/arm/include/asm/arch-sunxi/mmc.h +++ b/arch/arm/include/asm/arch-sunxi/mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/p2wi.h b/arch/arm/include/asm/arch-sunxi/p2wi.h index 5f2a898b3b..e855ef066f 100644 --- a/arch/arm/include/asm/arch-sunxi/p2wi.h +++ b/arch/arm/include/asm/arch-sunxi/p2wi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi platform Push-Push i2c register definition. * diff --git a/arch/arm/include/asm/arch-sunxi/pmic_bus.h b/arch/arm/include/asm/arch-sunxi/pmic_bus.h index 5ab9b2809f..48b13d9934 100644 --- a/arch/arm/include/asm/arch-sunxi/pmic_bus.h +++ b/arch/arm/include/asm/arch-sunxi/pmic_bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/include/asm/arch-sunxi/prcm.h b/arch/arm/include/asm/arch-sunxi/prcm.h index 5106076f5e..241b3a9cd1 100644 --- a/arch/arm/include/asm/arch-sunxi/prcm.h +++ b/arch/arm/include/asm/arch-sunxi/prcm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2020 Jernej Skrabec <jernej.skrabec(a)siol.net> * diff --git a/arch/arm/include/asm/arch-sunxi/prcm_sun50i.h b/arch/arm/include/asm/arch-sunxi/prcm_sun50i.h index fd63d3aad8..0d98971da4 100644 --- a/arch/arm/include/asm/arch-sunxi/prcm_sun50i.h +++ b/arch/arm/include/asm/arch-sunxi/prcm_sun50i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi H6 Power Management Unit register definition. * diff --git a/arch/arm/include/asm/arch-sunxi/prcm_sun6i.h b/arch/arm/include/asm/arch-sunxi/prcm_sun6i.h index ab664e80bb..a6b279cbd3 100644 --- a/arch/arm/include/asm/arch-sunxi/prcm_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/prcm_sun6i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi A31 Power Management Unit register definition. * diff --git a/arch/arm/include/asm/arch-sunxi/pwm.h b/arch/arm/include/asm/arch-sunxi/pwm.h index b89bddd2e8..1e6fcad887 100644 --- a/arch/arm/include/asm/arch-sunxi/pwm.h +++ b/arch/arm/include/asm/arch-sunxi/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Hans de Goede <hdegoede(a)redhat.com> */ diff --git a/arch/arm/include/asm/arch-sunxi/rsb.h b/arch/arm/include/asm/arch-sunxi/rsb.h index 8c64a995f2..77d4d96d2b 100644 --- a/arch/arm/include/asm/arch-sunxi/rsb.h +++ b/arch/arm/include/asm/arch-sunxi/rsb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h index 14944a20ea..e95711a8b8 100644 --- a/arch/arm/include/asm/arch-sunxi/spl.h +++ b/arch/arm/include/asm/arch-sunxi/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h index 064602292b..256b8d75e4 100644 --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/timer.h b/arch/arm/include/asm/arch-sunxi/timer.h index bb5626d893..9f2f014b58 100644 --- a/arch/arm/include/asm/arch-sunxi/timer.h +++ b/arch/arm/include/asm/arch-sunxi/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/include/asm/arch-sunxi/tve.h b/arch/arm/include/asm/arch-sunxi/tve.h index 46cd87e79e..4fd469229b 100644 --- a/arch/arm/include/asm/arch-sunxi/tve.h +++ b/arch/arm/include/asm/arch-sunxi/tve.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sunxi TV encoder register and constant defines * diff --git a/arch/arm/include/asm/arch-sunxi/tzpc.h b/arch/arm/include/asm/arch-sunxi/tzpc.h index 7a6fcaebdb..535ac6c558 100644 --- a/arch/arm/include/asm/arch-sunxi/tzpc.h +++ b/arch/arm/include/asm/arch-sunxi/tzpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Chen-Yu Tsai <wens(a)csie.org> */ diff --git a/arch/arm/include/asm/arch-sunxi/watchdog.h b/arch/arm/include/asm/arch-sunxi/watchdog.h index 38e2ef2aca..8d929ab24d 100644 --- a/arch/arm/include/asm/arch-sunxi/watchdog.h +++ b/arch/arm/include/asm/arch-sunxi/watchdog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Chen-Yu Tsai <wens(a)csie.org> diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h index 78aeb25ac7..a4eb387c94 100644 --- a/arch/arm/include/asm/arch-tegra/ap.h +++ b/arch/arm/include/asm/arch-tegra/ap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/apb_misc.h b/arch/arm/include/asm/arch-tegra/apb_misc.h index d438966afb..6cb2785418 100644 --- a/arch/arm/include/asm/arch-tegra/apb_misc.h +++ b/arch/arm/include/asm/arch-tegra/apb_misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/arch-tegra/board.h b/arch/arm/include/asm/arch-tegra/board.h index cd4d0ee3c9..18bcf21c25 100644 --- a/arch/arm/include/asm/arch-tegra/board.h +++ b/arch/arm/include/asm/arch-tegra/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/cboot.h b/arch/arm/include/asm/arch-tegra/cboot.h index 4e1da98d1f..0823cbb853 100644 --- a/arch/arm/include/asm/arch-tegra/cboot.h +++ b/arch/arm/include/asm/arch-tegra/cboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 NVIDIA Corporation. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/include/asm/arch-tegra/clk_rst.h index 2359e142fb..a27c47da6c 100644 --- a/arch/arm/include/asm/arch-tegra/clk_rst.h +++ b/arch/arm/include/asm/arch-tegra/clk_rst.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/include/asm/arch-tegra/clock.h index 61ef81e7fe..35749466e3 100644 --- a/arch/arm/include/asm/arch-tegra/clock.h +++ b/arch/arm/include/asm/arch-tegra/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/arch-tegra/crypto.h b/arch/arm/include/asm/arch-tegra/crypto.h index 7646163b97..2899cf3ef4 100644 --- a/arch/arm/include/asm/arch-tegra/crypto.h +++ b/arch/arm/include/asm/arch-tegra/crypto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h index 7613d84f22..ed1a2f9a6f 100644 --- a/arch/arm/include/asm/arch-tegra/dc.h +++ b/arch/arm/include/asm/arch-tegra/dc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/fuse.h b/arch/arm/include/asm/arch-tegra/fuse.h index f3f2ad8e3f..182b2bb2af 100644 --- a/arch/arm/include/asm/arch-tegra/fuse.h +++ b/arch/arm/include/asm/arch-tegra/fuse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/gp_padctrl.h b/arch/arm/include/asm/arch-tegra/gp_padctrl.h index 4362c53d88..c879e84f41 100644 --- a/arch/arm/include/asm/arch-tegra/gp_padctrl.h +++ b/arch/arm/include/asm/arch-tegra/gp_padctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/gpio.h b/arch/arm/include/asm/arch-tegra/gpio.h index fe7b3a50e0..da9977b45d 100644 --- a/arch/arm/include/asm/arch-tegra/gpio.h +++ b/arch/arm/include/asm/arch-tegra/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011, Google Inc. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h index d4d6deb494..78d02a35ad 100644 --- a/arch/arm/include/asm/arch-tegra/gpu.h +++ b/arch/arm/include/asm/arch-tegra/gpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/pinmux.h b/arch/arm/include/asm/arch-tegra/pinmux.h index 4b6e841950..d02200c859 100644 --- a/arch/arm/include/asm/arch-tegra/pinmux.h +++ b/arch/arm/include/asm/arch-tegra/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/pmc.h b/arch/arm/include/asm/arch-tegra/pmc.h index e1f5a73813..805cdb2070 100644 --- a/arch/arm/include/asm/arch-tegra/pmc.h +++ b/arch/arm/include/asm/arch-tegra/pmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2019 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/pmu.h b/arch/arm/include/asm/arch-tegra/pmu.h index e850875d31..b3d529fa7b 100644 --- a/arch/arm/include/asm/arch-tegra/pmu.h +++ b/arch/arm/include/asm/arch-tegra/pmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/pwm.h b/arch/arm/include/asm/arch-tegra/pwm.h index eebd104de9..b694032ca4 100644 --- a/arch/arm/include/asm/arch-tegra/pwm.h +++ b/arch/arm/include/asm/arch-tegra/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Tegra pulse width frequency modulator definitions * diff --git a/arch/arm/include/asm/arch-tegra/scu.h b/arch/arm/include/asm/arch-tegra/scu.h index afe076419c..69681791d2 100644 --- a/arch/arm/include/asm/arch-tegra/scu.h +++ b/arch/arm/include/asm/arch-tegra/scu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/sys_proto.h b/arch/arm/include/asm/arch-tegra/sys_proto.h index 566666a9a0..542c36f3bb 100644 --- a/arch/arm/include/asm/arch-tegra/sys_proto.h +++ b/arch/arm/include/asm/arch-tegra/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/tegra.h b/arch/arm/include/asm/arch-tegra/tegra.h index 7a4e0972fb..a226624a34 100644 --- a/arch/arm/include/asm/arch-tegra/tegra.h +++ b/arch/arm/include/asm/arch-tegra/tegra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index d6a55764ba..9ed423ffa5 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/include/asm/arch-tegra/timer.h b/arch/arm/include/asm/arch-tegra/timer.h index 1c4decacd3..e142eb7dd4 100644 --- a/arch/arm/include/asm/arch-tegra/timer.h +++ b/arch/arm/include/asm/arch-tegra/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/arch-tegra/uart.h b/arch/arm/include/asm/arch-tegra/uart.h index 24f0bdd51b..6ff5c023de 100644 --- a/arch/arm/include/asm/arch-tegra/uart.h +++ b/arch/arm/include/asm/arch-tegra/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra/usb.h b/arch/arm/include/asm/arch-tegra/usb.h index 6e6ea1443c..64d43b0927 100644 --- a/arch/arm/include/asm/arch-tegra/usb.h +++ b/arch/arm/include/asm/arch-tegra/usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2013 NVIDIA Corporation diff --git a/arch/arm/include/asm/arch-tegra/warmboot.h b/arch/arm/include/asm/arch-tegra/warmboot.h index bfde4c30ac..326c5ce64c 100644 --- a/arch/arm/include/asm/arch-tegra/warmboot.h +++ b/arch/arm/include/asm/arch-tegra/warmboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010, 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra114/mc.h b/arch/arm/include/asm/arch-tegra114/mc.h index 3930bab571..cce597c28b 100644 --- a/arch/arm/include/asm/arch-tegra114/mc.h +++ b/arch/arm/include/asm/arch-tegra114/mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra114/pinmux.h b/arch/arm/include/asm/arch-tegra114/pinmux.h index 414b22e201..68535ca848 100644 --- a/arch/arm/include/asm/arch-tegra114/pinmux.h +++ b/arch/arm/include/asm/arch-tegra114/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra124/ahb.h b/arch/arm/include/asm/arch-tegra124/ahb.h index d88cdfecea..7bc7fcef86 100644 --- a/arch/arm/include/asm/arch-tegra124/ahb.h +++ b/arch/arm/include/asm/arch-tegra124/ahb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/clock-tables.h b/arch/arm/include/asm/arch-tegra124/clock-tables.h index 9f53125315..2886894c12 100644 --- a/arch/arm/include/asm/arch-tegra124/clock-tables.h +++ b/arch/arm/include/asm/arch-tegra124/clock-tables.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/clock.h b/arch/arm/include/asm/arch-tegra124/clock.h index 3f54d36277..e422b82319 100644 --- a/arch/arm/include/asm/arch-tegra124/clock.h +++ b/arch/arm/include/asm/arch-tegra124/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/display.h b/arch/arm/include/asm/arch-tegra124/display.h index ca3d57579e..8ed89da3cb 100644 --- a/arch/arm/include/asm/arch-tegra124/display.h +++ b/arch/arm/include/asm/arch-tegra124/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/flow.h b/arch/arm/include/asm/arch-tegra124/flow.h index ebcb22f1cb..4a2904b704 100644 --- a/arch/arm/include/asm/arch-tegra124/flow.h +++ b/arch/arm/include/asm/arch-tegra124/flow.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/funcmux.h b/arch/arm/include/asm/arch-tegra124/funcmux.h index 8d4501e7de..34c25144ca 100644 --- a/arch/arm/include/asm/arch-tegra124/funcmux.h +++ b/arch/arm/include/asm/arch-tegra124/funcmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h index 750a2dc649..12177293dd 100644 --- a/arch/arm/include/asm/arch-tegra124/gp_padctrl.h +++ b/arch/arm/include/asm/arch-tegra124/gp_padctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/gpio.h b/arch/arm/include/asm/arch-tegra124/gpio.h index e5ea2815af..0a68c04220 100644 --- a/arch/arm/include/asm/arch-tegra124/gpio.h +++ b/arch/arm/include/asm/arch-tegra124/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/pinmux.h b/arch/arm/include/asm/arch-tegra124/pinmux.h index 4c593aae7c..67448a8ec7 100644 --- a/arch/arm/include/asm/arch-tegra124/pinmux.h +++ b/arch/arm/include/asm/arch-tegra124/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra124/pwm.h b/arch/arm/include/asm/arch-tegra124/pwm.h index 9ab23e8f2d..a93d04ced1 100644 --- a/arch/arm/include/asm/arch-tegra124/pwm.h +++ b/arch/arm/include/asm/arch-tegra124/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Tegra pulse width frequency modulator definitions * diff --git a/arch/arm/include/asm/arch-tegra124/sysctr.h b/arch/arm/include/asm/arch-tegra124/sysctr.h index 6567104d08..53c9adad96 100644 --- a/arch/arm/include/asm/arch-tegra124/sysctr.h +++ b/arch/arm/include/asm/arch-tegra124/sysctr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra124/tegra.h b/arch/arm/include/asm/arch-tegra124/tegra.h index 34070b8630..725572fc57 100644 --- a/arch/arm/include/asm/arch-tegra124/tegra.h +++ b/arch/arm/include/asm/arch-tegra124/tegra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/clock-tables.h b/arch/arm/include/asm/arch-tegra20/clock-tables.h index 861b3d5d07..58509d8905 100644 --- a/arch/arm/include/asm/arch-tegra20/clock-tables.h +++ b/arch/arm/include/asm/arch-tegra20/clock-tables.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2010-2012 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/clock.h b/arch/arm/include/asm/arch-tegra20/clock.h index 8158b83446..11f1344129 100644 --- a/arch/arm/include/asm/arch-tegra20/clock.h +++ b/arch/arm/include/asm/arch-tegra20/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/arch-tegra20/display.h b/arch/arm/include/asm/arch-tegra20/display.h index e7b3cffd46..c7e2ef6752 100644 --- a/arch/arm/include/asm/arch-tegra20/display.h +++ b/arch/arm/include/asm/arch-tegra20/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/emc.h b/arch/arm/include/asm/arch-tegra20/emc.h index 65d0e34f41..640576acd3 100644 --- a/arch/arm/include/asm/arch-tegra20/emc.h +++ b/arch/arm/include/asm/arch-tegra20/emc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/flow.h b/arch/arm/include/asm/arch-tegra20/flow.h index 33be841ddb..2b129e23a8 100644 --- a/arch/arm/include/asm/arch-tegra20/flow.h +++ b/arch/arm/include/asm/arch-tegra20/flow.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010, 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/funcmux.h b/arch/arm/include/asm/arch-tegra20/funcmux.h index e9e96c1f93..96f2aa123b 100644 --- a/arch/arm/include/asm/arch-tegra20/funcmux.h +++ b/arch/arm/include/asm/arch-tegra20/funcmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h index dd2ee12655..7ed87e604c 100644 --- a/arch/arm/include/asm/arch-tegra20/gp_padctrl.h +++ b/arch/arm/include/asm/arch-tegra20/gp_padctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/gpio.h b/arch/arm/include/asm/arch-tegra20/gpio.h index 6818c28723..037e6e4d9c 100644 --- a/arch/arm/include/asm/arch-tegra20/gpio.h +++ b/arch/arm/include/asm/arch-tegra20/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011, Google Inc. All rights reserved. * Portions Copyright 2011-2012 NVIDIA Corporation diff --git a/arch/arm/include/asm/arch-tegra20/mc.h b/arch/arm/include/asm/arch-tegra20/mc.h index 71283e4e21..71d0f18458 100644 --- a/arch/arm/include/asm/arch-tegra20/mc.h +++ b/arch/arm/include/asm/arch-tegra20/mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/pinmux.h b/arch/arm/include/asm/arch-tegra20/pinmux.h index e9e3801e6f..8a327bcb1b 100644 --- a/arch/arm/include/asm/arch-tegra20/pinmux.h +++ b/arch/arm/include/asm/arch-tegra20/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/pwm.h b/arch/arm/include/asm/arch-tegra20/pwm.h index 9467617b56..ae91b128d4 100644 --- a/arch/arm/include/asm/arch-tegra20/pwm.h +++ b/arch/arm/include/asm/arch-tegra20/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Tegra pulse width frequency modulator definitions * diff --git a/arch/arm/include/asm/arch-tegra20/sdram_param.h b/arch/arm/include/asm/arch-tegra20/sdram_param.h index 3d1405fa3b..5de0fd8b32 100644 --- a/arch/arm/include/asm/arch-tegra20/sdram_param.h +++ b/arch/arm/include/asm/arch-tegra20/sdram_param.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010, 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra20/tegra.h b/arch/arm/include/asm/arch-tegra20/tegra.h index 3fecbcdb62..4c48c445d8 100644 --- a/arch/arm/include/asm/arch-tegra20/tegra.h +++ b/arch/arm/include/asm/arch-tegra20/tegra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/ahb.h b/arch/arm/include/asm/arch-tegra210/ahb.h index 8ecd6d9bae..3acfe4bb15 100644 --- a/arch/arm/include/asm/arch-tegra210/ahb.h +++ b/arch/arm/include/asm/arch-tegra210/ahb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/clock-tables.h b/arch/arm/include/asm/arch-tegra210/clock-tables.h index c6d7487e62..af8969eda4 100644 --- a/arch/arm/include/asm/arch-tegra210/clock-tables.h +++ b/arch/arm/include/asm/arch-tegra210/clock-tables.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/clock.h b/arch/arm/include/asm/arch-tegra210/clock.h index 438a6f46c8..da8396caf5 100644 --- a/arch/arm/include/asm/arch-tegra210/clock.h +++ b/arch/arm/include/asm/arch-tegra210/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/flow.h b/arch/arm/include/asm/arch-tegra210/flow.h index ef0be19e58..b95ee865cc 100644 --- a/arch/arm/include/asm/arch-tegra210/flow.h +++ b/arch/arm/include/asm/arch-tegra210/flow.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/funcmux.h b/arch/arm/include/asm/arch-tegra210/funcmux.h index f6270e57a9..05d2a3ab99 100644 --- a/arch/arm/include/asm/arch-tegra210/funcmux.h +++ b/arch/arm/include/asm/arch-tegra210/funcmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h index e9ff903752..6ac56c9328 100644 --- a/arch/arm/include/asm/arch-tegra210/gp_padctrl.h +++ b/arch/arm/include/asm/arch-tegra210/gp_padctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/gpio.h b/arch/arm/include/asm/arch-tegra210/gpio.h index cb91b10bed..2572a23919 100644 --- a/arch/arm/include/asm/arch-tegra210/gpio.h +++ b/arch/arm/include/asm/arch-tegra210/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/mc.h b/arch/arm/include/asm/arch-tegra210/mc.h index 5a2a5681d7..f9f8c6bb75 100644 --- a/arch/arm/include/asm/arch-tegra210/mc.h +++ b/arch/arm/include/asm/arch-tegra210/mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014-2015 NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra210/pinmux.h b/arch/arm/include/asm/arch-tegra210/pinmux.h index 9e94074628..a3e5325629 100644 --- a/arch/arm/include/asm/arch-tegra210/pinmux.h +++ b/arch/arm/include/asm/arch-tegra210/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra210/powergate.h b/arch/arm/include/asm/arch-tegra210/powergate.h index ec8f518dd9..794c54d4ff 100644 --- a/arch/arm/include/asm/arch-tegra210/powergate.h +++ b/arch/arm/include/asm/arch-tegra210/powergate.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014-2015 NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra210/sysctr.h b/arch/arm/include/asm/arch-tegra210/sysctr.h index cb1c4997fa..81da77e5a3 100644 --- a/arch/arm/include/asm/arch-tegra210/sysctr.h +++ b/arch/arm/include/asm/arch-tegra210/sysctr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra210/tegra.h b/arch/arm/include/asm/arch-tegra210/tegra.h index 1c6fba64c1..ec515bac8a 100644 --- a/arch/arm/include/asm/arch-tegra210/tegra.h +++ b/arch/arm/include/asm/arch-tegra210/tegra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra30/display.h b/arch/arm/include/asm/arch-tegra30/display.h index 9411525799..e0a386a09e 100644 --- a/arch/arm/include/asm/arch-tegra30/display.h +++ b/arch/arm/include/asm/arch-tegra30/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra30/dsi.h b/arch/arm/include/asm/arch-tegra30/dsi.h index 7ade132613..7d073430d9 100644 --- a/arch/arm/include/asm/arch-tegra30/dsi.h +++ b/arch/arm/include/asm/arch-tegra30/dsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra30/mc.h b/arch/arm/include/asm/arch-tegra30/mc.h index bbb0fe77bc..c3909c7bd8 100644 --- a/arch/arm/include/asm/arch-tegra30/mc.h +++ b/arch/arm/include/asm/arch-tegra30/mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/include/asm/arch-tegra30/pinmux.h b/arch/arm/include/asm/arch-tegra30/pinmux.h index 1261943f58..e472683a24 100644 --- a/arch/arm/include/asm/arch-tegra30/pinmux.h +++ b/arch/arm/include/asm/arch-tegra30/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/include/asm/arch-tegra30/pwm.h b/arch/arm/include/asm/arch-tegra30/pwm.h index c314e2b5ad..576a0b3ece 100644 --- a/arch/arm/include/asm/arch-tegra30/pwm.h +++ b/arch/arm/include/asm/arch-tegra30/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Tegra pulse width frequency modulator definitions * diff --git a/arch/arm/include/asm/arch-vf610/clock.h b/arch/arm/include/asm/arch-vf610/clock.h index ec9786ce4f..b0726ca2e8 100644 --- a/arch/arm/include/asm/arch-vf610/clock.h +++ b/arch/arm/include/asm/arch-vf610/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h index 0c9ed52933..18510d545c 100644 --- a/arch/arm/include/asm/arch-vf610/crm_regs.h +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h index 03e3cecb95..a34859ea43 100644 --- a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h +++ b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 * Toradex, Inc. diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h index fa3a97824f..329330d62c 100644 --- a/arch/arm/include/asm/arch-vf610/imx-regs.h +++ b/arch/arm/include/asm/arch-vf610/imx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h index 94ab059745..6e12613b95 100644 --- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h +++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2014 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/arm11.h b/arch/arm/include/asm/arm11.h index 5276f735ef..a94f8e06e6 100644 --- a/arch/arm/include/asm/arm11.h +++ b/arch/arm/include/asm/arm11.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/include/asm/armv7.h b/arch/arm/include/asm/armv7.h index c002998ac0..00c931ed83 100644 --- a/arch/arm/include/asm/armv7.h +++ b/arch/arm/include/asm/armv7.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/armv7_mpu.h b/arch/arm/include/asm/armv7_mpu.h index 16b9d0d1ae..8e2555924d 100644 --- a/arch/arm/include/asm/armv7_mpu.h +++ b/arch/arm/include/asm/armv7_mpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h index ad67b4fa34..0906907f6f 100644 --- a/arch/arm/include/asm/armv7m.h +++ b/arch/arm/include/asm/armv7m.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com diff --git a/arch/arm/include/asm/armv8/cpu.h b/arch/arm/include/asm/armv8/cpu.h index 40d54dc85a..298f03b18e 100644 --- a/arch/arm/include/asm/armv8/cpu.h +++ b/arch/arm/include/asm/armv8/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 19a9e112a4..8054bd13a0 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/include/asm/armv8/sec_firmware.h b/arch/arm/include/asm/armv8/sec_firmware.h index 0f86c72b24..b6265fcecc 100644 --- a/arch/arm/include/asm/armv8/sec_firmware.h +++ b/arch/arm/include/asm/armv8/sec_firmware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 NXP Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/barriers.h b/arch/arm/include/asm/barriers.h index 75b9eb4bc9..4e971261d3 100644 --- a/arch/arm/include/asm/barriers.h +++ b/arch/arm/include/asm/barriers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 ARM Ltd. * diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h index 439e43c2d0..05e77e56ac 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013, Google Inc. * diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h index b10edf805b..2cf2903d2c 100644 --- a/arch/arm/include/asm/cache.h +++ b/arch/arm/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index 5870412c43..ce1ae21695 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 8af1ea0aa4..813c2fc0c7 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 15627c96e9..b38fa9283c 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/arch/arm/include/asm/gic-v3.h b/arch/arm/include/asm/gic-v3.h index 5131fabec4..e461354345 100644 --- a/arch/arm/include/asm/gic-v3.h +++ b/arch/arm/include/asm/gic-v3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Broadcom. */ diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index b385bae026..a5d03af27a 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/include/asm/handoff.h b/arch/arm/include/asm/handoff.h index 0790d2ab1e..3ae1836abd 100644 --- a/arch/arm/include/asm/handoff.h +++ b/arch/arm/include/asm/handoff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Architecture-specific SPL handoff information for ARM * diff --git a/arch/arm/include/asm/iproc-common/armpll.h b/arch/arm/include/asm/iproc-common/armpll.h index f5b60b1917..329dcbf841 100644 --- a/arch/arm/include/asm/iproc-common/armpll.h +++ b/arch/arm/include/asm/iproc-common/armpll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/iproc-common/sysmap.h b/arch/arm/include/asm/iproc-common/sysmap.h index efd2f35f21..d0bb87aa2c 100644 --- a/arch/arm/include/asm/iproc-common/sysmap.h +++ b/arch/arm/include/asm/iproc-common/sysmap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/iproc-common/timer.h b/arch/arm/include/asm/iproc-common/timer.h index 44810c863a..6e0f3caa70 100644 --- a/arch/arm/include/asm/iproc-common/timer.h +++ b/arch/arm/include/asm/iproc-common/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/kona-common/clk.h b/arch/arm/include/asm/kona-common/clk.h index fded004c21..0b841329cd 100644 --- a/arch/arm/include/asm/kona-common/clk.h +++ b/arch/arm/include/asm/kona-common/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/arch/arm/include/asm/mach-imx/ahab.h b/arch/arm/include/asm/mach-imx/ahab.h index 4884f05625..efb1e8b2c6 100644 --- a/arch/arm/include/asm/mach-imx/ahab.h +++ b/arch/arm/include/asm/mach-imx/ahab.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/include/asm/mach-imx/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h index a568c44372..7ef65c1d7b 100644 --- a/arch/arm/include/asm/mach-imx/boot_mode.h +++ b/arch/arm/include/asm/mach-imx/boot_mode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Boundary Devices Inc. */ diff --git a/arch/arm/include/asm/mach-imx/dma.h b/arch/arm/include/asm/mach-imx/dma.h index 55eb84cb8e..20a843644d 100644 --- a/arch/arm/include/asm/mach-imx/dma.h +++ b/arch/arm/include/asm/mach-imx/dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 APBH DMA * diff --git a/arch/arm/include/asm/mach-imx/ele_api.h b/arch/arm/include/asm/mach-imx/ele_api.h index cfd4ecebb6..b6caee1763 100644 --- a/arch/arm/include/asm/mach-imx/ele_api.h +++ b/arch/arm/include/asm/mach-imx/ele_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/mach-imx/gpio.h b/arch/arm/include/asm/mach-imx/gpio.h index 1b7c9cd524..43d7af029e 100644 --- a/arch/arm/include/asm/mach-imx/gpio.h +++ b/arch/arm/include/asm/mach-imx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefano Babic, DENX Software Engineering, <sbabic(a)denx.de> diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index 2abf28ea45..92a358cd3e 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2015 Freescale Semiconductor, Inc. All Rights Reserved. * diff --git a/arch/arm/include/asm/mach-imx/imx-nandbcb.h b/arch/arm/include/asm/mach-imx/imx-nandbcb.h index 74c9031d4e..a3e0c33df9 100644 --- a/arch/arm/include/asm/mach-imx/imx-nandbcb.h +++ b/arch/arm/include/asm/mach-imx/imx-nandbcb.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _IMX_NAND_BCB_H_ diff --git a/arch/arm/include/asm/mach-imx/imximage.cfg b/arch/arm/include/asm/mach-imx/imximage.cfg index 8fbc0620c3..c26569617e 100644 --- a/arch/arm/include/asm/mach-imx/imximage.cfg +++ b/arch/arm/include/asm/mach-imx/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * i.MX image header offset values * Copyright (C) 2013 Marek Vasut <marex(a)denx.de> diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index 0492abd298..d1a05b5c99 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on Linux i.MX iomux-v3.h file: * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH, diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h index 6c92cb40d6..e29e5872a8 100644 --- a/arch/arm/include/asm/mach-imx/module_fuse.h +++ b/arch/arm/include/asm/mach-imx/module_fuse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/include/asm/mach-imx/mu_hal.h b/arch/arm/include/asm/mach-imx/mu_hal.h index 5db559c1ac..824e63a403 100644 --- a/arch/arm/include/asm/mach-imx/mu_hal.h +++ b/arch/arm/include/asm/mach-imx/mu_hal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/arch/arm/include/asm/mach-imx/mx5_video.h b/arch/arm/include/asm/mach-imx/mx5_video.h index b55c0fe897..8a97b7d16c 100644 --- a/arch/arm/include/asm/mach-imx/mx5_video.h +++ b/arch/arm/include/asm/mach-imx/mx5_video.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 * Anatolij Gustschin, DENX Software Engineering, <agust(a)denx.de> diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h index e8b330f33d..0eb916181f 100644 --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. */ diff --git a/arch/arm/include/asm/mach-imx/rdc-sema.h b/arch/arm/include/asm/mach-imx/rdc-sema.h index 70d6a76a9d..4cb57aab58 100644 --- a/arch/arm/include/asm/mach-imx/rdc-sema.h +++ b/arch/arm/include/asm/mach-imx/rdc-sema.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/mach-imx/regs-apbh.h b/arch/arm/include/asm/mach-imx/regs-apbh.h index 94c330c7f9..68d8b5022f 100644 --- a/arch/arm/include/asm/mach-imx/regs-apbh.h +++ b/arch/arm/include/asm/mach-imx/regs-apbh.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 APBH Register Definitions * diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h index 5a149002e2..c58f13a5bc 100644 --- a/arch/arm/include/asm/mach-imx/regs-bch.h +++ b/arch/arm/include/asm/mach-imx/regs-bch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 BCH Register Definitions * diff --git a/arch/arm/include/asm/mach-imx/regs-common.h b/arch/arm/include/asm/mach-imx/regs-common.h index 0f9bd3cd7e..367cdb7905 100644 --- a/arch/arm/include/asm/mach-imx/regs-common.h +++ b/arch/arm/include/asm/mach-imx/regs-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MXS Register Accessors * diff --git a/arch/arm/include/asm/mach-imx/regs-gpmi.h b/arch/arm/include/asm/mach-imx/regs-gpmi.h index 7a15778631..973c71d7df 100644 --- a/arch/arm/include/asm/mach-imx/regs-gpmi.h +++ b/arch/arm/include/asm/mach-imx/regs-gpmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 GPMI Register Definitions * diff --git a/arch/arm/include/asm/mach-imx/regs-lcdif.h b/arch/arm/include/asm/mach-imx/regs-lcdif.h index 5874638796..98e7eaff6c 100644 --- a/arch/arm/include/asm/mach-imx/regs-lcdif.h +++ b/arch/arm/include/asm/mach-imx/regs-lcdif.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28/6SX/6UL/7D LCDIF Register Definitions * diff --git a/arch/arm/include/asm/mach-imx/regs-usbphy.h b/arch/arm/include/asm/mach-imx/regs-usbphy.h index 2b18ec20f3..74318b8b40 100644 --- a/arch/arm/include/asm/mach-imx/regs-usbphy.h +++ b/arch/arm/include/asm/mach-imx/regs-usbphy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale USB PHY Register Definitions * diff --git a/arch/arm/include/asm/mach-imx/sata.h b/arch/arm/include/asm/mach-imx/sata.h index cf9b73e68f..2fea5da1f0 100644 --- a/arch/arm/include/asm/mach-imx/sata.h +++ b/arch/arm/include/asm/mach-imx/sata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/mach-imx/spi.h b/arch/arm/include/asm/mach-imx/spi.h index 598a996a3c..2f3eabdbe5 100644 --- a/arch/arm/include/asm/mach-imx/spi.h +++ b/arch/arm/include/asm/mach-imx/spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 31ae179b21..c97d6be11f 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/arch/arm/include/asm/mach-imx/syscounter.h b/arch/arm/include/asm/mach-imx/syscounter.h index a2cae1edb8..8cf1445403 100644 --- a/arch/arm/include/asm/mach-imx/syscounter.h +++ b/arch/arm/include/asm/mach-imx/syscounter.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/include/asm/mach-imx/video.h b/arch/arm/include/asm/mach-imx/video.h index d1a14ad7d3..533e38f433 100644 --- a/arch/arm/include/asm/mach-imx/video.h +++ b/arch/arm/include/asm/mach-imx/video.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __IMX_VIDEO_H_ #define __IMX_VIDEO_H_ diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 1a1edc9870..febaf956e3 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/asm-arm/macro.h * diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 17fdfbcffb..16af8c591b 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/omap_musb.h b/arch/arm/include/asm/omap_musb.h index 614c93def8..2ee4286171 100644 --- a/arch/arm/include/asm/omap_musb.h +++ b/arch/arm/include/asm/omap_musb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board data structure for musb gadget on OMAPs * diff --git a/arch/arm/include/asm/omap_sec_common.h b/arch/arm/include/asm/omap_sec_common.h index 30f0a9f5cb..191eb75c09 100644 --- a/arch/arm/include/asm/omap_sec_common.h +++ b/arch/arm/include/asm/omap_sec_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/opcodes-virt.h b/arch/arm/include/asm/opcodes-virt.h index 437b9a899e..0b58da81b7 100644 --- a/arch/arm/include/asm/opcodes-virt.h +++ b/arch/arm/include/asm/opcodes-virt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * opcodes-virt.h: Opcode definitions for the ARM virtualization extensions * Copyright (C) 2012 Linaro Limited diff --git a/arch/arm/include/asm/pl310.h b/arch/arm/include/asm/pl310.h index 9d4cd68ee4..868252e6ea 100644 --- a/arch/arm/include/asm/pl310.h +++ b/arch/arm/include/asm/pl310.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/sections.h b/arch/arm/include/asm/sections.h index dff3bc260f..8d2ab1a7b9 100644 --- a/arch/arm/include/asm/sections.h +++ b/arch/arm/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/arm/include/asm/setjmp.h b/arch/arm/include/asm/setjmp.h index 662bec8632..28d780f72c 100644 --- a/arch/arm/include/asm/setjmp.h +++ b/arch/arm/include/asm/setjmp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH * (C) Copyright 2016 Alexander Graf <agraf(a)suse.de> diff --git a/arch/arm/include/asm/spin_table.h b/arch/arm/include/asm/spin_table.h index dec18c6e5c..99a440e5d2 100644 --- a/arch/arm/include/asm/spin_table.h +++ b/arch/arm/include/asm/spin_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_SPIN_TABLE_H__ #define __ASM_SPIN_TABLE_H__ diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index ee79a19c05..288f9fff2f 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/ti-common/keystone_nav.h b/arch/arm/include/asm/ti-common/keystone_nav.h index e577514428..d85c177afc 100644 --- a/arch/arm/include/asm/ti-common/keystone_nav.h +++ b/arch/arm/include/asm/ti-common/keystone_nav.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Multicore Navigator definitions * diff --git a/arch/arm/include/asm/ti-common/keystone_net.h b/arch/arm/include/asm/ti-common/keystone_net.h index bedbcdc8ba..1ad7386173 100644 --- a/arch/arm/include/asm/ti-common/keystone_net.h +++ b/arch/arm/include/asm/ti-common/keystone_net.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * emac definitions for keystone2 devices * diff --git a/arch/arm/include/asm/ti-common/keystone_serdes.h b/arch/arm/include/asm/ti-common/keystone_serdes.h index 623438856d..ac4fd9c8a2 100644 --- a/arch/arm/include/asm/ti-common/keystone_serdes.h +++ b/arch/arm/include/asm/ti-common/keystone_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments Keystone SerDes driver * diff --git a/arch/arm/include/asm/ti-common/omap_wdt.h b/arch/arm/include/asm/ti-common/omap_wdt.h index 42d7e4c989..2e5199c23d 100644 --- a/arch/arm/include/asm/ti-common/omap_wdt.h +++ b/arch/arm/include/asm/ti-common/omap_wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * omap_wdt.h * diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h index a96a8382fb..a39ba3d191 100644 --- a/arch/arm/include/asm/ti-common/sys_proto.h +++ b/arch/arm/include/asm/ti-common/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/ti-common/ti-aemif.h b/arch/arm/include/asm/ti-common/ti-aemif.h index a77538673f..8674e0b9a5 100644 --- a/arch/arm/include/asm/ti-common/ti-aemif.h +++ b/arch/arm/include/asm/ti-common/ti-aemif.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * AEMIF definitions * diff --git a/arch/arm/include/asm/ti-common/ti-edma3.h b/arch/arm/include/asm/ti-common/ti-edma3.h index 9abdbc88e4..fa4f129cfa 100644 --- a/arch/arm/include/asm/ti-common/ti-edma3.h +++ b/arch/arm/include/asm/ti-common/ti-edma3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Enhanced Direct Memory Access (EDMA3) Controller * diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index aef048708d..3ea3fe5f51 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h index 07528a46f5..9028c3761a 100644 --- a/arch/arm/include/asm/u-boot.h +++ b/arch/arm/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/include/asm/utils.h b/arch/arm/include/asm/utils.h index eee60c50e9..3f8c5d62b3 100644 --- a/arch/arm/include/asm/utils.h +++ b/arch/arm/include/asm/utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/include/asm/xen.h b/arch/arm/include/asm/xen.h index 670d5ad4a5..13315134ba 100644 --- a/arch/arm/include/asm/xen.h +++ b/arch/arm/include/asm/xen.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) 2020 EPAM Systems Inc. */ diff --git a/arch/arm/include/debug/8250.S b/arch/arm/include/debug/8250.S index 5e37536af5..2807ffb0e8 100644 --- a/arch/arm/include/debug/8250.S +++ b/arch/arm/include/debug/8250.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * arch/arm/include/debug/8250.S * diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index b1bcd37466..b787fb6dbd 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S index 6330de4833..0a3e912442 100644 --- a/arch/arm/lib/ashldi3.S +++ b/arch/arm/lib/ashldi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 1995, 1996, 1998, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. */ diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S index 6420312344..9308adca86 100644 --- a/arch/arm/lib/ashrdi3.S +++ b/arch/arm/lib/ashrdi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 1995, 1996, 1998, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. */ diff --git a/arch/arm/lib/asm-offsets.c b/arch/arm/lib/asm-offsets.c index 181a8ac4c2..8e5f3c412f 100644 --- a/arch/arm/lib/asm-offsets.c +++ b/arch/arm/lib/asm-offsets.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c * diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c index b88b01eefd..a584bfc817 100644 --- a/arch/arm/lib/bdinfo.c +++ b/arch/arm/lib/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ARM-specific information for the 'bd' command * diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 29020bd1c6..2c28eb4f59 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. * diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index c56285738a..f2ab23d4ca 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz(a)corscience.de> * - Added prep subcommand support diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 0893915b30..51124a0cd9 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/lib/cache-pl310.c b/arch/arm/lib/cache-pl310.c index d05314ee57..493fe4ce03 100644 --- a/arch/arm/lib/cache-pl310.c +++ b/arch/arm/lib/cache-pl310.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 7a16015867..8bd6800b69 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/lib/ccn504.S b/arch/arm/lib/ccn504.S index c6ea3e3afc..48dea46134 100644 --- a/arch/arm/lib/ccn504.S +++ b/arch/arm/lib/ccn504.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Freescale Semiconductor * diff --git a/arch/arm/lib/cmd_boot.c b/arch/arm/lib/cmd_boot.c index c905ecc4bd..a50cb11a0d 100644 --- a/arch/arm/lib/cmd_boot.c +++ b/arch/arm/lib/cmd_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index a0311438b4..3e09834978 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * crt0 - C-runtime startup Code for ARM U-Boot * diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index dcc924dd2f..667c43eb1c 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * crt0 - C-runtime startup Code for AArch64 U-Boot * diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S index 3c2cef6ec7..881112f87b 100644 --- a/arch/arm/lib/crt0_aarch64_efi.S +++ b/arch/arm/lib/crt0_aarch64_efi.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause */ /* * crt0-efi-aarch64.S - PE/COFF header for aarch64 EFI applications * diff --git a/arch/arm/lib/crt0_arm_efi.S b/arch/arm/lib/crt0_arm_efi.S index 75ee37b7d3..0378428e3b 100644 --- a/arch/arm/lib/crt0_arm_efi.S +++ b/arch/arm/lib/crt0_arm_efi.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause */ /* * crt0-efi-arm.S - PE/COFF header for ARM EFI applications * diff --git a/arch/arm/lib/debug.S b/arch/arm/lib/debug.S index af4beb4d9d..7f23f6c6ad 100644 --- a/arch/arm/lib/debug.S +++ b/arch/arm/lib/debug.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * linux/arch/arm/kernel/debug.S * diff --git a/arch/arm/lib/div0.c b/arch/arm/lib/div0.c index b91b408f64..01fbd7d62d 100644 --- a/arch/arm/lib/div0.c +++ b/arch/arm/lib/div0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/lib/eabi_compat.c b/arch/arm/lib/eabi_compat.c index f7029918d4..26aab50ef8 100644 --- a/arch/arm/lib/eabi_compat.c +++ b/arch/arm/lib/eabi_compat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Utility functions needed for (some) EABI conformant tool chains. * diff --git a/arch/arm/lib/gic-v3-its.c b/arch/arm/lib/gic-v3-its.c index f4bbd21da9..0ef3ea65a0 100644 --- a/arch/arm/lib/gic-v3-its.c +++ b/arch/arm/lib/gic-v3-its.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Broadcom. */ diff --git a/arch/arm/lib/gic_64.S b/arch/arm/lib/gic_64.S index 86cd882fc7..8a666ed6bc 100644 --- a/arch/arm/lib/gic_64.S +++ b/arch/arm/lib/gic_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GIC Initialization Routines. * diff --git a/arch/arm/lib/image.c b/arch/arm/lib/image.c index e394c1ad90..654eb029e6 100644 --- a/arch/arm/lib/image.c +++ b/arch/arm/lib/image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 6dc27d1d58..e5fd8b1dd9 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Texas Instruments <www.ti.com> diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index 125dc0bb39..bb069adff5 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c index 277854aa87..3231ca24c9 100644 --- a/arch/arm/lib/interrupts_m.c +++ b/arch/arm/lib/interrupts_m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index a1f44d9454..bf13a06398 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines * diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S index cfa5607c5b..59b61dadce 100644 --- a/arch/arm/lib/lshrdi3.S +++ b/arch/arm/lib/lshrdi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 1995, 1996, 1998, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. */ diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 903b335704..a5adc6d89a 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 NXP Semiconductor, Inc. */ diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 345e282e3e..a3abf4efe7 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * relocate - common relocation function for ARM U-Boot * diff --git a/arch/arm/lib/relocate_64.S b/arch/arm/lib/relocate_64.S index 495a5f03ba..e9d0a0bf46 100644 --- a/arch/arm/lib/relocate_64.S +++ b/arch/arm/lib/relocate_64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * relocate - common relocation function for AArch64 U-Boot * diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 3e051e36f1..621f6a074a 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f7b23faf0d..9de48c2031 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * save_prev_bl_data - saving previous bootloader data * to environment variables. diff --git a/arch/arm/lib/sections.c b/arch/arm/lib/sections.c index 857879711c..0124a1c72d 100644 --- a/arch/arm/lib/sections.c +++ b/arch/arm/lib/sections.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Albert ARIBAUD <albert.u.boot(a)aribaud.net> */ diff --git a/arch/arm/lib/semihosting.S b/arch/arm/lib/semihosting.S index 393aade94a..125d9e7e29 100644 --- a/arch/arm/lib/semihosting.S +++ b/arch/arm/lib/semihosting.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2022 Arm Ltd. */ diff --git a/arch/arm/lib/setjmp.S b/arch/arm/lib/setjmp.S index 2f041aeef0..3b5fbf7a9d 100644 --- a/arch/arm/lib/setjmp.S +++ b/arch/arm/lib/setjmp.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/lib/setjmp_aarch64.S b/arch/arm/lib/setjmp_aarch64.S index 1b8d000eb4..fcfeee5890 100644 --- a/arch/arm/lib/setjmp_aarch64.S +++ b/arch/arm/lib/setjmp_aarch64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index b13897495d..94c46891fc 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2012 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c index 656084c7e5..0ed58a068a 100644 --- a/arch/arm/lib/stack.c +++ b/arch/arm/lib/stack.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Andreas Bießmann <andreas(a)biessmann.org> * diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 7cf7d1636f..132bfcac49 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * vectors - Generic ARM exception table code * diff --git a/arch/arm/lib/vectors_m.S b/arch/arm/lib/vectors_m.S index 8d88cc756f..19fc1cb911 100644 --- a/arch/arm/lib/vectors_m.S +++ b/arch/arm/lib/vectors_m.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/arch/arm/lib/zimage.c b/arch/arm/lib/zimage.c index 45e9c4506a..3c29b15d42 100644 --- a/arch/arm/lib/zimage.c +++ b/arch/arm/lib/zimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 * Ladislav Michl <ladis(a)linux-mips.org> diff --git a/arch/arm/mach-apple/Makefile b/arch/arm/mach-apple/Makefile index 50b465b947..4cdc7edb91 100644 --- a/arch/arm/mach-apple/Makefile +++ b/arch/arm/mach-apple/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += board.o obj-y += lowlevel_init.o diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index 47393babbc..bdc88243af 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/arch/arm/mach-apple/lowlevel_init.S b/arch/arm/mach-apple/lowlevel_init.S index e1c0d91cef..1885b9d0e4 100644 --- a/arch/arm/mach-apple/lowlevel_init.S +++ b/arch/arm/mach-apple/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c index a550b553b6..c6c60f2c73 100644 --- a/arch/arm/mach-apple/rtkit.c +++ b/arch/arm/mach-apple/rtkit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> * (C) Copyright 2021 Copyright The Asahi Linux Contributors diff --git a/arch/arm/mach-aspeed/Makefile b/arch/arm/mach-aspeed/Makefile index 42599c125b..172222b32b 100644 --- a/arch/arm/mach-aspeed/Makefile +++ b/arch/arm/mach-aspeed/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc diff --git a/arch/arm/mach-aspeed/ast2500/board_common.c b/arch/arm/mach-aspeed/ast2500/board_common.c index bae1027184..0ccc7aaed4 100644 --- a/arch/arm/mach-aspeed/ast2500/board_common.c +++ b/arch/arm/mach-aspeed/ast2500/board_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c index 02bd3f67c9..8204017eca 100644 --- a/arch/arm/mach-aspeed/ast2500/clk_ast2500.c +++ b/arch/arm/mach-aspeed/ast2500/clk_ast2500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc */ diff --git a/arch/arm/mach-aspeed/ast2500/lowlevel_init.S b/arch/arm/mach-aspeed/ast2500/lowlevel_init.S index 9ec3dd46b7..ebfc132577 100644 --- a/arch/arm/mach-aspeed/ast2500/lowlevel_init.S +++ b/arch/arm/mach-aspeed/ast2500/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) ASPEED Technology Inc. */ diff --git a/arch/arm/mach-aspeed/ast2600/board_common.c b/arch/arm/mach-aspeed/ast2600/board_common.c index dc6cdc35d1..4c03f5bcd8 100644 --- a/arch/arm/mach-aspeed/ast2600/board_common.c +++ b/arch/arm/mach-aspeed/ast2600/board_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c index 0952e73a45..f8179c3beb 100644 --- a/arch/arm/mach-aspeed/ast2600/spl.c +++ b/arch/arm/mach-aspeed/ast2600/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds index 37f0ccd922..335d28556b 100644 --- a/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds +++ b/arch/arm/mach-aspeed/ast2600/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2004-2008 Texas Instruments * diff --git a/arch/arm/mach-aspeed/ast_wdt.c b/arch/arm/mach-aspeed/ast_wdt.c index 5bc442ef33..aecb73e78f 100644 --- a/arch/arm/mach-aspeed/ast_wdt.c +++ b/arch/arm/mach-aspeed/ast_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Google, Inc */ diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index cbd0ed68c2..715e0a71b4 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o ifneq ($(CONFIG_SPL_BUILD),) diff --git a/arch/arm/mach-at91/arm920t/Makefile b/arch/arm/mach-at91/arm920t/Makefile index 3adf893576..f2160958bf 100644 --- a/arch/arm/mach-at91/arm920t/Makefile +++ b/arch/arm/mach-at91/arm920t/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c index c849885bc2..a951af3263 100644 --- a/arch/arm/mach-at91/arm920t/at91rm9200_devices.c +++ b/arch/arm/mach-at91/arm920t/at91rm9200_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [partely copied from arch/arm/cpu/arm926ejs/at91/arm9260_devices.c] * diff --git a/arch/arm/mach-at91/arm920t/clock.c b/arch/arm/mach-at91/arm920t/clock.c index 09ac66d619..13946094f5 100644 --- a/arch/arm/mach-at91/arm920t/clock.c +++ b/arch/arm/mach-at91/arm920t/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [origin: Linux kernel linux/arch/arm/mach-at91/clock.c] * diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c index 9bf03fd68e..f1fe91e058 100644 --- a/arch/arm/mach-at91/arm920t/cpu.c +++ b/arch/arm/mach-at91/arm920t/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [origin: arch/arm/cpu/arm926ejs/at91/cpu.c] * diff --git a/arch/arm/mach-at91/arm920t/lowlevel_init.S b/arch/arm/mach-at91/arm920t/lowlevel_init.S index 6b7d3cbc71..288d3f638d 100644 --- a/arch/arm/mach-at91/arm920t/lowlevel_init.S +++ b/arch/arm/mach-at91/arm920t/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw(a)its.tudelft.nl) and * Jan-Derk Bakker (J.D.Bakker(a)its.tudelft.nl) diff --git a/arch/arm/mach-at91/arm920t/reset.c b/arch/arm/mach-at91/arm920t/reset.c index 91e375146a..a63ad1a7e0 100644 --- a/arch/arm/mach-at91/arm920t/reset.c +++ b/arch/arm/mach-at91/arm920t/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Lineo, Inc. <www.lineo.com> diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c index 8ef5764e31..644b6669a7 100644 --- a/arch/arm/mach-at91/arm920t/timer.c +++ b/arch/arm/mach-at91/arm920t/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Lineo, Inc. <www.lineo.com> diff --git a/arch/arm/mach-at91/arm926ejs/Makefile b/arch/arm/mach-at91/arm926ejs/Makefile index 902dd3a60e..52f6c19c05 100644 --- a/arch/arm/mach-at91/arm926ejs/Makefile +++ b/arch/arm/mach-at91/arm926ejs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c index c10571fa28..df44b84903 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c index 0c2b9f2ecc..9f3895e4c3 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c index 3b8a462386..4369d28df1 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c index d517810c99..bdd136c5ba 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c index 9f98ce7a45..bc6a6b8928 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Atmel Corporation * Josh Wu <josh.wu(a)atmel.com> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c index b4002eb750..3bf3c77bca 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c index f44760bed3..b998c12919 100644 --- a/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c +++ b/arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Atmel Corporation */ diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c index 013daf43b7..b3e52e768a 100644 --- a/arch/arm/mach-at91/arm926ejs/clock.c +++ b/arch/arm/mach-at91/arm926ejs/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [origin: Linux kernel linux/arch/arm/mach-at91/clock.c] * diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c index 5e84b0a40e..d84117d53d 100644 --- a/arch/arm/mach-at91/arm926ejs/cpu.c +++ b/arch/arm/mach-at91/arm926ejs/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Reinhard Meyer, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c index aade13cc01..251aa3c8bb 100644 --- a/arch/arm/mach-at91/arm926ejs/eflash.c +++ b/arch/arm/mach-at91/arm926ejs/eflash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Reinhard Meyer, EMK Elektronik, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/arm926ejs/lowlevel_init.S b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S index e159a74eea..3961c44805 100644 --- a/arch/arm/mach-at91/arm926ejs/lowlevel_init.S +++ b/arch/arm/mach-at91/arm926ejs/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Memory Setup stuff - taken from blob memsetup.S * diff --git a/arch/arm/mach-at91/arm926ejs/reset.c b/arch/arm/mach-at91/arm926ejs/reset.c index 6acbfa3301..7f61381b1c 100644 --- a/arch/arm/mach-at91/arm926ejs/reset.c +++ b/arch/arm/mach-at91/arm926ejs/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c b/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c index e3d3dd880c..3699e8a469 100644 --- a/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c +++ b/arch/arm/mach-at91/arm926ejs/sam9x60_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Microchip Technology Inc. and its subsidiaries */ diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c index a8cf0e4bd7..d91723005c 100644 --- a/arch/arm/mach-at91/arm926ejs/timer.c +++ b/arch/arm/mach-at91/arm926ejs/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds index 1a8bf94dee..b4a100e309 100644 --- a/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds +++ b/arch/arm/mach-at91/arm926ejs/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile index 6da1cdffef..887015050e 100644 --- a/arch/arm/mach-at91/armv7/Makefile +++ b/arch/arm/mach-at91/armv7/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-at91/armv7/clock.c b/arch/arm/mach-at91/armv7/clock.c index 6bfa02d1d0..0191b61a70 100644 --- a/arch/arm/mach-at91/armv7/clock.c +++ b/arch/arm/mach-at91/armv7/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [origin: Linux kernel linux/arch/arm/mach-at91/clock.c] * diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c index 5ea7e2609f..45d703101b 100644 --- a/arch/arm/mach-at91/armv7/cpu.c +++ b/arch/arm/mach-at91/armv7/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Reinhard Meyer, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/armv7/sama5d2_devices.c b/arch/arm/mach-at91/armv7/sama5d2_devices.c index edc20574c3..8391d8f642 100644 --- a/arch/arm/mach-at91/armv7/sama5d2_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d2_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/armv7/sama5d3_devices.c b/arch/arm/mach-at91/armv7/sama5d3_devices.c index 04b700a94d..b9072975d7 100644 --- a/arch/arm/mach-at91/armv7/sama5d3_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d3_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c index e68ae99407..b0dd49f8fc 100644 --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Atmel * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/armv7/sama7g5_devices.c b/arch/arm/mach-at91/armv7/sama7g5_devices.c index 6f2c1fc914..b8d6c231b2 100644 --- a/arch/arm/mach-at91/armv7/sama7g5_devices.c +++ b/arch/arm/mach-at91/armv7/sama7g5_devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology, Inc. * Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c index 1f54c5dcad..bc8ee7f358 100644 --- a/arch/arm/mach-at91/armv7/timer.c +++ b/arch/arm/mach-at91/armv7/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/armv7/u-boot-spl.lds b/arch/arm/mach-at91/armv7/u-boot-spl.lds index 6ca725fc4c..bffcd772eb 100644 --- a/arch/arm/mach-at91/armv7/u-boot-spl.lds +++ b/arch/arm/mach-at91/armv7/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c index 62108d2bd0..209d44507a 100644 --- a/arch/arm/mach-at91/atmel_sfr.c +++ b/arch/arm/mach-at91/atmel_sfr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/bootparams_atmel.S b/arch/arm/mach-at91/bootparams_atmel.S index 45cd7a9f34..8020dbe399 100644 --- a/arch/arm/mach-at91/bootparams_atmel.S +++ b/arch/arm/mach-at91/bootparams_atmel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Atmel SAMA5Dx boot parameter handling * diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 8344daeb39..5b8f4ebf17 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index f7b411cf7d..ecdade8847 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/include/mach/at91_dbu.h b/arch/arm/mach-at91/include/mach/at91_dbu.h index 91bb686bc1..16559d0478 100644 --- a/arch/arm/mach-at91/include/mach/at91_dbu.h +++ b/arch/arm/mach-at91/include/mach/at91_dbu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 * Reinhard Meyer, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/include/mach/at91_eefc.h b/arch/arm/mach-at91/include/mach/at91_eefc.h index e7bb2bfecb..b0ef552d1e 100644 --- a/arch/arm/mach-at91/include/mach/at91_eefc.h +++ b/arch/arm/mach-at91/include/mach/at91_eefc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 * Reinhard Meyer, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/include/mach/at91_emac.h b/arch/arm/mach-at91/include/mach/at91_emac.h index 44b943be3d..9cf398d111 100644 --- a/arch/arm/mach-at91/include/mach/at91_emac.h +++ b/arch/arm/mach-at91/include/mach/at91_emac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) * diff --git a/arch/arm/mach-at91/include/mach/at91_gpbr.h b/arch/arm/mach-at91/include/mach/at91_gpbr.h index ac1bb1cf01..6947cb2352 100644 --- a/arch/arm/mach-at91/include/mach/at91_gpbr.h +++ b/arch/arm/mach-at91/include/mach/at91_gpbr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 * Reinhard Meyer, reinhard.meyer(a)emk-elektronik.de diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h index d98fcf5105..5fd6415e16 100644 --- a/arch/arm/mach-at91/include/mach/at91_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) */ diff --git a/arch/arm/mach-at91/include/mach/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h index 7cf6cdf310..8f7e695221 100644 --- a/arch/arm/mach-at91/include/mach/at91_mc.h +++ b/arch/arm/mach-at91/include/mach/at91_mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) */ diff --git a/arch/arm/mach-at91/include/mach/at91_pdc.h b/arch/arm/mach-at91/include/mach/at91_pdc.h index a855a7177a..a6912d1f55 100644 --- a/arch/arm/mach-at91/include/mach/at91_pdc.h +++ b/arch/arm/mach-at91/include/mach/at91_pdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) */ diff --git a/arch/arm/mach-at91/include/mach/at91_pio.h b/arch/arm/mach-at91/include/mach/at91_pio.h index f51e47e55d..25acd27935 100644 --- a/arch/arm/mach-at91/include/mach/at91_pio.h +++ b/arch/arm/mach-at91/include/mach/at91_pio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91_pio.h] * diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h index dfaf2e0260..44eda37bda 100644 --- a/arch/arm/mach-at91/include/mach/at91_pit.h +++ b/arch/arm/mach-at91/include/mach/at91_pit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91_pit.h] * diff --git a/arch/arm/mach-at91/include/mach/at91_pmc.h b/arch/arm/mach-at91/include/mach/at91_pmc.h index 2ce99d956c..4c533e60e4 100644 --- a/arch/arm/mach-at91/include/mach/at91_pmc.h +++ b/arch/arm/mach-at91/include/mach/at91_pmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel arch/arm/mach-at91/include/mach/at91_pmc.h] * diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h index 11ffe4454a..c5b2310605 100644 --- a/arch/arm/mach-at91/include/mach/at91_rstc.h +++ b/arch/arm/mach-at91/include/mach/at91_rstc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91_rstc.h] * diff --git a/arch/arm/mach-at91/include/mach/at91_rtc.h b/arch/arm/mach-at91/include/mach/at91_rtc.h index 19d75515ea..031e376a65 100644 --- a/arch/arm/mach-at91/include/mach/at91_rtc.h +++ b/arch/arm/mach-at91/include/mach/at91_rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005 Ivan Kokshaysky * Copyright (C) SAN People diff --git a/arch/arm/mach-at91/include/mach/at91_sck.h b/arch/arm/mach-at91/include/mach/at91_sck.h index 3cf8a56737..646ee35893 100644 --- a/arch/arm/mach-at91/include/mach/at91_sck.h +++ b/arch/arm/mach-at91/include/mach/at91_sck.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-at91/include/mach/at91_sfr.h b/arch/arm/mach-at91/include/mach/at91_sfr.h index 4517df41bc..a4c1ccf4a2 100644 --- a/arch/arm/mach-at91/include/mach/at91_sfr.h +++ b/arch/arm/mach-at91/include/mach/at91_sfr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Special Function Register (SFR) * diff --git a/arch/arm/mach-at91/include/mach/at91_spi.h b/arch/arm/mach-at91/include/mach/at91_spi.h index ce7bbf276d..673df61f83 100644 --- a/arch/arm/mach-at91/include/mach/at91_spi.h +++ b/arch/arm/mach-at91/include/mach/at91_spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91_spi.h] * diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h index f91cec98c9..9e33eee9ec 100644 --- a/arch/arm/mach-at91/include/mach/at91_st.h +++ b/arch/arm/mach-at91/include/mach/at91_st.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) */ diff --git a/arch/arm/mach-at91/include/mach/at91_tc.h b/arch/arm/mach-at91/include/mach/at91_tc.h index eb6950ab28..a078dc1ef2 100644 --- a/arch/arm/mach-at91/include/mach/at91_tc.h +++ b/arch/arm/mach-at91/include/mach/at91_tc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jens Scharsig (js_at_ng(a)scharsoft.de) */ diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h index 8ef8e007d7..510a3d9d3f 100644 --- a/arch/arm/mach-at91/include/mach/at91_wdt.h +++ b/arch/arm/mach-at91/include/mach/at91_wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel arch/arm/mach-at91/include/mach/at91_wdt.h] * diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h index 24f3b4e9ba..dcc4f6ee1f 100644 --- a/arch/arm/mach-at91/include/mach/at91rm9200.h +++ b/arch/arm/mach-at91/include/mach/at91rm9200.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h index 103db26953..7a9a2dd855 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9260.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h index 7271129f6b..1b0f59ed95 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9260_matrix.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index 2b252f1e1e..62002f9a7f 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9261.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h index b856759b1d..f22ab67846 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9261_matrix.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 0aa1862567..10459ea435 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9263.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h index f08d2eb1fa..c3b7c9b843 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9263_matrix.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h index 558abbe268..1bbcdc491a 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jrosoft.com> */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h index 64abf70c5b..bceef7b790 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_sdramc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel arch/arm/mach-at91/include/mach/at91_wdt.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h index 404ffaad44..99eed9f5b0 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91sam9_smc.h] * diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index 22116f375b..54705897cf 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the AT91SAM9M1x family * diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h index 62d4901bc1..2ea840f24d 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Matrix-centric header file for the AT91SAM9M1x family * diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h index 0efb4a9f6d..765b196294 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9x5.h +++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the AT91SAM9x5 family * diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h index 8288090d5a..9dae94c048 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h +++ b/arch/arm/mach-at91/include/mach/at91sam9x5_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Matrix-centric header file for the AT91SAM9X5 family * diff --git a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h index 40ec87e2ff..33e919b345 100644 --- a/arch/arm/mach-at91/include/mach/atmel_mpddrc.h +++ b/arch/arm/mach-at91/include/mach/atmel_mpddrc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/include/mach/atmel_pio4.h b/arch/arm/mach-at91/include/mach/atmel_pio4.h index b712be8051..b2ab0977c2 100644 --- a/arch/arm/mach-at91/include/mach/atmel_pio4.h +++ b/arch/arm/mach-at91/include/mach/atmel_pio4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Atmel Corporation. * Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/include/mach/atmel_sdhci.h b/arch/arm/mach-at91/include/mach/atmel_sdhci.h index 48b6bd2236..c32eaa95e6 100644 --- a/arch/arm/mach-at91/include/mach/atmel_sdhci.h +++ b/arch/arm/mach-at91/include/mach/atmel_sdhci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Atmel Corporation * Wenyou.Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/include/mach/atmel_serial.h b/arch/arm/mach-at91/include/mach/atmel_serial.h index 5d14269364..3973d0b9e3 100644 --- a/arch/arm/mach-at91/include/mach/atmel_serial.h +++ b/arch/arm/mach-at91/include/mach/atmel_serial.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h index 835b47d91b..a9f4cb38d5 100644 --- a/arch/arm/mach-at91/include/mach/atmel_usba_udc.h +++ b/arch/arm/mach-at91/include/mach/atmel_usba_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005-2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index c1d92739e4..ab9288f3b2 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index c1aef798b1..3ec21994c3 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * [origin: Linux kernel include/asm-arm/arch-at91/gpio.h] * diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h index 0a16c8ff08..b4ec0ba9de 100644 --- a/arch/arm/mach-at91/include/mach/hardware.h +++ b/arch/arm/mach-at91/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/include/mach/sam9x60.h b/arch/arm/mach-at91/include/mach/sam9x60.h index 47c7c7209e..95df92ece9 100644 --- a/arch/arm/mach-at91/include/mach/sam9x60.h +++ b/arch/arm/mach-at91/include/mach/sam9x60.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the SAM9X60 SoC. * diff --git a/arch/arm/mach-at91/include/mach/sama5_boot.h b/arch/arm/mach-at91/include/mach/sama5_boot.h index db7531bb12..decd3f2fed 100644 --- a/arch/arm/mach-at91/include/mach/sama5_boot.h +++ b/arch/arm/mach-at91/include/mach/sama5_boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Boot mode definitions for the SAMA5Dx SoC * diff --git a/arch/arm/mach-at91/include/mach/sama5_matrix.h b/arch/arm/mach-at91/include/mach/sama5_matrix.h index 2a92d70161..80de91a99c 100644 --- a/arch/arm/mach-at91/include/mach/sama5_matrix.h +++ b/arch/arm/mach-at91/include/mach/sama5_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Bus Matrix header file for the SAMA5 family * diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h index 567cdd3cba..3a22b1b87f 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2.h +++ b/arch/arm/mach-at91/include/mach/sama5d2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the SAMA5D2 SoC * diff --git a/arch/arm/mach-at91/include/mach/sama5d2_smc.h b/arch/arm/mach-at91/include/mach/sama5d2_smc.h index 928a078f5f..454c703907 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2_smc.h +++ b/arch/arm/mach-at91/include/mach/sama5d2_smc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Microchip Corporation. * diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h index 9efcf5f4fa..0ddbd42353 100644 --- a/arch/arm/mach-at91/include/mach/sama5d3.h +++ b/arch/arm/mach-at91/include/mach/sama5d3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the SAMA5D3 family * diff --git a/arch/arm/mach-at91/include/mach/sama5d3_smc.h b/arch/arm/mach-at91/include/mach/sama5d3_smc.h index 547e7b72f4..dab793394a 100644 --- a/arch/arm/mach-at91/include/mach/sama5d3_smc.h +++ b/arch/arm/mach-at91/include/mach/sama5d3_smc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Atmel Corporation. * diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h index 9c80286ade..445bfb788e 100644 --- a/arch/arm/mach-at91/include/mach/sama5d4.h +++ b/arch/arm/mach-at91/include/mach/sama5d4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the SAMA5D4 SoC * diff --git a/arch/arm/mach-at91/include/mach/sama7g5.h b/arch/arm/mach-at91/include/mach/sama7g5.h index 621a26f6eb..c59c72a05b 100644 --- a/arch/arm/mach-at91/include/mach/sama7g5.h +++ b/arch/arm/mach-at91/include/mach/sama7g5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chip-specific header file for the SAMA7G5 SoC * diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c index 2fa8493a0b..9d95ee00eb 100644 --- a/arch/arm/mach-at91/matrix.c +++ b/arch/arm/mach-at91/matrix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/arch/arm/mach-at91/mpddrc.c b/arch/arm/mach-at91/mpddrc.c index 5422c05456..4b5a859654 100644 --- a/arch/arm/mach-at91/mpddrc.c +++ b/arch/arm/mach-at91/mpddrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/phy.c b/arch/arm/mach-at91/phy.c index f4484a77c7..250a21c37b 100644 --- a/arch/arm/mach-at91/phy.c +++ b/arch/arm/mach-at91/phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/arm/mach-at91/sdram.c b/arch/arm/mach-at91/sdram.c index 6638aa82bb..55a0387a7e 100644 --- a/arch/arm/mach-at91/sdram.c +++ b/arch/arm/mach-at91/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/arch/arm/mach-at91/spl.c b/arch/arm/mach-at91/spl.c index 8d537998c9..a1940d8e44 100644 --- a/arch/arm/mach-at91/spl.c +++ b/arch/arm/mach-at91/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index dfba9f730c..ce2d20bea8 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 DENX Software Engineering * Heiko Schocher <hs(a)denx.de> diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index a30c4f6c07..86baab30e4 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/arch/arm/mach-bcm283x/include/mach/gpio.h b/arch/arm/mach-bcm283x/include/mach/gpio.h index 4aeb48eeb2..bcb70e87bf 100644 --- a/arch/arm/mach-bcm283x/include/mach/gpio.h +++ b/arch/arm/mach-bcm283x/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Vikram Narayananan * <vikram186(a)gmail.com> diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 490664f878..7a1464fe84 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012,2015 Stephen Warren */ diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h index e54da86e35..fc6f1291b8 100644 --- a/arch/arm/mach-bcm283x/include/mach/msg.h +++ b/arch/arm/mach-bcm283x/include/mach/msg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012,2015 Stephen Warren */ diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index da9faafe1d..6cb5b4d9b6 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Stephen Warren */ diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c index 2188b38d84..d0313eb8b0 100644 --- a/arch/arm/mach-bcm283x/msg.c +++ b/arch/arm/mach-bcm283x/msg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Stephen Warren */ diff --git a/arch/arm/mach-bcm283x/phys2bus.c b/arch/arm/mach-bcm283x/phys2bus.c index 8e4318bf5f..530cdac9f4 100644 --- a/arch/arm/mach-bcm283x/phys2bus.c +++ b/arch/arm/mach-bcm283x/phys2bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Stephen Warren */ diff --git a/arch/arm/mach-bcmbca/Kconfig b/arch/arm/mach-bcmbca/Kconfig index 62b371612b..2ba8df1539 100644 --- a/arch/arm/mach-bcmbca/Kconfig +++ b/arch/arm/mach-bcmbca/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/Makefile b/arch/arm/mach-bcmbca/Makefile index 7de9450e19..5b7fa1da9c 100644 --- a/arch/arm/mach-bcmbca/Makefile +++ b/arch/arm/mach-bcmbca/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm47622/Kconfig b/arch/arm/mach-bcmbca/bcm47622/Kconfig index bce30892e3..7c9252fbdb 100644 --- a/arch/arm/mach-bcmbca/bcm47622/Kconfig +++ b/arch/arm/mach-bcmbca/bcm47622/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm47622/Makefile b/arch/arm/mach-bcmbca/bcm47622/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm47622/Makefile +++ b/arch/arm/mach-bcmbca/bcm47622/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm4908/Kconfig b/arch/arm/mach-bcmbca/bcm4908/Kconfig index 564bc8d2d6..70eaf717fb 100644 --- a/arch/arm/mach-bcmbca/bcm4908/Kconfig +++ b/arch/arm/mach-bcmbca/bcm4908/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm4908/Makefile b/arch/arm/mach-bcmbca/bcm4908/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm4908/Makefile +++ b/arch/arm/mach-bcmbca/bcm4908/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm4908/mmu_table.c b/arch/arm/mach-bcmbca/bcm4908/mmu_table.c index 5ab04083cc..60ec5f8f7f 100644 --- a/arch/arm/mach-bcmbca/bcm4908/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm4908/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm4912/Kconfig b/arch/arm/mach-bcmbca/bcm4912/Kconfig index b8c14d1dc1..5a0dbaa34b 100644 --- a/arch/arm/mach-bcmbca/bcm4912/Kconfig +++ b/arch/arm/mach-bcmbca/bcm4912/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm4912/Makefile b/arch/arm/mach-bcmbca/bcm4912/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm4912/Makefile +++ b/arch/arm/mach-bcmbca/bcm4912/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm4912/mmu_table.c b/arch/arm/mach-bcmbca/bcm4912/mmu_table.c index 52a53a2c76..9c84c69e1a 100644 --- a/arch/arm/mach-bcmbca/bcm4912/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm4912/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm63138/Kconfig b/arch/arm/mach-bcmbca/bcm63138/Kconfig index a34888d231..79d8e0438d 100644 --- a/arch/arm/mach-bcmbca/bcm63138/Kconfig +++ b/arch/arm/mach-bcmbca/bcm63138/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63138/Makefile b/arch/arm/mach-bcmbca/bcm63138/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm63138/Makefile +++ b/arch/arm/mach-bcmbca/bcm63138/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63146/Kconfig b/arch/arm/mach-bcmbca/bcm63146/Kconfig index 690cbf1eb2..ae39dfc911 100644 --- a/arch/arm/mach-bcmbca/bcm63146/Kconfig +++ b/arch/arm/mach-bcmbca/bcm63146/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63146/Makefile b/arch/arm/mach-bcmbca/bcm63146/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm63146/Makefile +++ b/arch/arm/mach-bcmbca/bcm63146/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63146/mmu_table.c b/arch/arm/mach-bcmbca/bcm63146/mmu_table.c index c6b7a54fbd..d36a923d0f 100644 --- a/arch/arm/mach-bcmbca/bcm63146/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm63146/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm63148/Kconfig b/arch/arm/mach-bcmbca/bcm63148/Kconfig index f81504c25c..84bfc47472 100644 --- a/arch/arm/mach-bcmbca/bcm63148/Kconfig +++ b/arch/arm/mach-bcmbca/bcm63148/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63148/Makefile b/arch/arm/mach-bcmbca/bcm63148/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm63148/Makefile +++ b/arch/arm/mach-bcmbca/bcm63148/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63158/Kconfig b/arch/arm/mach-bcmbca/bcm63158/Kconfig index b77444369e..cdc76e840e 100644 --- a/arch/arm/mach-bcmbca/bcm63158/Kconfig +++ b/arch/arm/mach-bcmbca/bcm63158/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63158/Makefile b/arch/arm/mach-bcmbca/bcm63158/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm63158/Makefile +++ b/arch/arm/mach-bcmbca/bcm63158/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63158/mmu_table.c b/arch/arm/mach-bcmbca/bcm63158/mmu_table.c index fe7efb30e2..55f1d5454e 100644 --- a/arch/arm/mach-bcmbca/bcm63158/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm63158/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm63178/Kconfig b/arch/arm/mach-bcmbca/bcm63178/Kconfig index 73ac46284b..3e655e0a43 100644 --- a/arch/arm/mach-bcmbca/bcm63178/Kconfig +++ b/arch/arm/mach-bcmbca/bcm63178/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm63178/Makefile b/arch/arm/mach-bcmbca/bcm63178/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm63178/Makefile +++ b/arch/arm/mach-bcmbca/bcm63178/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6756/Kconfig b/arch/arm/mach-bcmbca/bcm6756/Kconfig index c83dcd0f3e..f0a55cf9f3 100644 --- a/arch/arm/mach-bcmbca/bcm6756/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6756/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6756/Makefile b/arch/arm/mach-bcmbca/bcm6756/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm6756/Makefile +++ b/arch/arm/mach-bcmbca/bcm6756/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6813/Kconfig b/arch/arm/mach-bcmbca/bcm6813/Kconfig index 25a4221bef..c0c4e0b933 100644 --- a/arch/arm/mach-bcmbca/bcm6813/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6813/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6813/Makefile b/arch/arm/mach-bcmbca/bcm6813/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm6813/Makefile +++ b/arch/arm/mach-bcmbca/bcm6813/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6813/mmu_table.c b/arch/arm/mach-bcmbca/bcm6813/mmu_table.c index eb736bf7d5..f368234205 100644 --- a/arch/arm/mach-bcmbca/bcm6813/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm6813/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm6846/Kconfig b/arch/arm/mach-bcmbca/bcm6846/Kconfig index 229ab88dbb..3572148de5 100644 --- a/arch/arm/mach-bcmbca/bcm6846/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6846/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6846/Makefile b/arch/arm/mach-bcmbca/bcm6846/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm6846/Makefile +++ b/arch/arm/mach-bcmbca/bcm6846/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6855/Kconfig b/arch/arm/mach-bcmbca/bcm6855/Kconfig index 78087c7dd5..8e1cb5b64e 100644 --- a/arch/arm/mach-bcmbca/bcm6855/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6855/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6855/Makefile b/arch/arm/mach-bcmbca/bcm6855/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm6855/Makefile +++ b/arch/arm/mach-bcmbca/bcm6855/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6856/Kconfig b/arch/arm/mach-bcmbca/bcm6856/Kconfig index 6ac75cb840..1a2b58851d 100644 --- a/arch/arm/mach-bcmbca/bcm6856/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6856/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6856/Makefile b/arch/arm/mach-bcmbca/bcm6856/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm6856/Makefile +++ b/arch/arm/mach-bcmbca/bcm6856/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6856/mmu_table.c b/arch/arm/mach-bcmbca/bcm6856/mmu_table.c index 8e53b4929e..ec8da43d87 100644 --- a/arch/arm/mach-bcmbca/bcm6856/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm6856/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm6858/Kconfig b/arch/arm/mach-bcmbca/bcm6858/Kconfig index a6504bae1f..a585aca784 100644 --- a/arch/arm/mach-bcmbca/bcm6858/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6858/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6858/Makefile b/arch/arm/mach-bcmbca/bcm6858/Makefile index 6262497703..f2b24438e3 100644 --- a/arch/arm/mach-bcmbca/bcm6858/Makefile +++ b/arch/arm/mach-bcmbca/bcm6858/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c index 898291075f..fd05bd90b6 100644 --- a/arch/arm/mach-bcmbca/bcm6858/mmu_table.c +++ b/arch/arm/mach-bcmbca/bcm6858/mmu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Broadcom Ltd. */ diff --git a/arch/arm/mach-bcmbca/bcm6878/Kconfig b/arch/arm/mach-bcmbca/bcm6878/Kconfig index 43f8942c9b..3e06f47597 100644 --- a/arch/arm/mach-bcmbca/bcm6878/Kconfig +++ b/arch/arm/mach-bcmbca/bcm6878/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmbca/bcm6878/Makefile b/arch/arm/mach-bcmbca/bcm6878/Makefile index beb979af75..847271e417 100644 --- a/arch/arm/mach-bcmbca/bcm6878/Makefile +++ b/arch/arm/mach-bcmbca/bcm6878/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/arch/arm/mach-bcmstb/Makefile b/arch/arm/mach-bcmstb/Makefile index 71e5727e41..66f7d4263d 100644 --- a/arch/arm/mach-bcmstb/Makefile +++ b/arch/arm/mach-bcmstb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2018 Cisco Systems, Inc. # diff --git a/arch/arm/mach-bcmstb/include/mach/gpio.h b/arch/arm/mach-bcmstb/include/mach/gpio.h index bffecf9bde..b7778e36f3 100644 --- a/arch/arm/mach-bcmstb/include/mach/gpio.h +++ b/arch/arm/mach-bcmstb/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/arch/arm/mach-bcmstb/include/mach/hardware.h b/arch/arm/mach-bcmstb/include/mach/hardware.h index 76f799d024..db42043fda 100644 --- a/arch/arm/mach-bcmstb/include/mach/hardware.h +++ b/arch/arm/mach-bcmstb/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/arch/arm/mach-bcmstb/include/mach/sdhci.h b/arch/arm/mach-bcmstb/include/mach/sdhci.h index 243783d682..109d8f6a68 100644 --- a/arch/arm/mach-bcmstb/include/mach/sdhci.h +++ b/arch/arm/mach-bcmstb/include/mach/sdhci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h index 039dd664c2..a768a9954d 100644 --- a/arch/arm/mach-bcmstb/include/mach/timer.h +++ b/arch/arm/mach-bcmstb/include/mach/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/arch/arm/mach-bcmstb/lowlevel_init.S b/arch/arm/mach-bcmstb/lowlevel_init.S index aa81f70248..9e316c0f9e 100644 --- a/arch/arm/mach-bcmstb/lowlevel_init.S +++ b/arch/arm/mach-bcmstb/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/arch/arm/mach-cortina/Makefile b/arch/arm/mach-cortina/Makefile index ffb8692271..3a6c93f11a 100644 --- a/arch/arm/mach-cortina/Makefile +++ b/arch/arm/mach-cortina/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 Cortina Access Inc. # diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile index ae171e3ee2..c6280c16f7 100644 --- a/arch/arm/mach-davinci/Makefile +++ b/arch/arm/mach-davinci/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-davinci/config.mk b/arch/arm/mach-davinci/config.mk index 4674cae43b..0b3d31441e 100644 --- a/arch/arm/mach-davinci/config.mk +++ b/arch/arm/mach-davinci/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012, Texas Instruments, Incorporated - http://www.ti.com/ ifndef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-davinci/cpu.c b/arch/arm/mach-davinci/cpu.c index dae60262f5..942bb128f2 100644 --- a/arch/arm/mach-davinci/cpu.c +++ b/arch/arm/mach-davinci/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004 Texas Instruments. * Copyright (C) 2009 David Brownell diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 08c8f59252..b536e077aa 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SoC-specific lowlevel code for DA850 * diff --git a/arch/arm/mach-davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c index f2536c8dd6..4f3a70b5b7 100644 --- a/arch/arm/mach-davinci/da850_pinmux.c +++ b/arch/arm/mach-davinci/da850_pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pinmux configurations for the DA850 SoCs * diff --git a/arch/arm/mach-davinci/include/mach/da850_lowlevel.h b/arch/arm/mach-davinci/include/mach/da850_lowlevel.h index bb23ad3f98..ea03c8eea6 100644 --- a/arch/arm/mach-davinci/include/mach/da850_lowlevel.h +++ b/arch/arm/mach-davinci/include/mach/da850_lowlevel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SoC-specific lowlevel code for DA850 * diff --git a/arch/arm/mach-davinci/include/mach/da8xx-usb.h b/arch/arm/mach-davinci/include/mach/da8xx-usb.h index 99d403cef7..97186e6b02 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx-usb.h +++ b/arch/arm/mach-davinci/include/mach/da8xx-usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * da8xx-usb.h -- TI's DA8xx platform specific usb wrapper definitions. * diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h index 1133a23bde..9d481e49f3 100644 --- a/arch/arm/mach-davinci/include/mach/davinci_misc.h +++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Lyrtech <www.lyrtech.com> */ diff --git a/arch/arm/mach-davinci/include/mach/ddr2_defs.h b/arch/arm/mach-davinci/include/mach/ddr2_defs.h index bfdb744674..e1112f1abb 100644 --- a/arch/arm/mach-davinci/include/mach/ddr2_defs.h +++ b/arch/arm/mach-davinci/include/mach/ddr2_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h index eb1488e744..babdfc464c 100644 --- a/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h +++ b/arch/arm/mach-davinci/include/mach/dm365_lowlevel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SoC-specific lowlevel code for tms320dm365 and similar chips * diff --git a/arch/arm/mach-davinci/include/mach/emac_defs.h b/arch/arm/mach-davinci/include/mach/emac_defs.h index 7c6c19ba0f..36c0d2df71 100644 --- a/arch/arm/mach-davinci/include/mach/emac_defs.h +++ b/arch/arm/mach-davinci/include/mach/emac_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> * diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h index e5a4053414..4b4398f442 100644 --- a/arch/arm/mach-davinci/include/mach/gpio.h +++ b/arch/arm/mach-davinci/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Texas Instruments Incorporated */ diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index 4466c6c1d5..a8640443bc 100644 --- a/arch/arm/mach-davinci/include/mach/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007 Sergey Kubushyn <ksi(a)koi8.net> * diff --git a/arch/arm/mach-davinci/include/mach/i2c_defs.h b/arch/arm/mach-davinci/include/mach/i2c_defs.h index f12460dd5f..4e152f74ea 100644 --- a/arch/arm/mach-davinci/include/mach/i2c_defs.h +++ b/arch/arm/mach-davinci/include/mach/i2c_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2014 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-davinci/include/mach/pinmux_defs.h b/arch/arm/mach-davinci/include/mach/pinmux_defs.h index 4901ba49c9..7dab0bceae 100644 --- a/arch/arm/mach-davinci/include/mach/pinmux_defs.h +++ b/arch/arm/mach-davinci/include/mach/pinmux_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Pinmux configurations for the DAxxx SoCs * diff --git a/arch/arm/mach-davinci/include/mach/pll_defs.h b/arch/arm/mach-davinci/include/mach/pll_defs.h index e38fafd7c8..6d5ad32075 100644 --- a/arch/arm/mach-davinci/include/mach/pll_defs.h +++ b/arch/arm/mach-davinci/include/mach/pll_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/arch/arm/mach-davinci/include/mach/psc_defs.h b/arch/arm/mach-davinci/include/mach/psc_defs.h index 582e6f23d1..868f2d2cb0 100644 --- a/arch/arm/mach-davinci/include/mach/psc_defs.h +++ b/arch/arm/mach-davinci/include/mach/psc_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h index d4195cf588..ab761449a6 100644 --- a/arch/arm/mach-davinci/include/mach/sdmmc_defs.h +++ b/arch/arm/mach-davinci/include/mach/sdmmc_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Davinci MMC Controller Defines - Based on Linux davinci_mmc.c * diff --git a/arch/arm/mach-davinci/include/mach/timer_defs.h b/arch/arm/mach-davinci/include/mach/timer_defs.h index 110e67e454..3d409173f9 100644 --- a/arch/arm/mach-davinci/include/mach/timer_defs.h +++ b/arch/arm/mach-davinci/include/mach/timer_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 DENX Software Engineering GmbH * Heiko Schocher <hs(a)denx.de> diff --git a/arch/arm/mach-davinci/misc.c b/arch/arm/mach-davinci/misc.c index cfad28c43d..2f246c8310 100644 --- a/arch/arm/mach-davinci/misc.c +++ b/arch/arm/mach-davinci/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Miscelaneous DaVinci functions. * diff --git a/arch/arm/mach-davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c index 7904257b4a..c6fcff1439 100644 --- a/arch/arm/mach-davinci/pinmux.c +++ b/arch/arm/mach-davinci/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DaVinci pinmux functions. * diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index dae10aa03b..6c8ceb77d6 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Power and Sleep Controller (PSC) functions. * diff --git a/arch/arm/mach-davinci/reset.c b/arch/arm/mach-davinci/reset.c index 0d59eb6e3c..f8ccab3ab0 100644 --- a/arch/arm/mach-davinci/reset.c +++ b/arch/arm/mach-davinci/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Processor reset using WDT. * diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c index 5f5b9ebbf9..957fb180c7 100644 --- a/arch/arm/mach-davinci/spl.c +++ b/arch/arm/mach-davinci/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c index 83c190b620..06f05dd60a 100644 --- a/arch/arm/mach-davinci/timer.c +++ b/arch/arm/mach-davinci/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Texas Instruments <www.ti.com> diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index dd097cf541..eaf78fc242 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2009 Samsung Electronics # Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index f91f2ee862..2b7e76b44c 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h index 8664f10df4..5f5eb6ffb6 100644 --- a/arch/arm/mach-exynos/clock_init.h +++ b/arch/arm/mach-exynos/clock_init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Clock initialization routines * diff --git a/arch/arm/mach-exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c index 1cb8d391e7..e6243ada23 100644 --- a/arch/arm/mach-exynos/clock_init_exynos5.c +++ b/arch/arm/mach-exynos/clock_init_exynos5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock setup for SMDK5250 board based on EXYNOS5 * diff --git a/arch/arm/mach-exynos/config.mk b/arch/arm/mach-exynos/config.mk index 59d332b700..ceff57d974 100644 --- a/arch/arm/mach-exynos/config.mk +++ b/arch/arm/mach-exynos/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) Albert ARIBAUD <albert.u.boot(a)aribaud.net> diff --git a/arch/arm/mach-exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c index 44923dd552..df02a5bd0b 100644 --- a/arch/arm/mach-exynos/dmc_common.c +++ b/arch/arm/mach-exynos/dmc_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Mem setup common file for different types of DDR present on Exynos boards. * diff --git a/arch/arm/mach-exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c index cad8ccc531..17185b5e1f 100644 --- a/arch/arm/mach-exynos/dmc_init_ddr3.c +++ b/arch/arm/mach-exynos/dmc_init_ddr3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DDR3 mem setup file for board based on EXYNOS5 * diff --git a/arch/arm/mach-exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h index fbb45eb897..5fddfbee8f 100644 --- a/arch/arm/mach-exynos/exynos4_setup.h +++ b/arch/arm/mach-exynos/exynos4_setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Machine Specific Values for EXYNOS4012 based board * diff --git a/arch/arm/mach-exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h index af7a5afb03..b14d592898 100644 --- a/arch/arm/mach-exynos/exynos5_setup.h +++ b/arch/arm/mach-exynos/exynos5_setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Machine Specific Values for SMDK5250 board based on EXYNOS5 * diff --git a/arch/arm/mach-exynos/include/mach/adc.h b/arch/arm/mach-exynos/include/mach/adc.h index c5ce6050fd..9c8b70201c 100644 --- a/arch/arm/mach-exynos/include/mach/adc.h +++ b/arch/arm/mach-exynos/include/mach/adc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/board.h b/arch/arm/mach-exynos/include/mach/board.h index a167f96793..22245f5b9e 100644 --- a/arch/arm/mach-exynos/include/mach/board.h +++ b/arch/arm/mach-exynos/include/mach/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/clk.h b/arch/arm/mach-exynos/include/mach/clk.h index cf8db2109c..66b02eaa57 100644 --- a/arch/arm/mach-exynos/include/mach/clk.h +++ b/arch/arm/mach-exynos/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/clock.h b/arch/arm/mach-exynos/include/mach/clock.h index 9d23c476f9..1673939a6a 100644 --- a/arch/arm/mach-exynos/include/mach/clock.h +++ b/arch/arm/mach-exynos/include/mach/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h index dab148e332..01316f7ea1 100644 --- a/arch/arm/mach-exynos/include/mach/cpu.h +++ b/arch/arm/mach-exynos/include/mach/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/dp.h b/arch/arm/mach-exynos/include/mach/dp.h index 104a9d6ed7..042137cf3b 100644 --- a/arch/arm/mach-exynos/include/mach/dp.h +++ b/arch/arm/mach-exynos/include/mach/dp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/arch/arm/mach-exynos/include/mach/dp_info.h b/arch/arm/mach-exynos/include/mach/dp_info.h index 3226eb95f0..893cec696d 100644 --- a/arch/arm/mach-exynos/include/mach/dp_info.h +++ b/arch/arm/mach-exynos/include/mach/dp_info.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/arch/arm/mach-exynos/include/mach/dsim.h b/arch/arm/mach-exynos/include/mach/dsim.h index 15671b603c..ded9f0506e 100644 --- a/arch/arm/mach-exynos/include/mach/dsim.h +++ b/arch/arm/mach-exynos/include/mach/dsim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/arch/arm/mach-exynos/include/mach/dwmmc.h b/arch/arm/mach-exynos/include/mach/dwmmc.h index 59c28ed54c..b9bd6a65e1 100644 --- a/arch/arm/mach-exynos/include/mach/dwmmc.h +++ b/arch/arm/mach-exynos/include/mach/dwmmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/ehci.h b/arch/arm/mach-exynos/include/mach/ehci.h index e818228bce..e1e2ea80c0 100644 --- a/arch/arm/mach-exynos/include/mach/ehci.h +++ b/arch/arm/mach-exynos/include/mach/ehci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SAMSUNG EXYNOS USB HOST EHCI Controller * diff --git a/arch/arm/mach-exynos/include/mach/fb.h b/arch/arm/mach-exynos/include/mach/fb.h index 09be67b797..e847178c54 100644 --- a/arch/arm/mach-exynos/include/mach/fb.h +++ b/arch/arm/mach-exynos/include/mach/fb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Samsung Electronics * Donghwa Lee <dh09.lee(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/gpio.h b/arch/arm/mach-exynos/include/mach/gpio.h index f9975d7919..03a9235a05 100644 --- a/arch/arm/mach-exynos/include/mach/gpio.h +++ b/arch/arm/mach-exynos/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/i2s-regs.h b/arch/arm/mach-exynos/include/mach/i2s-regs.h index f67e7eb15b..266ae7158c 100644 --- a/arch/arm/mach-exynos/include/mach/i2s-regs.h +++ b/arch/arm/mach-exynos/include/mach/i2s-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h index 5e2b172fef..459dc30b6f 100644 --- a/arch/arm/mach-exynos/include/mach/mipi_dsim.h +++ b/arch/arm/mach-exynos/include/mach/mipi_dsim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/arch/arm/mach-exynos/include/mach/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h index eece44ea1a..66ce8ff120 100644 --- a/arch/arm/mach-exynos/include/mach/mmc.h +++ b/arch/arm/mach-exynos/include/mach/mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/periph.h b/arch/arm/mach-exynos/include/mach/periph.h index f262339f63..2099a164e2 100644 --- a/arch/arm/mach-exynos/include/mach/periph.h +++ b/arch/arm/mach-exynos/include/mach/periph.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/pinmux.h b/arch/arm/mach-exynos/include/mach/pinmux.h index 5ef04e711e..6a6f0a1ee2 100644 --- a/arch/arm/mach-exynos/include/mach/pinmux.h +++ b/arch/arm/mach-exynos/include/mach/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Abhilash Kesavan <a.kesavan(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/power.h b/arch/arm/mach-exynos/include/mach/power.h index a3d8974dcb..e6051338ce 100644 --- a/arch/arm/mach-exynos/include/mach/power.h +++ b/arch/arm/mach-exynos/include/mach/power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/pwm.h b/arch/arm/mach-exynos/include/mach/pwm.h index 17372492d5..a64a825d66 100644 --- a/arch/arm/mach-exynos/include/mach/pwm.h +++ b/arch/arm/mach-exynos/include/mach/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/sound.h b/arch/arm/mach-exynos/include/mach/sound.h index 1a40e35f0b..b05933649c 100644 --- a/arch/arm/mach-exynos/include/mach/sound.h +++ b/arch/arm/mach-exynos/include/mach/sound.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/spi.h b/arch/arm/mach-exynos/include/mach/spi.h index 43cb26fdb5..f6f7175ebc 100644 --- a/arch/arm/mach-exynos/include/mach/spi.h +++ b/arch/arm/mach-exynos/include/mach/spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 SAMSUNG Electronics * Padmavathi Venna <padma.v(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/spl.h b/arch/arm/mach-exynos/include/mach/spl.h index 816c85217e..c29825fc69 100644 --- a/arch/arm/mach-exynos/include/mach/spl.h +++ b/arch/arm/mach-exynos/include/mach/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/arm/mach-exynos/include/mach/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h index ac229e0d16..0bbf8b901d 100644 --- a/arch/arm/mach-exynos/include/mach/sromc.h +++ b/arch/arm/mach-exynos/include/mach/sromc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Naveen Krishna Ch <ch.naveen(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h index 53d53bc6b6..9a47866106 100644 --- a/arch/arm/mach-exynos/include/mach/sys_proto.h +++ b/arch/arm/mach-exynos/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Samsung Electrnoics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/system.h b/arch/arm/mach-exynos/include/mach/system.h index 5d0bebac57..3c9fae46c7 100644 --- a/arch/arm/mach-exynos/include/mach/system.h +++ b/arch/arm/mach-exynos/include/mach/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Samsung Electronics * Donghwa Lee <dh09.lee(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/tzpc.h b/arch/arm/mach-exynos/include/mach/tzpc.h index 66827ec8b4..93b1f43814 100644 --- a/arch/arm/mach-exynos/include/mach/tzpc.h +++ b/arch/arm/mach-exynos/include/mach/tzpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Samsung Electronics */ diff --git a/arch/arm/mach-exynos/include/mach/uart.h b/arch/arm/mach-exynos/include/mach/uart.h index d357188b22..8b3a3d1c71 100644 --- a/arch/arm/mach-exynos/include/mach/uart.h +++ b/arch/arm/mach-exynos/include/mach/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/watchdog.h b/arch/arm/mach-exynos/include/mach/watchdog.h index 903ac25447..412c93b322 100644 --- a/arch/arm/mach-exynos/include/mach/watchdog.h +++ b/arch/arm/mach-exynos/include/mach/watchdog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/arch/arm/mach-exynos/include/mach/xhci-exynos.h b/arch/arm/mach-exynos/include/mach/xhci-exynos.h index 403b1e16b2..a1c21e605a 100644 --- a/arch/arm/mach-exynos/include/mach/xhci-exynos.h +++ b/arch/arm/mach-exynos/include/mach/xhci-exynos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (c) 2012 Samsung Electronics Co. Ltd * * Exynos Phy register definitions diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c index 8d8c64e8f8..bfcc4b6069 100644 --- a/arch/arm/mach-exynos/mmu-arm64.c +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Samsung Electronics * Thomas Abraham <thomas.ab(a)samsung.com> diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c index ad3fbf2da7..ae016c40ca 100644 --- a/arch/arm/mach-exynos/pinmux.c +++ b/arch/arm/mach-exynos/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 Samsung Electronics. * Abhilash Kesavan <a.kesavan(a)samsung.com> diff --git a/arch/arm/mach-exynos/power.c b/arch/arm/mach-exynos/power.c index f2a6c00dd6..41aeceea48 100644 --- a/arch/arm/mach-exynos/power.c +++ b/arch/arm/mach-exynos/power.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * Donghwa Lee <dh09.lee(a)samsung.com> diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S index 1303544d83..ad4adcbf7f 100644 --- a/arch/arm/mach-exynos/sec_boot.S +++ b/arch/arm/mach-exynos/sec_boot.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Akshay Saraswat <akshay.s(a)samsung.com> diff --git a/arch/arm/mach-exynos/soc.c b/arch/arm/mach-exynos/soc.c index a07c87a2c8..af4b6c7386 100644 --- a/arch/arm/mach-exynos/soc.c +++ b/arch/arm/mach-exynos/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Samsung Electronics. * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index 553dac75b6..619f47260d 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics */ diff --git a/arch/arm/mach-exynos/system.c b/arch/arm/mach-exynos/system.c index 12d0d8fd34..f96b8b7386 100644 --- a/arch/arm/mach-exynos/system.c +++ b/arch/arm/mach-exynos/system.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * Donghwa Lee <dh09.lee(a)samsung.com> diff --git a/arch/arm/mach-exynos/tzpc.c b/arch/arm/mach-exynos/tzpc.c index abe8e7f458..7537488efe 100644 --- a/arch/arm/mach-exynos/tzpc.c +++ b/arch/arm/mach-exynos/tzpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Lowlevel setup for SMDK5250 board based on S5PC520 * diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile index 029e266bed..db1c35d6a9 100644 --- a/arch/arm/mach-highbank/Makefile +++ b/arch/arm/mach-highbank/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c index 2423a0e378..1b7ffc649f 100644 --- a/arch/arm/mach-highbank/timer.c +++ b/arch/arm/mach-highbank/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. * diff --git a/arch/arm/mach-histb/Makefile b/arch/arm/mach-histb/Makefile index 7975c0f2a0..d32ab216ed 100644 --- a/arch/arm/mach-histb/Makefile +++ b/arch/arm/mach-histb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += sysmap-histb.o obj-y += board_common.o diff --git a/arch/arm/mach-histb/board_common.c b/arch/arm/mach-histb/board_common.c index a26c2066e0..12aac67716 100644 --- a/arch/arm/mach-histb/board_common.c +++ b/arch/arm/mach-histb/board_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for all histb boards * diff --git a/arch/arm/mach-histb/sysmap-histb.c b/arch/arm/mach-histb/sysmap-histb.c index 83a2bb9417..029437f531 100644 --- a/arch/arm/mach-histb/sysmap-histb.c +++ b/arch/arm/mach-histb/sysmap-histb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hisilicon HiSTB memory map * diff --git a/arch/arm/mach-hpe/gxp/reset.c b/arch/arm/mach-hpe/gxp/reset.c index a147bcac18..b96ee2f0bd 100644 --- a/arch/arm/mach-hpe/gxp/reset.c +++ b/arch/arm/mach-hpe/gxp/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GXP driver * diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index a3b44c93e3..7ac53c9baf 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-imx/cache.c b/arch/arm/mach-imx/cache.c index ab9b621a2a..ba8a6ab759 100644 --- a/arch/arm/mach-imx/cache.c +++ b/arch/arm/mach-imx/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/cmd_bmode.c b/arch/arm/mach-imx/cmd_bmode.c index cb317499d5..93562ca373 100644 --- a/arch/arm/mach-imx/cmd_bmode.c +++ b/arch/arm/mach-imx/cmd_bmode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Boundary Devices Inc. */ diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 2f389dbe8d..4be8d7e294 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2015 Freescale Semiconductor, Inc. * Copyright 2022 NXP diff --git a/arch/arm/mach-imx/cmd_hdmidet.c b/arch/arm/mach-imx/cmd_hdmidet.c index e2571adfb0..4a8fe84a6d 100644 --- a/arch/arm/mach-imx/cmd_hdmidet.c +++ b/arch/arm/mach-imx/cmd_hdmidet.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Boundary Devices Inc. */ diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index 9576b48dde..3f54901a29 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 70a213a49d..c90463e74b 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -8,7 +8,7 @@ * * Reconstucted by Han Xu <han.xu(a)nxp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 488638c905..1ae3b1fff6 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.c b/arch/arm/mach-imx/ddrmc-vf610-calibration.c index cd7e95e61d..4ad8f3ef57 100644 --- a/arch/arm/mach-imx/ddrmc-vf610-calibration.c +++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ddrmc DDR3 calibration code for NXP's VF610 * diff --git a/arch/arm/mach-imx/ddrmc-vf610-calibration.h b/arch/arm/mach-imx/ddrmc-vf610-calibration.h index 56fffe1534..4290ad5f65 100644 --- a/arch/arm/mach-imx/ddrmc-vf610-calibration.h +++ b/arch/arm/mach-imx/ddrmc-vf610-calibration.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ddrmc DDR3 calibration code for NXP's VF610 * diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c index 7895ee66f8..a414f3f850 100644 --- a/arch/arm/mach-imx/ddrmc-vf610.c +++ b/arch/arm/mach-imx/ddrmc-vf610.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Toradex, Inc. * diff --git a/arch/arm/mach-imx/ele_ahab.c b/arch/arm/mach-imx/ele_ahab.c index 295c055ad0..8d921ea934 100644 --- a/arch/arm/mach-imx/ele_ahab.c +++ b/arch/arm/mach-imx/ele_ahab.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 27e053ef70..2b55e73524 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/i2c-mxv7.c b/arch/arm/mach-imx/i2c-mxv7.c index a5866cf9f7..0caa6de3a7 100644 --- a/arch/arm/mach-imx/i2c-mxv7.c +++ b/arch/arm/mach-imx/i2c-mxv7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Boundary Devices Inc. */ diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c index ebc8021d7c..b435a27df4 100644 --- a/arch/arm/mach-imx/image-container.c +++ b/arch/arm/mach-imx/image-container.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8/Makefile b/arch/arm/mach-imx/imx8/Makefile index 4ca4c14bdd..dd388c81a1 100644 --- a/arch/arm/mach-imx/imx8/Makefile +++ b/arch/arm/mach-imx/imx8/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += cpu.o iomux.o misc.o lowlevel_init.o diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index 994becccef..88ddac16d6 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019, 2022 NXP */ diff --git a/arch/arm/mach-imx/imx8/clock.c b/arch/arm/mach-imx/imx8/clock.c index 9941b57b4b..dcf31291c3 100644 --- a/arch/arm/mach-imx/imx8/clock.c +++ b/arch/arm/mach-imx/imx8/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 39ac0bc414..c96629655e 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP */ diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c index c2bed3e0c1..adf8ef8dc2 100644 --- a/arch/arm/mach-imx/imx8/fdt.c +++ b/arch/arm/mach-imx/imx8/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8/iomux.c b/arch/arm/mach-imx/imx8/iomux.c index e4f7651bd1..148c80c821 100644 --- a/arch/arm/mach-imx/imx8/iomux.c +++ b/arch/arm/mach-imx/imx8/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/mach-imx/imx8/lowlevel_init.S b/arch/arm/mach-imx/imx8/lowlevel_init.S index a66243c5e4..f0609c98fd 100644 --- a/arch/arm/mach-imx/imx8/lowlevel_init.S +++ b/arch/arm/mach-imx/imx8/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c index 0ce3036818..aa011e8c4c 100644 --- a/arch/arm/mach-imx/imx8/misc.c +++ b/arch/arm/mach-imx/imx8/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <log.h> #include <firmware/imx/sci/sci.h> diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c index 1eaa68f8d5..39b76114cc 100644 --- a/arch/arm/mach-imx/imx8/snvs_security_sc.c +++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2020 NXP. */ diff --git a/arch/arm/mach-imx/imx8m/Makefile b/arch/arm/mach-imx/imx8m/Makefile index abd5ddc177..91401f3b0c 100644 --- a/arch/arm/mach-imx/imx8m/Makefile +++ b/arch/arm/mach-imx/imx8m/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2017 NXP diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c index 986870799d..a0e81cd29e 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019 NXP * diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c index 9db62b944e..f465495c17 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * diff --git a/arch/arm/mach-imx/imx8m/clock_slice.c b/arch/arm/mach-imx/imx8m/clock_slice.c index b5ed27a923..8bc054ded4 100644 --- a/arch/arm/mach-imx/imx8m/clock_slice.c +++ b/arch/arm/mach-imx/imx8m/clock_slice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * diff --git a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg index 5dcb8ae72f..50ba0c4b51 100644 --- a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg +++ b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg index 120631a423..6f8a982ae3 100644 --- a/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg +++ b/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg index 7dae3fa93a..9e7803be4a 100644 --- a/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg +++ b/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg index 0fba9f50f3..61e16200ef 100644 --- a/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg +++ b/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/imx8m/imximage.cfg b/arch/arm/mach-imx/imx8m/imximage.cfg index 30490e0418..3a0f28e49f 100644 --- a/arch/arm/mach-imx/imx8m/imximage.cfg +++ b/arch/arm/mach-imx/imx8m/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2021 NXP */ diff --git a/arch/arm/mach-imx/imx8m/lowlevel_init.S b/arch/arm/mach-imx/imx8m/lowlevel_init.S index dd263c4060..888fd66071 100644 --- a/arch/arm/mach-imx/imx8m/lowlevel_init.S +++ b/arch/arm/mach-imx/imx8m/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 5de4d11a76..27aef118d4 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2019, 2021 NXP * diff --git a/arch/arm/mach-imx/imx8ulp/Makefile b/arch/arm/mach-imx/imx8ulp/Makefile index 2c9938fcdf..ea83530f03 100644 --- a/arch/arm/mach-imx/imx8ulp/Makefile +++ b/arch/arm/mach-imx/imx8ulp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 NXP # diff --git a/arch/arm/mach-imx/imx8ulp/cgc.c b/arch/arm/mach-imx/imx8ulp/cgc.c index d2fadb4877..3561285f1e 100644 --- a/arch/arm/mach-imx/imx8ulp/cgc.c +++ b/arch/arm/mach-imx/imx8ulp/cgc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/clock.c b/arch/arm/mach-imx/imx8ulp/clock.c index 36d12943a0..a5e36cbdbb 100644 --- a/arch/arm/mach-imx/imx8ulp/clock.c +++ b/arch/arm/mach-imx/imx8ulp/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/iomux.c b/arch/arm/mach-imx/imx8ulp/iomux.c index c6d20f5468..7f52344407 100644 --- a/arch/arm/mach-imx/imx8ulp/iomux.c +++ b/arch/arm/mach-imx/imx8ulp/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020-2021 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/lowlevel_init.S b/arch/arm/mach-imx/imx8ulp/lowlevel_init.S index 791c26407c..72c090eac6 100644 --- a/arch/arm/mach-imx/imx8ulp/lowlevel_init.S +++ b/arch/arm/mach-imx/imx8ulp/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/pcc.c b/arch/arm/mach-imx/imx8ulp/pcc.c index e3c6d6760b..03cad1e211 100644 --- a/arch/arm/mach-imx/imx8ulp/pcc.c +++ b/arch/arm/mach-imx/imx8ulp/pcc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/rdc.c b/arch/arm/mach-imx/imx8ulp/rdc.c index cfc09e79cb..95d8a4991d 100644 --- a/arch/arm/mach-imx/imx8ulp/rdc.c +++ b/arch/arm/mach-imx/imx8ulp/rdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index fd436dd885..017b55b51b 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/arch/arm/mach-imx/imx8ulp/upower/Makefile b/arch/arm/mach-imx/imx8ulp/upower/Makefile index f8b5da2ad3..440f200cc2 100644 --- a/arch/arm/mach-imx/imx8ulp/upower/Makefile +++ b/arch/arm/mach-imx/imx8ulp/upower/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 NXP # diff --git a/arch/arm/mach-imx/imx9/Makefile b/arch/arm/mach-imx/imx9/Makefile index e1b09ab534..5802dc35fa 100644 --- a/arch/arm/mach-imx/imx9/Makefile +++ b/arch/arm/mach-imx/imx9/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2022 NXP diff --git a/arch/arm/mach-imx/imx9/clock.c b/arch/arm/mach-imx/imx9/clock.c index 766a8811c1..236229171f 100644 --- a/arch/arm/mach-imx/imx9/clock.c +++ b/arch/arm/mach-imx/imx9/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/arch/arm/mach-imx/imx9/clock_root.c b/arch/arm/mach-imx/imx9/clock_root.c index 7d7ae86594..a0b74e5f0b 100644 --- a/arch/arm/mach-imx/imx9/clock_root.c +++ b/arch/arm/mach-imx/imx9/clock_root.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/arch/arm/mach-imx/imx9/imx_bootaux.c b/arch/arm/mach-imx/imx9/imx_bootaux.c index 6afb59e051..6ae88ff34f 100644 --- a/arch/arm/mach-imx/imx9/imx_bootaux.c +++ b/arch/arm/mach-imx/imx9/imx_bootaux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/mach-imx/imx9/lowlevel_init.S b/arch/arm/mach-imx/imx9/lowlevel_init.S index 1dc1dbfcdd..66f8065a86 100644 --- a/arch/arm/mach-imx/imx9/lowlevel_init.S +++ b/arch/arm/mach-imx/imx9/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index 86b45be3d8..769235c937 100644 --- a/arch/arm/mach-imx/imx9/soc.c +++ b/arch/arm/mach-imx/imx9/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/arch/arm/mach-imx/imx9/trdc.c b/arch/arm/mach-imx/imx9/trdc.c index d0f855bb1b..ff8d9fffe9 100644 --- a/arch/arm/mach-imx/imx9/trdc.c +++ b/arch/arm/mach-imx/imx9/trdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index f7b14ca38d..42a528a887 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/imxrt/Makefile b/arch/arm/mach-imx/imxrt/Makefile index 9621a8335a..2dbf34dcb7 100644 --- a/arch/arm/mach-imx/imxrt/Makefile +++ b/arch/arm/mach-imx/imxrt/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2019 # Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c index 34162a3976..4e59763196 100644 --- a/arch/arm/mach-imx/imxrt/soc.c +++ b/arch/arm/mach-imx/imxrt/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index ce3eb4b0b8..03088e516a 100644 --- a/arch/arm/mach-imx/init.c +++ b/arch/arm/mach-imx/init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/iomux-v3.c b/arch/arm/mach-imx/iomux-v3.c index 18131a20f4..bc620748bb 100644 --- a/arch/arm/mach-imx/iomux-v3.c +++ b/arch/arm/mach-imx/iomux-v3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Based on the iomux-v3.c from Linux kernel: * Copyright (C) 2008 by Sascha Hauer <kernel(a)pengutronix.de> diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c index 9bb63d25b4..ad5a5e143b 100644 --- a/arch/arm/mach-imx/mac.c +++ b/arch/arm/mach-imx/mac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * diff --git a/arch/arm/mach-imx/misc.c b/arch/arm/mach-imx/misc.c index 09a758ff6e..707544e142 100644 --- a/arch/arm/mach-imx/misc.c +++ b/arch/arm/mach-imx/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c index 9c822f721c..53d972e617 100644 --- a/arch/arm/mach-imx/mmc_env.c +++ b/arch/arm/mach-imx/mmc_env.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP */ diff --git a/arch/arm/mach-imx/mmdc_size.c b/arch/arm/mach-imx/mmdc_size.c index 41a5af6bd3..79e412f05a 100644 --- a/arch/arm/mach-imx/mmdc_size.c +++ b/arch/arm/mach-imx/mmdc_size.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/arch/arm/mach-imx/mx5/Makefile b/arch/arm/mach-imx/mx5/Makefile index 40d1998637..de47704c1b 100644 --- a/arch/arm/mach-imx/mx5/Makefile +++ b/arch/arm/mach-imx/mx5/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-imx/mx5/clock.c b/arch/arm/mach-imx/mx5/clock.c index bbaddd5a33..08600bf6f1 100644 --- a/arch/arm/mach-imx/mx5/clock.c +++ b/arch/arm/mach-imx/mx5/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/mach-imx/mx5/lowlevel_init.S b/arch/arm/mach-imx/mx5/lowlevel_init.S index 6ec38dcfa4..d7d9c9206d 100644 --- a/arch/arm/mach-imx/mx5/lowlevel_init.S +++ b/arch/arm/mach-imx/mx5/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> * diff --git a/arch/arm/mach-imx/mx5/mx53_dram.c b/arch/arm/mach-imx/mx5/mx53_dram.c index f744144194..39a9cdb638 100644 --- a/arch/arm/mach-imx/mx5/mx53_dram.c +++ b/arch/arm/mach-imx/mx5/mx53_dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Beckhoff Automation GmbH & Co. KG * Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c index 47f531dc85..b0fe6b0192 100644 --- a/arch/arm/mach-imx/mx5/soc.c +++ b/arch/arm/mach-imx/mx5/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/mach-imx/mx6/Makefile b/arch/arm/mach-imx/mx6/Makefile index 7ea8f91e4f..46ac345a1a 100644 --- a/arch/arm/mach-imx/mx6/Makefile +++ b/arch/arm/mach-imx/mx6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-imx/mx6/clock.c b/arch/arm/mach-imx/mx6/clock.c index 1bdc568f9b..89a927fdd4 100644 --- a/arch/arm/mach-imx/mx6/clock.c +++ b/arch/arm/mach-imx/mx6/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/mx6/ddr.c b/arch/arm/mach-imx/mx6/ddr.c index 3c87c57773..6bbc6d8b1a 100644 --- a/arch/arm/mach-imx/mx6/ddr.c +++ b/arch/arm/mach-imx/mx6/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Author: Tim Harvey <tharvey(a)gateworks.com> diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c index 2ba3245e22..8ae663ac9b 100644 --- a/arch/arm/mach-imx/mx6/litesom.c +++ b/arch/arm/mach-imx/mx6/litesom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. * Copyright (C) 2016 Grinn diff --git a/arch/arm/mach-imx/mx6/module_fuse.c b/arch/arm/mach-imx/mx6/module_fuse.c index b58f11c1e5..a8fb03c2e5 100644 --- a/arch/arm/mach-imx/mx6/module_fuse.c +++ b/arch/arm/mach-imx/mx6/module_fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/mx6/mp.c b/arch/arm/mach-imx/mx6/mp.c index de9ace083c..709da2a08e 100644 --- a/arch/arm/mach-imx/mx6/mp.c +++ b/arch/arm/mach-imx/mx6/mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Gabriel Huau <contact(a)huau-gabriel.fr> diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c index 38ead8ace2..f63ae2765a 100644 --- a/arch/arm/mach-imx/mx6/opos6ul.c +++ b/arch/arm/mach-imx/mx6/opos6ul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Armadeus Systems */ diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index c2875e727c..45103bfd74 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/mach-imx/mx7/Makefile b/arch/arm/mach-imx/mx7/Makefile index f1436e2d0d..09e0269d27 100644 --- a/arch/arm/mach-imx/mx7/Makefile +++ b/arch/arm/mach-imx/mx7/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Freescale Semiconductor, Inc. # diff --git a/arch/arm/mach-imx/mx7/clock.c b/arch/arm/mach-imx/mx7/clock.c index 4e232385af..9a5fd8c0c3 100644 --- a/arch/arm/mach-imx/mx7/clock.c +++ b/arch/arm/mach-imx/mx7/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/mach-imx/mx7/clock_slice.c b/arch/arm/mach-imx/mx7/clock_slice.c index dd731d9496..fecbb596b1 100644 --- a/arch/arm/mach-imx/mx7/clock_slice.c +++ b/arch/arm/mach-imx/mx7/clock_slice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-imx/mx7/ddr.c index cf25569765..4b9449a07a 100644 --- a/arch/arm/mach-imx/mx7/ddr.c +++ b/arch/arm/mach-imx/mx7/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DDR controller configuration for the i.MX7 architecture * diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index 699a2569cb..a433d605e2 100644 --- a/arch/arm/mach-imx/mx7/psci-mx7.c +++ b/arch/arm/mach-imx/mx7/psci-mx7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/arch/arm/mach-imx/mx7/psci-suspend.S b/arch/arm/mach-imx/mx7/psci-suspend.S index a21403f73f..4f0feb6f40 100644 --- a/arch/arm/mach-imx/mx7/psci-suspend.S +++ b/arch/arm/mach-imx/mx7/psci-suspend.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/arch/arm/mach-imx/mx7/snvs.c b/arch/arm/mach-imx/mx7/snvs.c index 359bbbb41c..41e48a8309 100644 --- a/arch/arm/mach-imx/mx7/snvs.c +++ b/arch/arm/mach-imx/mx7/snvs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Linaro */ diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 689dbefe8e..655b1ec11a 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/arch/arm/mach-imx/mx7ulp/Makefile b/arch/arm/mach-imx/mx7ulp/Makefile index adb8d7aecb..19f3fff9b8 100644 --- a/arch/arm/mach-imx/mx7ulp/Makefile +++ b/arch/arm/mach-imx/mx7ulp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Freescale Semiconductor, Inc. # diff --git a/arch/arm/mach-imx/mx7ulp/clock.c b/arch/arm/mach-imx/mx7ulp/clock.c index 37d8565c20..14aad56390 100644 --- a/arch/arm/mach-imx/mx7ulp/clock.c +++ b/arch/arm/mach-imx/mx7ulp/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/mx7ulp/iomux.c b/arch/arm/mach-imx/mx7ulp/iomux.c index 05ddeed2a6..ba02954c29 100644 --- a/arch/arm/mach-imx/mx7ulp/iomux.c +++ b/arch/arm/mach-imx/mx7ulp/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/mx7ulp/pcc.c b/arch/arm/mach-imx/mx7ulp/pcc.c index aa7ea86a44..6011e6132f 100644 --- a/arch/arm/mach-imx/mx7ulp/pcc.c +++ b/arch/arm/mach-imx/mx7ulp/pcc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/mx7ulp/scg.c b/arch/arm/mach-imx/mx7ulp/scg.c index 4c066557c1..f79fe092d4 100644 --- a/arch/arm/mach-imx/mx7ulp/scg.c +++ b/arch/arm/mach-imx/mx7ulp/scg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 217b7c4586..bc0dacb47b 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/arch/arm/mach-imx/priblob.c b/arch/arm/mach-imx/priblob.c index 5b022d5c82..13c0ecd567 100644 --- a/arch/arm/mach-imx/priblob.c +++ b/arch/arm/mach-imx/priblob.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/arm/mach-imx/rdc-sema.c b/arch/arm/mach-imx/rdc-sema.c index e683673753..7be4766970 100644 --- a/arch/arm/mach-imx/rdc-sema.c +++ b/arch/arm/mach-imx/rdc-sema.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/romapi.c b/arch/arm/mach-imx/romapi.c index ff0522c2d1..f012c21b76 100644 --- a/arch/arm/mach-imx/romapi.c +++ b/arch/arm/mach-imx/romapi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <asm/global_data.h> #include <asm/arch/sys_proto.h> diff --git a/arch/arm/mach-imx/sata.c b/arch/arm/mach-imx/sata.c index c4599aaf68..884947337e 100644 --- a/arch/arm/mach-imx/sata.c +++ b/arch/arm/mach-imx/sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c index 0e81cc880a..cb7b4a3179 100644 --- a/arch/arm/mach-imx/speed.c +++ b/arch/arm/mach-imx/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index b30cd96255..b3a20336ff 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c index 93d48e56ac..944ffc52df 100644 --- a/arch/arm/mach-imx/spl_imx_romapi.c +++ b/arch/arm/mach-imx/spl_imx_romapi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg index 6df779b771..7aa7af9b34 100644 --- a/arch/arm/mach-imx/spl_qspi.cfg +++ b/arch/arm/mach-imx/spl_qspi.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ */ diff --git a/arch/arm/mach-imx/spl_sd.cfg b/arch/arm/mach-imx/spl_sd.cfg index e739b54700..37f937a4a9 100644 --- a/arch/arm/mach-imx/spl_sd.cfg +++ b/arch/arm/mach-imx/spl_sd.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ */ diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c index 16df118675..6b72b2724a 100644 --- a/arch/arm/mach-imx/syscounter.c +++ b/arch/arm/mach-imx/syscounter.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index fcd45f09f1..495b3e10a5 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Sascha Hauer, Pengutronix diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index 1bc9b7cc7e..1100fc258d 100644 --- a/arch/arm/mach-imx/video.c +++ b/arch/arm/mach-imx/video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <env.h> diff --git a/arch/arm/mach-ipq40xx/Makefile b/arch/arm/mach-ipq40xx/Makefile index 08a65b8854..4ff8ddfa89 100644 --- a/arch/arm/mach-ipq40xx/Makefile +++ b/arch/arm/mach-ipq40xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019 Sartura Ltd. # diff --git a/arch/arm/mach-ipq40xx/clock-ipq4019.c b/arch/arm/mach-ipq40xx/clock-ipq4019.c index c1d5c4ecdd..e03ab4deb3 100644 --- a/arch/arm/mach-ipq40xx/clock-ipq4019.c +++ b/arch/arm/mach-ipq40xx/clock-ipq4019.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Clock drivers for Qualcomm IPQ40xx * diff --git a/arch/arm/mach-ipq40xx/include/mach/gpio.h b/arch/arm/mach-ipq40xx/include/mach/gpio.h index a45747c0fe..4b671ad43a 100644 --- a/arch/arm/mach-ipq40xx/include/mach/gpio.h +++ b/arch/arm/mach-ipq40xx/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Empty gpio.h * diff --git a/arch/arm/mach-ipq40xx/pinctrl-ipq4019.c b/arch/arm/mach-ipq40xx/pinctrl-ipq4019.c index 3e365f8cc8..26216d42c8 100644 --- a/arch/arm/mach-ipq40xx/pinctrl-ipq4019.c +++ b/arch/arm/mach-ipq40xx/pinctrl-ipq4019.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm IPQ40xx pinctrl * diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c index 036fec93d7..c51de16057 100644 --- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c +++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TLMM driver for Qualcomm IPQ40xx * diff --git a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.h b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.h index 2341a71349..df9b6664bb 100644 --- a/arch/arm/mach-ipq40xx/pinctrl-snapdragon.h +++ b/arch/arm/mach-ipq40xx/pinctrl-snapdragon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm Pin control * diff --git a/arch/arm/mach-k3/Makefile b/arch/arm/mach-k3/Makefile index fd77b8bbba..1932f90659 100644 --- a/arch/arm/mach-k3/Makefile +++ b/arch/arm/mach-k3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ # Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/am62ax/Makefile b/arch/arm/mach-k3/am62ax/Makefile index 02a941805e..5df62b8363 100644 --- a/arch/arm/mach-k3/am62ax/Makefile +++ b/arch/arm/mach-k3/am62ax/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ diff --git a/arch/arm/mach-k3/am62ax/am62a_qos_data.c b/arch/arm/mach-k3/am62ax/am62a_qos_data.c index 01b76f7493..1efeef3c35 100644 --- a/arch/arm/mach-k3/am62ax/am62a_qos_data.c +++ b/arch/arm/mach-k3/am62ax/am62a_qos_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am62a Quality of Service (QoS) Configuration Data * Auto generated from K3 Resource Partitioning tool diff --git a/arch/arm/mach-k3/am62ax/clk-data.c b/arch/arm/mach-k3/am62ax/clk-data.c index d950b35e0b..8aa8301915 100644 --- a/arch/arm/mach-k3/am62ax/clk-data.c +++ b/arch/arm/mach-k3/am62ax/clk-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AM62AX specific clock platform data * diff --git a/arch/arm/mach-k3/am62ax/dev-data.c b/arch/arm/mach-k3/am62ax/dev-data.c index abf5d8e91a..f1e4df789b 100644 --- a/arch/arm/mach-k3/am62ax/dev-data.c +++ b/arch/arm/mach-k3/am62ax/dev-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AM62AX specific device platform data * diff --git a/arch/arm/mach-k3/am62x/Makefile b/arch/arm/mach-k3/am62x/Makefile index d6c876df66..1af34f23f4 100644 --- a/arch/arm/mach-k3/am62x/Makefile +++ b/arch/arm/mach-k3/am62x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/ diff --git a/arch/arm/mach-k3/am62x/clk-data.c b/arch/arm/mach-k3/am62x/clk-data.c index d7bfed0e03..761aadd50c 100644 --- a/arch/arm/mach-k3/am62x/clk-data.c +++ b/arch/arm/mach-k3/am62x/clk-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AM62X specific clock platform data * diff --git a/arch/arm/mach-k3/am62x/dev-data.c b/arch/arm/mach-k3/am62x/dev-data.c index 59c95df2a8..ad77b23fd2 100644 --- a/arch/arm/mach-k3/am62x/dev-data.c +++ b/arch/arm/mach-k3/am62x/dev-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AM62X specific device platform data * diff --git a/arch/arm/mach-k3/am654_init.c b/arch/arm/mach-k3/am654_init.c index 0d3889cde2..68e7c82bc0 100644 --- a/arch/arm/mach-k3/am654_init.c +++ b/arch/arm/mach-k3/am654_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AM6: SoC specific initialization * diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64-mmu.c index f8087d2421..e623a4bfc3 100644 --- a/arch/arm/mach-k3/arm64-mmu.c +++ b/arch/arm/mach-k3/arm64-mmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K3: ARM64 MMU setup * diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index c3006ba387..3827f4ba8c 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K3: Common Architecture initialization * diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h index eabb44f620..bf2f101975 100644 --- a/arch/arm/mach-k3/common.h +++ b/arch/arm/mach-k3/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: Architecture common definitions * diff --git a/arch/arm/mach-k3/include/mach/am62_hardware.h b/arch/arm/mach-k3/include/mach/am62_hardware.h index acd2d109c2..68653bd954 100644 --- a/arch/arm/mach-k3/include/mach/am62_hardware.h +++ b/arch/arm/mach-k3/include/mach/am62_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: AM62 SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/am62_spl.h b/arch/arm/mach-k3/include/mach/am62_spl.h index 2c9139d2cc..9c7b64b6b9 100644 --- a/arch/arm/mach-k3/include/mach/am62_spl.h +++ b/arch/arm/mach-k3/include/mach/am62_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/ * Suman Anna <s-anna(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/am62a_hardware.h b/arch/arm/mach-k3/include/mach/am62a_hardware.h index 11080801c4..164eb12123 100644 --- a/arch/arm/mach-k3/include/mach/am62a_hardware.h +++ b/arch/arm/mach-k3/include/mach/am62a_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: AM62A SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/am62a_qos.h b/arch/arm/mach-k3/include/mach/am62a_qos.h index c74d69a28f..2b9206dc3e 100644 --- a/arch/arm/mach-k3/include/mach/am62a_qos.h +++ b/arch/arm/mach-k3/include/mach/am62a_qos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Keystone3 Quality of service endpoint definitions * Auto generated by K3 Resource Partitioning Tool diff --git a/arch/arm/mach-k3/include/mach/am62a_spl.h b/arch/arm/mach-k3/include/mach/am62a_spl.h index dd0f57714f..af6d1baef8 100644 --- a/arch/arm/mach-k3/include/mach/am62a_spl.h +++ b/arch/arm/mach-k3/include/mach/am62a_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ */ diff --git a/arch/arm/mach-k3/include/mach/am64_hardware.h b/arch/arm/mach-k3/include/mach/am64_hardware.h index 44df887d5d..0811727efd 100644 --- a/arch/arm/mach-k3/include/mach/am64_hardware.h +++ b/arch/arm/mach-k3/include/mach/am64_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: AM64 SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/am64_spl.h b/arch/arm/mach-k3/include/mach/am64_spl.h index b4f396b2c0..9a73cce464 100644 --- a/arch/arm/mach-k3/include/mach/am64_spl.h +++ b/arch/arm/mach-k3/include/mach/am64_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ * Keerthy <j-keerthy(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/am6_hardware.h b/arch/arm/mach-k3/include/mach/am6_hardware.h index 029041f415..ea0856c861 100644 --- a/arch/arm/mach-k3/include/mach/am6_hardware.h +++ b/arch/arm/mach-k3/include/mach/am6_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: AM6 SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/am6_spl.h b/arch/arm/mach-k3/include/mach/am6_spl.h index 61e0380927..d5e164d3db 100644 --- a/arch/arm/mach-k3/include/mach/am6_spl.h +++ b/arch/arm/mach-k3/include/mach/am6_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/clock.h b/arch/arm/mach-k3/include/mach/clock.h index e3adbcd9de..6e6ab0a374 100644 --- a/arch/arm/mach-k3/include/mach/clock.h +++ b/arch/arm/mach-k3/include/mach/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: Common SoC clock definitions. * diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h index 65742c4b7c..16af45c6e7 100644 --- a/arch/arm/mach-k3/include/mach/hardware.h +++ b/arch/arm/mach-k3/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/j721e_hardware.h b/arch/arm/mach-k3/include/mach/j721e_hardware.h index 376db389ba..105a2ea61c 100644 --- a/arch/arm/mach-k3/include/mach/j721e_hardware.h +++ b/arch/arm/mach-k3/include/mach/j721e_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: J721E SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/j721e_spl.h b/arch/arm/mach-k3/include/mach/j721e_spl.h index e8947917a6..5b89cd62bc 100644 --- a/arch/arm/mach-k3/include/mach/j721e_spl.h +++ b/arch/arm/mach-k3/include/mach/j721e_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/j721s2_hardware.h b/arch/arm/mach-k3/include/mach/j721s2_hardware.h index 7948bcf478..e1c6b528a2 100644 --- a/arch/arm/mach-k3/include/mach/j721s2_hardware.h +++ b/arch/arm/mach-k3/include/mach/j721s2_hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K3: J721S2 SoC definitions, structures etc. * diff --git a/arch/arm/mach-k3/include/mach/j721s2_spl.h b/arch/arm/mach-k3/include/mach/j721s2_spl.h index 94b6c1337f..2e93a072e4 100644 --- a/arch/arm/mach-k3/include/mach/j721s2_spl.h +++ b/arch/arm/mach-k3/include/mach/j721s2_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 Texas Instruments Incorporated - http://www.ti.com/ * David Huang <d-huang(a)ti.com> diff --git a/arch/arm/mach-k3/include/mach/spl.h b/arch/arm/mach-k3/include/mach/spl.h index 356cd89210..209c6aef0c 100644 --- a/arch/arm/mach-k3/include/mach/spl.h +++ b/arch/arm/mach-k3/include/mach/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/j7200/Makefile b/arch/arm/mach-k3/j7200/Makefile index ff9abd78ea..658eb70d03 100644 --- a/arch/arm/mach-k3/j7200/Makefile +++ b/arch/arm/mach-k3/j7200/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ obj-y += clk-data.o diff --git a/arch/arm/mach-k3/j7200/clk-data.c b/arch/arm/mach-k3/j7200/clk-data.c index 9b45786a2d..e88b790c33 100644 --- a/arch/arm/mach-k3/j7200/clk-data.c +++ b/arch/arm/mach-k3/j7200/clk-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J7200 specific clock platform data * diff --git a/arch/arm/mach-k3/j7200/dev-data.c b/arch/arm/mach-k3/j7200/dev-data.c index 8ce6796fd0..9aed8777d7 100644 --- a/arch/arm/mach-k3/j7200/dev-data.c +++ b/arch/arm/mach-k3/j7200/dev-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J7200 specific device platform data * diff --git a/arch/arm/mach-k3/j721e/Makefile b/arch/arm/mach-k3/j721e/Makefile index ff9abd78ea..658eb70d03 100644 --- a/arch/arm/mach-k3/j721e/Makefile +++ b/arch/arm/mach-k3/j721e/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ obj-y += clk-data.o diff --git a/arch/arm/mach-k3/j721e/clk-data.c b/arch/arm/mach-k3/j721e/clk-data.c index e4511092c8..dff461eedc 100644 --- a/arch/arm/mach-k3/j721e/clk-data.c +++ b/arch/arm/mach-k3/j721e/clk-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721E specific clock platform data * diff --git a/arch/arm/mach-k3/j721e/dev-data.c b/arch/arm/mach-k3/j721e/dev-data.c index b0adb1857b..01cb24934b 100644 --- a/arch/arm/mach-k3/j721e/dev-data.c +++ b/arch/arm/mach-k3/j721e/dev-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721E specific device platform data * diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c index b1f7e25ed0..6f4d3468f0 100644 --- a/arch/arm/mach-k3/j721e_init.c +++ b/arch/arm/mach-k3/j721e_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721E: SoC specific initialization * diff --git a/arch/arm/mach-k3/j721s2/Makefile b/arch/arm/mach-k3/j721s2/Makefile index 7bcd4901cd..c77298884f 100644 --- a/arch/arm/mach-k3/j721s2/Makefile +++ b/arch/arm/mach-k3/j721s2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 Texas Instruments Incorporated - http://www.ti.com/ obj-y += clk-data.o diff --git a/arch/arm/mach-k3/j721s2/clk-data.c b/arch/arm/mach-k3/j721s2/clk-data.c index 0c5c321c1e..299d32d1c2 100644 --- a/arch/arm/mach-k3/j721s2/clk-data.c +++ b/arch/arm/mach-k3/j721s2/clk-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721S2 specific clock platform data * diff --git a/arch/arm/mach-k3/j721s2/dev-data.c b/arch/arm/mach-k3/j721s2/dev-data.c index df70c5e5d7..f7623f277d 100644 --- a/arch/arm/mach-k3/j721s2/dev-data.c +++ b/arch/arm/mach-k3/j721s2/dev-data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721S2 specific device platform data * diff --git a/arch/arm/mach-k3/j721s2_init.c b/arch/arm/mach-k3/j721s2_init.c index a5be84b147..790369e3ff 100644 --- a/arch/arm/mach-k3/j721s2_init.c +++ b/arch/arm/mach-k3/j721s2_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * J721E: SoC specific initialization * diff --git a/arch/arm/mach-k3/lowlevel_init.S b/arch/arm/mach-k3/lowlevel_init.S index 70c5d1cade..47d1cc696d 100644 --- a/arch/arm/mach-k3/lowlevel_init.S +++ b/arch/arm/mach-k3/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/arch/arm/mach-k3/r5_mpu.c b/arch/arm/mach-k3/r5_mpu.c index 2aec96277e..c858f74e99 100644 --- a/arch/arm/mach-k3/r5_mpu.c +++ b/arch/arm/mach-k3/r5_mpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K3: R5 MPU region definitions * diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c index ef245fef9c..c74baa439b 100644 --- a/arch/arm/mach-k3/sysfw-loader.c +++ b/arch/arm/mach-k3/sysfw-loader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K3: System Firmware Loader * diff --git a/arch/arm/mach-k3/sysfw-loader.h b/arch/arm/mach-k3/sysfw-loader.h index b23a9e821e..31e513a3b6 100644 --- a/arch/arm/mach-k3/sysfw-loader.h +++ b/arch/arm/mach-k3/sysfw-loader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * Andreas Dannenberg <dannenberg(a)ti.com> diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile index 6c7c25090a..5c2625c244 100644 --- a/arch/arm/mach-keystone/Makefile +++ b/arch/arm/mach-keystone/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2012-2014 # Texas Instruments Incorporated, <www.ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += init.o diff --git a/arch/arm/mach-keystone/clock.c b/arch/arm/mach-keystone/clock.c index 0c59515d2e..8a0e8e3b46 100644 --- a/arch/arm/mach-keystone/clock.c +++ b/arch/arm/mach-keystone/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: pll initialization * diff --git a/arch/arm/mach-keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c index 72dc394df5..7623ebd4d1 100644 --- a/arch/arm/mach-keystone/cmd_clock.c +++ b/arch/arm/mach-keystone/cmd_clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * keystone2: commands for clocks * diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c index dc97bac855..f47407eba5 100644 --- a/arch/arm/mach-keystone/cmd_mon.c +++ b/arch/arm/mach-keystone/cmd_mon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2HK: secure kernel command file * diff --git a/arch/arm/mach-keystone/cmd_poweroff.c b/arch/arm/mach-keystone/cmd_poweroff.c index f0ad9173b9..8c4add9b48 100644 --- a/arch/arm/mach-keystone/cmd_poweroff.c +++ b/arch/arm/mach-keystone/cmd_poweroff.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone EVM : Power off * diff --git a/arch/arm/mach-keystone/config.mk b/arch/arm/mach-keystone/config.mk index 8eccbdb301..f23bd042c3 100644 --- a/arch/arm/mach-keystone/config.mk +++ b/arch/arm/mach-keystone/config.mk @@ -2,7 +2,7 @@ # # Lokesh Vutla <lokeshvutla(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include $(srctree)/arch/arm/mach-omap2/config_secure.mk diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c index ea7d0b903c..6ff027e854 100644 --- a/arch/arm/mach-keystone/ddr3.c +++ b/arch/arm/mach-keystone/ddr3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 initialization * diff --git a/arch/arm/mach-keystone/ddr3_spd.c b/arch/arm/mach-keystone/ddr3_spd.c index 6f7f8ab7b4..7a32be49d6 100644 --- a/arch/arm/mach-keystone/ddr3_spd.c +++ b/arch/arm/mach-keystone/ddr3_spd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 SPD configuration * diff --git a/arch/arm/mach-keystone/include/mach/clock-k2e.h b/arch/arm/mach-keystone/include/mach/clock-k2e.h index 8e16167ad4..73bcbbbe22 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2e.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2e.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2E: Clock management APIs * diff --git a/arch/arm/mach-keystone/include/mach/clock-k2g.h b/arch/arm/mach-keystone/include/mach/clock-k2g.h index 823aea8e74..aa9ff95f6f 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2g.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2g.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2G: Clock data * diff --git a/arch/arm/mach-keystone/include/mach/clock-k2hk.h b/arch/arm/mach-keystone/include/mach/clock-k2hk.h index 46dda879f1..6ffa8221c2 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2hk.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2hk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2HK: Clock management APIs * diff --git a/arch/arm/mach-keystone/include/mach/clock-k2l.h b/arch/arm/mach-keystone/include/mach/clock-k2l.h index e89715c7e9..9a210c1f96 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2l.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2l.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2L: Clock management APIs * diff --git a/arch/arm/mach-keystone/include/mach/clock.h b/arch/arm/mach-keystone/include/mach/clock.h index 7ce2469b02..96a2c2adc6 100644 --- a/arch/arm/mach-keystone/include/mach/clock.h +++ b/arch/arm/mach-keystone/include/mach/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * keystone2: common clock header file * diff --git a/arch/arm/mach-keystone/include/mach/clock_defs.h b/arch/arm/mach-keystone/include/mach/clock_defs.h index 336b103dc8..bb288918bb 100644 --- a/arch/arm/mach-keystone/include/mach/clock_defs.h +++ b/arch/arm/mach-keystone/include/mach/clock_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * keystone2: common pll clock definitions * (C) Copyright 2012-2014 diff --git a/arch/arm/mach-keystone/include/mach/ddr3.h b/arch/arm/mach-keystone/include/mach/ddr3.h index cb28068db7..4648c5c09c 100644 --- a/arch/arm/mach-keystone/include/mach/ddr3.h +++ b/arch/arm/mach-keystone/include/mach/ddr3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * DDR3 * diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2e.h b/arch/arm/mach-keystone/include/mach/hardware-k2e.h index a30c86057f..4fc2312ace 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2e.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2e.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2E: SoC definitions * diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2g.h b/arch/arm/mach-keystone/include/mach/hardware-k2g.h index 971c081bb3..cf5b56e865 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2g.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2g.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2G: SoC definitions * diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2hk.h b/arch/arm/mach-keystone/include/mach/hardware-k2hk.h index 3d078be991..a7f00f1379 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2hk.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2hk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2HK: SoC definitions * diff --git a/arch/arm/mach-keystone/include/mach/hardware-k2l.h b/arch/arm/mach-keystone/include/mach/hardware-k2l.h index 0e710a3795..877d24cd6f 100644 --- a/arch/arm/mach-keystone/include/mach/hardware-k2l.h +++ b/arch/arm/mach-keystone/include/mach/hardware-k2l.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2L: SoC definitions * diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h index 424c32a4be..e6c4c3439d 100644 --- a/arch/arm/mach-keystone/include/mach/hardware.h +++ b/arch/arm/mach-keystone/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Keystone2: Common SoC definitions, structures etc. * diff --git a/arch/arm/mach-keystone/include/mach/i2c_defs.h b/arch/arm/mach-keystone/include/mach/i2c_defs.h index 55251ee7f0..889af2df44 100644 --- a/arch/arm/mach-keystone/include/mach/i2c_defs.h +++ b/arch/arm/mach-keystone/include/mach/i2c_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * keystone: i2c driver definitions * diff --git a/arch/arm/mach-keystone/include/mach/mmc_host_def.h b/arch/arm/mach-keystone/include/mach/mmc_host_def.h index 120c7cc5c7..e6898b712a 100644 --- a/arch/arm/mach-keystone/include/mach/mmc_host_def.h +++ b/arch/arm/mach-keystone/include/mach/mmc_host_def.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2G: MMC * diff --git a/arch/arm/mach-keystone/include/mach/mon.h b/arch/arm/mach-keystone/include/mach/mon.h index e1bef216d9..e92f511b46 100644 --- a/arch/arm/mach-keystone/include/mach/mon.h +++ b/arch/arm/mach-keystone/include/mach/mon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2HK: secure kernel command header file * diff --git a/arch/arm/mach-keystone/include/mach/msmc.h b/arch/arm/mach-keystone/include/mach/msmc.h index 3fe09ea596..1f4dc59983 100644 --- a/arch/arm/mach-keystone/include/mach/msmc.h +++ b/arch/arm/mach-keystone/include/mach/msmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MSMC controller * diff --git a/arch/arm/mach-keystone/include/mach/mux-k2g.h b/arch/arm/mach-keystone/include/mach/mux-k2g.h index 67d47f8172..69bad6cde2 100644 --- a/arch/arm/mach-keystone/include/mach/mux-k2g.h +++ b/arch/arm/mach-keystone/include/mach/mux-k2g.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2G: Pinmux configuration * diff --git a/arch/arm/mach-keystone/include/mach/psc_defs.h b/arch/arm/mach-keystone/include/mach/psc_defs.h index f164f95bf2..97b0e63aea 100644 --- a/arch/arm/mach-keystone/include/mach/psc_defs.h +++ b/arch/arm/mach-keystone/include/mach/psc_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2014 * Texas Instruments Incorporated, <www.ti.com> diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c index 1954e69e9f..1fcd9e0310 100644 --- a/arch/arm/mach-keystone/init.c +++ b/arch/arm/mach-keystone/init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: Architecture initialization * diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index efaabca5a7..a0875b7aeb 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone EVM : Board initialization * diff --git a/arch/arm/mach-keystone/mon.c b/arch/arm/mach-keystone/mon.c index b863bab196..f0af9ed79b 100644 --- a/arch/arm/mach-keystone/mon.c +++ b/arch/arm/mach-keystone/mon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2x: Secure commands file * diff --git a/arch/arm/mach-keystone/msmc.c b/arch/arm/mach-keystone/msmc.c index f5cadfbf66..e6ec3b302d 100644 --- a/arch/arm/mach-keystone/msmc.c +++ b/arch/arm/mach-keystone/msmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MSMC controller utilities * diff --git a/arch/arm/mach-keystone/psc.c b/arch/arm/mach-keystone/psc.c index 145aff8ac6..a258d0bc47 100644 --- a/arch/arm/mach-keystone/psc.c +++ b/arch/arm/mach-keystone/psc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone: PSC configuration module * diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile index 0fb5a2326f..67ee642341 100644 --- a/arch/arm/mach-kirkwood/Makefile +++ b/arch/arm/mach-kirkwood/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/cache.c b/arch/arm/mach-kirkwood/cache.c index 009b7deeca..07e210d2e1 100644 --- a/arch/arm/mach-kirkwood/cache.c +++ b/arch/arm/mach-kirkwood/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 Michael Walle * Michael Walle <michael(a)walle.cc> diff --git a/arch/arm/mach-kirkwood/cpu.c b/arch/arm/mach-kirkwood/cpu.c index 2b493b36c2..2367adb5b5 100644 --- a/arch/arm/mach-kirkwood/cpu.c +++ b/arch/arm/mach-kirkwood/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index fbef9c99b1..8803673464 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/include/mach/cpu.h b/arch/arm/mach-kirkwood/include/mach/cpu.h index 9eec786fe8..4ec3745478 100644 --- a/arch/arm/mach-kirkwood/include/mach/cpu.h +++ b/arch/arm/mach-kirkwood/include/mach/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/include/mach/gpio.h b/arch/arm/mach-kirkwood/include/mach/gpio.h index cae7d55d72..2a7b72bf84 100644 --- a/arch/arm/mach-kirkwood/include/mach/gpio.h +++ b/arch/arm/mach-kirkwood/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * arch/asm-arm/mach-kirkwood/include/mach/gpio.h */ diff --git a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h index d3a3a83657..c7e9f4f5ef 100644 --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h index 67f0b3ec67..a4f7f3a110 100644 --- a/arch/arm/mach-kirkwood/include/mach/kw88f6281.h +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6281.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/include/mach/mpp.h b/arch/arm/mach-kirkwood/include/mach/mpp.h index 4d1f58c0cb..4cf341e270 100644 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins * diff --git a/arch/arm/mach-kirkwood/include/mach/soc.h b/arch/arm/mach-kirkwood/include/mach/soc.h index 4a7efc50f6..45cb51f8b2 100644 --- a/arch/arm/mach-kirkwood/include/mach/soc.h +++ b/arch/arm/mach-kirkwood/include/mach/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-kirkwood/lowlevel.S b/arch/arm/mach-kirkwood/lowlevel.S index 6810384954..c51dea9415 100644 --- a/arch/arm/mach-kirkwood/lowlevel.S +++ b/arch/arm/mach-kirkwood/lowlevel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> #include <linux/linkage.h> diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index 6303570bee..61ee5820c8 100644 --- a/arch/arm/mach-lpc32xx/Makefile +++ b/arch/arm/mach-lpc32xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-lpc32xx/clk.c b/arch/arm/mach-lpc32xx/clk.c index cb2344d79f..8323df8f68 100644 --- a/arch/arm/mach-lpc32xx/clk.c +++ b/arch/arm/mach-lpc32xx/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/mach-lpc32xx/cpu.c b/arch/arm/mach-lpc32xx/cpu.c index a97f9a1958..707c5db049 100644 --- a/arch/arm/mach-lpc32xx/cpu.c +++ b/arch/arm/mach-lpc32xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2015 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/mach-lpc32xx/devices.c b/arch/arm/mach-lpc32xx/devices.c index 6a67a3591a..14e94a5d90 100644 --- a/arch/arm/mach-lpc32xx/devices.c +++ b/arch/arm/mach-lpc32xx/devices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/mach-lpc32xx/dram.c b/arch/arm/mach-lpc32xx/dram.c index 1602237923..66f3b06851 100644 --- a/arch/arm/mach-lpc32xx/dram.c +++ b/arch/arm/mach-lpc32xx/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LPC32xx dram init * diff --git a/arch/arm/mach-lpc32xx/lowlevel_init.S b/arch/arm/mach-lpc32xx/lowlevel_init.S index d42da2bc56..c07883f5c7 100644 --- a/arch/arm/mach-lpc32xx/lowlevel_init.S +++ b/arch/arm/mach-lpc32xx/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * WORK Microwave work_92105 board low level init * diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c index 90183e3014..e90300432c 100644 --- a/arch/arm/mach-lpc32xx/timer.c +++ b/arch/arm/mach-lpc32xx/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/arm/mach-meson/Makefile b/arch/arm/mach-meson/Makefile index 535b0878b9..c5026b0353 100644 --- a/arch/arm/mach-meson/Makefile +++ b/arch/arm/mach-meson/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c index 967bb67182..9bb6d6335a 100644 --- a/arch/arm/mach-meson/board-a1.c +++ b/arch/arm/mach-meson/board-a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 SberDevices, Inc. */ diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index fdf18752cd..cd2914cf0c 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 7ceba7cede..a2da2bcb68 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d5a830fb1d..2a74dccc87 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index c3fbdfffea..bcc3635862 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c index 2421acd817..094a37f2fa 100644 --- a/arch/arm/mach-meson/board-info.c +++ b/arch/arm/mach-meson/board-info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Julien Masson <jmasson(a)baylibre.com> * (C) Copyright 2019 Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 914fd11c98..73316d78b7 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> * diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 0584ed2be5..34835ca5ce 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014-2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/arm/mach-mvebu/alleycat5/Makefile b/arch/arm/mach-mvebu/alleycat5/Makefile index b897ad089a..bbb7968314 100644 --- a/arch/arm/mach-mvebu/alleycat5/Makefile +++ b/arch/arm/mach-mvebu/alleycat5/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y = cpu.o diff --git a/arch/arm/mach-mvebu/alleycat5/cpu.c b/arch/arm/mach-mvebu/alleycat5/cpu.c index 8204d96275..62cb23a302 100644 --- a/arch/arm/mach-mvebu/alleycat5/cpu.c +++ b/arch/arm/mach-mvebu/alleycat5/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marvell International Ltd. */ diff --git a/arch/arm/mach-mvebu/alleycat5/soc.c b/arch/arm/mach-mvebu/alleycat5/soc.c index 734b0a87dd..c5f3cd478d 100644 --- a/arch/arm/mach-mvebu/alleycat5/soc.c +++ b/arch/arm/mach-mvebu/alleycat5/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marvell International Ltd. */ diff --git a/arch/arm/mach-mvebu/alleycat5/soc.h b/arch/arm/mach-mvebu/alleycat5/soc.h index 97663d2c01..a1d2fa6b62 100644 --- a/arch/arm/mach-mvebu/alleycat5/soc.h +++ b/arch/arm/mach-mvebu/alleycat5/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _ALLEYCAT5_SOC_H #define _ALLEYCAT5_SOC_H diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 4c67f1aba4..ae0382352a 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-mvebu/armada3700/Makefile b/arch/arm/mach-mvebu/armada3700/Makefile index 98350a41e0..6cc175116c 100644 --- a/arch/arm/mach-mvebu/armada3700/Makefile +++ b/arch/arm/mach-mvebu/armada3700/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index ab72b304e5..360bf86f6d 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> * Copyright (C) 2020 Marek Behún <kabel(a)kernel.org> diff --git a/arch/arm/mach-mvebu/armada3700/efuse.c b/arch/arm/mach-mvebu/armada3700/efuse.c index 07d5f39435..12e6430c89 100644 --- a/arch/arm/mach-mvebu/armada3700/efuse.c +++ b/arch/arm/mach-mvebu/armada3700/efuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2017 Marvell International Ltd. * (C) 2021 Pali Rohár <pali(a)kernel.org> diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c index 6555b8673c..50afe05dc1 100644 --- a/arch/arm/mach-mvebu/armada3700/mbox.c +++ b/arch/arm/mach-mvebu/armada3700/mbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> * Copyright (C) 2021 Pali Rohár <pali(a)kernel.org> diff --git a/arch/arm/mach-mvebu/armada8k/Makefile b/arch/arm/mach-mvebu/armada8k/Makefile index 0a4756717a..85f327371a 100644 --- a/arch/arm/mach-mvebu/armada8k/Makefile +++ b/arch/arm/mach-mvebu/armada8k/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 939abce000..dc0a8a8db0 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c index 6c801bfa1d..cdb78e986a 100644 --- a/arch/arm/mach-mvebu/armada8k/dram.c +++ b/arch/arm/mach-mvebu/armada8k/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 6deffb8183..2c95bdc053 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index d398d0f767..a31a8089d2 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-mvebu/efuse.c b/arch/arm/mach-mvebu/efuse.c index be5dc0e07d..691207e371 100644 --- a/arch/arm/mach-mvebu/efuse.c +++ b/arch/arm/mach-mvebu/efuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Reinhard Pfau <reinhard.pfau(a)gdsys.cc> */ diff --git a/arch/arm/mach-mvebu/gpio.c b/arch/arm/mach-mvebu/gpio.c index 1d1e3df8ba..08f40f1b74 100644 --- a/arch/arm/mach-mvebu/gpio.c +++ b/arch/arm/mach-mvebu/gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index 6102747548..d191e96c40 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index 904e7157ba..40bdbe697a 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-mvebu/include/mach/efuse.h b/arch/arm/mach-mvebu/include/mach/efuse.h index b125c30beb..dfe63321ab 100644 --- a/arch/arm/mach-mvebu/include/mach/efuse.h +++ b/arch/arm/mach-mvebu/include/mach/efuse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Reinhard Pfau <reinhard.pfau(a)gdsys.cc> */ diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h index b0c95db7f2..7e866a3b7c 100644 --- a/arch/arm/mach-mvebu/include/mach/gpio.h +++ b/arch/arm/mach-mvebu/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __MACH_MVEBU_GPIO_H #define __MACH_MVEBU_GPIO_H diff --git a/arch/arm/mach-mvebu/include/mach/mbox.h b/arch/arm/mach-mvebu/include/mach/mbox.h index fcc7a46c1d..a8c9d7b017 100644 --- a/arch/arm/mach-mvebu/include/mach/mbox.h +++ b/arch/arm/mach-mvebu/include/mach/mbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> * Copyright (C) 2021 Pali Rohár <pali(a)kernel.org> diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index dc68d406f9..ba312a53f7 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/arch/arm/mach-mvebu/lowlevel.S b/arch/arm/mach-mvebu/lowlevel.S index 6c9783aa63..1305ac33a3 100644 --- a/arch/arm/mach-mvebu/lowlevel.S +++ b/arch/arm/mach-mvebu/lowlevel.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> #include <linux/linkage.h> diff --git a/arch/arm/mach-mvebu/lowlevel_spl.S b/arch/arm/mach-mvebu/lowlevel_spl.S index 49891df9ea..fdd2fcc210 100644 --- a/arch/arm/mach-mvebu/lowlevel_spl.S +++ b/arch/arm/mach-mvebu/lowlevel_spl.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> #include <linux/linkage.h> diff --git a/arch/arm/mach-mvebu/serdes/a38x/Makefile b/arch/arm/mach-mvebu/serdes/a38x/Makefile index 5a70b37596..f6c1f07b36 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/Makefile +++ b/arch/arm/mach-mvebu/serdes/a38x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) += high_speed_env_spec.o obj-$(CONFIG_SPL_BUILD) += high_speed_env_spec-38x.o diff --git a/arch/arm/mach-mvebu/serdes/axp/Makefile b/arch/arm/mach-mvebu/serdes/axp/Makefile index 897afb703a..b0c08eef13 100644 --- a/arch/arm/mach-mvebu/serdes/axp/Makefile +++ b/arch/arm/mach-mvebu/serdes/axp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) = high_speed_env_lib.o obj-$(CONFIG_SPL_BUILD) += high_speed_env_spec.o diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 379daa88a4..714c530a9f 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c index 7cdde11cbd..079329cd07 100644 --- a/arch/arm/mach-mvebu/system-controller.c +++ b/arch/arm/mach-mvebu/system-controller.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // (C) 2021 Pali Rohár <pali(a)kernel.org> #include <common.h> diff --git a/arch/arm/mach-nexell/Makefile b/arch/arm/mach-nexell/Makefile index dda16dbb8e..1cd07b477c 100644 --- a/arch/arm/mach-nexell/Makefile +++ b/arch/arm/mach-nexell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/clock.c b/arch/arm/mach-nexell/clock.c index 59ffa26255..008541fd78 100644 --- a/arch/arm/mach-nexell/clock.c +++ b/arch/arm/mach-nexell/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/config.mk b/arch/arm/mach-nexell/config.mk index 7b0662699c..5ac7ed5e70 100644 --- a/arch/arm/mach-nexell/config.mk +++ b/arch/arm/mach-nexell/config.mk @@ -2,7 +2,7 @@ # (C) Copyright 2016 Nexell # junghyun kim<jhkim(a)nexell.co.kr> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # SOCDIR=CPUDIR/$(VENDOR) diff --git a/arch/arm/mach-nexell/include/mach/boot0.h b/arch/arm/mach-nexell/include/mach/boot0.h index 29f37d3ba4..bb35ff21d6 100644 --- a/arch/arm/mach-nexell/include/mach/boot0.h +++ b/arch/arm/mach-nexell/include/mach/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * NSIH (Nexell System Information Header) for FriendlyArm nanopi2 board * diff --git a/arch/arm/mach-nexell/include/mach/clk.h b/arch/arm/mach-nexell/include/mach/clk.h index cc5589adea..61e6aa604f 100644 --- a/arch/arm/mach-nexell/include/mach/clk.h +++ b/arch/arm/mach-nexell/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/display.h b/arch/arm/mach-nexell/include/mach/display.h index b0ee912605..52eb2d9971 100644 --- a/arch/arm/mach-nexell/include/mach/display.h +++ b/arch/arm/mach-nexell/include/mach/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/arch/arm/mach-nexell/include/mach/display_dev.h b/arch/arm/mach-nexell/include/mach/display_dev.h index 4c54a5ecd4..8cbc195d54 100644 --- a/arch/arm/mach-nexell/include/mach/display_dev.h +++ b/arch/arm/mach-nexell/include/mach/display_dev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/arch/arm/mach-nexell/include/mach/ehci.h b/arch/arm/mach-nexell/include/mach/ehci.h index 545153b145..971906a4d4 100644 --- a/arch/arm/mach-nexell/include/mach/ehci.h +++ b/arch/arm/mach-nexell/include/mach/ehci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * NEXELL USB HOST EHCI Controller * diff --git a/arch/arm/mach-nexell/include/mach/gpio.h b/arch/arm/mach-nexell/include/mach/gpio.h index 7167d3cf5b..368d3ce018 100644 --- a/arch/arm/mach-nexell/include/mach/gpio.h +++ b/arch/arm/mach-nexell/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * DeokJin, Lee <truevirtue(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/mipi_display.h b/arch/arm/mach-nexell/include/mach/mipi_display.h index f3fdec6464..8916e33004 100644 --- a/arch/arm/mach-nexell/include/mach/mipi_display.h +++ b/arch/arm/mach-nexell/include/mach/mipi_display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Defines for Mobile Industry Processor Interface (MIPI(R)) * Display Working Group standards: DSI, DCS, DBI, DPI diff --git a/arch/arm/mach-nexell/include/mach/nexell.h b/arch/arm/mach-nexell/include/mach/nexell.h index e42805fa01..8d44308a63 100644 --- a/arch/arm/mach-nexell/include/mach/nexell.h +++ b/arch/arm/mach-nexell/include/mach/nexell.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/nx_gpio.h b/arch/arm/mach-nexell/include/mach/nx_gpio.h index 91803d28cb..31ebfcc0dd 100644 --- a/arch/arm/mach-nexell/include/mach/nx_gpio.h +++ b/arch/arm/mach-nexell/include/mach/nx_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Youngbok, Park <ybpark(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/pwm.h b/arch/arm/mach-nexell/include/mach/pwm.h index 1e12058dd5..8a95c06fa8 100644 --- a/arch/arm/mach-nexell/include/mach/pwm.h +++ b/arch/arm/mach-nexell/include/mach/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/arch/arm/mach-nexell/include/mach/reset.h b/arch/arm/mach-nexell/include/mach/reset.h index e1301d4e53..b50f7db3bb 100644 --- a/arch/arm/mach-nexell/include/mach/reset.h +++ b/arch/arm/mach-nexell/include/mach/reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Youngbok, Park <ybpark(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/sec_reg.h b/arch/arm/mach-nexell/include/mach/sec_reg.h index e3ae5ac1bb..2a8bb1a88d 100644 --- a/arch/arm/mach-nexell/include/mach/sec_reg.h +++ b/arch/arm/mach-nexell/include/mach/sec_reg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/include/mach/tieoff.h b/arch/arm/mach-nexell/include/mach/tieoff.h index 70e9652b6d..628d495a73 100644 --- a/arch/arm/mach-nexell/include/mach/tieoff.h +++ b/arch/arm/mach-nexell/include/mach/tieoff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/nx_gpio.c b/arch/arm/mach-nexell/nx_gpio.c index dfba3a2374..b000e238d0 100644 --- a/arch/arm/mach-nexell/nx_gpio.c +++ b/arch/arm/mach-nexell/nx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Youngbok, Park <ybpark(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/nx_sec_reg.c b/arch/arm/mach-nexell/nx_sec_reg.c index 3d3dd9fd8b..bff0ba6652 100644 --- a/arch/arm/mach-nexell/nx_sec_reg.c +++ b/arch/arm/mach-nexell/nx_sec_reg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/reset.c b/arch/arm/mach-nexell/reset.c index 1f732a3d37..f4f3345e17 100644 --- a/arch/arm/mach-nexell/reset.c +++ b/arch/arm/mach-nexell/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/tieoff.c b/arch/arm/mach-nexell/tieoff.c index 5a4744c296..0cfbddd62d 100644 --- a/arch/arm/mach-nexell/tieoff.c +++ b/arch/arm/mach-nexell/tieoff.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/arch/arm/mach-nexell/timer.c b/arch/arm/mach-nexell/timer.c index 3b311fd22a..c6f02f129a 100644 --- a/arch/arm/mach-nexell/timer.c +++ b/arch/arm/mach-nexell/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/arch/arm/mach-npcm/npcm7xx/cpu.c b/arch/arm/mach-npcm/npcm7xx/cpu.c index dd74bb9e08..242c02c475 100644 --- a/arch/arm/mach-npcm/npcm7xx/cpu.c +++ b/arch/arm/mach-npcm/npcm7xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c index ed4b1ca5c9..9ad1b16004 100644 --- a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c +++ b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310_init.S b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310_init.S index 8ec4e374a5..5acb0ec920 100644 --- a/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310_init.S +++ b/arch/arm/mach-npcm/npcm7xx/l2_cache_pl310_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/arch/arm/mach-npcm/npcm8xx/cpu.c b/arch/arm/mach-npcm/npcm8xx/cpu.c index af59452609..62e4776dc8 100644 --- a/arch/arm/mach-npcm/npcm8xx/cpu.c +++ b/arch/arm/mach-npcm/npcm8xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/arch/arm/mach-npcm/npcm8xx/reset.c b/arch/arm/mach-npcm/npcm8xx/reset.c index 6954e6c6a1..3738b93e82 100644 --- a/arch/arm/mach-npcm/npcm8xx/reset.c +++ b/arch/arm/mach-npcm/npcm8xx/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index bb01eab80e..934f13c1b4 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-omap2/abb.c b/arch/arm/mach-omap2/abb.c index 722e6db056..6b5243b09a 100644 --- a/arch/arm/mach-omap2/abb.c +++ b/arch/arm/mach-omap2/abb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Adaptive Body Bias programming sequence for OMAP family * diff --git a/arch/arm/mach-omap2/am33xx/Makefile b/arch/arm/mach-omap2/am33xx/Makefile index 2aa8013527..209d843dab 100644 --- a/arch/arm/mach-omap2/am33xx/Makefile +++ b/arch/arm/mach-omap2/am33xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 06b4129773..cf95710cda 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c index 459bac13e0..8919df5994 100644 --- a/arch/arm/mach-omap2/am33xx/chilisom.c +++ b/arch/arm/mach-omap2/am33xx/chilisom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ * Copyright (C) 2017, Grinn - http://grinn-global.com/ diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c index c9b9502aef..8e27914f77 100644 --- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c +++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * clk-synthesizer.c * diff --git a/arch/arm/mach-omap2/am33xx/clock.c b/arch/arm/mach-omap2/am33xx/clock.c index 130ee6c6e3..848132e95b 100644 --- a/arch/arm/mach-omap2/am33xx/clock.c +++ b/arch/arm/mach-omap2/am33xx/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * clock.c * diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c index cd3b34bf56..87eaad041f 100644 --- a/arch/arm/mach-omap2/am33xx/clock_am33xx.c +++ b/arch/arm/mach-omap2/am33xx/clock_am33xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * clock_am33xx.c * diff --git a/arch/arm/mach-omap2/am33xx/clock_am43xx.c b/arch/arm/mach-omap2/am33xx/clock_am43xx.c index b98bb9989c..3e7c591cf6 100644 --- a/arch/arm/mach-omap2/am33xx/clock_am43xx.c +++ b/arch/arm/mach-omap2/am33xx/clock_am43xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * clock_am43xx.c * diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c index 5f970d93f0..2b0213d980 100644 --- a/arch/arm/mach-omap2/am33xx/ddr.c +++ b/arch/arm/mach-omap2/am33xx/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DDR Configuration for AM33xx devices. * diff --git a/arch/arm/mach-omap2/am33xx/emif4.c b/arch/arm/mach-omap2/am33xx/emif4.c index bf3da43ed9..dbc346de79 100644 --- a/arch/arm/mach-omap2/am33xx/emif4.c +++ b/arch/arm/mach-omap2/am33xx/emif4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * emif4.c * diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c index 2ec30b1f9c..fb93f85065 100644 --- a/arch/arm/mach-omap2/am33xx/fdt.c +++ b/arch/arm/mach-omap2/am33xx/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Texas Instruments, Inc. */ diff --git a/arch/arm/mach-omap2/am33xx/hw_data.c b/arch/arm/mach-omap2/am33xx/hw_data.c index e9e5415bea..48de952536 100644 --- a/arch/arm/mach-omap2/am33xx/hw_data.c +++ b/arch/arm/mach-omap2/am33xx/hw_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * HW data initialization for AM33xx. * diff --git a/arch/arm/mach-omap2/am33xx/prcm-regs.c b/arch/arm/mach-omap2/am33xx/prcm-regs.c index d4c661e5a8..1b26328f2d 100644 --- a/arch/arm/mach-omap2/am33xx/prcm-regs.c +++ b/arch/arm/mach-omap2/am33xx/prcm-regs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * HW regs data for AM33xx. * diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c index 338f6afcae..a08172b04d 100644 --- a/arch/arm/mach-omap2/am33xx/sys_info.c +++ b/arch/arm/mach-omap2/am33xx/sys_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sys_info.c * diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index a2dd5f6df0..6b32c0a34c 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * boot-common.c * diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 390d1f2a64..ebe1d2e9b9 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Clock initialization for OMAP4 diff --git a/arch/arm/mach-omap2/config.mk b/arch/arm/mach-omap2/config.mk index 4f0d2598fa..fd8e0eb904 100644 --- a/arch/arm/mach-omap2/config.mk +++ b/arch/arm/mach-omap2/config.mk @@ -1,7 +1,7 @@ # # Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later include $(srctree)/arch/arm/mach-omap2/config_secure.mk diff --git a/arch/arm/mach-omap2/config_secure.mk b/arch/arm/mach-omap2/config_secure.mk index f76262bb0c..ef45bcdccb 100644 --- a/arch/arm/mach-omap2/config_secure.mk +++ b/arch/arm/mach-omap2/config_secure.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016, Texas Instruments, Incorporated - http://www.ti.com/ quiet_cmd_mkomapsecimg = SECURE $@ diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index 9daaeef731..43d47f828a 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EMIF programming * diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c index e90d577670..0d51b6f523 100644 --- a/arch/arm/mach-omap2/fdt-common.c +++ b/arch/arm/mach-omap2/fdt-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016-2017 Texas Instruments, Inc. */ diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c index 0e4572ca41..fe55a772d7 100644 --- a/arch/arm/mach-omap2/hwinit-common.c +++ b/arch/arm/mach-omap2/hwinit-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common functions for OMAP4/5 based boards diff --git a/arch/arm/mach-omap2/lowlevel_init.S b/arch/arm/mach-omap2/lowlevel_init.S index 1a55295f9d..9191567c9c 100644 --- a/arch/arm/mach-omap2/lowlevel_init.S +++ b/arch/arm/mach-omap2/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board specific setup info * diff --git a/arch/arm/mach-omap2/mem-common.c b/arch/arm/mach-omap2/mem-common.c index 19197482aa..e798daf47b 100644 --- a/arch/arm/mach-omap2/mem-common.c +++ b/arch/arm/mach-omap2/mem-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c index 36db588243..de2b156540 100644 --- a/arch/arm/mach-omap2/omap-cache.c +++ b/arch/arm/mach-omap2/omap-cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common functions for OMAP4/5 based boards diff --git a/arch/arm/mach-omap2/omap3/Makefile b/arch/arm/mach-omap2/omap3/Makefile index 151bdf6ebc..714145a938 100644 --- a/arch/arm/mach-omap2/omap3/Makefile +++ b/arch/arm/mach-omap2/omap3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-omap2/omap3/am35x_musb.c b/arch/arm/mach-omap2/omap3/am35x_musb.c index 1121acc005..a0f792629a 100644 --- a/arch/arm/mach-omap2/omap3/am35x_musb.c +++ b/arch/arm/mach-omap2/omap3/am35x_musb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file configures the internal USB PHY in AM35X. * diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 8b70251457..361bb7980f 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common board functions for OMAP3 based boards. diff --git a/arch/arm/mach-omap2/omap3/boot.c b/arch/arm/mach-omap2/omap3/boot.c index ea26115b71..8e61198a88 100644 --- a/arch/arm/mach-omap2/omap3/boot.c +++ b/arch/arm/mach-omap2/omap3/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP3 boot * diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c index 13685e0567..ee5be08beb 100644 --- a/arch/arm/mach-omap2/omap3/clock.c +++ b/arch/arm/mach-omap2/omap3/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c index d0d0b7a75a..746d228983 100644 --- a/arch/arm/mach-omap2/omap3/emac.c +++ b/arch/arm/mach-omap2/omap3/emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * DaVinci EMAC initialization. diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c index 491e7c23db..ec75074955 100644 --- a/arch/arm/mach-omap2/omap3/emif4.c +++ b/arch/arm/mach-omap2/omap3/emif4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Author : * Vaibhav Hiremath <hvaibhav(a)ti.com> diff --git a/arch/arm/mach-omap2/omap3/hw_data.c b/arch/arm/mach-omap2/omap3/hw_data.c index 1d21fcc597..314138b9df 100644 --- a/arch/arm/mach-omap2/omap3/hw_data.c +++ b/arch/arm/mach-omap2/omap3/hw_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * HW data initialization for OMAP3. * diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S b/arch/arm/mach-omap2/omap3/lowlevel_init.S index 1ab9472e19..6e36e8d3a7 100644 --- a/arch/arm/mach-omap2/omap3/lowlevel_init.S +++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board specific setup info * diff --git a/arch/arm/mach-omap2/omap3/prcm-regs.c b/arch/arm/mach-omap2/omap3/prcm-regs.c index e704c8eef1..7ae6c890f2 100644 --- a/arch/arm/mach-omap2/omap3/prcm-regs.c +++ b/arch/arm/mach-omap2/omap3/prcm-regs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * HW regs data for OMAP3. * diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c index 07f534a60b..f4ccfedc90 100644 --- a/arch/arm/mach-omap2/omap3/sdrc.c +++ b/arch/arm/mach-omap2/omap3/sdrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Functions related to OMAP3 SDRC. * diff --git a/arch/arm/mach-omap2/omap3/spl_id_nand.c b/arch/arm/mach-omap2/omap3/spl_id_nand.c index 84a0b0ade9..87942c888e 100644 --- a/arch/arm/mach-omap2/omap3/spl_id_nand.c +++ b/arch/arm/mach-omap2/omap3/spl_id_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-omap2/omap3/sys_info.c b/arch/arm/mach-omap2/omap3/sys_info.c index 5f535e2782..a81a28b525 100644 --- a/arch/arm/mach-omap2/omap3/sys_info.c +++ b/arch/arm/mach-omap2/omap3/sys_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-omap2/omap4/Makefile b/arch/arm/mach-omap2/omap4/Makefile index 0ed3fc768d..617ecb453c 100644 --- a/arch/arm/mach-omap2/omap4/Makefile +++ b/arch/arm/mach-omap2/omap4/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-omap2/omap4/boot.c b/arch/arm/mach-omap2/omap4/boot.c index 90b5380ae3..84fce98aa6 100644 --- a/arch/arm/mach-omap2/omap4/boot.c +++ b/arch/arm/mach-omap2/omap4/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP4 boot * diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c index 35a51645be..8d07485118 100644 --- a/arch/arm/mach-omap2/omap4/emif.c +++ b/arch/arm/mach-omap2/omap4/emif.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EMIF programming * diff --git a/arch/arm/mach-omap2/omap4/hw_data.c b/arch/arm/mach-omap2/omap4/hw_data.c index d587a4d4de..e767061968 100644 --- a/arch/arm/mach-omap2/omap4/hw_data.c +++ b/arch/arm/mach-omap2/omap4/hw_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * HW data initialization for OMAP4 diff --git a/arch/arm/mach-omap2/omap4/hwinit.c b/arch/arm/mach-omap2/omap4/hwinit.c index 27dfa9142d..9b01446916 100644 --- a/arch/arm/mach-omap2/omap4/hwinit.c +++ b/arch/arm/mach-omap2/omap4/hwinit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common functions for OMAP4 based boards diff --git a/arch/arm/mach-omap2/omap4/prcm-regs.c b/arch/arm/mach-omap2/omap4/prcm-regs.c index eaf98b3891..fe662d4afd 100644 --- a/arch/arm/mach-omap2/omap4/prcm-regs.c +++ b/arch/arm/mach-omap2/omap4/prcm-regs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * HW regs data for OMAP4 diff --git a/arch/arm/mach-omap2/omap4/sdram_elpida.c b/arch/arm/mach-omap2/omap4/sdram_elpida.c index 2a18cf0215..21d7f47147 100644 --- a/arch/arm/mach-omap2/omap4/sdram_elpida.c +++ b/arch/arm/mach-omap2/omap4/sdram_elpida.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Timing and Organization details of the Elpida parts used in OMAP4 * SDPs and Panda diff --git a/arch/arm/mach-omap2/omap5/Makefile b/arch/arm/mach-omap2/omap5/Makefile index 592e026ed2..2afa00d352 100644 --- a/arch/arm/mach-omap2/omap5/Makefile +++ b/arch/arm/mach-omap2/omap5/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-omap2/omap5/abb.c b/arch/arm/mach-omap2/omap5/abb.c index 2f9f8e65d0..f43d43a5ef 100644 --- a/arch/arm/mach-omap2/omap5/abb.c +++ b/arch/arm/mach-omap2/omap5/abb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Adaptive Body Bias programming sequence for OMAP5 family * diff --git a/arch/arm/mach-omap2/omap5/boot.c b/arch/arm/mach-omap2/omap5/boot.c index 15d6836c6e..853fbdffb7 100644 --- a/arch/arm/mach-omap2/omap5/boot.c +++ b/arch/arm/mach-omap2/omap5/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP5 boot * diff --git a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c index 8569eff31a..b1f051d311 100644 --- a/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +++ b/arch/arm/mach-omap2/omap5/dra7xx_iodelay.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Texas Instruments Incorporated, <www.ti.com> diff --git a/arch/arm/mach-omap2/omap5/emif.c b/arch/arm/mach-omap2/omap5/emif.c index 2de36b6fec..e1c20dbd2b 100644 --- a/arch/arm/mach-omap2/omap5/emif.c +++ b/arch/arm/mach-omap2/omap5/emif.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EMIF programming * diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index a8c301c6c2..2a7a0cd276 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Texas Instruments, Inc. */ diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c index e6bee48dfc..32d60fe069 100644 --- a/arch/arm/mach-omap2/omap5/hw_data.c +++ b/arch/arm/mach-omap2/omap5/hw_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * HW data initialization for OMAP5 diff --git a/arch/arm/mach-omap2/omap5/hwinit.c b/arch/arm/mach-omap2/omap5/hwinit.c index edab9a9298..122c6b1fe3 100644 --- a/arch/arm/mach-omap2/omap5/hwinit.c +++ b/arch/arm/mach-omap2/omap5/hwinit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Functions for omap5 based boards. diff --git a/arch/arm/mach-omap2/omap5/prcm-regs.c b/arch/arm/mach-omap2/omap5/prcm-regs.c index d7196a3156..e8c56ad2af 100644 --- a/arch/arm/mach-omap2/omap5/prcm-regs.c +++ b/arch/arm/mach-omap2/omap5/prcm-regs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * HW regs data for OMAP5 Soc diff --git a/arch/arm/mach-omap2/omap5/sdram.c b/arch/arm/mach-omap2/omap5/sdram.c index 786da45fac..02dc589642 100644 --- a/arch/arm/mach-omap2/omap5/sdram.c +++ b/arch/arm/mach-omap2/omap5/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Timing and Organization details of the ddr device parts used in OMAP5 * EVM diff --git a/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S b/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S index 32de9d3d4f..263b81a569 100644 --- a/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S +++ b/arch/arm/mach-omap2/omap5/sec_entry_cpu1.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Secure entry function for CPU Core #1 * diff --git a/arch/arm/mach-omap2/pipe3-phy.c b/arch/arm/mach-omap2/pipe3-phy.c index 3dfb184c43..c79719a18a 100644 --- a/arch/arm/mach-omap2/pipe3-phy.c +++ b/arch/arm/mach-omap2/pipe3-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI PIPE3 PHY * diff --git a/arch/arm/mach-omap2/pipe3-phy.h b/arch/arm/mach-omap2/pipe3-phy.h index 182bdcd4c8..01f0ec0065 100644 --- a/arch/arm/mach-omap2/pipe3-phy.h +++ b/arch/arm/mach-omap2/pipe3-phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * TI PIPE3 PHY * diff --git a/arch/arm/mach-omap2/reset.c b/arch/arm/mach-omap2/reset.c index 1fd79c2e8a..7815ced4dd 100644 --- a/arch/arm/mach-omap2/reset.c +++ b/arch/arm/mach-omap2/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common layer for reset related functionality of OMAP based socs. diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c index 53c39ce1fb..9998102711 100644 --- a/arch/arm/mach-omap2/sata.c +++ b/arch/arm/mach-omap2/sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI SATA platform driver * diff --git a/arch/arm/mach-omap2/sec-common.c b/arch/arm/mach-omap2/sec-common.c index 64560b21e3..4b8b0a1369 100644 --- a/arch/arm/mach-omap2/sec-common.c +++ b/arch/arm/mach-omap2/sec-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Common security related functions for OMAP devices diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c index 49bc3a634f..7f36d131e4 100644 --- a/arch/arm/mach-omap2/sysinfo-common.c +++ b/arch/arm/mach-omap2/sysinfo-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * System information routines for all OMAP based boards. * diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 71fdf5bf48..1f0edd7eb6 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Texas Instruments diff --git a/arch/arm/mach-omap2/u-boot-spl.lds b/arch/arm/mach-omap2/u-boot-spl.lds index 1d6e5d45b4..355f395d0e 100644 --- a/arch/arm/mach-omap2/u-boot-spl.lds +++ b/arch/arm/mach-omap2/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 0623281a3c..dd7f2d6d0c 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Linaro Limited * Aneesh V <aneesh(a)ti.com> diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index a8b87f6d71..a5bd2ac1fa 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> # diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c index ffae9a01e3..4e67353122 100644 --- a/arch/arm/mach-orion5x/cpu.c +++ b/arch/arm/mach-orion5x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/dram.c b/arch/arm/mach-orion5x/dram.c index 5647f847d7..15ec284ecc 100644 --- a/arch/arm/mach-orion5x/dram.c +++ b/arch/arm/mach-orion5x/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/include/mach/cpu.h b/arch/arm/mach-orion5x/include/mach/cpu.h index c3ff89669e..e212e5d47c 100644 --- a/arch/arm/mach-orion5x/include/mach/cpu.h +++ b/arch/arm/mach-orion5x/include/mach/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/include/mach/mv88f5182.h b/arch/arm/mach-orion5x/include/mach/mv88f5182.h index ee0aa94bf2..b361360aed 100644 --- a/arch/arm/mach-orion5x/include/mach/mv88f5182.h +++ b/arch/arm/mach-orion5x/include/mach/mv88f5182.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h index e41d07e18c..a0dd2612ce 100644 --- a/arch/arm/mach-orion5x/include/mach/orion5x.h +++ b/arch/arm/mach-orion5x/include/mach/orion5x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/lowlevel_init.S b/arch/arm/mach-orion5x/lowlevel_init.S index aa3fcf7c30..d5afe0ded2 100644 --- a/arch/arm/mach-orion5x/lowlevel_init.S +++ b/arch/arm/mach-orion5x/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c index b373e59e6f..d347ef0a68 100644 --- a/arch/arm/mach-orion5x/timer.c +++ b/arch/arm/mach-orion5x/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-orion5x/u-boot-spl.lds b/arch/arm/mach-orion5x/u-boot-spl.lds index 154bb12060..c24f617baf 100644 --- a/arch/arm/mach-orion5x/u-boot-spl.lds +++ b/arch/arm/mach-orion5x/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile index f3a69ebf15..6107774520 100644 --- a/arch/arm/mach-owl/Makefile +++ b/arch/arm/mach-owl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += soc.o obj-$(CONFIG_ARM64) += sysmap-owl.o diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c index f0f46f2dcb..c77f52b128 100644 --- a/arch/arm/mach-owl/soc.c +++ b/arch/arm/mach-owl/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Actions Semi Owl SoCs platform support. * diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c index 81f6ca2e49..c9e399d541 100644 --- a/arch/arm/mach-owl/sysmap-owl.c +++ b/arch/arm/mach-owl/sysmap-owl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Memory map for Actions Semi Owl series SoCs. * diff --git a/arch/arm/mach-rmobile/Kconfig.rzg2l b/arch/arm/mach-rmobile/Kconfig.rzg2l index dc30bdf3e5..3cdc46b50c 100644 --- a/arch/arm/mach-rmobile/Kconfig.rzg2l +++ b/arch/arm/mach-rmobile/Kconfig.rzg2l @@ -1,5 +1,5 @@ # Copyright (C) 2023 Renesas Electronics Corporation -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later if RZG2L diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile index ff8b0c7bae..b5dd38bc1c 100644 --- a/arch/arm/mach-rmobile/Makefile +++ b/arch/arm/mach-rmobile/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index a10371f74e..99424a4d12 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> * (C) Copyright 2012 Renesas Solutions Corp. diff --git a/arch/arm/mach-rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c index dcbe25f37a..66453aa7ce 100644 --- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c +++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> * (C) Copyright 2012 Renesas Solutions Corp. diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 6804b1da2c..5ec49ed272 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> * (C) Copyright 2012-2021 Renesas Solutions Corp. diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c index cb9bce0cf2..ef2304d775 100644 --- a/arch/arm/mach-rmobile/emac.c +++ b/arch/arm/mach-rmobile/emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RMOBILE EtherMAC initialization. * diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h index ca1274272d..7c4816b2f9 100644 --- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h +++ b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ./arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h * diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h b/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h index ac57698849..9ce3a90ad2 100644 --- a/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h +++ b/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ./arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h * diff --git a/arch/arm/mach-rmobile/include/mach/rzg2l.h b/arch/arm/mach-rmobile/include/mach/rzg2l.h index 057df5cb9d..99a7d698cb 100644 --- a/arch/arm/mach-rmobile/include/mach/rzg2l.h +++ b/arch/arm/mach-rmobile/include/mach/rzg2l.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RZ/G2L SoC Family support. * Copyright (C) 2023 Renesas Electronics Corporation diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-rmobile/include/mach/sys_proto.h index ec8036a354..5bd813d535 100644 --- a/arch/arm/mach-rmobile/include/mach/sys_proto.h +++ b/arch/arm/mach-rmobile/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/arch/arm/mach-rmobile/lowlevel_init.S b/arch/arm/mach-rmobile/lowlevel_init.S index 212e95539b..bcb5d1a707 100644 --- a/arch/arm/mach-rmobile/lowlevel_init.S +++ b/arch/arm/mach-rmobile/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.Iwamatsu.yj(a)renesas.com> * Copyright (C) 2012 Renesas Solutions Corp. diff --git a/arch/arm/mach-rmobile/lowlevel_init_gen3.S b/arch/arm/mach-rmobile/lowlevel_init_gen3.S index 0d7780031a..45c955bc97 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_gen3.S +++ b/arch/arm/mach-rmobile/lowlevel_init_gen3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * arch/arm/cpu/armv8/rcar_gen3/lowlevel_init.S * This file is lowlevel initialize routine. diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index a68eb806b3..ad6de6f746 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen3 memory map tables * diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach-rmobile/memmap-rzg2l.c index a08d0ea08f..b4babfb504 100644 --- a/arch/arm/mach-rmobile/memmap-rzg2l.c +++ b/arch/arm/mach-rmobile/memmap-rzg2l.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RZ/G2L family memory map tables * diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index 1dc92066bb..00c67bb7f2 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Google, Inc # Copyright (c) 2019 Rockchip Electronics Co., Ltd. diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 57f08e0be0..6cf74cac88 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index eb8f65ae4e..c092087727 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/bootrom.c b/arch/arm/mach-rockchip/bootrom.c index b36e559e87..cdef97fb0d 100644 --- a/arch/arm/mach-rockchip/bootrom.c +++ b/arch/arm/mach-rockchip/bootrom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright (c) 2017 Google, Inc */ diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index dac24910e0..ac3306397f 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * (C) Copyright 2019 Amarula Solutions(India) * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 7d03f0c2b6..5c4b726d96 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RK3399: Architecture common definitions * diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c index 637a5e1b18..58988f0e25 100644 --- a/arch/arm/mach-rockchip/px30-board-tpl.c +++ b/arch/arm/mach-rockchip/px30-board-tpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/px30/Makefile b/arch/arm/mach-rockchip/px30/Makefile index 080ce146f7..0dcffb8c79 100644 --- a/arch/arm/mach-rockchip/px30/Makefile +++ b/arch/arm/mach-rockchip/px30/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2017 Rockchip Electronics Co., Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_px30.o diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c index 73f6d241a1..c4810a5d66 100644 --- a/arch/arm/mach-rockchip/rk3036-board-spl.c +++ b/arch/arm/mach-rockchip/rk3036-board-spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015-2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3036/Makefile b/arch/arm/mach-rockchip/rk3036/Makefile index 299fc50635..15b4f1f2aa 100644 --- a/arch/arm/mach-rockchip/rk3036/Makefile +++ b/arch/arm/mach-rockchip/rk3036/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2015 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk3036.o diff --git a/arch/arm/mach-rockchip/rk3036/clk_rk3036.c b/arch/arm/mach-rockchip/rk3036/clk_rk3036.c index 116dccd7b8..01d914762f 100644 --- a/arch/arm/mach-rockchip/rk3036/clk_rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/clk_rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3036/rk3036.c b/arch/arm/mach-rockchip/rk3036/rk3036.c index 0a072cf03a..81b8f63c4a 100644 --- a/arch/arm/mach-rockchip/rk3036/rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c index fcae65b2e5..834e140596 100644 --- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c b/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c index c2fd160799..ed35fbb959 100644 --- a/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c +++ b/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3066/Makefile b/arch/arm/mach-rockchip/rk3066/Makefile index 9e2a9d4b0a..06a2cd0186 100644 --- a/arch/arm/mach-rockchip/rk3066/Makefile +++ b/arch/arm/mach-rockchip/rk3066/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += clk_rk3066.o obj-y += rk3066.o diff --git a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c index c47526dca5..06efd0d6dc 100644 --- a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c index 78c7d894f9..b626f9b587 100644 --- a/arch/arm/mach-rockchip/rk3066/rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/rk3066.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c index a598f6400d..bfc25dab3f 100644 --- a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c +++ b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3128/Makefile b/arch/arm/mach-rockchip/rk3128/Makefile index 50e1117542..bfa504821d 100644 --- a/arch/arm/mach-rockchip/rk3128/Makefile +++ b/arch/arm/mach-rockchip/rk3128/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2017 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += rk3128.o diff --git a/arch/arm/mach-rockchip/rk3128/clk_rk3128.c b/arch/arm/mach-rockchip/rk3128/clk_rk3128.c index a1b038c648..3c28a4892e 100644 --- a/arch/arm/mach-rockchip/rk3128/clk_rk3128.c +++ b/arch/arm/mach-rockchip/rk3128/clk_rk3128.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c index 01dbfa75cb..6e1704471b 100644 --- a/arch/arm/mach-rockchip/rk3128/rk3128.c +++ b/arch/arm/mach-rockchip/rk3128/rk3128.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c b/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c index 1406d5d0d3..669c7190e4 100644 --- a/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c +++ b/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3188/Makefile b/arch/arm/mach-rockchip/rk3188/Makefile index 7dc123a3d2..e16836cf0e 100644 --- a/arch/arm/mach-rockchip/rk3188/Makefile +++ b/arch/arm/mach-rockchip/rk3188/Makefile @@ -1,7 +1,7 @@ # # Copyright (c) 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifndef CONFIG_TPL_BUILD diff --git a/arch/arm/mach-rockchip/rk3188/clk_rk3188.c b/arch/arm/mach-rockchip/rk3188/clk_rk3188.c index 94d1d23e1f..ffaa3ca256 100644 --- a/arch/arm/mach-rockchip/rk3188/clk_rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/clk_rk3188.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index c807221f33..7359e150e7 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c index 917ff37c0f..15a7b82f7b 100644 --- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk322x/Makefile b/arch/arm/mach-rockchip/rk322x/Makefile index 89b0fed692..b5e03bfb29 100644 --- a/arch/arm/mach-rockchip/rk322x/Makefile +++ b/arch/arm/mach-rockchip/rk322x/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2017 Rockchip Electronics Co., Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk322x.o diff --git a/arch/arm/mach-rockchip/rk322x/clk_rk322x.c b/arch/arm/mach-rockchip/rk322x/clk_rk322x.c index 2e57672b24..c06973f6f6 100644 --- a/arch/arm/mach-rockchip/rk322x/clk_rk322x.c +++ b/arch/arm/mach-rockchip/rk322x/clk_rk322x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c index a304795fec..86adcb69c5 100644 --- a/arch/arm/mach-rockchip/rk322x/rk322x.c +++ b/arch/arm/mach-rockchip/rk322x/rk322x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c b/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c index 0d9dca8173..722956f7b9 100644 --- a/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c +++ b/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3288/Makefile b/arch/arm/mach-rockchip/rk3288/Makefile index a0033a0d84..1a3c6a7e1e 100644 --- a/arch/arm/mach-rockchip/rk3288/Makefile +++ b/arch/arm/mach-rockchip/rk3288/Makefile @@ -1,7 +1,7 @@ # # Copyright (c) 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk3288.o diff --git a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c index fb4c0891d0..2d527b8495 100644 --- a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c index 26c7e41cd8..d959cd3ae1 100644 --- a/arch/arm/mach-rockchip/rk3288/rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c index 8b2c2f323a..2393113762 100644 --- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3308/Makefile b/arch/arm/mach-rockchip/rk3308/Makefile index ce4d44bb34..f7962d0599 100644 --- a/arch/arm/mach-rockchip/rk3308/Makefile +++ b/arch/arm/mach-rockchip/rk3308/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2018 Rockchip Electronics Co., Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += syscon_rk3308.o diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c index 5763604dc3..9daef291c4 100644 --- a/arch/arm/mach-rockchip/rk3308/rk3308.c +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* *Copyright (c) 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c b/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c index b380ff5723..59af7388ee 100644 --- a/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c +++ b/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3328/Makefile b/arch/arm/mach-rockchip/rk3328/Makefile index bbab036a12..0ffcc4dd76 100644 --- a/arch/arm/mach-rockchip/rk3328/Makefile +++ b/arch/arm/mach-rockchip/rk3328/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk3328.o diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index de17b88682..54d2f09ff3 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c b/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c index daf74a0e2d..319009b741 100644 --- a/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3368/Makefile b/arch/arm/mach-rockchip/rk3368/Makefile index 5910f20bff..db9bd76b2f 100644 --- a/arch/arm/mach-rockchip/rk3368/Makefile +++ b/arch/arm/mach-rockchip/rk3368/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Andreas Färber obj-y += clk_rk3368.o diff --git a/arch/arm/mach-rockchip/rk3368/clk_rk3368.c b/arch/arm/mach-rockchip/rk3368/clk_rk3368.c index b075319720..d539690c56 100644 --- a/arch/arm/mach-rockchip/rk3368/clk_rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/clk_rk3368.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Rockchip Electronics Co., Ltd * Author: Andy Yan <andy.yan(a)rock-chips.org> diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c index d0a6107e5e..dc912f3ab4 100644 --- a/arch/arm/mach-rockchip/rk3368/rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Rockchip Electronics Co., Ltd * Copyright (c) 2016 Andreas Färber diff --git a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c index dc2d831dd8..4777edf435 100644 --- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd * Author: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/arch/arm/mach-rockchip/rk3399/Makefile b/arch/arm/mach-rockchip/rk3399/Makefile index 98ebeac340..d7bd4e6cd4 100644 --- a/arch/arm/mach-rockchip/rk3399/Makefile +++ b/arch/arm/mach-rockchip/rk3399/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk3399.o diff --git a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c index 9d9a837fc7..ff8a21629f 100644 --- a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 14565d2ed9..1581f05c9a 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c index 2b5746cb31..fd7cbd0e90 100644 --- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3568/Makefile b/arch/arm/mach-rockchip/rk3568/Makefile index 28c1f4ee5c..779775e506 100644 --- a/arch/arm/mach-rockchip/rk3568/Makefile +++ b/arch/arm/mach-rockchip/rk3568/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2021 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clk_rk3568.o diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 69ef19cc85..c971df606c 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c b/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c index 5407e7827f..5b7b20e49f 100644 --- a/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rk3588/Makefile b/arch/arm/mach-rockchip/rk3588/Makefile index 4003eea87a..d7452bc8c2 100644 --- a/arch/arm/mach-rockchip/rk3588/Makefile +++ b/arch/arm/mach-rockchip/rk3588/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2021 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += rk3588.o diff --git a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c index e8772d3a38..1271bec4db 100644 --- a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c +++ b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rv1108/Makefile b/arch/arm/mach-rockchip/rv1108/Makefile index 9035a1a892..45851f1dcf 100644 --- a/arch/arm/mach-rockchip/rv1108/Makefile +++ b/arch/arm/mach-rockchip/rv1108/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifndef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-rockchip/rv1108/rv1108.c b/arch/arm/mach-rockchip/rv1108/rv1108.c index 6362af995b..5c1a3725d8 100644 --- a/arch/arm/mach-rockchip/rv1108/rv1108.c +++ b/arch/arm/mach-rockchip/rv1108/rv1108.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * Author: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c b/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c index babdf5720b..898a4c359a 100644 --- a/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c +++ b/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/rv1126/Makefile b/arch/arm/mach-rockchip/rv1126/Makefile index b2875633db..250868615f 100644 --- a/arch/arm/mach-rockchip/rv1126/Makefile +++ b/arch/arm/mach-rockchip/rv1126/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2019 Rockchip Electronics Co., Ltd # Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += rv1126.o diff --git a/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c index 599ea66e3d..b5f31663f3 100644 --- a/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c +++ b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. diff --git a/arch/arm/mach-rockchip/sdram.c b/arch/arm/mach-rockchip/sdram.c index 99ecbdc341..b7ed0881b0 100644 --- a/arch/arm/mach-rockchip/sdram.c +++ b/arch/arm/mach-rockchip/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Rockchip Electronics Co., Ltd. */ diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 93b8e7de4d..f53a785fee 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 87280e2ba7..5ca5133f3c 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index fdd0c592b3..57efa3e5e2 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds index 74618eba59..730d67dd4c 100644 --- a/arch/arm/mach-rockchip/u-boot-tpl-v8.lds +++ b/arch/arm/mach-rockchip/u-boot-tpl-v8.lds @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Rockchip Electronics Co., Ltd diff --git a/arch/arm/mach-s5pc1xx/Makefile b/arch/arm/mach-s5pc1xx/Makefile index ab804604d5..9fb94ef4b7 100644 --- a/arch/arm/mach-s5pc1xx/Makefile +++ b/arch/arm/mach-s5pc1xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c index b390bdf827..43527f0833 100644 --- a/arch/arm/mach-s5pc1xx/cache.c +++ b/arch/arm/mach-s5pc1xx/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c index c90c341b50..58a362c44c 100644 --- a/arch/arm/mach-s5pc1xx/clock.c +++ b/arch/arm/mach-s5pc1xx/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/clk.h b/arch/arm/mach-s5pc1xx/include/mach/clk.h index 8f22c0b1c0..94282a8180 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/clk.h +++ b/arch/arm/mach-s5pc1xx/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/clock.h b/arch/arm/mach-s5pc1xx/include/mach/clock.h index 079d5238d5..55cd3b6a7b 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/clock.h +++ b/arch/arm/mach-s5pc1xx/include/mach/clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/cpu.h b/arch/arm/mach-s5pc1xx/include/mach/cpu.h index 78c905b866..6eff9c7ff0 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/cpu.h +++ b/arch/arm/mach-s5pc1xx/include/mach/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/gpio.h b/arch/arm/mach-s5pc1xx/include/mach/gpio.h index c8dfbdd642..f483b3b01d 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/gpio.h +++ b/arch/arm/mach-s5pc1xx/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/mmc.h b/arch/arm/mach-s5pc1xx/include/mach/mmc.h index 7078790860..6be7853f3b 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/mmc.h +++ b/arch/arm/mach-s5pc1xx/include/mach/mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/periph.h b/arch/arm/mach-s5pc1xx/include/mach/periph.h index bb73d727f8..a794153ac5 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/periph.h +++ b/arch/arm/mach-s5pc1xx/include/mach/periph.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/pinmux.h b/arch/arm/mach-s5pc1xx/include/mach/pinmux.h index 9447a4950b..4b31f03eee 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/pinmux.h +++ b/arch/arm/mach-s5pc1xx/include/mach/pinmux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Abhilash Kesavan <a.kesavan(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/power.h b/arch/arm/mach-s5pc1xx/include/mach/power.h index e382e8e21d..3f7178859f 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/power.h +++ b/arch/arm/mach-s5pc1xx/include/mach/power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/pwm.h b/arch/arm/mach-s5pc1xx/include/mach/pwm.h index 6d53e52f64..af4407d8ed 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/pwm.h +++ b/arch/arm/mach-s5pc1xx/include/mach/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h index a8eb2a38b0..c6b4e906ce 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/sromc.h +++ b/arch/arm/mach-s5pc1xx/include/mach/sromc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 Samsung Electronics * Naveen Krishna Ch <ch.naveen(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h index 89de400043..26173945eb 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h +++ b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electrnoics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/uart.h b/arch/arm/mach-s5pc1xx/include/mach/uart.h index 6618981ca8..5c27e5b3f5 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/uart.h +++ b/arch/arm/mach-s5pc1xx/include/mach/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/include/mach/watchdog.h b/arch/arm/mach-s5pc1xx/include/mach/watchdog.h index 81b8b0f23f..d875eaab8c 100644 --- a/arch/arm/mach-s5pc1xx/include/mach/watchdog.h +++ b/arch/arm/mach-s5pc1xx/include/mach/watchdog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/arch/arm/mach-s5pc1xx/pinmux.c b/arch/arm/mach-s5pc1xx/pinmux.c index 818d75164d..6884e09681 100644 --- a/arch/arm/mach-s5pc1xx/pinmux.c +++ b/arch/arm/mach-s5pc1xx/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Dummy functions to keep s5p_goni building (although it won't work) * diff --git a/arch/arm/mach-s5pc1xx/reset.S b/arch/arm/mach-s5pc1xx/reset.S index aac1ea061e..196082bf4b 100644 --- a/arch/arm/mach-s5pc1xx/reset.S +++ b/arch/arm/mach-s5pc1xx/reset.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Samsung Electronics. * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/arch/arm/mach-snapdragon/Makefile b/arch/arm/mach-snapdragon/Makefile index cbaaf23f6b..5e5d40c733 100644 --- a/arch/arm/mach-snapdragon/Makefile +++ b/arch/arm/mach-snapdragon/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.h b/arch/arm/mach-snapdragon/clock-snapdragon.h index c90bbefa58..c9ad48a81b 100644 --- a/arch/arm/mach-snapdragon/clock-snapdragon.h +++ b/arch/arm/mach-snapdragon/clock-snapdragon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm APQ8016, APQ8096, SDM845 * diff --git a/arch/arm/mach-snapdragon/dram.c b/arch/arm/mach-snapdragon/dram.c index 499dfdf0da..70d1efd1c1 100644 --- a/arch/arm/mach-snapdragon/dram.c +++ b/arch/arm/mach-snapdragon/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Onboard memory detection for Snapdragon boards * diff --git a/arch/arm/mach-snapdragon/include/mach/boot0.h b/arch/arm/mach-snapdragon/include/mach/boot0.h index 953cccad79..c381e20a8e 100644 --- a/arch/arm/mach-snapdragon/include/mach/boot0.h +++ b/arch/arm/mach-snapdragon/include/mach/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Workaround for "PSCI bug" on DragonBoard 410c * Copyright (C) 2021 Stephan Gerhold <stephan(a)gerhold.net> diff --git a/arch/arm/mach-snapdragon/include/mach/dram.h b/arch/arm/mach-snapdragon/include/mach/dram.h index 0a9eedda41..572c6c6ced 100644 --- a/arch/arm/mach-snapdragon/include/mach/dram.h +++ b/arch/arm/mach-snapdragon/include/mach/dram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Snapdragon DRAM * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> diff --git a/arch/arm/mach-snapdragon/include/mach/gpio.h b/arch/arm/mach-snapdragon/include/mach/gpio.h index bbc2bc1617..a297e21939 100644 --- a/arch/arm/mach-snapdragon/include/mach/gpio.h +++ b/arch/arm/mach-snapdragon/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Empty gpio.h * diff --git a/arch/arm/mach-snapdragon/include/mach/misc.h b/arch/arm/mach-snapdragon/include/mach/misc.h index c60e3e4724..825da7788d 100644 --- a/arch/arm/mach-snapdragon/include/mach/misc.h +++ b/arch/arm/mach-snapdragon/include/mach/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Snapdragon DRAM * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> diff --git a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h index d9a3b1af98..9f513c52f5 100644 --- a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h +++ b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8016.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm APQ8916 sysmap * diff --git a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h index 36a902bd92..da56d1fc39 100644 --- a/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h +++ b/arch/arm/mach-snapdragon/include/mach/sysmap-apq8096.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm APQ8096 sysmap * diff --git a/arch/arm/mach-snapdragon/include/mach/sysmap-qcs404.h b/arch/arm/mach-snapdragon/include/mach/sysmap-qcs404.h index 5768fb1377..306d94f3cd 100644 --- a/arch/arm/mach-snapdragon/include/mach/sysmap-qcs404.h +++ b/arch/arm/mach-snapdragon/include/mach/sysmap-qcs404.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm QCS404 sysmap * diff --git a/arch/arm/mach-snapdragon/include/mach/sysmap-sdm845.h b/arch/arm/mach-snapdragon/include/mach/sysmap-sdm845.h index 7165985bcd..640958aa51 100644 --- a/arch/arm/mach-snapdragon/include/mach/sysmap-sdm845.h +++ b/arch/arm/mach-snapdragon/include/mach/sysmap-sdm845.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm SDM845 sysmap * diff --git a/arch/arm/mach-snapdragon/init_sdm845.c b/arch/arm/mach-snapdragon/init_sdm845.c index 1f88502394..adeea2671b 100644 --- a/arch/arm/mach-snapdragon/init_sdm845.c +++ b/arch/arm/mach-snapdragon/init_sdm845.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common init part for boards based on SDM845 * diff --git a/arch/arm/mach-snapdragon/misc.c b/arch/arm/mach-snapdragon/misc.c index 7d452f4529..a8f733e52f 100644 --- a/arch/arm/mach-snapdragon/misc.c +++ b/arch/arm/mach-snapdragon/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Miscellaneous Snapdragon functionality * diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8016.c b/arch/arm/mach-snapdragon/pinctrl-apq8016.c index 70c0be0bca..d6904e2af5 100644 --- a/arch/arm/mach-snapdragon/pinctrl-apq8016.c +++ b/arch/arm/mach-snapdragon/pinctrl-apq8016.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8016 pinctrl * diff --git a/arch/arm/mach-snapdragon/pinctrl-apq8096.c b/arch/arm/mach-snapdragon/pinctrl-apq8096.c index 45462f01c2..cbb0a45d83 100644 --- a/arch/arm/mach-snapdragon/pinctrl-apq8096.c +++ b/arch/arm/mach-snapdragon/pinctrl-apq8096.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8096 pinctrl * diff --git a/arch/arm/mach-snapdragon/pinctrl-qcs404.c b/arch/arm/mach-snapdragon/pinctrl-qcs404.c index a6e53c4412..34674aa22e 100644 --- a/arch/arm/mach-snapdragon/pinctrl-qcs404.c +++ b/arch/arm/mach-snapdragon/pinctrl-qcs404.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm QCS404 pinctrl * diff --git a/arch/arm/mach-snapdragon/pinctrl-sdm845.c b/arch/arm/mach-snapdragon/pinctrl-sdm845.c index 40f2f012fa..ef5f44f000 100644 --- a/arch/arm/mach-snapdragon/pinctrl-sdm845.c +++ b/arch/arm/mach-snapdragon/pinctrl-sdm845.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm SDM845 pinctrl * diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c index 826dc51486..fd5bf549c6 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TLMM driver for Qualcomm APQ8016, APQ8096 * diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h index 178ee01a41..391ea12b2b 100644 --- a/arch/arm/mach-snapdragon/pinctrl-snapdragon.h +++ b/arch/arm/mach-snapdragon/pinctrl-snapdragon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Qualcomm Pin control * diff --git a/arch/arm/mach-snapdragon/sysmap-apq8016.c b/arch/arm/mach-snapdragon/sysmap-apq8016.c index ffa3f9aa35..30eef4a685 100644 --- a/arch/arm/mach-snapdragon/sysmap-apq8016.c +++ b/arch/arm/mach-snapdragon/sysmap-apq8016.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8016 memory map * diff --git a/arch/arm/mach-snapdragon/sysmap-apq8096.c b/arch/arm/mach-snapdragon/sysmap-apq8096.c index 0614f8308d..c7b0990bd1 100644 --- a/arch/arm/mach-snapdragon/sysmap-apq8096.c +++ b/arch/arm/mach-snapdragon/sysmap-apq8096.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm APQ8096 memory map * diff --git a/arch/arm/mach-snapdragon/sysmap-qcs404.c b/arch/arm/mach-snapdragon/sysmap-qcs404.c index 64ca4adf1b..84a7c4f73b 100644 --- a/arch/arm/mach-snapdragon/sysmap-qcs404.c +++ b/arch/arm/mach-snapdragon/sysmap-qcs404.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm QCS404 memory map * diff --git a/arch/arm/mach-snapdragon/sysmap-sdm845.c b/arch/arm/mach-snapdragon/sysmap-sdm845.c index 721ac41166..b19e48a719 100644 --- a/arch/arm/mach-snapdragon/sysmap-sdm845.c +++ b/arch/arm/mach-snapdragon/sysmap-sdm845.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm SDM845 memory map * diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile index ec38b64dd4..d849cbaef6 100644 --- a/arch/arm/mach-socfpga/Makefile +++ b/arch/arm/mach-socfpga/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 09e09192fb..e5ec9f26f4 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Altera SoCFPGA common board code * diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index 9e645a4253..2eabcc6cc2 100644 --- a/arch/arm/mach-socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/clock_manager_gen5.c b/arch/arm/mach-socfpga/clock_manager_gen5.c index 8fa2760798..4112ae4f20 100644 --- a/arch/arm/mach-socfpga/clock_manager_gen5.c +++ b/arch/arm/mach-socfpga/clock_manager_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/freeze_controller.c b/arch/arm/mach-socfpga/freeze_controller.c index 561d3408cd..eeab17acb6 100644 --- a/arch/arm/mach-socfpga/freeze_controller.c +++ b/arch/arm/mach-socfpga/freeze_controller.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_a10.h b/arch/arm/mach-socfpga/include/mach/base_addr_a10.h index b947cc0729..961537d50e 100644 --- a/arch/arm/mach-socfpga/include/mach/base_addr_a10.h +++ b/arch/arm/mach-socfpga/include/mach/base_addr_a10.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h index da966fb458..87dfd044ca 100644 --- a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h +++ b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h index c78def5066..97ccc447fc 100644 --- a/arch/arm/mach-socfpga/include/mach/boot0.h +++ b/arch/arm/mach-socfpga/include/mach/boot0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Specialty padding for the Altera SoCFPGA preloader image */ diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h index a8cb07a1c4..efe0dd6288 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h index d53095a7da..229f2d5801 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_gen5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/freeze_controller.h b/arch/arm/mach-socfpga/include/mach/freeze_controller.h index 80846a67f1..653e43078d 100644 --- a/arch/arm/mach-socfpga/include/mach/freeze_controller.h +++ b/arch/arm/mach-socfpga/include/mach/freeze_controller.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/gpio.h b/arch/arm/mach-socfpga/include/mach/gpio.h index f216b80332..1a19a8f84c 100644 --- a/arch/arm/mach-socfpga/include/mach/gpio.h +++ b/arch/arm/mach-socfpga/include/mach/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/include/mach/nic301.h b/arch/arm/mach-socfpga/include/mach/nic301.h index 20bebb8c81..b4e335084f 100644 --- a/arch/arm/mach-socfpga/include/mach/nic301.h +++ b/arch/arm/mach-socfpga/include/mach/nic301.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager.h b/arch/arm/mach-socfpga/include/mach/reset_manager.h index 1d68034cb5..e0c0fc87ba 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h index d108eac1e2..2220829de0 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/scan_manager.h b/arch/arm/mach-socfpga/include/mach/scan_manager.h index 4d8d649be0..1177d1dd55 100644 --- a/arch/arm/mach-socfpga/include/mach/scan_manager.h +++ b/arch/arm/mach-socfpga/include/mach/scan_manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/scu.h b/arch/arm/mach-socfpga/include/mach/scu.h index b684a55019..5d10928f05 100644 --- a/arch/arm/mach-socfpga/include/mach/scu.h +++ b/arch/arm/mach-socfpga/include/mach/scu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/include/mach/sdram.h b/arch/arm/mach-socfpga/include/mach/sdram.h index 79cb9e6064..4be2c71bad 100644 --- a/arch/arm/mach-socfpga/include/mach/sdram.h +++ b/arch/arm/mach-socfpga/include/mach/sdram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright Altera Corporation (C) 2014-2015 */ diff --git a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h index 8818a6b967..bf8376798b 100644 --- a/arch/arm/mach-socfpga/include/mach/sdram_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/sdram_gen5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright Altera Corporation (C) 2014-2015 */ diff --git a/arch/arm/mach-socfpga/include/mach/smc_api.h b/arch/arm/mach-socfpga/include/mach/smc_api.h index 6b5b7eadc6..a0f2d877ee 100644 --- a/arch/arm/mach-socfpga/include/mach/smc_api.h +++ b/arch/arm/mach-socfpga/include/mach/smc_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Intel Corporation */ diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h index 5603eaa3d0..98ab1c18c4 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h index a63a4ee27d..9fb9d7efe3 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager_gen5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/include/mach/timer.h b/arch/arm/mach-socfpga/include/mach/timer.h index 82596e412e..93482da1f3 100644 --- a/arch/arm/mach-socfpga/include/mach/timer.h +++ b/arch/arm/mach-socfpga/include/mach/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 80ad087034..f649568dd8 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c index e7500c16f7..4e9c5ca54c 100644 --- a/arch/arm/mach-socfpga/misc_gen5.c +++ b/arch/arm/mach-socfpga/misc_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c index a65860ef02..4244163dae 100644 --- a/arch/arm/mach-socfpga/reset_manager_gen5.c +++ b/arch/arm/mach-socfpga/reset_manager_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/scan_manager.c b/arch/arm/mach-socfpga/scan_manager.c index 36d6880141..5905d583a9 100644 --- a/arch/arm/mach-socfpga/scan_manager.c +++ b/arch/arm/mach-socfpga/scan_manager.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/smc_api.c b/arch/arm/mach-socfpga/smc_api.c index 8ffc7a472b..deb0e84c91 100644 --- a/arch/arm/mach-socfpga/smc_api.c +++ b/arch/arm/mach-socfpga/smc_api.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Intel Corporation <www.intel.com> * diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c index 9edbbf4a29..c9a21838d6 100644 --- a/arch/arm/mach-socfpga/spl_a10.c +++ b/arch/arm/mach-socfpga/spl_a10.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2021 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c index 287fbd1713..a827739c78 100644 --- a/arch/arm/mach-socfpga/spl_gen5.c +++ b/arch/arm/mach-socfpga/spl_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/system_manager_gen5.c b/arch/arm/mach-socfpga/system_manager_gen5.c index 09caebb3c8..106ff6165b 100644 --- a/arch/arm/mach-socfpga/system_manager_gen5.c +++ b/arch/arm/mach-socfpga/system_manager_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2017 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/timer.c b/arch/arm/mach-socfpga/timer.c index d9e8c84bfc..f34ddb5b2a 100644 --- a/arch/arm/mach-socfpga/timer.c +++ b/arch/arm/mach-socfpga/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/arch/arm/mach-socfpga/wrap_iocsr_config.c b/arch/arm/mach-socfpga/wrap_iocsr_config.c index ce86f04cad..62cdc11be5 100644 --- a/arch/arm/mach-socfpga/wrap_iocsr_config.c +++ b/arch/arm/mach-socfpga/wrap_iocsr_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/wrap_pinmux_config.c b/arch/arm/mach-socfpga/wrap_pinmux_config.c index 33ca14c9dc..85622354d8 100644 --- a/arch/arm/mach-socfpga/wrap_pinmux_config.c +++ b/arch/arm/mach-socfpga/wrap_pinmux_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/wrap_pll_config.c b/arch/arm/mach-socfpga/wrap_pll_config.c index 0c40ae9876..0ffeeaa7a4 100644 --- a/arch/arm/mach-socfpga/wrap_pll_config.c +++ b/arch/arm/mach-socfpga/wrap_pll_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-socfpga/wrap_sdram_config.c b/arch/arm/mach-socfpga/wrap_sdram_config.c index cd3a0f6633..bf0de85a4d 100644 --- a/arch/arm/mach-socfpga/wrap_sdram_config.c +++ b/arch/arm/mach-socfpga/wrap_sdram_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/arm/mach-stm32/Makefile b/arch/arm/mach-stm32/Makefile index 03d535d814..984967875f 100644 --- a/arch/arm/mach-stm32/Makefile +++ b/arch/arm/mach-stm32/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c index 0bd8d7b22c..7164d46892 100644 --- a/arch/arm/mach-stm32/soc.c +++ b/arch/arm/mach-stm32/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile index a19b2797c8..42f1d1c07d 100644 --- a/arch/arm/mach-stm32mp/Makefile +++ b/arch/arm/mach-stm32mp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # diff --git a/arch/arm/mach-stm32mp/boot_params.c b/arch/arm/mach-stm32mp/boot_params.c index 158bf40cb9..59d547bd00 100644 --- a/arch/arm/mach-stm32mp/boot_params.c +++ b/arch/arm/mach-stm32mp/boot_params.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c index 599e63a93d..9045cc697f 100644 --- a/arch/arm/mach-stm32mp/bsec.c +++ b/arch/arm/mach-stm32mp/bsec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c index e16fcf4424..c69c6a8d0f 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32key.c +++ b/arch/arm/mach-stm32mp/cmd_stm32key.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/Makefile b/arch/arm/mach-stm32mp/cmd_stm32prog/Makefile index b57e1bf870..5fb7ec8833 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/Makefile +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020, STMicroelectronics - All Rights Reserved # diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 2411bcf06d..ba88943bb8 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 393f9a1b41..efb8eafa44 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h index ae4bd8842f..c1b23acea4 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c index 35bed31994..d68d5cf569 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c index d18455bf36..d1428e4363 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index e07abbe21c..34841bf35c 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c index 7f37b0d2aa..13f96f4ebe 100644 --- a/arch/arm/mach-stm32mp/dram_init.c +++ b/arch/arm/mach-stm32mp/dram_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/ecdsa_romapi.c b/arch/arm/mach-stm32mp/ecdsa_romapi.c index 93c561c69b..524dd696ad 100644 --- a/arch/arm/mach-stm32mp/ecdsa_romapi.c +++ b/arch/arm/mach-stm32mp/ecdsa_romapi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * STM32MP ECDSA verification via the ROM API * diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index de5c5a55ea..a62df16bd8 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019-2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/bsec.h b/arch/arm/mach-stm32mp/include/mach/bsec.h index 10ebc535c4..e92e822aac 100644 --- a/arch/arm/mach-stm32mp/include/mach/bsec.h +++ b/arch/arm/mach-stm32mp/include/mach/bsec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/ddr.h b/arch/arm/mach-stm32mp/include/mach/ddr.h index bfc42a7c48..6c9d63a8e7 100644 --- a/arch/arm/mach-stm32mp/include/mach/ddr.h +++ b/arch/arm/mach-stm32mp/include/mach/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h index 1cdc5e3b18..a93f96b89a 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h index 1b2bba3d34..dd7238f156 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/stm32prog.h b/arch/arm/mach-stm32mp/include/mach/stm32prog.h index 23d1adfbad..a09771db73 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32prog.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32prog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h index 83fb32a45f..747d514909 100644 --- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h +++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2015-2017, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/include/mach/tzc.h b/arch/arm/mach-stm32mp/include/mach/tzc.h index 16db55c464..6d68f3d3d8 100644 --- a/arch/arm/mach-stm32mp/include/mach/tzc.h +++ b/arch/arm/mach-stm32mp/include/mach/tzc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Simple API for configuring TrustZone memory regions * diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c index 8cdeb0ab3f..93e0c1526e 100644 --- a/arch/arm/mach-stm32mp/psci.c +++ b/arch/arm/mach-stm32mp/psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/pwr_regulator.c b/arch/arm/mach-stm32mp/pwr_regulator.c index 846637ab16..ea46aeca00 100644 --- a/arch/arm/mach-stm32mp/pwr_regulator.c +++ b/arch/arm/mach-stm32mp/pwr_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c index 6c79259b2c..69f26b118c 100644 --- a/arch/arm/mach-stm32mp/spl.c +++ b/arch/arm/mach-stm32mp/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/syscon.c b/arch/arm/mach-stm32mp/syscon.c index a0e8e1dfdc..10c5b4406e 100644 --- a/arch/arm/mach-stm32mp/syscon.c +++ b/arch/arm/mach-stm32mp/syscon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/arch/arm/mach-stm32mp/tzc400.c b/arch/arm/mach-stm32mp/tzc400.c index cdc4a40eda..beff8bc675 100644 --- a/arch/arm/mach-stm32mp/tzc400.c +++ b/arch/arm/mach-stm32mp/tzc400.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple API for configuring TrustZone memory restrictions for TZC400 */ diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 58f807cb82..396da1dfe1 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> # diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 78597ad932..67c719253e 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/arch/arm/mach-sunxi/clock.c b/arch/arm/mach-sunxi/clock.c index da3a0eb058..52342abd91 100644 --- a/arch/arm/mach-sunxi/clock.c +++ b/arch/arm/mach-sunxi/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2012 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/mach-sunxi/clock_sun4i.c b/arch/arm/mach-sunxi/clock_sun4i.c index 471609764d..cd5bff1037 100644 --- a/arch/arm/mach-sunxi/clock_sun4i.c +++ b/arch/arm/mach-sunxi/clock_sun4i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun4i, sun5i and sun7i specific clock code * diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c index 6bd75a15f6..8fed7b9db2 100644 --- a/arch/arm/mach-sunxi/clock_sun6i.c +++ b/arch/arm/mach-sunxi/clock_sun6i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun6i specific clock code * diff --git a/arch/arm/mach-sunxi/clock_sun8i_a83t.c b/arch/arm/mach-sunxi/clock_sun8i_a83t.c index 31e4281529..df22287b8a 100644 --- a/arch/arm/mach-sunxi/clock_sun8i_a83t.c +++ b/arch/arm/mach-sunxi/clock_sun8i_a83t.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A83 specific clock code * diff --git a/arch/arm/mach-sunxi/clock_sun9i.c b/arch/arm/mach-sunxi/clock_sun9i.c index 8ba4802f3b..4474f7f27c 100644 --- a/arch/arm/mach-sunxi/clock_sun9i.c +++ b/arch/arm/mach-sunxi/clock_sun9i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun9i specific clock code diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c index 7eef178859..04c211c7ee 100644 --- a/arch/arm/mach-sunxi/cpu_info.c +++ b/arch/arm/mach-sunxi/cpu_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c index cdf2750f1c..afb7943679 100644 --- a/arch/arm/mach-sunxi/dram_helpers.c +++ b/arch/arm/mach-sunxi/dram_helpers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DRAM init helper functions * diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c index 80a6c4bc0f..8b3fda1d1b 100644 --- a/arch/arm/mach-sunxi/dram_sun4i.c +++ b/arch/arm/mach-sunxi/dram_sun4i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sunxi DRAM controller initialization * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c index bff2e42513..3e23211e48 100644 --- a/arch/arm/mach-sunxi/dram_sun50i_h6.c +++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun50i H6 platform dram controller init * diff --git a/arch/arm/mach-sunxi/dram_sun50i_h616.c b/arch/arm/mach-sunxi/dram_sun50i_h616.c index 7e580b62dc..e7864c87cf 100644 --- a/arch/arm/mach-sunxi/dram_sun50i_h616.c +++ b/arch/arm/mach-sunxi/dram_sun50i_h616.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun50i H616 platform dram controller driver * diff --git a/arch/arm/mach-sunxi/dram_sun6i.c b/arch/arm/mach-sunxi/dram_sun6i.c index 0590110d4a..2819e68fc1 100644 --- a/arch/arm/mach-sunxi/dram_sun6i.c +++ b/arch/arm/mach-sunxi/dram_sun6i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sun6i platform dram controller init. * diff --git a/arch/arm/mach-sunxi/dram_sun8i_a23.c b/arch/arm/mach-sunxi/dram_sun8i_a23.c index 3ed97b59a3..4ba33c2993 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a23.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a23.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sun8i platform dram controller init. * diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c index 367b74061e..f1d038475b 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a33.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sun8i a33 platform dram controller init. * diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c index a3f833dd34..ccf882cbcc 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sun8i a33 platform dram controller init. * diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c index 14be212e89..4a4fa224c1 100644 --- a/arch/arm/mach-sunxi/dram_sun9i.c +++ b/arch/arm/mach-sunxi/dram_sun9i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun9i dram controller initialisation * diff --git a/arch/arm/mach-sunxi/dram_suniv.c b/arch/arm/mach-sunxi/dram_suniv.c index 3aa3ce7627..7b5cb78f44 100644 --- a/arch/arm/mach-sunxi/dram_suniv.c +++ b/arch/arm/mach-sunxi/dram_suniv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * suniv DRAM initialization * diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c index 9382d3d0be..d14f9f9e47 100644 --- a/arch/arm/mach-sunxi/dram_sunxi_dw.c +++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sun8i H3 platform dram controller init * diff --git a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c index 232b4fe2df..9ad81ba15d 100644 --- a/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c +++ b/arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c @@ -8,7 +8,7 @@ * Based on H6 DDR3 timings: * (C) Copyright 2018,2019 Arm Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c index b6d6a68746..a94d2e3b5f 100644 --- a/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c +++ b/arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c @@ -8,7 +8,7 @@ * Based on H6 DDR3 timings: * (C) Copyright 2018,2019 Arm Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c index 2136ca3a4c..7babdf4946 100644 --- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c +++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c @@ -16,7 +16,7 @@ * * Many thanks to Jernej Skrabec for contributing some fixes! * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c index 1000860113..4cbe0b00e0 100644 --- a/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c +++ b/arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c @@ -3,7 +3,7 @@ * * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/arch/arm/mach-sunxi/gtbus_sun9i.c b/arch/arm/mach-sunxi/gtbus_sun9i.c index cf011c4cfa..6622177c7e 100644 --- a/arch/arm/mach-sunxi/gtbus_sun9i.c +++ b/arch/arm/mach-sunxi/gtbus_sun9i.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GTBUS initialisation for sun9i * diff --git a/arch/arm/mach-sunxi/pinmux.c b/arch/arm/mach-sunxi/pinmux.c index c95fcee9f6..40bd7256d5 100644 --- a/arch/arm/mach-sunxi/pinmux.c +++ b/arch/arm/mach-sunxi/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c index c090840637..5c1fa86975 100644 --- a/arch/arm/mach-sunxi/pmic_bus.c +++ b/arch/arm/mach-sunxi/pmic_bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/arch/arm/mach-sunxi/prcm.c b/arch/arm/mach-sunxi/prcm.c index 71a2e44918..adaf5a90ba 100644 --- a/arch/arm/mach-sunxi/prcm.c +++ b/arch/arm/mach-sunxi/prcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sunxi A31 Power Management Unit * diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c index 81159cfee6..9ca39ec47c 100644 --- a/arch/arm/mach-sunxi/spl_spi_sunxi.c +++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Siarhei Siamashka <siarhei.siamashka(a)gmail.com> */ diff --git a/arch/arm/mach-sunxi/timer.c b/arch/arm/mach-sunxi/timer.c index fc9d419a25..7f96d24481 100644 --- a/arch/arm/mach-sunxi/timer.c +++ b/arch/arm/mach-sunxi/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index a5733b0bf6..f5064a83f2 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2019 Nvidia Corporation. # diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c index 532730fe72..cf36d4cc61 100644 --- a/arch/arm/mach-tegra/ap.c +++ b/arch/arm/mach-tegra/ap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/arm64-mmu.c b/arch/arm/mach-tegra/arm64-mmu.c index ea4eac392d..b9c87a931b 100644 --- a/arch/arm/mach-tegra/arm64-mmu.c +++ b/arch/arm/mach-tegra/arm64-mmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index f8b61a2b3e..1070343811 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 981768bb0e..4b057bb345 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c index 8f5bb2f261..f547973c19 100644 --- a/arch/arm/mach-tegra/cboot.c +++ b/arch/arm/mach-tegra/cboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016-2018, NVIDIA CORPORATION. */ diff --git a/arch/arm/mach-tegra/cmd_enterrcm.c b/arch/arm/mach-tegra/cmd_enterrcm.c index 92ff6cb1bf..db3da7ddd4 100644 --- a/arch/arm/mach-tegra/cmd_enterrcm.c +++ b/arch/arm/mach-tegra/cmd_enterrcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012-2019, NVIDIA CORPORATION. All rights reserved. * diff --git a/arch/arm/mach-tegra/cpu.h b/arch/arm/mach-tegra/cpu.h index 006aae3d07..81c68fa7d9 100644 --- a/arch/arm/mach-tegra/cpu.h +++ b/arch/arm/mach-tegra/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/crypto.c b/arch/arm/mach-tegra/crypto.c index 893da35e0b..92e18acb38 100644 --- a/arch/arm/mach-tegra/crypto.c +++ b/arch/arm/mach-tegra/crypto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c index c11494722b..3e1dffcc8e 100644 --- a/arch/arm/mach-tegra/dt-setup.c +++ b/arch/arm/mach-tegra/dt-setup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010-2016, NVIDIA CORPORATION. */ diff --git a/arch/arm/mach-tegra/emc.c b/arch/arm/mach-tegra/emc.c index 2eea14b5a7..68b00d97cd 100644 --- a/arch/arm/mach-tegra/emc.c +++ b/arch/arm/mach-tegra/emc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/mach-tegra/emc.h b/arch/arm/mach-tegra/emc.h index 7cc8e2d566..fec5807782 100644 --- a/arch/arm/mach-tegra/emc.h +++ b/arch/arm/mach-tegra/emc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c index 83bd505538..35649739dc 100644 --- a/arch/arm/mach-tegra/fuse.c +++ b/arch/arm/mach-tegra/fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/pinmux-common.c b/arch/arm/mach-tegra/pinmux-common.c index 16b03bfe7b..0e2ca2e4d2 100644 --- a/arch/arm/mach-tegra/pinmux-common.c +++ b/arch/arm/mach-tegra/pinmux-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2011 The Chromium OS Authors. diff --git a/arch/arm/mach-tegra/psci.S b/arch/arm/mach-tegra/psci.S index f9eb37fc79..54c1be991f 100644 --- a/arch/arm/mach-tegra/psci.S +++ b/arch/arm/mach-tegra/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, NVIDIA * Copyright (C) 2015, Siemens AG diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c index ed897efc5f..bb4d9196f7 100644 --- a/arch/arm/mach-tegra/spl.c +++ b/arch/arm/mach-tegra/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * NVIDIA Inc, <www.nvidia.com> diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c index 5ad586ac17..e06ae1ce30 100644 --- a/arch/arm/mach-tegra/sys_info.c +++ b/arch/arm/mach-tegra/sys_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c index 8ad71f590f..b78401d8b5 100644 --- a/arch/arm/mach-tegra/tegra114/clock.c +++ b/arch/arm/mach-tegra/tegra114/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c index 62c1053630..0a82314249 100644 --- a/arch/arm/mach-tegra/tegra114/cpu.c +++ b/arch/arm/mach-tegra/tegra114/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra114/pinmux.c b/arch/arm/mach-tegra/tegra114/pinmux.c index 11796602c5..9a6e1129a7 100644 --- a/arch/arm/mach-tegra/tegra114/pinmux.c +++ b/arch/arm/mach-tegra/tegra114/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/mach-tegra/tegra124/Makefile b/arch/arm/mach-tegra/tegra124/Makefile index d275dafdc4..a26485044f 100644 --- a/arch/arm/mach-tegra/tegra124/Makefile +++ b/arch/arm/mach-tegra/tegra124/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2014 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_SPL_BUILD) += cpu.o diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c index ca9549a318..d7ac8e4e5c 100644 --- a/arch/arm/mach-tegra/tegra124/clock.c +++ b/arch/arm/mach-tegra/tegra124/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c index b1bfe8fb5e..10a61cc2a2 100644 --- a/arch/arm/mach-tegra/tegra124/cpu.c +++ b/arch/arm/mach-tegra/tegra124/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra124/funcmux.c b/arch/arm/mach-tegra/tegra124/funcmux.c index e7ad85fde2..7c55da8c62 100644 --- a/arch/arm/mach-tegra/tegra124/funcmux.c +++ b/arch/arm/mach-tegra/tegra124/funcmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra124/pinmux.c b/arch/arm/mach-tegra/tegra124/pinmux.c index 261ce64b20..0bf8cbc9c7 100644 --- a/arch/arm/mach-tegra/tegra124/pinmux.c +++ b/arch/arm/mach-tegra/tegra124/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/mach-tegra/tegra124/pmc.c b/arch/arm/mach-tegra/tegra124/pmc.c index 3921ffb52a..5dd0460f95 100644 --- a/arch/arm/mach-tegra/tegra124/pmc.c +++ b/arch/arm/mach-tegra/tegra124/pmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Google, Inc */ diff --git a/arch/arm/mach-tegra/tegra124/psci.c b/arch/arm/mach-tegra/tegra124/psci.c index ab102a6226..c3e1c5c5b9 100644 --- a/arch/arm/mach-tegra/tegra124/psci.c +++ b/arch/arm/mach-tegra/tegra124/psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015, Siemens AG * Author: Jan Kiszka <jan.kiszka(a)siemens.com> diff --git a/arch/arm/mach-tegra/tegra20/Makefile b/arch/arm/mach-tegra/tegra20/Makefile index 991cabeec5..1ce097c106 100644 --- a/arch/arm/mach-tegra/tegra20/Makefile +++ b/arch/arm/mach-tegra/tegra20/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 Nvidia Corporation. diff --git a/arch/arm/mach-tegra/tegra20/bct.h b/arch/arm/mach-tegra/tegra20/bct.h index 4b78aef7cf..d9364b3fdd 100644 --- a/arch/arm/mach-tegra/tegra20/bct.h +++ b/arch/arm/mach-tegra/tegra20/bct.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _BCT_H_ #define _BCT_H_ diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c index abd6e3917a..3e7f8c1063 100644 --- a/arch/arm/mach-tegra/tegra20/clock.c +++ b/arch/arm/mach-tegra/tegra20/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2015 diff --git a/arch/arm/mach-tegra/tegra20/display.c b/arch/arm/mach-tegra/tegra20/display.c index 4ba3fb23fd..7c577ab047 100644 --- a/arch/arm/mach-tegra/tegra20/display.c +++ b/arch/arm/mach-tegra/tegra20/display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c index fb5e699c94..2c93cebe38 100644 --- a/arch/arm/mach-tegra/tegra20/emc.c +++ b/arch/arm/mach-tegra/tegra20/emc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/mach-tegra/tegra20/funcmux.c b/arch/arm/mach-tegra/tegra20/funcmux.c index 90fe0cba8e..96e3cb94c1 100644 --- a/arch/arm/mach-tegra/tegra20/funcmux.c +++ b/arch/arm/mach-tegra/tegra20/funcmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/mach-tegra/tegra20/pinmux.c b/arch/arm/mach-tegra/tegra20/pinmux.c index 0af39e74c5..86665b19df 100644 --- a/arch/arm/mach-tegra/tegra20/pinmux.c +++ b/arch/arm/mach-tegra/tegra20/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/arm/mach-tegra/tegra20/pmu.c b/arch/arm/mach-tegra/tegra20/pmu.c index 05d0668cdb..d55f087236 100644 --- a/arch/arm/mach-tegra/tegra20/pmu.c +++ b/arch/arm/mach-tegra/tegra20/pmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c index 5e3a9ebace..af06961277 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot.c +++ b/arch/arm/mach-tegra/tegra20/warmboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 - 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c index 94ce762e01..f1d68e239d 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c +++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 - 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.h b/arch/arm/mach-tegra/tegra20/warmboot_avp.h index f300fe6625..1bf1ee6378 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot_avp.h +++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010, 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra210/Makefile b/arch/arm/mach-tegra/tegra210/Makefile index cfcba5b68f..7ce29b8a74 100644 --- a/arch/arm/mach-tegra/tegra210/Makefile +++ b/arch/arm/mach-tegra/tegra210/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2020 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += clock.o diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c index 900537afbe..a4b9e6ee4c 100644 --- a/arch/arm/mach-tegra/tegra210/clock.c +++ b/arch/arm/mach-tegra/tegra210/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2020 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra210/funcmux.c b/arch/arm/mach-tegra/tegra210/funcmux.c index 30d994a17f..4f787ff681 100644 --- a/arch/arm/mach-tegra/tegra210/funcmux.c +++ b/arch/arm/mach-tegra/tegra210/funcmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra30/bct.h b/arch/arm/mach-tegra/tegra30/bct.h index 9797384da3..28afc87cb8 100644 --- a/arch/arm/mach-tegra/tegra30/bct.h +++ b/arch/arm/mach-tegra/tegra30/bct.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _BCT_H_ #define _BCT_H_ diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c index 698c7ab956..069bd81247 100644 --- a/arch/arm/mach-tegra/tegra30/clock.c +++ b/arch/arm/mach-tegra/tegra30/clock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/arch/arm/mach-tegra/tegra30/pinmux.c b/arch/arm/mach-tegra/tegra30/pinmux.c index d11b2aa572..7aa09f5a4c 100644 --- a/arch/arm/mach-tegra/tegra30/pinmux.c +++ b/arch/arm/mach-tegra/tegra30/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010-2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index 5172efac0c..aabd57096f 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-uniphier/arm32/Makefile b/arch/arm/mach-uniphier/arm32/Makefile index b41aba7e29..b61c19738e 100644 --- a/arch/arm/mach-uniphier/arm32/Makefile +++ b/arch/arm/mach-uniphier/arm32/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SPL_BUILD obj-y += lowlevel_init.o diff --git a/arch/arm/mach-uniphier/arm32/arm-mpcore.h b/arch/arm/mach-uniphier/arm32/arm-mpcore.h index 27eac90a04..7d74100b05 100644 --- a/arch/arm/mach-uniphier/arm32/arm-mpcore.h +++ b/arch/arm/mach-uniphier/arm32/arm-mpcore.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011-2014 Panasonic Corporation */ diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index cde2a8124f..cbaf416abc 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.h b/arch/arm/mach-uniphier/arm32/cache-uniphier.h index 40838244d1..b8b2054d4f 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.h +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S b/arch/arm/mach-uniphier/arm32/debug_ll.S index 3fed7985fc..17975942f3 100644 --- a/arch/arm/mach-uniphier/arm32/debug_ll.S +++ b/arch/arm/mach-uniphier/arm32/debug_ll.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * On-chip UART initializaion for low-level debugging * diff --git a/arch/arm/mach-uniphier/arm32/late_lowlevel_init.S b/arch/arm/mach-uniphier/arm32/late_lowlevel_init.S index 6c722d02ed..7a32dace87 100644 --- a/arch/arm/mach-uniphier/arm32/late_lowlevel_init.S +++ b/arch/arm/mach-uniphier/arm32/late_lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/arm32/lowlevel_init.S b/arch/arm/mach-uniphier/arm32/lowlevel_init.S index 3f9f135bcb..6b1e34eaf5 100644 --- a/arch/arm/mach-uniphier/arm32/lowlevel_init.S +++ b/arch/arm/mach-uniphier/arm32/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index fbb6ebca77..0f81e13d95 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/arm32/psci_smp.S b/arch/arm/mach-uniphier/arm32/psci_smp.S index 65a06ae23e..54aec5a27d 100644 --- a/arch/arm/mach-uniphier/arm32/psci_smp.S +++ b/arch/arm/mach-uniphier/arm32/psci_smp.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/arm64/Makefile b/arch/arm/mach-uniphier/arm64/Makefile index 750c4f756e..91aad26569 100644 --- a/arch/arm/mach-uniphier/arm64/Makefile +++ b/arch/arm/mach-uniphier/arm64/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += mem_map.o diff --git a/arch/arm/mach-uniphier/arm64/mem_map.c b/arch/arm/mach-uniphier/arm64/mem_map.c index a8bd4eee89..da04fd63a2 100644 --- a/arch/arm/mach-uniphier/arm64/mem_map.c +++ b/arch/arm/mach-uniphier/arm64/mem_map.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/bcu/Makefile b/arch/arm/mach-uniphier/bcu/Makefile index 88730205af..7a8dea28a6 100644 --- a/arch/arm/mach-uniphier/bcu/Makefile +++ b/arch/arm/mach-uniphier/bcu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_ARCH_UNIPHIER_LD4) += bcu-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_SLD8) += bcu-ld4.o diff --git a/arch/arm/mach-uniphier/bcu/bcu-ld4.c b/arch/arm/mach-uniphier/bcu/bcu-ld4.c index ea6088ba1c..ebfb515561 100644 --- a/arch/arm/mach-uniphier/bcu/bcu-ld4.c +++ b/arch/arm/mach-uniphier/bcu/bcu-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/bcu/bcu-regs.h b/arch/arm/mach-uniphier/bcu/bcu-regs.h index 9f6cf540bf..8bcf9f9f8e 100644 --- a/arch/arm/mach-uniphier/bcu/bcu-regs.h +++ b/arch/arm/mach-uniphier/bcu/bcu-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier BCU (Bus Control Unit) registers * diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 30e4e23a64..93858f7a3e 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index b5356ed87e..d701a2b6a7 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index 3e2ec9b26a..7d30b2c7c9 100644 --- a/arch/arm/mach-uniphier/boards.c +++ b/arch/arm/mach-uniphier/boards.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/Makefile b/arch/arm/mach-uniphier/boot-device/Makefile index 97d54443cb..bb6db822f2 100644 --- a/arch/arm/mach-uniphier/boot-device/Makefile +++ b/arch/arm/mach-uniphier/boot-device/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += boot-device.o diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c index 4689ed79fd..0d57f7c1f0 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld11.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c index c6aef18c19..7d9c49be32 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c index efd07a3296..365778973f 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c index 677470cdc6..2328fe2824 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c index 6888099312..c5682f72ad 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device-pxs3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.c b/arch/arm/mach-uniphier/boot-device/boot-device.c index 1e6bc8433f..e25623aa09 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.c +++ b/arch/arm/mach-uniphier/boot-device/boot-device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/boot-device/boot-device.h b/arch/arm/mach-uniphier/boot-device/boot-device.h index bbb634316b..11703ae9ea 100644 --- a/arch/arm/mach-uniphier/boot-device/boot-device.h +++ b/arch/arm/mach-uniphier/boot-device/boot-device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/clk/Makefile b/arch/arm/mach-uniphier/clk/Makefile index c49e44754c..9cc2e80a77 100644 --- a/arch/arm/mach-uniphier/clk/Makefile +++ b/arch/arm/mach-uniphier/clk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c index 3b721eaf23..53904a778f 100644 --- a/arch/arm/mach-uniphier/clk/clk-dram-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-dram-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c index 808d1ebfe1..1787b20b05 100644 --- a/arch/arm/mach-uniphier/clk/clk-dram-pro5.c +++ b/arch/arm/mach-uniphier/clk/clk-dram-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c index 75d3e70d6a..93b209d9c7 100644 --- a/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-dram-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/clk-early-ld4.c b/arch/arm/mach-uniphier/clk/clk-early-ld4.c index 25b72d8926..36fc9a7aad 100644 --- a/arch/arm/mach-uniphier/clk/clk-early-ld4.c +++ b/arch/arm/mach-uniphier/clk/clk-early-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/clk-ld11.c b/arch/arm/mach-uniphier/clk/clk-ld11.c index d241a65382..cb42989543 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld11.c +++ b/arch/arm/mach-uniphier/clk/clk-ld11.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/clk-ld20.c b/arch/arm/mach-uniphier/clk/clk-ld20.c index 397b2d7384..90aa7df415 100644 --- a/arch/arm/mach-uniphier/clk/clk-ld20.c +++ b/arch/arm/mach-uniphier/clk/clk-ld20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/clk-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c index 798128b302..29ccb9cce1 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro4.c +++ b/arch/arm/mach-uniphier/clk/clk-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2015 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/clk-pro5.c b/arch/arm/mach-uniphier/clk/clk-pro5.c index 36006fd256..8d80b67994 100644 --- a/arch/arm/mach-uniphier/clk/clk-pro5.c +++ b/arch/arm/mach-uniphier/clk/clk-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/clk/clk-pxs2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c index c2a75ce000..030b1526ec 100644 --- a/arch/arm/mach-uniphier/clk/clk-pxs2.c +++ b/arch/arm/mach-uniphier/clk/clk-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/clk/clk-pxs3.c b/arch/arm/mach-uniphier/clk/clk-pxs3.c index 33b9c5b73d..505df618d9 100644 --- a/arch/arm/mach-uniphier/clk/clk-pxs3.c +++ b/arch/arm/mach-uniphier/clk/clk-pxs3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/dpll-ld4.c b/arch/arm/mach-uniphier/clk/dpll-ld4.c index f24a0eb0b8..d0cb013be2 100644 --- a/arch/arm/mach-uniphier/clk/dpll-ld4.c +++ b/arch/arm/mach-uniphier/clk/dpll-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/dpll-pro4.c b/arch/arm/mach-uniphier/clk/dpll-pro4.c index 204aee1a62..29ff1810d8 100644 --- a/arch/arm/mach-uniphier/clk/dpll-pro4.c +++ b/arch/arm/mach-uniphier/clk/dpll-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/dpll-sld8.c b/arch/arm/mach-uniphier/clk/dpll-sld8.c index 1ac52d11f3..b492ea965f 100644 --- a/arch/arm/mach-uniphier/clk/dpll-sld8.c +++ b/arch/arm/mach-uniphier/clk/dpll-sld8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/dpll-tail.c b/arch/arm/mach-uniphier/clk/dpll-tail.c index 6ba5a36727..83a1f4d268 100644 --- a/arch/arm/mach-uniphier/clk/dpll-tail.c +++ b/arch/arm/mach-uniphier/clk/dpll-tail.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/pll-base-ld20.c b/arch/arm/mach-uniphier/clk/pll-base-ld20.c index ea96d739c5..a00195824d 100644 --- a/arch/arm/mach-uniphier/clk/pll-base-ld20.c +++ b/arch/arm/mach-uniphier/clk/pll-base-ld20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/clk/pll-ld11.c b/arch/arm/mach-uniphier/clk/pll-ld11.c index 7f07e3e92b..30470bf5a4 100644 --- a/arch/arm/mach-uniphier/clk/pll-ld11.c +++ b/arch/arm/mach-uniphier/clk/pll-ld11.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/pll-ld20.c b/arch/arm/mach-uniphier/clk/pll-ld20.c index 04b3312a2a..8b5e270c1a 100644 --- a/arch/arm/mach-uniphier/clk/pll-ld20.c +++ b/arch/arm/mach-uniphier/clk/pll-ld20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/clk/pll-ld4.c b/arch/arm/mach-uniphier/clk/pll-ld4.c index c66031bdd0..1407e788e7 100644 --- a/arch/arm/mach-uniphier/clk/pll-ld4.c +++ b/arch/arm/mach-uniphier/clk/pll-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/pll-pro4.c b/arch/arm/mach-uniphier/clk/pll-pro4.c index b7dc3e261f..4d75d5298a 100644 --- a/arch/arm/mach-uniphier/clk/pll-pro4.c +++ b/arch/arm/mach-uniphier/clk/pll-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/clk/pll-pxs3.c b/arch/arm/mach-uniphier/clk/pll-pxs3.c index 278f530ea9..f7f14942e8 100644 --- a/arch/arm/mach-uniphier/clk/pll-pxs3.c +++ b/arch/arm/mach-uniphier/clk/pll-pxs3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/clk/pll.h b/arch/arm/mach-uniphier/clk/pll.h index dbdbd2b45d..16a3bb9933 100644 --- a/arch/arm/mach-uniphier/clk/pll.h +++ b/arch/arm/mach-uniphier/clk/pll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/cpu-info.c b/arch/arm/mach-uniphier/cpu-info.c index 1ede50771e..2d16c76111 100644 --- a/arch/arm/mach-uniphier/cpu-info.c +++ b/arch/arm/mach-uniphier/cpu-info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/debug-uart/Makefile b/arch/arm/mach-uniphier/debug-uart/Makefile index 81e9314a50..15729b20b9 100644 --- a/arch/arm/mach-uniphier/debug-uart/Makefile +++ b/arch/arm/mach-uniphier/debug-uart/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ARCH_UNIPHIER_LD4) += debug-uart-ld4.o diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c index 10a7087c0d..1cc8aef58e 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c index f64ff39c9e..d7d416cb54 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-ld6b.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c index 79c6c101e2..3ef71e2949 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c index ef3b383ee4..fbf33b390f 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c index ee8caad1d4..c57213f436 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c b/arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c index da16abdbab..719d668c3f 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart-sld8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.c b/arch/arm/mach-uniphier/debug-uart/debug-uart.c index 1ba012ca45..23a8fab177 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart.c +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug-uart/debug-uart.h b/arch/arm/mach-uniphier/debug-uart/debug-uart.h index f4e98c0bb0..57c4f24c7b 100644 --- a/arch/arm/mach-uniphier/debug-uart/debug-uart.h +++ b/arch/arm/mach-uniphier/debug-uart/debug-uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/arch/arm/mach-uniphier/debug.h b/arch/arm/mach-uniphier/debug.h index 466dc9b03b..a896eda856 100644 --- a/arch/arm/mach-uniphier/debug.h +++ b/arch/arm/mach-uniphier/debug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/dram/Makefile b/arch/arm/mach-uniphier/dram/Makefile index 7d11315d07..76c5580fa3 100644 --- a/arch/arm/mach-uniphier/dram/Makefile +++ b/arch/arm/mach-uniphier/dram/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SPL_BUILD diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c index 629f8b90c9..d5c60c2e86 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c index ca519d1c7e..bd45e7c571 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrphy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram/ddrmphy-regs.h b/arch/arm/mach-uniphier/dram/ddrmphy-regs.h index 96bab9de52..da205a3d32 100644 --- a/arch/arm/mach-uniphier/dram/ddrmphy-regs.h +++ b/arch/arm/mach-uniphier/dram/ddrmphy-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier DDR MultiPHY registers * diff --git a/arch/arm/mach-uniphier/dram/ddrphy-init.h b/arch/arm/mach-uniphier/dram/ddrphy-init.h index 4431f5c0ba..430ad024ca 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-init.h +++ b/arch/arm/mach-uniphier/dram/ddrphy-init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c index 26f3ba9d57..c57a540354 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-ld4.c +++ b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram/ddrphy-regs.h b/arch/arm/mach-uniphier/dram/ddrphy-regs.h index 8b342921bf..661270fcdf 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-regs.h +++ b/arch/arm/mach-uniphier/dram/ddrphy-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier DDR PHY registers * diff --git a/arch/arm/mach-uniphier/dram/ddrphy-training.c b/arch/arm/mach-uniphier/dram/ddrphy-training.c index 1decdf1cbf..8ee4463605 100644 --- a/arch/arm/mach-uniphier/dram/ddrphy-training.c +++ b/arch/arm/mach-uniphier/dram/ddrphy-training.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c index 1eb15b611f..528e2c3f68 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld4.c +++ b/arch/arm/mach-uniphier/dram/umc-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c index 0114df782b..c2bc64c552 100644 --- a/arch/arm/mach-uniphier/dram/umc-pro4.c +++ b/arch/arm/mach-uniphier/dram/umc-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram/umc-pro5.c b/arch/arm/mach-uniphier/dram/umc-pro5.c index a002b309ef..04b384239d 100644 --- a/arch/arm/mach-uniphier/dram/umc-pro5.c +++ b/arch/arm/mach-uniphier/dram/umc-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. */ diff --git a/arch/arm/mach-uniphier/dram/umc-pxs2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c index 73574201e3..20c2ea74ca 100644 --- a/arch/arm/mach-uniphier/dram/umc-pxs2.c +++ b/arch/arm/mach-uniphier/dram/umc-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/dram/umc-regs.h b/arch/arm/mach-uniphier/dram/umc-regs.h index 02efab384b..6908ab48e9 100644 --- a/arch/arm/mach-uniphier/dram/umc-regs.h +++ b/arch/arm/mach-uniphier/dram/umc-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier UMC (Universal Memory Controller) registers * diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c index 583a1bad8b..a36bf0f249 100644 --- a/arch/arm/mach-uniphier/dram/umc-sld8.c +++ b/arch/arm/mach-uniphier/dram/umc-sld8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 7f2753190c..f632f58264 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2017 Socionext Inc. diff --git a/arch/arm/mach-uniphier/fdt-fixup.c b/arch/arm/mach-uniphier/fdt-fixup.c index dfa32fdd48..467714208e 100644 --- a/arch/arm/mach-uniphier/fdt-fixup.c +++ b/arch/arm/mach-uniphier/fdt-fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2018 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h index 535c06343d..85cff86352 100644 --- a/arch/arm/mach-uniphier/init.h +++ b/arch/arm/mach-uniphier/init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/memconf.c b/arch/arm/mach-uniphier/memconf.c index ab0d187a1f..573783befb 100644 --- a/arch/arm/mach-uniphier/memconf.c +++ b/arch/arm/mach-uniphier/memconf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2015 Panasonic Corporation * Copyright (C) 2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c index 95780f79c2..edff2a8a25 100644 --- a/arch/arm/mach-uniphier/micro-support-card.c +++ b/arch/arm/mach-uniphier/micro-support-card.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2020 Socionext Inc. diff --git a/arch/arm/mach-uniphier/micro-support-card.h b/arch/arm/mach-uniphier/micro-support-card.h index a5a94f8ed9..8c1f164f83 100644 --- a/arch/arm/mach-uniphier/micro-support-card.h +++ b/arch/arm/mach-uniphier/micro-support-card.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/mmc-boot-mode.c b/arch/arm/mach-uniphier/mmc-boot-mode.c index 09cad743c5..cb62de6126 100644 --- a/arch/arm/mach-uniphier/mmc-boot-mode.c +++ b/arch/arm/mach-uniphier/mmc-boot-mode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/mmc-first-dev.c b/arch/arm/mach-uniphier/mmc-first-dev.c index 45bb10f8eb..c45bc6c93a 100644 --- a/arch/arm/mach-uniphier/mmc-first-dev.c +++ b/arch/arm/mach-uniphier/mmc-first-dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c index dddb48ec4a..dbcb262238 100644 --- a/arch/arm/mach-uniphier/reset.c +++ b/arch/arm/mach-uniphier/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/arch/arm/mach-uniphier/sc-regs.h b/arch/arm/mach-uniphier/sc-regs.h index e43116e064..b1466ea44d 100644 --- a/arch/arm/mach-uniphier/sc-regs.h +++ b/arch/arm/mach-uniphier/sc-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier SC (System Control) block registers * diff --git a/arch/arm/mach-uniphier/sc64-regs.h b/arch/arm/mach-uniphier/sc64-regs.h index fdcca232b6..9fd223100e 100644 --- a/arch/arm/mach-uniphier/sc64-regs.h +++ b/arch/arm/mach-uniphier/sc64-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier SC (System Control) block registers for ARMv8 SoCs * diff --git a/arch/arm/mach-uniphier/sg-regs.h b/arch/arm/mach-uniphier/sg-regs.h index a0fa51a8b7..a07f7d39c3 100644 --- a/arch/arm/mach-uniphier/sg-regs.h +++ b/arch/arm/mach-uniphier/sg-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UniPhier SG (SoC Glue) block registers * diff --git a/arch/arm/mach-uniphier/soc-info.c b/arch/arm/mach-uniphier/soc-info.c index b0221016d1..dd643e8f6b 100644 --- a/arch/arm/mach-uniphier/soc-info.c +++ b/arch/arm/mach-uniphier/soc-info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/soc-info.h b/arch/arm/mach-uniphier/soc-info.h index 73256b7c7b..1d82325eda 100644 --- a/arch/arm/mach-uniphier/soc-info.h +++ b/arch/arm/mach-uniphier/soc-info.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c index 0f2e3504c8..fa82ccdbbf 100644 --- a/arch/arm/mach-uniphier/spl_board_init.c +++ b/arch/arm/mach-uniphier/spl_board_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig index 645f06add4..dc71be0bac 100644 --- a/arch/arm/mach-versal/Kconfig +++ b/arch/arm/mach-versal/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later if ARCH_VERSAL diff --git a/arch/arm/mach-versal/Makefile b/arch/arm/mach-versal/Makefile index 864b3053d6..c39bc76fe3 100644 --- a/arch/arm/mach-versal/Makefile +++ b/arch/arm/mach-versal/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 - 2018 Xilinx, Inc. # Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c index 5e3f44c778..b5ca829ddd 100644 --- a/arch/arm/mach-versal/clk.c +++ b/arch/arm/mach-versal/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - 2018 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c index e4dc305d92..35150bceea 100644 --- a/arch/arm/mach-versal/cpu.c +++ b/arch/arm/mach-versal/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - 2018 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-versal/include/mach/hardware.h b/arch/arm/mach-versal/include/mach/hardware.h index 9d1c2f0dcf..3b52faccca 100644 --- a/arch/arm/mach-versal/include/mach/hardware.h +++ b/arch/arm/mach-versal/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 - 2018 Xilinx, Inc. */ diff --git a/arch/arm/mach-versal/include/mach/sys_proto.h b/arch/arm/mach-versal/include/mach/sys_proto.h index 757bd873fb..e87f2c6bca 100644 --- a/arch/arm/mach-versal/include/mach/sys_proto.h +++ b/arch/arm/mach-versal/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 - 2018 Xilinx, Inc. */ diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile index 858ca9414c..814b06175a 100644 --- a/arch/arm/mach-versatile/Makefile +++ b/arch/arm/mach-versatile/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-versatile/reset.S b/arch/arm/mach-versatile/reset.S index c7f1225fb2..6a9262d475 100644 --- a/arch/arm/mach-versatile/reset.S +++ b/arch/arm/mach-versatile/reset.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * armboot - Startup Code for ARM926EJS CPU-core * diff --git a/arch/arm/mach-versatile/timer.c b/arch/arm/mach-versatile/timer.c index b471412186..36d4809324 100644 --- a/arch/arm/mach-versatile/timer.c +++ b/arch/arm/mach-versatile/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Texas Instruments <www.ti.com> diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index d9b2b999e1..9018c8772f 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c index 1945f60e08..e93a72af97 100644 --- a/arch/arm/mach-zynq/clk.c +++ b/arch/arm/mach-zynq/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Soren Brinkmann <soren.brinkmann(a)xilinx.com> * Copyright (C) 2013 Xilinx, Inc. All rights reserved. diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c index 3b6518c71c..6a19713a1d 100644 --- a/arch/arm/mach-zynq/cpu.c +++ b/arch/arm/mach-zynq/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Michal Simek <monstr(a)monstr.eu> * Copyright (C) 2012 Xilinx, Inc. All rights reserved. diff --git a/arch/arm/mach-zynq/ddrc.c b/arch/arm/mach-zynq/ddrc.c index 28988ef95b..9522722bba 100644 --- a/arch/arm/mach-zynq/ddrc.c +++ b/arch/arm/mach-zynq/ddrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 - 2013 Michal Simek <monstr(a)monstr.eu> * Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved. diff --git a/arch/arm/mach-zynq/include/mach/clk.h b/arch/arm/mach-zynq/include/mach/clk.h index 4fff9f4525..4e7f2046bd 100644 --- a/arch/arm/mach-zynq/include/mach/clk.h +++ b/arch/arm/mach-zynq/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Xilinx Inc. */ diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h index 89eb565c94..3800690bf5 100644 --- a/arch/arm/mach-zynq/include/mach/hardware.h +++ b/arch/arm/mach-zynq/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Xilinx Inc. */ diff --git a/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h b/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h index bd46a9b31e..efb193340e 100644 --- a/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h +++ b/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2016 Topic Embedded Products. diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h index 268ec50ad8..e35e881c8c 100644 --- a/arch/arm/mach-zynq/include/mach/sys_proto.h +++ b/arch/arm/mach-zynq/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Xilinx Inc. */ diff --git a/arch/arm/mach-zynq/lowlevel_init.S b/arch/arm/mach-zynq/lowlevel_init.S index ed7329d9a5..a5516ae3c8 100644 --- a/arch/arm/mach-zynq/lowlevel_init.S +++ b/arch/arm/mach-zynq/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 - 2015 Xilinx, Inc. All rights reserved. */ diff --git a/arch/arm/mach-zynq/ps7_spl_init.c b/arch/arm/mach-zynq/ps7_spl_init.c index 4c38724d4d..60d7260156 100644 --- a/arch/arm/mach-zynq/ps7_spl_init.c +++ b/arch/arm/mach-zynq/ps7_spl_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2017 Xilinx, Inc. All rights reserved. * (c) Copyright 2016 Topic Embedded Products. diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 5d9f4d23f3..5cd381bcb1 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 - 2017 Xilinx Inc. */ diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index fea1c9b12a..6012d52849 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek */ diff --git a/arch/arm/mach-zynq/u-boot-spl.lds b/arch/arm/mach-zynq/u-boot-spl.lds index 8c18d3f91f..26ef92d102 100644 --- a/arch/arm/mach-zynq/u-boot-spl.lds +++ b/arch/arm/mach-zynq/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Xilinx, Inc. Michal Simek * Copyright (c) 2004-2008 Texas Instruments diff --git a/arch/arm/mach-zynq/u-boot.lds b/arch/arm/mach-zynq/u-boot.lds index 3b7c9d515f..bb8cc11e6b 100644 --- a/arch/arm/mach-zynq/u-boot.lds +++ b/arch/arm/mach-zynq/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2004-2008 Texas Instruments * diff --git a/arch/arm/mach-zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile index 8f897a37d1..894b0ae5b9 100644 --- a/arch/arm/mach-zynqmp/Makefile +++ b/arch/arm/mach-zynqmp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 - 2015 Xilinx, Inc. # Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c index 3b05f8455b..01e679cdd3 100644 --- a/arch/arm/mach-zynqmp/clk.c +++ b/arch/arm/mach-zynqmp/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c index 6ae27894ec..50d1092987 100644 --- a/arch/arm/mach-zynqmp/cpu.c +++ b/arch/arm/mach-zynqmp/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c index dce9243892..be0d06e13d 100644 --- a/arch/arm/mach-zynqmp/handoff.c +++ b/arch/arm/mach-zynqmp/handoff.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 - 2017 Xilinx, Inc. * diff --git a/arch/arm/mach-zynqmp/include/mach/clk.h b/arch/arm/mach-zynqmp/include/mach/clk.h index 9918d46912..11667cfe09 100644 --- a/arch/arm/mach-zynqmp/include/mach/clk.h +++ b/arch/arm/mach-zynqmp/include/mach/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index 8cb6494e52..d8697b01c9 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h index 434a7fa20e..905c8fbe75 100644 --- a/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h +++ b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _PSU_INIT_GPL_H_ /* prevent circular inclusions */ #define _PSU_INIT_GPL_H_ diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h index 15b69e7771..41ff4fd920 100644 --- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h +++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh index cdecb1c1d3..b2b1ff04d0 100755 --- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh +++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # script to generate FIT image source for Xilinx ZynqMP boards with # ARM Trusted Firmware and multiple device trees (given on the command line) diff --git a/arch/arm/mach-zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c index aff9054212..7bf344ea86 100644 --- a/arch/arm/mach-zynqmp/mp.c +++ b/arch/arm/mach-zynqmp/mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/arch/arm/mach-zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c index b4d7f44bbe..23704a6b1e 100644 --- a/arch/arm/mach-zynqmp/psu_spl_init.c +++ b/arch/arm/mach-zynqmp/psu_spl_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Xilinx, Inc. * diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index a0f35f36fa..27ec6a6317 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 - 2016 Xilinx, Inc. * diff --git a/arch/arm/thumb1/include/asm/proc-armv/system.h b/arch/arm/thumb1/include/asm/proc-armv/system.h index 1324f7efb1..4241b192d6 100644 --- a/arch/arm/thumb1/include/asm/proc-armv/system.h +++ b/arch/arm/thumb1/include/asm/proc-armv/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Thumb-1 drop-in for the linux/include/asm-arm/proc-armv/system.h * diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 4a7960bbeb..2151887f1d 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/m68k/cpu/$(CPU)/start.o diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 643b7d1d35..f32dded7ed 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf523x/Makefile b/arch/m68k/cpu/mcf523x/Makefile index ef43893c51..29d8272258 100644 --- a/arch/m68k/cpu/mcf523x/Makefile +++ b/arch/m68k/cpu/mcf523x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c index bef67767b4..2a3715f6f6 100644 --- a/arch/m68k/cpu/mcf523x/cpu.c +++ b/arch/m68k/cpu/mcf523x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c index 10be73822f..00b2ef887a 100644 --- a/arch/m68k/cpu/mcf523x/cpu_init.c +++ b/arch/m68k/cpu/mcf523x/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf523x/interrupts.c b/arch/m68k/cpu/mcf523x/interrupts.c index 09c7f9e67c..9b2688ac19 100644 --- a/arch/m68k/cpu/mcf523x/interrupts.c +++ b/arch/m68k/cpu/mcf523x/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. diff --git a/arch/m68k/cpu/mcf523x/speed.c b/arch/m68k/cpu/mcf523x/speed.c index 6b08a12af0..e703ffc876 100644 --- a/arch/m68k/cpu/mcf523x/speed.c +++ b/arch/m68k/cpu/mcf523x/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf523x/start.S b/arch/m68k/cpu/mcf523x/start.S index c609e82163..3d424bae39 100644 --- a/arch/m68k/cpu/mcf523x/start.S +++ b/arch/m68k/cpu/mcf523x/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner(a)telex.de> * Based on code from Bernhard Kuhn <bkuhn(a)metrowerks.com> diff --git a/arch/m68k/cpu/mcf52x2/Makefile b/arch/m68k/cpu/mcf52x2/Makefile index ba06994ac0..5f08f19a17 100644 --- a/arch/m68k/cpu/mcf52x2/Makefile +++ b/arch/m68k/cpu/mcf52x2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 5042a38b3e..a653e233a1 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Josef Baumgartner <josef.baumgartner(a)telex.de> diff --git a/arch/m68k/cpu/mcf52x2/cpu.h b/arch/m68k/cpu/mcf52x2/cpu.h index 9bba7810e0..8e05877638 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.h +++ b/arch/m68k/cpu/mcf52x2/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * cpu.h * diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 99eb61f167..08d27ea325 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Josef Baumgartner <josef.baumgartner(a)telex.de> diff --git a/arch/m68k/cpu/mcf52x2/interrupts.c b/arch/m68k/cpu/mcf52x2/interrupts.c index c5ed060073..07253e08b7 100644 --- a/arch/m68k/cpu/mcf52x2/interrupts.c +++ b/arch/m68k/cpu/mcf52x2/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf52x2/speed.c b/arch/m68k/cpu/mcf52x2/speed.c index 6c7628252b..dd34e2a9e8 100644 --- a/arch/m68k/cpu/mcf52x2/speed.c +++ b/arch/m68k/cpu/mcf52x2/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Josef Baumgartner <josef.baumgartner(a)telex.de> diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S index 3a2760236c..cde5c2017b 100644 --- a/arch/m68k/cpu/mcf52x2/start.S +++ b/arch/m68k/cpu/mcf52x2/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner(a)telex.de> * Based on code from Bernhard Kuhn <bkuhn(a)metrowerks.com> diff --git a/arch/m68k/cpu/mcf530x/Makefile b/arch/m68k/cpu/mcf530x/Makefile index 6bd7cd3591..19d8f9dba3 100644 --- a/arch/m68k/cpu/mcf530x/Makefile +++ b/arch/m68k/cpu/mcf530x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c index 53a25d8362..368b743d66 100644 --- a/arch/m68k/cpu/mcf530x/cpu.c +++ b/arch/m68k/cpu/mcf530x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c index dad47d87ab..7eb752fcec 100644 --- a/arch/m68k/cpu/mcf530x/cpu_init.c +++ b/arch/m68k/cpu/mcf530x/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/cpu/mcf530x/interrupts.c b/arch/m68k/cpu/mcf530x/interrupts.c index 11686202dc..6ca07ccb61 100644 --- a/arch/m68k/cpu/mcf530x/interrupts.c +++ b/arch/m68k/cpu/mcf530x/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/cpu/mcf530x/speed.c b/arch/m68k/cpu/mcf530x/speed.c index c8d079016f..b176c63991 100644 --- a/arch/m68k/cpu/mcf530x/speed.c +++ b/arch/m68k/cpu/mcf530x/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/cpu/mcf530x/start.S b/arch/m68k/cpu/mcf530x/start.S index 552e0204b7..0cb68eb4c4 100644 --- a/arch/m68k/cpu/mcf530x/start.S +++ b/arch/m68k/cpu/mcf530x/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Angelo Dureghello <angelo(a)sysam.it> * Based on code from Bernhard Kuhn <bkuhn(a)metrowerks.com> diff --git a/arch/m68k/cpu/mcf532x/Makefile b/arch/m68k/cpu/mcf532x/Makefile index 7b2ca3e65f..b32cfbbc4f 100644 --- a/arch/m68k/cpu/mcf532x/Makefile +++ b/arch/m68k/cpu/mcf532x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c index 18d20a8926..7005fca2bc 100644 --- a/arch/m68k/cpu/mcf532x/cpu.c +++ b/arch/m68k/cpu/mcf532x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index 844d2cd760..4191b1518a 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf532x/interrupts.c b/arch/m68k/cpu/mcf532x/interrupts.c index 4f72fa88e5..f06e2d245a 100644 --- a/arch/m68k/cpu/mcf532x/interrupts.c +++ b/arch/m68k/cpu/mcf532x/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 32ffac0813..3c44aef009 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S index c3eae73a9c..6d2ccf837c 100644 --- a/arch/m68k/cpu/mcf532x/start.S +++ b/arch/m68k/cpu/mcf532x/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner(a)telex.de> * Based on code from Bernhard Kuhn <bkuhn(a)metrowerks.com> diff --git a/arch/m68k/cpu/mcf5445x/Makefile b/arch/m68k/cpu/mcf5445x/Makefile index 6a38c4838e..3e6a163cb6 100644 --- a/arch/m68k/cpu/mcf5445x/Makefile +++ b/arch/m68k/cpu/mcf5445x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c index d9a71c6b92..565844e4b4 100644 --- a/arch/m68k/cpu/mcf5445x/cpu.c +++ b/arch/m68k/cpu/mcf5445x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index bc3a2f3aed..0e9d9e1ff5 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/arch/m68k/cpu/mcf5445x/dspi.c b/arch/m68k/cpu/mcf5445x/dspi.c index 456af171a4..69d1dff194 100644 --- a/arch/m68k/cpu/mcf5445x/dspi.c +++ b/arch/m68k/cpu/mcf5445x/dspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Angelo Dureghello <angleo(a)sysam.it> diff --git a/arch/m68k/cpu/mcf5445x/interrupts.c b/arch/m68k/cpu/mcf5445x/interrupts.c index 400f3dee87..b6dc0c8542 100644 --- a/arch/m68k/cpu/mcf5445x/interrupts.c +++ b/arch/m68k/cpu/mcf5445x/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2004 diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c index 5c78eb9834..9116ebb5ce 100644 --- a/arch/m68k/cpu/mcf5445x/speed.c +++ b/arch/m68k/cpu/mcf5445x/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 5c3bfff791..1a73355b5b 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner(a)telex.de> * Based on code from Bernhard Kuhn <bkuhn(a)metrowerks.com> diff --git a/arch/m68k/cpu/u-boot.lds b/arch/m68k/cpu/u-boot.lds index 03d427cd36..adbacb676b 100644 --- a/arch/m68k/cpu/u-boot.lds +++ b/arch/m68k/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/dts/M5208EVBE.dts b/arch/m68k/dts/M5208EVBE.dts index ec203e8b69..93be0e3ad8 100644 --- a/arch/m68k/dts/M5208EVBE.dts +++ b/arch/m68k/dts/M5208EVBE.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5235EVB.dts b/arch/m68k/dts/M5235EVB.dts index e8b22c9216..3b75b59170 100644 --- a/arch/m68k/dts/M5235EVB.dts +++ b/arch/m68k/dts/M5235EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5235EVB_Flash32.dts b/arch/m68k/dts/M5235EVB_Flash32.dts index 60b28c07f7..eb2f9ad7e8 100644 --- a/arch/m68k/dts/M5235EVB_Flash32.dts +++ b/arch/m68k/dts/M5235EVB_Flash32.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5249EVB.dts b/arch/m68k/dts/M5249EVB.dts index 84ba4f188b..ecac60c816 100644 --- a/arch/m68k/dts/M5249EVB.dts +++ b/arch/m68k/dts/M5249EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5253DEMO.dts b/arch/m68k/dts/M5253DEMO.dts index a3f070661e..67858ef176 100644 --- a/arch/m68k/dts/M5253DEMO.dts +++ b/arch/m68k/dts/M5253DEMO.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5272C3.dts b/arch/m68k/dts/M5272C3.dts index a228937907..2e4e1d17c7 100644 --- a/arch/m68k/dts/M5272C3.dts +++ b/arch/m68k/dts/M5272C3.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5275EVB.dts b/arch/m68k/dts/M5275EVB.dts index d79f8a7885..f44f5f2293 100644 --- a/arch/m68k/dts/M5275EVB.dts +++ b/arch/m68k/dts/M5275EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5282EVB.dts b/arch/m68k/dts/M5282EVB.dts index 51788f9654..deccc516f8 100644 --- a/arch/m68k/dts/M5282EVB.dts +++ b/arch/m68k/dts/M5282EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M53017EVB.dts b/arch/m68k/dts/M53017EVB.dts index 90851dd0af..68e6481e99 100644 --- a/arch/m68k/dts/M53017EVB.dts +++ b/arch/m68k/dts/M53017EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5329AFEE.dts b/arch/m68k/dts/M5329AFEE.dts index c1cd2845a3..7bacfd12c8 100644 --- a/arch/m68k/dts/M5329AFEE.dts +++ b/arch/m68k/dts/M5329AFEE.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5329BFEE.dts b/arch/m68k/dts/M5329BFEE.dts index 51ec4b5d1a..91654ddd38 100644 --- a/arch/m68k/dts/M5329BFEE.dts +++ b/arch/m68k/dts/M5329BFEE.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/M5373EVB.dts b/arch/m68k/dts/M5373EVB.dts index 27ce800cae..7aafc47de9 100644 --- a/arch/m68k/dts/M5373EVB.dts +++ b/arch/m68k/dts/M5373EVB.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/Makefile b/arch/m68k/dts/Makefile index 7988522eb9..92aa16f415 100644 --- a/arch/m68k/dts/Makefile +++ b/arch/m68k/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_M5235EVB) += M5235EVB.dtb \ M5235EVB_Flash32.dtb diff --git a/arch/m68k/dts/amcore.dts b/arch/m68k/dts/amcore.dts index d43202a3ab..1422fee42f 100644 --- a/arch/m68k/dts/amcore.dts +++ b/arch/m68k/dts/amcore.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/astro_mcf5373l.dts b/arch/m68k/dts/astro_mcf5373l.dts index 40f84dd64b..1d9714cb48 100644 --- a/arch/m68k/dts/astro_mcf5373l.dts +++ b/arch/m68k/dts/astro_mcf5373l.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/cobra5272.dts b/arch/m68k/dts/cobra5272.dts index 2b5767d96d..32a7a5d1bb 100644 --- a/arch/m68k/dts/cobra5272.dts +++ b/arch/m68k/dts/cobra5272.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/eb_cpu5282.dts b/arch/m68k/dts/eb_cpu5282.dts index 27f33b9f90..9668afbe4c 100644 --- a/arch/m68k/dts/eb_cpu5282.dts +++ b/arch/m68k/dts/eb_cpu5282.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/eb_cpu5282_internal.dts b/arch/m68k/dts/eb_cpu5282_internal.dts index 53a94ea7f7..98a71319e0 100644 --- a/arch/m68k/dts/eb_cpu5282_internal.dts +++ b/arch/m68k/dts/eb_cpu5282_internal.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5208.dtsi b/arch/m68k/dts/mcf5208.dtsi index c61dbf3557..c4f977fd16 100644 --- a/arch/m68k/dts/mcf5208.dtsi +++ b/arch/m68k/dts/mcf5208.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf523x.dtsi b/arch/m68k/dts/mcf523x.dtsi index cae7b4f861..c14db11045 100644 --- a/arch/m68k/dts/mcf523x.dtsi +++ b/arch/m68k/dts/mcf523x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5249.dtsi b/arch/m68k/dts/mcf5249.dtsi index d45d5532ca..5adb843394 100644 --- a/arch/m68k/dts/mcf5249.dtsi +++ b/arch/m68k/dts/mcf5249.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5253.dtsi b/arch/m68k/dts/mcf5253.dtsi index b9816f4754..fca9df641c 100644 --- a/arch/m68k/dts/mcf5253.dtsi +++ b/arch/m68k/dts/mcf5253.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5271.dtsi b/arch/m68k/dts/mcf5271.dtsi index 5acf6994af..d77556e630 100644 --- a/arch/m68k/dts/mcf5271.dtsi +++ b/arch/m68k/dts/mcf5271.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5272.dtsi b/arch/m68k/dts/mcf5272.dtsi index 173baaba3f..fb918f37f0 100644 --- a/arch/m68k/dts/mcf5272.dtsi +++ b/arch/m68k/dts/mcf5272.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5275.dtsi b/arch/m68k/dts/mcf5275.dtsi index 3df17b445c..f1f9425647 100644 --- a/arch/m68k/dts/mcf5275.dtsi +++ b/arch/m68k/dts/mcf5275.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5282.dtsi b/arch/m68k/dts/mcf5282.dtsi index 640c1a32e4..b6e12d8ad9 100644 --- a/arch/m68k/dts/mcf5282.dtsi +++ b/arch/m68k/dts/mcf5282.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5301x.dtsi b/arch/m68k/dts/mcf5301x.dtsi index a13afad093..51546ce717 100644 --- a/arch/m68k/dts/mcf5301x.dtsi +++ b/arch/m68k/dts/mcf5301x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5307.dtsi b/arch/m68k/dts/mcf5307.dtsi index d6d386b22e..f8ca0e06d8 100644 --- a/arch/m68k/dts/mcf5307.dtsi +++ b/arch/m68k/dts/mcf5307.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5329.dtsi b/arch/m68k/dts/mcf5329.dtsi index 991985e48c..d5e276f949 100644 --- a/arch/m68k/dts/mcf5329.dtsi +++ b/arch/m68k/dts/mcf5329.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf537x.dtsi b/arch/m68k/dts/mcf537x.dtsi index 4fa0f4bc3d..ef93d3a9d6 100644 --- a/arch/m68k/dts/mcf537x.dtsi +++ b/arch/m68k/dts/mcf537x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf5441x.dtsi b/arch/m68k/dts/mcf5441x.dtsi index dcca36312f..1678edeb65 100644 --- a/arch/m68k/dts/mcf5441x.dtsi +++ b/arch/m68k/dts/mcf5441x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/mcf54xx.dtsi b/arch/m68k/dts/mcf54xx.dtsi index e9cebb9f74..cf854c950b 100644 --- a/arch/m68k/dts/mcf54xx.dtsi +++ b/arch/m68k/dts/mcf54xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/dts/stmark2.dts b/arch/m68k/dts/stmark2.dts index 3ba68b77d6..c27b61e253 100644 --- a/arch/m68k/dts/stmark2.dts +++ b/arch/m68k/dts/stmark2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index 9179622250..8a248f0332 100644 --- a/arch/m68k/include/asm/byteorder.h +++ b/arch/m68k/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew(a)freescale.com) diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h index 8ed2b4dbab..31be377188 100644 --- a/arch/m68k/include/asm/cache.h +++ b/arch/m68k/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ColdFire cache * diff --git a/arch/m68k/include/asm/coldfire/ata.h b/arch/m68k/include/asm/coldfire/ata.h index d85c052c2e..4732a32763 100644 --- a/arch/m68k/include/asm/coldfire/ata.h +++ b/arch/m68k/include/asm/coldfire/ata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ATA Internal Memory Map * diff --git a/arch/m68k/include/asm/coldfire/crossbar.h b/arch/m68k/include/asm/coldfire/crossbar.h index e26da13372..04b711528c 100644 --- a/arch/m68k/include/asm/coldfire/crossbar.h +++ b/arch/m68k/include/asm/coldfire/crossbar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Cross Bar Switch Internal Memory Map * diff --git a/arch/m68k/include/asm/coldfire/dspi.h b/arch/m68k/include/asm/coldfire/dspi.h index 7848dbdff4..d80643c299 100644 --- a/arch/m68k/include/asm/coldfire/dspi.h +++ b/arch/m68k/include/asm/coldfire/dspi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5227x Internal Memory Map * diff --git a/arch/m68k/include/asm/coldfire/edma.h b/arch/m68k/include/asm/coldfire/edma.h index a89d02ab21..9edfc25747 100644 --- a/arch/m68k/include/asm/coldfire/edma.h +++ b/arch/m68k/include/asm/coldfire/edma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * EDMA Internal Memory Map * diff --git a/arch/m68k/include/asm/coldfire/eport.h b/arch/m68k/include/asm/coldfire/eport.h index eb5c666361..e6cf1bc8ca 100644 --- a/arch/m68k/include/asm/coldfire/eport.h +++ b/arch/m68k/include/asm/coldfire/eport.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Edge Port Memory Map * diff --git a/arch/m68k/include/asm/coldfire/flexbus.h b/arch/m68k/include/asm/coldfire/flexbus.h index c47787a87e..974519fd77 100644 --- a/arch/m68k/include/asm/coldfire/flexbus.h +++ b/arch/m68k/include/asm/coldfire/flexbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * FlexBus Internal Memory Map * diff --git a/arch/m68k/include/asm/coldfire/flexcan.h b/arch/m68k/include/asm/coldfire/flexcan.h index 7d8e9e269b..e2ae560d9d 100644 --- a/arch/m68k/include/asm/coldfire/flexcan.h +++ b/arch/m68k/include/asm/coldfire/flexcan.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Flex CAN Memory Map * diff --git a/arch/m68k/include/asm/coldfire/intctrl.h b/arch/m68k/include/asm/coldfire/intctrl.h index 3f7c458ef0..de0fa0cd6b 100644 --- a/arch/m68k/include/asm/coldfire/intctrl.h +++ b/arch/m68k/include/asm/coldfire/intctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Interrupt Controller Memory Map * diff --git a/arch/m68k/include/asm/coldfire/lcd.h b/arch/m68k/include/asm/coldfire/lcd.h index a347bed838..4bfc81b9c2 100644 --- a/arch/m68k/include/asm/coldfire/lcd.h +++ b/arch/m68k/include/asm/coldfire/lcd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LCD controller Memory Map * diff --git a/arch/m68k/include/asm/coldfire/mdha.h b/arch/m68k/include/asm/coldfire/mdha.h index be3dae972a..49be5f5c0c 100644 --- a/arch/m68k/include/asm/coldfire/mdha.h +++ b/arch/m68k/include/asm/coldfire/mdha.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Message Digest Hardware Accelerator Memory Map * diff --git a/arch/m68k/include/asm/coldfire/pwm.h b/arch/m68k/include/asm/coldfire/pwm.h index 1b83acfe37..37fd682b98 100644 --- a/arch/m68k/include/asm/coldfire/pwm.h +++ b/arch/m68k/include/asm/coldfire/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Pulse Width Modulation Memory Map * diff --git a/arch/m68k/include/asm/coldfire/qspi.h b/arch/m68k/include/asm/coldfire/qspi.h index dd4565ae96..2e6bf83c32 100644 --- a/arch/m68k/include/asm/coldfire/qspi.h +++ b/arch/m68k/include/asm/coldfire/qspi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Queue Serial Peripheral Interface Memory Map * diff --git a/arch/m68k/include/asm/coldfire/rng.h b/arch/m68k/include/asm/coldfire/rng.h index 88124e36e2..d4fa251045 100644 --- a/arch/m68k/include/asm/coldfire/rng.h +++ b/arch/m68k/include/asm/coldfire/rng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RNG Memory Map * diff --git a/arch/m68k/include/asm/coldfire/skha.h b/arch/m68k/include/asm/coldfire/skha.h index 3b48dc970c..b6ef8fbda2 100644 --- a/arch/m68k/include/asm/coldfire/skha.h +++ b/arch/m68k/include/asm/coldfire/skha.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Symmetric Key Hardware Accelerator Memory Map * diff --git a/arch/m68k/include/asm/coldfire/ssi.h b/arch/m68k/include/asm/coldfire/ssi.h index 900d6bdcf6..7e0751a80f 100644 --- a/arch/m68k/include/asm/coldfire/ssi.h +++ b/arch/m68k/include/asm/coldfire/ssi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SSI Internal Memory Map * diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h index bad0026648..62894c3c4c 100644 --- a/arch/m68k/include/asm/config.h +++ b/arch/m68k/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/m68k/include/asm/fec.h b/arch/m68k/include/asm/fec.h index 759c8cfc43..6dcb84744e 100644 --- a/arch/m68k/include/asm/fec.h +++ b/arch/m68k/include/asm/fec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * fec.h -- Fast Ethernet Controller definitions * diff --git a/arch/m68k/include/asm/fsl_mcdmafec.h b/arch/m68k/include/asm/fsl_mcdmafec.h index de6c548faf..84d9859249 100644 --- a/arch/m68k/include/asm/fsl_mcdmafec.h +++ b/arch/m68k/include/asm/fsl_mcdmafec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * fsl_mcdmafec.h -- Multi-channel DMA Fast Ethernet Controller definitions * diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index 5f576ba16f..d3a7864a56 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 - 2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index aafa4f40cb..612be4473f 100644 --- a/arch/m68k/include/asm/immap.h +++ b/arch/m68k/include/asm/immap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ColdFire Internal Memory Map and Defines * diff --git a/arch/m68k/include/asm/immap_520x.h b/arch/m68k/include/asm/immap_520x.h index 7c7443b968..23645c6f3f 100644 --- a/arch/m68k/include/asm/immap_520x.h +++ b/arch/m68k/include/asm/immap_520x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF520x Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5235.h b/arch/m68k/include/asm/immap_5235.h index a1825c2a94..76b82328b8 100644 --- a/arch/m68k/include/asm/immap_5235.h +++ b/arch/m68k/include/asm/immap_5235.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5329 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5249.h b/arch/m68k/include/asm/immap_5249.h index aa4c3ef42f..9b5241979f 100644 --- a/arch/m68k/include/asm/immap_5249.h +++ b/arch/m68k/include/asm/immap_5249.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5249 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5253.h b/arch/m68k/include/asm/immap_5253.h index 1ab7243dfd..acde22831d 100644 --- a/arch/m68k/include/asm/immap_5253.h +++ b/arch/m68k/include/asm/immap_5253.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5253 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5271.h b/arch/m68k/include/asm/immap_5271.h index a5bf18c4b8..09c307282d 100644 --- a/arch/m68k/include/asm/immap_5271.h +++ b/arch/m68k/include/asm/immap_5271.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5272 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5272.h b/arch/m68k/include/asm/immap_5272.h index c5c3cc7512..a0097d8d5c 100644 --- a/arch/m68k/include/asm/immap_5272.h +++ b/arch/m68k/include/asm/immap_5272.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5272 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5275.h b/arch/m68k/include/asm/immap_5275.h index 9b8d71d30d..e798bcff4b 100644 --- a/arch/m68k/include/asm/immap_5275.h +++ b/arch/m68k/include/asm/immap_5275.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5274/5 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h index f810a4dd5c..97fc833a7b 100644 --- a/arch/m68k/include/asm/immap_5282.h +++ b/arch/m68k/include/asm/immap_5282.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5282 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5301x.h b/arch/m68k/include/asm/immap_5301x.h index e1f7858b10..d7b732353d 100644 --- a/arch/m68k/include/asm/immap_5301x.h +++ b/arch/m68k/include/asm/immap_5301x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5301x Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5307.h b/arch/m68k/include/asm/immap_5307.h index d6442d95b4..c963435946 100644 --- a/arch/m68k/include/asm/immap_5307.h +++ b/arch/m68k/include/asm/immap_5307.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/include/asm/immap_5329.h b/arch/m68k/include/asm/immap_5329.h index dbf3a2260e..3a83bdad51 100644 --- a/arch/m68k/include/asm/immap_5329.h +++ b/arch/m68k/include/asm/immap_5329.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5329 Internal Memory Map * diff --git a/arch/m68k/include/asm/immap_5441x.h b/arch/m68k/include/asm/immap_5441x.h index 708d0db755..66b58ca1c7 100644 --- a/arch/m68k/include/asm/immap_5441x.h +++ b/arch/m68k/include/asm/immap_5441x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5441x Internal Memory Map * diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 35ad4a1c04..0a8ef808a9 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * IO header file * diff --git a/arch/m68k/include/asm/m520x.h b/arch/m68k/include/asm/m520x.h index ce271eca91..46dbf9ded4 100644 --- a/arch/m68k/include/asm/m520x.h +++ b/arch/m68k/include/asm/m520x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * m520x.h -- Definitions for Freescale Coldfire 520x * diff --git a/arch/m68k/include/asm/m5235.h b/arch/m68k/include/asm/m5235.h index 2d942f30fc..964972b242 100644 --- a/arch/m68k/include/asm/m5235.h +++ b/arch/m68k/include/asm/m5235.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5329.h -- Definitions for Freescale Coldfire 5329 * diff --git a/arch/m68k/include/asm/m5249.h b/arch/m68k/include/asm/m5249.h index afafb4e547..21ac7420d0 100644 --- a/arch/m68k/include/asm/m5249.h +++ b/arch/m68k/include/asm/m5249.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5249.h -- Definitions for Motorola Coldfire 5249 * diff --git a/arch/m68k/include/asm/m5253.h b/arch/m68k/include/asm/m5253.h index a2fdad78d4..41fef0670f 100644 --- a/arch/m68k/include/asm/m5253.h +++ b/arch/m68k/include/asm/m5253.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew(a)freescale.com) diff --git a/arch/m68k/include/asm/m5271.h b/arch/m68k/include/asm/m5271.h index e63b42c00d..f003a2b052 100644 --- a/arch/m68k/include/asm/m5271.h +++ b/arch/m68k/include/asm/m5271.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5271.h -- Definitions for Motorola Coldfire 5271 * diff --git a/arch/m68k/include/asm/m5272.h b/arch/m68k/include/asm/m5272.h index 1315845528..f75bcb9898 100644 --- a/arch/m68k/include/asm/m5272.h +++ b/arch/m68k/include/asm/m5272.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5272.h -- Definitions for Motorola Coldfire 5272 * diff --git a/arch/m68k/include/asm/m5275.h b/arch/m68k/include/asm/m5275.h index 86790c52c3..081cd047f0 100644 --- a/arch/m68k/include/asm/m5275.h +++ b/arch/m68k/include/asm/m5275.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5275 Internal Memory Map * diff --git a/arch/m68k/include/asm/m5282.h b/arch/m68k/include/asm/m5282.h index 180f20386f..a7707b63da 100644 --- a/arch/m68k/include/asm/m5282.h +++ b/arch/m68k/include/asm/m5282.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5282.h -- Definitions for Motorola Coldfire 5282 */ diff --git a/arch/m68k/include/asm/m5301x.h b/arch/m68k/include/asm/m5301x.h index 40a05d2b91..be25d7d952 100644 --- a/arch/m68k/include/asm/m5301x.h +++ b/arch/m68k/include/asm/m5301x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * m5301x.h -- Definitions for Freescale Coldfire 5301x * diff --git a/arch/m68k/include/asm/m5307.h b/arch/m68k/include/asm/m5307.h index 67547d2dd9..7e0796d9f5 100644 --- a/arch/m68k/include/asm/m5307.h +++ b/arch/m68k/include/asm/m5307.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> * diff --git a/arch/m68k/include/asm/m5329.h b/arch/m68k/include/asm/m5329.h index 4e30ddf0dc..5e62f98b2d 100644 --- a/arch/m68k/include/asm/m5329.h +++ b/arch/m68k/include/asm/m5329.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * mcf5329.h -- Definitions for Freescale Coldfire 5329 * diff --git a/arch/m68k/include/asm/m5441x.h b/arch/m68k/include/asm/m5441x.h index f2e7e7fff4..bcaac50653 100644 --- a/arch/m68k/include/asm/m5441x.h +++ b/arch/m68k/include/asm/m5441x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MCF5441X Internal Memory Map * diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h index d419824806..42da5b8a2f 100644 --- a/arch/m68k/include/asm/ptrace.h +++ b/arch/m68k/include/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _M68K_PTRACE_H #define _M68K_PTRACE_H diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h index 1fb492c76e..2e160f8dde 100644 --- a/arch/m68k/include/asm/rtc.h +++ b/arch/m68k/include/asm/rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RealTime Clock * diff --git a/arch/m68k/include/asm/sections.h b/arch/m68k/include/asm/sections.h index 3cb8aa0326..971e96d7e1 100644 --- a/arch/m68k/include/asm/sections.h +++ b/arch/m68k/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/m68k/include/asm/timer.h b/arch/m68k/include/asm/timer.h index 982d71a542..bac37d6065 100644 --- a/arch/m68k/include/asm/timer.h +++ b/arch/m68k/include/asm/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * timer.h -- ColdFire internal TIMER support defines. * diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/u-boot.h index 803f76fce3..75b89db00e 100644 --- a/arch/m68k/include/asm/u-boot.h +++ b/arch/m68k/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 - 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/include/asm/uart.h b/arch/m68k/include/asm/uart.h index e4a9650a03..acf38d3995 100644 --- a/arch/m68k/include/asm/uart.h +++ b/arch/m68k/include/asm/uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * uart.h -- ColdFire internal UART support defines. * diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index 6e1fd938f5..79de62ec21 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/lib/ashldi3.c b/arch/m68k/lib/ashldi3.c index 9a4bc676bf..8f7332c53f 100644 --- a/arch/m68k/lib/ashldi3.c +++ b/arch/m68k/lib/ashldi3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ashldi3.c extracted from gcc-2.7.2.3/libgcc2.c and * gcc-2.7.2.3/longlong.h diff --git a/arch/m68k/lib/ashrdi3.c b/arch/m68k/lib/ashrdi3.c index e144378b7f..88a8c94ea6 100644 --- a/arch/m68k/lib/ashrdi3.c +++ b/arch/m68k/lib/ashrdi3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ashrdi3.c extracted from gcc-2.7.2/libgcc2.c which is: * Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 0b4629f1c8..c2cd785fdc 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/lib/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PPC-specific information for the 'bd' command * diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index f18bed235d..68a0d85224 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/lib/cache.c b/arch/m68k/lib/cache.c index 57e5632fdb..433c8ea4bc 100644 --- a/arch/m68k/lib/cache.c +++ b/arch/m68k/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c index eecea7a023..d6af880a96 100644 --- a/arch/m68k/lib/fec.c +++ b/arch/m68k/lib/fec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2019 Angelo Dureghello <angelo.dureghello(a)timesys.com> */ diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index 799daab561..2775fd490d 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/m68k/lib/lshrdi3.c b/arch/m68k/lib/lshrdi3.c index e639e676a2..4dcf58211c 100644 --- a/arch/m68k/lib/lshrdi3.c +++ b/arch/m68k/lib/lshrdi3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * lshrdi3.c extracted from gcc-2.7.2.3/libgcc2.c and * gcc-2.7.2.3/longlong.h diff --git a/arch/m68k/lib/muldi3.c b/arch/m68k/lib/muldi3.c index c42ca1d753..fc84f09d2d 100644 --- a/arch/m68k/lib/muldi3.c +++ b/arch/m68k/lib/muldi3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and * gcc-2.7.2.3/longlong.h diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index 61db1e6c50..ef4e2f83cb 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner(a)telex.de> * diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 28fe803928..c4d387502c 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Josef Baumgartner <josef.baumgartner(a)telex.de> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index dd68ce441b..fb73dcb4b5 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/microblaze/cpu/start.o diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk index 64c3f31319..16122ece19 100644 --- a/arch/microblaze/config.mk +++ b/arch/microblaze/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007-2008 Michal Simek # Michal SIMEK <monstr(a)monstr.eu> diff --git a/arch/microblaze/cpu/Makefile b/arch/microblaze/cpu/Makefile index b8c1dcbe14..144babb588 100644 --- a/arch/microblaze/cpu/Makefile +++ b/arch/microblaze/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c index 829e6c7ae6..3c9ba2b159 100644 --- a/arch/microblaze/cpu/cache.c +++ b/arch/microblaze/cpu/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Michal Simek * diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c index 6b15d6ca41..32d312e84a 100644 --- a/arch/microblaze/cpu/cpuinfo.c +++ b/arch/microblaze/cpu/cpuinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index 9414776afa..d961b51f70 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Michal Simek * diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c index ac53208bda..331d570ceb 100644 --- a/arch/microblaze/cpu/interrupts.c +++ b/arch/microblaze/cpu/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Michal Simek * (C) Copyright 2004 Atmark Techno, Inc. diff --git a/arch/microblaze/cpu/irq.S b/arch/microblaze/cpu/irq.S index ff3e6af918..bdd89b291a 100644 --- a/arch/microblaze/cpu/irq.S +++ b/arch/microblaze/cpu/irq.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Michal Simek * diff --git a/arch/microblaze/cpu/pvr.c b/arch/microblaze/cpu/pvr.c index 23c0f912d4..6eece81f28 100644 --- a/arch/microblaze/cpu/pvr.c +++ b/arch/microblaze/cpu/pvr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index c21beafdb8..867e8a8dc4 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 - 2014 Xilinx, Inc * diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index c1e0fcda0a..ac3bc56108 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Michal Simek * (C) Copyright 2004 Atmark Techno, Inc. diff --git a/arch/microblaze/cpu/u-boot-spl.lds b/arch/microblaze/cpu/u-boot-spl.lds index 09abbea84d..35007fc8d0 100644 --- a/arch/microblaze/cpu/u-boot-spl.lds +++ b/arch/microblaze/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 - 2014 Xilinx, Inc * diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds index a2c8fb2e21..cf39c6c16c 100644 --- a/arch/microblaze/cpu/u-boot.lds +++ b/arch/microblaze/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004 Atmark Techno, Inc. * diff --git a/arch/microblaze/dts/Makefile b/arch/microblaze/dts/Makefile index 427a8f9aac..5a78fafc35 100644 --- a/arch/microblaze/dts/Makefile +++ b/arch/microblaze/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-y += $(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)).dtb diff --git a/arch/microblaze/include/asm/asm.h b/arch/microblaze/include/asm/asm.h index fb8fe386fc..72337223a2 100644 --- a/arch/microblaze/include/asm/asm.h +++ b/arch/microblaze/include/asm/asm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Michal Simek * diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h index c39b66dd7d..0ae3a629a6 100644 --- a/arch/microblaze/include/asm/cache.h +++ b/arch/microblaze/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h index bad0026648..62894c3c4c 100644 --- a/arch/microblaze/include/asm/config.h +++ b/arch/microblaze/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 3c58e52217..800dcf924b 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index 93506dec89..9d4777167f 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004 Atmark Techno, Inc. * diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 632bb236fb..64fe905fe4 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/asm-microblaze/io.h -- Misc I/O operations * diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h index c0423eaf93..3d9e535b78 100644 --- a/arch/microblaze/include/asm/processor.h +++ b/arch/microblaze/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Michal Simek <monstr(a)monstr.eu> */ diff --git a/arch/microblaze/include/asm/pvr.h b/arch/microblaze/include/asm/pvr.h index bfe159af79..d8c23f70d6 100644 --- a/arch/microblaze/include/asm/pvr.h +++ b/arch/microblaze/include/asm/pvr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/arch/microblaze/include/asm/sections.h b/arch/microblaze/include/asm/sections.h index 740783cdf8..dd697eac75 100644 --- a/arch/microblaze/include/asm/sections.h +++ b/arch/microblaze/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/microblaze/include/asm/spl.h b/arch/microblaze/include/asm/spl.h index 7557dc2a5a..99c1a42206 100644 --- a/arch/microblaze/include/asm/spl.h +++ b/arch/microblaze/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 - 2014 Xilinx, Inc * diff --git a/arch/microblaze/include/asm/u-boot.h b/arch/microblaze/include/asm/u-boot.h index a922122f2b..9f464c61fe 100644 --- a/arch/microblaze/include/asm/u-boot.h +++ b/arch/microblaze/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004 Atmark Techno, Inc. * diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile index dfd8135f4f..3986eacecc 100644 --- a/arch/microblaze/lib/Makefile +++ b/arch/microblaze/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/microblaze/lib/bdinfo.c b/arch/microblaze/lib/bdinfo.c index 41b7a216a4..84747731af 100644 --- a/arch/microblaze/lib/bdinfo.c +++ b/arch/microblaze/lib/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 930384f401..e217ca05e0 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Michal Simek * (C) Copyright 2004 Atmark Techno, Inc. diff --git a/arch/microblaze/lib/muldi3.c b/arch/microblaze/lib/muldi3.c index 05389bd78f..bb1474ab65 100644 --- a/arch/microblaze/lib/muldi3.c +++ b/arch/microblaze/lib/muldi3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot - muldi3.c contains routines for mult and div * diff --git a/arch/mips/Makefile b/arch/mips/Makefile index a007914590..6c2ff2153e 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/mips/cpu/start.o diff --git a/arch/mips/Makefile.postlink b/arch/mips/Makefile.postlink index 9ad7d4e453..d6cc6bc579 100644 --- a/arch/mips/Makefile.postlink +++ b/arch/mips/Makefile.postlink @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Imagination Technologies Ltd. diff --git a/arch/mips/config.mk b/arch/mips/config.mk index 745f03190e..23062db6f7 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/mips/cpu/Makefile b/arch/mips/cpu/Makefile index 6df7bb4e48..aacfedc30f 100644 --- a/arch/mips/cpu/Makefile +++ b/arch/mips/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later extra-y = start.o diff --git a/arch/mips/cpu/cm_init.S b/arch/mips/cpu/cm_init.S index e0d76ce79a..c1a8af4733 100644 --- a/arch/mips/cpu/cm_init.S +++ b/arch/mips/cpu/cm_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MIPS Coherence Manager (CM) Initialisation * diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c index f0e20da28f..94b18bfa7c 100644 --- a/arch/mips/cpu/cpu.c +++ b/arch/mips/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> diff --git a/arch/mips/cpu/interrupts.c b/arch/mips/cpu/interrupts.c index b3ba9aaeae..0351d69e51 100644 --- a/arch/mips/cpu/interrupts.c +++ b/arch/mips/cpu/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> diff --git a/arch/mips/cpu/start.S b/arch/mips/cpu/start.S index a95c95bc78..46afda29dd 100644 --- a/arch/mips/cpu/start.S +++ b/arch/mips/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Startup Code for MIPS32 CPU-core * diff --git a/arch/mips/cpu/time.c b/arch/mips/cpu/time.c index 5e7a7144d0..065ed78e80 100644 --- a/arch/mips/cpu/time.c +++ b/arch/mips/cpu/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds index 310a5c5053..47d0065361 100644 --- a/arch/mips/cpu/u-boot-spl.lds +++ b/arch/mips/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ MEMORY { .spl_mem : ORIGIN = IMAGE_TEXT_BASE, \ LENGTH = IMAGE_MAX_SIZE } diff --git a/arch/mips/cpu/u-boot.lds b/arch/mips/cpu/u-boot.lds index 9a4ebcd151..c6e805ee52 100644 --- a/arch/mips/cpu/u-boot.lds +++ b/arch/mips/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Wolfgang Denk Engineering, <wd(a)denx.de> diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index 1b179116c9..a2b1beeee0 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_AP121) += ap121.dtb dtb-$(CONFIG_TARGET_AP143) += ap143.dtb diff --git a/arch/mips/dts/ap121.dts b/arch/mips/dts/ap121.dts index f30af50216..5cdbc5f24b 100644 --- a/arch/mips/dts/ap121.dts +++ b/arch/mips/dts/ap121.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/dts/ap143.dts b/arch/mips/dts/ap143.dts index 93a098052c..a112c8508b 100644 --- a/arch/mips/dts/ap143.dts +++ b/arch/mips/dts/ap143.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/dts/ap152.dts b/arch/mips/dts/ap152.dts index 1722290c73..df1b3c9272 100644 --- a/arch/mips/dts/ap152.dts +++ b/arch/mips/dts/ap152.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/arch/mips/dts/ar933x.dtsi b/arch/mips/dts/ar933x.dtsi index c4f29324ef..3a096e5ced 100644 --- a/arch/mips/dts/ar933x.dtsi +++ b/arch/mips/dts/ar933x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/dts/ar934x.dtsi b/arch/mips/dts/ar934x.dtsi index 9bc2da1121..421d8e94bd 100644 --- a/arch/mips/dts/ar934x.dtsi +++ b/arch/mips/dts/ar934x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/mips/dts/brcm,bcm3380.dtsi b/arch/mips/dts/brcm,bcm3380.dtsi index c79a6db42f..f4df29404e 100644 --- a/arch/mips/dts/brcm,bcm3380.dtsi +++ b/arch/mips/dts/brcm,bcm3380.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6318.dtsi b/arch/mips/dts/brcm,bcm6318.dtsi index 5813de7bf6..ee3f1fe552 100644 --- a/arch/mips/dts/brcm,bcm6318.dtsi +++ b/arch/mips/dts/brcm,bcm6318.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm63268.dtsi b/arch/mips/dts/brcm,bcm63268.dtsi index 587a6e8042..9b8c28235a 100644 --- a/arch/mips/dts/brcm,bcm63268.dtsi +++ b/arch/mips/dts/brcm,bcm63268.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6328.dtsi b/arch/mips/dts/brcm,bcm6328.dtsi index 7b9c09c68a..7c691fd1a0 100644 --- a/arch/mips/dts/brcm,bcm6328.dtsi +++ b/arch/mips/dts/brcm,bcm6328.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6338.dtsi b/arch/mips/dts/brcm,bcm6338.dtsi index 92e4d62941..4d55f80a37 100644 --- a/arch/mips/dts/brcm,bcm6338.dtsi +++ b/arch/mips/dts/brcm,bcm6338.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6348.dtsi b/arch/mips/dts/brcm,bcm6348.dtsi index 3f1471b67c..a1b8710e9d 100644 --- a/arch/mips/dts/brcm,bcm6348.dtsi +++ b/arch/mips/dts/brcm,bcm6348.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6358.dtsi b/arch/mips/dts/brcm,bcm6358.dtsi index d53e4f7ac0..4424b76560 100644 --- a/arch/mips/dts/brcm,bcm6358.dtsi +++ b/arch/mips/dts/brcm,bcm6358.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6362.dtsi b/arch/mips/dts/brcm,bcm6362.dtsi index b1f0085c96..7d731918b7 100644 --- a/arch/mips/dts/brcm,bcm6362.dtsi +++ b/arch/mips/dts/brcm,bcm6362.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6368.dtsi b/arch/mips/dts/brcm,bcm6368.dtsi index ea50ff9200..20da0ee1ad 100644 --- a/arch/mips/dts/brcm,bcm6368.dtsi +++ b/arch/mips/dts/brcm,bcm6368.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/brcm,bcm6838.dtsi b/arch/mips/dts/brcm,bcm6838.dtsi index 4032e24528..a468ed527a 100644 --- a/arch/mips/dts/brcm,bcm6838.dtsi +++ b/arch/mips/dts/brcm,bcm6838.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/arch/mips/dts/brcm,bcm968380gerg.dts b/arch/mips/dts/brcm,bcm968380gerg.dts index c7835a7c0a..f6fb122574 100644 --- a/arch/mips/dts/brcm,bcm968380gerg.dts +++ b/arch/mips/dts/brcm,bcm968380gerg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/arch/mips/dts/ci20.dts b/arch/mips/dts/ci20.dts index 8d6417af73..22ae576183 100644 --- a/arch/mips/dts/ci20.dts +++ b/arch/mips/dts/ci20.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/arch/mips/dts/comtrend,ar-5315u.dts b/arch/mips/dts/comtrend,ar-5315u.dts index 65f5184c09..9959a3511b 100644 --- a/arch/mips/dts/comtrend,ar-5315u.dts +++ b/arch/mips/dts/comtrend,ar-5315u.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/comtrend,ar-5387un.dts b/arch/mips/dts/comtrend,ar-5387un.dts index e5163d6147..c410e4833c 100644 --- a/arch/mips/dts/comtrend,ar-5387un.dts +++ b/arch/mips/dts/comtrend,ar-5387un.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/comtrend,ct-5361.dts b/arch/mips/dts/comtrend,ct-5361.dts index 8170095abd..90024e2adc 100644 --- a/arch/mips/dts/comtrend,ct-5361.dts +++ b/arch/mips/dts/comtrend,ct-5361.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/comtrend,vr-3032u.dts b/arch/mips/dts/comtrend,vr-3032u.dts index 55a70d215e..348767d1e2 100644 --- a/arch/mips/dts/comtrend,vr-3032u.dts +++ b/arch/mips/dts/comtrend,vr-3032u.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/comtrend,wap-5813n.dts b/arch/mips/dts/comtrend,wap-5813n.dts index 2625d4e03a..f1c9128e5f 100644 --- a/arch/mips/dts/comtrend,wap-5813n.dts +++ b/arch/mips/dts/comtrend,wap-5813n.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/huawei,hg556a.dts b/arch/mips/dts/huawei,hg556a.dts index ce28a25d29..0e6c458943 100644 --- a/arch/mips/dts/huawei,hg556a.dts +++ b/arch/mips/dts/huawei,hg556a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/jr2_pcb110.dts b/arch/mips/dts/jr2_pcb110.dts index 6562221794..78ee0d3456 100644 --- a/arch/mips/dts/jr2_pcb110.dts +++ b/arch/mips/dts/jr2_pcb110.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/jr2_pcb111.dts b/arch/mips/dts/jr2_pcb111.dts index 74305a8f33..69f6ace592 100644 --- a/arch/mips/dts/jr2_pcb111.dts +++ b/arch/mips/dts/jr2_pcb111.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/jz4780.dtsi b/arch/mips/dts/jz4780.dtsi index f62a7a95f8..6d19cbddea 100644 --- a/arch/mips/dts/jz4780.dtsi +++ b/arch/mips/dts/jz4780.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dt-bindings/clock/jz4780-cgu.h> diff --git a/arch/mips/dts/luton_pcb090.dts b/arch/mips/dts/luton_pcb090.dts index ea3e3b7fbd..a0d558b535 100644 --- a/arch/mips/dts/luton_pcb090.dts +++ b/arch/mips/dts/luton_pcb090.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/luton_pcb091.dts b/arch/mips/dts/luton_pcb091.dts index cb78c5751b..5c7e134391 100644 --- a/arch/mips/dts/luton_pcb091.dts +++ b/arch/mips/dts/luton_pcb091.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mrvl,cn73xx.dtsi b/arch/mips/dts/mrvl,cn73xx.dtsi index 23aac65406..d8040d6b45 100644 --- a/arch/mips/dts/mrvl,cn73xx.dtsi +++ b/arch/mips/dts/mrvl,cn73xx.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell / Cavium Inc. CN73xx */ diff --git a/arch/mips/dts/mrvl,octeon-ebb7304.dts b/arch/mips/dts/mrvl,octeon-ebb7304.dts index 59e43b9c77..0980b5f798 100644 --- a/arch/mips/dts/mrvl,octeon-ebb7304.dts +++ b/arch/mips/dts/mrvl,octeon-ebb7304.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell / Cavium Inc. EVB CN7300 */ diff --git a/arch/mips/dts/mrvl,octeon-nic23.dts b/arch/mips/dts/mrvl,octeon-nic23.dts index e58a66431a..87179e3635 100644 --- a/arch/mips/dts/mrvl,octeon-nic23.dts +++ b/arch/mips/dts/mrvl,octeon-nic23.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell / Cavium Inc. NIC23 */ diff --git a/arch/mips/dts/mscc,jr2.dtsi b/arch/mips/dts/mscc,jr2.dtsi index 87db7cae9c..567ba0a571 100644 --- a/arch/mips/dts/mscc,jr2.dtsi +++ b/arch/mips/dts/mscc,jr2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mscc,luton.dtsi b/arch/mips/dts/mscc,luton.dtsi index c8231018f1..9c182a1524 100644 --- a/arch/mips/dts/mscc,luton.dtsi +++ b/arch/mips/dts/mscc,luton.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mscc,ocelot.dtsi b/arch/mips/dts/mscc,ocelot.dtsi index aeb4bf8f4b..1277213504 100644 --- a/arch/mips/dts/mscc,ocelot.dtsi +++ b/arch/mips/dts/mscc,ocelot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mscc,ocelot_pcb.dtsi b/arch/mips/dts/mscc,ocelot_pcb.dtsi index 885b5643f7..b52fe45232 100644 --- a/arch/mips/dts/mscc,ocelot_pcb.dtsi +++ b/arch/mips/dts/mscc,ocelot_pcb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mscc,serval.dtsi b/arch/mips/dts/mscc,serval.dtsi index 90eeebd3a4..1f13ba1b08 100644 --- a/arch/mips/dts/mscc,serval.dtsi +++ b/arch/mips/dts/mscc,serval.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/mscc,servalt.dtsi b/arch/mips/dts/mscc,servalt.dtsi index 45ae2de5e8..437d0a0879 100644 --- a/arch/mips/dts/mscc,servalt.dtsi +++ b/arch/mips/dts/mscc,servalt.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/netgear,cg3100d.dts b/arch/mips/dts/netgear,cg3100d.dts index 1c5b8ebec8..d1fb3cd93a 100644 --- a/arch/mips/dts/netgear,cg3100d.dts +++ b/arch/mips/dts/netgear,cg3100d.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/netgear,dgnd3700v2.dts b/arch/mips/dts/netgear,dgnd3700v2.dts index 72314558da..f9a019b4ca 100644 --- a/arch/mips/dts/netgear,dgnd3700v2.dts +++ b/arch/mips/dts/netgear,dgnd3700v2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/ocelot_pcb120.dts b/arch/mips/dts/ocelot_pcb120.dts index e608029a3f..d95145d03c 100644 --- a/arch/mips/dts/ocelot_pcb120.dts +++ b/arch/mips/dts/ocelot_pcb120.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/ocelot_pcb123.dts b/arch/mips/dts/ocelot_pcb123.dts index 1b0156e503..ffa734b69b 100644 --- a/arch/mips/dts/ocelot_pcb123.dts +++ b/arch/mips/dts/ocelot_pcb123.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/pic32mzda.dtsi b/arch/mips/dts/pic32mzda.dtsi index 43cd7cf304..f5494d78b5 100644 --- a/arch/mips/dts/pic32mzda.dtsi +++ b/arch/mips/dts/pic32mzda.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Microchip Technology, Inc. * Purna Chandra Mandal, <purna.mandal(a)microchip.com> diff --git a/arch/mips/dts/pic32mzda_sk.dts b/arch/mips/dts/pic32mzda_sk.dts index b9b78b507e..0b74befae1 100644 --- a/arch/mips/dts/pic32mzda_sk.dts +++ b/arch/mips/dts/pic32mzda_sk.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Purna Chandra Mandal, purna.mandal(a)microchip.com */ diff --git a/arch/mips/dts/qca953x.dtsi b/arch/mips/dts/qca953x.dtsi index 148de76863..6c2823c503 100644 --- a/arch/mips/dts/qca953x.dtsi +++ b/arch/mips/dts/qca953x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/dts/qca956x.dtsi b/arch/mips/dts/qca956x.dtsi index 6cb360b3f8..b006041b02 100644 --- a/arch/mips/dts/qca956x.dtsi +++ b/arch/mips/dts/qca956x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/arch/mips/dts/sagem,f(a)st1704.dts b/arch/mips/dts/sagem,f(a)st1704.dts index 4e1340bfd5..f833f3d0da 100644 --- a/arch/mips/dts/sagem,f(a)st1704.dts +++ b/arch/mips/dts/sagem,f(a)st1704.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/serval2_pcb112.dts b/arch/mips/dts/serval2_pcb112.dts index 5777a773b1..a750ed562e 100644 --- a/arch/mips/dts/serval2_pcb112.dts +++ b/arch/mips/dts/serval2_pcb112.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/serval_pcb105.dts b/arch/mips/dts/serval_pcb105.dts index 667277080f..dd2ee37e1f 100644 --- a/arch/mips/dts/serval_pcb105.dts +++ b/arch/mips/dts/serval_pcb105.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/serval_pcb106.dts b/arch/mips/dts/serval_pcb106.dts index e77c357868..609ea60ef7 100644 --- a/arch/mips/dts/serval_pcb106.dts +++ b/arch/mips/dts/serval_pcb106.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/servalt_pcb116.dts b/arch/mips/dts/servalt_pcb116.dts index 313b0998e6..c6054d1490 100644 --- a/arch/mips/dts/servalt_pcb116.dts +++ b/arch/mips/dts/servalt_pcb116.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/dts/sfr,nb4-ser.dts b/arch/mips/dts/sfr,nb4-ser.dts index ad3a4ce8a8..1b02e626e1 100644 --- a/arch/mips/dts/sfr,nb4-ser.dts +++ b/arch/mips/dts/sfr,nb4-ser.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/arch/mips/dts/skeleton.dtsi b/arch/mips/dts/skeleton.dtsi index 422fcdb176..c185c127c8 100644 --- a/arch/mips/dts/skeleton.dtsi +++ b/arch/mips/dts/skeleton.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Skeleton device tree; the bare minimum needed to boot; just include and * add a compatible value. The bootloader will typically populate the memory diff --git a/arch/mips/dts/tplink_wdr4300.dts b/arch/mips/dts/tplink_wdr4300.dts index 2bcad6d201..abde05c8dd 100644 --- a/arch/mips/dts/tplink_wdr4300.dts +++ b/arch/mips/dts/tplink_wdr4300.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/mips/dts/vocore_vocore2.dts b/arch/mips/dts/vocore_vocore2.dts index 9adf39652f..c463ee3c5d 100644 --- a/arch/mips/dts/vocore_vocore2.dts +++ b/arch/mips/dts/vocore_vocore2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Mauro Condarelli <mc5686(a)mclink.it> */ diff --git a/arch/mips/include/asm/asm-offsets.h b/arch/mips/include/asm/asm-offsets.h index b722499572..47182f70f6 100644 --- a/arch/mips/include/asm/asm-offsets.h +++ b/arch/mips/include/asm/asm-offsets.h @@ -1,3 +1,3 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #include <generated/asm-offsets.h> diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index c4f08b7820..8f3ff6fa79 100644 --- a/arch/mips/include/asm/atomic.h +++ b/arch/mips/include/asm/atomic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Cadence Design Systems Inc. */ diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h index d3e8a8cd41..0991fc3f32 100644 --- a/arch/mips/include/asm/cache.h +++ b/arch/mips/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h index c695ffc71f..800f8428be 100644 --- a/arch/mips/include/asm/cm.h +++ b/arch/mips/include/asm/cm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MIPS Coherence Manager (CM) Register Definitions * diff --git a/arch/mips/include/asm/config.h b/arch/mips/include/asm/config.h index bad0026648..62894c3c4c 100644 --- a/arch/mips/include/asm/config.h +++ b/arch/mips/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index f0d3b07bf1..8ea8265b61 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/mips/include/asm/relocs.h b/arch/mips/include/asm/relocs.h index b9b0261f62..709b8d52d5 100644 --- a/arch/mips/include/asm/relocs.h +++ b/arch/mips/include/asm/relocs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MIPS Relocations * diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h index 93c30e9724..49afc41789 100644 --- a/arch/mips/include/asm/sections.h +++ b/arch/mips/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/mips/include/asm/spl.h b/arch/mips/include/asm/spl.h index 0a847edec8..1b19f1d59b 100644 --- a/arch/mips/include/asm/spl.h +++ b/arch/mips/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/mips/include/asm/u-boot-mips.h b/arch/mips/include/asm/u-boot-mips.h index 8b37cc4029..ae12c37d33 100644 --- a/arch/mips/include/asm/u-boot-mips.h +++ b/arch/mips/include/asm/u-boot-mips.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _U_BOOT_MIPS_H_ #define _U_BOOT_MIPS_H_ diff --git a/arch/mips/include/asm/u-boot.h b/arch/mips/include/asm/u-boot.h index 4a9bbaf7cc..996dde3aed 100644 --- a/arch/mips/include/asm/u-boot.h +++ b/arch/mips/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 9ee1fcb5c7..e559c174c5 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/mips/lib/asm-offsets.c b/arch/mips/lib/asm-offsets.c index 22dc14b107..8c7496b182 100644 --- a/arch/mips/lib/asm-offsets.c +++ b/arch/mips/lib/asm-offsets.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * offset.c: Calculate pt_regs and task_struct offsets. * diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c index 1b29d637ce..9a6d13ed11 100644 --- a/arch/mips/lib/boot.c +++ b/arch/mips/lib/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index ab92bd06b0..9014761efa 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index d23b38d6b9..17d5864d83 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, <wd(a)denx.de> diff --git a/arch/mips/lib/cache_init.S b/arch/mips/lib/cache_init.S index 602741c65d..e6dc139bf9 100644 --- a/arch/mips/lib/cache_init.S +++ b/arch/mips/lib/cache_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Cache-handling routined for MIPS CPUs * diff --git a/arch/mips/lib/genex.S b/arch/mips/lib/genex.S index aba8c48827..367cadd99d 100644 --- a/arch/mips/lib/genex.S +++ b/arch/mips/lib/genex.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1994 - 2000, 2001, 2003 Ralf Baechle * Copyright (C) 1999, 2000 Silicon Graphics, Inc. diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index 9cf6809f40..b02b8241d2 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MIPS Relocation * diff --git a/arch/mips/lib/spl.c b/arch/mips/lib/spl.c index f96fda5b2d..e75444d967 100644 --- a/arch/mips/lib/spl.c +++ b/arch/mips/lib/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c index 930d21856d..d77ae8c37b 100644 --- a/arch/mips/lib/stack.c +++ b/arch/mips/lib/stack.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <init.h> diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 7a682f256a..bf8b10b131 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 1994 - 1999, 2000, 01, 06 Ralf Baechle * Copyright (C) 1995, 1996 Paul M. Antoine diff --git a/arch/mips/mach-ath79/Makefile b/arch/mips/mach-ath79/Makefile index fbd40c02be..db1e601c5c 100644 --- a/arch/mips/mach-ath79/Makefile +++ b/arch/mips/mach-ath79/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += reset.o obj-y += cpu.o diff --git a/arch/mips/mach-ath79/ar933x/Makefile b/arch/mips/mach-ath79/ar933x/Makefile index 5ba849c738..084f012ede 100644 --- a/arch/mips/mach-ath79/ar933x/Makefile +++ b/arch/mips/mach-ath79/ar933x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += clk.o obj-y += ddr.o diff --git a/arch/mips/mach-ath79/ar933x/clk.c b/arch/mips/mach-ath79/ar933x/clk.c index 68d48939d7..2e32047624 100644 --- a/arch/mips/mach-ath79/ar933x/clk.c +++ b/arch/mips/mach-ath79/ar933x/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/mach-ath79/ar933x/ddr.c b/arch/mips/mach-ath79/ar933x/ddr.c index 09166ecf8f..34676efc00 100644 --- a/arch/mips/mach-ath79/ar933x/ddr.c +++ b/arch/mips/mach-ath79/ar933x/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> * Based on Atheros LSDK/QSDK diff --git a/arch/mips/mach-ath79/ar933x/lowlevel_init.S b/arch/mips/mach-ath79/ar933x/lowlevel_init.S index 390d4b3896..68ad7adc9b 100644 --- a/arch/mips/mach-ath79/ar933x/lowlevel_init.S +++ b/arch/mips/mach-ath79/ar933x/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> * Based on Atheros LSDK/QSDK and u-boot_mod project diff --git a/arch/mips/mach-ath79/ar934x/Makefile b/arch/mips/mach-ath79/ar934x/Makefile index 0beaa9b0af..83b036c06f 100644 --- a/arch/mips/mach-ath79/ar934x/Makefile +++ b/arch/mips/mach-ath79/ar934x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += cpu.o obj-y += clk.o diff --git a/arch/mips/mach-ath79/ar934x/clk.c b/arch/mips/mach-ath79/ar934x/clk.c index 6ed4057353..42014bd976 100644 --- a/arch/mips/mach-ath79/ar934x/clk.c +++ b/arch/mips/mach-ath79/ar934x/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/mips/mach-ath79/ar934x/cpu.c b/arch/mips/mach-ath79/ar934x/cpu.c index 7daac03671..7a66250786 100644 --- a/arch/mips/mach-ath79/ar934x/cpu.c +++ b/arch/mips/mach-ath79/ar934x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c index 9df48b97ef..d3ce917a4e 100644 --- a/arch/mips/mach-ath79/ar934x/ddr.c +++ b/arch/mips/mach-ath79/ar934x/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> * diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c index 79f419088a..b082803f9f 100644 --- a/arch/mips/mach-ath79/cpu.c +++ b/arch/mips/mach-ath79/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/mach-ath79/dram.c b/arch/mips/mach-ath79/dram.c index 545b1199e1..292257a453 100644 --- a/arch/mips/mach-ath79/dram.c +++ b/arch/mips/mach-ath79/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h index 5888f6eb28..61e3498e68 100644 --- a/arch/mips/mach-ath79/include/mach/ar71xx_regs.h +++ b/arch/mips/mach-ath79/include/mach/ar71xx_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Atheros AR71XX/AR724X/AR913X SoC register definitions * diff --git a/arch/mips/mach-ath79/include/mach/ath79.h b/arch/mips/mach-ath79/include/mach/ath79.h index 2eda38885e..181237faf1 100644 --- a/arch/mips/mach-ath79/include/mach/ath79.h +++ b/arch/mips/mach-ath79/include/mach/ath79.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Atheros AR71XX/AR724X/AR913X common definitions * diff --git a/arch/mips/mach-ath79/include/mach/ddr.h b/arch/mips/mach-ath79/include/mach/ddr.h index 59b76c86f5..37bd819ec0 100644 --- a/arch/mips/mach-ath79/include/mach/ddr.h +++ b/arch/mips/mach-ath79/include/mach/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/mach-ath79/qca953x/Makefile b/arch/mips/mach-ath79/qca953x/Makefile index 5ba849c738..084f012ede 100644 --- a/arch/mips/mach-ath79/qca953x/Makefile +++ b/arch/mips/mach-ath79/qca953x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += clk.o obj-y += ddr.o diff --git a/arch/mips/mach-ath79/qca953x/clk.c b/arch/mips/mach-ath79/qca953x/clk.c index f5438ef1c8..dcefa7c95e 100644 --- a/arch/mips/mach-ath79/qca953x/clk.c +++ b/arch/mips/mach-ath79/qca953x/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/arch/mips/mach-ath79/qca953x/ddr.c b/arch/mips/mach-ath79/qca953x/ddr.c index 78f2370e09..32cc096af2 100644 --- a/arch/mips/mach-ath79/qca953x/ddr.c +++ b/arch/mips/mach-ath79/qca953x/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> * Based on Atheros LSDK/QSDK diff --git a/arch/mips/mach-ath79/qca953x/lowlevel_init.S b/arch/mips/mach-ath79/qca953x/lowlevel_init.S index 169d340726..96665ee417 100644 --- a/arch/mips/mach-ath79/qca953x/lowlevel_init.S +++ b/arch/mips/mach-ath79/qca953x/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> * Based on Atheros LSDK/QSDK diff --git a/arch/mips/mach-ath79/qca956x/Makefile b/arch/mips/mach-ath79/qca956x/Makefile index 3f5fc0363f..891ff3a6bf 100644 --- a/arch/mips/mach-ath79/qca956x/Makefile +++ b/arch/mips/mach-ath79/qca956x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += cpu.o obj-y += clk.o diff --git a/arch/mips/mach-ath79/qca956x/clk.c b/arch/mips/mach-ath79/qca956x/clk.c index 6a58dba91f..896b5dbd22 100644 --- a/arch/mips/mach-ath79/qca956x/clk.c +++ b/arch/mips/mach-ath79/qca956x/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/arch/mips/mach-ath79/qca956x/cpu.c b/arch/mips/mach-ath79/qca956x/cpu.c index 08a8c84e72..f889d6e49b 100644 --- a/arch/mips/mach-ath79/qca956x/cpu.c +++ b/arch/mips/mach-ath79/qca956x/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/arch/mips/mach-ath79/qca956x/ddr.c b/arch/mips/mach-ath79/qca956x/ddr.c index f9cf8daa22..802f46327d 100644 --- a/arch/mips/mach-ath79/qca956x/ddr.c +++ b/arch/mips/mach-ath79/qca956x/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rosy Song <rosysong(a)rosinson.com> * diff --git a/arch/mips/mach-ath79/qca956x/qca956x-ddr-tap.S b/arch/mips/mach-ath79/qca956x/qca956x-ddr-tap.S index db54b575fb..f90b1ee28c 100644 --- a/arch/mips/mach-ath79/qca956x/qca956x-ddr-tap.S +++ b/arch/mips/mach-ath79/qca956x/qca956x-ddr-tap.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Rosy Song <rosysong(a)rosinson.com> * diff --git a/arch/mips/mach-ath79/reset.c b/arch/mips/mach-ath79/reset.c index 6cd5e77fd1..88228e1259 100644 --- a/arch/mips/mach-ath79/reset.c +++ b/arch/mips/mach-ath79/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> * Copyright (C) 2018-2019 Rosy Song <rosysong(a)rosinson.com> diff --git a/arch/mips/mach-bmips/Makefile b/arch/mips/mach-bmips/Makefile index dd1b434740..a6690c969a 100644 --- a/arch/mips/mach-bmips/Makefile +++ b/arch/mips/mach-bmips/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += dram.o diff --git a/arch/mips/mach-bmips/dram.c b/arch/mips/mach-bmips/dram.c index bba6cd6f4a..79033b3872 100644 --- a/arch/mips/mach-bmips/dram.c +++ b/arch/mips/mach-bmips/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> diff --git a/arch/mips/mach-jz47xx/Makefile b/arch/mips/mach-jz47xx/Makefile index dbb8229f78..e41cf0f106 100644 --- a/arch/mips/mach-jz47xx/Makefile +++ b/arch/mips/mach-jz47xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later extra-$(CONFIG_SPL_BUILD) := start.o diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780.h b/arch/mips/mach-jz47xx/include/mach/jz4780.h index 880445dac3..a2362ccabd 100644 --- a/arch/mips/mach-jz47xx/include/mach/jz4780.h +++ b/arch/mips/mach-jz47xx/include/mach/jz4780.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * JZ4780 definitions * diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h index 2c0d30a80e..6c284113af 100644 --- a/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h +++ b/arch/mips/mach-jz47xx/include/mach/jz4780_dram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * JZ4780 DDR initialization - parameters definitions * diff --git a/arch/mips/mach-jz47xx/include/mach/jz4780_gpio.h b/arch/mips/mach-jz47xx/include/mach/jz4780_gpio.h index 37f0892f7b..066957102f 100644 --- a/arch/mips/mach-jz47xx/include/mach/jz4780_gpio.h +++ b/arch/mips/mach-jz47xx/include/mach/jz4780_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __JZ4780_GPIO_H__ #define __JZ4780_GPIO_H__ diff --git a/arch/mips/mach-jz47xx/jz4780/Makefile b/arch/mips/mach-jz47xx/jz4780/Makefile index 5b3c354327..cde1cce818 100644 --- a/arch/mips/mach-jz47xx/jz4780/Makefile +++ b/arch/mips/mach-jz47xx/jz4780/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := gpio.o jz4780.o pll.o reset.o sdram.o timer.o diff --git a/arch/mips/mach-jz47xx/jz4780/gpio.c b/arch/mips/mach-jz47xx/jz4780/gpio.c index d4884e7fa9..a86307eb63 100644 --- a/arch/mips/mach-jz47xx/jz4780/gpio.c +++ b/arch/mips/mach-jz47xx/jz4780/gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <config.h> #include <common.h> diff --git a/arch/mips/mach-jz47xx/jz4780/jz4780.c b/arch/mips/mach-jz47xx/jz4780/jz4780.c index 56fdf04bca..6851442c34 100644 --- a/arch/mips/mach-jz47xx/jz4780/jz4780.c +++ b/arch/mips/mach-jz47xx/jz4780/jz4780.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 common routines * diff --git a/arch/mips/mach-jz47xx/jz4780/pll.c b/arch/mips/mach-jz47xx/jz4780/pll.c index 4519b478cc..a89e163a36 100644 --- a/arch/mips/mach-jz47xx/jz4780/pll.c +++ b/arch/mips/mach-jz47xx/jz4780/pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 PLL setup * diff --git a/arch/mips/mach-jz47xx/jz4780/reset.c b/arch/mips/mach-jz47xx/jz4780/reset.c index bf6addccb5..eb2092e3c9 100644 --- a/arch/mips/mach-jz47xx/jz4780/reset.c +++ b/arch/mips/mach-jz47xx/jz4780/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 common routines * diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c index 690f3c5601..e254f5ae86 100644 --- a/arch/mips/mach-jz47xx/jz4780/sdram.c +++ b/arch/mips/mach-jz47xx/jz4780/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 DDR initialization * diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c index 82bb9e8c3b..1ae6dab6f0 100644 --- a/arch/mips/mach-jz47xx/jz4780/timer.c +++ b/arch/mips/mach-jz47xx/jz4780/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 timer * diff --git a/arch/mips/mach-jz47xx/start.S b/arch/mips/mach-jz47xx/start.S index 760d021549..5ca4e5d8a7 100644 --- a/arch/mips/mach-jz47xx/start.S +++ b/arch/mips/mach-jz47xx/start.S @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Startup Code for MIPS32 XBURST CPU-core * diff --git a/arch/mips/mach-mscc/Kconfig b/arch/mips/mach-mscc/Kconfig index affc4721f8..54f080f472 100644 --- a/arch/mips/mach-mscc/Kconfig +++ b/arch/mips/mach-mscc/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) menu "MSCC VCore-III platforms" depends on ARCH_MSCC diff --git a/arch/mips/mach-mscc/Makefile b/arch/mips/mach-mscc/Makefile index 6d60020471..fbf09d13ab 100644 --- a/arch/mips/mach-mscc/Makefile +++ b/arch/mips/mach-mscc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) CFLAGS_cpu.o += -finline-limit=64000 diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c index d484eb92c4..d10ee39308 100644 --- a/arch/mips/mach-mscc/cpu.c +++ b/arch/mips/mach-mscc/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c index f7fbd33cc4..bfe62fc0a5 100644 --- a/arch/mips/mach-mscc/dram.c +++ b/arch/mips/mach-mscc/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/gpio.c b/arch/mips/mach-mscc/gpio.c index d6b4c5d768..2a055ee553 100644 --- a/arch/mips/mach-mscc/gpio.c +++ b/arch/mips/mach-mscc/gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/ioremap.h b/arch/mips/mach-mscc/include/ioremap.h index 9024364a57..ce9c1649b9 100644 --- a/arch/mips/mach-mscc/include/ioremap.h +++ b/arch/mips/mach-mscc/include/ioremap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/common.h b/arch/mips/mach-mscc/include/mach/common.h index 8f9a9c280b..ea31ae9838 100644 --- a/arch/mips/mach-mscc/include/mach/common.h +++ b/arch/mips/mach-mscc/include/mach/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/ddr.h b/arch/mips/mach-mscc/include/mach/ddr.h index 75fb3ca00d..51c8a033bc 100644 --- a/arch/mips/mach-mscc/include/mach/ddr.h +++ b/arch/mips/mach-mscc/include/mach/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2.h b/arch/mips/mach-mscc/include/mach/jr2/jr2.h index 3a779e7035..2a046e0858 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Microsemi Jaguar2 Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h index 8d1d21b9b1..ef0dd3f59d 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h index e11ad8788f..de83e9dec5 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_devcpu_gcb_miim_regs.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h index 151bb3e6d4..270a67829e 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2_icpu_cfg.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/luton/luton.h b/arch/mips/mach-mscc/include/mach/luton/luton.h index dda665fc15..eacdf762e4 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Microsemi Ocelot Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h index 750a8013d1..84c50793bf 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h index 07c4f9aeb6..dbde4f4947 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_devcpu_gcb_miim_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Microsemi Ocelot Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h index ded7c5fa77..6750761117 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton_icpu_cfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h index 72b07c33cd..87c38688c3 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Microsemi Ocelot Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h index 5715ec164c..5519ae1fe0 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h index 50cf073eab..d0c99cb945 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_devcpu_gcb_miim_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h index fb10bf2c26..94e3247617 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot_icpu_cfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/serval/serval.h b/arch/mips/mach-mscc/include/mach/serval/serval.h index a78c6e59bb..8464fd3041 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Microsemi Serval Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h index 43d40be716..124eff0b20 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h index e8cb1dcf9a..ce7869984d 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_devcpu_gcb_miim_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h index 4d4151b3d5..af50cf1ba8 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval_icpu_cfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt.h b/arch/mips/mach-mscc/include/mach/servalt/servalt.h index 4d7d0886dd..3abef7c448 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Microsemi Servalt Switch driver * diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h index 7d6c64f316..2a62c1c577 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h index 72d7c4d08d..c6b0ad317a 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_devcpu_gcb_miim_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h b/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h index 13967f66b0..bdb0cd5350 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt_icpu_cfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/include/mach/tlb.h b/arch/mips/mach-mscc/include/mach/tlb.h index ebd8ad0dc1..ae3ccd845e 100644 --- a/arch/mips/mach-mscc/include/mach/tlb.h +++ b/arch/mips/mach-mscc/include/mach/tlb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/lowlevel_init.S b/arch/mips/mach-mscc/lowlevel_init.S index 0c24cb5f22..6267cfc78c 100644 --- a/arch/mips/mach-mscc/lowlevel_init.S +++ b/arch/mips/mach-mscc/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/lowlevel_init_luton.S b/arch/mips/mach-mscc/lowlevel_init_luton.S index 8a528fa83a..dd59625be6 100644 --- a/arch/mips/mach-mscc/lowlevel_init_luton.S +++ b/arch/mips/mach-mscc/lowlevel_init_luton.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/phy.c b/arch/mips/mach-mscc/phy.c index 83d3e5bdd2..421ed60006 100644 --- a/arch/mips/mach-mscc/phy.c +++ b/arch/mips/mach-mscc/phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mscc/reset.c b/arch/mips/mach-mscc/reset.c index a1214573b5..7267a491cb 100644 --- a/arch/mips/mach-mscc/reset.c +++ b/arch/mips/mach-mscc/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/arch/mips/mach-mtmips/Makefile b/arch/mips/mach-mtmips/Makefile index 19f1e07033..993dbf12fa 100644 --- a/arch/mips/mach-mtmips/Makefile +++ b/arch/mips/mach-mtmips/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += cpu.o diff --git a/arch/mips/mach-mtmips/cpu.c b/arch/mips/mach-mtmips/cpu.c index e88dab10c7..f6a879504d 100644 --- a/arch/mips/mach-mtmips/cpu.c +++ b/arch/mips/mach-mtmips/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/mach-octeon/Makefile b/arch/mips/mach-octeon/Makefile index 6aa7b36741..4b17156321 100644 --- a/arch/mips/mach-octeon/Makefile +++ b/arch/mips/mach-octeon/Makefile @@ -1,6 +1,6 @@ # (C) Copyright 2019 Marvell, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += lowlevel_init.o diff --git a/arch/mips/mach-octeon/bootoctlinux.c b/arch/mips/mach-octeon/bootoctlinux.c index 2c583b8b83..154c536bfb 100644 --- a/arch/mips/mach-octeon/bootoctlinux.c +++ b/arch/mips/mach-octeon/bootoctlinux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/mach-octeon/cache.c b/arch/mips/mach-octeon/cache.c index f293d65dae..5b79f0d3a7 100644 --- a/arch/mips/mach-octeon/cache.c +++ b/arch/mips/mach-octeon/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Marvell International Ltd. */ diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index c7744e8470..f278086090 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2022 Marvell International Ltd. */ diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c index 5b1311d8b5..55c2b2b652 100644 --- a/arch/mips/mach-octeon/dram.c +++ b/arch/mips/mach-octeon/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/mach-octeon/include/mach/cvmx-regs.h b/arch/mips/mach-octeon/include/mach/cvmx-regs.h index f97c1e907f..58291bce13 100644 --- a/arch/mips/mach-octeon/include/mach/cvmx-regs.h +++ b/arch/mips/mach-octeon/include/mach/cvmx-regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/mips/mach-pic32/Makefile b/arch/mips/mach-pic32/Makefile index e321e65fd4..e40973fc00 100644 --- a/arch/mips/mach-pic32/Makefile +++ b/arch/mips/mach-pic32/Makefile @@ -1,7 +1,7 @@ # (C) Copyright 2015 # Purna Chandra Mandal, purna.mandal(a)microchip.com. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y = cpu.o lowlevel_init.o reset.o \ No newline at end of file diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c index 7ed306e045..4794b3de93 100644 --- a/arch/mips/mach-pic32/cpu.c +++ b/arch/mips/mach-pic32/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 * Purna Chandra Mandal <purna.mandal(a)microchip.com> diff --git a/arch/mips/mach-pic32/include/mach/ddr.h b/arch/mips/mach-pic32/include/mach/ddr.h index 1b2391e016..c4638a7459 100644 --- a/arch/mips/mach-pic32/include/mach/ddr.h +++ b/arch/mips/mach-pic32/include/mach/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/arch/mips/mach-pic32/include/mach/pic32.h b/arch/mips/mach-pic32/include/mach/pic32.h index 69015334b9..d0e5b50a52 100644 --- a/arch/mips/mach-pic32/include/mach/pic32.h +++ b/arch/mips/mach-pic32/include/mach/pic32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Paul Thacker <paul.thacker(a)microchip.com> * diff --git a/arch/mips/mach-pic32/lowlevel_init.S b/arch/mips/mach-pic32/lowlevel_init.S index 6ecea5ca97..f9e487b648 100644 --- a/arch/mips/mach-pic32/lowlevel_init.S +++ b/arch/mips/mach-pic32/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/arch/mips/mach-pic32/reset.c b/arch/mips/mach-pic32/reset.c index 8071b13f7b..66ce6fb11d 100644 --- a/arch/mips/mach-pic32/reset.c +++ b/arch/mips/mach-pic32/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index fee18b1b52..590987fe48 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/nios2/cpu/start.o diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index b18b9b78ab..5ea2bd15c6 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2004 # Psyent Corporation <www.psyent.com> diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile index 0b675e7c08..262d23fd0a 100644 --- a/arch/nios2/cpu/Makefile +++ b/arch/nios2/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index 79a54d1bc2..76d0e85583 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/cpu/exceptions.S b/arch/nios2/cpu/exceptions.S index 95be04cdb3..58872f40af 100644 --- a/arch/nios2/cpu/exceptions.S +++ b/arch/nios2/cpu/exceptions.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 90cabb6757..786191fe4e 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index acb8ca686e..5d8be449e7 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c index 087a05097d..3ebb45a5c2 100644 --- a/arch/nios2/cpu/traps.c +++ b/arch/nios2/cpu/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds index 5b9e27d940..b9c5ce9ea6 100644 --- a/arch/nios2/cpu/u-boot.lds +++ b/arch/nios2/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts index df645962da..5a1c1b120c 100644 --- a/arch/nios2/dts/10m50_devboard.dts +++ b/arch/nios2/dts/10m50_devboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Altera Corporation * diff --git a/arch/nios2/dts/3c120_devboard.dts b/arch/nios2/dts/3c120_devboard.dts index 5a84935769..f38a6356a2 100644 --- a/arch/nios2/dts/3c120_devboard.dts +++ b/arch/nios2/dts/3c120_devboard.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation * diff --git a/arch/nios2/dts/Makefile b/arch/nios2/dts/Makefile index 2b29fa90f6..815dfbd75e 100644 --- a/arch/nios2/dts/Makefile +++ b/arch/nios2/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-y += $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%).dtb diff --git a/arch/nios2/include/asm/bitops.h b/arch/nios2/include/asm/bitops.h index 289da18437..f879ba5883 100644 --- a/arch/nios2/include/asm/bitops.h +++ b/arch/nios2/include/asm/bitops.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/byteorder.h b/arch/nios2/include/asm/byteorder.h index 5d96b31c90..2e35d66565 100644 --- a/arch/nios2/include/asm/byteorder.h +++ b/arch/nios2/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/cache.h b/arch/nios2/include/asm/cache.h index 57848840d0..7132019f80 100644 --- a/arch/nios2/include/asm/cache.h +++ b/arch/nios2/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/config.h b/arch/nios2/include/asm/config.h index bad0026648..62894c3c4c 100644 --- a/arch/nios2/include/asm/config.h +++ b/arch/nios2/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index 1a0e7d25fa..519e7347c3 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h index 817cd72e00..179bfab28e 100644 --- a/arch/nios2/include/asm/io.h +++ b/arch/nios2/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/nios2.h b/arch/nios2/include/asm/nios2.h index 0872dd6ad1..fb802a5868 100644 --- a/arch/nios2/include/asm/nios2.h +++ b/arch/nios2/include/asm/nios2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/opcodes.h b/arch/nios2/include/asm/opcodes.h index 346cefa0a2..42e53f56ad 100644 --- a/arch/nios2/include/asm/opcodes.h +++ b/arch/nios2/include/asm/opcodes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/processor.h b/arch/nios2/include/asm/processor.h index 2ac4a4b4c8..fbc14179d7 100644 --- a/arch/nios2/include/asm/processor.h +++ b/arch/nios2/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/ptrace.h b/arch/nios2/include/asm/ptrace.h index 317d8ae09b..cf83ce8c87 100644 --- a/arch/nios2/include/asm/ptrace.h +++ b/arch/nios2/include/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/string.h b/arch/nios2/include/asm/string.h index 69f4921fef..2954a49ba6 100644 --- a/arch/nios2/include/asm/string.h +++ b/arch/nios2/include/asm/string.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/system.h b/arch/nios2/include/asm/system.h index 33614d541e..6a5f04be0d 100644 --- a/arch/nios2/include/asm/system.h +++ b/arch/nios2/include/asm/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/include/asm/u-boot.h b/arch/nios2/include/asm/u-boot.h index f050067143..90879aab2d 100644 --- a/arch/nios2/include/asm/u-boot.h +++ b/arch/nios2/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/lib/Makefile b/arch/nios2/lib/Makefile index a9f3c7100e..b3e6848ab6 100644 --- a/arch/nios2/lib/Makefile +++ b/arch/nios2/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index 06c094d0f1..de84702be7 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c index 5864d8f0f4..140f61442e 100644 --- a/arch/nios2/lib/cache.c +++ b/arch/nios2/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> * Copyright (C) 2009, Wind River Systems Inc diff --git a/arch/nios2/lib/libgcc.c b/arch/nios2/lib/libgcc.c index a45b3e82ef..4fe5fa79be 100644 --- a/arch/nios2/lib/libgcc.c +++ b/arch/nios2/lib/libgcc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of GNU CC. */ diff --git a/arch/nios2/lib/longlong.h b/arch/nios2/lib/longlong.h index e46d45378a..9c5a742862 100644 --- a/arch/nios2/lib/longlong.h +++ b/arch/nios2/lib/longlong.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* longlong.h -- definitions for mixed size 32/64 bit arithmetic. Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004, 2005 Free Software Foundation, Inc. diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 5050f387a6..8e39203f45 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/powerpc/cpu/$(CPU)/start.o head-$(CONFIG_MPC85xx) += arch/powerpc/cpu/mpc85xx/resetvec.o diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 725a4f48aa..1a347673dc 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/Makefile b/arch/powerpc/cpu/Makefile index e7f6405927..d4d5e51d9d 100644 --- a/arch/powerpc/cpu/Makefile +++ b/arch/powerpc/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_MPC83xx) += mpc8xxx/ obj-$(CONFIG_MPC85xx) += mpc8xxx/ diff --git a/arch/powerpc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile index 1255f533e3..26bdcce13a 100644 --- a/arch/powerpc/cpu/mpc83xx/Makefile +++ b/arch/powerpc/cpu/mpc83xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc83xx/config.mk b/arch/powerpc/cpu/mpc83xx/config.mk index a07df4d389..ae9c926833 100644 --- a/arch/powerpc/cpu/mpc83xx/config.mk +++ b/arch/powerpc/cpu/mpc83xx/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2004 Freescale Semiconductor, Inc. diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index f6ffe295b8..6c88c18770 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index f5cb000de6..553caf7aba 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2009 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc83xx/ecc.c b/arch/powerpc/cpu/mpc83xx/ecc.c index 3e24752e2f..e40ef058d6 100644 --- a/arch/powerpc/cpu/mpc83xx/ecc.c +++ b/arch/powerpc/cpu/mpc83xx/ecc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index 33b2151f87..ffbc807100 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index f9486678af..265c09c563 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index 65ef0497c2..d252620dff 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Freescale Semiconductor, Inc. 2007 * diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index 47ca74c5c3..49cd297f5d 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007-2009 Freescale Semiconductor, Inc. * Copyright (C) 2008-2009 MontaVista Software, Inc. diff --git a/arch/powerpc/cpu/mpc83xx/qe_io.c b/arch/powerpc/cpu/mpc83xx/qe_io.c index 52360703a7..1dc60da86f 100644 --- a/arch/powerpc/cpu/mpc83xx/qe_io.c +++ b/arch/powerpc/cpu/mpc83xx/qe_io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc83xx/serdes.c b/arch/powerpc/cpu/mpc83xx/serdes.c index d4848b2ec4..e538829a9a 100644 --- a/arch/powerpc/cpu/mpc83xx/serdes.c +++ b/arch/powerpc/cpu/mpc83xx/serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale SerDes initialization routine * diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 6da8fc4381..44ced5eb71 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006-2007 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index b7a87fec2f..9fa3eb8343 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc83xx/spl_minimal.c b/arch/powerpc/cpu/mpc83xx/spl_minimal.c index b55bfaffca..1a97e28cc9 100644 --- a/arch/powerpc/cpu/mpc83xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc83xx/spl_minimal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index d72d3147f6..cb02ad83fe 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1998 Dan Malek <dmalek(a)jlc.net> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c index 94e6323d73..9774830b36 100644 --- a/arch/powerpc/cpu/mpc83xx/traps.c +++ b/arch/powerpc/cpu/mpc83xx/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds index 856d3b3e16..332078c27d 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds b/arch/powerpc/cpu/mpc83xx/u-boot.lds index 1a1e537b2a..c13baf5170 100644 --- a/arch/powerpc/cpu/mpc83xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile index f3ee7d3494..bdb77ecec3 100644 --- a/arch/powerpc/cpu/mpc85xx/Makefile +++ b/arch/powerpc/cpu/mpc85xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c index 013a171ed8..c4b08a5557 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c index 8e18e12f63..cd346c5831 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c index 7921334827..72af194c7b 100644 --- a/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * Author: Prabhakar Kushwaha <prabhakar(a)freescale.com> diff --git a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c index e53dd43f31..78e31c6ae4 100644 --- a/arch/powerpc/cpu/mpc85xx/c29x_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/c29x_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index c7d473d4a1..bd3b55f2d8 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk index 71a98f05c9..369ae069b6 100644 --- a/arch/powerpc/cpu/mpc85xx/config.mk +++ b/arch/powerpc/cpu/mpc85xx/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002,2003 Motorola Inc. # Xianghua Xiao, X.Xiao(a)motorola.com diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index e8a3e82765..3ec1219544 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004,2007-2011 Freescale Semiconductor, Inc. * (C) Copyright 2002, 2003 Motorola Inc. diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 96183ac2c8..55933f432f 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c index a67f37e3af..b98659d0ef 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2012 Freescale Semiconductor, Inc */ diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index e26436bf57..f8c58722df 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c index 9b6577e547..aa0854da21 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h index 4e2d444274..5fea06caa3 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c index 7c2de02c4c..4c56736b00 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h index e95dc48581..4c6948c0d5 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2010 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index bcbdfac027..b762263d4f 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c index 4b8844a4d9..1d7883140d 100644 --- a/arch/powerpc/cpu/mpc85xx/liodn.c +++ b/arch/powerpc/cpu/mpc85xx/liodn.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/mp.c b/arch/powerpc/cpu/mpc85xx/mp.c index 7c47e415f0..9653a26ea0 100644 --- a/arch/powerpc/cpu/mpc85xx/mp.c +++ b/arch/powerpc/cpu/mpc85xx/mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c index cbcb57fe3a..4a20076078 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008,2010 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c index a48f3c1512..13c29652ed 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c index 479ee085d3..9d4a639209 100644 --- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c index 56e5ef6468..81039b0a3f 100644 --- a/arch/powerpc/cpu/mpc85xx/p1010_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1010_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. * Author: Prabhakar Kushwaha <prabhakar(a)freescale.com> diff --git a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c index 47f13e3c1c..9cc90f4f96 100644 --- a/arch/powerpc/cpu/mpc85xx/p1021_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1021_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c index 7a8f653727..bd61ff829e 100644 --- a/arch/powerpc/cpu/mpc85xx/p1023_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p1023_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Author: Roy Zang <tie-fei.zang(a)freescale.com> diff --git a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c index 8c5d82ae8a..cd9f1e943a 100644 --- a/arch/powerpc/cpu/mpc85xx/p2020_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p2020_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p2041_ids.c b/arch/powerpc/cpu/mpc85xx/p2041_ids.c index 540a6e6e19..9b5f1bb24b 100644 --- a/arch/powerpc/cpu/mpc85xx/p2041_ids.c +++ b/arch/powerpc/cpu/mpc85xx/p2041_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c index 3eca3a6932..05fb8b4360 100644 --- a/arch/powerpc/cpu/mpc85xx/p2041_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p2041_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p3041_ids.c b/arch/powerpc/cpu/mpc85xx/p3041_ids.c index 8f645258a5..7c86c19bc2 100644 --- a/arch/powerpc/cpu/mpc85xx/p3041_ids.c +++ b/arch/powerpc/cpu/mpc85xx/p3041_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c index ec8234c1c1..955dac9f16 100644 --- a/arch/powerpc/cpu/mpc85xx/p3041_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p3041_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p4080_ids.c b/arch/powerpc/cpu/mpc85xx/p4080_ids.c index db41116202..398f39f689 100644 --- a/arch/powerpc/cpu/mpc85xx/p4080_ids.c +++ b/arch/powerpc/cpu/mpc85xx/p4080_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c index 463fa119c9..508669f899 100644 --- a/arch/powerpc/cpu/mpc85xx/p4080_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p4080_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p5040_ids.c b/arch/powerpc/cpu/mpc85xx/p5040_ids.c index bd05eae255..fc16347ecc 100644 --- a/arch/powerpc/cpu/mpc85xx/p5040_ids.c +++ b/arch/powerpc/cpu/mpc85xx/p5040_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c index 2327b2c2a4..e96f9b7df4 100644 --- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index 6b4cbddcdf..643c8b82d2 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/qe_io.c b/arch/powerpc/cpu/mpc85xx/qe_io.c index 3cf41ca76d..6df84e0d72 100644 --- a/arch/powerpc/cpu/mpc85xx/qe_io.c +++ b/arch/powerpc/cpu/mpc85xx/qe_io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 391751ce1e..3d17217404 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2008-2012 Freescale Semiconductor, Inc. * Kumar Gala <kumar.gala(a)freescale.com> diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c index 9af40310b4..0162de27a1 100644 --- a/arch/powerpc/cpu/mpc85xx/speed.c +++ b/arch/powerpc/cpu/mpc85xx/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004, 2007-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/spl_minimal.c b/arch/powerpc/cpu/mpc85xx/spl_minimal.c index ce2b9c2166..86606fb601 100644 --- a/arch/powerpc/cpu/mpc85xx/spl_minimal.c +++ b/arch/powerpc/cpu/mpc85xx/spl_minimal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index e9c3042773..5ae8580679 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2004, 2007-2012 Freescale Semiconductor, Inc. * Copyright (C) 2003 Motorola,Inc. diff --git a/arch/powerpc/cpu/mpc85xx/t1024_ids.c b/arch/powerpc/cpu/mpc85xx/t1024_ids.c index bab076b2b1..e60414d00f 100644 --- a/arch/powerpc/cpu/mpc85xx/t1024_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t1024_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c index 16458e73be..c62b4474fd 100644 --- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t1040_ids.c b/arch/powerpc/cpu/mpc85xx/t1040_ids.c index 59f4f9c669..08f0c7b9e8 100644 --- a/arch/powerpc/cpu/mpc85xx/t1040_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t1040_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c index 3a7fdef79c..e03d33b85d 100644 --- a/arch/powerpc/cpu/mpc85xx/t1040_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t1040_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t2080_ids.c b/arch/powerpc/cpu/mpc85xx/t2080_ids.c index 390bb11537..e6a589d7e0 100644 --- a/arch/powerpc/cpu/mpc85xx/t2080_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t2080_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c index 5f34aab453..ebe877e1c6 100644 --- a/arch/powerpc/cpu/mpc85xx/t2080_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t2080_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/t4240_ids.c b/arch/powerpc/cpu/mpc85xx/t4240_ids.c index 37ea7788cc..3c636e9274 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_ids.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 61402e84ef..aef4a5715b 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 2a78f0fe50..1053970ac0 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index 8f451b4862..7415eae570 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * linux/arch/powerpc/kernel/traps.c * diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index d918b4395b..b2ac06eb00 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 3af0dfdf33..7b1b1f6fae 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2007-2009, 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile index 28a21eeb76..204665076a 100644 --- a/arch/powerpc/cpu/mpc8xx/Makefile +++ b/arch/powerpc/cpu/mpc8xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/cache.c b/arch/powerpc/cpu/mpc8xx/cache.c index 41559009ca..c6e08e39e9 100644 --- a/arch/powerpc/cpu/mpc8xx/cache.c +++ b/arch/powerpc/cpu/mpc8xx/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Christophe Leroy, CS Systemes d'Information, christophe.leroy(a)c-s.fr diff --git a/arch/powerpc/cpu/mpc8xx/config.mk b/arch/powerpc/cpu/mpc8xx/config.mk index 5a64665a61..9a095b8f9e 100644 --- a/arch/powerpc/cpu/mpc8xx/config.mk +++ b/arch/powerpc/cpu/mpc8xx/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 56383cecde..d43a32b50b 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c index feef792ee7..c38dacfc77 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index b4a26efe30..d29ad487fd 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008 (C) Bryan O'Donoghue * diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c index 40793c26e1..d9e5a9dc24 100644 --- a/arch/powerpc/cpu/mpc8xx/immap.c +++ b/arch/powerpc/cpu/mpc8xx/immap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c index eef1951f2f..0bbf08a636 100644 --- a/arch/powerpc/cpu/mpc8xx/interrupts.c +++ b/arch/powerpc/cpu/mpc8xx/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c index 1a882a3882..d99f4b6125 100644 --- a/arch/powerpc/cpu/mpc8xx/speed.c +++ b/arch/powerpc/cpu/mpc8xx/speed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S index 78429515ae..31946ea303 100644 --- a/arch/powerpc/cpu/mpc8xx/start.S +++ b/arch/powerpc/cpu/mpc8xx/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1998 Dan Malek <dmalek(a)jlc.net> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c index 56794b08a1..47b695161e 100644 --- a/arch/powerpc/cpu/mpc8xx/traps.c +++ b/arch/powerpc/cpu/mpc8xx/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * linux/arch/powerpc/kernel/traps.c * diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c index 73d28f2a4e..832b470a8e 100644 --- a/arch/powerpc/cpu/mpc8xxx/cpu.c +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2012 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 3004290248..f507a5cb42 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2014 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c index 8e1f6c964d..25bd13c1b5 100644 --- a/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +++ b/arch/powerpc/cpu/mpc8xxx/fsl_pamu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * FSL PAMU driver * diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 35409dc882..22251002c5 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/cpu/mpc8xxx/pamu_table.c b/arch/powerpc/cpu/mpc8xxx/pamu_table.c index b906279226..5870449660 100644 --- a/arch/powerpc/cpu/mpc8xxx/pamu_table.c +++ b/arch/powerpc/cpu/mpc8xxx/pamu_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012-2016 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c index c0b4a1217d..febc7b0517 100644 --- a/arch/powerpc/cpu/mpc8xxx/srio.c +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index bb436f02bc..b3b63eac6c 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_KMCENT2) += kmcent2.dtb dtb-$(CONFIG_TARGET_KMCOGE5NE) += kmcoge5ne.dtb diff --git a/arch/powerpc/dts/cmpc885.dts b/arch/powerpc/dts/cmpc885.dts index 7b9566a0fa..9c6e8b1279 100644 --- a/arch/powerpc/dts/cmpc885.dts +++ b/arch/powerpc/dts/cmpc885.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CMPC885 Device Tree Source * diff --git a/arch/powerpc/dts/cmpcpro.dts b/arch/powerpc/dts/cmpcpro.dts index c27d9dba33..225524f66d 100644 --- a/arch/powerpc/dts/cmpcpro.dts +++ b/arch/powerpc/dts/cmpcpro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CMPC885 Device Tree Source * diff --git a/arch/powerpc/dts/e500mc_power_isa.dtsi b/arch/powerpc/dts/e500mc_power_isa.dtsi index e486ae501a..eba9a13869 100644 --- a/arch/powerpc/dts/e500mc_power_isa.dtsi +++ b/arch/powerpc/dts/e500mc_power_isa.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * e500mc Power ISA Device Tree Source (include) * diff --git a/arch/powerpc/dts/e500v2_power_isa.dtsi b/arch/powerpc/dts/e500v2_power_isa.dtsi index 010e8e5f3f..61d9176c3e 100644 --- a/arch/powerpc/dts/e500v2_power_isa.dtsi +++ b/arch/powerpc/dts/e500v2_power_isa.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * e500v2 Power ISA Device Tree Source (include) * diff --git a/arch/powerpc/dts/e5500_power_isa.dtsi b/arch/powerpc/dts/e5500_power_isa.dtsi index 0a0943b0bb..e2d8c88b1d 100644 --- a/arch/powerpc/dts/e5500_power_isa.dtsi +++ b/arch/powerpc/dts/e5500_power_isa.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * e5500 Power ISA Device Tree Source (include) * diff --git a/arch/powerpc/dts/e6500_power_isa.dtsi b/arch/powerpc/dts/e6500_power_isa.dtsi index 1b06170c7a..4902ef909b 100644 --- a/arch/powerpc/dts/e6500_power_isa.dtsi +++ b/arch/powerpc/dts/e6500_power_isa.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * e6500 Power ISA Device Tree Source (include) * diff --git a/arch/powerpc/dts/km8321-uboot.dtsi b/arch/powerpc/dts/km8321-uboot.dtsi index 7e776f8872..cb532b618a 100644 --- a/arch/powerpc/dts/km8321-uboot.dtsi +++ b/arch/powerpc/dts/km8321-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids 8321 U-Boot specific Device Tree Source parts * diff --git a/arch/powerpc/dts/km8321.dtsi b/arch/powerpc/dts/km8321.dtsi index 6c36017563..3cfbac18b3 100644 --- a/arch/powerpc/dts/km8321.dtsi +++ b/arch/powerpc/dts/km8321.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids km8321 common ports Device Tree Source * diff --git a/arch/powerpc/dts/km836x-uboot.dtsi b/arch/powerpc/dts/km836x-uboot.dtsi index 50c886bc18..143449e71d 100644 --- a/arch/powerpc/dts/km836x-uboot.dtsi +++ b/arch/powerpc/dts/km836x-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids km836x U-Boot specific Device Tree Source parts * diff --git a/arch/powerpc/dts/km836x.dtsi b/arch/powerpc/dts/km836x.dtsi index 94b71cdcaa..fbb75c5a2b 100644 --- a/arch/powerpc/dts/km836x.dtsi +++ b/arch/powerpc/dts/km836x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids km836x common ports Device Tree Source * diff --git a/arch/powerpc/dts/kmcoge5ne-uboot.dtsi b/arch/powerpc/dts/kmcoge5ne-uboot.dtsi index 69392bbab0..5234f2fb23 100644 --- a/arch/powerpc/dts/kmcoge5ne-uboot.dtsi +++ b/arch/powerpc/dts/kmcoge5ne-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids kmcoge5ne U-Boot specific Device Tree Source parts * diff --git a/arch/powerpc/dts/kmcoge5ne.dts b/arch/powerpc/dts/kmcoge5ne.dts index 0dad793b6a..275ca2a03b 100644 --- a/arch/powerpc/dts/kmcoge5ne.dts +++ b/arch/powerpc/dts/kmcoge5ne.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids KMCOGE5ne Device Tree Source * diff --git a/arch/powerpc/dts/kmeter1-uboot.dtsi b/arch/powerpc/dts/kmeter1-uboot.dtsi index 5f63994aa2..590c03c02b 100644 --- a/arch/powerpc/dts/kmeter1-uboot.dtsi +++ b/arch/powerpc/dts/kmeter1-uboot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids kmeter1 U-Boot specific Device Tree Source parts * diff --git a/arch/powerpc/dts/kmeter1.dts b/arch/powerpc/dts/kmeter1.dts index a62ee18bb7..cf32de8c32 100644 --- a/arch/powerpc/dts/kmeter1.dts +++ b/arch/powerpc/dts/kmeter1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids KMETER1 Device Tree Source * diff --git a/arch/powerpc/dts/kmopti2.dts b/arch/powerpc/dts/kmopti2.dts index b2d9f0fa75..ffb9abe268 100644 --- a/arch/powerpc/dts/kmopti2.dts +++ b/arch/powerpc/dts/kmopti2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids OPTI2 Device Tree Source * diff --git a/arch/powerpc/dts/kmsupc5.dts b/arch/powerpc/dts/kmsupc5.dts index 9736c18401..f075da1ca0 100644 --- a/arch/powerpc/dts/kmsupc5.dts +++ b/arch/powerpc/dts/kmsupc5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids SUPC5 Device Tree Source * diff --git a/arch/powerpc/dts/kmsupm5.dts b/arch/powerpc/dts/kmsupm5.dts index 0687b4dea4..ba56ed6951 100644 --- a/arch/powerpc/dts/kmsupm5.dts +++ b/arch/powerpc/dts/kmsupm5.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids SUPM5 Device Tree Source * diff --git a/arch/powerpc/dts/kmtepr2.dts b/arch/powerpc/dts/kmtepr2.dts index 7cf6aefe57..1dcb0a8529 100644 --- a/arch/powerpc/dts/kmtepr2.dts +++ b/arch/powerpc/dts/kmtepr2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids TEPR2 Device Tree Source * diff --git a/arch/powerpc/dts/kmtuge1.dts b/arch/powerpc/dts/kmtuge1.dts index 41bb3623fb..71c6c2c7b1 100644 --- a/arch/powerpc/dts/kmtuge1.dts +++ b/arch/powerpc/dts/kmtuge1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids TUGE1 Device Tree Source * diff --git a/arch/powerpc/dts/kmtuxa1.dts b/arch/powerpc/dts/kmtuxa1.dts index 8b06a18f54..b4b184f8a7 100644 --- a/arch/powerpc/dts/kmtuxa1.dts +++ b/arch/powerpc/dts/kmtuxa1.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi Power Grids TUXA1 Device Tree Source * diff --git a/arch/powerpc/dts/mcr3000.dts b/arch/powerpc/dts/mcr3000.dts index c4d7737bc6..7e3bfc9306 100644 --- a/arch/powerpc/dts/mcr3000.dts +++ b/arch/powerpc/dts/mcr3000.dts @@ -3,7 +3,7 @@ * * Copyright 2017 CS Systemes d'Information * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /dts-v1/; diff --git a/arch/powerpc/dts/mpc8379erdb.dts b/arch/powerpc/dts/mpc8379erdb.dts index 3db5ececae..a7d6e96396 100644 --- a/arch/powerpc/dts/mpc8379erdb.dts +++ b/arch/powerpc/dts/mpc8379erdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * MPC8379E RDB Device Tree Source * diff --git a/arch/powerpc/dts/mpc8548-post.dtsi b/arch/powerpc/dts/mpc8548-post.dtsi index 97c3ce6e74..43c738e0e9 100644 --- a/arch/powerpc/dts/mpc8548-post.dtsi +++ b/arch/powerpc/dts/mpc8548-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * MPC8548 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/mpc8548.dtsi b/arch/powerpc/dts/mpc8548.dtsi index b24567dc65..5d9784d0d3 100644 --- a/arch/powerpc/dts/mpc8548.dtsi +++ b/arch/powerpc/dts/mpc8548.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * MPC8548CDS Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/mpc8548cds.dts b/arch/powerpc/dts/mpc8548cds.dts index 3b927bd265..818c95c442 100644 --- a/arch/powerpc/dts/mpc8548cds.dts +++ b/arch/powerpc/dts/mpc8548cds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * MPC8548CDS Device Tree Source * diff --git a/arch/powerpc/dts/mpc8548cds_36b.dts b/arch/powerpc/dts/mpc8548cds_36b.dts index 98d7c2410b..f65873f6c6 100644 --- a/arch/powerpc/dts/mpc8548cds_36b.dts +++ b/arch/powerpc/dts/mpc8548cds_36b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * MPC8548CDS (36-bit address map) Device Tree Source * diff --git a/arch/powerpc/dts/p1010rdb-pa.dts b/arch/powerpc/dts/p1010rdb-pa.dts index 360d254d91..4542dea67d 100644 --- a/arch/powerpc/dts/p1010rdb-pa.dts +++ b/arch/powerpc/dts/p1010rdb-pa.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010 RDB Device Tree Source * diff --git a/arch/powerpc/dts/p1010rdb-pa_36b.dts b/arch/powerpc/dts/p1010rdb-pa_36b.dts index 062086a8c0..540cf0b9c5 100644 --- a/arch/powerpc/dts/p1010rdb-pa_36b.dts +++ b/arch/powerpc/dts/p1010rdb-pa_36b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010 RDB Device Tree Source (36-bit address map) * diff --git a/arch/powerpc/dts/p1010rdb-pb.dts b/arch/powerpc/dts/p1010rdb-pb.dts index 9ca562534f..99645e8ec8 100644 --- a/arch/powerpc/dts/p1010rdb-pb.dts +++ b/arch/powerpc/dts/p1010rdb-pb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010RDB Device Tree Source * diff --git a/arch/powerpc/dts/p1010rdb-pb_36b.dts b/arch/powerpc/dts/p1010rdb-pb_36b.dts index eeff2a8704..da232aab70 100644 --- a/arch/powerpc/dts/p1010rdb-pb_36b.dts +++ b/arch/powerpc/dts/p1010rdb-pb_36b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010 RDB Device Tree Source (36-bit address map) * diff --git a/arch/powerpc/dts/p1010rdb.dtsi b/arch/powerpc/dts/p1010rdb.dtsi index c2aecde134..9932ece25e 100644 --- a/arch/powerpc/dts/p1010rdb.dtsi +++ b/arch/powerpc/dts/p1010rdb.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010RDB Device Tree Source * diff --git a/arch/powerpc/dts/p1010rdb_32b.dtsi b/arch/powerpc/dts/p1010rdb_32b.dtsi index 5da790da5e..ebf2df85a4 100644 --- a/arch/powerpc/dts/p1010rdb_32b.dtsi +++ b/arch/powerpc/dts/p1010rdb_32b.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010RDB Device Tree Source * diff --git a/arch/powerpc/dts/p1010rdb_36b.dtsi b/arch/powerpc/dts/p1010rdb_36b.dtsi index 54dd16e43b..0e3685bc1a 100644 --- a/arch/powerpc/dts/p1010rdb_36b.dtsi +++ b/arch/powerpc/dts/p1010rdb_36b.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010RDB Device Tree Source (36-bit address map) * diff --git a/arch/powerpc/dts/p1010si-post.dtsi b/arch/powerpc/dts/p1010si-post.dtsi index 2e7eb0e2fb..4aeb81e3f3 100644 --- a/arch/powerpc/dts/p1010si-post.dtsi +++ b/arch/powerpc/dts/p1010si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p1010si-pre.dtsi b/arch/powerpc/dts/p1010si-pre.dtsi index 9d7bb6c95d..05bbd13482 100644 --- a/arch/powerpc/dts/p1010si-pre.dtsi +++ b/arch/powerpc/dts/p1010si-pre.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1010 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p1020-post.dtsi b/arch/powerpc/dts/p1020-post.dtsi index 668ca0fa07..e31ac0c9fd 100644 --- a/arch/powerpc/dts/p1020-post.dtsi +++ b/arch/powerpc/dts/p1020-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p1020.dtsi b/arch/powerpc/dts/p1020.dtsi index ee2b6f4945..73368f0d5d 100644 --- a/arch/powerpc/dts/p1020.dtsi +++ b/arch/powerpc/dts/p1020.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p1020rdb-pc.dts b/arch/powerpc/dts/p1020rdb-pc.dts index ab42325366..1d701037f5 100644 --- a/arch/powerpc/dts/p1020rdb-pc.dts +++ b/arch/powerpc/dts/p1020rdb-pc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020RDB-PC Device Tree Source * diff --git a/arch/powerpc/dts/p1020rdb-pc.dtsi b/arch/powerpc/dts/p1020rdb-pc.dtsi index 6bf424fd3f..85c75563e0 100644 --- a/arch/powerpc/dts/p1020rdb-pc.dtsi +++ b/arch/powerpc/dts/p1020rdb-pc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020 RDB-PC Device Tree Source stub (no addresses or top-level ranges) * diff --git a/arch/powerpc/dts/p1020rdb-pc_36b.dts b/arch/powerpc/dts/p1020rdb-pc_36b.dts index 708f9a9db1..266d0c0b1d 100644 --- a/arch/powerpc/dts/p1020rdb-pc_36b.dts +++ b/arch/powerpc/dts/p1020rdb-pc_36b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020RDB-PC (36-bit address map) Device Tree Source * diff --git a/arch/powerpc/dts/p1020rdb-pd.dts b/arch/powerpc/dts/p1020rdb-pd.dts index b05f3deed5..1006a25c54 100644 --- a/arch/powerpc/dts/p1020rdb-pd.dts +++ b/arch/powerpc/dts/p1020rdb-pd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P1020RDB-PD Device Tree Source * diff --git a/arch/powerpc/dts/p2020-post.dtsi b/arch/powerpc/dts/p2020-post.dtsi index ea215ab075..54e1416585 100644 --- a/arch/powerpc/dts/p2020-post.dtsi +++ b/arch/powerpc/dts/p2020-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2020 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p2020.dtsi b/arch/powerpc/dts/p2020.dtsi index 7fdcb85c80..6311f04a4d 100644 --- a/arch/powerpc/dts/p2020.dtsi +++ b/arch/powerpc/dts/p2020.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2020 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p2020rdb-pc.dts b/arch/powerpc/dts/p2020rdb-pc.dts index 84d32360ba..df92c07f85 100644 --- a/arch/powerpc/dts/p2020rdb-pc.dts +++ b/arch/powerpc/dts/p2020rdb-pc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2020RDB-PC Device Tree Source * diff --git a/arch/powerpc/dts/p2020rdb-pc.dtsi b/arch/powerpc/dts/p2020rdb-pc.dtsi index 0d2acc746e..e59ff9c4fd 100644 --- a/arch/powerpc/dts/p2020rdb-pc.dtsi +++ b/arch/powerpc/dts/p2020rdb-pc.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2020 RDB-PC Device Tree Source stub (no addresses or top-level ranges) * diff --git a/arch/powerpc/dts/p2020rdb-pc_36b.dts b/arch/powerpc/dts/p2020rdb-pc_36b.dts index c847417df9..602225d164 100644 --- a/arch/powerpc/dts/p2020rdb-pc_36b.dts +++ b/arch/powerpc/dts/p2020rdb-pc_36b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2020RDB-PC (36-bit address map) Device Tree Source * diff --git a/arch/powerpc/dts/p2041.dtsi b/arch/powerpc/dts/p2041.dtsi index ad09b138fc..9d91d147bd 100644 --- a/arch/powerpc/dts/p2041.dtsi +++ b/arch/powerpc/dts/p2041.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2041 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p2041rdb.dts b/arch/powerpc/dts/p2041rdb.dts index 0fa1f09852..5e6a5a9dbc 100644 --- a/arch/powerpc/dts/p2041rdb.dts +++ b/arch/powerpc/dts/p2041rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P2041RDB Device Tree Source * diff --git a/arch/powerpc/dts/p2041si-post.dtsi b/arch/powerpc/dts/p2041si-post.dtsi index 8819199646..e1c7bc07c4 100644 --- a/arch/powerpc/dts/p2041si-post.dtsi +++ b/arch/powerpc/dts/p2041si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * P2041/P2040 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p3041.dtsi b/arch/powerpc/dts/p3041.dtsi index e34117b65a..bff0aa9a7b 100644 --- a/arch/powerpc/dts/p3041.dtsi +++ b/arch/powerpc/dts/p3041.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P3041 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p3041ds.dts b/arch/powerpc/dts/p3041ds.dts index 069dae3b85..368c975db3 100644 --- a/arch/powerpc/dts/p3041ds.dts +++ b/arch/powerpc/dts/p3041ds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P3041DS Device Tree Source * diff --git a/arch/powerpc/dts/p3041si-post.dtsi b/arch/powerpc/dts/p3041si-post.dtsi index a3e8088d25..25d89af736 100644 --- a/arch/powerpc/dts/p3041si-post.dtsi +++ b/arch/powerpc/dts/p3041si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * P3041 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p4080.dtsi b/arch/powerpc/dts/p4080.dtsi index 8ab5cf541a..e4adf5e51d 100644 --- a/arch/powerpc/dts/p4080.dtsi +++ b/arch/powerpc/dts/p4080.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P4080/P4040 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p4080ds.dts b/arch/powerpc/dts/p4080ds.dts index d5618f1e49..3c3b13c172 100644 --- a/arch/powerpc/dts/p4080ds.dts +++ b/arch/powerpc/dts/p4080ds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P4080DS Device Tree Source * diff --git a/arch/powerpc/dts/p4080si-post.dtsi b/arch/powerpc/dts/p4080si-post.dtsi index 56b79b14f4..1810c935f3 100644 --- a/arch/powerpc/dts/p4080si-post.dtsi +++ b/arch/powerpc/dts/p4080si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * P4080/P4040 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/p5040.dtsi b/arch/powerpc/dts/p5040.dtsi index 10402cf222..eb6918be8a 100644 --- a/arch/powerpc/dts/p5040.dtsi +++ b/arch/powerpc/dts/p5040.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P5040 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/p5040ds.dts b/arch/powerpc/dts/p5040ds.dts index c2ec765d3e..c32bdde66f 100644 --- a/arch/powerpc/dts/p5040ds.dts +++ b/arch/powerpc/dts/p5040ds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * P5040DS Device Tree Source * diff --git a/arch/powerpc/dts/p5040si-post.dtsi b/arch/powerpc/dts/p5040si-post.dtsi index fae3ed31a5..d64d83ff8b 100644 --- a/arch/powerpc/dts/p5040si-post.dtsi +++ b/arch/powerpc/dts/p5040si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * P5040 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/pq3-etsec1-0.dtsi b/arch/powerpc/dts/pq3-etsec1-0.dtsi index 8800243f34..c9d5fcd9c5 100644 --- a/arch/powerpc/dts/pq3-etsec1-0.dtsi +++ b/arch/powerpc/dts/pq3-etsec1-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC device tree stub [ @ offsets 0x24000 ] * diff --git a/arch/powerpc/dts/pq3-etsec1-1.dtsi b/arch/powerpc/dts/pq3-etsec1-1.dtsi index 2bc62d1a57..96c7c29407 100644 --- a/arch/powerpc/dts/pq3-etsec1-1.dtsi +++ b/arch/powerpc/dts/pq3-etsec1-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC device tree stub [ @ offsets 0x25000 ] * diff --git a/arch/powerpc/dts/pq3-etsec1-2.dtsi b/arch/powerpc/dts/pq3-etsec1-2.dtsi index d45865fe03..68d881184b 100644 --- a/arch/powerpc/dts/pq3-etsec1-2.dtsi +++ b/arch/powerpc/dts/pq3-etsec1-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC device tree stub [ @ offsets 0x26000 ] * diff --git a/arch/powerpc/dts/pq3-etsec1-3.dtsi b/arch/powerpc/dts/pq3-etsec1-3.dtsi index 853a27359d..6ae15a9288 100644 --- a/arch/powerpc/dts/pq3-etsec1-3.dtsi +++ b/arch/powerpc/dts/pq3-etsec1-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC device tree stub [ @ offsets 0x27000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-0.dtsi b/arch/powerpc/dts/pq3-etsec2-0.dtsi index f9d3d04650..872017c16d 100644 --- a/arch/powerpc/dts/pq3-etsec2-0.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 device tree stub [ @ offsets 0x24000/0xb0000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-1.dtsi b/arch/powerpc/dts/pq3-etsec2-1.dtsi index 6c01481909..01b0c13888 100644 --- a/arch/powerpc/dts/pq3-etsec2-1.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 device tree stub [ @ offsets 0x25000/0xb1000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-2.dtsi b/arch/powerpc/dts/pq3-etsec2-2.dtsi index 2a597c0db6..03e7ca399b 100644 --- a/arch/powerpc/dts/pq3-etsec2-2.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 device tree stub [ @ offsets 0x26000/0xb2000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-grp2-0.dtsi b/arch/powerpc/dts/pq3-etsec2-grp2-0.dtsi index 16752a7c45..a6514ac59f 100644 --- a/arch/powerpc/dts/pq3-etsec2-grp2-0.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-grp2-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb4000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-grp2-1.dtsi b/arch/powerpc/dts/pq3-etsec2-grp2-1.dtsi index 0464938424..3f3444852e 100644 --- a/arch/powerpc/dts/pq3-etsec2-grp2-1.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-grp2-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb5000 ] * diff --git a/arch/powerpc/dts/pq3-etsec2-grp2-2.dtsi b/arch/powerpc/dts/pq3-etsec2-grp2-2.dtsi index fe8003c44a..c4abd5b5da 100644 --- a/arch/powerpc/dts/pq3-etsec2-grp2-2.dtsi +++ b/arch/powerpc/dts/pq3-etsec2-grp2-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 eTSEC2 Group 2 device tree stub [ @ offsets 0xb6000 ] * diff --git a/arch/powerpc/dts/pq3-i2c-0.dtsi b/arch/powerpc/dts/pq3-i2c-0.dtsi index a838bd9e7a..10729fb831 100644 --- a/arch/powerpc/dts/pq3-i2c-0.dtsi +++ b/arch/powerpc/dts/pq3-i2c-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 I2C Device Tree stub * diff --git a/arch/powerpc/dts/pq3-i2c-1.dtsi b/arch/powerpc/dts/pq3-i2c-1.dtsi index 96cd009ac7..bb8640de2a 100644 --- a/arch/powerpc/dts/pq3-i2c-1.dtsi +++ b/arch/powerpc/dts/pq3-i2c-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * PQ3 I2C Device Tree stub * diff --git a/arch/powerpc/dts/qemu-ppce500.dts b/arch/powerpc/dts/qemu-ppce500.dts index e88e09e179..ef7678c158 100644 --- a/arch/powerpc/dts/qemu-ppce500.dts +++ b/arch/powerpc/dts/qemu-ppce500.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Empty device tree for qemu-ppce400 * diff --git a/arch/powerpc/dts/qoriq-clockgen1.dtsi b/arch/powerpc/dts/qoriq-clockgen1.dtsi index dd4253d1d5..39ef56e655 100644 --- a/arch/powerpc/dts/qoriq-clockgen1.dtsi +++ b/arch/powerpc/dts/qoriq-clockgen1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ clock control device tree stub [ controller @ offset 0xe1000 ] * diff --git a/arch/powerpc/dts/qoriq-clockgen2.dtsi b/arch/powerpc/dts/qoriq-clockgen2.dtsi index dec1e363b5..8e03ba7c18 100644 --- a/arch/powerpc/dts/qoriq-clockgen2.dtsi +++ b/arch/powerpc/dts/qoriq-clockgen2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ clock control device tree stub [ controller @ offset 0xe1000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-10g-0.dtsi b/arch/powerpc/dts/qoriq-fman-0-10g-0.dtsi index 0b2488441f..31d0e6a283 100644 --- a/arch/powerpc/dts/qoriq-fman-0-10g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-10g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 10g port #0 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-1g-0.dtsi b/arch/powerpc/dts/qoriq-fman-0-1g-0.dtsi index 0acc172bc5..f895b5f131 100644 --- a/arch/powerpc/dts/qoriq-fman-0-1g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-1g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #0 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-1g-1.dtsi b/arch/powerpc/dts/qoriq-fman-0-1g-1.dtsi index 52ea19e5ff..2548cb0577 100644 --- a/arch/powerpc/dts/qoriq-fman-0-1g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-1g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #1 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-1g-2.dtsi b/arch/powerpc/dts/qoriq-fman-0-1g-2.dtsi index c6a7aed2b9..80c896ff19 100644 --- a/arch/powerpc/dts/qoriq-fman-0-1g-2.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-1g-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #2 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-1g-3.dtsi b/arch/powerpc/dts/qoriq-fman-0-1g-3.dtsi index 39f273458e..37976cda3c 100644 --- a/arch/powerpc/dts/qoriq-fman-0-1g-3.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-1g-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #3 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0-1g-4.dtsi b/arch/powerpc/dts/qoriq-fman-0-1g-4.dtsi index b73014cc7d..5434512a1f 100644 --- a/arch/powerpc/dts/qoriq-fman-0-1g-4.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0-1g-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #4 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-0.dtsi b/arch/powerpc/dts/qoriq-fman-0.dtsi index ed103f2fdb..63af9383aa 100644 --- a/arch/powerpc/dts/qoriq-fman-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-10g-0.dtsi b/arch/powerpc/dts/qoriq-fman-1-10g-0.dtsi index d293990114..682774a81d 100644 --- a/arch/powerpc/dts/qoriq-fman-1-10g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-10g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 10g port #0 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-1g-0.dtsi b/arch/powerpc/dts/qoriq-fman-1-1g-0.dtsi index 1eb6bbf367..31ba685197 100644 --- a/arch/powerpc/dts/qoriq-fman-1-1g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-1g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #0 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-1g-1.dtsi b/arch/powerpc/dts/qoriq-fman-1-1g-1.dtsi index 5ad1b6fb96..12e0c9b385 100644 --- a/arch/powerpc/dts/qoriq-fman-1-1g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-1g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #1 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-1g-2.dtsi b/arch/powerpc/dts/qoriq-fman-1-1g-2.dtsi index 0d7ee5417e..a9bd1dcca1 100644 --- a/arch/powerpc/dts/qoriq-fman-1-1g-2.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-1g-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #2 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-1g-3.dtsi b/arch/powerpc/dts/qoriq-fman-1-1g-3.dtsi index 06a8c08e1b..fad3838866 100644 --- a/arch/powerpc/dts/qoriq-fman-1-1g-3.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-1g-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #3 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1-1g-4.dtsi b/arch/powerpc/dts/qoriq-fman-1-1g-4.dtsi index f64dc2a3c3..820c441ca6 100644 --- a/arch/powerpc/dts/qoriq-fman-1-1g-4.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1-1g-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan 1g port #4 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman-1.dtsi b/arch/powerpc/dts/qoriq-fman-1.dtsi index 1166f3fcd3..1455abc1c5 100644 --- a/arch/powerpc/dts/qoriq-fman-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-10g-0-best-effort.dtsi b/arch/powerpc/dts/qoriq-fman3-0-10g-0-best-effort.dtsi index e2c3da0e5e..3a44784446 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-10g-0-best-effort.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-10g-0-best-effort.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #0 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-10g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-0-10g-0.dtsi index 0ac313342a..d701b8d411 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-10g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-10g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #0 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-10g-1-best-effort.dtsi b/arch/powerpc/dts/qoriq-fman3-0-10g-1-best-effort.dtsi index 142c696c36..6cbc1828e5 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-10g-1-best-effort.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-10g-1-best-effort.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #1 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-10g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-0-10g-1.dtsi index b04af6437f..c040eb4286 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-10g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-10g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #1 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-0.dtsi index a9297c4e9e..539c00ef60 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #0 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-1.dtsi index 9cc2103967..f3eb226eaf 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #1 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-2.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-2.dtsi index 86f94dde81..e89fa1a6ff 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-2.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #2 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-3.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-3.dtsi index d59e625ad6..938c143b36 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-3.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #3 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-4.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-4.dtsi index 4878736aa5..16576557f4 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-4.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #4 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0-1g-5.dtsi b/arch/powerpc/dts/qoriq-fman3-0-1g-5.dtsi index 989328cc31..9fe8e7296a 100644 --- a/arch/powerpc/dts/qoriq-fman3-0-1g-5.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0-1g-5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #5 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-0.dtsi b/arch/powerpc/dts/qoriq-fman3-0.dtsi index d9098f72ab..e74e5c5822 100644 --- a/arch/powerpc/dts/qoriq-fman3-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi index 65bb8a4b0b..de80622079 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #0 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi index eb39d29b39..3d5ff431ca 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 10g port #1 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi index 2f2209dbc9..f78f7ad4bd 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #0 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi index 11653c58b5..f0c4f676ae 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #1 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi index ae27c7bc6d..7327fe7177 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #2 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi index 55ae549917..4edc000b4f 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #3 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi index 833cf3e23d..dbfce00d4c 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #4 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi index 81da55dfbe..b80fd267ed 100644 --- a/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 1g port #5 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1.dtsi index 9efcf26c4a..0d8f19814b 100644 --- a/arch/powerpc/dts/qoriq-fman3-1.dtsi +++ b/arch/powerpc/dts/qoriq-fman3-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree stub [ controller @ offset 0x500000 ] * diff --git a/arch/powerpc/dts/qoriq-fman3l-0.dtsi b/arch/powerpc/dts/qoriq-fman3l-0.dtsi index 84cc9a1f64..623e5e0f04 100644 --- a/arch/powerpc/dts/qoriq-fman3l-0.dtsi +++ b/arch/powerpc/dts/qoriq-fman3l-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ FMan v3 device tree stub [ controller @ offset 0x400000 ] * diff --git a/arch/powerpc/dts/qoriq-gpio-0.dtsi b/arch/powerpc/dts/qoriq-gpio-0.dtsi index 417fd2bdd8..227968c878 100644 --- a/arch/powerpc/dts/qoriq-gpio-0.dtsi +++ b/arch/powerpc/dts/qoriq-gpio-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ GPIO device tree stub [ controller @ offset 0x130000 ] * diff --git a/arch/powerpc/dts/qoriq-gpio-1.dtsi b/arch/powerpc/dts/qoriq-gpio-1.dtsi index 237f49e607..ae72f4fb9d 100644 --- a/arch/powerpc/dts/qoriq-gpio-1.dtsi +++ b/arch/powerpc/dts/qoriq-gpio-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ GPIO device tree stub [ controller @ offset 0x131000 ] * diff --git a/arch/powerpc/dts/qoriq-gpio-2.dtsi b/arch/powerpc/dts/qoriq-gpio-2.dtsi index d3ee2aed61..21d6de7f40 100644 --- a/arch/powerpc/dts/qoriq-gpio-2.dtsi +++ b/arch/powerpc/dts/qoriq-gpio-2.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ GPIO device tree stub [ controller @ offset 0x132000 ] * diff --git a/arch/powerpc/dts/qoriq-gpio-3.dtsi b/arch/powerpc/dts/qoriq-gpio-3.dtsi index 3d766f2665..053651bf7a 100644 --- a/arch/powerpc/dts/qoriq-gpio-3.dtsi +++ b/arch/powerpc/dts/qoriq-gpio-3.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * QorIQ GPIO device tree stub [ controller @ offset 0x133000 ] * diff --git a/arch/powerpc/dts/qoriq-i2c-0.dtsi b/arch/powerpc/dts/qoriq-i2c-0.dtsi index 7fb09e0125..4df8a10a8f 100644 --- a/arch/powerpc/dts/qoriq-i2c-0.dtsi +++ b/arch/powerpc/dts/qoriq-i2c-0.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * QorIQ I2C Device Tree stub * diff --git a/arch/powerpc/dts/qoriq-i2c-1.dtsi b/arch/powerpc/dts/qoriq-i2c-1.dtsi index f469abc1f5..9fa8c4ddd6 100644 --- a/arch/powerpc/dts/qoriq-i2c-1.dtsi +++ b/arch/powerpc/dts/qoriq-i2c-1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * QorIQ I2C Device Tree stub * diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi index c2a28eaebf..025c503a3b 100644 --- a/arch/powerpc/dts/socrates-u-boot.dtsi +++ b/arch/powerpc/dts/socrates-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de diff --git a/arch/powerpc/dts/socrates.dts b/arch/powerpc/dts/socrates.dts index ea75eb6af3..3b0884858b 100644 --- a/arch/powerpc/dts/socrates.dts +++ b/arch/powerpc/dts/socrates.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device Tree Source for the Socrates board (MPC8544). * diff --git a/arch/powerpc/dts/t1023si-post.dtsi b/arch/powerpc/dts/t1023si-post.dtsi index 0cd34fe488..26c5c3e19c 100644 --- a/arch/powerpc/dts/t1023si-post.dtsi +++ b/arch/powerpc/dts/t1023si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * T1023 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/t1024rdb-u-boot.dtsi b/arch/powerpc/dts/t1024rdb-u-boot.dtsi index b50b922aeb..469ae76a76 100644 --- a/arch/powerpc/dts/t1024rdb-u-boot.dtsi +++ b/arch/powerpc/dts/t1024rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &serial0 { diff --git a/arch/powerpc/dts/t1024rdb.dts b/arch/powerpc/dts/t1024rdb.dts index afaf90cb59..bf6a2e447b 100644 --- a/arch/powerpc/dts/t1024rdb.dts +++ b/arch/powerpc/dts/t1024rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T1024RDB Device Tree Source * diff --git a/arch/powerpc/dts/t1024si-post.dtsi b/arch/powerpc/dts/t1024si-post.dtsi index 8cdc5088e9..9bafaac5e2 100644 --- a/arch/powerpc/dts/t1024si-post.dtsi +++ b/arch/powerpc/dts/t1024si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * T1024 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/t102x.dtsi b/arch/powerpc/dts/t102x.dtsi index cf8962abe2..be0aaaf7aa 100644 --- a/arch/powerpc/dts/t102x.dtsi +++ b/arch/powerpc/dts/t102x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T102X Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/t1042d4rdb-u-boot.dtsi b/arch/powerpc/dts/t1042d4rdb-u-boot.dtsi index b50b922aeb..469ae76a76 100644 --- a/arch/powerpc/dts/t1042d4rdb-u-boot.dtsi +++ b/arch/powerpc/dts/t1042d4rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &serial0 { diff --git a/arch/powerpc/dts/t1042d4rdb.dts b/arch/powerpc/dts/t1042d4rdb.dts index 0230d3ba67..bad63f52fe 100644 --- a/arch/powerpc/dts/t1042d4rdb.dts +++ b/arch/powerpc/dts/t1042d4rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T1042D4RDB Device Tree Source * diff --git a/arch/powerpc/dts/t1042si-post.dtsi b/arch/powerpc/dts/t1042si-post.dtsi index 9f4fd7216a..d286db6e95 100644 --- a/arch/powerpc/dts/t1042si-post.dtsi +++ b/arch/powerpc/dts/t1042si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * T1042 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/t104x.dtsi b/arch/powerpc/dts/t104x.dtsi index 2c7e5b4718..ceeffee9f3 100644 --- a/arch/powerpc/dts/t104x.dtsi +++ b/arch/powerpc/dts/t104x.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T104X Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/t2080.dtsi b/arch/powerpc/dts/t2080.dtsi index 7e446b18df..e41a708725 100644 --- a/arch/powerpc/dts/t2080.dtsi +++ b/arch/powerpc/dts/t2080.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T2080/T2081 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/t2080qds.dts b/arch/powerpc/dts/t2080qds.dts index f9e786b239..f0e5bdabc4 100644 --- a/arch/powerpc/dts/t2080qds.dts +++ b/arch/powerpc/dts/t2080qds.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T2080QDS Device Tree Source * diff --git a/arch/powerpc/dts/t2080rdb-u-boot.dtsi b/arch/powerpc/dts/t2080rdb-u-boot.dtsi index b50b922aeb..469ae76a76 100644 --- a/arch/powerpc/dts/t2080rdb-u-boot.dtsi +++ b/arch/powerpc/dts/t2080rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &serial0 { diff --git a/arch/powerpc/dts/t2080rdb.dts b/arch/powerpc/dts/t2080rdb.dts index c0b0bd6f2c..5a7aa09521 100644 --- a/arch/powerpc/dts/t2080rdb.dts +++ b/arch/powerpc/dts/t2080rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T2080RDB Device Tree Source * diff --git a/arch/powerpc/dts/t2080si-post.dtsi b/arch/powerpc/dts/t2080si-post.dtsi index 46053c6b87..b9721e4f9b 100644 --- a/arch/powerpc/dts/t2080si-post.dtsi +++ b/arch/powerpc/dts/t2080si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * T2080 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/t4240.dtsi b/arch/powerpc/dts/t4240.dtsi index 498da4f795..4188684388 100644 --- a/arch/powerpc/dts/t4240.dtsi +++ b/arch/powerpc/dts/t4240.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T4240 Silicon/SoC Device Tree Source (pre include) * diff --git a/arch/powerpc/dts/t4240rdb-u-boot.dtsi b/arch/powerpc/dts/t4240rdb-u-boot.dtsi index b50b922aeb..469ae76a76 100644 --- a/arch/powerpc/dts/t4240rdb-u-boot.dtsi +++ b/arch/powerpc/dts/t4240rdb-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 NXP */ &serial0 { diff --git a/arch/powerpc/dts/t4240rdb.dts b/arch/powerpc/dts/t4240rdb.dts index c33b4982ba..afce6f457b 100644 --- a/arch/powerpc/dts/t4240rdb.dts +++ b/arch/powerpc/dts/t4240rdb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * T4240RDB Device Tree Source * diff --git a/arch/powerpc/dts/t4240si-post.dtsi b/arch/powerpc/dts/t4240si-post.dtsi index bd93345d38..7e16f86c59 100644 --- a/arch/powerpc/dts/t4240si-post.dtsi +++ b/arch/powerpc/dts/t4240si-post.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) /* * T4240 Silicon/SoC Device Tree Source (post include) * diff --git a/arch/powerpc/dts/u-boot.dtsi b/arch/powerpc/dts/u-boot.dtsi index c39ab6f0ca..052ce4f6ab 100644 --- a/arch/powerpc/dts/u-boot.dtsi +++ b/arch/powerpc/dts/u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h index df95d2238f..aa6dccde18 100644 --- a/arch/powerpc/include/asm/arch-mpc83xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc83xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _MPC83XX_GPIO_H_ #define _MPC83XX_GPIO_H_ diff --git a/arch/powerpc/include/asm/arch-mpc83xx/soc.h b/arch/powerpc/include/asm/arch-mpc83xx/soc.h index ce54f9bebb..250e5f36d9 100644 --- a/arch/powerpc/include/asm/arch-mpc83xx/soc.h +++ b/arch/powerpc/include/asm/arch-mpc83xx/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h index 79ba7868c2..abae5c301d 100644 --- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/arch-mpc8xx/gpio.h b/arch/powerpc/include/asm/arch-mpc8xx/gpio.h index 6b73acbaee..ad430896ec 100644 --- a/arch/powerpc/include/asm/arch-mpc8xx/gpio.h +++ b/arch/powerpc/include/asm/arch-mpc8xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _MPC8XX_GPIO_H_ #define _MPC8XX_GPIO_H_ diff --git a/arch/powerpc/include/asm/arch-ppc4xx/gpio.h b/arch/powerpc/include/asm/arch-ppc4xx/gpio.h index e74a2e1041..5d1445574b 100644 --- a/arch/powerpc/include/asm/arch-ppc4xx/gpio.h +++ b/arch/powerpc/include/asm/arch-ppc4xx/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Google, Inc */ diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index f0702cab14..e0e973a981 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index d990ecff96..202e7a6bc8 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_fdt.h b/arch/powerpc/include/asm/fsl_fdt.h index 57bddf21fe..e030f1bffb 100644 --- a/arch/powerpc/include/asm/fsl_fdt.h +++ b/arch/powerpc/include/asm/fsl_fdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h index a03f091c30..1de340a4e9 100644 --- a/arch/powerpc/include/asm/fsl_lbc.h +++ b/arch/powerpc/include/asm/fsl_lbc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2008,2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h index 0af3d8902a..9d06d0daca 100644 --- a/arch/powerpc/include/asm/fsl_liodn.h +++ b/arch/powerpc/include/asm/fsl_liodn.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h index a02b599265..d5a62e1224 100644 --- a/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h +++ b/arch/powerpc/include/asm/fsl_mpc83xx_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_pamu.h b/arch/powerpc/include/asm/fsl_pamu.h index d0d33fd163..b4d6ef3a5e 100644 --- a/arch/powerpc/include/asm/fsl_pamu.h +++ b/arch/powerpc/include/asm/fsl_pamu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012-2016 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index 809ab1d418..ed965a74be 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2007,2009-2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_portals.h b/arch/powerpc/include/asm/fsl_portals.h index 54ef4fb629..f8f2b9abc0 100644 --- a/arch/powerpc/include/asm/fsl_portals.h +++ b/arch/powerpc/include/asm/fsl_portals.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 221f9d842a..ff4de98184 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h index ddde4f80c6..eb4c193379 100644 --- a/arch/powerpc/include/asm/fsl_serdes.h +++ b/arch/powerpc/include/asm/fsl_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/fsl_srio.h b/arch/powerpc/include/asm/fsl_srio.h index 9429233ffd..26c5856048 100644 --- a/arch/powerpc/include/asm/fsl_srio.h +++ b/arch/powerpc/include/asm/fsl_srio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2012 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 6ed21c781f..6534484d6a 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2010 * Copyright 2020 NXP diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index 24bd438c14..98e465b690 100644 --- a/arch/powerpc/include/asm/immap_83xx.h +++ b/arch/powerpc/include/asm/immap_83xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2004-2011 Freescale Semiconductor, Inc. * diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 7293720fb3..77b7f1344e 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MPC85xx Internal Memory Map * diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h index cda21a2651..605b3ba144 100644 --- a/arch/powerpc/include/asm/interrupt.h +++ b/arch/powerpc/include/asm/interrupt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda(a)gmail.com diff --git a/arch/powerpc/include/asm/iopin_8xx.h b/arch/powerpc/include/asm/iopin_8xx.h index a41b332332..f21d64b865 100644 --- a/arch/powerpc/include/asm/iopin_8xx.h +++ b/arch/powerpc/include/asm/iopin_8xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MPC8xx I/O port pin manipulation functions diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/asm/linkage.h index f9b036eb92..fc1aa9bff0 100644 --- a/arch/powerpc/include/asm/linkage.h +++ b/arch/powerpc/include/asm/linkage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/arch/powerpc/include/asm/mp.h b/arch/powerpc/include/asm/mp.h index 8dacd2781d..5aecf71b1d 100644 --- a/arch/powerpc/include/asm/mp.h +++ b/arch/powerpc/include/asm/mp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2010 Freescale Semiconductor, Inc. */ diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index 0ed6beca38..c59d5ada0e 100644 --- a/arch/powerpc/include/asm/mpc85xx_gpio.h +++ b/arch/powerpc/include/asm/mpc85xx_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010 eXMeritus, A Boeing Company */ diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h index 2923350bd7..478236c75d 100644 --- a/arch/powerpc/include/asm/ppc.h +++ b/arch/powerpc/include/asm/ppc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Ugly header containing required header files. This could be adjusted * so that including asm/arch/hardware includes the correct file. diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h index ccd28ac18b..4b94437d17 100644 --- a/arch/powerpc/include/asm/sections.h +++ b/arch/powerpc/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/powerpc/include/asm/spl.h b/arch/powerpc/include/asm/spl.h index 60a7d37d30..4930d319b2 100644 --- a/arch/powerpc/include/asm/spl.h +++ b/arch/powerpc/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 36af8e5403..2643d66cf8 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 - 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index bb819dcbb6..a158771dac 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/lib/_ashldi3.S b/arch/powerpc/lib/_ashldi3.S index 0a635a80cf..813fd3af59 100644 --- a/arch/powerpc/lib/_ashldi3.S +++ b/arch/powerpc/lib/_ashldi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This code was copied from arch/powerpc/kernel/misc_32.S in the Linux * kernel sources (commit 85e2efbb1db9a18d218006706d6e4fbeb0216213, also diff --git a/arch/powerpc/lib/_ashrdi3.S b/arch/powerpc/lib/_ashrdi3.S index 728001696d..4f8e6e1521 100644 --- a/arch/powerpc/lib/_ashrdi3.S +++ b/arch/powerpc/lib/_ashrdi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This code was copied from arch/powerpc/kernel/misc_32.S in the Linux * kernel sources (commit 85e2efbb1db9a18d218006706d6e4fbeb0216213, also diff --git a/arch/powerpc/lib/_lshrdi3.S b/arch/powerpc/lib/_lshrdi3.S index 55ebc7e235..704c41a99d 100644 --- a/arch/powerpc/lib/_lshrdi3.S +++ b/arch/powerpc/lib/_lshrdi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This code was copied from arch/powerpc/kernel/misc_32.S in the Linux * kernel sources (commit 85e2efbb1db9a18d218006706d6e4fbeb0216213, also diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c index 55dcad5df8..cad5672868 100644 --- a/arch/powerpc/lib/bdinfo.c +++ b/arch/powerpc/lib/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PPC-specific information for the 'bd' command * diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 910121ec9c..c81b66dcf6 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c index c4c5c2d451..6f80d38573 100644 --- a/arch/powerpc/lib/cache.c +++ b/arch/powerpc/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/lib/extable.c b/arch/powerpc/lib/extable.c index 7e9d4f22f3..30b2047179 100644 --- a/arch/powerpc/lib/extable.c +++ b/arch/powerpc/lib/extable.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> * diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index df312dfa28..b32e626e2f 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/lib/ppccache.S b/arch/powerpc/lib/ppccache.S index e55025181f..c6b30dddad 100644 --- a/arch/powerpc/lib/ppccache.S +++ b/arch/powerpc/lib/ppccache.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1998 Dan Malek <dmalek(a)jlc.net> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> diff --git a/arch/powerpc/lib/ppcstring.S b/arch/powerpc/lib/ppcstring.S index f88d79fa42..303ba8b08e 100644 --- a/arch/powerpc/lib/ppcstring.S +++ b/arch/powerpc/lib/ppcstring.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * String handling functions for PowerPC. * diff --git a/arch/powerpc/lib/reloc.S b/arch/powerpc/lib/reloc.S index eb51fe8881..89ac3d1327 100644 --- a/arch/powerpc/lib/reloc.S +++ b/arch/powerpc/lib/reloc.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Wolfgang Denk <wd(a)denx.de> */ diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c index b638ea7be6..81c1179af8 100644 --- a/arch/powerpc/lib/spl.c +++ b/arch/powerpc/lib/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Stefan Roese <sr(a)denx.de> */ diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c index 2e731aa870..26f6d387df 100644 --- a/arch/powerpc/lib/stack.c +++ b/arch/powerpc/lib/stack.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Andreas Bießmann <andreas(a)biessmann.org> * diff --git a/arch/powerpc/lib/ticks.S b/arch/powerpc/lib/ticks.S index 8647d77cc9..a5e2e49f13 100644 --- a/arch/powerpc/lib/ticks.S +++ b/arch/powerpc/lib/ticks.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000, 2001 * Erik Theisen, Wave 7 Optics, etheisen(a)mindspring.com. diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c index 8d6babfb83..9f7b3ff790 100644 --- a/arch/powerpc/lib/time.c +++ b/arch/powerpc/lib/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000, 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/powerpc/lib/traps.c b/arch/powerpc/lib/traps.c index c7bce82a44..de6ba7f4a0 100644 --- a/arch/powerpc/lib/traps.c +++ b/arch/powerpc/lib/traps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index b3ef87078b..a8d85c70fe 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Andes Technology Corporation. # Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk index 9cf2aef0a4..c5cba53a53 100644 --- a/arch/riscv/config.mk +++ b/arch/riscv/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/riscv/cpu/Makefile b/arch/riscv/cpu/Makefile index 6bf6f911c6..bde446073d 100644 --- a/arch/riscv/cpu/Makefile +++ b/arch/riscv/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/riscv/cpu/andesv5/Makefile b/arch/riscv/cpu/andesv5/Makefile index 35a1a2fb83..880206f84a 100644 --- a/arch/riscv/cpu/andesv5/Makefile +++ b/arch/riscv/cpu/andesv5/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Andes Technology Corporation # Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/cpu/andesv5/cache.c b/arch/riscv/cpu/andesv5/cache.c index 40d77f671c..0cc1088989 100644 --- a/arch/riscv/cpu/andesv5/cache.c +++ b/arch/riscv/cpu/andesv5/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/cpu/andesv5/cpu.c b/arch/riscv/cpu/andesv5/cpu.c index 06e379bcb1..5aea704870 100644 --- a/arch/riscv/cpu/andesv5/cpu.c +++ b/arch/riscv/cpu/andesv5/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/cpu/andesv5/spl.c b/arch/riscv/cpu/andesv5/spl.c index 413849043b..6590c0ec12 100644 --- a/arch/riscv/cpu/andesv5/spl.c +++ b/arch/riscv/cpu/andesv5/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index c1a9638c1a..71ed207a0e 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/fu540/Kconfig b/arch/riscv/cpu/fu540/Kconfig index c68209d8fb..4bd5554885 100644 --- a/arch/riscv/cpu/fu540/Kconfig +++ b/arch/riscv/cpu/fu540/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/riscv/cpu/fu540/Makefile b/arch/riscv/cpu/fu540/Makefile index 043fb961a5..f69bfe4cf4 100644 --- a/arch/riscv/cpu/fu540/Makefile +++ b/arch/riscv/cpu/fu540/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 SiFive, Inc # Pragnesh Patel <pragnesh.patel(a)sifive.com> diff --git a/arch/riscv/cpu/fu540/cpu.c b/arch/riscv/cpu/fu540/cpu.c index f13c18942f..0deab26ba8 100644 --- a/arch/riscv/cpu/fu540/cpu.c +++ b/arch/riscv/cpu/fu540/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/fu540/dram.c b/arch/riscv/cpu/fu540/dram.c index 94d8018407..60049a3310 100644 --- a/arch/riscv/cpu/fu540/dram.c +++ b/arch/riscv/cpu/fu540/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/fu540/spl.c b/arch/riscv/cpu/fu540/spl.c index 45657b7909..aee252cd94 100644 --- a/arch/riscv/cpu/fu540/spl.c +++ b/arch/riscv/cpu/fu540/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 SiFive, Inc * Pragnesh Patel <pragnesh.patel(a)sifive.com> diff --git a/arch/riscv/cpu/fu740/Kconfig b/arch/riscv/cpu/fu740/Kconfig index d7ca968717..bfede5ad99 100644 --- a/arch/riscv/cpu/fu740/Kconfig +++ b/arch/riscv/cpu/fu740/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020-2021 SiFive, Inc # Pragnesh Patel <pragnesh.patel(a)sifive.com> diff --git a/arch/riscv/cpu/fu740/Makefile b/arch/riscv/cpu/fu740/Makefile index 1d1ad98ba7..19dc7ea9ff 100644 --- a/arch/riscv/cpu/fu740/Makefile +++ b/arch/riscv/cpu/fu740/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020-2021 SiFive, Inc # Pragnesh Patel <pragnesh.patel(a)sifive.com> diff --git a/arch/riscv/cpu/fu740/cpu.c b/arch/riscv/cpu/fu740/cpu.c index f13c18942f..0deab26ba8 100644 --- a/arch/riscv/cpu/fu740/cpu.c +++ b/arch/riscv/cpu/fu740/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/fu740/dram.c b/arch/riscv/cpu/fu740/dram.c index 8657fcd165..f7ef2cc496 100644 --- a/arch/riscv/cpu/fu740/dram.c +++ b/arch/riscv/cpu/fu740/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/fu740/spl.c b/arch/riscv/cpu/fu740/spl.c index c6816e9ed4..b6c33b38d8 100644 --- a/arch/riscv/cpu/fu740/spl.c +++ b/arch/riscv/cpu/fu740/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2021 SiFive, Inc * Pragnesh Patel <pragnesh.patel(a)sifive.com> diff --git a/arch/riscv/cpu/generic/Kconfig b/arch/riscv/cpu/generic/Kconfig index 2baba22992..129ffe4ddc 100644 --- a/arch/riscv/cpu/generic/Kconfig +++ b/arch/riscv/cpu/generic/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/riscv/cpu/generic/Makefile b/arch/riscv/cpu/generic/Makefile index 258e4620dd..51a3825b49 100644 --- a/arch/riscv/cpu/generic/Makefile +++ b/arch/riscv/cpu/generic/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index d78e1a3453..4ab1aa4ad2 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c index 1b51bae9b6..d947fd31fe 100644 --- a/arch/riscv/cpu/generic/dram.c +++ b/arch/riscv/cpu/generic/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/cpu/jh7110/Kconfig b/arch/riscv/cpu/jh7110/Kconfig index e5549a01b8..6f5c5855e2 100644 --- a/arch/riscv/cpu/jh7110/Kconfig +++ b/arch/riscv/cpu/jh7110/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 StarFive Technology Co., Ltd. diff --git a/arch/riscv/cpu/jh7110/Makefile b/arch/riscv/cpu/jh7110/Makefile index 951c95631e..0f6b775e70 100644 --- a/arch/riscv/cpu/jh7110/Makefile +++ b/arch/riscv/cpu/jh7110/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 StarFive Technology Co., Ltd. diff --git a/arch/riscv/cpu/jh7110/cpu.c b/arch/riscv/cpu/jh7110/cpu.c index 1d7c026584..1d785932e2 100644 --- a/arch/riscv/cpu/jh7110/cpu.c +++ b/arch/riscv/cpu/jh7110/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/cpu/jh7110/dram.c b/arch/riscv/cpu/jh7110/dram.c index 1a9fa46d14..3f8ccd312f 100644 --- a/arch/riscv/cpu/jh7110/dram.c +++ b/arch/riscv/cpu/jh7110/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/cpu/jh7110/spl.c b/arch/riscv/cpu/jh7110/spl.c index 4047b10efe..be7713c49a 100644 --- a/arch/riscv/cpu/jh7110/spl.c +++ b/arch/riscv/cpu/jh7110/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/cpu/mtrap.S b/arch/riscv/cpu/mtrap.S index e40c7bd3f4..e552f936a3 100644 --- a/arch/riscv/cpu/mtrap.S +++ b/arch/riscv/cpu/mtrap.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * M-mode Trap Handler Code for RISC-V Core * diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 30cf674370..97ab425c11 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Startup Code for RISC-V Core * diff --git a/arch/riscv/cpu/u-boot-spl.lds b/arch/riscv/cpu/u-boot-spl.lds index d1113a59aa..c636f26185 100644 --- a/arch/riscv/cpu/u-boot-spl.lds +++ b/arch/riscv/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on arch/riscv/cpu/u-boot.lds, which is * Copyright (C) 2017 Andes Technology Corporation diff --git a/arch/riscv/cpu/u-boot.lds b/arch/riscv/cpu/u-boot.lds index 2ffe6ba3c8..a3fb28e479 100644 --- a/arch/riscv/cpu/u-boot.lds +++ b/arch/riscv/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index be6c8a4227..c908d58fb8 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_TARGET_ANDES_AE350) += ae350_32.dtb ae350_64.dtb dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += mpfs-icicle-kit.dtb diff --git a/arch/riscv/dts/binman.dtsi b/arch/riscv/dts/binman.dtsi index 6b4eb8dc7b..9334ea8ddf 100644 --- a/arch/riscv/dts/binman.dtsi +++ b/arch/riscv/dts/binman.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/dts/k210-maix-bit.dts b/arch/riscv/dts/k210-maix-bit.dts index c4bbf6b018..a459528d0d 100644 --- a/arch/riscv/dts/k210-maix-bit.dts +++ b/arch/riscv/dts/k210-maix-bit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/arch/riscv/dts/k210.dtsi b/arch/riscv/dts/k210.dtsi index 6b8586066f..665f212dec 100644 --- a/arch/riscv/dts/k210.dtsi +++ b/arch/riscv/dts/k210.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/arch/riscv/dts/mpfs-icicle-kit.dts b/arch/riscv/dts/mpfs-icicle-kit.dts index 8aa5fb17d6..af4e5a1672 100644 --- a/arch/riscv/dts/mpfs-icicle-kit.dts +++ b/arch/riscv/dts/mpfs-icicle-kit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2021-2022 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/arch/riscv/dts/mpfs.dtsi b/arch/riscv/dts/mpfs.dtsi index 6012a28507..f06f1e059d 100644 --- a/arch/riscv/dts/mpfs.dtsi +++ b/arch/riscv/dts/mpfs.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* Copyright (c) 2020-2021 Microchip Technology Inc */ #include "dt-bindings/clock/microchip-mpfs-clock.h" diff --git a/arch/riscv/dts/qemu-virt32.dts b/arch/riscv/dts/qemu-virt32.dts index 17e2f0dea4..ea16483476 100644 --- a/arch/riscv/dts/qemu-virt32.dts +++ b/arch/riscv/dts/qemu-virt32.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/dts/qemu-virt64.dts b/arch/riscv/dts/qemu-virt64.dts index 17e2f0dea4..ea16483476 100644 --- a/arch/riscv/dts/qemu-virt64.dts +++ b/arch/riscv/dts/qemu-virt64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/include/asm/arch-andes/csr.h b/arch/riscv/include/asm/arch-andes/csr.h index c7ed920cde..e6b6ef4de4 100644 --- a/arch/riscv/include/asm/arch-andes/csr.h +++ b/arch/riscv/include/asm/arch-andes/csr.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Andes Technology Corporation */ diff --git a/arch/riscv/include/asm/arch-fu540/clk.h b/arch/riscv/include/asm/arch-fu540/clk.h index d71ed4357c..6f461f642c 100644 --- a/arch/riscv/include/asm/arch-fu540/clk.h +++ b/arch/riscv/include/asm/arch-fu540/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 SiFive Inc * diff --git a/arch/riscv/include/asm/arch-fu540/gpio.h b/arch/riscv/include/asm/arch-fu540/gpio.h index b87282b974..604204ceba 100644 --- a/arch/riscv/include/asm/arch-fu540/gpio.h +++ b/arch/riscv/include/asm/arch-fu540/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 SiFive, Inc. */ diff --git a/arch/riscv/include/asm/arch-fu540/reset.h b/arch/riscv/include/asm/arch-fu540/reset.h index e42797a395..84c618b505 100644 --- a/arch/riscv/include/asm/arch-fu540/reset.h +++ b/arch/riscv/include/asm/arch-fu540/reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 SiFive, Inc. * diff --git a/arch/riscv/include/asm/arch-fu540/spl.h b/arch/riscv/include/asm/arch-fu540/spl.h index 4697279f43..9225af7c03 100644 --- a/arch/riscv/include/asm/arch-fu540/spl.h +++ b/arch/riscv/include/asm/arch-fu540/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 SiFive, Inc. * diff --git a/arch/riscv/include/asm/arch-fu740/clk.h b/arch/riscv/include/asm/arch-fu740/clk.h index 9f883616b2..fe05312992 100644 --- a/arch/riscv/include/asm/arch-fu740/clk.h +++ b/arch/riscv/include/asm/arch-fu740/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020-2021 SiFive Inc * diff --git a/arch/riscv/include/asm/arch-fu740/gpio.h b/arch/riscv/include/asm/arch-fu740/gpio.h index 908e2e5563..96b95a39c8 100644 --- a/arch/riscv/include/asm/arch-fu740/gpio.h +++ b/arch/riscv/include/asm/arch-fu740/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020-2021 SiFive, Inc. */ diff --git a/arch/riscv/include/asm/arch-fu740/reset.h b/arch/riscv/include/asm/arch-fu740/reset.h index 538ef87410..051bc12105 100644 --- a/arch/riscv/include/asm/arch-fu740/reset.h +++ b/arch/riscv/include/asm/arch-fu740/reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020-2021 SiFive, Inc. * diff --git a/arch/riscv/include/asm/arch-fu740/spl.h b/arch/riscv/include/asm/arch-fu740/spl.h index 15ad9e7c8b..467ac85f60 100644 --- a/arch/riscv/include/asm/arch-fu740/spl.h +++ b/arch/riscv/include/asm/arch-fu740/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020-2021 SiFive, Inc. * diff --git a/arch/riscv/include/asm/arch-generic/clk.h b/arch/riscv/include/asm/arch-generic/clk.h index 1631f5f0bd..9ea931482f 100644 --- a/arch/riscv/include/asm/arch-generic/clk.h +++ b/arch/riscv/include/asm/arch-generic/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 Western Digital Corporation or its affiliates. * diff --git a/arch/riscv/include/asm/arch-generic/gpio.h b/arch/riscv/include/asm/arch-generic/gpio.h index b1f403027d..3404fca05e 100644 --- a/arch/riscv/include/asm/arch-generic/gpio.h +++ b/arch/riscv/include/asm/arch-generic/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 SiFive, Inc. */ diff --git a/arch/riscv/include/asm/arch-jh7110/eeprom.h b/arch/riscv/include/asm/arch-jh7110/eeprom.h index f354d5c60c..4838988328 100644 --- a/arch/riscv/include/asm/arch-jh7110/eeprom.h +++ b/arch/riscv/include/asm/arch-jh7110/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/include/asm/arch-jh7110/regs.h b/arch/riscv/include/asm/arch-jh7110/regs.h index 05026870a0..9101950d05 100644 --- a/arch/riscv/include/asm/arch-jh7110/regs.h +++ b/arch/riscv/include/asm/arch-jh7110/regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/include/asm/arch-jh7110/spl.h b/arch/riscv/include/asm/arch-jh7110/spl.h index 23ce8871b3..af82b1ce1b 100644 --- a/arch/riscv/include/asm/arch-jh7110/spl.h +++ b/arch/riscv/include/asm/arch-jh7110/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h index f541fb4daa..30328921ac 100644 --- a/arch/riscv/include/asm/atomic.h +++ b/arch/riscv/include/asm/atomic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2023 SiFive, Inc. */ diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h index 874963d731..fc88c8d64a 100644 --- a/arch/riscv/include/asm/cache.h +++ b/arch/riscv/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/include/asm/config.h b/arch/riscv/include/asm/config.h index c55c85d4e6..511ea9f5c9 100644 --- a/arch/riscv/include/asm/config.h +++ b/arch/riscv/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h index 6ecadab41c..e6262ea868 100644 --- a/arch/riscv/include/asm/dma-mapping.h +++ b/arch/riscv/include/asm/dma-mapping.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Western Digital Corporation or its affiliates. * diff --git a/arch/riscv/include/asm/encoding.h b/arch/riscv/include/asm/encoding.h index 56c5da86e8..9c3feb3a1e 100644 --- a/arch/riscv/include/asm/encoding.h +++ b/arch/riscv/include/asm/encoding.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Microsemi Corporation. * Padmarao Begari, Microsemi Corporation <padmarao.begari(a)microsemi.com> diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index 937fa4d154..378d6029ab 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/riscv/include/asm/gpio.h b/arch/riscv/include/asm/gpio.h index 008d75698b..83126c332e 100644 --- a/arch/riscv/include/asm/gpio.h +++ b/arch/riscv/include/asm/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 SiFive, Inc. */ diff --git a/arch/riscv/include/asm/linkage.h b/arch/riscv/include/asm/linkage.h index 0c8822b7d4..9156d562f9 100644 --- a/arch/riscv/include/asm/linkage.h +++ b/arch/riscv/include/asm/linkage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot - linkage.h * diff --git a/arch/riscv/include/asm/sections.h b/arch/riscv/include/asm/sections.h index 9dd36ddda4..9d4a12c838 100644 --- a/arch/riscv/include/asm/sections.h +++ b/arch/riscv/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/riscv/include/asm/setjmp.h b/arch/riscv/include/asm/setjmp.h index 72383d4330..cf124f88c2 100644 --- a/arch/riscv/include/asm/setjmp.h +++ b/arch/riscv/include/asm/setjmp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Alexander Graf <agraf(a)suse.de> */ diff --git a/arch/riscv/include/asm/spl.h b/arch/riscv/include/asm/spl.h index 9c0bf9755c..97543dfe78 100644 --- a/arch/riscv/include/asm/spl.h +++ b/arch/riscv/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on arch/mips/include/asm/spl.h. * diff --git a/arch/riscv/include/asm/syscon.h b/arch/riscv/include/asm/syscon.h index 5787702e74..7c36ca802a 100644 --- a/arch/riscv/include/asm/syscon.h +++ b/arch/riscv/include/asm/syscon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/include/asm/system.h b/arch/riscv/include/asm/system.h index 87a804bfd5..cca6cbc4e5 100644 --- a/arch/riscv/include/asm/system.h +++ b/arch/riscv/include/asm/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/include/asm/u-boot-riscv.h b/arch/riscv/include/asm/u-boot-riscv.h index 543a1688db..cfe08002f2 100644 --- a/arch/riscv/include/asm/u-boot-riscv.h +++ b/arch/riscv/include/asm/u-boot-riscv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index d5e1d5f323..a86bfd536e 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 9a05b662fd..dff3cb950b 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/riscv/lib/aclint_ipi.c b/arch/riscv/lib/aclint_ipi.c index 90b8e128cb..5e3cc71dc9 100644 --- a/arch/riscv/lib/aclint_ipi.c +++ b/arch/riscv/lib/aclint_ipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Sean Anderson <seanga2(a)gmail.com> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/riscv/lib/andes_plicsw.c b/arch/riscv/lib/andes_plicsw.c index 6fd49e873b..6d32b854cf 100644 --- a/arch/riscv/lib/andes_plicsw.c +++ b/arch/riscv/lib/andes_plicsw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Rick Chen <rick(a)andestech.com> * diff --git a/arch/riscv/lib/asm-offsets.c b/arch/riscv/lib/asm-offsets.c index 452dfcea97..26dc08de8d 100644 --- a/arch/riscv/lib/asm-offsets.c +++ b/arch/riscv/lib/asm-offsets.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c index 778d011f7c..88d8f1ba29 100644 --- a/arch/riscv/lib/boot.c +++ b/arch/riscv/lib/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index cc30efc904..a06772c0c9 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation <nobuhiro(a)andestech.com> diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index 686e699efb..108bc768b1 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S index 793eefdd88..825fe7cbdb 100644 --- a/arch/riscv/lib/crt0_riscv_efi.S +++ b/arch/riscv/lib/crt0_riscv_efi.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * crt0-efi-riscv.S - PE/COFF header for RISC-V EFI applications * diff --git a/arch/riscv/lib/elf_riscv32_efi.lds b/arch/riscv/lib/elf_riscv32_efi.lds index c3e0d20d57..2a47577084 100644 --- a/arch/riscv/lib/elf_riscv32_efi.lds +++ b/arch/riscv/lib/elf_riscv32_efi.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot riscv32 EFI linker script * diff --git a/arch/riscv/lib/elf_riscv64_efi.lds b/arch/riscv/lib/elf_riscv64_efi.lds index ecb9139548..c9808571b4 100644 --- a/arch/riscv/lib/elf_riscv64_efi.lds +++ b/arch/riscv/lib/elf_riscv64_efi.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot riscv64 EFI linker script * diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c index 36c16e9be2..66351bafcd 100644 --- a/arch/riscv/lib/fdt_fixup.c +++ b/arch/riscv/lib/fdt_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Western Digital Corporation or its affiliates * diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c index a65a5b8d17..87d110a59d 100644 --- a/arch/riscv/lib/image.c +++ b/arch/riscv/lib/image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Western Digital Corporation or its affiliates. * Authors: diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index e966afa7e3..756453dcae 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016-17 Microsemi Corporation. * Padmarao Begari, Microsemi Corporation <padmarao.begari(a)microsemi.com> diff --git a/arch/riscv/lib/reloc_riscv_efi.c b/arch/riscv/lib/reloc_riscv_efi.c index c1039dd165..bd12300c9a 100644 --- a/arch/riscv/lib/reloc_riscv_efi.c +++ b/arch/riscv/lib/reloc_riscv_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* reloc_riscv.c - position independent ELF shared object relocator Copyright (C) 2018 Alexander Graf <agraf(a)suse.de> Copyright (C) 2014 Linaro Ltd. <ard.biesheuvel(a)linaro.org> diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c index 8779c619cc..8e7ea0b3a5 100644 --- a/arch/riscv/lib/reset.c +++ b/arch/riscv/lib/reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/riscv/lib/sbi_ipi.c b/arch/riscv/lib/sbi_ipi.c index d02e2b4c48..dc7a27d1a3 100644 --- a/arch/riscv/lib/sbi_ipi.c +++ b/arch/riscv/lib/sbi_ipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Fraunhofer AISEC, * Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> diff --git a/arch/riscv/lib/semihosting.S b/arch/riscv/lib/semihosting.S index c0c571bce9..01806262f6 100644 --- a/arch/riscv/lib/semihosting.S +++ b/arch/riscv/lib/semihosting.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Ventana Micro Systems Inc. */ diff --git a/arch/riscv/lib/setjmp.S b/arch/riscv/lib/setjmp.S index 99d6195827..eab90fc07a 100644 --- a/arch/riscv/lib/setjmp.S +++ b/arch/riscv/lib/setjmp.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 Alexander Graf <agraf(a)suse.de> */ diff --git a/arch/riscv/lib/sifive_cache.c b/arch/riscv/lib/sifive_cache.c index 28154878fc..9314d694c1 100644 --- a/arch/riscv/lib/sifive_cache.c +++ b/arch/riscv/lib/sifive_cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 SiFive, Inc */ diff --git a/arch/riscv/lib/smp.c b/arch/riscv/lib/smp.c index f3cd8b9044..f910597812 100644 --- a/arch/riscv/lib/smp.c +++ b/arch/riscv/lib/smp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Fraunhofer AISEC, * Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index 9b242ed821..65f94727c4 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Fraunhofer AISEC, * Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index a335f8acfd..4482f2400e 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/sandbox/cpu/start.o arch/sandbox/cpu/os.o head-$(CONFIG_SANDBOX_SDL) += arch/sandbox/cpu/sdl.o diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2d184c5f65..54dc47a7b7 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index 7c5c52652f..e9a90288dc 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/arch/sandbox/cpu/cache.c b/arch/sandbox/cpu/cache.c index 46c62c0b44..f154d47fe0 100644 --- a/arch/sandbox/cpu/cache.c +++ b/arch/sandbox/cpu/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index a1c5c7c431..5c4dbd26ec 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 85d0d6a170..fd481aa38a 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c index 590e406517..ab7e58b21a 100644 --- a/arch/sandbox/cpu/sdl.c +++ b/arch/sandbox/cpu/sdl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 16b7662798..ad5ee1772e 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 2589c2eba7..727b1bd532 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011-2012 The Chromium OS Authors. */ diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index e38bb248b7..875604e89a 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011-2012 The Chromium OS Authors. */ diff --git a/arch/sandbox/cpu/u-boot-spl.lds b/arch/sandbox/cpu/u-boot-spl.lds index a81d66a6f2..3a5cbb6075 100644 --- a/arch/sandbox/cpu/u-boot-spl.lds +++ b/arch/sandbox/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011-2012 The Chromium OS Authors. * Use of this source code is governed by a BSD-style license that can be diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index ba8dee50c7..536512dd5b 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011-2012 The Chromium OS Authors. * Use of this source code is governed by a BSD-style license that can be diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index f810b4752f..0b29e9ddcf 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_SANDBOX64 dtb-$(CONFIG_SANDBOX) += sandbox64.dtb diff --git a/arch/sandbox/dts/cedit.dtsi b/arch/sandbox/dts/cedit.dtsi index 9bd84e6293..9cff875f62 100644 --- a/arch/sandbox/dts/cedit.dtsi +++ b/arch/sandbox/dts/cedit.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Expo definition for the configuration editor * diff --git a/arch/sandbox/dts/other.dts b/arch/sandbox/dts/other.dts index 395a792322..7710463f80 100644 --- a/arch/sandbox/dts/other.dts +++ b/arch/sandbox/dts/other.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Other devicetree file for running sandbox tests * diff --git a/arch/sandbox/dts/overlay0.dtso b/arch/sandbox/dts/overlay0.dtso index 9e5f38962b..daf008715e 100644 --- a/arch/sandbox/dts/overlay0.dtso +++ b/arch/sandbox/dts/overlay0.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Overlay test file */ diff --git a/arch/sandbox/dts/overlay1.dtso b/arch/sandbox/dts/overlay1.dtso index 303e713f33..02035a21de 100644 --- a/arch/sandbox/dts/overlay1.dtso +++ b/arch/sandbox/dts/overlay1.dtso @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Overlay test file */ diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 12d3eff5fa..b1a9615212 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Main sandbox devicetree */ diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index ff7e5584c5..e417389e84 100644 --- a/arch/sandbox/dts/sandbox.dtsi +++ b/arch/sandbox/dts/sandbox.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This is the common sandbox device-tree nodes. This is shared between sandbox * and sandbox64 builds. diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts index 195365580a..3882fdffcf 100644 --- a/arch/sandbox/dts/sandbox64.dts +++ b/arch/sandbox/dts/sandbox64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Main sandbox64 devicetree */ diff --git a/arch/sandbox/dts/sandbox_pmic.dtsi b/arch/sandbox/dts/sandbox_pmic.dtsi index 565c382ed4..63cccea301 100644 --- a/arch/sandbox/dts/sandbox_pmic.dtsi +++ b/arch/sandbox/dts/sandbox_pmic.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sandbox PMIC dts node * diff --git a/arch/sandbox/dts/sandbox_vpl.dtsi b/arch/sandbox/dts/sandbox_vpl.dtsi index c7dc00a8d2..344486d777 100644 --- a/arch/sandbox/dts/sandbox_vpl.dtsi +++ b/arch/sandbox/dts/sandbox_vpl.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Devicetree file for VPL (Verifying Program Loader) */ diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index e430347356..69b8426e55 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Devicetree file for running sandbox tests * diff --git a/arch/sandbox/include/asm/acpi_table.h b/arch/sandbox/include/asm/acpi_table.h index cb10eb542b..1450367b95 100644 --- a/arch/sandbox/include/asm/acpi_table.h +++ b/arch/sandbox/include/asm/acpi_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/arch/sandbox/include/asm/axi.h b/arch/sandbox/include/asm/axi.h index 5b94beda0a..c025c8b235 100644 --- a/arch/sandbox/include/asm/axi.h +++ b/arch/sandbox/include/asm/axi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/arch/sandbox/include/asm/byteorder.h b/arch/sandbox/include/asm/byteorder.h index 70b4c078af..5adf48d55e 100644 --- a/arch/sandbox/include/asm/byteorder.h +++ b/arch/sandbox/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/cache.h b/arch/sandbox/include/asm/cache.h index 609a835967..701a3ec768 100644 --- a/arch/sandbox/include/asm/cache.h +++ b/arch/sandbox/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/config.h b/arch/sandbox/include/asm/config.h index 87b9d23b37..9cae88f61d 100644 --- a/arch/sandbox/include/asm/config.h +++ b/arch/sandbox/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/cpu.h b/arch/sandbox/include/asm/cpu.h index c97ac7ba95..26ae93f9de 100644 --- a/arch/sandbox/include/asm/cpu.h +++ b/arch/sandbox/include/asm/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/arch/sandbox/include/asm/fuzzing_engine.h b/arch/sandbox/include/asm/fuzzing_engine.h index cf6396363b..bc2e70ef3b 100644 --- a/arch/sandbox/include/asm/fuzzing_engine.h +++ b/arch/sandbox/include/asm/fuzzing_engine.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h index c697773502..b86429398c 100644 --- a/arch/sandbox/include/asm/global_data.h +++ b/arch/sandbox/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/arch/sandbox/include/asm/gpio.h b/arch/sandbox/include/asm/gpio.h index 0dd4c7bf60..9f0255f79f 100644 --- a/arch/sandbox/include/asm/gpio.h +++ b/arch/sandbox/include/asm/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This is the interface to the sandbox GPIO driver for test code which * wants to change the GPIO values reported to U-Boot. diff --git a/arch/sandbox/include/asm/handoff.h b/arch/sandbox/include/asm/handoff.h index be4e7b0fae..5a5c1f7876 100644 --- a/arch/sandbox/include/asm/handoff.h +++ b/arch/sandbox/include/asm/handoff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Architecture-specific SPL handoff information for sandbox * diff --git a/arch/sandbox/include/asm/i2c.h b/arch/sandbox/include/asm/i2c.h index 4fc190be4b..77220735d5 100644 --- a/arch/sandbox/include/asm/i2c.h +++ b/arch/sandbox/include/asm/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 31ab7289b4..6f6b18673d 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/main.h b/arch/sandbox/include/asm/main.h index 7a2f0d3a8d..c9df1ff9de 100644 --- a/arch/sandbox/include/asm/main.h +++ b/arch/sandbox/include/asm/main.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/arch/sandbox/include/asm/malloc.h b/arch/sandbox/include/asm/malloc.h index 8aaaa9cb87..f65e2af154 100644 --- a/arch/sandbox/include/asm/malloc.h +++ b/arch/sandbox/include/asm/malloc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sandbox access to system malloc (i.e. not U-Boot's) * diff --git a/arch/sandbox/include/asm/processor.h b/arch/sandbox/include/asm/processor.h index 8dced6006b..a9ba75bfdd 100644 --- a/arch/sandbox/include/asm/processor.h +++ b/arch/sandbox/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/arch/sandbox/include/asm/ptrace.h b/arch/sandbox/include/asm/ptrace.h index 78e58173f6..d148a42ca7 100644 --- a/arch/sandbox/include/asm/ptrace.h +++ b/arch/sandbox/include/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/rtc.h b/arch/sandbox/include/asm/rtc.h index bf3ac5ea1e..2acd39c1eb 100644 --- a/arch/sandbox/include/asm/rtc.h +++ b/arch/sandbox/include/asm/rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Simulate an I2C real time clock * diff --git a/arch/sandbox/include/asm/sandbox_arm_ffa.h b/arch/sandbox/include/asm/sandbox_arm_ffa.h index be2790f496..a8fd126b38 100644 --- a/arch/sandbox/include/asm/sandbox_arm_ffa.h +++ b/arch/sandbox/include/asm/sandbox_arm_ffa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/arch/sandbox/include/asm/sandbox_arm_ffa_priv.h b/arch/sandbox/include/asm/sandbox_arm_ffa_priv.h index b0881822d7..b3b0cb9b1f 100644 --- a/arch/sandbox/include/asm/sandbox_arm_ffa_priv.h +++ b/arch/sandbox/include/asm/sandbox_arm_ffa_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h index ee4991f7c2..007722c745 100644 --- a/arch/sandbox/include/asm/sdl.h +++ b/arch/sandbox/include/asm/sdl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc */ diff --git a/arch/sandbox/include/asm/serial.h b/arch/sandbox/include/asm/serial.h index 16589a1b21..c5979919b0 100644 --- a/arch/sandbox/include/asm/serial.h +++ b/arch/sandbox/include/asm/serial.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/sandbox/include/asm/setjmp.h b/arch/sandbox/include/asm/setjmp.h index 001c7ea322..f976e05de7 100644 --- a/arch/sandbox/include/asm/setjmp.h +++ b/arch/sandbox/include/asm/setjmp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2018 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/sandbox/include/asm/spl.h b/arch/sandbox/include/asm/spl.h index f349ea1997..179cae1484 100644 --- a/arch/sandbox/include/asm/spl.h +++ b/arch/sandbox/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index 59a20595f5..6621cbfc38 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011-2012 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/string.h b/arch/sandbox/include/asm/string.h index 32685b317b..23a8c0dde1 100644 --- a/arch/sandbox/include/asm/string.h +++ b/arch/sandbox/include/asm/string.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/system.h b/arch/sandbox/include/asm/system.h index 7933b6292e..8144f2f5b4 100644 --- a/arch/sandbox/include/asm/system.h +++ b/arch/sandbox/include/asm/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h index 17159f8d67..871c83e751 100644 --- a/arch/sandbox/include/asm/test.h +++ b/arch/sandbox/include/asm/test.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Test-related constants for sandbox * diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 5f4b649ee3..0097966e1a 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h index e7027747b3..380f59b823 100644 --- a/arch/sandbox/include/asm/u-boot-sandbox.h +++ b/arch/sandbox/include/asm/u-boot-sandbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/arch/sandbox/include/asm/u-boot.h b/arch/sandbox/include/asm/u-boot.h index 34fcb71492..f6ef091364 100644 --- a/arch/sandbox/include/asm/u-boot.h +++ b/arch/sandbox/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/sandbox/include/asm/unaligned.h b/arch/sandbox/include/asm/unaligned.h index 2cb2a17fa9..3b8305f90d 100644 --- a/arch/sandbox/include/asm/unaligned.h +++ b/arch/sandbox/include/asm/unaligned.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index a2bc5a7ee6..0a9ce066c5 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index dc8b8e46cb..1cf4743c1c 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2015 Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> diff --git a/arch/sandbox/lib/crt0_sandbox_efi.S b/arch/sandbox/lib/crt0_sandbox_efi.S index 88537345dd..1d89956ba0 100644 --- a/arch/sandbox/lib/crt0_sandbox_efi.S +++ b/arch/sandbox/lib/crt0_sandbox_efi.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * PE/COFF header for EFI applications * diff --git a/arch/sandbox/lib/fdt_fixup.c b/arch/sandbox/lib/fdt_fixup.c index a646f2059c..9b8872eed8 100644 --- a/arch/sandbox/lib/fdt_fixup.c +++ b/arch/sandbox/lib/fdt_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #define LOG_CATEGORY LOGC_ARCH diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index 4d7cbff802..77becdc3d8 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * Use of this source code is governed by a BSD-style license that can be diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c index 2038141947..f5f7d01b9e 100644 --- a/arch/sandbox/lib/pci_io.c +++ b/arch/sandbox/lib/pci_io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/sandbox/lib/reloc_sandbox_efi.c b/arch/sandbox/lib/reloc_sandbox_efi.c index a21e6757c5..211988986e 100644 --- a/arch/sandbox/lib/reloc_sandbox_efi.c +++ b/arch/sandbox/lib/reloc_sandbox_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * position independent shared object relocator * diff --git a/arch/sandbox/lib/sections.c b/arch/sandbox/lib/sections.c index 2f2f3fbfdb..66d5039cd9 100644 --- a/arch/sandbox/lib/sections.c +++ b/arch/sandbox/lib/sections.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Albert ARIBAUD <albert.u.boot(a)aribaud.net> * diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 1e36c4c992..5ecb53887c 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/sh/lib/start.o diff --git a/arch/sh/config.mk b/arch/sh/config.mk index a408264d4b..d3e714a697 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/sh/cpu/sh4/Makefile b/arch/sh/cpu/sh4/Makefile index 7403a2c304..ad93424755 100644 --- a/arch/sh/cpu/sh4/Makefile +++ b/arch/sh/cpu/sh4/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/sh/cpu/sh4/cache.c b/arch/sh/cpu/sh4/cache.c index 0f7dfdd3cf..9ee96ceec7 100644 --- a/arch/sh/cpu/sh4/cache.c +++ b/arch/sh/cpu/sh4/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Vladimir Zapolskiy <vz(a)mleia.com> * (C) Copyright 2007 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/arch/sh/cpu/sh4/config.mk b/arch/sh/cpu/sh4/config.mk index 23fec66492..b6ac1ad341 100644 --- a/arch/sh/cpu/sh4/config.mk +++ b/arch/sh/cpu/sh4/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index 1b2f50dbe6..3e44ca6bb6 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/arch/sh/cpu/sh4/interrupts.c b/arch/sh/cpu/sh4/interrupts.c index 278a3e32ac..51e87a79e6 100644 --- a/arch/sh/cpu/sh4/interrupts.c +++ b/arch/sh/cpu/sh4/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/arch/sh/cpu/sh4/watchdog.c b/arch/sh/cpu/sh4/watchdog.c index bf403d3c52..6f9e4ec3e7 100644 --- a/arch/sh/cpu/sh4/watchdog.c +++ b/arch/sh/cpu/sh4/watchdog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cpu_func.h> diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index c31deecec6..0a8ec3d5b7 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Vladimir Zapolskiy <vz(a)mleia.com> * Copyright (C) 2008-2009 Yoshihiro Shimoda <shimoda.yoshihiro(a)renesas.com> diff --git a/arch/sh/include/asm/byteorder.h b/arch/sh/include/asm/byteorder.h index b5dfe4e4d8..316b181dc2 100644 --- a/arch/sh/include/asm/byteorder.h +++ b/arch/sh/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ASM_SH_BYTEORDER_H_ #define __ASM_SH_BYTEORDER_H_ diff --git a/arch/sh/include/asm/config.h b/arch/sh/include/asm/config.h index 03c196fec3..2635ead69b 100644 --- a/arch/sh/include/asm/config.h +++ b/arch/sh/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/sh/include/asm/cpu_sh4.h b/arch/sh/include/asm/cpu_sh4.h index ed7c243b3b..997ef8dc70 100644 --- a/arch/sh/include/asm/cpu_sh4.h +++ b/arch/sh/include/asm/cpu_sh4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007,2008 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> */ diff --git a/arch/sh/include/asm/cpu_sh7722.h b/arch/sh/include/asm/cpu_sh7722.h index 9f1f6a0474..bcdbfc92bf 100644 --- a/arch/sh/include/asm/cpu_sh7722.h +++ b/arch/sh/include/asm/cpu_sh7722.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> * diff --git a/arch/sh/include/asm/cpu_sh7723.h b/arch/sh/include/asm/cpu_sh7723.h index 59116cf0fe..56a44358fe 100644 --- a/arch/sh/include/asm/cpu_sh7723.h +++ b/arch/sh/include/asm/cpu_sh7723.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 Renesas Solutions Corp. * diff --git a/arch/sh/include/asm/cpu_sh7734.h b/arch/sh/include/asm/cpu_sh7734.h index 546f4fff9b..bb7e9ac530 100644 --- a/arch/sh/include/asm/cpu_sh7734.h +++ b/arch/sh/include/asm/cpu_sh7734.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008, 2011 Renesas Solutions Corp. * diff --git a/arch/sh/include/asm/cpu_sh7750.h b/arch/sh/include/asm/cpu_sh7750.h index e0cafbdbba..432555ad76 100644 --- a/arch/sh/include/asm/cpu_sh7750.h +++ b/arch/sh/include/asm/cpu_sh7750.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> * diff --git a/arch/sh/include/asm/cpu_sh7752.h b/arch/sh/include/asm/cpu_sh7752.h index e024423f25..69dc750f02 100644 --- a/arch/sh/include/asm/cpu_sh7752.h +++ b/arch/sh/include/asm/cpu_sh7752.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Renesas Solutions Corp. */ diff --git a/arch/sh/include/asm/cpu_sh7753.h b/arch/sh/include/asm/cpu_sh7753.h index 2f779b137e..1d124c8d29 100644 --- a/arch/sh/include/asm/cpu_sh7753.h +++ b/arch/sh/include/asm/cpu_sh7753.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Renesas Solutions Corp. */ diff --git a/arch/sh/include/asm/cpu_sh7757.h b/arch/sh/include/asm/cpu_sh7757.h index b3aaec2aaa..09366e8766 100644 --- a/arch/sh/include/asm/cpu_sh7757.h +++ b/arch/sh/include/asm/cpu_sh7757.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Renesas Solutions Corp. */ diff --git a/arch/sh/include/asm/cpu_sh7763.h b/arch/sh/include/asm/cpu_sh7763.h index e56d135abe..6a6d11ec9f 100644 --- a/arch/sh/include/asm/cpu_sh7763.h +++ b/arch/sh/include/asm/cpu_sh7763.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Renesas Solutions Corp. * Copyright (C) 2007,2008 Nobuhiro Iwamatsu diff --git a/arch/sh/include/asm/cpu_sh7780.h b/arch/sh/include/asm/cpu_sh7780.h index 2ac3e93074..4ab7e8da41 100644 --- a/arch/sh/include/asm/cpu_sh7780.h +++ b/arch/sh/include/asm/cpu_sh7780.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _ASM_CPU_SH7780_H_ #define _ASM_CPU_SH7780_H_ diff --git a/arch/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h index bd946ffd8f..71d7ae9f7d 100644 --- a/arch/sh/include/asm/global_data.h +++ b/arch/sh/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/sh/include/asm/macro.h b/arch/sh/include/asm/macro.h index e15ec0a27e..a833dd3818 100644 --- a/arch/sh/include/asm/macro.h +++ b/arch/sh/include/asm/macro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Yoshihiro Shimoda <shimoda.yoshihiro(a)renesas.com> */ diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 18b95ff5cf..32b6f80de7 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SH4 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin(a)sensoria.com) diff --git a/arch/sh/include/asm/sections.h b/arch/sh/include/asm/sections.h index 85859e59a1..d8fd506284 100644 --- a/arch/sh/include/asm/sections.h +++ b/arch/sh/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/sh/include/asm/u-boot.h b/arch/sh/include/asm/u-boot.h index d1eb1ab7cb..db47806a9a 100644 --- a/arch/sh/include/asm/u-boot.h +++ b/arch/sh/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* ******************************************************************** * NOTE: This header file defines an interface to U-Boot. Including diff --git a/arch/sh/include/asm/zimage.h b/arch/sh/include/asm/zimage.h index 23be23da31..e6d491c437 100644 --- a/arch/sh/include/asm/zimage.h +++ b/arch/sh/include/asm/zimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Renesas Solutions Corp. diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index e7520a328d..e93499f94f 100644 --- a/arch/sh/lib/Makefile +++ b/arch/sh/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2007 # Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/arch/sh/lib/ashiftrt.S b/arch/sh/lib/ashiftrt.S index 2412337a9e..2982c8c491 100644 --- a/arch/sh/lib/ashiftrt.S +++ b/arch/sh/lib/ashiftrt.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/ashlsi3.S b/arch/sh/lib/ashlsi3.S index 035dd70d66..6800b4d8ec 100644 --- a/arch/sh/lib/ashlsi3.S +++ b/arch/sh/lib/ashlsi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/ashrsi3.S b/arch/sh/lib/ashrsi3.S index 6064c206d8..60007bfb03 100644 --- a/arch/sh/lib/ashrsi3.S +++ b/arch/sh/lib/ashrsi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c index b31fa6d703..69b1dc4dee 100644 --- a/arch/sh/lib/board.c +++ b/arch/sh/lib/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Vladimir Zapolskiy <vz(a)mleia.com> */ diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c index b205e5e3db..7e74c49d69 100644 --- a/arch/sh/lib/bootm.c +++ b/arch/sh/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/sh/lib/lshrsi3.S b/arch/sh/lib/lshrsi3.S index d6fb7d48c1..410b12b695 100644 --- a/arch/sh/lib/lshrsi3.S +++ b/arch/sh/lib/lshrsi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/movmem.S b/arch/sh/lib/movmem.S index 9517329666..dc8832d8ff 100644 --- a/arch/sh/lib/movmem.S +++ b/arch/sh/lib/movmem.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/start.S b/arch/sh/lib/start.S index f0e1c805b0..6ecc3aa2f1 100644 --- a/arch/sh/lib/start.S +++ b/arch/sh/lib/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Vladimir Zapolskiy <vz(a)mleia.com> * Copyright (C) 2007, 2010 Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c index 366500d90b..0ae03770e8 100644 --- a/arch/sh/lib/time.c +++ b/arch/sh/lib/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c index 5484c543c6..f4bd7fb0c2 100644 --- a/arch/sh/lib/time_sh2.c +++ b/arch/sh/lib/time_sh2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007,2008 Nobobuhiro Iwamatsu <iwamatsu(a)nigauri.org> * Copyright (C) 2008 Renesas Solutions Corp. diff --git a/arch/sh/lib/udiv_qrnnd.S b/arch/sh/lib/udiv_qrnnd.S index 939cee6df8..8bdf8669e6 100644 --- a/arch/sh/lib/udiv_qrnnd.S +++ b/arch/sh/lib/udiv_qrnnd.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/udivsi3.S b/arch/sh/lib/udivsi3.S index 00b771f4c0..7ba606d7e1 100644 --- a/arch/sh/lib/udivsi3.S +++ b/arch/sh/lib/udivsi3.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. diff --git a/arch/sh/lib/udivsi3_i4i-Os.S b/arch/sh/lib/udivsi3_i4i-Os.S index a7113d89ca..d300484dd0 100644 --- a/arch/sh/lib/udivsi3_i4i-Os.S +++ b/arch/sh/lib/udivsi3_i4i-Os.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006 Free Software Foundation, Inc. */ diff --git a/arch/sh/lib/udivsi3_i4i.S b/arch/sh/lib/udivsi3_i4i.S index f331a10db2..72d431707c 100644 --- a/arch/sh/lib/udivsi3_i4i.S +++ b/arch/sh/lib/udivsi3_i4i.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. diff --git a/arch/sh/lib/zimageboot.c b/arch/sh/lib/zimageboot.c index c2e285ff0f..3ef9d69d94 100644 --- a/arch/sh/lib/zimageboot.c +++ b/arch/sh/lib/zimageboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Renesas Solutions Corp. diff --git a/arch/x86/Makefile b/arch/x86/Makefile index f1afc74fff..8e9b2f3b20 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifeq ($(CONFIG_EFI_APP),) ifdef CONFIG_$(SPL_)X86_64 diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 26ec1af2f0..74d71c74de 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 16e67e3da2..c8c4ab1466 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c index da01e71335..7e845b0a13 100644 --- a/arch/x86/cpu/acpi_gpe.c +++ b/arch/x86/cpu/acpi_gpe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google, LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile index 2ddf4af62c..84f980597a 100644 --- a/arch/x86/cpu/apollolake/Makefile +++ b/arch/x86/cpu/apollolake/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index c610a7f447..e6e51577d7 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Intel Corp. * Copyright (C) 2017-2019 Siemens AG diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c index c6be707e4e..82cf21b9a2 100644 --- a/arch/x86/cpu/apollolake/fsp_m.c +++ b/arch/x86/cpu/apollolake/fsp_m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index a9b13c0c70..2d252a96df 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig index a8efea8a34..ae5223af48 100644 --- a/arch/x86/cpu/baytrail/Kconfig +++ b/arch/x86/cpu/baytrail/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Google, Inc diff --git a/arch/x86/cpu/baytrail/Makefile b/arch/x86/cpu/baytrail/Makefile index ce5d6178cd..12076214aa 100644 --- a/arch/x86/cpu/baytrail/Makefile +++ b/arch/x86/cpu/baytrail/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Google, Inc diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 4378846f8b..0b8efe2505 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index c270426d82..b68c6e5b9a 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index 08dbd5538f..b435418775 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index f73738ce5c..5b29ad4e16 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/braswell/Kconfig b/arch/x86/cpu/braswell/Kconfig index 2676fe6e17..3d9e73cc55 100644 --- a/arch/x86/cpu/braswell/Kconfig +++ b/arch/x86/cpu/braswell/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/braswell/Makefile b/arch/x86/cpu/braswell/Makefile index 277f81e6de..9a7b78cfe7 100644 --- a/arch/x86/cpu/braswell/Makefile +++ b/arch/x86/cpu/braswell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c index 3345049993..7b984e39c5 100644 --- a/arch/x86/cpu/braswell/braswell.c +++ b/arch/x86/cpu/braswell/braswell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c index d78c6b0feb..c8158403a5 100644 --- a/arch/x86/cpu/braswell/early_uart.c +++ b/arch/x86/cpu/braswell/early_uart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 243298fd57..0999415ee3 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/broadwell/Makefile b/arch/x86/cpu/broadwell/Makefile index 3e1f76d611..49f57cc93f 100644 --- a/arch/x86/cpu/broadwell/Makefile +++ b/arch/x86/cpu/broadwell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c index df5a9675ee..47e206eff4 100644 --- a/arch/x86/cpu/broadwell/cpu_from_spl.c +++ b/arch/x86/cpu/broadwell/cpu_from_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c index 85bd37101b..8a24973926 100644 --- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c +++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc */ diff --git a/arch/x86/cpu/call32.S b/arch/x86/cpu/call32.S index b28d58a317..b6333f979d 100644 --- a/arch/x86/cpu/call32.S +++ b/arch/x86/cpu/call32.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/config.mk b/arch/x86/cpu/config.mk index 87e242a206..8a800a64d1 100644 --- a/arch/x86/cpu/config.mk +++ b/arch/x86/cpu/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile index a6cdb9a148..1a8ebc798b 100644 --- a/arch/x86/cpu/coreboot/Makefile +++ b/arch/x86/cpu/coreboot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/arch/x86/cpu/coreboot/car.S b/arch/x86/cpu/coreboot/car.S index 7163b69a49..ab83692d1d 100644 --- a/arch/x86/cpu/coreboot/car.S +++ b/arch/x86/cpu/coreboot/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 82fe4c71cd..d7d6827ff1 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 diff --git a/arch/x86/cpu/coreboot/coreboot_spl.c b/arch/x86/cpu/coreboot/coreboot_spl.c index 36661871e9..2eeb627b76 100644 --- a/arch/x86/cpu/coreboot/coreboot_spl.c +++ b/arch/x86/cpu/coreboot/coreboot_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Google LLC */ diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 26352df421..518d042bc4 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index 3ad611a530..4872b4bf56 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. * diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index ce55efc454..72dbe1c896 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 59da41f383..0ea1b18c51 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index 9716a4ebe0..0491d0f311 100644 --- a/arch/x86/cpu/efi/Makefile +++ b/arch/x86/cpu/efi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c index f754489784..a5eb15b1dc 100644 --- a/arch/x86/cpu/efi/app.c +++ b/arch/x86/cpu/efi/app.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/arch/x86/cpu/efi/car.S b/arch/x86/cpu/efi/car.S index 488dcde66c..22c35bed97 100644 --- a/arch/x86/cpu/efi/car.S +++ b/arch/x86/cpu/efi/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 708bfbe7ee..5425fa6557 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 56f3326146..6c4adb698f 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/arch/x86/cpu/i386/call64.S b/arch/x86/cpu/i386/call64.S index d81bcc6f8f..147099469e 100644 --- a/arch/x86/cpu/i386/call64.S +++ b/arch/x86/cpu/i386/call64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Google, Inc * Copyright (C) 1991, 1992, 1993 Linus Torvalds diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 8882532ebf..5b3a50b570 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index f3f3527237..b040e7fec0 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index 1dc17b4587..38446f6349 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index d94ec208f6..2b283938cd 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic Intel ACPI table generation * diff --git a/arch/x86/cpu/intel_common/generic_wifi.c b/arch/x86/cpu/intel_common/generic_wifi.c index 61ec5391b0..031b4b9392 100644 --- a/arch/x86/cpu/intel_common/generic_wifi.c +++ b/arch/x86/cpu/intel_common/generic_wifi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic WiFi ACPI info * diff --git a/arch/x86/cpu/intel_common/intel_opregion.c b/arch/x86/cpu/intel_common/intel_opregion.c index 1eed21d8cd..e2b041ad18 100644 --- a/arch/x86/cpu/intel_common/intel_opregion.c +++ b/arch/x86/cpu/intel_common/intel_opregion.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Writing IntelGraphicsMem table for ACPI * diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c index 4f99de6ece..2445e7ba45 100644 --- a/arch/x86/cpu/ioapic.c +++ b/arch/x86/cpu/ioapic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c index 766b2451a2..041c0867a0 100644 --- a/arch/x86/cpu/irq.c +++ b/arch/x86/cpu/irq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/ivybridge/Makefile b/arch/x86/cpu/ivybridge/Makefile index 716134e9ff..9754597811 100644 --- a/arch/x86/cpu/ivybridge/Makefile +++ b/arch/x86/cpu/ivybridge/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Google, Inc diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index 417290f559..779f56b16a 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Google, Inc */ diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c index 3c4ea6c267..0ae7c3c71e 100644 --- a/arch/x86/cpu/ivybridge/fsp_configs.c +++ b/arch/x86/cpu/ivybridge/fsp_configs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c index eb3f362e4e..a450a546e3 100644 --- a/arch/x86/cpu/ivybridge/ivybridge.c +++ b/arch/x86/cpu/ivybridge/ivybridge.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index a133a5d811..b6819eac1a 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 9c24ae984e..60e6c64a16 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Google, Inc * diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 8a992ed823..9ab68519c9 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008,2009 diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index f8f2f64730..f3480991be 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index b7dd5bd46c..e71a9e6a54 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/qemu/car.S b/arch/x86/cpu/qemu/car.S index 466b4876ef..61b69953cd 100644 --- a/arch/x86/cpu/qemu/car.S +++ b/arch/x86/cpu/qemu/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index 735b656084..63b9aaaf02 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Miao Yan <yanmiaobest(a)gmail.com> */ diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index d83abf0052..d5a1715f43 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index ebfe595644..fa60f887f8 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * QEMU x86 specific E820 table generation * diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 7041455608..62f636322c 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c index ee00b8fe73..aacbb9bc11 100644 --- a/arch/x86/cpu/qfw_cpu.c +++ b/arch/x86/cpu/qfw_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/arch/x86/cpu/quark/Kconfig b/arch/x86/cpu/quark/Kconfig index 0d4008a31f..df47d74ffb 100644 --- a/arch/x86/cpu/quark/Kconfig +++ b/arch/x86/cpu/quark/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/quark/Makefile b/arch/x86/cpu/quark/Makefile index 7039f8b9b6..797fd6825e 100644 --- a/arch/x86/cpu/quark/Makefile +++ b/arch/x86/cpu/quark/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c index 9a2d682451..dababcf7de 100644 --- a/arch/x86/cpu/quark/acpi.c +++ b/arch/x86/cpu/quark/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/quark/car.S b/arch/x86/cpu/quark/car.S index 48d5167c74..fdf8fa4238 100644 --- a/arch/x86/cpu/quark/car.S +++ b/arch/x86/cpu/quark/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index ad98f3e07b..bb4b39b181 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c index d4f8c082ff..1064b9e637 100644 --- a/arch/x86/cpu/quark/msg_port.c +++ b/arch/x86/cpu/quark/msg_port.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index 62b83c228c..20b07a254a 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/queensbay/Kconfig b/arch/x86/cpu/queensbay/Kconfig index c9e0fda031..ead53ea383 100644 --- a/arch/x86/cpu/queensbay/Kconfig +++ b/arch/x86/cpu/queensbay/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/queensbay/Makefile b/arch/x86/cpu/queensbay/Makefile index ac2961356b..5773d85084 100644 --- a/arch/x86/cpu/queensbay/Makefile +++ b/arch/x86/cpu/queensbay/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 4a008622d1..d3d8d1ecb9 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S index cf972738b3..282ed2255e 100644 --- a/arch/x86/cpu/resetvec.S +++ b/arch/x86/cpu/resetvec.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot - x86 Startup Code * diff --git a/arch/x86/cpu/slimbootloader/Kconfig b/arch/x86/cpu/slimbootloader/Kconfig index 58a9ca01a9..1959a8569f 100644 --- a/arch/x86/cpu/slimbootloader/Kconfig +++ b/arch/x86/cpu/slimbootloader/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Intel Corporation <www.intel.com> diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile index aac9fa3db8..1b76111c34 100644 --- a/arch/x86/cpu/slimbootloader/Makefile +++ b/arch/x86/cpu/slimbootloader/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Intel Corporation <www.intel.com> diff --git a/arch/x86/cpu/slimbootloader/car.S b/arch/x86/cpu/slimbootloader/car.S index 6e0304333c..4fb6fbd7a9 100644 --- a/arch/x86/cpu/slimbootloader/car.S +++ b/arch/x86/cpu/slimbootloader/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c index fbb33b246e..b0262bba78 100644 --- a/arch/x86/cpu/slimbootloader/sdram.c +++ b/arch/x86/cpu/slimbootloader/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index d28b280890..0dedc06909 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c index ec5b87cfd6..9f1220dd23 100644 --- a/arch/x86/cpu/slimbootloader/slimbootloader.c +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 0ef27cc5a0..62a980fef6 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot - x86 Startup Code * diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 865a49731e..a7516e21f7 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot - x86 Startup Code * diff --git a/arch/x86/cpu/start64.S b/arch/x86/cpu/start64.S index 78e894d2a2..0df77aa34a 100644 --- a/arch/x86/cpu/start64.S +++ b/arch/x86/cpu/start64.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * 64-bit x86 Startup Code * diff --git a/arch/x86/cpu/start_from_spl.S b/arch/x86/cpu/start_from_spl.S index abfd4abb62..f41113a5a9 100644 --- a/arch/x86/cpu/start_from_spl.S +++ b/arch/x86/cpu/start_from_spl.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * 32-bit x86 Startup Code when running from SPL. This is the startup code in * U-Boot proper, when SPL is used. diff --git a/arch/x86/cpu/start_from_tpl.S b/arch/x86/cpu/start_from_tpl.S index 9a4974a5f1..d164082327 100644 --- a/arch/x86/cpu/start_from_tpl.S +++ b/arch/x86/cpu/start_from_tpl.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * 32-bit x86 Startup Code when running from TPL. This is the startup code in * SPL, when TPL is used. diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index 19aaf165d6..70520c4e82 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Intel Corporation diff --git a/arch/x86/cpu/tangier/Makefile b/arch/x86/cpu/tangier/Makefile index 68f4a326ee..c34bb2f00e 100644 --- a/arch/x86/cpu/tangier/Makefile +++ b/arch/x86/cpu/tangier/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Intel Corporation diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 1c667c7d56..9c5de845a5 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/cpu/tangier/car.S b/arch/x86/cpu/tangier/car.S index 7163b69a49..ab83692d1d 100644 --- a/arch/x86/cpu/tangier/car.S +++ b/arch/x86/cpu/tangier/car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010-2011 diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c index 23bfa7c18d..1b6521eef4 100644 --- a/arch/x86/cpu/tangier/pinmux.c +++ b/arch/x86/cpu/tangier/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Emlid Limited */ diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index 374b262b13..1b2b1f806e 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/cpu/tangier/sysreset.c b/arch/x86/cpu/tangier/sysreset.c index b03bc28f93..ba1d830ff8 100644 --- a/arch/x86/cpu/tangier/sysreset.c +++ b/arch/x86/cpu/tangier/sysreset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index 1e2f6cc8b7..457ca61983 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index d0398ff00d..81260567d9 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index a0a2a06a18..558e8bf568 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index a31f4220a0..af1e74d91f 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S index 093bf3bcc5..71cd46ec36 100644 --- a/arch/x86/cpu/wakeup.S +++ b/arch/x86/cpu/wakeup.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 2647bff891..bb9c15414a 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 634f7660c0..bc41ea842b 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/cpu/x86_64/misc.c b/arch/x86/cpu/x86_64/misc.c index 691b67ff68..88c9f1a727 100644 --- a/arch/x86/cpu/x86_64/misc.c +++ b/arch/x86/cpu/x86_64/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index cd77f4c4e8..c126f0426d 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-y += bayleybay.dtb \ cherryhill.dtb \ diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts index 59403f40ce..4644c82bd9 100644 --- a/arch/x86/dts/bayleybay.dts +++ b/arch/x86/dts/bayleybay.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts index 4e12c4a40c..d4a06851f6 100644 --- a/arch/x86/dts/baytrail_som-db5800-som-6867.dts +++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2016, George McCollister <george.mccollister(a)gmail.com> diff --git a/arch/x86/dts/cherryhill.dts b/arch/x86/dts/cherryhill.dts index 3d35e4643c..192b7c05a2 100644 --- a/arch/x86/dts/cherryhill.dts +++ b/arch/x86/dts/cherryhill.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/conga-qeval20-qa3-e3845.dts b/arch/x86/dts/conga-qeval20-qa3-e3845.dts index c6577b30c8..e27c6deca4 100644 --- a/arch/x86/dts/conga-qeval20-qa3-e3845.dts +++ b/arch/x86/dts/conga-qeval20-qa3-e3845.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/x86/dts/coreboot-u-boot.dtsi b/arch/x86/dts/coreboot-u-boot.dtsi index 38efc48d83..9d570d8f91 100644 --- a/arch/x86/dts/coreboot-u-boot.dtsi +++ b/arch/x86/dts/coreboot-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/dts/coreboot.dts b/arch/x86/dts/coreboot.dts index 0eb31cae42..f436941ac5 100644 --- a/arch/x86/dts/coreboot.dts +++ b/arch/x86/dts/coreboot.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/dts/cougarcanyon2.dts b/arch/x86/dts/cougarcanyon2.dts index 4833aab21c..81aa5f491a 100644 --- a/arch/x86/dts/cougarcanyon2.dts +++ b/arch/x86/dts/cougarcanyon2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts index 64282303fb..e3ce7e6a78 100644 --- a/arch/x86/dts/crownbay.dts +++ b/arch/x86/dts/crownbay.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/dfi-bt700-q7x-151.dts b/arch/x86/dts/dfi-bt700-q7x-151.dts index ca60289370..29f912c6e6 100644 --- a/arch/x86/dts/dfi-bt700-q7x-151.dts +++ b/arch/x86/dts/dfi-bt700-q7x-151.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/x86/dts/dfi-bt700.dtsi b/arch/x86/dts/dfi-bt700.dtsi index 868cea4d18..3c8f0290dd 100644 --- a/arch/x86/dts/dfi-bt700.dtsi +++ b/arch/x86/dts/dfi-bt700.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index 7af8507e45..e77a85b153 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/dts/efi-x86_app.dts b/arch/x86/dts/efi-x86_app.dts index 59e2e402d5..ae0804d362 100644 --- a/arch/x86/dts/efi-x86_app.dts +++ b/arch/x86/dts/efi-x86_app.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/arch/x86/dts/efi-x86_payload.dts b/arch/x86/dts/efi-x86_payload.dts index 1a6dd7dd70..330e76c00b 100644 --- a/arch/x86/dts/efi-x86_payload.dts +++ b/arch/x86/dts/efi-x86_payload.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi index 7245fe51b3..9c35a08687 100644 --- a/arch/x86/dts/emulation-u-boot.dtsi +++ b/arch/x86/dts/emulation-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts index 08be190eda..c46b710491 100644 --- a/arch/x86/dts/galileo.dts +++ b/arch/x86/dts/galileo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts index f44b9bbc53..187f334e5c 100644 --- a/arch/x86/dts/minnowmax.dts +++ b/arch/x86/dts/minnowmax.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/qemu-x86_i440fx.dts b/arch/x86/dts/qemu-x86_i440fx.dts index 3bb2f121de..ce7473692c 100644 --- a/arch/x86/dts/qemu-x86_i440fx.dts +++ b/arch/x86/dts/qemu-x86_i440fx.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/qemu-x86_q35.dts b/arch/x86/dts/qemu-x86_q35.dts index 63931cd6dd..6ee6da050f 100644 --- a/arch/x86/dts/qemu-x86_q35.dts +++ b/arch/x86/dts/qemu-x86_q35.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi index 60ffffcc0e..5294cdb530 100644 --- a/arch/x86/dts/quark-u-boot.dtsi +++ b/arch/x86/dts/quark-u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/dts/slimbootloader.dts b/arch/x86/dts/slimbootloader.dts index 9b581c8489..016d11499a 100644 --- a/arch/x86/dts/slimbootloader.dts +++ b/arch/x86/dts/slimbootloader.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/arch/x86/dts/smbios.dtsi b/arch/x86/dts/smbios.dtsi index 9fa8c638a5..56f08f009f 100644 --- a/arch/x86/dts/smbios.dtsi +++ b/arch/x86/dts/smbios.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Default SMBIOS information. Include this in your board .dts file if you want * these defaults. diff --git a/arch/x86/dts/theadorable-x86-dfi-bt700.dts b/arch/x86/dts/theadorable-x86-dfi-bt700.dts index ea0bff7b92..a9b7462194 100644 --- a/arch/x86/dts/theadorable-x86-dfi-bt700.dts +++ b/arch/x86/dts/theadorable-x86-dfi-bt700.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index e0de331809..0c9fe2e152 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 4475d046e8..e500db8fb7 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/acpi/debug.asl b/arch/x86/include/asm/acpi/debug.asl index 6025507e7c..49b1c0bf6b 100644 --- a/arch/x86/include/asm/acpi/debug.asl +++ b/arch/x86/include/asm/acpi/debug.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/acpi/global_nvs.h b/arch/x86/include/asm/acpi/global_nvs.h index 46383629cc..a0f632f8a7 100644 --- a/arch/x86/include/asm/acpi/global_nvs.h +++ b/arch/x86/include/asm/acpi/global_nvs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/acpi/globutil.asl b/arch/x86/include/asm/acpi/globutil.asl index 5d50ef3673..6cfce14b2b 100644 --- a/arch/x86/include/asm/acpi/globutil.asl +++ b/arch/x86/include/asm/acpi/globutil.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/acpi/irq_helper.h b/arch/x86/include/asm/acpi/irq_helper.h index 6e404f48bb..aa6e79bba3 100644 --- a/arch/x86/include/asm/acpi/irq_helper.h +++ b/arch/x86/include/asm/acpi/irq_helper.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2014 Sage Electronics Engineering, LLC. diff --git a/arch/x86/include/asm/acpi/irqlinks.asl b/arch/x86/include/asm/acpi/irqlinks.asl index 9fc83a511e..044bb6c22d 100644 --- a/arch/x86/include/asm/acpi/irqlinks.asl +++ b/arch/x86/include/asm/acpi/irqlinks.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/acpi/irqroute.asl b/arch/x86/include/asm/acpi/irqroute.asl index 0ed7efd85a..a925649f49 100644 --- a/arch/x86/include/asm/acpi/irqroute.asl +++ b/arch/x86/include/asm/acpi/irqroute.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2013 Google Inc. diff --git a/arch/x86/include/asm/acpi/sleepstates.asl b/arch/x86/include/asm/acpi/sleepstates.asl index 31aa69a570..2d2487dd87 100644 --- a/arch/x86/include/asm/acpi/sleepstates.asl +++ b/arch/x86/include/asm/acpi/sleepstates.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/acpi/statdef.asl b/arch/x86/include/asm/acpi/statdef.asl index 6697bc455b..851dac939b 100644 --- a/arch/x86/include/asm/acpi/statdef.asl +++ b/arch/x86/include/asm/acpi/statdef.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Advanced Micro Devices, Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/acpi_nhlt.h b/arch/x86/include/asm/acpi_nhlt.h index 2c44196317..ec806e1a9f 100644 --- a/arch/x86/include/asm/acpi_nhlt.h +++ b/arch/x86/include/asm/acpi_nhlt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC * diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 226753b65d..75e79e68d8 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on acpi.c from coreboot * diff --git a/arch/x86/include/asm/acpigen.h b/arch/x86/include/asm/acpigen.h index c531dd61d5..605109314e 100644 --- a/arch/x86/include/asm/acpigen.h +++ b/arch/x86/include/asm/acpigen.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Generation of x86-specific ACPI tables * diff --git a/arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl b/arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl index 7854f7e1c5..450109036c 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Alexandru Gagniuc <alexandrux.gagniuc(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/gpio.asl b/arch/x86/include/asm/arch-apollolake/acpi/gpio.asl index b0f892166b..ef68e9a578 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/gpio.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/gpio.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/lpss.asl b/arch/x86/include/asm/arch-apollolake/acpi/lpss.asl index bc3eabba60..60c9f2bc47 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/lpss.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/lpss.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl b/arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl index ff5657abd0..cb5354d693 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl b/arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl index 21a1ca9ff9..4ea10c0270 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl b/arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl index df2fafb7f6..8c8fa45c6e 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl b/arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl index 08290194f6..ccad3290c8 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl b/arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl index 3ab7d18fc8..08515ee3d9 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC. * Copyright 2019 Intel Corp. diff --git a/arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl b/arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl index 192267221f..7ae02ac505 100644 --- a/arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl +++ b/arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC. * Copyright 2019 Intel Corp. diff --git a/arch/x86/include/asm/arch-apollolake/global_nvs.h b/arch/x86/include/asm/arch-apollolake/global_nvs.h index ef8eb228db..0084a85d9b 100644 --- a/arch/x86/include/asm/arch-apollolake/global_nvs.h +++ b/arch/x86/include/asm/arch-apollolake/global_nvs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2017 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/gpio.h b/arch/x86/include/asm/arch-apollolake/gpio.h index 762160da88..232abe5e6e 100644 --- a/arch/x86/include/asm/arch-apollolake/gpio.h +++ b/arch/x86/include/asm/arch-apollolake/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Definitions for the GPIO subsystem on Apollolake * diff --git a/arch/x86/include/asm/arch-apollolake/hostbridge.h b/arch/x86/include/asm/arch-apollolake/hostbridge.h index f4dce0d522..fe51bc09e4 100644 --- a/arch/x86/include/asm/arch-apollolake/hostbridge.h +++ b/arch/x86/include/asm/arch-apollolake/hostbridge.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC */ diff --git a/arch/x86/include/asm/arch-apollolake/pm.h b/arch/x86/include/asm/arch-apollolake/pm.h index 9a8d971e91..e64b3aa58e 100644 --- a/arch/x86/include/asm/arch-apollolake/pm.h +++ b/arch/x86/include/asm/arch-apollolake/pm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Intel Corp. * (Written by Lance Zhao <lijian.zhao(a)intel.com> for Intel Corp.) diff --git a/arch/x86/include/asm/arch-apollolake/pmc.h b/arch/x86/include/asm/arch-apollolake/pmc.h index 23ac8fe7e2..3f90feb3b5 100644 --- a/arch/x86/include/asm/arch-apollolake/pmc.h +++ b/arch/x86/include/asm/arch-apollolake/pmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC */ 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 aaf87f4735..b682501f04 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl b/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl index abe37566cb..905b10d900 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/gpio.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h b/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h index 57921f283d..80810a6289 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h +++ b/arch/x86/include/asm/arch-baytrail/acpi/irqroute.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl b/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl index 69455d90da..5fb4db24ed 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/lpc.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2013 Google Inc. diff --git a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl index 5186fe0adf..57980ffd65 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl index 3b220c7ac2..7626dcbd73 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/southcluster.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/usb.asl b/arch/x86/include/asm/arch-baytrail/acpi/usb.asl index 78a7952cf5..e547e8a4f4 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/usb.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/usb.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2009 coresystems GmbH * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl b/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl index 13cb429b9b..58886974c1 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/xhci.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/device.h b/arch/x86/include/asm/arch-baytrail/device.h index a3872cf060..479d2dadc5 100644 --- a/arch/x86/include/asm/arch-baytrail/device.h +++ b/arch/x86/include/asm/arch-baytrail/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/global_nvs.h b/arch/x86/include/asm/arch-baytrail/global_nvs.h index 1072e3ddf4..859f542ad8 100644 --- a/arch/x86/include/asm/arch-baytrail/global_nvs.h +++ b/arch/x86/include/asm/arch-baytrail/global_nvs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-baytrail/iomap.h b/arch/x86/include/asm/arch-baytrail/iomap.h index 752dae0e6a..5d0f4fd8fe 100644 --- a/arch/x86/include/asm/arch-baytrail/iomap.h +++ b/arch/x86/include/asm/arch-baytrail/iomap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/arch-baytrail/irq.h b/arch/x86/include/asm/arch-baytrail/irq.h index fda3f590fa..07ae970d5e 100644 --- a/arch/x86/include/asm/arch-baytrail/irq.h +++ b/arch/x86/include/asm/arch-baytrail/irq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> 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 4425dcb365..ca8e6a24f4 100644 --- a/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-braswell/fsp/fsp_configs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-braswell/gpio.h b/arch/x86/include/asm/arch-braswell/gpio.h index e8389e556f..cf4202e171 100644 --- a/arch/x86/include/asm/arch-braswell/gpio.h +++ b/arch/x86/include/asm/arch-braswell/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/include/asm/arch-braswell/iomap.h b/arch/x86/include/asm/arch-braswell/iomap.h index 873d331f92..42f7b44083 100644 --- a/arch/x86/include/asm/arch-braswell/iomap.h +++ b/arch/x86/include/asm/arch-braswell/iomap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ 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 ae9105b6ef..ccdc6f9bbe 100644 --- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_configs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ 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 4b0f23a340..5800538641 100644 --- a/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-ivybridge/fsp/fsp_vpd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-qemu/device.h b/arch/x86/include/asm/arch-qemu/device.h index daafd5d067..b812e396ff 100644 --- a/arch/x86/include/asm/arch-qemu/device.h +++ b/arch/x86/include/asm/arch-qemu/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-qemu/qemu.h b/arch/x86/include/asm/arch-qemu/qemu.h index 061735b298..bdae018663 100644 --- a/arch/x86/include/asm/arch-qemu/qemu.h +++ b/arch/x86/include/asm/arch-qemu/qemu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ 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 61602173f8..7e1e56d0a6 100644 --- a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/acpi/irqroute.h b/arch/x86/include/asm/arch-quark/acpi/irqroute.h index 879b67d8c5..5a948fae6e 100644 --- a/arch/x86/include/asm/arch-quark/acpi/irqroute.h +++ b/arch/x86/include/asm/arch-quark/acpi/irqroute.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/acpi/lpc.asl b/arch/x86/include/asm/arch-quark/acpi/lpc.asl index fc30e0ab70..1ba49bfbdc 100644 --- a/arch/x86/include/asm/arch-quark/acpi/lpc.asl +++ b/arch/x86/include/asm/arch-quark/acpi/lpc.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/acpi/platform.asl b/arch/x86/include/asm/arch-quark/acpi/platform.asl index 5b3e4a5339..297565df5c 100644 --- a/arch/x86/include/asm/arch-quark/acpi/platform.asl +++ b/arch/x86/include/asm/arch-quark/acpi/platform.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/acpi/southcluster.asl b/arch/x86/include/asm/arch-quark/acpi/southcluster.asl index 384dab25bd..cd54d0293b 100644 --- a/arch/x86/include/asm/arch-quark/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-quark/acpi/southcluster.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/device.h b/arch/x86/include/asm/arch-quark/device.h index 0c43916283..2ab6a024f9 100644 --- a/arch/x86/include/asm/arch-quark/device.h +++ b/arch/x86/include/asm/arch-quark/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/global_nvs.h b/arch/x86/include/asm/arch-quark/global_nvs.h index 6e99e6737d..f3e3bc9eae 100644 --- a/arch/x86/include/asm/arch-quark/global_nvs.h +++ b/arch/x86/include/asm/arch-quark/global_nvs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/iomap.h b/arch/x86/include/asm/arch-quark/iomap.h index e233252dc1..3773df4c48 100644 --- a/arch/x86/include/asm/arch-quark/iomap.h +++ b/arch/x86/include/asm/arch-quark/iomap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/irq.h b/arch/x86/include/asm/arch-quark/irq.h index 2aaa728e7a..2971cea56c 100644 --- a/arch/x86/include/asm/arch-quark/irq.h +++ b/arch/x86/include/asm/arch-quark/irq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h index 9527fdad3f..c3d08cbcf5 100644 --- a/arch/x86/include/asm/arch-quark/msg_port.h +++ b/arch/x86/include/asm/arch-quark/msg_port.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h index feca1983ba..6b6629667d 100644 --- a/arch/x86/include/asm/arch-quark/quark.h +++ b/arch/x86/include/asm/arch-quark/quark.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-queensbay/device.h b/arch/x86/include/asm/arch-queensbay/device.h index 15857bfba5..26fd73fda4 100644 --- a/arch/x86/include/asm/arch-queensbay/device.h +++ b/arch/x86/include/asm/arch-queensbay/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-queensbay/tnc.h b/arch/x86/include/asm/arch-queensbay/tnc.h index 8d151509ab..0fea4b04ad 100644 --- a/arch/x86/include/asm/arch-queensbay/tnc.h +++ b/arch/x86/include/asm/arch-queensbay/tnc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h index 05dd1b2b44..4e04ecfe58 100644 --- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h +++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ 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 895b807e96..9b1fb9d317 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/include/asm/arch-tangier/acpi/platform.asl b/arch/x86/include/asm/arch-tangier/acpi/platform.asl index cf75ca7543..70d6687731 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/platform.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/platform.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index 4a7c854261..3aece70786 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/include/asm/arch-tangier/global_nvs.h b/arch/x86/include/asm/arch-tangier/global_nvs.h index a7811a331a..5acebe3092 100644 --- a/arch/x86/include/asm/arch-tangier/global_nvs.h +++ b/arch/x86/include/asm/arch-tangier/global_nvs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/include/asm/arch-tangier/iomap.h b/arch/x86/include/asm/arch-tangier/iomap.h index b0fc03e015..b1ae3a9c03 100644 --- a/arch/x86/include/asm/arch-tangier/iomap.h +++ b/arch/x86/include/asm/arch-tangier/iomap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (c) 2019 Intel Corporation */ #ifndef _TANGIER_IOMAP_H diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h index 3b641783b9..132f9025b2 100644 --- a/arch/x86/include/asm/bootm.h +++ b/arch/x86/include/asm/bootm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013, Google Inc. */ diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 256a3c01ed..b324d4f854 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/arch/x86/include/asm/cmos_layout.h b/arch/x86/include/asm/cmos_layout.h index e2f6d18554..79dd4f5799 100644 --- a/arch/x86/include/asm/cmos_layout.h +++ b/arch/x86/include/asm/cmos_layout.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h index bad0026648..62894c3c4c 100644 --- a/arch/x86/include/asm/config.h +++ b/arch/x86/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/arch/x86/include/asm/control_regs.h b/arch/x86/include/asm/control_regs.h index 44b8ba2554..80f6089292 100644 --- a/arch/x86/include/asm/control_regs.h +++ b/arch/x86/include/asm/control_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 073f80b07f..ddabb1826d 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 The Chromium OS Authors. * diff --git a/arch/x86/include/asm/cpu_x86.h b/arch/x86/include/asm/cpu_x86.h index 7d04977996..967fede245 100644 --- a/arch/x86/include/asm/cpu_x86.h +++ b/arch/x86/include/asm/cpu_x86.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 8be1003e6b..30a5f74874 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 * Stelian Pop <stelian(a)popies.net> diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h index 543a9e69f0..a697418e53 100644 --- a/arch/x86/include/asm/early_cmos.h +++ b/arch/x86/include/asm/early_cmos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index dfd858b78b..9f7fded38c 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright Google LLC */ diff --git a/arch/x86/include/asm/fast_spi.h b/arch/x86/include/asm/fast_spi.h index 998847b82c..2fef71bddf 100644 --- a/arch/x86/include/asm/fast_spi.h +++ b/arch/x86/include/asm/fast_spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Intel Corporation. */ diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h index 3a9b61903c..7b6645cec7 100644 --- a/arch/x86/include/asm/fsp/fsp_api.h +++ b/arch/x86/include/asm/fsp/fsp_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h index 3b2077b392..a4fa3027bf 100644 --- a/arch/x86/include/asm/fsp_arch.h +++ b/arch/x86/include/asm/fsp_arch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 6f4a7130f1..b246db97f2 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/x86/include/asm/handoff.h b/arch/x86/include/asm/handoff.h index aec49b9b81..77dee1d359 100644 --- a/arch/x86/include/asm/handoff.h +++ b/arch/x86/include/asm/handoff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Architecture-specific SPL handoff information for x86 * diff --git a/arch/x86/include/asm/i8254.h b/arch/x86/include/asm/i8254.h index 0b999a1d31..a3c549ab09 100644 --- a/arch/x86/include/asm/i8254.h +++ b/arch/x86/include/asm/i8254.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h index 90f2d3866c..99bcda0208 100644 --- a/arch/x86/include/asm/i8259.h +++ b/arch/x86/include/asm/i8259.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h index 4368b6e3e0..2cb0f6e99b 100644 --- a/arch/x86/include/asm/ibmpc.h +++ b/arch/x86/include/asm/ibmpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se diff --git a/arch/x86/include/asm/intel_acpi.h b/arch/x86/include/asm/intel_acpi.h index c1f5048ce6..898354ecaa 100644 --- a/arch/x86/include/asm/intel_acpi.h +++ b/arch/x86/include/asm/intel_acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/intel_opregion.h b/arch/x86/include/asm/intel_opregion.h index 182398a7db..f88eb56fe4 100644 --- a/arch/x86/include/asm/intel_opregion.h +++ b/arch/x86/include/asm/intel_opregion.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Writing IntelGraphicsMem table for ACPI * diff --git a/arch/x86/include/asm/interrupt.h b/arch/x86/include/asm/interrupt.h index e23fb2c8e7..05a1428753 100644 --- a/arch/x86/include/asm/interrupt.h +++ b/arch/x86/include/asm/interrupt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Graeme Russ, graeme.russ(a)gmail.com diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 83dc09757e..ab1ceabef7 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index bee0760c2d..b16c3a1557 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/ist.h b/arch/x86/include/asm/ist.h index 80b8597d54..8bbac6534f 100644 --- a/arch/x86/include/asm/ist.h +++ b/arch/x86/include/asm/ist.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _ASM_X86_IST_H #define _ASM_X86_IST_H diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 09652b95a3..97ffacce44 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index a25f8f03a1..21d570c91a 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/include/asm/mrccache.h b/arch/x86/include/asm/mrccache.h index 8ed6e0e9d6..68d4166e0f 100644 --- a/arch/x86/include/asm/mrccache.h +++ b/arch/x86/include/asm/mrccache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Google, Inc * Copyright (C) 2015 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index c49b4225ac..8fdfbc9db5 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Taken from the linux kernel file of the same name * diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 27764fc56c..0912baab18 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Taken from the linux kernel file of the same name * diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 2e995f5406..bd7ae03863 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc * diff --git a/arch/x86/include/asm/p2sb.h b/arch/x86/include/asm/p2sb.h index 6f63eae8e2..63748d2f3c 100644 --- a/arch/x86/include/asm/p2sb.h +++ b/arch/x86/include/asm/p2sb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC */ diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 1c30b32d46..b4adcef8f4 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se diff --git a/arch/x86/include/asm/pirq_routing.h b/arch/x86/include/asm/pirq_routing.h index 67e5c447ab..999ed8fc73 100644 --- a/arch/x86/include/asm/pirq_routing.h +++ b/arch/x86/include/asm/pirq_routing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/include/asm/pmu.h b/arch/x86/include/asm/pmu.h index 818e80881e..295544f077 100644 --- a/arch/x86/include/asm/pmu.h +++ b/arch/x86/include/asm/pmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/include/asm/pnp_def.h b/arch/x86/include/asm/pnp_def.h index 0345d195c6..d8179bccdb 100644 --- a/arch/x86/include/asm/pnp_def.h +++ b/arch/x86/include/asm/pnp_def.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/include/asm/post.h b/arch/x86/include/asm/post.h index 939b6fa57e..6c6e0a2c50 100644 --- a/arch/x86/include/asm/post.h +++ b/arch/x86/include/asm/post.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index d7b6836786..02f40ea997 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se diff --git a/arch/x86/include/asm/scu.h b/arch/x86/include/asm/scu.h index f5ec5a19d9..04a702d129 100644 --- a/arch/x86/include/asm/scu.h +++ b/arch/x86/include/asm/scu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h index 874a43d16c..ade413df17 100644 --- a/arch/x86/include/asm/sections.h +++ b/arch/x86/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/x86/include/asm/sfi.h b/arch/x86/include/asm/sfi.h index 10bd1c56a3..b8df06cf53 100644 --- a/arch/x86/include/asm/sfi.h +++ b/arch/x86/include/asm/sfi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright(c) 2009 Intel Corporation. All rights reserved. */ diff --git a/arch/x86/include/asm/sipi.h b/arch/x86/include/asm/sipi.h index 2483422528..b86dff8edd 100644 --- a/arch/x86/include/asm/sipi.h +++ b/arch/x86/include/asm/sipi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Gooogle, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/include/asm/spl.h b/arch/x86/include/asm/spl.h index 483cf702cb..e32a9bbd63 100644 --- a/arch/x86/include/asm/spl.h +++ b/arch/x86/include/asm/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/include/asm/sysreset.h b/arch/x86/include/asm/sysreset.h index 5e586f51c0..bea4c1c2fb 100644 --- a/arch/x86/include/asm/sysreset.h +++ b/arch/x86/include/asm/sysreset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC */ diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h index 37be01240d..9fbd6fd75f 100644 --- a/arch/x86/include/asm/tables.h +++ b/arch/x86/include/asm/tables.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index 3acc58ad74..af39d35faa 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se. diff --git a/arch/x86/include/asm/u-boot.h b/arch/x86/include/asm/u-boot.h index 432eb35b84..c2b4916a9a 100644 --- a/arch/x86/include/asm/u-boot.h +++ b/arch/x86/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h index 655675b666..6a666c073f 100644 --- a/arch/x86/include/asm/zimage.h +++ b/arch/x86/include/asm/zimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, daniel(a)omicron.se diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 90a7618ecf..d8ac066f6f 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c index 155fffabf0..acfc047cd9 100644 --- a/arch/x86/lib/acpi.c +++ b/arch/x86/lib/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c index 6c8cd83e12..bc14ae23a0 100644 --- a/arch/x86/lib/acpi_nhlt.c +++ b/arch/x86/lib/acpi_nhlt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Google LLC * diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 2c70acbe7b..9553c75913 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index c5b33dc65d..5f1e60327e 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Based on acpi.c from coreboot * diff --git a/arch/x86/lib/acpigen.c b/arch/x86/lib/acpigen.c index ea2ec2a908..ed796184e1 100644 --- a/arch/x86/lib/acpigen.c +++ b/arch/x86/lib/acpigen.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Google LLC */ diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index 8df67db65c..3f99e9834f 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c * diff --git a/arch/x86/lib/bdinfo.c b/arch/x86/lib/bdinfo.c index 124058442c..f49566040c 100644 --- a/arch/x86/lib/bdinfo.c +++ b/arch/x86/lib/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * x86-specific information for the 'bd' command * diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 3196f9ddc2..b16754fa57 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index 4facbe5f32..36b65e6336 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/lib/coreboot/Makefile b/arch/x86/lib/coreboot/Makefile index cb0ae1d017..91e636c86b 100644 --- a/arch/x86/lib/coreboot/Makefile +++ b/arch/x86/lib/coreboot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Google LLC # diff --git a/arch/x86/lib/coreboot/cb_support.c b/arch/x86/lib/coreboot/cb_support.c index ebb45cdfb5..d7a93a98b1 100644 --- a/arch/x86/lib/coreboot/cb_support.c +++ b/arch/x86/lib/coreboot/cb_support.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Support for booting from coreboot * diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 05519d851a..dd1b68d9f8 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 12fcff1238..07d97c19bf 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/early_cmos.c b/arch/x86/lib/early_cmos.c index f7b3bb2a8e..45f063d51c 100644 --- a/arch/x86/lib/early_cmos.c +++ b/arch/x86/lib/early_cmos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile index da6c0a886a..be070d4127 100644 --- a/arch/x86/lib/fsp/Makefile +++ b/arch/x86/lib/fsp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 8f2977a807..0587b35d55 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index cc889a688d..71266e1c16 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 09d5da8c84..292ac5265b 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp1/Makefile b/arch/x86/lib/fsp1/Makefile index 1cf5e54191..8e3653b946 100644 --- a/arch/x86/lib/fsp1/Makefile +++ b/arch/x86/lib/fsp1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Google, Inc diff --git a/arch/x86/lib/fsp1/fsp_car.S b/arch/x86/lib/fsp1/fsp_car.S index a64a653435..a22371a784 100644 --- a/arch/x86/lib/fsp1/fsp_car.S +++ b/arch/x86/lib/fsp1/fsp_car.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index df18f47675..4fd657b1ef 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c index eee9ce54b1..05f96a3757 100644 --- a/arch/x86/lib/fsp1/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/fsp2/Makefile b/arch/x86/lib/fsp2/Makefile index ddbe2d0db2..df6f8533a6 100644 --- a/arch/x86/lib/fsp2/Makefile +++ b/arch/x86/lib/fsp2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/arch/x86/lib/fsp2/fsp_common.c b/arch/x86/lib/fsp2/fsp_common.c index d802a86967..76bfb74b9a 100644 --- a/arch/x86/lib/fsp2/fsp_common.c +++ b/arch/x86/lib/fsp2/fsp_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c index a1432239cf..a9cc2e8210 100644 --- a/arch/x86/lib/fsp2/fsp_dram.c +++ b/arch/x86/lib/fsp2/fsp_dram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c index a8d1db188e..4d33df5766 100644 --- a/arch/x86/lib/i8254.c +++ b/arch/x86/lib/i8254.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel(a)omicron.se> diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c index a0e3c09257..64b73ebaa6 100644 --- a/arch/x86/lib/i8259.c +++ b/arch/x86/lib/i8259.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index bf0c921577..963a978c82 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index ff52959ed2..4f4fc53c82 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/lib/lpc-uclass.c b/arch/x86/lib/lpc-uclass.c index 67b931d3b2..94d76ae7a5 100644 --- a/arch/x86/lib/lpc-uclass.c +++ b/arch/x86/lib/lpc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index 8e97d9ff36..cfbb631421 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/lib/northbridge-uclass.c b/arch/x86/lib/northbridge-uclass.c index 3838887248..7a498e05cb 100644 --- a/arch/x86/lib/northbridge-uclass.c +++ b/arch/x86/lib/northbridge-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index c93f245845..be3c7ada6e 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc */ diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index caeaec9287..e04b81c59a 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c index 083aec8d8d..e95cd5536a 100644 --- a/arch/x86/lib/pmu.c +++ b/arch/x86/lib/pmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index da819b9bdd..375c1be914 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index 90ef239bcd..605b700b69 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation * diff --git a/arch/x86/lib/sections.c b/arch/x86/lib/sections.c index 375029ead0..791ab97090 100644 --- a/arch/x86/lib/sections.c +++ b/arch/x86/lib/sections.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Albert ARIBAUD <albert.u.boot(a)aribaud.net> */ diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index 85e963b634..7899f2cd75 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/arch/x86/lib/string.c b/arch/x86/lib/string.c index c6263cd2f5..c76730d0f6 100644 --- a/arch/x86/lib/string.c +++ b/arch/x86/lib/string.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 1991,1992,1993,1997,1998,2003, 2005 Free Software Foundation, Inc. * This file is part of the GNU C Library. diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 5b5070f7ca..edb65fdfcc 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index a41e1ccf8a..fbc7d78ed9 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002 diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 7e27f60172..122565f0b4 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later head-y := arch/xtensa/cpu/start.o diff --git a/arch/xtensa/config.mk b/arch/xtensa/config.mk index b0809999e4..5c4f910c03 100644 --- a/arch/xtensa/config.mk +++ b/arch/xtensa/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 - 2013 Tensilica, Inc. # (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/cpu/Makefile b/arch/xtensa/cpu/Makefile index f28487d206..b13f006151 100644 --- a/arch/xtensa/cpu/Makefile +++ b/arch/xtensa/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 - 2013 Tensilica, Inc. # (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c index 98d9753b7e..6625849aa3 100644 --- a/arch/xtensa/cpu/cpu.c +++ b/arch/xtensa/cpu/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2013 Tensilica Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c index cf9af4326a..4deb6e4ed1 100644 --- a/arch/xtensa/cpu/exceptions.c +++ b/arch/xtensa/cpu/exceptions.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2013 Tensilica Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/cpu/start.S b/arch/xtensa/cpu/start.S index 580df65ea7..c26745c2c1 100644 --- a/arch/xtensa/cpu/start.S +++ b/arch/xtensa/cpu/start.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 - 2013 Tensilica Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/cpu/u-boot.lds b/arch/xtensa/cpu/u-boot.lds index 84ba32c044..864edc1a0a 100644 --- a/arch/xtensa/cpu/u-boot.lds +++ b/arch/xtensa/cpu/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 - 2013 Tensilica, Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/dts/Makefile b/arch/xtensa/dts/Makefile index c22c50ac4e..31e7e306b1 100644 --- a/arch/xtensa/dts/Makefile +++ b/arch/xtensa/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-$(CONFIG_XTENSA) += ml605.dtb ml605_nommu.dtb kc705.dtb kc705_nommu.dtb diff --git a/arch/xtensa/include/asm/addrspace.h b/arch/xtensa/include/asm/addrspace.h index 920b5fd26b..0323a07dc4 100644 --- a/arch/xtensa/include/asm/addrspace.h +++ b/arch/xtensa/include/asm/addrspace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008-2013 Tensilica Inc. * Copyright (C) 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/arch-dc232b/core.h b/arch/xtensa/include/asm/arch-dc232b/core.h index c1453f719e..645fa6b91e 100644 --- a/arch/xtensa/include/asm/arch-dc232b/core.h +++ b/arch/xtensa/include/asm/arch-dc232b/core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. diff --git a/arch/xtensa/include/asm/arch-dc232b/tie-asm.h b/arch/xtensa/include/asm/arch-dc232b/tie-asm.h index 35a26dca7c..fc6643c4c4 100644 --- a/arch/xtensa/include/asm/arch-dc232b/tie-asm.h +++ b/arch/xtensa/include/asm/arch-dc232b/tie-asm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions diff --git a/arch/xtensa/include/asm/arch-dc232b/tie.h b/arch/xtensa/include/asm/arch-dc232b/tie.h index 4f8b50cd6c..ec4c73ad48 100644 --- a/arch/xtensa/include/asm/arch-dc232b/tie.h +++ b/arch/xtensa/include/asm/arch-dc232b/tie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this diff --git a/arch/xtensa/include/asm/arch-dc233c/core.h b/arch/xtensa/include/asm/arch-dc233c/core.h index cd3c8c115f..bb8bd1bfc6 100644 --- a/arch/xtensa/include/asm/arch-dc233c/core.h +++ b/arch/xtensa/include/asm/arch-dc233c/core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. diff --git a/arch/xtensa/include/asm/arch-dc233c/tie-asm.h b/arch/xtensa/include/asm/arch-dc233c/tie-asm.h index 7b3d1f3c57..be8dc55450 100644 --- a/arch/xtensa/include/asm/arch-dc233c/tie-asm.h +++ b/arch/xtensa/include/asm/arch-dc233c/tie-asm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions diff --git a/arch/xtensa/include/asm/arch-dc233c/tie.h b/arch/xtensa/include/asm/arch-dc233c/tie.h index 2c2a8493cd..43fb7678a9 100644 --- a/arch/xtensa/include/asm/arch-dc233c/tie.h +++ b/arch/xtensa/include/asm/arch-dc233c/tie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this diff --git a/arch/xtensa/include/asm/arch-de212/core.h b/arch/xtensa/include/asm/arch-de212/core.h index 60c6efba7d..27be2f5618 100644 --- a/arch/xtensa/include/asm/arch-de212/core.h +++ b/arch/xtensa/include/asm/arch-de212/core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. diff --git a/arch/xtensa/include/asm/arch-de212/tie-asm.h b/arch/xtensa/include/asm/arch-de212/tie-asm.h index 3192ac82ad..1f0ddf66ed 100644 --- a/arch/xtensa/include/asm/arch-de212/tie-asm.h +++ b/arch/xtensa/include/asm/arch-de212/tie-asm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions diff --git a/arch/xtensa/include/asm/arch-de212/tie.h b/arch/xtensa/include/asm/arch-de212/tie.h index 865c41c128..662ce2bc52 100644 --- a/arch/xtensa/include/asm/arch-de212/tie.h +++ b/arch/xtensa/include/asm/arch-de212/tie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this diff --git a/arch/xtensa/include/asm/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 78613fc579..b29c25cf06 100644 --- a/arch/xtensa/include/asm/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005 - 2013 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h index 4e3ad56472..898d6110f5 100644 --- a/arch/xtensa/include/asm/atomic.h +++ b/arch/xtensa/include/asm/atomic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Cadence Design Systems Inc. */ diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index 48a3e1f517..a070df92a2 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2001 - 2012 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/bootparam.h b/arch/xtensa/include/asm/bootparam.h index d7562564af..ec53c5c74f 100644 --- a/arch/xtensa/include/asm/bootparam.h +++ b/arch/xtensa/include/asm/bootparam.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Definition of the Linux/Xtensa boot parameter structure * diff --git a/arch/xtensa/include/asm/byteorder.h b/arch/xtensa/include/asm/byteorder.h index 2137dcff24..3ce91a6e74 100644 --- a/arch/xtensa/include/asm/byteorder.h +++ b/arch/xtensa/include/asm/byteorder.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on Linux/Xtensa kernel version * diff --git a/arch/xtensa/include/asm/cache.h b/arch/xtensa/include/asm/cache.h index 68b8330ccb..35cde31d87 100644 --- a/arch/xtensa/include/asm/cache.h +++ b/arch/xtensa/include/asm/cache.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Tensilica Inc. */ diff --git a/arch/xtensa/include/asm/cacheasm.h b/arch/xtensa/include/asm/cacheasm.h index 69448cfff7..46eb68c5e4 100644 --- a/arch/xtensa/include/asm/cacheasm.h +++ b/arch/xtensa/include/asm/cacheasm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index 268c5688b3..3eda4f034b 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/global_data.h b/arch/xtensa/include/asm/global_data.h index 1157978ab6..03ddbd834c 100644 --- a/arch/xtensa/include/asm/global_data.h +++ b/arch/xtensa/include/asm/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007, Tensilica Inc. */ diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index 76a646e882..451d18d6b4 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * IO header file * diff --git a/arch/xtensa/include/asm/ldscript.h b/arch/xtensa/include/asm/ldscript.h index 78a0b230bd..998dd68ff3 100644 --- a/arch/xtensa/include/asm/ldscript.h +++ b/arch/xtensa/include/asm/ldscript.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Tensilica, Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/include/asm/misc.h b/arch/xtensa/include/asm/misc.h index 3ed9fcb3a2..7f1a8107c8 100644 --- a/arch/xtensa/include/asm/misc.h +++ b/arch/xtensa/include/asm/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008, Tensilica Inc. * diff --git a/arch/xtensa/include/asm/posix_types.h b/arch/xtensa/include/asm/posix_types.h index 7fb65ead67..405be9ea29 100644 --- a/arch/xtensa/include/asm/posix_types.h +++ b/arch/xtensa/include/asm/posix_types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007, Tensilica Inc. * diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index 22203c9649..4a33bb0c57 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1997 Tensilica Inc. */ diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h index 7717016cc6..5f34afb4a3 100644 --- a/arch/xtensa/include/asm/ptrace.h +++ b/arch/xtensa/include/asm/ptrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2001 - 2007 Tensilica Inc. */ diff --git a/arch/xtensa/include/asm/regs.h b/arch/xtensa/include/asm/regs.h index 52d6e8cc01..8babed7b51 100644 --- a/arch/xtensa/include/asm/regs.h +++ b/arch/xtensa/include/asm/regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2006 Tensilica, Inc. All Rights Reserved. */ diff --git a/arch/xtensa/include/asm/sections.h b/arch/xtensa/include/asm/sections.h index af2c177bea..cb3ed23393 100644 --- a/arch/xtensa/include/asm/sections.h +++ b/arch/xtensa/include/asm/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/arch/xtensa/include/asm/system.h b/arch/xtensa/include/asm/system.h index a241568f60..19731c054f 100644 --- a/arch/xtensa/include/asm/system.h +++ b/arch/xtensa/include/asm/system.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Cadence Design Systems Inc. */ diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h index 2c5b5433cc..a416cd28b5 100644 --- a/arch/xtensa/include/asm/types.h +++ b/arch/xtensa/include/asm/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1997 Tensilica Inc. */ diff --git a/arch/xtensa/include/asm/u-boot.h b/arch/xtensa/include/asm/u-boot.h index 24c4fce643..fe526cb7cc 100644 --- a/arch/xtensa/include/asm/u-boot.h +++ b/arch/xtensa/include/asm/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007, Tensilica Inc. * diff --git a/arch/xtensa/lib/Makefile b/arch/xtensa/lib/Makefile index ad4fe32cb6..59c7997217 100644 --- a/arch/xtensa/lib/Makefile +++ b/arch/xtensa/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 - 2013 Tensilica Inc. # (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c index fee3392815..776b363a59 100644 --- a/arch/xtensa/lib/bootm.c +++ b/arch/xtensa/lib/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2013 Tensilica Inc. * (C) Copyright 2014 Cadence Design Systems Inc. diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c index 4e0c0acc3b..a4d31ca18d 100644 --- a/arch/xtensa/lib/cache.c +++ b/arch/xtensa/lib/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2013 Tensilica Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/arch/xtensa/lib/misc.S b/arch/xtensa/lib/misc.S index f682d9c39c..c145bff8db 100644 --- a/arch/xtensa/lib/misc.S +++ b/arch/xtensa/lib/misc.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Miscellaneous assembly functions. * diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c index a499590c75..9f37e2f23e 100644 --- a/arch/xtensa/lib/relocate.c +++ b/arch/xtensa/lib/relocate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Cadence Design Systems Inc. */ diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c index 1c927d2a6a..7967161ff9 100644 --- a/arch/xtensa/lib/time.c +++ b/arch/xtensa/lib/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2013 Tensilica Inc. */ diff --git a/board/AndesTech/ae350/Makefile b/board/AndesTech/ae350/Makefile index 705ae43af5..3361e29e24 100644 --- a/board/AndesTech/ae350/Makefile +++ b/board/AndesTech/ae350/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Andes Technology Corporation. # Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/board/AndesTech/ae350/ae350.c b/board/AndesTech/ae350/ae350.c index d78ee403e6..831fadf4a0 100644 --- a/board/AndesTech/ae350/ae350.c +++ b/board/AndesTech/ae350/ae350.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/board/BuR/brppt1/Makefile b/board/BuR/brppt1/Makefile index 3dec0e6522..95b892bacf 100644 --- a/board/BuR/brppt1/Makefile +++ b/board/BuR/brppt1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c index 36945bbdcc..c9c270ac19 100644 --- a/board/BuR/brppt1/board.c +++ b/board/BuR/brppt1/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/BuR/brppt1/config.mk b/board/BuR/brppt1/config.mk index 6853135f83..1c27a61ba7 100644 --- a/board/BuR/brppt1/config.mk +++ b/board/BuR/brppt1/config.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018 Hannes Schmelzer <oe5hpm(a)oevsv.at> - # B&R Industrial Automation GmbH - http://www.br-automation.com # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE) | sed -e 's/am335x-//') diff --git a/board/BuR/brppt1/mux.c b/board/BuR/brppt1/mux.c index 5d2c7a201e..6d9e229393 100644 --- a/board/BuR/brppt1/mux.c +++ b/board/BuR/brppt1/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/BuR/brppt2/Makefile b/board/BuR/brppt2/Makefile index 7f3c7cd953..2504c2f9fa 100644 --- a/board/BuR/brppt2/Makefile +++ b/board/BuR/brppt2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019 # B&R Industrial Automation GmbH - http://www.br-automation.com diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c index ee006f0196..b9e095519b 100644 --- a/board/BuR/brppt2/board.c +++ b/board/BuR/brppt2/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for BuR BRPPT2 board * diff --git a/board/BuR/brppt2/config.mk b/board/BuR/brppt2/config.mk index 0d1638a97a..bb7a38af6f 100644 --- a/board/BuR/brppt2/config.mk +++ b/board/BuR/brppt2/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Hannes Schmelzer <oe5hpm(a)oevsv.at> - # B&R Industrial Automation GmbH - http://www.br-automation.com diff --git a/board/BuR/brsmarc1/Makefile b/board/BuR/brsmarc1/Makefile index 1c3f64dea4..54dc2d6db7 100644 --- a/board/BuR/brsmarc1/Makefile +++ b/board/BuR/brsmarc1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Hannes Schmelzer <oe5hpm(a)oevsv.at> - # B&R Industrial Automation GmbH - http://www.br-automation.com/ diff --git a/board/BuR/brsmarc1/board.c b/board/BuR/brsmarc1/board.c index 738a5d2ff9..3184b2daf4 100644 --- a/board/BuR/brsmarc1/board.c +++ b/board/BuR/brsmarc1/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/BuR/brsmarc1/config.mk b/board/BuR/brsmarc1/config.mk index 1de971876c..aac6a10951 100644 --- a/board/BuR/brsmarc1/config.mk +++ b/board/BuR/brsmarc1/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Hannes Schmelzer <oe5hpm(a)oevsv.at> - # B&R Industrial Automation GmbH - http://www.br-automation.com diff --git a/board/BuR/brsmarc1/mux.c b/board/BuR/brsmarc1/mux.c index 33c214d6b2..4cf0cd3a83 100644 --- a/board/BuR/brsmarc1/mux.c +++ b/board/BuR/brsmarc1/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/BuR/brxre1/Makefile b/board/BuR/brxre1/Makefile index 1d224e9e71..5f4c4dad8b 100644 --- a/board/BuR/brxre1/Makefile +++ b/board/BuR/brxre1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c index a909104df4..a0550ee20b 100644 --- a/board/BuR/brxre1/board.c +++ b/board/BuR/brxre1/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/BuR/brxre1/mux.c b/board/BuR/brxre1/mux.c index 6c5ad891ba..2b14f7e5c5 100644 --- a/board/BuR/brxre1/mux.c +++ b/board/BuR/brxre1/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/BuR/common/br_resetc.c b/board/BuR/common/br_resetc.c index 32f32b65e9..38177a90b0 100644 --- a/board/BuR/common/br_resetc.c +++ b/board/BuR/common/br_resetc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * common reset-controller functions for B&R boards * diff --git a/board/BuR/common/br_resetc.h b/board/BuR/common/br_resetc.h index ba0689bf20..43a3f2ddce 100644 --- a/board/BuR/common/br_resetc.h +++ b/board/BuR/common/br_resetc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * common reset-controller functions for B&R boards * diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h index 55d14c2a6b..aac9eec843 100644 --- a/board/BuR/common/bur_common.h +++ b/board/BuR/common/bur_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * bur_comon.h * diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 3c78020bf9..c80a557fff 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * common.c * diff --git a/board/BuS/eb_cpu5282/Makefile b/board/BuS/eb_cpu5282/Makefile index 10026ee0e4..1e25dabc65 100644 --- a/board/BuS/eb_cpu5282/Makefile +++ b/board/BuS/eb_cpu5282/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c index ea49c7a99c..71679d2d1e 100644 --- a/board/BuS/eb_cpu5282/eb_cpu5282.c +++ b/board/BuS/eb_cpu5282/eb_cpu5282.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2005-2009 * BuS Elektronik GmbH & Co.KG <esw(a)bus-elektonik.de> diff --git a/board/CZ.NIC/turris_atsha_otp.c b/board/CZ.NIC/turris_atsha_otp.c index a29fe36231..fe9edd19a6 100644 --- a/board/CZ.NIC/turris_atsha_otp.c +++ b/board/CZ.NIC/turris_atsha_otp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Marek Behún <kabel(a)kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek(a)nic.cz> diff --git a/board/CZ.NIC/turris_atsha_otp.h b/board/CZ.NIC/turris_atsha_otp.h index 2cfe20bbc3..624572f969 100644 --- a/board/CZ.NIC/turris_atsha_otp.h +++ b/board/CZ.NIC/turris_atsha_otp.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef TURRIS_ATSHA_OTP_H #define TURRIS_ATSHA_OTP_H diff --git a/board/CZ.NIC/turris_mox/Makefile b/board/CZ.NIC/turris_mox/Makefile index 2196821b81..2d7e0e6840 100644 --- a/board/CZ.NIC/turris_mox/Makefile +++ b/board/CZ.NIC/turris_mox/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c index 87f67512fb..5ca4296d23 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.c +++ b/board/CZ.NIC/turris_mox/mox_sp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> */ diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h index 83b6037458..a3e2a34f29 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.h +++ b/board/CZ.NIC/turris_mox/mox_sp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> */ diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 370c2668b0..d8324332dd 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> */ diff --git a/board/CZ.NIC/turris_omnia/Makefile b/board/CZ.NIC/turris_omnia/Makefile index dc39b44ae1..41e90538a4 100644 --- a/board/CZ.NIC/turris_omnia/Makefile +++ b/board/CZ.NIC/turris_omnia/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Marek Behún <kabel(a)kernel.org> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index 19c5043fcb..abcdbdf805 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Marek Behún <kabel(a)kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek(a)nic.cz> diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c index 52880a16fa..35288c8192 100644 --- a/board/LaCie/common/common.c +++ b/board/LaCie/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> */ diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h index bf75d0a097..8683c06938 100644 --- a/board/LaCie/common/common.h +++ b/board/LaCie/common/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> */ diff --git a/board/LaCie/common/cpld-gpio-bus.c b/board/LaCie/common/cpld-gpio-bus.c index b95fcfa421..9e3621d0a9 100644 --- a/board/LaCie/common/cpld-gpio-bus.c +++ b/board/LaCie/common/cpld-gpio-bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cpld-gpio-bus.c: provides support for the CPLD GPIO bus found on some LaCie * boards (as the 2Big/5Big Network v2 and the 2Big NAS). This parallel GPIO diff --git a/board/LaCie/common/cpld-gpio-bus.h b/board/LaCie/common/cpld-gpio-bus.h index 8db8323569..74ab6cf61b 100644 --- a/board/LaCie/common/cpld-gpio-bus.h +++ b/board/LaCie/common/cpld-gpio-bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Simon Guinot <simon.guinot(a)sequanux.org> */ diff --git a/board/LaCie/net2big_v2/Makefile b/board/LaCie/net2big_v2/Makefile index 3d12b72812..cb6245c9cd 100644 --- a/board/LaCie/net2big_v2/Makefile +++ b/board/LaCie/net2big_v2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/net2big_v2/kwbimage.cfg b/board/LaCie/net2big_v2/kwbimage.cfg index 3897a1197a..78807bb8bd 100644 --- a/board/LaCie/net2big_v2/kwbimage.cfg +++ b/board/LaCie/net2big_v2/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c index 9170913400..8c285134de 100644 --- a/board/LaCie/net2big_v2/net2big_v2.c +++ b/board/LaCie/net2big_v2/net2big_v2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> * diff --git a/board/LaCie/net2big_v2/net2big_v2.h b/board/LaCie/net2big_v2/net2big_v2.h index d61dd0e998..327c5251cd 100644 --- a/board/LaCie/net2big_v2/net2big_v2.h +++ b/board/LaCie/net2big_v2/net2big_v2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> * diff --git a/board/LaCie/netspace_v2/Makefile b/board/LaCie/netspace_v2/Makefile index a6270bdd4b..78b41dfceb 100644 --- a/board/LaCie/netspace_v2/Makefile +++ b/board/LaCie/netspace_v2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/netspace_v2/kwbimage-is2.cfg b/board/LaCie/netspace_v2/kwbimage-is2.cfg index 50f584ae70..b7125c1c3f 100644 --- a/board/LaCie/netspace_v2/kwbimage-is2.cfg +++ b/board/LaCie/netspace_v2/kwbimage-is2.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/netspace_v2/kwbimage-ns2l.cfg b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg index 092353a06d..0a6a69eb47 100644 --- a/board/LaCie/netspace_v2/kwbimage-ns2l.cfg +++ b/board/LaCie/netspace_v2/kwbimage-ns2l.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/netspace_v2/kwbimage.cfg b/board/LaCie/netspace_v2/kwbimage.cfg index 1ed03fa9a9..fa58127a68 100644 --- a/board/LaCie/netspace_v2/kwbimage.cfg +++ b/board/LaCie/netspace_v2/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> # diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 22bb008745..1580fa682e 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> * diff --git a/board/LaCie/netspace_v2/netspace_v2.h b/board/LaCie/netspace_v2/netspace_v2.h index 2c930171ea..a8410d1d75 100644 --- a/board/LaCie/netspace_v2/netspace_v2.h +++ b/board/LaCie/netspace_v2/netspace_v2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> * diff --git a/board/Marvell/db-88f6720/Makefile b/board/Marvell/db-88f6720/Makefile index 6c633132dd..1a6f9026da 100644 --- a/board/Marvell/db-88f6720/Makefile +++ b/board/Marvell/db-88f6720/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/db-88f6720/db-88f6720.c b/board/Marvell/db-88f6720/db-88f6720.c index 26c30647fb..12b8e92e1b 100644 --- a/board/Marvell/db-88f6720/db-88f6720.c +++ b/board/Marvell/db-88f6720/db-88f6720.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/db-88f6820-amc/Makefile b/board/Marvell/db-88f6820-amc/Makefile index 99bdf1a2c7..db99a7af92 100644 --- a/board/Marvell/db-88f6820-amc/Makefile +++ b/board/Marvell/db-88f6820-amc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c index 122c63d11f..e1c842c946 100644 --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/db-88f6820-gp/Makefile b/board/Marvell/db-88f6820-gp/Makefile index afc9648510..0de208a16d 100644 --- a/board/Marvell/db-88f6820-gp/Makefile +++ b/board/Marvell/db-88f6820-gp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c index 1edc1cb651..0a12799675 100644 --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/db-mv784mp-gp/Makefile b/board/Marvell/db-mv784mp-gp/Makefile index 1bd2388afb..6e869fa46e 100644 --- a/board/Marvell/db-mv784mp-gp/Makefile +++ b/board/Marvell/db-mv784mp-gp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c index 9e1fdecfca..bb2900cf5a 100644 --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/db-xc3-24g4xg/Makefile b/board/Marvell/db-xc3-24g4xg/Makefile index 24e8200007..da5d8f24fe 100644 --- a/board/Marvell/db-xc3-24g4xg/Makefile +++ b/board/Marvell/db-xc3-24g4xg/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c index 0abdca1cd2..5ee0eadb7c 100644 --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/dreamplug/Makefile b/board/Marvell/dreamplug/Makefile index e239d591b7..24ebaf2d90 100644 --- a/board/Marvell/dreamplug/Makefile +++ b/board/Marvell/dreamplug/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2011 # Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index d15faa1cb7..52c87c268c 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021-2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2011 Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/board/Marvell/dreamplug/kwbimage.cfg b/board/Marvell/dreamplug/kwbimage.cfg index f916208c19..fa5abd5f99 100644 --- a/board/Marvell/dreamplug/kwbimage.cfg +++ b/board/Marvell/dreamplug/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2011 # Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/board/Marvell/guruplug/Makefile b/board/Marvell/guruplug/Makefile index b0dfc0cd6d..1ecabf059d 100644 --- a/board/Marvell/guruplug/Makefile +++ b/board/Marvell/guruplug/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index ea87ded222..9457712b46 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/guruplug/guruplug.h b/board/Marvell/guruplug/guruplug.h index a702366813..4cc1dd646d 100644 --- a/board/Marvell/guruplug/guruplug.h +++ b/board/Marvell/guruplug/guruplug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/guruplug/kwbimage.cfg b/board/Marvell/guruplug/kwbimage.cfg index 8a0d752c91..b6165cc4d5 100644 --- a/board/Marvell/guruplug/kwbimage.cfg +++ b/board/Marvell/guruplug/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/mvebu_alleycat-5/Makefile b/board/Marvell/mvebu_alleycat-5/Makefile index 29254b4d64..3c979c3254 100644 --- a/board/Marvell/mvebu_alleycat-5/Makefile +++ b/board/Marvell/mvebu_alleycat-5/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := board.o diff --git a/board/Marvell/mvebu_alleycat-5/board.c b/board/Marvell/mvebu_alleycat-5/board.c index 0c4f8e03b8..0ed3e0a32f 100644 --- a/board/Marvell/mvebu_alleycat-5/board.c +++ b/board/Marvell/mvebu_alleycat-5/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/global_data.h> diff --git a/board/Marvell/mvebu_armada-37xx/Makefile b/board/Marvell/mvebu_armada-37xx/Makefile index 27221557c7..b725c6cbcf 100644 --- a/board/Marvell/mvebu_armada-37xx/Makefile +++ b/board/Marvell/mvebu_armada-37xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 04124d8014..386ba524bc 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/mvebu_armada-8k/Makefile b/board/Marvell/mvebu_armada-8k/Makefile index 27221557c7..b725c6cbcf 100644 --- a/board/Marvell/mvebu_armada-8k/Makefile +++ b/board/Marvell/mvebu_armada-8k/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index a8899af6e5..ccadf1536d 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/octeon_ebb7304/Makefile b/board/Marvell/octeon_ebb7304/Makefile index a3ed0c8873..4968994004 100644 --- a/board/Marvell/octeon_ebb7304/Makefile +++ b/board/Marvell/octeon_ebb7304/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020 Stefan Roese <sr(a)denx.de> # Copyright (C) 2019-2020 Marvell International Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := board.o diff --git a/board/Marvell/octeon_ebb7304/board.c b/board/Marvell/octeon_ebb7304/board.c index 5fd84b260b..afa09a4e3b 100644 --- a/board/Marvell/octeon_ebb7304/board.c +++ b/board/Marvell/octeon_ebb7304/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/octeon_nic23/Makefile b/board/Marvell/octeon_nic23/Makefile index a79b94ec6f..d9f40b10d2 100644 --- a/board/Marvell/octeon_nic23/Makefile +++ b/board/Marvell/octeon_nic23/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2021 Stefan Roese <sr(a)denx.de> # Copyright (C) 2019-2020 Marvell International Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := board.o diff --git a/board/Marvell/octeon_nic23/board.c b/board/Marvell/octeon_nic23/board.c index bc9332cb74..970ebe8319 100644 --- a/board/Marvell/octeon_nic23/board.c +++ b/board/Marvell/octeon_nic23/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021-2022 Stefan Roese <sr(a)denx.de> */ diff --git a/board/Marvell/octeontx2_cn913x/Makefile b/board/Marvell/octeontx2_cn913x/Makefile index 8c6ffb9328..3986361fd1 100644 --- a/board/Marvell/octeontx2_cn913x/Makefile +++ b/board/Marvell/octeontx2_cn913x/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2016 Stefan Roese <sr(a)denx.de> # Copyright (C) 2019 Marvell International Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := board.o diff --git a/board/Marvell/octeontx2_cn913x/board.c b/board/Marvell/octeontx2_cn913x/board.c index 3d20cfb2fa..25fc02c7f0 100644 --- a/board/Marvell/octeontx2_cn913x/board.c +++ b/board/Marvell/octeontx2_cn913x/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> * Copyright (C) 2020 Marvell International Ltd. diff --git a/board/Marvell/openrd/Makefile b/board/Marvell/openrd/Makefile index ecebb421f7..5f78098070 100644 --- a/board/Marvell/openrd/Makefile +++ b/board/Marvell/openrd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Net Insight <www.netinsight.net> diff --git a/board/Marvell/openrd/kwbimage.cfg b/board/Marvell/openrd/kwbimage.cfg index 356fd46f93..9c473d4789 100644 --- a/board/Marvell/openrd/kwbimage.cfg +++ b/board/Marvell/openrd/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 581e2e084d..02dea1474b 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Net Insight <www.netinsight.net> diff --git a/board/Marvell/openrd/openrd.h b/board/Marvell/openrd/openrd.h index ade8d27392..c56e304ac8 100644 --- a/board/Marvell/openrd/openrd.h +++ b/board/Marvell/openrd/openrd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Net Insight <www.netinsight.net> diff --git a/board/Marvell/sheevaplug/Makefile b/board/Marvell/sheevaplug/Makefile index c39dd03e2d..95b6342131 100644 --- a/board/Marvell/sheevaplug/Makefile +++ b/board/Marvell/sheevaplug/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/sheevaplug/kwbimage.cfg b/board/Marvell/sheevaplug/kwbimage.cfg index f5206451da..2e5ad7ebf5 100644 --- a/board/Marvell/sheevaplug/kwbimage.cfg +++ b/board/Marvell/sheevaplug/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index 26ee39ef77..8acfe1cefc 100644 --- a/board/Marvell/sheevaplug/sheevaplug.c +++ b/board/Marvell/sheevaplug/sheevaplug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021-2022 Tony Dinh <mibodhi(a)gmail.com> * (C) Copyright 2009 diff --git a/board/Seagate/dockstar/Makefile b/board/Seagate/dockstar/Makefile index 7fda3f42c0..cf76395bd8 100644 --- a/board/Seagate/dockstar/Makefile +++ b/board/Seagate/dockstar/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010 Eric C. Cooper <ecc(a)cmu.edu> # diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index d72e3ef24e..0c4fb1769b 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2010 Eric C. Cooper <ecc(a)cmu.edu> diff --git a/board/Seagate/dockstar/kwbimage.cfg b/board/Seagate/dockstar/kwbimage.cfg index 65183d4ef2..8032a1a093 100644 --- a/board/Seagate/dockstar/kwbimage.cfg +++ b/board/Seagate/dockstar/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010 Eric C. Cooper <ecc(a)cmu.edu> # diff --git a/board/Seagate/goflexhome/Makefile b/board/Seagate/goflexhome/Makefile index d6e6b976ac..82ecda81f6 100644 --- a/board/Seagate/goflexhome/Makefile +++ b/board/Seagate/goflexhome/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013 Suriyan Ramasami <suriyan.r(a)gmail.com> # diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index caea89c10e..1368317def 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021-2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2013-2021 Suriyan Ramasami <suriyan.r(a)gmail.com> diff --git a/board/Seagate/goflexhome/kwbimage.cfg b/board/Seagate/goflexhome/kwbimage.cfg index 8c81931479..1c7b3702f8 100644 --- a/board/Seagate/goflexhome/kwbimage.cfg +++ b/board/Seagate/goflexhome/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013 Suriyan Ramasami <suriyan.r(a)gmail.com> # diff --git a/board/Seagate/nas220/Makefile b/board/Seagate/nas220/Makefile index 9de73e6f5e..634cb01a15 100644 --- a/board/Seagate/nas220/Makefile +++ b/board/Seagate/nas220/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2014 Evgeni Dobrev <evgeni(a)studio-punkt.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := nas220.o diff --git a/board/Seagate/nas220/kwbimage.cfg b/board/Seagate/nas220/kwbimage.cfg index dbbfb9c020..ef47e13851 100644 --- a/board/Seagate/nas220/kwbimage.cfg +++ b/board/Seagate/nas220/kwbimage.cfg @@ -6,7 +6,7 @@ # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c index cd2bbdad1c..97bcabf2db 100644 --- a/board/Seagate/nas220/nas220.c +++ b/board/Seagate/nas220/nas220.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Evgeni Dobrev <evgeni(a)studio-punkt.com> * diff --git a/board/Synology/common/Makefile b/board/Synology/common/Makefile index f688b54906..8bee73c0bc 100644 --- a/board/Synology/common/Makefile +++ b/board/Synology/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 Phil Sutter <phil(a)nwl.cc> diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index a0bace7b46..b1d56befc2 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * Walter Schweizer <swwa(a)users.sourceforge.net> diff --git a/board/Synology/common/legacy.h b/board/Synology/common/legacy.h index 0a814324d0..8132546209 100644 --- a/board/Synology/common/legacy.h +++ b/board/Synology/common/legacy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 * Walter Schweizer <swwa(a)users.sourceforge.net> diff --git a/board/Synology/ds109/Makefile b/board/Synology/ds109/Makefile index 9d103a61bc..455aec1ccb 100644 --- a/board/Synology/ds109/Makefile +++ b/board/Synology/ds109/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c index 5c3f46e23f..8b00cf497e 100644 --- a/board/Synology/ds109/ds109.c +++ b/board/Synology/ds109/ds109.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009-2012 * Wojciech Dubowik <wojciech.dubowik(a)neratec.com> diff --git a/board/Synology/ds109/ds109.h b/board/Synology/ds109/ds109.h index 0cf05257c8..ce1d73e0c6 100644 --- a/board/Synology/ds109/ds109.h +++ b/board/Synology/ds109/ds109.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009-2012 * Wojciech Dubowik <wojciech.dubowik(a)neratec.com> diff --git a/board/Synology/ds109/kwbimage.cfg b/board/Synology/ds109/kwbimage.cfg index 8f6e705137..e985de6b97 100644 --- a/board/Synology/ds109/kwbimage.cfg +++ b/board/Synology/ds109/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2011 # Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/board/Synology/ds116/Makefile b/board/Synology/ds116/Makefile index 952cc1b9da..9e22422291 100644 --- a/board/Synology/ds116/Makefile +++ b/board/Synology/ds116/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/Synology/ds116/ds116.c b/board/Synology/ds116/ds116.c index cf2575b562..ab94306d31 100644 --- a/board/Synology/ds116/ds116.c +++ b/board/Synology/ds116/ds116.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/board/Synology/ds414/Makefile b/board/Synology/ds414/Makefile index b1d018effa..082626052b 100644 --- a/board/Synology/ds414/Makefile +++ b/board/Synology/ds414/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Phil Sutter <phil(a)nwl.cc> diff --git a/board/Synology/ds414/cmd_syno.c b/board/Synology/ds414/cmd_syno.c index a62658a2eb..588aed4615 100644 --- a/board/Synology/ds414/cmd_syno.c +++ b/board/Synology/ds414/cmd_syno.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Commands to deal with Synology specifics. * diff --git a/board/Synology/ds414/cmd_syno.h b/board/Synology/ds414/cmd_syno.h index 42e435c803..87fa9e3c85 100644 --- a/board/Synology/ds414/cmd_syno.h +++ b/board/Synology/ds414/cmd_syno.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Commands to deal with Synology specifics. * diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c index abe6f9eb5e..1ef9dd37e1 100644 --- a/board/Synology/ds414/ds414.c +++ b/board/Synology/ds414/ds414.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2015 Phil Sutter <phil(a)nwl.cc> diff --git a/board/abilis/tb100/Makefile b/board/abilis/tb100/Makefile index 43cc777be7..e3c1423e7d 100644 --- a/board/abilis/tb100/Makefile +++ b/board/abilis/tb100/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Pierrick Hascoet, Abilis Systems diff --git a/board/abilis/tb100/config.mk b/board/abilis/tb100/config.mk index 9e8dee49bd..f54a32dcc9 100644 --- a/board/abilis/tb100/config.mk +++ b/board/abilis/tb100/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Synopsys, Inc. All rights reserved. diff --git a/board/abilis/tb100/tb100.c b/board/abilis/tb100/tb100.c index 89e73225a7..00b19f1a53 100644 --- a/board/abilis/tb100/tb100.c +++ b/board/abilis/tb100/tb100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Pierrick Hascoet, Abilis Systems */ diff --git a/board/advantech/imx8mp_rsb3720a1/Makefile b/board/advantech/imx8mp_rsb3720a1/Makefile index eb6b18b04a..7e4798c233 100644 --- a/board/advantech/imx8mp_rsb3720a1/Makefile +++ b/board/advantech/imx8mp_rsb3720a1/Makefile @@ -2,7 +2,7 @@ # Copyright 2019 NXP # Copyright 2022 Linaro # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_TARGET_IMX8MP_RSB3720A1_6G diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index b79a2380aa..8652f035cb 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * Copyright 2022 Linaro diff --git a/board/advantech/imx8mp_rsb3720a1/imximage-8mp-lpddr4.cfg b/board/advantech/imx8mp_rsb3720a1/imximage-8mp-lpddr4.cfg index 330a604ae7..634d331b6a 100644 --- a/board/advantech/imx8mp_rsb3720a1/imximage-8mp-lpddr4.cfg +++ b/board/advantech/imx8mp_rsb3720a1/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP * Copyright 2022 NXP diff --git a/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_4G.c b/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_4G.c index 67aa442605..ecca5d2436 100644 --- a/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_4G.c +++ b/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_4G.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_6G.c b/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_6G.c index 08c9e906bf..c947574231 100644 --- a/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_6G.c +++ b/board/advantech/imx8mp_rsb3720a1/lpddr4_timing_rsb3720a1_6G.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/board/advantech/imx8mp_rsb3720a1/spl.c b/board/advantech/imx8mp_rsb3720a1/spl.c index f4257bc993..c794ddb530 100644 --- a/board/advantech/imx8mp_rsb3720a1/spl.c +++ b/board/advantech/imx8mp_rsb3720a1/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019 NXP * Copyright 2022 Linaro diff --git a/board/advantech/imx8qm_dmsse20_a1/Makefile b/board/advantech/imx8qm_dmsse20_a1/Makefile index 262ffcd683..15aef1692e 100644 --- a/board/advantech/imx8qm_dmsse20_a1/Makefile +++ b/board/advantech/imx8qm_dmsse20_a1/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8qm_dmsse20_a1.o diff --git a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c index 8b4d73052e..1e920f992b 100644 --- a/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c +++ b/board/advantech/imx8qm_dmsse20_a1/imx8qm_dmsse20_a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP * Copyright 2019-2023 Kococonnector GmbH diff --git a/board/advantech/imx8qm_rom7720_a1/Makefile b/board/advantech/imx8qm_rom7720_a1/Makefile index 51c5de251c..bfa1acf99d 100644 --- a/board/advantech/imx8qm_rom7720_a1/Makefile +++ b/board/advantech/imx8qm_rom7720_a1/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8qm_rom7720_a1.o diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c index 206ce7d5c1..52147a6b6d 100644 --- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c +++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP * Copyright (C) 2019 Oliver Graute <oliver.graute(a)kococonnector.com> diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index 43035088e3..90ced5712e 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c index d32400101f..39549a372a 100644 --- a/board/advantech/imx8qm_rom7720_a1/spl.c +++ b/board/advantech/imx8qm_rom7720_a1/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP */ diff --git a/board/advantech/som-db5800-som-6867/Makefile b/board/advantech/som-db5800-som-6867/Makefile index 95af6c4df7..8567e72b89 100644 --- a/board/advantech/som-db5800-som-6867/Makefile +++ b/board/advantech/som-db5800-som-6867/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Google, Inc diff --git a/board/advantech/som-db5800-som-6867/acpi/mainboard.asl b/board/advantech/som-db5800-som-6867/acpi/mainboard.asl index beb9d93ec9..ac436ab119 100644 --- a/board/advantech/som-db5800-som-6867/acpi/mainboard.asl +++ b/board/advantech/som-db5800-som-6867/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/advantech/som-db5800-som-6867/dsdt.asl b/board/advantech/som-db5800-som-6867/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/advantech/som-db5800-som-6867/dsdt.asl +++ b/board/advantech/som-db5800-som-6867/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c index 8499fc541f..d62fc6988a 100644 --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> * Copyright (C) 2016 George McCollister <george.mccollister(a)gmail.com> diff --git a/board/alliedtelesis/SBx81LIFKW/Makefile b/board/alliedtelesis/SBx81LIFKW/Makefile index 806020ed85..1204cb6a9b 100644 --- a/board/alliedtelesis/SBx81LIFKW/Makefile +++ b/board/alliedtelesis/SBx81LIFKW/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010, 2018 # Allied Telesis <www.alliedtelesis.com> diff --git a/board/alliedtelesis/SBx81LIFKW/kwbimage.cfg b/board/alliedtelesis/SBx81LIFKW/kwbimage.cfg index 9726f15e28..1682ce48a6 100644 --- a/board/alliedtelesis/SBx81LIFKW/kwbimage.cfg +++ b/board/alliedtelesis/SBx81LIFKW/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2018 Allied Telesis # diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c index e0a7f3fa89..707f2ab15a 100644 --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010, 2018 * Allied Telesis <www.alliedtelesis.com> diff --git a/board/alliedtelesis/SBx81LIFXCAT/Makefile b/board/alliedtelesis/SBx81LIFXCAT/Makefile index f21c8ef9d6..cb6b0cc74c 100644 --- a/board/alliedtelesis/SBx81LIFXCAT/Makefile +++ b/board/alliedtelesis/SBx81LIFXCAT/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010, 2018 # Allied Telesis <www.alliedtelesis.com> diff --git a/board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg b/board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg index 53d4812f34..80360275ca 100644 --- a/board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg +++ b/board/alliedtelesis/SBx81LIFXCAT/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2018 Allied Telesis # diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c index 52b8eba92f..fd88501b4c 100644 --- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c +++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010, 2018 * Allied Telesis <www.alliedtelesis.com> diff --git a/board/alliedtelesis/common/gpio_hog.c b/board/alliedtelesis/common/gpio_hog.c index 4aecf7e2ce..aa25703257 100644 --- a/board/alliedtelesis/common/gpio_hog.c +++ b/board/alliedtelesis/common/gpio_hog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Allied Telesis Labs */ diff --git a/board/alliedtelesis/common/gpio_hog.h b/board/alliedtelesis/common/gpio_hog.h index edb7443131..05e52425c3 100644 --- a/board/alliedtelesis/common/gpio_hog.h +++ b/board/alliedtelesis/common/gpio_hog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Allied Telesis Labs */ diff --git a/board/alliedtelesis/x240/Makefile b/board/alliedtelesis/x240/Makefile index 7f20a47d6a..f72a43407f 100644 --- a/board/alliedtelesis/x240/Makefile +++ b/board/alliedtelesis/x240/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 Allied Telesis # diff --git a/board/alliedtelesis/x240/x240.c b/board/alliedtelesis/x240/x240.c index 0c4f8e03b8..0ed3e0a32f 100644 --- a/board/alliedtelesis/x240/x240.c +++ b/board/alliedtelesis/x240/x240.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/global_data.h> diff --git a/board/alliedtelesis/x530/Makefile b/board/alliedtelesis/x530/Makefile index 97de1d463f..56da55a3be 100644 --- a/board/alliedtelesis/x530/Makefile +++ b/board/alliedtelesis/x530/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Allied Telesis Labs # diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index 80ad62c2c6..f8d3f1eda6 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Allied Telesis Labs */ diff --git a/board/amarula/vyasa-rk3288/Makefile b/board/amarula/vyasa-rk3288/Makefile index 7c0d5c0316..1f7ce8d954 100644 --- a/board/amarula/vyasa-rk3288/Makefile +++ b/board/amarula/vyasa-rk3288/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2017 Amarula Solutions # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += vyasa-rk3288.o diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c index 92e0698c53..c8a8fbe1dc 100644 --- a/board/amarula/vyasa-rk3288/vyasa-rk3288.c +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Amarula Solutions */ diff --git a/board/amlogic/ad401/Makefile b/board/amlogic/ad401/Makefile index e65c1215f6..abb5c3c318 100644 --- a/board/amlogic/ad401/Makefile +++ b/board/amlogic/ad401/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2023 SberDevices, Inc. obj-y := ad401.o diff --git a/board/amlogic/ad401/ad401.c b/board/amlogic/ad401/ad401.c index 356b2880bd..4656c2ae2f 100644 --- a/board/amlogic/ad401/ad401.c +++ b/board/amlogic/ad401/ad401.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 SberDevices, Inc. * Author: Igor Prusov <ivprusov(a)sberdevices.ru> diff --git a/board/amlogic/beelink-s922x/Makefile b/board/amlogic/beelink-s922x/Makefile index 27b1a74105..7f0b933ccd 100644 --- a/board/amlogic/beelink-s922x/Makefile +++ b/board/amlogic/beelink-s922x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/beelink-s922x/beelink-s922x.c b/board/amlogic/beelink-s922x/beelink-s922x.c index adae27fc7e..ec3cd61a06 100644 --- a/board/amlogic/beelink-s922x/beelink-s922x.c +++ b/board/amlogic/beelink-s922x/beelink-s922x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/jethub-j100/Makefile b/board/amlogic/jethub-j100/Makefile index 4d935af984..8695dca62b 100644 --- a/board/amlogic/jethub-j100/Makefile +++ b/board/amlogic/jethub-j100/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2021 Vyacheslav Bocharov # Author: Vyacheslav Bocharov <adeep(a)lexina.in> diff --git a/board/amlogic/jethub-j100/jethub-j100.c b/board/amlogic/jethub-j100/jethub-j100.c index 6a2c4ad4c3..e6bfdd1a06 100644 --- a/board/amlogic/jethub-j100/jethub-j100.c +++ b/board/amlogic/jethub-j100/jethub-j100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Vyacheslav Bocharov * Author: Vyacheslav Bocharov <adeep(a)lexina.in> diff --git a/board/amlogic/jethub-j80/Makefile b/board/amlogic/jethub-j80/Makefile index a727a4b222..a6891b186e 100644 --- a/board/amlogic/jethub-j80/Makefile +++ b/board/amlogic/jethub-j80/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2021 Vyacheslav Bocharov # Author: Vyacheslav Bocharov <adeep(a)lexina.in> diff --git a/board/amlogic/jethub-j80/jethub-j80.c b/board/amlogic/jethub-j80/jethub-j80.c index 185880de13..279c03847d 100644 --- a/board/amlogic/jethub-j80/jethub-j80.c +++ b/board/amlogic/jethub-j80/jethub-j80.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Vyacheslav Bocharov * Author: Vyacheslav Bocharov <adeep(a)lexina.in> diff --git a/board/amlogic/odroid-go-ultra/Makefile b/board/amlogic/odroid-go-ultra/Makefile index 8ebaa0c215..0d01e5e2e0 100644 --- a/board/amlogic/odroid-go-ultra/Makefile +++ b/board/amlogic/odroid-go-ultra/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2023 Neil Armstrong <neil.armstrong(a)linaro.org> diff --git a/board/amlogic/odroid-go-ultra/odroid-go-ultra.c b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c index bbd23e20fc..a24d004e46 100644 --- a/board/amlogic/odroid-go-ultra/odroid-go-ultra.c +++ b/board/amlogic/odroid-go-ultra/odroid-go-ultra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Neil Armstrong <neil.armstrong(a)linaro.org> */ diff --git a/board/amlogic/odroid-n2/Makefile b/board/amlogic/odroid-n2/Makefile index 68e4e2a828..82b7bc799b 100644 --- a/board/amlogic/odroid-n2/Makefile +++ b/board/amlogic/odroid-n2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c index 2135457edd..2da45cfb2b 100644 --- a/board/amlogic/odroid-n2/odroid-n2.c +++ b/board/amlogic/odroid-n2/odroid-n2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/p200/Makefile b/board/amlogic/p200/Makefile index f82a7ea9ca..f72bb9f7e0 100644 --- a/board/amlogic/p200/Makefile +++ b/board/amlogic/p200/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c index 7c432f9d28..0dd20df170 100644 --- a/board/amlogic/p200/p200.c +++ b/board/amlogic/p200/p200.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/board/amlogic/p201/Makefile b/board/amlogic/p201/Makefile index 11de5396ab..1aab8fbb6a 100644 --- a/board/amlogic/p201/Makefile +++ b/board/amlogic/p201/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c index 7c432f9d28..0dd20df170 100644 --- a/board/amlogic/p201/p201.c +++ b/board/amlogic/p201/p201.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/board/amlogic/p212/Makefile b/board/amlogic/p212/Makefile index d98cc11a49..4123c158bc 100644 --- a/board/amlogic/p212/Makefile +++ b/board/amlogic/p212/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index fcef90bce5..40b28205e2 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/q200/Makefile b/board/amlogic/q200/Makefile index fd78fd068a..8d0e7c8453 100644 --- a/board/amlogic/q200/Makefile +++ b/board/amlogic/q200/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index 3aa6d8f200..b83ac4b774 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/s400/Makefile b/board/amlogic/s400/Makefile index bf03862b90..0769433b7d 100644 --- a/board/amlogic/s400/Makefile +++ b/board/amlogic/s400/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c index 06a9044fd8..040d2e55ba 100644 --- a/board/amlogic/s400/s400.c +++ b/board/amlogic/s400/s400.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/sei510/Makefile b/board/amlogic/sei510/Makefile index 03399a3849..ef2c0594e0 100644 --- a/board/amlogic/sei510/Makefile +++ b/board/amlogic/sei510/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/sei510/sei510.c b/board/amlogic/sei510/sei510.c index bb188c21f7..ff7777e02f 100644 --- a/board/amlogic/sei510/sei510.c +++ b/board/amlogic/sei510/sei510.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/sei610/Makefile b/board/amlogic/sei610/Makefile index 428792afea..21347091fc 100644 --- a/board/amlogic/sei610/Makefile +++ b/board/amlogic/sei610/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/sei610/sei610.c b/board/amlogic/sei610/sei610.c index 6490bac9eb..25a478dc1a 100644 --- a/board/amlogic/sei610/sei610.c +++ b/board/amlogic/sei610/sei610.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/u200/Makefile b/board/amlogic/u200/Makefile index 485791bbb2..a4cf30957e 100644 --- a/board/amlogic/u200/Makefile +++ b/board/amlogic/u200/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c index 06a9044fd8..040d2e55ba 100644 --- a/board/amlogic/u200/u200.c +++ b/board/amlogic/u200/u200.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/vim3/Makefile b/board/amlogic/vim3/Makefile index c515077302..518245c067 100644 --- a/board/amlogic/vim3/Makefile +++ b/board/amlogic/vim3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/vim3/vim3.c b/board/amlogic/vim3/vim3.c index 8bdfb302f7..34e3f06494 100644 --- a/board/amlogic/vim3/vim3.c +++ b/board/amlogic/vim3/vim3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/w400/Makefile b/board/amlogic/w400/Makefile index fac4a73afa..4ea911ad85 100644 --- a/board/amlogic/w400/Makefile +++ b/board/amlogic/w400/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2019 BayLibre, SAS # Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c index 4199198496..1e4c042985 100644 --- a/board/amlogic/w400/w400.c +++ b/board/amlogic/w400/w400.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/board/anbernic/rgxx3_rk3566/Makefile b/board/anbernic/rgxx3_rk3566/Makefile index afd3e0adf6..d3940f03b8 100644 --- a/board/anbernic/rgxx3_rk3566/Makefile +++ b/board/anbernic/rgxx3_rk3566/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2023 Chris Morgan <macromorgan(a)hotmail.com> # diff --git a/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c b/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c index 3f1a42d184..0a0557b024 100644 --- a/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c +++ b/board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Chris Morgan <macromorgan(a)hotmail.com> */ diff --git a/board/aristainetos/Makefile b/board/aristainetos/Makefile index 222542efe9..b34a81803e 100644 --- a/board/aristainetos/Makefile +++ b/board/aristainetos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c index 17f37badd7..fbcd1856e5 100644 --- a/board/aristainetos/aristainetos.c +++ b/board/aristainetos/aristainetos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/board/aristainetos/aristainetos2.cfg b/board/aristainetos/aristainetos2.cfg index 2454ac5515..8a45a1f121 100644 --- a/board/aristainetos/aristainetos2.cfg +++ b/board/aristainetos/aristainetos2.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/board/aristainetos/axi.cfg b/board/aristainetos/axi.cfg index c8ec094b69..8851b4f353 100644 --- a/board/aristainetos/axi.cfg +++ b/board/aristainetos/axi.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/aristainetos/clocks2.cfg b/board/aristainetos/clocks2.cfg index b3146a95d7..e7d05a2d81 100644 --- a/board/aristainetos/clocks2.cfg +++ b/board/aristainetos/clocks2.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/aristainetos/ddr-setup2.cfg b/board/aristainetos/ddr-setup2.cfg index 5810446f17..f3ed6be546 100644 --- a/board/aristainetos/ddr-setup2.cfg +++ b/board/aristainetos/ddr-setup2.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/aristainetos/nt5cc256m16cp.cfg b/board/aristainetos/nt5cc256m16cp.cfg index 2f63d1ff86..365da52261 100644 --- a/board/aristainetos/nt5cc256m16cp.cfg +++ b/board/aristainetos/nt5cc256m16cp.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/armadeus/opos6uldev/Makefile b/board/armadeus/opos6uldev/Makefile index cff8eb267c..36ce3324e4 100644 --- a/board/armadeus/opos6uldev/Makefile +++ b/board/armadeus/opos6uldev/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2017 Armadeus Systems obj-y := board.o diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c index 365fdca1b7..e749761567 100644 --- a/board/armadeus/opos6uldev/board.c +++ b/board/armadeus/opos6uldev/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Armadeus Systems */ diff --git a/board/armadeus/opos6uldev/opos6uldev.env b/board/armadeus/opos6uldev/opos6uldev.env index f900297871..0f72b6f9ea 100644 --- a/board/armadeus/opos6uldev/opos6uldev.env +++ b/board/armadeus/opos6uldev/opos6uldev.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Armadeus Systems diff --git a/board/armltd/corstone1000/Makefile b/board/armltd/corstone1000/Makefile index 77a82c2892..453d319d8d 100644 --- a/board/armltd/corstone1000/Makefile +++ b/board/armltd/corstone1000/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Arm Limited # (C) Copyright 2022 Linaro diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c index 01c80aaf9d..bb3cdf75ee 100644 --- a/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 ARM Limited * (C) Copyright 2022 Linaro diff --git a/board/armltd/corstone1000/corstone1000.env b/board/armltd/corstone1000/corstone1000.env index ee318b1b1c..61e7c253dd 100644 --- a/board/armltd/corstone1000/corstone1000.env +++ b/board/armltd/corstone1000/corstone1000.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ usb_pgood_delay=250 boot_bank_flag=0x08005006 diff --git a/board/armltd/integrator/Makefile b/board/armltd/integrator/Makefile index 107e59bf0f..cb337bafe1 100644 --- a/board/armltd/integrator/Makefile +++ b/board/armltd/integrator/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/armltd/integrator/arm-ebi.h b/board/armltd/integrator/arm-ebi.h index 6b1a96d8ab..2f538293b4 100644 --- a/board/armltd/integrator/arm-ebi.h +++ b/board/armltd/integrator/arm-ebi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Linaro diff --git a/board/armltd/integrator/integrator-sc.h b/board/armltd/integrator/integrator-sc.h index 42d90b1188..475deb17de 100644 --- a/board/armltd/integrator/integrator-sc.h +++ b/board/armltd/integrator/integrator-sc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Linaro diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index ad02cf16da..acd3732c9a 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S index ea5b654ed5..5bdc2dc30c 100644 --- a/board/armltd/integrator/lowlevel_init.S +++ b/board/armltd/integrator/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board specific setup info * diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index 9db5135a8f..82141e817c 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/board/armltd/total_compute/Makefile b/board/armltd/total_compute/Makefile index 8b10458431..aff2f6dcd6 100644 --- a/board/armltd/total_compute/Makefile +++ b/board/armltd/total_compute/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 Arm Limited # Usama Arif <usama.arif(a)arm.com> diff --git a/board/armltd/total_compute/total_compute.c b/board/armltd/total_compute/total_compute.c index 53941b5f5f..9d6f5f82e9 100644 --- a/board/armltd/total_compute/total_compute.c +++ b/board/armltd/total_compute/total_compute.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Arm Limited * Usama Arif <usama.arif(a)arm.com> diff --git a/board/armltd/vexpress/Makefile b/board/armltd/vexpress/Makefile index 84804f5ce7..0f4f84cf57 100644 --- a/board/armltd/vexpress/Makefile +++ b/board/armltd/vexpress/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c index 763131c217..34240836fd 100644 --- a/board/armltd/vexpress/vexpress_common.c +++ b/board/armltd/vexpress/vexpress_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile index 1878fbed4e..e0f736779c 100644 --- a/board/armltd/vexpress64/Makefile +++ b/board/armltd/vexpress64/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index e553da86e0..d684595753 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) ARM Ltd 2015 * diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index ee65a59683..ee2ee2caf0 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * David Feng <fenghua(a)phytium.com.cn> diff --git a/board/astro/mcf5373l/Makefile b/board/astro/mcf5373l/Makefile index d3ea0d06a8..333eb5d7fb 100644 --- a/board/astro/mcf5373l/Makefile +++ b/board/astro/mcf5373l/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/astro/mcf5373l/fpga.c b/board/astro/mcf5373l/fpga.c index f85737432b..188eb89801 100644 --- a/board/astro/mcf5373l/fpga.c +++ b/board/astro/mcf5373l/fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006 * Wolfgang Wegner, ASTRO Strobel Kommunikationssysteme GmbH, diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c index 43563c4127..83ac0a8316 100644 --- a/board/astro/mcf5373l/mcf5373l.c +++ b/board/astro/mcf5373l/mcf5373l.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/asus/grouper/Makefile b/board/asus/grouper/Makefile index e4a477a366..3992d008f8 100644 --- a/board/asus/grouper/Makefile +++ b/board/asus/grouper/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/asus/grouper/grouper-spl-max.c b/board/asus/grouper/grouper-spl-max.c index 844383766a..b6e620d4df 100644 --- a/board/asus/grouper/grouper-spl-max.c +++ b/board/asus/grouper/grouper-spl-max.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * T30 Grouper MAX SPL stage configuration * diff --git a/board/asus/grouper/grouper-spl-ti.c b/board/asus/grouper/grouper-spl-ti.c index e5b78f0121..cf7204f60f 100644 --- a/board/asus/grouper/grouper-spl-ti.c +++ b/board/asus/grouper/grouper-spl-ti.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * T30 Grouper TI SPL stage configuration * diff --git a/board/asus/grouper/grouper.c b/board/asus/grouper/grouper.c index 2769313e68..8060b2e703 100644 --- a/board/asus/grouper/grouper.c +++ b/board/asus/grouper/grouper.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/asus/transformer-t30/Makefile b/board/asus/transformer-t30/Makefile index c083f2289b..da0682fb5e 100644 --- a/board/asus/transformer-t30/Makefile +++ b/board/asus/transformer-t30/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/asus/transformer-t30/transformer-t30-spl.c b/board/asus/transformer-t30/transformer-t30-spl.c index 89819b2b92..4924989612 100644 --- a/board/asus/transformer-t30/transformer-t30-spl.c +++ b/board/asus/transformer-t30/transformer-t30-spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * T30 Transformers SPL stage configuration * diff --git a/board/asus/transformer-t30/transformer-t30.c b/board/asus/transformer-t30/transformer-t30.c index b6fd19d28e..e0749f3cd1 100644 --- a/board/asus/transformer-t30/transformer-t30.c +++ b/board/asus/transformer-t30/transformer-t30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile index 0f1729644c..262d3b78e8 100644 --- a/board/atmel/at91sam9260ek/Makefile +++ b/board/atmel/at91sam9260ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index b8e02f4590..fc5502c4e3 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile index de3466627b..0d33349358 100644 --- a/board/atmel/at91sam9261ek/Makefile +++ b/board/atmel/at91sam9261ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index eab3a13081..818952d08f 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile index 57ad36f758..43c1167ec5 100644 --- a/board/atmel/at91sam9263ek/Makefile +++ b/board/atmel/at91sam9263ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 15f20b62f6..1f9c3569b6 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/atmel/at91sam9m10g45ek/Makefile b/board/atmel/at91sam9m10g45ek/Makefile index c17719eba5..7e3fe1053e 100644 --- a/board/atmel/at91sam9m10g45ek/Makefile +++ b/board/atmel/at91sam9m10g45ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c index f53c1cf612..347b708e7a 100644 --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/atmel/at91sam9n12ek/Makefile b/board/atmel/at91sam9n12ek/Makefile index 2ca5459a19..99cb702f61 100644 --- a/board/atmel/at91sam9n12ek/Makefile +++ b/board/atmel/at91sam9n12ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c index a3e294c88f..b2a8e005d6 100644 --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Atmel Corporation * Josh Wu <josh.wu(a)atmel.com> diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile index 96e246dc01..d876364235 100644 --- a/board/atmel/at91sam9rlek/Makefile +++ b/board/atmel/at91sam9rlek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 11725f778b..1f23638562 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/atmel/at91sam9x5ek/Makefile b/board/atmel/at91sam9x5ek/Makefile index e50948a5bb..b4c6bb01a4 100644 --- a/board/atmel/at91sam9x5ek/Makefile +++ b/board/atmel/at91sam9x5ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c index ab666b6be3..a8f2ab6b51 100644 --- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c +++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Atmel Corporation */ diff --git a/board/atmel/common/Makefile b/board/atmel/common/Makefile index c046da7988..84cadf051a 100644 --- a/board/atmel/common/Makefile +++ b/board/atmel/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Microchip # Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c index c93c0e52e3..2bde0043d9 100644 --- a/board/atmel/common/board.c +++ b/board/atmel/common/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip * Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/common/mac-spi-nor.c b/board/atmel/common/mac-spi-nor.c index ced27b65e6..edaa562d17 100644 --- a/board/atmel/common/mac-spi-nor.c +++ b/board/atmel/common/mac-spi-nor.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries * diff --git a/board/atmel/common/mac_eeprom.c b/board/atmel/common/mac_eeprom.c index 4606008c69..5afd194c1d 100644 --- a/board/atmel/common/mac_eeprom.c +++ b/board/atmel/common/mac_eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip * Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c index a5049f4aad..7d1db879c9 100644 --- a/board/atmel/common/video_display.c +++ b/board/atmel/common/video_display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip * Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/sam9x60_curiosity/Makefile b/board/atmel/sam9x60_curiosity/Makefile index c4d17e66d4..1fee157213 100644 --- a/board/atmel/sam9x60_curiosity/Makefile +++ b/board/atmel/sam9x60_curiosity/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 Microchip Technology Inc. and its subsidiaries # diff --git a/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c b/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c index f53d359404..f9a45c350a 100644 --- a/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c +++ b/board/atmel/sam9x60_curiosity/sam9x60_curiosity.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Microchip Technology Inc. and its subsidiaries * diff --git a/board/atmel/sam9x60ek/Makefile b/board/atmel/sam9x60ek/Makefile index 12a406a3bb..83b9dc3fef 100644 --- a/board/atmel/sam9x60ek/Makefile +++ b/board/atmel/sam9x60ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Microchip Technology Inc. and its subsidiaries # diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c index 3fbfca4acc..90a10ecba7 100644 --- a/board/atmel/sam9x60ek/sam9x60ek.c +++ b/board/atmel/sam9x60ek/sam9x60ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Microchip Technology Inc. and its subsidiaries * diff --git a/board/atmel/sama5d27_som1_ek/Makefile b/board/atmel/sama5d27_som1_ek/Makefile index 72d320b1a0..e01d945fe6 100644 --- a/board/atmel/sama5d27_som1_ek/Makefile +++ b/board/atmel/sama5d27_som1_ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Microchip Corporation # Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c index 329eac7223..4424b1d27e 100644 --- a/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c +++ b/board/atmel/sama5d27_som1_ek/sama5d27_som1_ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip Corporation * Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/sama5d27_wlsom1_ek/Makefile b/board/atmel/sama5d27_wlsom1_ek/Makefile index cf827ae5e3..d35593b611 100644 --- a/board/atmel/sama5d27_wlsom1_ek/Makefile +++ b/board/atmel/sama5d27_wlsom1_ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries # diff --git a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c index 6e41017af1..9488941470 100644 --- a/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c +++ b/board/atmel/sama5d27_wlsom1_ek/sama5d27_wlsom1_ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries * diff --git a/board/atmel/sama5d29_curiosity/Makefile b/board/atmel/sama5d29_curiosity/Makefile index 848e1ce149..cca291f4e7 100644 --- a/board/atmel/sama5d29_curiosity/Makefile +++ b/board/atmel/sama5d29_curiosity/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2023 Microchip Technology Inc. and its subsidiaries # diff --git a/board/atmel/sama5d29_curiosity/sama5d29_curiosity.c b/board/atmel/sama5d29_curiosity/sama5d29_curiosity.c index d0679317fb..8c178a44f2 100644 --- a/board/atmel/sama5d29_curiosity/sama5d29_curiosity.c +++ b/board/atmel/sama5d29_curiosity/sama5d29_curiosity.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Microchip Technology Inc. and its subsidiaries * diff --git a/board/atmel/sama5d2_icp/Makefile b/board/atmel/sama5d2_icp/Makefile index fd7e870599..45aa8f9227 100644 --- a/board/atmel/sama5d2_icp/Makefile +++ b/board/atmel/sama5d2_icp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Microchip Technology Inc. # Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/board/atmel/sama5d2_icp/sama5d2_icp.c b/board/atmel/sama5d2_icp/sama5d2_icp.c index fabe492715..7a921feb1f 100644 --- a/board/atmel/sama5d2_icp/sama5d2_icp.c +++ b/board/atmel/sama5d2_icp/sama5d2_icp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Microchip Technology, Inc. * Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/board/atmel/sama5d2_ptc_ek/Makefile b/board/atmel/sama5d2_ptc_ek/Makefile index 22f4664394..691c5d289a 100644 --- a/board/atmel/sama5d2_ptc_ek/Makefile +++ b/board/atmel/sama5d2_ptc_ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Microchip Corporation # Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c index 854715ea22..a4a51d85a9 100644 --- a/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c +++ b/board/atmel/sama5d2_ptc_ek/sama5d2_ptc_ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip Corporation * Wenyou Yang <wenyou.yang(a)microchip.com> diff --git a/board/atmel/sama5d2_xplained/Makefile b/board/atmel/sama5d2_xplained/Makefile index 39ba24d5f5..b622d010b6 100644 --- a/board/atmel/sama5d2_xplained/Makefile +++ b/board/atmel/sama5d2_xplained/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Atmel Corporation # Wenyou Yang <wenyou.yang(a)atmel.com> diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c index aa52207569..7efafcecf2 100644 --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou.Yang <wenyou.yang(a)atmel.com> diff --git a/board/atmel/sama5d3_xplained/Makefile b/board/atmel/sama5d3_xplained/Makefile index b6bcd3c0aa..591b1f16eb 100644 --- a/board/atmel/sama5d3_xplained/Makefile +++ b/board/atmel/sama5d3_xplained/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index ce73a801e5..85a072d28b 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama5d3xek/Makefile b/board/atmel/sama5d3xek/Makefile index 6fe1b13b0f..572c846d51 100644 --- a/board/atmel/sama5d3xek/Makefile +++ b/board/atmel/sama5d3xek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index 660a6b9d58..2df345a8ff 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 - 2013 Atmel Corporation * Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama5d4_xplained/Makefile b/board/atmel/sama5d4_xplained/Makefile index a79a97420f..f752c174b0 100644 --- a/board/atmel/sama5d4_xplained/Makefile +++ b/board/atmel/sama5d4_xplained/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Atmel # Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c index 780aba15ab..407b992e2b 100644 --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Atmel * Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama5d4ek/Makefile b/board/atmel/sama5d4ek/Makefile index b5696c8c02..0aaa88da01 100644 --- a/board/atmel/sama5d4ek/Makefile +++ b/board/atmel/sama5d4ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Atmel # Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama5d4ek/sama5d4ek.c b/board/atmel/sama5d4ek/sama5d4ek.c index 2226906a3b..5010946038 100644 --- a/board/atmel/sama5d4ek/sama5d4ek.c +++ b/board/atmel/sama5d4ek/sama5d4ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Atmel * Bo Shen <voice.shen(a)atmel.com> diff --git a/board/atmel/sama7g5ek/Makefile b/board/atmel/sama7g5ek/Makefile index a6eedd10fa..be25136e15 100644 --- a/board/atmel/sama7g5ek/Makefile +++ b/board/atmel/sama7g5ek/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Microchip Technology Inc. # Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/board/atmel/sama7g5ek/sama7g5ek.c b/board/atmel/sama7g5ek/sama7g5ek.c index 295fd079dc..1dbf8caab2 100644 --- a/board/atmel/sama7g5ek/sama7g5ek.c +++ b/board/atmel/sama7g5ek/sama7g5ek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology, Inc. * Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/board/avionic-design/common/pinmux-config-tamonten-ng.h b/board/avionic-design/common/pinmux-config-tamonten-ng.h index e7215b1907..52b59c0ec6 100644 --- a/board/avionic-design/common/pinmux-config-tamonten-ng.h +++ b/board/avionic-design/common/pinmux-config-tamonten-ng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Avionic Design GmbH <www.avionic-design.de> diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c index 29bde60228..9c73ab0b1e 100644 --- a/board/avionic-design/common/tamonten-ng.c +++ b/board/avionic-design/common/tamonten-ng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Avionic Design GmbH <www.avionic-design.de> diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index 988f057a28..6661f8d13e 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile index fb5fd384de..ec3fb834cf 100644 --- a/board/avionic-design/medcom-wide/Makefile +++ b/board/avionic-design/medcom-wide/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile index fb5fd384de..ec3fb834cf 100644 --- a/board/avionic-design/plutux/Makefile +++ b/board/avionic-design/plutux/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/avionic-design/tec-ng/Makefile b/board/avionic-design/tec-ng/Makefile index d6890e5797..091f5207ce 100644 --- a/board/avionic-design/tec-ng/Makefile +++ b/board/avionic-design/tec-ng/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2013 # Avionic Design GmbH <www.avionic-design.de> diff --git a/board/avionic-design/tec/Makefile b/board/avionic-design/tec/Makefile index fb5fd384de..ec3fb834cf 100644 --- a/board/avionic-design/tec/Makefile +++ b/board/avionic-design/tec/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/beacon/beacon-rzg2m/Makefile b/board/beacon/beacon-rzg2m/Makefile index 9131a92efa..0e283016af 100644 --- a/board/beacon/beacon-rzg2m/Makefile +++ b/board/beacon/beacon-rzg2m/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2019 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := beacon-rzg2m.o ../../renesas/rcar-common/common.o diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index 99fe1edfb3..9885220356 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/board/beacon/imx8mm/Makefile b/board/beacon/imx8mm/Makefile index 7d3bd3112c..7e8105eff2 100644 --- a/board/beacon/imx8mm/Makefile +++ b/board/beacon/imx8mm/Makefile @@ -1,7 +1,7 @@ # # Copyright 2020 Compass Electronics Group, LLC # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mm_beacon.o diff --git a/board/beacon/imx8mm/imx8mm_beacon.c b/board/beacon/imx8mm/imx8mm_beacon.c index 204235a3f8..7bb2c3fdde 100644 --- a/board/beacon/imx8mm/imx8mm_beacon.c +++ b/board/beacon/imx8mm/imx8mm_beacon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ diff --git a/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg b/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg index 20061521f2..be26a8fb6d 100644 --- a/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg +++ b/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/beacon/imx8mm/lpddr4_timing.c b/board/beacon/imx8mm/lpddr4_timing.c index 8e48b9d81b..d8e878c87e 100644 --- a/board/beacon/imx8mm/lpddr4_timing.c +++ b/board/beacon/imx8mm/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c index 1632238bf5..e19a128b59 100644 --- a/board/beacon/imx8mm/spl.c +++ b/board/beacon/imx8mm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cpu_func.h> diff --git a/board/beacon/imx8mn/Makefile b/board/beacon/imx8mn/Makefile index d620ccb772..50657f9d74 100644 --- a/board/beacon/imx8mn/Makefile +++ b/board/beacon/imx8mn/Makefile @@ -1,7 +1,7 @@ # # Copyright 2020 Compass Electronics Group, LLC # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mn_beacon.o diff --git a/board/beacon/imx8mn/imx8mn_beacon.c b/board/beacon/imx8mn/imx8mn_beacon.c index 204235a3f8..7bb2c3fdde 100644 --- a/board/beacon/imx8mn/imx8mn_beacon.c +++ b/board/beacon/imx8mn/imx8mn_beacon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks */ diff --git a/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg index 0edda9c5e0..13c02e6464 100644 --- a/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg +++ b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/beacon/imx8mn/lpddr4_2g_timing.c b/board/beacon/imx8mn/lpddr4_2g_timing.c index 3c32d804a1..e88065b313 100644 --- a/board/beacon/imx8mn/lpddr4_2g_timing.c +++ b/board/beacon/imx8mn/lpddr4_2g_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/beacon/imx8mn/lpddr4_timing.c b/board/beacon/imx8mn/lpddr4_timing.c index 112e892f51..0291b7f6a3 100644 --- a/board/beacon/imx8mn/lpddr4_timing.c +++ b/board/beacon/imx8mn/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c index b4d46f11f9..e68d460d24 100644 --- a/board/beacon/imx8mn/spl.c +++ b/board/beacon/imx8mn/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/board/beacon/imx8mp/Makefile b/board/beacon/imx8mp/Makefile index 264720f6d4..533ae77b5e 100644 --- a/board/beacon/imx8mp/Makefile +++ b/board/beacon/imx8mp/Makefile @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks # diff --git a/board/beacon/imx8mp/imx8mp_beacon.c b/board/beacon/imx8mp/imx8mp_beacon.c index 8963a51fbb..194c0eb75a 100644 --- a/board/beacon/imx8mp/imx8mp_beacon.c +++ b/board/beacon/imx8mp/imx8mp_beacon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2023 Logic PD, Inc dba Beacon EmbeddedWorks */ #include <common.h> diff --git a/board/beacon/imx8mp/imximage-8mp-lpddr4.cfg b/board/beacon/imx8mp/imximage-8mp-lpddr4.cfg index 6dedf1724a..619b2d9a80 100644 --- a/board/beacon/imx8mp/imximage-8mp-lpddr4.cfg +++ b/board/beacon/imx8mp/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/beacon/imx8mp/lpddr4_timing.c b/board/beacon/imx8mp/lpddr4_timing.c index ae0b84870e..f9fd77d2cb 100644 --- a/board/beacon/imx8mp/lpddr4_timing.c +++ b/board/beacon/imx8mp/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks */ #include <linux/kernel.h> diff --git a/board/beckhoff/mx53cx9020/Makefile b/board/beckhoff/mx53cx9020/Makefile index 423a5532ca..9bd2eb91fc 100644 --- a/board/beckhoff/mx53cx9020/Makefile +++ b/board/beckhoff/mx53cx9020/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Beckhoff Automation GmbH & Co. KG # Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/board/beckhoff/mx53cx9020/imximage.cfg b/board/beckhoff/mx53cx9020/imximage.cfg index 159f50e2a5..8569d6d4db 100644 --- a/board/beckhoff/mx53cx9020/imximage.cfg +++ b/board/beckhoff/mx53cx9020/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Beckhoff Automation GmbH * Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index e7b131836b..39c450ec36 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Beckhoff Automation GmbH & Co. KG * Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c index bf47290256..4684ba7d2d 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020_video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Beckhoff Automation GmbH & Co. KG * Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/board/bluewater/gurnard/Makefile b/board/bluewater/gurnard/Makefile index 8218e2cd58..93a81b91d5 100644 --- a/board/bluewater/gurnard/Makefile +++ b/board/bluewater/gurnard/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/bluewater/gurnard/gurnard.c b/board/bluewater/gurnard/gurnard.c index 9b42299b08..5b287efc9d 100644 --- a/board/bluewater/gurnard/gurnard.c +++ b/board/bluewater/gurnard/gurnard.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bluewater Systems Snapper 9260/9G20 modules * diff --git a/board/bosch/acc/Makefile b/board/bosch/acc/Makefile index d425a677bc..d0fabbf55b 100644 --- a/board/bosch/acc/Makefile +++ b/board/bosch/acc/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2017 # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := acc.o diff --git a/board/bosch/acc/acc.c b/board/bosch/acc/acc.c index 34088adee4..d2c71a351b 100644 --- a/board/bosch/acc/acc.c +++ b/board/bosch/acc/acc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 DENX Software Engineering GmbH, Heiko Schocher <hs(a)denx.de> * Copyright (c) 2019 Bosch Thermotechnik GmbH diff --git a/board/bosch/guardian/Makefile b/board/bosch/guardian/Makefile index 20cecbfb64..b5cc921689 100644 --- a/board/bosch/guardian/Makefile +++ b/board/bosch/guardian/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c index c31e2c86a2..6e18f9e05b 100644 --- a/board/bosch/guardian/board.c +++ b/board/bosch/guardian/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/bosch/guardian/board.h b/board/bosch/guardian/board.h index b301caf47f..4300b9a626 100644 --- a/board/bosch/guardian/board.h +++ b/board/bosch/guardian/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/bosch/guardian/mux.c b/board/bosch/guardian/mux.c index 12c3eb666f..2a5c3ab511 100644 --- a/board/bosch/guardian/mux.c +++ b/board/bosch/guardian/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/bosch/shc/Makefile b/board/bosch/shc/Makefile index 93f2df3773..d2a3ad28ac 100644 --- a/board/bosch/shc/Makefile +++ b/board/bosch/shc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index e3a9c00e80..513efd9638 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/bosch/shc/board.h b/board/bosch/shc/board.h index 997595bf42..b0b09725bd 100644 --- a/board/bosch/shc/board.h +++ b/board/bosch/shc/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/bosch/shc/mux.c b/board/bosch/shc/mux.c index 0a97eafea6..054366ad7a 100644 --- a/board/bosch/shc/mux.c +++ b/board/bosch/shc/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg index c38c151472..213d2f2a76 100644 --- a/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg +++ b/board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg index f81d49106a..5a66d2fa38 100644 --- a/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg +++ b/board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg index cb04832c50..93681c5018 100644 --- a/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_2x128mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg index d85466f2fd..eb68454954 100644 --- a/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_2x256mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg index 417af64500..09bc88d1c5 100644 --- a/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_4x128mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg index 6f75ea2774..a01253f680 100644 --- a/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg +++ b/board/boundary/nitrogen6x/800mhz_4x256mx16.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices */ diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile index c8433bd748..12de541dcc 100644 --- a/board/boundary/nitrogen6x/Makefile +++ b/board/boundary/nitrogen6x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012-2013, Guennadi Liakhovetski <lg(a)denx.de> # (C) Copyright 2012-2013 Freescale Semiconductor, Inc. diff --git a/board/boundary/nitrogen6x/clocks.cfg b/board/boundary/nitrogen6x/clocks.cfg index d78e0fdbbd..5761446426 100644 --- a/board/boundary/nitrogen6x/clocks.cfg +++ b/board/boundary/nitrogen6x/clocks.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/ddr-setup.cfg b/board/boundary/nitrogen6x/ddr-setup.cfg index 99b449c294..3867182075 100644 --- a/board/boundary/nitrogen6x/ddr-setup.cfg +++ b/board/boundary/nitrogen6x/ddr-setup.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6dl.cfg b/board/boundary/nitrogen6x/nitrogen6dl.cfg index a57b16a767..ce9b7f479f 100644 --- a/board/boundary/nitrogen6x/nitrogen6dl.cfg +++ b/board/boundary/nitrogen6x/nitrogen6dl.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg index 7379b891a6..585ab6d384 100644 --- a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6q.cfg b/board/boundary/nitrogen6x/nitrogen6q.cfg index c7029ab034..ed98a483e5 100644 --- a/board/boundary/nitrogen6x/nitrogen6q.cfg +++ b/board/boundary/nitrogen6x/nitrogen6q.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6q2g.cfg b/board/boundary/nitrogen6x/nitrogen6q2g.cfg index 1d58cd4d13..cb3b594565 100644 --- a/board/boundary/nitrogen6x/nitrogen6q2g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6q2g.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6s.cfg b/board/boundary/nitrogen6x/nitrogen6s.cfg index b16d9447fa..946ac0d295 100644 --- a/board/boundary/nitrogen6x/nitrogen6s.cfg +++ b/board/boundary/nitrogen6x/nitrogen6s.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg index debec755d6..aa50128afa 100644 --- a/board/boundary/nitrogen6x/nitrogen6s1g.cfg +++ b/board/boundary/nitrogen6x/nitrogen6s1g.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 382c01ddf4..eea88aa508 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices <info(a)boundarydevices.com> diff --git a/board/broadcom/bcmbca/Kconfig b/board/broadcom/bcmbca/Kconfig index 5903a6a786..45fce39c5f 100644 --- a/board/broadcom/bcmbca/Kconfig +++ b/board/broadcom/bcmbca/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd # diff --git a/board/broadcom/bcmbca/Makefile b/board/broadcom/bcmbca/Makefile index 8f06c3111b..5d420ca187 100644 --- a/board/broadcom/bcmbca/Makefile +++ b/board/broadcom/bcmbca/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Broadcom Ltd diff --git a/board/broadcom/bcmbca/board.c b/board/broadcom/bcmbca/board.c index bcecb4d783..00d0f80f85 100644 --- a/board/broadcom/bcmbca/board.c +++ b/board/broadcom/bcmbca/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/board/broadcom/bcmns/ns.c b/board/broadcom/bcmns/ns.c index 1249e45af0..0482b89692 100644 --- a/board/broadcom/bcmns/ns.c +++ b/board/broadcom/bcmns/ns.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Broadcom Northstar generic board set-up code * Copyright (C) 2023 Linus Walleij <linus.walleij(a)linaro.org> diff --git a/board/broadcom/bcmns3/Makefile b/board/broadcom/bcmns3/Makefile index 3404260148..9fc2116634 100644 --- a/board/broadcom/bcmns3/Makefile +++ b/board/broadcom/bcmns3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 Broadcom. diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c index 7ae6742c4b..6eee4647bd 100644 --- a/board/broadcom/bcmns3/ns3.c +++ b/board/broadcom/bcmns3/ns3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Broadcom. * diff --git a/board/broadcom/bcmstb/Makefile b/board/broadcom/bcmstb/Makefile index 9609887760..602c1f2745 100644 --- a/board/broadcom/bcmstb/Makefile +++ b/board/broadcom/bcmstb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2018 Cisco Systems, Inc. # diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index aead6f099e..f0bebc3e6b 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Cisco Systems, Inc. * (C) Copyright 2019 Synamedia diff --git a/board/bsh/imx6ulz_smm_m2/Makefile b/board/bsh/imx6ulz_smm_m2/Makefile index b761bbb2f9..c9e9f65e48 100644 --- a/board/bsh/imx6ulz_smm_m2/Makefile +++ b/board/bsh/imx6ulz_smm_m2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2021 Amarula Solutions B.V. obj-y := imx6ulz_smm_m2.o diff --git a/board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c b/board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c index c82eabbfbe..c37bb2acc9 100644 --- a/board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c +++ b/board/bsh/imx6ulz_smm_m2/imx6ulz_smm_m2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2021 BSH Hausgeraete GmbH diff --git a/board/bsh/imx6ulz_smm_m2/spl.c b/board/bsh/imx6ulz_smm_m2/spl.c index 5b4812e129..669dc4c921 100644 --- a/board/bsh/imx6ulz_smm_m2/spl.c +++ b/board/bsh/imx6ulz_smm_m2/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cpu_func.h> diff --git a/board/bsh/imx8mn_smm_s2/Makefile b/board/bsh/imx8mn_smm_s2/Makefile index 19d37a723e..b993c710a3 100644 --- a/board/bsh/imx8mn_smm_s2/Makefile +++ b/board/bsh/imx8mn_smm_s2/Makefile @@ -1,7 +1,7 @@ # # Copyright 2021 Collabora Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mn_smm_s2.o diff --git a/board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c b/board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c index 0da641834d..ad486344f1 100644 --- a/board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c +++ b/board/bsh/imx8mn_smm_s2/ddr3l_timing_256m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c b/board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c index f845395ad9..2f4353456e 100644 --- a/board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c +++ b/board/bsh/imx8mn_smm_s2/ddr3l_timing_512m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c b/board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c index 0ebf208be8..99708774aa 100644 --- a/board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c +++ b/board/bsh/imx8mn_smm_s2/imx8mn_smm_s2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. */ diff --git a/board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg b/board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg index a0091cddfb..7da74d383e 100644 --- a/board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg +++ b/board/bsh/imx8mn_smm_s2/imximage-8mn-ddr3.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/board/bsh/imx8mn_smm_s2/spl.c b/board/bsh/imx8mn_smm_s2/spl.c index 5a77d28cb7..c655b5fe74 100644 --- a/board/bsh/imx8mn_smm_s2/spl.c +++ b/board/bsh/imx8mn_smm_s2/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * diff --git a/board/bticino/mamoj/Makefile b/board/bticino/mamoj/Makefile index f1ddda4891..e824f9c711 100644 --- a/board/bticino/mamoj/Makefile +++ b/board/bticino/mamoj/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 2018 BTicino # Copyright (C) 2017 Amarula Solutions B.V. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := mamoj.o diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c index c9da42b43b..0bb4a449ee 100644 --- a/board/bticino/mamoj/mamoj.c +++ b/board/bticino/mamoj/mamoj.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Simone CIANNI <simone.cianni(a)bticino.it> * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati(a)bticino.it> diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c index 883b7f4133..9fde555baf 100644 --- a/board/bticino/mamoj/spl.c +++ b/board/bticino/mamoj/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Simone CIANNI <simone.cianni(a)bticino.it> * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati(a)bticino.it> diff --git a/board/buffalo/lsxl/Makefile b/board/buffalo/lsxl/Makefile index 60babb0ded..f6065fcaa0 100644 --- a/board/buffalo/lsxl/Makefile +++ b/board/buffalo/lsxl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2012 Michael Walle # Michael Walle <michael(a)walle.cc> diff --git a/board/buffalo/lsxl/kwbimage-lschl.cfg b/board/buffalo/lsxl/kwbimage-lschl.cfg index 4493307d87..526d696cb5 100644 --- a/board/buffalo/lsxl/kwbimage-lschl.cfg +++ b/board/buffalo/lsxl/kwbimage-lschl.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2012 Michael Walle # Michael Walle <michael(a)walle.cc> diff --git a/board/buffalo/lsxl/kwbimage-lsxhl.cfg b/board/buffalo/lsxl/kwbimage-lsxhl.cfg index 4335a663c9..fb00659af6 100644 --- a/board/buffalo/lsxl/kwbimage-lsxhl.cfg +++ b/board/buffalo/lsxl/kwbimage-lsxhl.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2012 Michael Walle # Michael Walle <michael(a)walle.cc> diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index 6a866b5470..92b5132e32 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 Michael Walle * Michael Walle <michael(a)walle.cc> diff --git a/board/buffalo/lsxl/lsxl.h b/board/buffalo/lsxl/lsxl.h index 8ff3f2f3a9..01e7fc2903 100644 --- a/board/buffalo/lsxl/lsxl.h +++ b/board/buffalo/lsxl/lsxl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 Michael Walle * Michael Walle <michael(a)walle.cc> diff --git a/board/cadence/xtfpga/Makefile b/board/cadence/xtfpga/Makefile index 64bce9e6ba..74cf0f7ce5 100644 --- a/board/cadence/xtfpga/Makefile +++ b/board/cadence/xtfpga/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 - 2013, Tensilica Inc. diff --git a/board/cadence/xtfpga/xtfpga.c b/board/cadence/xtfpga/xtfpga.c index 8e4081b4c6..826b255d36 100644 --- a/board/cadence/xtfpga/xtfpga.c +++ b/board/cadence/xtfpga/xtfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 - 2013 Tensilica Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. diff --git a/board/calao/usb_a9263/Makefile b/board/calao/usb_a9263/Makefile index 2d8f1401a2..94632c5fba 100644 --- a/board/calao/usb_a9263/Makefile +++ b/board/calao/usb_a9263/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/calao/usb_a9263/usb_a9263.c b/board/calao/usb_a9263/usb_a9263.c index 3d31776d48..c325c61fd9 100644 --- a/board/calao/usb_a9263/usb_a9263.c +++ b/board/calao/usb_a9263/usb_a9263.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2013 * Stelian Pop <stelian.pop(a)leadtechdesign.com> diff --git a/board/cavium/thunderx/Makefile b/board/cavium/thunderx/Makefile index 4088c7678d..36127f9d95 100644 --- a/board/cavium/thunderx/Makefile +++ b/board/cavium/thunderx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2014, Cavium Inc. # # diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c index 37340fe970..d9e27e8dba 100644 --- a/board/cavium/thunderx/atf.c +++ b/board/cavium/thunderx/atf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/board/cavium/thunderx/thunderx.c b/board/cavium/thunderx/thunderx.c index ab20825ed3..a09ec1b349 100644 --- a/board/cavium/thunderx/thunderx.c +++ b/board/cavium/thunderx/thunderx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/board/cei/cei-tk1-som/Makefile b/board/cei/cei-tk1-som/Makefile index 127b1043a5..3349438c39 100644 --- a/board/cei/cei-tk1-som/Makefile +++ b/board/cei/cei-tk1-som/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2014 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ../../nvidia/venice2/as3722_init.o diff --git a/board/cei/cei-tk1-som/cei-tk1-som.c b/board/cei/cei-tk1-som/cei-tk1-som.c index 95ee7bbfe2..00fc34947d 100644 --- a/board/cei/cei-tk1-som/cei-tk1-som.c +++ b/board/cei/cei-tk1-som/cei-tk1-som.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/cei/cei-tk1-som/pinmux-config-cei-tk1-som.h b/board/cei/cei-tk1-som/pinmux-config-cei-tk1-som.h index eff52cf941..1ccb71bcaf 100644 --- a/board/cei/cei-tk1-som/pinmux-config-cei-tk1-som.h +++ b/board/cei/cei-tk1-som/pinmux-config-cei-tk1-som.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. */ diff --git a/board/chipspark/popmetal_rk3288/Makefile b/board/chipspark/popmetal_rk3288/Makefile index 86d66b0bfe..faacd3b56e 100644 --- a/board/chipspark/popmetal_rk3288/Makefile +++ b/board/chipspark/popmetal_rk3288/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += popmetal-rk3288.o diff --git a/board/chipspark/popmetal_rk3288/popmetal-rk3288.c b/board/chipspark/popmetal_rk3288/popmetal-rk3288.c index e6909b3b1c..a87c06b546 100644 --- a/board/chipspark/popmetal_rk3288/popmetal-rk3288.c +++ b/board/chipspark/popmetal_rk3288/popmetal-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/board/cloos/imx8mm_phg/Makefile b/board/cloos/imx8mm_phg/Makefile index 2b36931fcf..f471d3f7e7 100644 --- a/board/cloos/imx8mm_phg/Makefile +++ b/board/cloos/imx8mm_phg/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mm_phg.o diff --git a/board/cloos/imx8mm_phg/imx8mm_phg.c b/board/cloos/imx8mm_phg/imx8mm_phg.c index bc4e984d50..cbf5efa6a6 100644 --- a/board/cloos/imx8mm_phg/imx8mm_phg.c +++ b/board/cloos/imx8mm_phg/imx8mm_phg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/cloos/imx8mm_phg/imximage-8mm-lpddr4.cfg b/board/cloos/imx8mm_phg/imximage-8mm-lpddr4.cfg index 20061521f2..be26a8fb6d 100644 --- a/board/cloos/imx8mm_phg/imximage-8mm-lpddr4.cfg +++ b/board/cloos/imx8mm_phg/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/cloos/imx8mm_phg/spl.c b/board/cloos/imx8mm_phg/spl.c index 0c3a0135a8..6ca0b285f6 100644 --- a/board/cloos/imx8mm_phg/spl.c +++ b/board/cloos/imx8mm_phg/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/cloudengines/pogo_e02/Makefile b/board/cloudengines/pogo_e02/Makefile index f2d930e248..13474fea02 100644 --- a/board/cloudengines/pogo_e02/Makefile +++ b/board/cloudengines/pogo_e02/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/cloudengines/pogo_e02/kwbimage.cfg b/board/cloudengines/pogo_e02/kwbimage.cfg index 84cfa90c1f..088f8fa21f 100644 --- a/board/cloudengines/pogo_e02/kwbimage.cfg +++ b/board/cloudengines/pogo_e02/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 # David Purdy <david.c.purdy(a)gmail.com> diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c index 59e1218b41..7f0da88d4f 100644 --- a/board/cloudengines/pogo_e02/pogo_e02.c +++ b/board/cloudengines/pogo_e02/pogo_e02.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2012 diff --git a/board/cloudengines/pogo_v4/Kconfig b/board/cloudengines/pogo_v4/Kconfig index db3b76b4d4..48cafe400d 100644 --- a/board/cloudengines/pogo_v4/Kconfig +++ b/board/cloudengines/pogo_v4/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014-2021 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/cloudengines/pogo_v4/Makefile b/board/cloudengines/pogo_v4/Makefile index 511bf5ff7e..3dc2ae3781 100644 --- a/board/cloudengines/pogo_v4/Makefile +++ b/board/cloudengines/pogo_v4/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014-2021 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/cloudengines/pogo_v4/kwbimage.cfg b/board/cloudengines/pogo_v4/kwbimage.cfg index f6294fe313..92b6ff9342 100644 --- a/board/cloudengines/pogo_v4/kwbimage.cfg +++ b/board/cloudengines/pogo_v4/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 # David Purdy <david.c.purdy(a)gmail.com> diff --git a/board/cloudengines/pogo_v4/pogo_v4.c b/board/cloudengines/pogo_v4/pogo_v4.c index 61ce0d59c7..d82c0c7db5 100644 --- a/board/cloudengines/pogo_v4/pogo_v4.c +++ b/board/cloudengines/pogo_v4/pogo_v4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2022 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/board/cobra5272/Makefile b/board/cobra5272/Makefile index c6a9e48400..53111c87d9 100644 --- a/board/cobra5272/Makefile +++ b/board/cobra5272/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/cobra5272/cobra5272.c b/board/cobra5272/cobra5272.c index 69a9df9423..e277c8e3f8 100644 --- a/board/cobra5272/cobra5272.c +++ b/board/cobra5272/cobra5272.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c index 8416af163a..06248981bd 100644 --- a/board/cobra5272/flash.c +++ b/board/cobra5272/flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/compulab/cl-som-imx7/Makefile b/board/compulab/cl-som-imx7/Makefile index 8f0e068b7e..ea9b6fec63 100644 --- a/board/compulab/cl-som-imx7/Makefile +++ b/board/compulab/cl-som-imx7/Makefile @@ -5,7 +5,7 @@ # # Author: Uri Mashiach <uri.mashiach(a)compulab.co.il> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := mux.o common.o diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c index af19a658b5..d518ab959b 100644 --- a/board/compulab/cl-som-imx7/cl-som-imx7.c +++ b/board/compulab/cl-som-imx7/cl-som-imx7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot board functions for CompuLab CL-SOM-iMX7 module * diff --git a/board/compulab/cl-som-imx7/common.c b/board/compulab/cl-som-imx7/common.c index 40ba0f7a96..f99e911ff9 100644 --- a/board/compulab/cl-som-imx7/common.c +++ b/board/compulab/cl-som-imx7/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPL/U-Boot common functions for CompuLab CL-SOM-iMX7 module * diff --git a/board/compulab/cl-som-imx7/common.h b/board/compulab/cl-som-imx7/common.h index bc19867f87..d9899674c2 100644 --- a/board/compulab/cl-som-imx7/common.h +++ b/board/compulab/cl-som-imx7/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SPL/U-Boot common header file for CompuLab CL-SOM-iMX7 module * diff --git a/board/compulab/cl-som-imx7/mux.c b/board/compulab/cl-som-imx7/mux.c index 18f16a4873..fd5df37b36 100644 --- a/board/compulab/cl-som-imx7/mux.c +++ b/board/compulab/cl-som-imx7/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPL/U-Boot mux functions for CompuLab CL-SOM-iMX7 module * diff --git a/board/compulab/cl-som-imx7/spl.c b/board/compulab/cl-som-imx7/spl.c index 98c3b831f1..b0aa5be715 100644 --- a/board/compulab/cl-som-imx7/spl.c +++ b/board/compulab/cl-som-imx7/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPL board functions for CompuLab CL-SOM-iMX7 module * diff --git a/board/compulab/cm_fx6/Makefile b/board/compulab/cm_fx6/Makefile index e648db26a1..343c0ffccd 100644 --- a/board/compulab/cm_fx6/Makefile +++ b/board/compulab/cm_fx6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> # diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 7bce09e432..379bbe004d 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for Compulab CM-FX6 board * diff --git a/board/compulab/cm_fx6/common.c b/board/compulab/cm_fx6/common.c index ed8c7a3bf5..e77a804f05 100644 --- a/board/compulab/cm_fx6/common.c +++ b/board/compulab/cm_fx6/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Code used by both U-Boot and SPL for Compulab CM-FX6 * diff --git a/board/compulab/cm_fx6/common.h b/board/compulab/cm_fx6/common.h index debef15880..062e47d99e 100644 --- a/board/compulab/cm_fx6/common.h +++ b/board/compulab/cm_fx6/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ * diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index 079f196200..cdcf2c4092 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPL specific code for Compulab CM-FX6 board * diff --git a/board/compulab/cm_t43/Makefile b/board/compulab/cm_t43/Makefile index 6fa231a045..535743e46a 100644 --- a/board/compulab/cm_t43/Makefile +++ b/board/compulab/cm_t43/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/compulab/cm_t43/board.h b/board/compulab/cm_t43/board.h index fcacd2bc0f..b0df57f845 100644 --- a/board/compulab/cm_t43/board.h +++ b/board/compulab/cm_t43/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Compulab, Ltd. */ diff --git a/board/compulab/cm_t43/cm_t43.c b/board/compulab/cm_t43/cm_t43.c index 5df378a62e..bab9d85679 100644 --- a/board/compulab/cm_t43/cm_t43.c +++ b/board/compulab/cm_t43/cm_t43.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Compulab, Ltd. */ diff --git a/board/compulab/cm_t43/mux.c b/board/compulab/cm_t43/mux.c index 778ea05e84..f2d7bedf37 100644 --- a/board/compulab/cm_t43/mux.c +++ b/board/compulab/cm_t43/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Compulab, Ltd. */ diff --git a/board/compulab/cm_t43/spl.c b/board/compulab/cm_t43/spl.c index a6223a477f..ff7a2fa567 100644 --- a/board/compulab/cm_t43/spl.c +++ b/board/compulab/cm_t43/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Compulab, Ltd. */ diff --git a/board/compulab/common/Makefile b/board/compulab/common/Makefile index 7c8226e6e1..2f28fb73d8 100644 --- a/board/compulab/common/Makefile +++ b/board/compulab/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il> # diff --git a/board/compulab/common/common.c b/board/compulab/common/common.c index 528c97df19..ca7cb93578 100644 --- a/board/compulab/common/common.c +++ b/board/compulab/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/board/compulab/common/common.h b/board/compulab/common/common.h index 17cfbb6f27..cbd8f521d2 100644 --- a/board/compulab/common/common.h +++ b/board/compulab/common/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index c4b257f851..12c3cca373 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h index 9bd7604a99..5d1d3ef46c 100644 --- a/board/compulab/common/eeprom.h +++ b/board/compulab/common/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/board/compulab/common/omap3_smc911x.c b/board/compulab/common/omap3_smc911x.c index f0d365272c..d7562aedc0 100644 --- a/board/compulab/common/omap3_smc911x.c +++ b/board/compulab/common/omap3_smc911x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/board/compulab/imx8mm-cl-iot-gate/Makefile b/board/compulab/imx8mm-cl-iot-gate/Makefile index 3800b21a6f..d65de240af 100644 --- a/board/compulab/imx8mm-cl-iot-gate/Makefile +++ b/board/compulab/imx8mm-cl-iot-gate/Makefile @@ -2,7 +2,7 @@ # Copyright 2018 NXP # Copyright 2020 Linaro # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mm-cl-iot-gate.o diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c index b230478b61..bc3d5220d2 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * Copyright 2020 Linaro diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h index 508b4a565c..d99bf22ab2 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * Copyright 2020 Linaro diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c index 9019a1f203..0f2231e97d 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.1_2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c index 5141c04f12..86cb26fba7 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_01061010.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c index 2334722497..a123d5a201 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff000110.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c index e65445e015..ee047fc5fa 100644 --- a/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c +++ b/board/compulab/imx8mm-cl-iot-gate/ddr/lpddr4_timing_ff020008.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c b/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c index 90cc33a6e4..230f3a3694 100644 --- a/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/eeprom_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* (C) Copyright 2019 CompuLab, Ltd. <www.compulab.co.il> */ #include <common.h> diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c index af070ec315..e3952fff64 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * Copyright 2020 Linaro diff --git a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg index f9ce7f89d7..ca87cbbd38 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg +++ b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c index 19c1acd8a5..5bd9cb77af 100644 --- a/board/compulab/imx8mm-cl-iot-gate/spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * Copyright 2020 Linaro diff --git a/board/compulab/trimslice/Makefile b/board/compulab/trimslice/Makefile index abdf471910..9a659359bf 100644 --- a/board/compulab/trimslice/Makefile +++ b/board/compulab/trimslice/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c index 21ff0cda7f..766632d857 100644 --- a/board/compulab/trimslice/trimslice.c +++ b/board/compulab/trimslice/trimslice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/congatec/Kconfig b/board/congatec/Kconfig index e9fa153755..f24d1a9d2c 100644 --- a/board/congatec/Kconfig +++ b/board/congatec/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/congatec/cgtqmx8/Makefile b/board/congatec/cgtqmx8/Makefile index 4b59dbb6bc..e22f0156fa 100644 --- a/board/congatec/cgtqmx8/Makefile +++ b/board/congatec/cgtqmx8/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += cgtqmx8.o diff --git a/board/congatec/cgtqmx8/cgtqmx8.c b/board/congatec/cgtqmx8/cgtqmx8.c index 26189ff66f..4dbf815242 100644 --- a/board/congatec/cgtqmx8/cgtqmx8.c +++ b/board/congatec/cgtqmx8/cgtqmx8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 congatec AG * Copyright (C) 2019 Oliver Graute <oliver.graute(a)kococonnector.com> diff --git a/board/congatec/cgtqmx8/imximage.cfg b/board/congatec/cgtqmx8/imximage.cfg index 43035088e3..90ced5712e 100644 --- a/board/congatec/cgtqmx8/imximage.cfg +++ b/board/congatec/cgtqmx8/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/board/congatec/cgtqmx8/spl.c b/board/congatec/cgtqmx8/spl.c index b432ce2745..feda185a29 100644 --- a/board/congatec/cgtqmx8/spl.c +++ b/board/congatec/cgtqmx8/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/congatec/common/Makefile b/board/congatec/common/Makefile index 2db0fc1ae5..80c9047c0b 100644 --- a/board/congatec/common/Makefile +++ b/board/congatec/common/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # MINIMAL= diff --git a/board/congatec/common/mmc.c b/board/congatec/common/mmc.c index bb7a3d4a9a..c304422df1 100644 --- a/board/congatec/common/mmc.c +++ b/board/congatec/common/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2018 NXP diff --git a/board/congatec/conga-qeval20-qa3-e3845/Makefile b/board/congatec/conga-qeval20-qa3-e3845/Makefile index 215f5680dc..13a6091edd 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Makefile +++ b/board/congatec/conga-qeval20-qa3-e3845/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Google, Inc diff --git a/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl b/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl index 856960d5e2..64eb51550b 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl +++ b/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c index 315b6dc542..877ba23f7f 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl b/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl +++ b/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/coreboot/Kconfig b/board/coreboot/Kconfig index 05a72d3c55..843a655eb7 100644 --- a/board/coreboot/Kconfig +++ b/board/coreboot/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/coreboot/coreboot/Makefile b/board/coreboot/coreboot/Makefile index d292b7032c..ea909c93a2 100644 --- a/board/coreboot/coreboot/Makefile +++ b/board/coreboot/coreboot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # (C) Copyright 2008 diff --git a/board/coreboot/coreboot/coreboot.c b/board/coreboot/coreboot/coreboot.c index db855c11ae..75998c11e8 100644 --- a/board/coreboot/coreboot/coreboot.c +++ b/board/coreboot/coreboot/coreboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/coreboot/coreboot/coreboot.env b/board/coreboot/coreboot/coreboot.env index 0f5bb6fb62..c06966b014 100644 --- a/board/coreboot/coreboot/coreboot.env +++ b/board/coreboot/coreboot/coreboot.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/cortina/presidio-asic/Makefile b/board/cortina/presidio-asic/Makefile index d167a157ff..7b70941ab1 100644 --- a/board/cortina/presidio-asic/Makefile +++ b/board/cortina/presidio-asic/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 Cortina-Access.Inc. # diff --git a/board/cortina/presidio-asic/lowlevel_init.S b/board/cortina/presidio-asic/lowlevel_init.S index 220ec79e87..923b40159e 100644 --- a/board/cortina/presidio-asic/lowlevel_init.S +++ b/board/cortina/presidio-asic/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Cortina-Access * diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c index fdfa3affc3..2ea56a580b 100644 --- a/board/cortina/presidio-asic/presidio.c +++ b/board/cortina/presidio-asic/presidio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 - Cortina Access Inc. * diff --git a/board/cssi/cmpc885/Makefile b/board/cssi/cmpc885/Makefile index baf9e5ab4f..594e6ec794 100644 --- a/board/cssi/cmpc885/Makefile +++ b/board/cssi/cmpc885/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010-2020 CS Group # Charles Frey <charles.frey(a)c-s.fr> diff --git a/board/cssi/cmpc885/cmpc885.c b/board/cssi/cmpc885/cmpc885.c index 5e6aa8b8cf..ef1851972d 100644 --- a/board/cssi/cmpc885/cmpc885.c +++ b/board/cssi/cmpc885/cmpc885.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2020 CS Group * Charles Frey <charles.frey(a)c-s.fr> diff --git a/board/cssi/cmpc885/nand.c b/board/cssi/cmpc885/nand.c index 38100046df..73db97a31d 100644 --- a/board/cssi/cmpc885/nand.c +++ b/board/cssi/cmpc885/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2020 CS Group * Florent Trinh Thai <florent.trinh-thai(a)c-s.fr> diff --git a/board/cssi/cmpc885/sdram.c b/board/cssi/cmpc885/sdram.c index 7349b85ed2..e6009444a2 100644 --- a/board/cssi/cmpc885/sdram.c +++ b/board/cssi/cmpc885/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 CS Group * Charles Frey <charles.frey(a)c-s.fr> diff --git a/board/cssi/cmpc885/u-boot.lds b/board/cssi/cmpc885/u-boot.lds index 53f616fcfe..b9b674997c 100644 --- a/board/cssi/cmpc885/u-boot.lds +++ b/board/cssi/cmpc885/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010-2020 CS Group * Christophe Leroy <christophe.leroy(a)c-s.fr> diff --git a/board/cssi/cmpcpro/Makefile b/board/cssi/cmpcpro/Makefile index 73ff451ea1..6579d1cbf6 100644 --- a/board/cssi/cmpcpro/Makefile +++ b/board/cssi/cmpcpro/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += cmpcpro.o nand.o ../common/common.o diff --git a/board/cssi/cmpcpro/cmpcpro.c b/board/cssi/cmpcpro/cmpcpro.c index 8a30c48e35..ebf28dc1ee 100644 --- a/board/cssi/cmpcpro/cmpcpro.c +++ b/board/cssi/cmpcpro/cmpcpro.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006-2023 CS GROUP France */ diff --git a/board/cssi/cmpcpro/nand.c b/board/cssi/cmpcpro/nand.c index d8b4197314..a9435a25cc 100644 --- a/board/cssi/cmpcpro/nand.c +++ b/board/cssi/cmpcpro/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2023 CS GROUP France * Florent TRINH THAI (florent.trinh-thai(a)csgroup.eu) diff --git a/board/cssi/common/common.c b/board/cssi/common/common.c index 7ecf772620..d3a33e7c2f 100644 --- a/board/cssi/common/common.c +++ b/board/cssi/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2020 CS Group * Charles Frey <charles.frey(a)c-s.fr> diff --git a/board/cssi/common/common.h b/board/cssi/common/common.h index c5ecb038c9..0bd9d55e25 100644 --- a/board/cssi/common/common.h +++ b/board/cssi/common/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _BOARD_CSSI_COMMON_H #define _BOARD_CSSI_COMMON_H diff --git a/board/cssi/mcr3000/Makefile b/board/cssi/mcr3000/Makefile index 7803016af3..7f96692b4e 100644 --- a/board/cssi/mcr3000/Makefile +++ b/board/cssi/mcr3000/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010-2017 CS Systemes d'Information # Christophe Leroy <christophe.leroy(a)c-s.fr> diff --git a/board/cssi/mcr3000/mcr3000.c b/board/cssi/mcr3000/mcr3000.c index 3514f67490..8bae4cbbf4 100644 --- a/board/cssi/mcr3000/mcr3000.c +++ b/board/cssi/mcr3000/mcr3000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2017 CS Systemes d'Information * Florent Trinh Thai <florent.trinh-thai(a)c-s.fr> diff --git a/board/cssi/mcr3000/mcr3000.env b/board/cssi/mcr3000/mcr3000.env index 372ab09094..1d5621584b 100644 --- a/board/cssi/mcr3000/mcr3000.env +++ b/board/cssi/mcr3000/mcr3000.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ sdram_type=SDRAM flash_type=AM29LV160DB diff --git a/board/cssi/mcr3000/nand.c b/board/cssi/mcr3000/nand.c index 11aca4ff73..b07d693605 100644 --- a/board/cssi/mcr3000/nand.c +++ b/board/cssi/mcr3000/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2017 CS Systemes d'Information * Florent Trinh Thai <florent.trinh-thai(a)c-s.fr> diff --git a/board/cssi/mcr3000/u-boot.lds b/board/cssi/mcr3000/u-boot.lds index 24b535e724..ccb4e7a196 100644 --- a/board/cssi/mcr3000/u-boot.lds +++ b/board/cssi/mcr3000/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010-2017 CS Systemes d'Information * Christophe Leroy <christophe.leroy(a)c-s.fr> diff --git a/board/d-link/dns325/Makefile b/board/d-link/dns325/Makefile index e78f6d9c33..0e7bf767e1 100644 --- a/board/d-link/dns325/Makefile +++ b/board/d-link/dns325/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 # Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c index 8ebfe4c601..dae36b55a9 100644 --- a/board/d-link/dns325/dns325.c +++ b/board/d-link/dns325/dns325.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> diff --git a/board/d-link/dns325/dns325.h b/board/d-link/dns325/dns325.h index 62ced6814e..35812372e8 100644 --- a/board/d-link/dns325/dns325.h +++ b/board/d-link/dns325/dns325.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> diff --git a/board/d-link/dns325/kwbimage.cfg b/board/d-link/dns325/kwbimage.cfg index dc2a34513e..3498eee186 100644 --- a/board/d-link/dns325/kwbimage.cfg +++ b/board/d-link/dns325/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 # Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> diff --git a/board/data_modul/common/common.c b/board/data_modul/common/common.c index bf9a11472d..c639e2c37d 100644 --- a/board/data_modul/common/common.c +++ b/board/data_modul/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/common/common.h b/board/data_modul/common/common.h index 4f6b2bc17d..66bd1abd6b 100644 --- a/board/data_modul/common/common.h +++ b/board/data_modul/common/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mm_edm_sbc/Makefile b/board/data_modul/imx8mm_edm_sbc/Makefile index 6d72e930fc..d7f320700a 100644 --- a/board/data_modul/imx8mm_edm_sbc/Makefile +++ b/board/data_modul/imx8mm_edm_sbc/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2022 Marek Vasut <marex(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c b/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c index ff89333b73..b3bfbead6f 100644 --- a/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c +++ b/board/data_modul/imx8mm_edm_sbc/imx8mm_data_modul_edm_sbc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mm_edm_sbc/imximage.cfg b/board/data_modul/imx8mm_edm_sbc/imximage.cfg index fa0b618128..d8bce7adc6 100644 --- a/board/data_modul/imx8mm_edm_sbc/imximage.cfg +++ b/board/data_modul/imx8mm_edm_sbc/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h index 8b5368a104..8830c05fbd 100644 --- a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h +++ b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_2G_32.c b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_2G_32.c index f40fd48fc4..4015661219 100644 --- a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_2G_32.c +++ b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_2G_32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_4G_32.c b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_4G_32.c index 0e5be8efd0..5dcf25fc40 100644 --- a/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_4G_32.c +++ b/board/data_modul/imx8mm_edm_sbc/lpddr4_timing_4G_32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/data_modul/imx8mm_edm_sbc/spl.c b/board/data_modul/imx8mm_edm_sbc/spl.c index 4a9c62fb86..66eca59e77 100644 --- a/board/data_modul/imx8mm_edm_sbc/spl.c +++ b/board/data_modul/imx8mm_edm_sbc/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mp_edm_sbc/Makefile b/board/data_modul/imx8mp_edm_sbc/Makefile index 28c1d62f2b..c0db2cc35f 100644 --- a/board/data_modul/imx8mp_edm_sbc/Makefile +++ b/board/data_modul/imx8mp_edm_sbc/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2022 Marek Vasut <marex(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c b/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c index 9fbbbc1b77..bbfd91af2e 100644 --- a/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c +++ b/board/data_modul/imx8mp_edm_sbc/imx8mp_data_modul_edm_sbc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mp_edm_sbc/imximage.cfg b/board/data_modul/imx8mp_edm_sbc/imximage.cfg index 8aadedb102..f2971bc99d 100644 --- a/board/data_modul/imx8mp_edm_sbc/imximage.cfg +++ b/board/data_modul/imx8mp_edm_sbc/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/data_modul/imx8mp_edm_sbc/lpddr4_timing.h b/board/data_modul/imx8mp_edm_sbc/lpddr4_timing.h index 24569d5931..cb7de169ce 100644 --- a/board/data_modul/imx8mp_edm_sbc/lpddr4_timing.h +++ b/board/data_modul/imx8mp_edm_sbc/lpddr4_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/data_modul/imx8mp_edm_sbc/lpddr4_timing_4G_32.c b/board/data_modul/imx8mp_edm_sbc/lpddr4_timing_4G_32.c index 04cef3a8b9..37e578f3b7 100644 --- a/board/data_modul/imx8mp_edm_sbc/lpddr4_timing_4G_32.c +++ b/board/data_modul/imx8mp_edm_sbc/lpddr4_timing_4G_32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/data_modul/imx8mp_edm_sbc/spl.c b/board/data_modul/imx8mp_edm_sbc/spl.c index 2fdd95a730..7c856a3171 100644 --- a/board/data_modul/imx8mp_edm_sbc/spl.c +++ b/board/data_modul/imx8mp_edm_sbc/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/davinci/da8xxevm/Makefile b/board/davinci/da8xxevm/Makefile index fe043d517f..0100ee2c02 100644 --- a/board/davinci/da8xxevm/Makefile +++ b/board/davinci/da8xxevm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 474dca7292..d7a15f5b52 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ * diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 5ffd420fff..25e99a966b 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ * diff --git a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds index 7e0f09f3b5..603703707e 100644 --- a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds +++ b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/board/dfi/Kconfig b/board/dfi/Kconfig index 267ac50a3d..bcaf4c4e3d 100644 --- a/board/dfi/Kconfig +++ b/board/dfi/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/dfi/dfi-bt700/Makefile b/board/dfi/dfi-bt700/Makefile index 1c4329a058..efb7c1e0fd 100644 --- a/board/dfi/dfi-bt700/Makefile +++ b/board/dfi/dfi-bt700/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Google, Inc diff --git a/board/dfi/dfi-bt700/acpi/mainboard.asl b/board/dfi/dfi-bt700/acpi/mainboard.asl index 4863fbf6d9..d7e3bee636 100644 --- a/board/dfi/dfi-bt700/acpi/mainboard.asl +++ b/board/dfi/dfi-bt700/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c index 87506a77a1..798aa332b9 100644 --- a/board/dfi/dfi-bt700/dfi-bt700.c +++ b/board/dfi/dfi-bt700/dfi-bt700.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/dfi/dfi-bt700/dsdt.asl b/board/dfi/dfi-bt700/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/dfi/dfi-bt700/dsdt.asl +++ b/board/dfi/dfi-bt700/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/dhelectronics/common/Makefile b/board/dhelectronics/common/Makefile index a472ea8d51..d55458e8c3 100644 --- a/board/dhelectronics/common/Makefile +++ b/board/dhelectronics/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2022 DENX Software Engineering GmbH, Philip Oberfichtner <pro(a)denx.de> # diff --git a/board/dhelectronics/common/dh_common.c b/board/dhelectronics/common/dh_common.c index 67e3d59b1f..75e2e4bd00 100644 --- a/board/dhelectronics/common/dh_common.c +++ b/board/dhelectronics/common/dh_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> * Copyright 2022 DENX Software Engineering GmbH, Philip Oberfichtner <pro(a)denx.de> diff --git a/board/dhelectronics/common/dh_common.h b/board/dhelectronics/common/dh_common.h index 2b24637d96..e5c70c8c63 100644 --- a/board/dhelectronics/common/dh_common.h +++ b/board/dhelectronics/common/dh_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright 2022 DENX Software Engineering GmbH, Philip Oberfichtner <pro(a)denx.de> */ diff --git a/board/dhelectronics/common/dh_imx.c b/board/dhelectronics/common/dh_imx.c index 7f451bad59..ad93a74f01 100644 --- a/board/dhelectronics/common/dh_imx.c +++ b/board/dhelectronics/common/dh_imx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> * Copyright 2022 DENX Software Engineering GmbH, Philip Oberfichtner <pro(a)denx.de> diff --git a/board/dhelectronics/common/dh_imx.h b/board/dhelectronics/common/dh_imx.h index 284f8637fb..d8ccd4f713 100644 --- a/board/dhelectronics/common/dh_imx.h +++ b/board/dhelectronics/common/dh_imx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright 2022 DENX Software Engineering GmbH, Philip Oberfichtner <pro(a)denx.de> */ diff --git a/board/dhelectronics/dh_imx6/Makefile b/board/dhelectronics/dh_imx6/Makefile index 70ca30d397..d5213eaa8b 100644 --- a/board/dhelectronics/dh_imx6/Makefile +++ b/board/dhelectronics/dh_imx6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Marek Vasut <marex(a)denx.de> diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 07fc9b1fe6..935946ad13 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DHCOM DH-iMX6 PDK board support * diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c index e6d5657c62..ab02ceee1a 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DHCOM DH-iMX6 PDK SPL support * diff --git a/board/dhelectronics/dh_imx8mp/Makefile b/board/dhelectronics/dh_imx8mp/Makefile index e5a29fdd12..daa8a6e07d 100644 --- a/board/dhelectronics/dh_imx8mp/Makefile +++ b/board/dhelectronics/dh_imx8mp/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2022 Marek Vasut <marex(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/dhelectronics/dh_imx8mp/common.c b/board/dhelectronics/dh_imx8mp/common.c index 44456da681..9e63cd6681 100644 --- a/board/dhelectronics/dh_imx8mp/common.c +++ b/board/dhelectronics/dh_imx8mp/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c index 5edb85e1de..d8967ef226 100644 --- a/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c +++ b/board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/dhelectronics/dh_imx8mp/imximage-lpddr4.cfg b/board/dhelectronics/dh_imx8mp/imximage-lpddr4.cfg index 8aadedb102..f2971bc99d 100644 --- a/board/dhelectronics/dh_imx8mp/imximage-lpddr4.cfg +++ b/board/dhelectronics/dh_imx8mp/imximage-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/dhelectronics/dh_imx8mp/lpddr4_timing.h b/board/dhelectronics/dh_imx8mp/lpddr4_timing.h index 7894da3b91..14584eac8c 100644 --- a/board/dhelectronics/dh_imx8mp/lpddr4_timing.h +++ b/board/dhelectronics/dh_imx8mp/lpddr4_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c b/board/dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c index 51b8c4cf7b..861eae139d 100644 --- a/board/dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c +++ b/board/dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> * diff --git a/board/dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c b/board/dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c index a4c1b121c2..0b1e16c399 100644 --- a/board/dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c +++ b/board/dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> * diff --git a/board/dhelectronics/dh_imx8mp/spl.c b/board/dhelectronics/dh_imx8mp/spl.c index 1b05da53c3..d16af513d1 100644 --- a/board/dhelectronics/dh_imx8mp/spl.c +++ b/board/dhelectronics/dh_imx8mp/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/dhelectronics/dh_stm32mp1/Makefile b/board/dhelectronics/dh_stm32mp1/Makefile index 30db1dee80..4b67641bf8 100644 --- a/board/dhelectronics/dh_stm32mp1/Makefile +++ b/board/dhelectronics/dh_stm32mp1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index d1f662d970..04ba733fb5 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/board/ea/ea-lpc3250devkitv2/Makefile b/board/ea/ea-lpc3250devkitv2/Makefile index a4a40b6d4f..485640e49f 100644 --- a/board/ea/ea-lpc3250devkitv2/Makefile +++ b/board/ea/ea-lpc3250devkitv2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021 Trevor Woerner <twoerner(a)gmail.com> obj-y += ea-lpc3250devkitv2.o diff --git a/board/ea/ea-lpc3250devkitv2/README.rst b/board/ea/ea-lpc3250devkitv2/README.rst index 1b78000331..b6aa9f7778 100644 --- a/board/ea/ea-lpc3250devkitv2/README.rst +++ b/board/ea/ea-lpc3250devkitv2/README.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ToC: - Introduction diff --git a/board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c b/board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c index 2b03e4891d..89e475644f 100644 --- a/board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c +++ b/board/ea/ea-lpc3250devkitv2/ea-lpc3250devkitv2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for Embedded Artists LPC3250 DevKit v2 * Copyright (C) 2021 Trevor Woerner <twoerner(a)gmail.com> diff --git a/board/ea/mx7ulp_com/Makefile b/board/ea/mx7ulp_com/Makefile index b3b230b172..3f10e7fcc7 100644 --- a/board/ea/mx7ulp_com/Makefile +++ b/board/ea/mx7ulp_com/Makefile @@ -1,6 +1,6 @@ # (C) Copyright 2016 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := mx7ulp_com.o diff --git a/board/ea/mx7ulp_com/imximage.cfg b/board/ea/mx7ulp_com/imximage.cfg index 1731da814d..9720603538 100644 --- a/board/ea/mx7ulp_com/imximage.cfg +++ b/board/ea/mx7ulp_com/imximage.cfg @@ -1,7 +1,7 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Refer docs/README.imxmage for more details about how-to configure * and create imximage boot image diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c index cd9591a9e3..75eb51b1fc 100644 --- a/board/ea/mx7ulp_com/mx7ulp_com.c +++ b/board/ea/mx7ulp_com/mx7ulp_com.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/eets/pdu001/Kconfig b/board/eets/pdu001/Kconfig index e64ae28875..754c251304 100644 --- a/board/eets/pdu001/Kconfig +++ b/board/eets/pdu001/Kconfig @@ -1,6 +1,6 @@ # Copyright (C) 2018 EETS GmbH - http://www.eets.ch/ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # if TARGET_PDU001 diff --git a/board/eets/pdu001/Makefile b/board/eets/pdu001/Makefile index 35ea3978fe..2ca777853c 100644 --- a/board/eets/pdu001/Makefile +++ b/board/eets/pdu001/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2018 EETS GmbH - http://www.eets.ch/ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := board.o mux.o diff --git a/board/eets/pdu001/README b/board/eets/pdu001/README index 50e715446b..3592d5cbc7 100644 --- a/board/eets/pdu001/README +++ b/board/eets/pdu001/README @@ -1,6 +1,6 @@ # Copyright (C) 2018 EETS GmbH - http://www.eets.ch/ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Summary diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c index de224d4d28..c10109a7d0 100644 --- a/board/eets/pdu001/board.c +++ b/board/eets/pdu001/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/eets/pdu001/board.h b/board/eets/pdu001/board.h index bfea96e5f0..7299503a9a 100644 --- a/board/eets/pdu001/board.h +++ b/board/eets/pdu001/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/eets/pdu001/mux.c b/board/eets/pdu001/mux.c index 886fef60b0..0b7fc5433a 100644 --- a/board/eets/pdu001/mux.c +++ b/board/eets/pdu001/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/efi/efi-x86_app/efi-x86_app.env b/board/efi/efi-x86_app/efi-x86_app.env index 106836af1f..a39fed0a86 100644 --- a/board/efi/efi-x86_app/efi-x86_app.env +++ b/board/efi/efi-x86_app/efi-x86_app.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/board/efi/efi-x86_payload/Makefile b/board/efi/efi-x86_payload/Makefile index a4ebc85aa5..0c0bd856af 100644 --- a/board/efi/efi-x86_payload/Makefile +++ b/board/efi/efi-x86_payload/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/efi/efi-x86_payload/efi-x86_payload.env b/board/efi/efi-x86_payload/efi-x86_payload.env index 6a65628706..4bfd27411a 100644 --- a/board/efi/efi-x86_payload/efi-x86_payload.env +++ b/board/efi/efi-x86_payload/efi-x86_payload.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/efi/efi-x86_payload/payload.c b/board/efi/efi-x86_payload/payload.c index 5d4492cdc7..cf28f9cbcf 100644 --- a/board/efi/efi-x86_payload/payload.c +++ b/board/efi/efi-x86_payload/payload.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/egnite/ethernut5/Makefile b/board/egnite/ethernut5/Makefile index 580f440564..9227e03ef0 100644 --- a/board/egnite/ethernut5/Makefile +++ b/board/egnite/ethernut5/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c index 9953df017e..b93b115108 100644 --- a/board/egnite/ethernut5/ethernut5.c +++ b/board/egnite/ethernut5/ethernut5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * egnite GmbH <info(a)egnite.de> diff --git a/board/egnite/ethernut5/ethernut5_pwrman.c b/board/egnite/ethernut5/ethernut5_pwrman.c index 81f1abf2fa..decc0211af 100644 --- a/board/egnite/ethernut5/ethernut5_pwrman.c +++ b/board/egnite/ethernut5/ethernut5_pwrman.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * egnite GmbH <info(a)egnite.de> diff --git a/board/egnite/ethernut5/ethernut5_pwrman.h b/board/egnite/ethernut5/ethernut5_pwrman.h index 103f558328..c0e13ea413 100644 --- a/board/egnite/ethernut5/ethernut5_pwrman.h +++ b/board/egnite/ethernut5/ethernut5_pwrman.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * egnite GmbH <info(a)egnite.de> diff --git a/board/elgin/elgin_rv1108/Makefile b/board/elgin/elgin_rv1108/Makefile index 382218006a..cf617e153c 100644 --- a/board/elgin/elgin_rv1108/Makefile +++ b/board/elgin/elgin_rv1108/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += elgin_rv1108.o diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index eb7a322d84..b60293bf51 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C)Copyright 2016 Rockchip Electronics Co., Ltd * Authors: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/board/embest/mx6boards/Makefile b/board/embest/mx6boards/Makefile index a032a3df9f..d06b0cd112 100644 --- a/board/embest/mx6boards/Makefile +++ b/board/embest/mx6boards/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c index a3c23bdfb6..8d0832d87b 100644 --- a/board/embest/mx6boards/mx6boards.c +++ b/board/embest/mx6boards/mx6boards.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Eukréa Electromatique * Author: Eric Bénard <eric(a)eukrea.com> diff --git a/board/emulation/Kconfig b/board/emulation/Kconfig index f821458fa6..b75b1f1f10 100644 --- a/board/emulation/Kconfig +++ b/board/emulation/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/emulation/common/Makefile b/board/emulation/common/Makefile index c5b452e7e3..ef5fa47297 100644 --- a/board/emulation/common/Makefile +++ b/board/emulation/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += qemu_mtdparts.o obj-$(CONFIG_SET_DFU_ALT_INFO) += qemu_dfu.o diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c index 7e7d84f6c0..78a3d842c4 100644 --- a/board/emulation/common/qemu_dfu.c +++ b/board/emulation/common/qemu_dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Linaro Limited */ diff --git a/board/emulation/common/qemu_mtdparts.c b/board/emulation/common/qemu_mtdparts.c index 60212e97ac..212c1546cd 100644 --- a/board/emulation/common/qemu_mtdparts.c +++ b/board/emulation/common/qemu_mtdparts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Linaro Limited */ diff --git a/board/emulation/qemu-arm/Makefile b/board/emulation/qemu-arm/Makefile index a22d1237ff..5098912f22 100644 --- a/board/emulation/qemu-arm/Makefile +++ b/board/emulation/qemu-arm/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += qemu-arm.o diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index 942f1fff57..ef40ee152e 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Tuomas Tynkkynen */ diff --git a/board/emulation/qemu-arm/qemu-arm.env b/board/emulation/qemu-arm/qemu-arm.env index fb4adef281..2a7569996e 100644 --- a/board/emulation/qemu-arm/qemu-arm.env +++ b/board/emulation/qemu-arm/qemu-arm.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* environment for qemu-arm and qemu-arm64 */ diff --git a/board/emulation/qemu-ppce500/Makefile b/board/emulation/qemu-ppce500/Makefile index 817d06d845..ea80f940b6 100644 --- a/board/emulation/qemu-ppce500/Makefile +++ b/board/emulation/qemu-ppce500/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2007 Freescale Semiconductor, Inc. # (C) Copyright 2001-2006 diff --git a/board/emulation/qemu-ppce500/qemu-ppce500.c b/board/emulation/qemu-ppce500/qemu-ppce500.c index 221361691c..dcc9f12562 100644 --- a/board/emulation/qemu-ppce500/qemu-ppce500.c +++ b/board/emulation/qemu-ppce500/qemu-ppce500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007,2009-2014 Freescale Semiconductor, Inc. * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/emulation/qemu-riscv/Makefile b/board/emulation/qemu-riscv/Makefile index 3f29b90a41..47d158e90c 100644 --- a/board/emulation/qemu-riscv/Makefile +++ b/board/emulation/qemu-riscv/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c index 181abbbf97..fd8df829e7 100644 --- a/board/emulation/qemu-riscv/qemu-riscv.c +++ b/board/emulation/qemu-riscv/qemu-riscv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/emulation/qemu-x86/qemu-x86.env b/board/emulation/qemu-x86/qemu-x86.env index adcc1c53bd..2019460be3 100644 --- a/board/emulation/qemu-x86/qemu-x86.env +++ b/board/emulation/qemu-x86/qemu-x86.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/engicam/common/Makefile b/board/engicam/common/Makefile index 15f0eaa1ec..b0af2c2874 100644 --- a/board/engicam/common/Makefile +++ b/board/engicam/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2016 Amarula Solutions B.V. ifdef CONFIG_SPL_BUILD diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index df9149e0d6..6b6008d889 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/common/board.h b/board/engicam/common/board.h index 9f47e18ca8..28bea3bd69 100644 --- a/board/engicam/common/board.h +++ b/board/engicam/common/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Amarula Solutions B.V. */ diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index f1ccdc3343..e4a2331718 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/imx6q/Makefile b/board/engicam/imx6q/Makefile index 39554797a7..3d7114a1fe 100644 --- a/board/engicam/imx6q/Makefile +++ b/board/engicam/imx6q/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2016 Amarula Solutions B.V. obj-y := imx6q.o diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c index e6c888fcfd..dbbcc39d46 100644 --- a/board/engicam/imx6q/imx6q.c +++ b/board/engicam/imx6q/imx6q.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/imx6ul/Makefile b/board/engicam/imx6ul/Makefile index 5cf8f30f33..b9344c5600 100644 --- a/board/engicam/imx6ul/Makefile +++ b/board/engicam/imx6ul/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2016 Amarula Solutions B.V. obj-y := imx6ul.o diff --git a/board/engicam/imx6ul/imx6ul.c b/board/engicam/imx6ul/imx6ul.c index 412d6c302e..0d58b0f73c 100644 --- a/board/engicam/imx6ul/imx6ul.c +++ b/board/engicam/imx6ul/imx6ul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/imx8mm/Makefile b/board/engicam/imx8mm/Makefile index 3392d61920..e32cee1cbf 100644 --- a/board/engicam/imx8mm/Makefile +++ b/board/engicam/imx8mm/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Amarula Solutions(India) # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += icore_mx8mm.o diff --git a/board/engicam/imx8mm/icore_mx8mm.c b/board/engicam/imx8mm/icore_mx8mm.c index 320388faae..90b796ed90 100644 --- a/board/engicam/imx8mm/icore_mx8mm.c +++ b/board/engicam/imx8mm/icore_mx8mm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/imx8mm/lpddr4_timing.c b/board/engicam/imx8mm/lpddr4_timing.c index 821212740b..0ffc1aaae4 100644 --- a/board/engicam/imx8mm/lpddr4_timing.c +++ b/board/engicam/imx8mm/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/engicam/imx8mm/spl.c b/board/engicam/imx8mm/spl.c index af9044a3c2..213cd38f02 100644 --- a/board/engicam/imx8mm/spl.c +++ b/board/engicam/imx8mm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Engicam s.r.l. * Copyright (C) 2020 Amarula Solutions(India) diff --git a/board/engicam/imx8mp/Makefile b/board/engicam/imx8mp/Makefile index c3ec09d6e3..69b3c9da55 100644 --- a/board/engicam/imx8mp/Makefile +++ b/board/engicam/imx8mp/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Amarula Solutions(India) # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += icore_mx8mp.o diff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c index 5f820cc8dd..0e8dc8be5a 100644 --- a/board/engicam/imx8mp/icore_mx8mp.c +++ b/board/engicam/imx8mp/icore_mx8mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Engicam S.r.l. * Copyright (C) 2022 Amarula Solutions(India) diff --git a/board/engicam/imx8mp/imximage-lpddr4.cfg b/board/engicam/imx8mp/imximage-lpddr4.cfg index 8aadedb102..f2971bc99d 100644 --- a/board/engicam/imx8mp/imximage-lpddr4.cfg +++ b/board/engicam/imx8mp/imximage-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/engicam/imx8mp/lpddr4_timing.c b/board/engicam/imx8mp/lpddr4_timing.c index 4444180c5c..1693bc0720 100644 --- a/board/engicam/imx8mp/lpddr4_timing.c +++ b/board/engicam/imx8mp/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/engicam/imx8mp/spl.c b/board/engicam/imx8mp/spl.c index 36b83aace3..37669e975b 100644 --- a/board/engicam/imx8mp/spl.c +++ b/board/engicam/imx8mp/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Amarula Solutions(India) * Copyright (C) 2016 Engicam S.r.l. diff --git a/board/engicam/stm32mp1/Makefile b/board/engicam/stm32mp1/Makefile index 155d33f9ee..394b1238a3 100644 --- a/board/engicam/stm32mp1/Makefile +++ b/board/engicam/stm32mp1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # diff --git a/board/engicam/stm32mp1/spl.c b/board/engicam/stm32mp1/spl.c index 2b7779cc01..b67fb75c8c 100644 --- a/board/engicam/stm32mp1/spl.c +++ b/board/engicam/stm32mp1/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Copyright (C) 2020 Engicam S.r.l. diff --git a/board/engicam/stm32mp1/stm32mp1.c b/board/engicam/stm32mp1/stm32mp1.c index 5223e9bae8..364b596891 100644 --- a/board/engicam/stm32mp1/stm32mp1.c +++ b/board/engicam/stm32mp1/stm32mp1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Copyright (C) 2020 Engicam S.r.l. diff --git a/board/esd/meesc/Makefile b/board/esd/meesc/Makefile index c13e221095..ba5a55ea55 100644 --- a/board/esd/meesc/Makefile +++ b/board/esd/meesc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/esd/meesc/meesc.c b/board/esd/meesc/meesc.c index 9e36210422..dd48f89552 100644 --- a/board/esd/meesc/meesc.c +++ b/board/esd/meesc/meesc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/firefly/firefly-rk3288/Makefile b/board/firefly/firefly-rk3288/Makefile index 671684597d..253c99e8cf 100644 --- a/board/firefly/firefly-rk3288/Makefile +++ b/board/firefly/firefly-rk3288/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += firefly-rk3288.o diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c index 95d8b00924..7523cc3c52 100644 --- a/board/firefly/firefly-rk3288/firefly-rk3288.c +++ b/board/firefly/firefly-rk3288/firefly-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc */ diff --git a/board/firefly/firefly-rk3308/Makefile b/board/firefly/firefly-rk3308/Makefile index 4c50b26ea9..7f5aa946c8 100644 --- a/board/firefly/firefly-rk3308/Makefile +++ b/board/firefly/firefly-rk3308/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2018 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += roc_cc_rk3308.o diff --git a/board/firefly/firefly-rk3308/roc_cc_rk3308.c b/board/firefly/firefly-rk3308/roc_cc_rk3308.c index bdf3cc03dc..0be9f11a27 100644 --- a/board/firefly/firefly-rk3308/roc_cc_rk3308.c +++ b/board/firefly/firefly-rk3308/roc_cc_rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/board/firefly/roc-pc-rk3399/Makefile b/board/firefly/roc-pc-rk3399/Makefile index 29c79b25d7..3890cb6ec9 100644 --- a/board/firefly/roc-pc-rk3399/Makefile +++ b/board/firefly/roc-pc-rk3399/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += roc-pc-rk3399.o diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c index 93e7d776fb..f51ca83f3f 100644 --- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index b4faf6f9e0..57ce67bc71 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c index 46ffd817b4..3b3f83f24b 100644 --- a/board/freescale/common/arm_sleep.c +++ b/board/freescale/common/arm_sleep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index e7e07fff86..19dddaf1f2 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004, 2011 Freescale Semiconductor. */ diff --git a/board/freescale/common/cadmus.h b/board/freescale/common/cadmus.h index fb74e8f6db..4e05d82d58 100644 --- a/board/freescale/common/cadmus.h +++ b/board/freescale/common/cadmus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2004 Freescale Semiconductor. */ diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c index dc2d62850d..bb4e3be367 100644 --- a/board/freescale/common/cds_pci_ft.c +++ b/board/freescale/common/cds_pci_ft.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004 Freescale Semiconductor. */ diff --git a/board/freescale/common/cds_via.c b/board/freescale/common/cds_via.c index 6184472b16..f2d2506467 100644 --- a/board/freescale/common/cds_via.c +++ b/board/freescale/common/cds_via.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2006 Freescale Semiconductor. */ diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index 6c096266b4..29b1f0a496 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/eeprom.h b/board/freescale/common/eeprom.h index 328fd3974b..896fec4882 100644 --- a/board/freescale/common/eeprom.h +++ b/board/freescale/common/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2004 Freescale Semiconductor. */ diff --git a/board/freescale/common/emc2305.c b/board/freescale/common/emc2305.c index 9a75c5a09d..7facec7e9d 100644 --- a/board/freescale/common/emc2305.c +++ b/board/freescale/common/emc2305.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2020 NXP. * diff --git a/board/freescale/common/emc2305.h b/board/freescale/common/emc2305.h index 24c5410d12..8572dafd4c 100644 --- a/board/freescale/common/emc2305.h +++ b/board/freescale/common/emc2305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2020 NXP * diff --git a/board/freescale/common/fman.c b/board/freescale/common/fman.c index 358303108d..1740b56526 100644 --- a/board/freescale/common/fman.c +++ b/board/freescale/common/fman.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011-2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/fman.h b/board/freescale/common/fman.h index 16afc34b03..14c2b66da2 100644 --- a/board/freescale/common/fman.h +++ b/board/freescale/common/fman.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 87ed814d6a..b792697a25 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2022 NXP diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index bfe6357b0d..88f19cff61 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2021-2022 NXP diff --git a/board/freescale/common/i2c_common.c b/board/freescale/common/i2c_common.c index 119ed3c617..8020374a0b 100644 --- a/board/freescale/common/i2c_common.c +++ b/board/freescale/common/i2c_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-21 NXP diff --git a/board/freescale/common/i2c_common.h b/board/freescale/common/i2c_common.h index 77a7b6aedd..146b5e8d6c 100644 --- a/board/freescale/common/i2c_common.h +++ b/board/freescale/common/i2c_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-21 NXP diff --git a/board/freescale/common/i2c_mux.c b/board/freescale/common/i2c_mux.c index 54f89e2576..f70393a9bb 100644 --- a/board/freescale/common/i2c_mux.c +++ b/board/freescale/common/i2c_mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-21 NXP diff --git a/board/freescale/common/i2c_mux.h b/board/freescale/common/i2c_mux.h index 0870c1918e..f50a812302 100644 --- a/board/freescale/common/i2c_mux.h +++ b/board/freescale/common/i2c_mux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-21 NXP diff --git a/board/freescale/common/ics307_clk.c b/board/freescale/common/ics307_clk.c index 5f95571d24..7c9686e272 100644 --- a/board/freescale/common/ics307_clk.c +++ b/board/freescale/common/ics307_clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/ics307_clk.h b/board/freescale/common/ics307_clk.h index 163496930c..fc0e69afa7 100644 --- a/board/freescale/common/ics307_clk.h +++ b/board/freescale/common/ics307_clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c index f754cf42fd..e76570b2ac 100644 --- a/board/freescale/common/ls102xa_stream_id.c +++ b/board/freescale/common/ls102xa_stream_id.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor */ diff --git a/board/freescale/common/mc34vr500.c b/board/freescale/common/mc34vr500.c index d6b4c65a3c..3d5594a171 100644 --- a/board/freescale/common/mc34vr500.c +++ b/board/freescale/common/mc34vr500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Hou Zhiqiang <Zhiqiang.Hou(a)freescale.com> diff --git a/board/freescale/common/mmc.c b/board/freescale/common/mmc.c index 8cd5079f96..7c32a6db49 100644 --- a/board/freescale/common/mmc.c +++ b/board/freescale/common/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2018-2022 NXP diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/freescale/common/mpc85xx_sleep.c index d3323b9ec1..70a98869bd 100644 --- a/board/freescale/common/mpc85xx_sleep.c +++ b/board/freescale/common/mpc85xx_sleep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/ngpixis.c b/board/freescale/common/ngpixis.c index 7be1ccee63..ad75d03e00 100644 --- a/board/freescale/common/ngpixis.c +++ b/board/freescale/common/ngpixis.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright 2010-2011 Freescale Semiconductor * Author: Timur Tabi <timur(a)freescale.com> diff --git a/board/freescale/common/ngpixis.h b/board/freescale/common/ngpixis.h index 7a20ee015f..a859811416 100644 --- a/board/freescale/common/ngpixis.h +++ b/board/freescale/common/ngpixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * Copyright 2010-2011 Freescale Semiconductor * Author: Timur Tabi <timur(a)freescale.com> diff --git a/board/freescale/common/ns_access.c b/board/freescale/common/ns_access.c index a95d15c1ef..1eb590b727 100644 --- a/board/freescale/common/ns_access.c +++ b/board/freescale/common/ns_access.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor */ diff --git a/board/freescale/common/p_corenet/Makefile b/board/freescale/common/p_corenet/Makefile index ce156018a0..d5f5be6f1f 100644 --- a/board/freescale/common/p_corenet/Makefile +++ b/board/freescale/common/p_corenet/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/common/p_corenet/law.c b/board/freescale/common/p_corenet/law.c index 1a1e9343d2..8d52d3b256 100644 --- a/board/freescale/common/p_corenet/law.c +++ b/board/freescale/common/p_corenet/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * diff --git a/board/freescale/common/p_corenet/tlb.c b/board/freescale/common/p_corenet/tlb.c index 1a2d9cbfc0..2e3da878ab 100644 --- a/board/freescale/common/p_corenet/tlb.c +++ b/board/freescale/common/p_corenet/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * diff --git a/board/freescale/common/pfuze.c b/board/freescale/common/pfuze.c index a9288820b2..476a39b6e6 100644 --- a/board/freescale/common/pfuze.c +++ b/board/freescale/common/pfuze.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/pfuze.h b/board/freescale/common/pfuze.h index 45b49afaeb..28d9378041 100644 --- a/board/freescale/common/pfuze.h +++ b/board/freescale/common/pfuze.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/qixis.c b/board/freescale/common/qixis.c index da2c1de078..3baa218a95 100644 --- a/board/freescale/common/qixis.c +++ b/board/freescale/common/qixis.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor * Copyright 2020 NXP diff --git a/board/freescale/common/qixis.h b/board/freescale/common/qixis.h index 784046ac4e..c6196c48f9 100644 --- a/board/freescale/common/qixis.h +++ b/board/freescale/common/qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor * Copyright 2020 NXP diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c index a1c7a94a90..8d5f0bcb5b 100644 --- a/board/freescale/common/sdhc_boot.c +++ b/board/freescale/common/sdhc_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/sleep.h b/board/freescale/common/sleep.h index 1450baa072..4c7912d3da 100644 --- a/board/freescale/common/sleep.h +++ b/board/freescale/common/sleep.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/common/spl.h b/board/freescale/common/spl.h index d4689d3d72..4354eb0b9b 100644 --- a/board/freescale/common/spl.h +++ b/board/freescale/common/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Google, Inc */ diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 64139d4659..1fa641dd9d 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2006, 2008-2009, 2011 Freescale Semiconductor * York Sun (yorksun(a)freescale.com) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index 5ec3f2a76b..829dc2e713 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-21 NXP diff --git a/board/freescale/common/vid.h b/board/freescale/common/vid.h index b34c080b4b..4f17b7d8bb 100644 --- a/board/freescale/common/vid.h +++ b/board/freescale/common/vid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/board/freescale/common/vsc3316_3308.h b/board/freescale/common/vsc3316_3308.h index 8d343ba4d6..3ff4e766bc 100644 --- a/board/freescale/common/vsc3316_3308.h +++ b/board/freescale/common/vsc3316_3308.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/imx8mm_evk/Makefile b/board/freescale/imx8mm_evk/Makefile index 1db7b62caf..560ee5a5a3 100644 --- a/board/freescale/imx8mm_evk/Makefile +++ b/board/freescale/imx8mm_evk/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mm_evk.o diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c index e0975fcda7..feb2d880d7 100644 --- a/board/freescale/imx8mm_evk/imx8mm_evk.c +++ b/board/freescale/imx8mm_evk/imx8mm_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg index fcace8a93a..7040caae81 100644 --- a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg +++ b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg index 20061521f2..be26a8fb6d 100644 --- a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg +++ b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/freescale/imx8mm_evk/lpddr4_timing.c b/board/freescale/imx8mm_evk/lpddr4_timing.c index 4373ca624e..38883009f4 100644 --- a/board/freescale/imx8mm_evk/lpddr4_timing.c +++ b/board/freescale/imx8mm_evk/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019 NXP * diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index 35437811d9..8795840f38 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/board/freescale/imx8mn_evk/Makefile b/board/freescale/imx8mn_evk/Makefile index 42d1179724..edf1a576ff 100644 --- a/board/freescale/imx8mn_evk/Makefile +++ b/board/freescale/imx8mn_evk/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mn_evk.o diff --git a/board/freescale/imx8mn_evk/ddr4_timing.c b/board/freescale/imx8mn_evk/ddr4_timing.c index 77611ea026..34cf0cf1cb 100644 --- a/board/freescale/imx8mn_evk/ddr4_timing.c +++ b/board/freescale/imx8mn_evk/ddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/freescale/imx8mn_evk/ddr4_timing_ld.c b/board/freescale/imx8mn_evk/ddr4_timing_ld.c index a3577efd0b..e1d6bb22e9 100644 --- a/board/freescale/imx8mn_evk/ddr4_timing_ld.c +++ b/board/freescale/imx8mn_evk/ddr4_timing_ld.c @@ -1,7 +1,7 @@ /* * Copyright 2019 NXP * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Generated code from MX8M_DDR_tool * Align with uboot version: diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c index e35d505aea..f17ca62f25 100644 --- a/board/freescale/imx8mn_evk/imx8mn_evk.c +++ b/board/freescale/imx8mn_evk/imx8mn_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg index 0edda9c5e0..13c02e6464 100644 --- a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg +++ b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/freescale/imx8mn_evk/lpddr4_timing.c b/board/freescale/imx8mn_evk/lpddr4_timing.c index 671e924132..8a03098699 100644 --- a/board/freescale/imx8mn_evk/lpddr4_timing.c +++ b/board/freescale/imx8mn_evk/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/freescale/imx8mn_evk/lpddr4_timing_ld.c b/board/freescale/imx8mn_evk/lpddr4_timing_ld.c index aa23c35094..5207b2004c 100644 --- a/board/freescale/imx8mn_evk/lpddr4_timing_ld.c +++ b/board/freescale/imx8mn_evk/lpddr4_timing_ld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/freescale/imx8mp_evk/Makefile b/board/freescale/imx8mp_evk/Makefile index 106bf9a1ed..1902ba1f82 100644 --- a/board/freescale/imx8mp_evk/Makefile +++ b/board/freescale/imx8mp_evk/Makefile @@ -1,7 +1,7 @@ # # Copyright 2019 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mp_evk.o diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index a24b8c1d86..8d1a4c7822 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg index 6dedf1724a..619b2d9a80 100644 --- a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg +++ b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/freescale/imx8mp_evk/lpddr4_timing.c b/board/freescale/imx8mp_evk/lpddr4_timing.c index 8c5306d5d2..874e51d651 100644 --- a/board/freescale/imx8mp_evk/lpddr4_timing.c +++ b/board/freescale/imx8mp_evk/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/imx8mq_evk/Makefile b/board/freescale/imx8mq_evk/Makefile index cf046963d2..60dff516ad 100644 --- a/board/freescale/imx8mq_evk/Makefile +++ b/board/freescale/imx8mq_evk/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mq_evk.o diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c index e394805856..339eb341c5 100644 --- a/board/freescale/imx8mq_evk/imx8mq_evk.c +++ b/board/freescale/imx8mq_evk/imx8mq_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8mq_evk/lpddr4_timing.c b/board/freescale/imx8mq_evk/lpddr4_timing.c index 46bc7f8591..a03fb1cd28 100644 --- a/board/freescale/imx8mq_evk/lpddr4_timing.c +++ b/board/freescale/imx8mq_evk/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8mq_evk/lpddr4_timing_b0.c b/board/freescale/imx8mq_evk/lpddr4_timing_b0.c index ec68edaf69..ac16f0a4e6 100644 --- a/board/freescale/imx8mq_evk/lpddr4_timing_b0.c +++ b/board/freescale/imx8mq_evk/lpddr4_timing_b0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c index 818cdd615e..67ababaa0d 100644 --- a/board/freescale/imx8mq_evk/spl.c +++ b/board/freescale/imx8mq_evk/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2021 NXP * diff --git a/board/freescale/imx8qm_mek/Makefile b/board/freescale/imx8qm_mek/Makefile index bc9a1260bd..4c6457e0ef 100644 --- a/board/freescale/imx8qm_mek/Makefile +++ b/board/freescale/imx8qm_mek/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8qm_mek.o diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index d96d1d07bb..520261001c 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8qm_mek/imximage.cfg b/board/freescale/imx8qm_mek/imximage.cfg index 71612678c9..74bfbe7c97 100644 --- a/board/freescale/imx8qm_mek/imximage.cfg +++ b/board/freescale/imx8qm_mek/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/freescale/imx8qm_mek/uboot-container.cfg index e25aa76fe1..def28918ff 100644 --- a/board/freescale/imx8qm_mek/uboot-container.cfg +++ b/board/freescale/imx8qm_mek/uboot-container.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/board/freescale/imx8qxp_mek/Makefile b/board/freescale/imx8qxp_mek/Makefile index acaadcd84a..23706eda89 100644 --- a/board/freescale/imx8qxp_mek/Makefile +++ b/board/freescale/imx8qxp_mek/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8qxp_mek.o diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index 516cefd2f2..0e4af57205 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg index 88d6955a9e..9b614bc081 100644 --- a/board/freescale/imx8qxp_mek/imximage.cfg +++ b/board/freescale/imx8qxp_mek/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP * diff --git a/board/freescale/imx8qxp_mek/uboot-container.cfg b/board/freescale/imx8qxp_mek/uboot-container.cfg index b481c98f92..28d15d0db2 100644 --- a/board/freescale/imx8qxp_mek/uboot-container.cfg +++ b/board/freescale/imx8qxp_mek/uboot-container.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/board/freescale/imx8ulp_evk/Makefile b/board/freescale/imx8ulp_evk/Makefile index 1cf148ab91..53b7a4e246 100644 --- a/board/freescale/imx8ulp_evk/Makefile +++ b/board/freescale/imx8ulp_evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += imx8ulp_evk.o diff --git a/board/freescale/imx8ulp_evk/imx8ulp_evk.c b/board/freescale/imx8ulp_evk/imx8ulp_evk.c index dd04d5925a..1cc070192e 100644 --- a/board/freescale/imx8ulp_evk/imx8ulp_evk.c +++ b/board/freescale/imx8ulp_evk/imx8ulp_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/board/freescale/imx8ulp_evk/lpddr4_timing.c b/board/freescale/imx8ulp_evk/lpddr4_timing.c index 6d2805315b..6081cc7629 100644 --- a/board/freescale/imx8ulp_evk/lpddr4_timing.c +++ b/board/freescale/imx8ulp_evk/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021 NXP * diff --git a/board/freescale/imx8ulp_evk/lpddr4_timing_266.c b/board/freescale/imx8ulp_evk/lpddr4_timing_266.c index 7945760146..61eefbca31 100644 --- a/board/freescale/imx8ulp_evk/lpddr4_timing_266.c +++ b/board/freescale/imx8ulp_evk/lpddr4_timing_266.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021 NXP * diff --git a/board/freescale/imx8ulp_evk/spl.c b/board/freescale/imx8ulp_evk/spl.c index c49b5be476..acbb48d9f1 100644 --- a/board/freescale/imx8ulp_evk/spl.c +++ b/board/freescale/imx8ulp_evk/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP */ diff --git a/board/freescale/imx93_evk/Makefile b/board/freescale/imx93_evk/Makefile index 17956d24bf..01712259cf 100644 --- a/board/freescale/imx93_evk/Makefile +++ b/board/freescale/imx93_evk/Makefile @@ -1,7 +1,7 @@ # # Copyright 2022 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx93_evk.o diff --git a/board/freescale/imx93_evk/imx93_evk.c b/board/freescale/imx93_evk/imx93_evk.c index f4297f8fd4..5ee4388b7f 100644 --- a/board/freescale/imx93_evk/imx93_evk.c +++ b/board/freescale/imx93_evk/imx93_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/board/freescale/imx93_evk/lpddr4x_timing.c b/board/freescale/imx93_evk/lpddr4x_timing.c index ffdf96b739..10978f576b 100644 --- a/board/freescale/imx93_evk/lpddr4x_timing.c +++ b/board/freescale/imx93_evk/lpddr4x_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 NXP * diff --git a/board/freescale/imx93_evk/lpddr4x_timing_ld.c b/board/freescale/imx93_evk/lpddr4x_timing_ld.c index f080322f11..3402f312fa 100644 --- a/board/freescale/imx93_evk/lpddr4x_timing_ld.c +++ b/board/freescale/imx93_evk/lpddr4x_timing_ld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/board/freescale/imx93_evk/spl.c b/board/freescale/imx93_evk/spl.c index be9c24fc0d..90b0786f02 100644 --- a/board/freescale/imx93_evk/spl.c +++ b/board/freescale/imx93_evk/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/board/freescale/imxrt1020-evk/Makefile b/board/freescale/imxrt1020-evk/Makefile index 807dc7c35e..5b1208c956 100644 --- a/board/freescale/imxrt1020-evk/Makefile +++ b/board/freescale/imxrt1020-evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 # Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1020-evk/imximage.cfg b/board/freescale/imxrt1020-evk/imximage.cfg index 0ed71479a6..940ffa6ed9 100644 --- a/board/freescale/imxrt1020-evk/imximage.cfg +++ b/board/freescale/imxrt1020-evk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c index 785da604b9..911120db0c 100644 --- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c +++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1050-evk/Makefile b/board/freescale/imxrt1050-evk/Makefile index 0e984d1d7a..241cd15cf5 100644 --- a/board/freescale/imxrt1050-evk/Makefile +++ b/board/freescale/imxrt1050-evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 # Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1050-evk/imximage.cfg b/board/freescale/imxrt1050-evk/imximage.cfg index f1f09fd7eb..8086edaccd 100644 --- a/board/freescale/imxrt1050-evk/imximage.cfg +++ b/board/freescale/imxrt1050-evk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c index 4b82ee5e9c..81a0d4ce85 100644 --- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c +++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1170-evk/Makefile b/board/freescale/imxrt1170-evk/Makefile index 857a168b09..f6201617b2 100644 --- a/board/freescale/imxrt1170-evk/Makefile +++ b/board/freescale/imxrt1170-evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 # Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/imxrt1170-evk/imximage.cfg b/board/freescale/imxrt1170-evk/imximage.cfg index 57583d04ce..0d311590a9 100644 --- a/board/freescale/imxrt1170-evk/imximage.cfg +++ b/board/freescale/imxrt1170-evk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/board/freescale/imxrt1170-evk/imxrt1170-evk.c b/board/freescale/imxrt1170-evk/imxrt1170-evk.c index 4b82ee5e9c..81a0d4ce85 100644 --- a/board/freescale/imxrt1170-evk/imxrt1170-evk.c +++ b/board/freescale/imxrt1170-evk/imxrt1170-evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/board/freescale/ls1012afrdm/Makefile b/board/freescale/ls1012afrdm/Makefile index 1e53c96730..9b1dcd0c1f 100644 --- a/board/freescale/ls1012afrdm/Makefile +++ b/board/freescale/ls1012afrdm/Makefile @@ -1,7 +1,7 @@ # # Copyright 2016 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1012afrdm.o diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrdm/eth.c index d2df9351ea..d22b42cd6c 100644 --- a/board/freescale/ls1012afrdm/eth.c +++ b/board/freescale/ls1012afrdm/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 271072bf7a..96321c1112 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018, 2021 NXP */ diff --git a/board/freescale/ls1012aqds/Makefile b/board/freescale/ls1012aqds/Makefile index 5aba9caf92..318c81f75f 100644 --- a/board/freescale/ls1012aqds/Makefile +++ b/board/freescale/ls1012aqds/Makefile @@ -1,7 +1,7 @@ # # Copyright 2016 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1012aqds.o diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c index 38267acedd..65385c6342 100644 --- a/board/freescale/ls1012aqds/eth.c +++ b/board/freescale/ls1012aqds/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index a5ea8d634e..e912bbed8d 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/ls1012aqds/ls1012aqds_pfe.h b/board/freescale/ls1012aqds/ls1012aqds_pfe.h index 5ab283ce8d..1e8b25bb4d 100644 --- a/board/freescale/ls1012aqds/ls1012aqds_pfe.h +++ b/board/freescale/ls1012aqds/ls1012aqds_pfe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls1012aqds/ls1012aqds_qixis.h b/board/freescale/ls1012aqds/ls1012aqds_qixis.h index 19f522d9ea..372e014190 100644 --- a/board/freescale/ls1012aqds/ls1012aqds_qixis.h +++ b/board/freescale/ls1012aqds/ls1012aqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1012ardb/Makefile b/board/freescale/ls1012ardb/Makefile index 70c7b33273..e6de37d883 100644 --- a/board/freescale/ls1012ardb/Makefile +++ b/board/freescale/ls1012ardb/Makefile @@ -1,7 +1,7 @@ # # Copyright 2016 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1012ardb.o diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c index 5c66127498..c630acff8f 100644 --- a/board/freescale/ls1012ardb/eth.c +++ b/board/freescale/ls1012ardb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 18f92089ca..4330c7a9e5 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/ls1021aiot/Makefile b/board/freescale/ls1021aiot/Makefile index 587bbd79dd..77cd20ec97 100644 --- a/board/freescale/ls1021aiot/Makefile +++ b/board/freescale/ls1021aiot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2016 Freescale Semiconductor, Inc. diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index d6f22bd6a2..4ba9ae112b 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/ls1021aiot/psci.S b/board/freescale/ls1021aiot/psci.S index d0106ba390..c5fd72102f 100644 --- a/board/freescale/ls1021aiot/psci.S +++ b/board/freescale/ls1021aiot/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 NXP Semiconductor. * Author: Feng Li <feng.li_2(a)nxp.com> diff --git a/board/freescale/ls1021aqds/Makefile b/board/freescale/ls1021aqds/Makefile index 8cbf33fa0c..fd5eb75628 100644 --- a/board/freescale/ls1021aqds/Makefile +++ b/board/freescale/ls1021aqds/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1021aqds.o diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c index 4e70acc5a0..738f478416 100644 --- a/board/freescale/ls1021aqds/ddr.c +++ b/board/freescale/ls1021aqds/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1021aqds/ddr.h b/board/freescale/ls1021aqds/ddr.h index 58a8838436..f4514e5a9b 100644 --- a/board/freescale/ls1021aqds/ddr.h +++ b/board/freescale/ls1021aqds/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index a618ce11a5..d94a6a834d 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2019, 2021 NXP diff --git a/board/freescale/ls1021aqds/ls1021aqds_qixis.h b/board/freescale/ls1021aqds/ls1021aqds_qixis.h index 7ad08a54ea..75bac90271 100644 --- a/board/freescale/ls1021aqds/ls1021aqds_qixis.h +++ b/board/freescale/ls1021aqds/ls1021aqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1021aqds/psci.S b/board/freescale/ls1021aqds/psci.S index 0f38c934dd..57697deac4 100644 --- a/board/freescale/ls1021aqds/psci.S +++ b/board/freescale/ls1021aqds/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 NXP Semiconductor. * Author: Wang Dongsheng <dongsheng.wang(a)freescale.com> diff --git a/board/freescale/ls1021atwr/Makefile b/board/freescale/ls1021atwr/Makefile index cfa6c0c854..15097c0e14 100644 --- a/board/freescale/ls1021atwr/Makefile +++ b/board/freescale/ls1021atwr/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1021atwr.o diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 27b9d79e5f..fce0c7d1a8 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2019, 2021-2022 NXP diff --git a/board/freescale/ls1021atwr/psci.S b/board/freescale/ls1021atwr/psci.S index 3c093aa33c..a2f716198f 100644 --- a/board/freescale/ls1021atwr/psci.S +++ b/board/freescale/ls1021atwr/psci.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 NXP Semiconductor. * Author: Wang Dongsheng <dongsheng.wang(a)freescale.com> diff --git a/board/freescale/ls1028a/Makefile b/board/freescale/ls1028a/Makefile index 9bc144cbfe..825649b535 100644 --- a/board/freescale/ls1028a/Makefile +++ b/board/freescale/ls1028a/Makefile @@ -1,7 +1,7 @@ # # Copyright 2019 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ls1028a.o diff --git a/board/freescale/ls1028a/ddr.c b/board/freescale/ls1028a/ddr.c index 3e976da6b3..c5116d5791 100644 --- a/board/freescale/ls1028a/ddr.c +++ b/board/freescale/ls1028a/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 7f181ab3df..c0ea12a1e0 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2022 NXP */ diff --git a/board/freescale/ls1043aqds/Makefile b/board/freescale/ls1043aqds/Makefile index 49d8d7d9b9..6ef3c4c181 100644 --- a/board/freescale/ls1043aqds/Makefile +++ b/board/freescale/ls1043aqds/Makefile @@ -1,7 +1,7 @@ # # Copyright 2015 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ddr.o diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c index 23947bdb84..30095df7fe 100644 --- a/board/freescale/ls1043aqds/ddr.c +++ b/board/freescale/ls1043aqds/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043aqds/ddr.h b/board/freescale/ls1043aqds/ddr.h index 65b0250d37..feda5e212f 100644 --- a/board/freescale/ls1043aqds/ddr.h +++ b/board/freescale/ls1043aqds/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043aqds/eth.c b/board/freescale/ls1043aqds/eth.c index cd1f83e3d0..15a48a20ff 100644 --- a/board/freescale/ls1043aqds/eth.c +++ b/board/freescale/ls1043aqds/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index b87da41e40..d40d77c377 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2019-2020 NXP diff --git a/board/freescale/ls1043aqds/ls1043aqds_qixis.h b/board/freescale/ls1043aqds/ls1043aqds_qixis.h index bba494ae41..2adc225cd5 100644 --- a/board/freescale/ls1043aqds/ls1043aqds_qixis.h +++ b/board/freescale/ls1043aqds/ls1043aqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043ardb/Makefile b/board/freescale/ls1043ardb/Makefile index 5309576c68..d2393878cd 100644 --- a/board/freescale/ls1043ardb/Makefile +++ b/board/freescale/ls1043ardb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2015 Freescale Semiconductor diff --git a/board/freescale/ls1043ardb/cpld.c b/board/freescale/ls1043ardb/cpld.c index 9db3aa5860..9e4f94a9ee 100644 --- a/board/freescale/ls1043ardb/cpld.c +++ b/board/freescale/ls1043ardb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor * diff --git a/board/freescale/ls1043ardb/cpld.h b/board/freescale/ls1043ardb/cpld.h index eed34d6354..98f5ca2334 100644 --- a/board/freescale/ls1043ardb/cpld.h +++ b/board/freescale/ls1043ardb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor */ diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c index 4d2fce3841..e695e1eb3e 100644 --- a/board/freescale/ls1043ardb/ddr.c +++ b/board/freescale/ls1043ardb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043ardb/ddr.h b/board/freescale/ls1043ardb/ddr.h index 85ed920ca6..010e23961a 100644 --- a/board/freescale/ls1043ardb/ddr.h +++ b/board/freescale/ls1043ardb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043ardb/eth.c b/board/freescale/ls1043ardb/eth.c index cc95214c4e..49aeb622b0 100644 --- a/board/freescale/ls1043ardb/eth.c +++ b/board/freescale/ls1043ardb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 18869d8c1d..cc1d1c227e 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Copyright 2021-2022 NXP diff --git a/board/freescale/ls1046afrwy/Makefile b/board/freescale/ls1046afrwy/Makefile index c70f5cda79..4aeba140f1 100644 --- a/board/freescale/ls1046afrwy/Makefile +++ b/board/freescale/ls1046afrwy/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 NXP diff --git a/board/freescale/ls1046afrwy/ddr.c b/board/freescale/ls1046afrwy/ddr.c index 256397b52b..44abbf3bbd 100644 --- a/board/freescale/ls1046afrwy/ddr.c +++ b/board/freescale/ls1046afrwy/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c index d1a2bfe188..83b2543eeb 100644 --- a/board/freescale/ls1046afrwy/eth.c +++ b/board/freescale/ls1046afrwy/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c index 899c22a367..3db9584e09 100644 --- a/board/freescale/ls1046afrwy/ls1046afrwy.c +++ b/board/freescale/ls1046afrwy/ls1046afrwy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019, 2021 NXP */ diff --git a/board/freescale/ls1046aqds/Makefile b/board/freescale/ls1046aqds/Makefile index 6267522cc2..0f5a59ae24 100644 --- a/board/freescale/ls1046aqds/Makefile +++ b/board/freescale/ls1046aqds/Makefile @@ -1,7 +1,7 @@ # # Copyright 2016 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ddr.o diff --git a/board/freescale/ls1046aqds/ddr.c b/board/freescale/ls1046aqds/ddr.c index 9a96de2717..81b2e454dd 100644 --- a/board/freescale/ls1046aqds/ddr.c +++ b/board/freescale/ls1046aqds/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046aqds/ddr.h b/board/freescale/ls1046aqds/ddr.h index e55446f2b2..709fc07648 100644 --- a/board/freescale/ls1046aqds/ddr.h +++ b/board/freescale/ls1046aqds/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046aqds/eth.c b/board/freescale/ls1046aqds/eth.c index bbf8b8c2be..065589970b 100644 --- a/board/freescale/ls1046aqds/eth.c +++ b/board/freescale/ls1046aqds/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2018-2020 NXP diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index 2faac54a0e..62ff804f72 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2019-2021 NXP diff --git a/board/freescale/ls1046aqds/ls1046aqds_qixis.h b/board/freescale/ls1046aqds/ls1046aqds_qixis.h index f371056e37..a59df7d17d 100644 --- a/board/freescale/ls1046aqds/ls1046aqds_qixis.h +++ b/board/freescale/ls1046aqds/ls1046aqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046ardb/Makefile b/board/freescale/ls1046ardb/Makefile index 1c13ed6b6f..0e92fe6bd6 100644 --- a/board/freescale/ls1046ardb/Makefile +++ b/board/freescale/ls1046ardb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2016 Freescale Semiconductor diff --git a/board/freescale/ls1046ardb/cpld.c b/board/freescale/ls1046ardb/cpld.c index ee19d4ff8a..970a525f7b 100644 --- a/board/freescale/ls1046ardb/cpld.c +++ b/board/freescale/ls1046ardb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor * diff --git a/board/freescale/ls1046ardb/cpld.h b/board/freescale/ls1046ardb/cpld.h index e87044f5c0..cf23d004c7 100644 --- a/board/freescale/ls1046ardb/cpld.h +++ b/board/freescale/ls1046ardb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor */ diff --git a/board/freescale/ls1046ardb/ddr.c b/board/freescale/ls1046ardb/ddr.c index befb556bd3..f6158f1676 100644 --- a/board/freescale/ls1046ardb/ddr.c +++ b/board/freescale/ls1046ardb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046ardb/ddr.h b/board/freescale/ls1046ardb/ddr.h index 05baef232a..fa24c8476e 100644 --- a/board/freescale/ls1046ardb/ddr.h +++ b/board/freescale/ls1046ardb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c index bbc22a3cdf..ff0b518c1d 100644 --- a/board/freescale/ls1046ardb/eth.c +++ b/board/freescale/ls1046ardb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 26e69db55f..52d25742b3 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/ls1088a/Makefile b/board/freescale/ls1088a/Makefile index c2b0e7dc0f..15bf0e139d 100644 --- a/board/freescale/ls1088a/Makefile +++ b/board/freescale/ls1088a/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2017 NXP diff --git a/board/freescale/ls1088a/ddr.c b/board/freescale/ls1088a/ddr.c index 9e0941cc9d..d750b14b5d 100644 --- a/board/freescale/ls1088a/ddr.c +++ b/board/freescale/ls1088a/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls1088a/ddr.h b/board/freescale/ls1088a/ddr.h index b35c4ae2da..93a96916fe 100644 --- a/board/freescale/ls1088a/ddr.h +++ b/board/freescale/ls1088a/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/freescale/ls1088a/eth_ls1088aqds.c index f62f5fd274..74cbd62fef 100644 --- a/board/freescale/ls1088a/eth_ls1088aqds.c +++ b/board/freescale/ls1088a/eth_ls1088aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/freescale/ls1088a/eth_ls1088ardb.c index fb6f9c1a81..dd489a2db9 100644 --- a/board/freescale/ls1088a/eth_ls1088ardb.c +++ b/board/freescale/ls1088a/eth_ls1088ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 98a91c48ad..ce93669f3e 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2022 NXP */ diff --git a/board/freescale/ls1088a/ls1088a_qixis.h b/board/freescale/ls1088a/ls1088a_qixis.h index e3502eb1d1..05feda31be 100644 --- a/board/freescale/ls1088a/ls1088a_qixis.h +++ b/board/freescale/ls1088a/ls1088a_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/board/freescale/ls2080aqds/Makefile b/board/freescale/ls2080aqds/Makefile index efc51b4a34..0fa45be961 100644 --- a/board/freescale/ls2080aqds/Makefile +++ b/board/freescale/ls2080aqds/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2015 Freescale Semiconductor diff --git a/board/freescale/ls2080aqds/ddr.c b/board/freescale/ls2080aqds/ddr.c index 2767d058cc..e7be0caf65 100644 --- a/board/freescale/ls2080aqds/ddr.c +++ b/board/freescale/ls2080aqds/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080aqds/ddr.h b/board/freescale/ls2080aqds/ddr.h index b5d790a4a0..440eb58808 100644 --- a/board/freescale/ls2080aqds/ddr.h +++ b/board/freescale/ls2080aqds/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c index 0d0d5de156..16c3d621d8 100644 --- a/board/freescale/ls2080aqds/eth.c +++ b/board/freescale/ls2080aqds/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 5c94c83121..533a94558d 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor * Copyright 2021 NXP diff --git a/board/freescale/ls2080aqds/ls2080aqds_qixis.h b/board/freescale/ls2080aqds/ls2080aqds_qixis.h index 7b2607b8da..9410f9fb74 100644 --- a/board/freescale/ls2080aqds/ls2080aqds_qixis.h +++ b/board/freescale/ls2080aqds/ls2080aqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080ardb/Makefile b/board/freescale/ls2080ardb/Makefile index ed44d459f0..afa2036c7c 100644 --- a/board/freescale/ls2080ardb/Makefile +++ b/board/freescale/ls2080ardb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2015 Freescale Semiconductor diff --git a/board/freescale/ls2080ardb/ddr.c b/board/freescale/ls2080ardb/ddr.c index 07fa847333..8830fcdfd0 100644 --- a/board/freescale/ls2080ardb/ddr.c +++ b/board/freescale/ls2080ardb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080ardb/ddr.h b/board/freescale/ls2080ardb/ddr.h index c5f2a95211..939a35d01b 100644 --- a/board/freescale/ls2080ardb/ddr.h +++ b/board/freescale/ls2080ardb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/freescale/ls2080ardb/eth_ls2080rdb.c index 44d9782d72..5b6f499bcd 100644 --- a/board/freescale/ls2080ardb/eth_ls2080rdb.c +++ b/board/freescale/ls2080ardb/eth_ls2080rdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 5c30de83d8..eef248a57b 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor * Copyright 2017, 2021 NXP diff --git a/board/freescale/ls2080ardb/ls2080ardb_qixis.h b/board/freescale/ls2080ardb/ls2080ardb_qixis.h index db3c6dc2a2..1d5d00850a 100644 --- a/board/freescale/ls2080ardb/ls2080ardb_qixis.h +++ b/board/freescale/ls2080ardb/ls2080ardb_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/lx2160a/Makefile b/board/freescale/lx2160a/Makefile index c9561bfade..04c210efd9 100644 --- a/board/freescale/lx2160a/Makefile +++ b/board/freescale/lx2160a/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 Freescale Semiconductor # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += lx2160a.o diff --git a/board/freescale/lx2160a/ddr.c b/board/freescale/lx2160a/ddr.c index 7ab7a9e6ca..873243901b 100644 --- a/board/freescale/lx2160a/ddr.c +++ b/board/freescale/lx2160a/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c index 9939bb6f89..5915557c4a 100644 --- a/board/freescale/lx2160a/eth_lx2160aqds.c +++ b/board/freescale/lx2160a/eth_lx2160aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2020 NXP * diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/freescale/lx2160a/eth_lx2160ardb.c index c5dfefe1f3..5fdf4dfe51 100644 --- a/board/freescale/lx2160a/eth_lx2160ardb.c +++ b/board/freescale/lx2160a/eth_lx2160ardb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2020 NXP * diff --git a/board/freescale/lx2160a/eth_lx2162aqds.c b/board/freescale/lx2160a/eth_lx2162aqds.c index 805aa705be..1c3a2189df 100644 --- a/board/freescale/lx2160a/eth_lx2162aqds.c +++ b/board/freescale/lx2160a/eth_lx2162aqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP * diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index b3187a1421..cecbf7aad4 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2021 NXP */ diff --git a/board/freescale/lx2160a/lx2160a.h b/board/freescale/lx2160a/lx2160a.h index 61a8bb9590..b0117e36d6 100644 --- a/board/freescale/lx2160a/lx2160a.h +++ b/board/freescale/lx2160a/lx2160a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/board/freescale/m5208evbe/Makefile b/board/freescale/m5208evbe/Makefile index b7a7c3e647..7e3479c647 100644 --- a/board/freescale/m5208evbe/Makefile +++ b/board/freescale/m5208evbe/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/freescale/m5208evbe/m5208evbe.c index 6125c9e13a..0f1c382131 100644 --- a/board/freescale/m5208evbe/m5208evbe.c +++ b/board/freescale/m5208evbe/m5208evbe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5235evb/Makefile b/board/freescale/m5235evb/Makefile index b7067e4581..8a137fe289 100644 --- a/board/freescale/m5235evb/Makefile +++ b/board/freescale/m5235evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5235evb/m5235evb.c b/board/freescale/m5235evb/m5235evb.c index 44161a0b0a..9783fbd7eb 100644 --- a/board/freescale/m5235evb/m5235evb.c +++ b/board/freescale/m5235evb/m5235evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5249evb/Makefile b/board/freescale/m5249evb/Makefile index 497bc72290..0793140054 100644 --- a/board/freescale/m5249evb/Makefile +++ b/board/freescale/m5249evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5249evb/m5249evb.c b/board/freescale/m5249evb/m5249evb.c index d67db24d58..0892739c54 100644 --- a/board/freescale/m5249evb/m5249evb.c +++ b/board/freescale/m5249evb/m5249evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5253demo/Makefile b/board/freescale/m5253demo/Makefile index 00d395d1a3..5f6cb5e16f 100644 --- a/board/freescale/m5253demo/Makefile +++ b/board/freescale/m5253demo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index eeb9cfd312..db40e3f916 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5253demo/m5253demo.c b/board/freescale/m5253demo/m5253demo.c index c1cff52fb3..3bc98769fa 100644 --- a/board/freescale/m5253demo/m5253demo.c +++ b/board/freescale/m5253demo/m5253demo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5272c3/Makefile b/board/freescale/m5272c3/Makefile index 1df8f7003e..207c4d9a28 100644 --- a/board/freescale/m5272c3/Makefile +++ b/board/freescale/m5272c3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5272c3/m5272c3.c b/board/freescale/m5272c3/m5272c3.c index 3c20a23385..c2b7e02ec8 100644 --- a/board/freescale/m5272c3/m5272c3.c +++ b/board/freescale/m5272c3/m5272c3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5275evb/Makefile b/board/freescale/m5275evb/Makefile index 83e3b10f0e..5a691cc611 100644 --- a/board/freescale/m5275evb/Makefile +++ b/board/freescale/m5275evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5275evb/m5275evb.c b/board/freescale/m5275evb/m5275evb.c index 00fa35ca5f..72dbcbaac7 100644 --- a/board/freescale/m5275evb/m5275evb.c +++ b/board/freescale/m5275evb/m5275evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5282evb/Makefile b/board/freescale/m5282evb/Makefile index e898f39330..63956d3bb8 100644 --- a/board/freescale/m5282evb/Makefile +++ b/board/freescale/m5282evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c index 53e0f20210..855ca158b3 100644 --- a/board/freescale/m5282evb/m5282evb.c +++ b/board/freescale/m5282evb/m5282evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m53017evb/Makefile b/board/freescale/m53017evb/Makefile index 4eeb3a860b..1a722c16af 100644 --- a/board/freescale/m53017evb/Makefile +++ b/board/freescale/m53017evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m53017evb/m53017evb.c b/board/freescale/m53017evb/m53017evb.c index 76ebc0ab8d..5482009ecd 100644 --- a/board/freescale/m53017evb/m53017evb.c +++ b/board/freescale/m53017evb/m53017evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5329evb/Makefile b/board/freescale/m5329evb/Makefile index 19796c213f..abcc863d04 100644 --- a/board/freescale/m5329evb/Makefile +++ b/board/freescale/m5329evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5329evb/m5329evb.c b/board/freescale/m5329evb/m5329evb.c index b278dbfb48..58f5eb7bae 100644 --- a/board/freescale/m5329evb/m5329evb.c +++ b/board/freescale/m5329evb/m5329evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c index d921eef8b6..69dfaf4808 100644 --- a/board/freescale/m5329evb/nand.c +++ b/board/freescale/m5329evb/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5373evb/Makefile b/board/freescale/m5373evb/Makefile index 20efa7b843..a071065fad 100644 --- a/board/freescale/m5373evb/Makefile +++ b/board/freescale/m5373evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5373evb/m5373evb.c b/board/freescale/m5373evb/m5373evb.c index 0e9eec316c..266b4eeb6a 100644 --- a/board/freescale/m5373evb/m5373evb.c +++ b/board/freescale/m5373evb/m5373evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/m5373evb/nand.c b/board/freescale/m5373evb/nand.c index 6d825a66e3..871a87d8e9 100644 --- a/board/freescale/m5373evb/nand.c +++ b/board/freescale/m5373evb/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/mpc837xerdb/Makefile b/board/freescale/mpc837xerdb/Makefile index 4661e4cf23..b6419f9d96 100644 --- a/board/freescale/mpc837xerdb/Makefile +++ b/board/freescale/mpc837xerdb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 97884a3979..96857ad66c 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 Freescale Semiconductor, Inc. * Kevin Lam <kevin.lam(a)freescale.com> diff --git a/board/freescale/mpc8548cds/Makefile b/board/freescale/mpc8548cds/Makefile index 5ed40e92eb..c011277b9d 100644 --- a/board/freescale/mpc8548cds/Makefile +++ b/board/freescale/mpc8548cds/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2004 Freescale Semiconductor. # (C) Copyright 2001-2006 diff --git a/board/freescale/mpc8548cds/law.c b/board/freescale/mpc8548cds/law.c index 7b6ef5b11c..09e59adbbe 100644 --- a/board/freescale/mpc8548cds/law.c +++ b/board/freescale/mpc8548cds/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008,2010-2011 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index ec6e3a2d0a..2dcd70a9d6 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004, 2007, 2009-2011 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mpc8548cds/tlb.c b/board/freescale/mpc8548cds/tlb.c index 994a32dd92..c189bda96b 100644 --- a/board/freescale/mpc8548cds/tlb.c +++ b/board/freescale/mpc8548cds/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008, 2011 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx23evk/Makefile b/board/freescale/mx23evk/Makefile index 6fe6992a5f..551a32abcf 100644 --- a/board/freescale/mx23evk/Makefile +++ b/board/freescale/mx23evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c index df4fb39125..8788936e1b 100644 --- a/board/freescale/mx23evk/mx23evk.c +++ b/board/freescale/mx23evk/mx23evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale MX23EVK board * diff --git a/board/freescale/mx23evk/spl_boot.c b/board/freescale/mx23evk/spl_boot.c index 14e9b4a863..2f48a2c48c 100644 --- a/board/freescale/mx23evk/spl_boot.c +++ b/board/freescale/mx23evk/spl_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale MX23EVK Boot setup * diff --git a/board/freescale/mx28evk/Makefile b/board/freescale/mx28evk/Makefile index 057760433d..b25598e8ae 100644 --- a/board/freescale/mx28evk/Makefile +++ b/board/freescale/mx28evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/freescale/mx28evk/iomux.c b/board/freescale/mx28evk/iomux.c index cc0c858854..2c972e1db4 100644 --- a/board/freescale/mx28evk/iomux.c +++ b/board/freescale/mx28evk/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale MX28EVK IOMUX setup * diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c index 88c3bf3608..d47e543a36 100644 --- a/board/freescale/mx28evk/mx28evk.c +++ b/board/freescale/mx28evk/mx28evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale MX28EVK board * diff --git a/board/freescale/mx51evk/Makefile b/board/freescale/mx51evk/Makefile index 808e35015e..cc9cb28e51 100644 --- a/board/freescale/mx51evk/Makefile +++ b/board/freescale/mx51evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/freescale/mx51evk/imximage.cfg b/board/freescale/mx51evk/imximage.cfg index ff2ec4aa27..1671d2978b 100644 --- a/board/freescale/mx51evk/imximage.cfg +++ b/board/freescale/mx51evk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C Copyright 2009 * Stefano Babic DENX Software Engineering sbabic(a)denx.de. diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 95edb35994..2fdd3593a4 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx53loco/Makefile b/board/freescale/mx53loco/Makefile index 9befe42695..89ee86de01 100644 --- a/board/freescale/mx53loco/Makefile +++ b/board/freescale/mx53loco/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2011 Freescale Semiconductor, Inc. # Jason Liu <r64343(a)freescale.com> diff --git a/board/freescale/mx53loco/imximage.cfg b/board/freescale/mx53loco/imximage.cfg index d12801d19f..18da6427ff 100644 --- a/board/freescale/mx53loco/imximage.cfg +++ b/board/freescale/mx53loco/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Jason Liu <r64343(a)freescale.com> diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index d418cd8f4c..ec0c0dc3af 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Jason Liu <r64343(a)freescale.com> diff --git a/board/freescale/mx6memcal/Makefile b/board/freescale/mx6memcal/Makefile index fc2d3eb9e1..a873f8ad61 100644 --- a/board/freescale/mx6memcal/Makefile +++ b/board/freescale/mx6memcal/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c index 0dfd7dec9e..ee5b2b7692 100644 --- a/board/freescale/mx6memcal/mx6memcal.c +++ b/board/freescale/mx6memcal/mx6memcal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mx6memcal board support - provides a minimal, UART-only * U-Boot that's capable of running a memory test. diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c index 61d0ca3408..36d7bb8412 100644 --- a/board/freescale/mx6memcal/spl.c +++ b/board/freescale/mx6memcal/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nelson Integration, LLC * Author: Eric Nelson <eric(a)nelint.com> diff --git a/board/freescale/mx6sabreauto/Makefile b/board/freescale/mx6sabreauto/Makefile index 7ecdb6b4ad..d06de2bf43 100644 --- a/board/freescale/mx6sabreauto/Makefile +++ b/board/freescale/mx6sabreauto/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index 77e9200613..a0c5f675ac 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6sabresd/Makefile b/board/freescale/mx6sabresd/Makefile index 92e1ff72a4..83f869b85f 100644 --- a/board/freescale/mx6sabresd/Makefile +++ b/board/freescale/mx6sabresd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index b558a596df..4b2dd389de 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6slevk/Makefile b/board/freescale/mx6slevk/Makefile index 770f7aac6b..708ec35f30 100644 --- a/board/freescale/mx6slevk/Makefile +++ b/board/freescale/mx6slevk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2013 Freescale Semiconductor, Inc. obj-y := mx6slevk.o diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg index 64be101d6e..1dedc28bc6 100644 --- a/board/freescale/mx6slevk/imximage.cfg +++ b/board/freescale/mx6slevk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index e9ac57118b..9c15639836 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6sllevk/Makefile b/board/freescale/mx6sllevk/Makefile index 8f724ccfc9..cab70ac6d3 100644 --- a/board/freescale/mx6sllevk/Makefile +++ b/board/freescale/mx6sllevk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 Freescale Semiconductor, Inc. obj-y := mx6sllevk.o diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/freescale/mx6sllevk/imximage.cfg index 550be3f6c1..a7f8ce4a88 100644 --- a/board/freescale/mx6sllevk/imximage.cfg +++ b/board/freescale/mx6sllevk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/freescale/mx6sllevk/mx6sllevk.c index 10a00095af..e4fe10e4e4 100644 --- a/board/freescale/mx6sllevk/mx6sllevk.c +++ b/board/freescale/mx6sllevk/mx6sllevk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6sllevk/plugin.S b/board/freescale/mx6sllevk/plugin.S index dcf5e14d48..80847f235c 100644 --- a/board/freescale/mx6sllevk/plugin.S +++ b/board/freescale/mx6sllevk/plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6sxsabreauto/Makefile b/board/freescale/mx6sxsabreauto/Makefile index 50f29a9dd0..9c6e126c00 100644 --- a/board/freescale/mx6sxsabreauto/Makefile +++ b/board/freescale/mx6sxsabreauto/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2014 Freescale Semiconductor, Inc. obj-y := mx6sxsabreauto.o diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg index da703093aa..f2ceb6b417 100644 --- a/board/freescale/mx6sxsabreauto/imximage.cfg +++ b/board/freescale/mx6sxsabreauto/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c index 84cc51e9ca..f7c203103d 100644 --- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6sxsabresd/Makefile b/board/freescale/mx6sxsabresd/Makefile index 266bd4ac49..a07a052173 100644 --- a/board/freescale/mx6sxsabresd/Makefile +++ b/board/freescale/mx6sxsabresd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2014 Freescale Semiconductor, Inc. obj-y := mx6sxsabresd.o diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg index 313ab58950..3d6f585618 100644 --- a/board/freescale/mx6sxsabresd/imximage.cfg +++ b/board/freescale/mx6sxsabresd/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index e7958df402..09c2641fc7 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6ul_14x14_evk/Makefile b/board/freescale/mx6ul_14x14_evk/Makefile index 272ada720e..bd0b681bd1 100644 --- a/board/freescale/mx6ul_14x14_evk/Makefile +++ b/board/freescale/mx6ul_14x14_evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2015 Freescale Semiconductor, Inc. obj-y := mx6ul_14x14_evk.o diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c index 534b16cec7..4177a09c57 100644 --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6ullevk/Makefile b/board/freescale/mx6ullevk/Makefile index 1ff03b5f1c..de4c99789c 100644 --- a/board/freescale/mx6ullevk/Makefile +++ b/board/freescale/mx6ullevk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 Freescale Semiconductor, Inc. obj-y := mx6ullevk.o diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg index 0c6f444a7a..7485f4b81a 100644 --- a/board/freescale/mx6ullevk/imximage.cfg +++ b/board/freescale/mx6ullevk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index de45f8b1d2..2a5249211d 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx6ullevk/plugin.S b/board/freescale/mx6ullevk/plugin.S index 1f631ff5e3..307f5be161 100644 --- a/board/freescale/mx6ullevk/plugin.S +++ b/board/freescale/mx6ullevk/plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx7dsabresd/Makefile b/board/freescale/mx7dsabresd/Makefile index 852b3d87ad..c8a8bf0b8e 100644 --- a/board/freescale/mx7dsabresd/Makefile +++ b/board/freescale/mx7dsabresd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2015 Freescale Semiconductor, Inc. obj-y := mx7dsabresd.o diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg index 59e66fbda1..69a4e545c4 100644 --- a/board/freescale/mx7dsabresd/imximage.cfg +++ b/board/freescale/mx7dsabresd/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index cff2e6a871..f3f4d7b216 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx7ulp_evk/Makefile b/board/freescale/mx7ulp_evk/Makefile index 9f33c61f03..1770b74051 100644 --- a/board/freescale/mx7ulp_evk/Makefile +++ b/board/freescale/mx7ulp_evk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 Freescale Semiconductor, Inc. obj-y := mx7ulp_evk.o diff --git a/board/freescale/mx7ulp_evk/imximage.cfg b/board/freescale/mx7ulp_evk/imximage.cfg index 62fd79afd6..e19a958cae 100644 --- a/board/freescale/mx7ulp_evk/imximage.cfg +++ b/board/freescale/mx7ulp_evk/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c index 01e3213653..d029f532d7 100644 --- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c +++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/mx7ulp_evk/plugin.S b/board/freescale/mx7ulp_evk/plugin.S index 2cc93dbdd5..1514491254 100644 --- a/board/freescale/mx7ulp_evk/plugin.S +++ b/board/freescale/mx7ulp_evk/plugin.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/board/freescale/p1010rdb/Makefile b/board/freescale/p1010rdb/Makefile index a00806e6aa..3aded3396a 100644 --- a/board/freescale/p1010rdb/Makefile +++ b/board/freescale/p1010rdb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2010-2011 Freescale Semiconductor, Inc. diff --git a/board/freescale/p1010rdb/ddr.c b/board/freescale/p1010rdb/ddr.c index b423ec8e21..e7c6db972f 100644 --- a/board/freescale/p1010rdb/ddr.c +++ b/board/freescale/p1010rdb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1010rdb/law.c b/board/freescale/p1010rdb/law.c index 13fc2fa2e3..f59a557a46 100644 --- a/board/freescale/p1010rdb/law.c +++ b/board/freescale/p1010rdb/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index d32274b248..a40e53a1a5 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/board/freescale/p1010rdb/spl.c b/board/freescale/p1010rdb/spl.c index e450f626e0..9f985c21cb 100644 --- a/board/freescale/p1010rdb/spl.c +++ b/board/freescale/p1010rdb/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/freescale/p1010rdb/spl_minimal.c index 8f0dec4c0a..fbc0731707 100644 --- a/board/freescale/p1010rdb/spl_minimal.c +++ b/board/freescale/p1010rdb/spl_minimal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1010rdb/tlb.c b/board/freescale/p1010rdb/tlb.c index 265cde81a3..f79a3773f7 100644 --- a/board/freescale/p1010rdb/tlb.c +++ b/board/freescale/p1010rdb/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1_p2_rdb_pc/Makefile b/board/freescale/p1_p2_rdb_pc/Makefile index cbdb2507e8..ed3561b6d5 100644 --- a/board/freescale/p1_p2_rdb_pc/Makefile +++ b/board/freescale/p1_p2_rdb_pc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2010-2011 Freescale Semiconductor, Inc. diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/freescale/p1_p2_rdb_pc/law.c index 6085984eab..b3c79d49ff 100644 --- a/board/freescale/p1_p2_rdb_pc/law.c +++ b/board/freescale/p1_p2_rdb_pc/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 602b7f0156..19358416e6 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011, 2013 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/freescale/p1_p2_rdb_pc/spl.c index 6c3f82849e..cc08531710 100644 --- a/board/freescale/p1_p2_rdb_pc/spl.c +++ b/board/freescale/p1_p2_rdb_pc/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/freescale/p1_p2_rdb_pc/spl_minimal.c index f9e0b5b25a..3d0be0025b 100644 --- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c +++ b/board/freescale/p1_p2_rdb_pc/spl_minimal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index 94773969e9..59a29369ff 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p2041rdb/Makefile b/board/freescale/p2041rdb/Makefile index ebd0982b5d..04830e38ee 100644 --- a/board/freescale/p2041rdb/Makefile +++ b/board/freescale/p2041rdb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2011 Freescale Semiconductor, Inc. # (C) Copyright 2001-2006 diff --git a/board/freescale/p2041rdb/cpld.c b/board/freescale/p2041rdb/cpld.c index a1908b8a57..2c4712e53d 100644 --- a/board/freescale/p2041rdb/cpld.c +++ b/board/freescale/p2041rdb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright 2011 Freescale Semiconductor * Author: Mingkai Hu <Mingkai.hu(a)freescale.com> diff --git a/board/freescale/p2041rdb/cpld.h b/board/freescale/p2041rdb/cpld.h index 8c90c1ccf3..7aa300f9a3 100644 --- a/board/freescale/p2041rdb/cpld.h +++ b/board/freescale/p2041rdb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * Copyright 2011 Freescale Semiconductor * Author: Mingkai Hu <Mingkai.hu(a)freescale.com> diff --git a/board/freescale/p2041rdb/eth.c b/board/freescale/p2041rdb/eth.c index c0d05539c5..e5776b4237 100644 --- a/board/freescale/p2041rdb/eth.c +++ b/board/freescale/p2041rdb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. * Author: Mingkai Hu <Mingkai.hu(a)freescale.com> diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index 575259b19c..bd80adf0b2 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011,2012 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/p2041rdb/pbi.cfg b/board/freescale/p2041rdb/pbi.cfg index 75dfc32162..6cd52d228e 100644 --- a/board/freescale/p2041rdb/pbi.cfg +++ b/board/freescale/p2041rdb/pbi.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2012 Freescale Semiconductor, Inc. # Refer doc/README.pblimage for more details about how-to configure diff --git a/board/freescale/t102xrdb/Makefile b/board/freescale/t102xrdb/Makefile index e597486c94..7ddeeb7e13 100644 --- a/board/freescale/t102xrdb/Makefile +++ b/board/freescale/t102xrdb/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/freescale/t102xrdb/cpld.c b/board/freescale/t102xrdb/cpld.c index 17a6226caf..bb72e5b411 100644 --- a/board/freescale/t102xrdb/cpld.c +++ b/board/freescale/t102xrdb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h index bd40cc319a..12557c3173 100644 --- a/board/freescale/t102xrdb/cpld.h +++ b/board/freescale/t102xrdb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c index 1b41739899..e1e0014520 100644 --- a/board/freescale/t102xrdb/ddr.c +++ b/board/freescale/t102xrdb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/freescale/t102xrdb/eth_t102xrdb.c index ad78f72f98..583dc42098 100644 --- a/board/freescale/t102xrdb/eth_t102xrdb.c +++ b/board/freescale/t102xrdb/eth_t102xrdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t102xrdb/law.c b/board/freescale/t102xrdb/law.c index d636bef325..4f2716e8dc 100644 --- a/board/freescale/t102xrdb/law.c +++ b/board/freescale/t102xrdb/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c index 9faf259af7..ff7d6a129c 100644 --- a/board/freescale/t102xrdb/spl.c +++ b/board/freescale/t102xrdb/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index 73f9d3ac72..4bd07ba594 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-2023 NXP diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/freescale/t102xrdb/t102xrdb.h index 33df0f24df..4a3f5899e1 100644 --- a/board/freescale/t102xrdb/t102xrdb.h +++ b/board/freescale/t102xrdb/t102xrdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t102xrdb/tlb.c b/board/freescale/t102xrdb/tlb.c index 2519a9e4db..ee286d8c4c 100644 --- a/board/freescale/t102xrdb/tlb.c +++ b/board/freescale/t102xrdb/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/Makefile b/board/freescale/t104xrdb/Makefile index a949501943..8d76e4db68 100644 --- a/board/freescale/t104xrdb/Makefile +++ b/board/freescale/t104xrdb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/freescale/t104xrdb/cpld.c b/board/freescale/t104xrdb/cpld.c index 9ac57bbd83..6f03908f83 100644 --- a/board/freescale/t104xrdb/cpld.c +++ b/board/freescale/t104xrdb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h index 0384202fbc..2cf8c9ed75 100644 --- a/board/freescale/t104xrdb/cpld.h +++ b/board/freescale/t104xrdb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * Copyright 2013 Freescale Semiconductor * diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c index 02ddb66141..6fa68ff463 100644 --- a/board/freescale/t104xrdb/ddr.c +++ b/board/freescale/t104xrdb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/t104xrdb/ddr.h b/board/freescale/t104xrdb/ddr.h index f9d667f617..2cea238423 100644 --- a/board/freescale/t104xrdb/ddr.h +++ b/board/freescale/t104xrdb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index 5eca9386f6..80dc86b3f9 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/law.c b/board/freescale/t104xrdb/law.c index a0d6eb5b27..957366ae08 100644 --- a/board/freescale/t104xrdb/law.c +++ b/board/freescale/t104xrdb/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c index dd8283f3c6..3ebdd07c9b 100644 --- a/board/freescale/t104xrdb/spl.c +++ b/board/freescale/t104xrdb/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index b308049271..2ce589f60f 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * Copyright 2023 NXP diff --git a/board/freescale/t104xrdb/t104xrdb.h b/board/freescale/t104xrdb/t104xrdb.h index 678724c7e2..a9f307d2d1 100644 --- a/board/freescale/t104xrdb/t104xrdb.h +++ b/board/freescale/t104xrdb/t104xrdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t104xrdb/tlb.c b/board/freescale/t104xrdb/tlb.c index 10be580b81..2c1247028c 100644 --- a/board/freescale/t104xrdb/tlb.c +++ b/board/freescale/t104xrdb/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xqds/Makefile b/board/freescale/t208xqds/Makefile index de8613058d..38ce823f02 100644 --- a/board/freescale/t208xqds/Makefile +++ b/board/freescale/t208xqds/Makefile @@ -1,7 +1,7 @@ # # Copyright 2013 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/freescale/t208xqds/ddr.h b/board/freescale/t208xqds/ddr.h index 9dd39813bf..7714a8ae2f 100644 --- a/board/freescale/t208xqds/ddr.h +++ b/board/freescale/t208xqds/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c index 569b193eab..85cfd27257 100644 --- a/board/freescale/t208xqds/eth_t208xqds.c +++ b/board/freescale/t208xqds/eth_t208xqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/board/freescale/t208xqds/law.c b/board/freescale/t208xqds/law.c index 3cdd493768..47733b6e70 100644 --- a/board/freescale/t208xqds/law.c +++ b/board/freescale/t208xqds/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2012 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t208xqds/spl.c b/board/freescale/t208xqds/spl.c index 8866be54a6..d9fbbd5c79 100644 --- a/board/freescale/t208xqds/spl.c +++ b/board/freescale/t208xqds/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xqds/t208x_pbi.cfg b/board/freescale/t208xqds/t208x_pbi.cfg index 43be8a864e..6966ea37da 100644 --- a/board/freescale/t208xqds/t208x_pbi.cfg +++ b/board/freescale/t208xqds/t208x_pbi.cfg @@ -1,7 +1,7 @@ # # Copyright 2013 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Refer doc/README.pblimage for more details about how-to configure # and create PBL boot image diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index 8be55e52e5..2abfa8193c 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2013 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/board/freescale/t208xqds/t208xqds.h b/board/freescale/t208xqds/t208xqds.h index 50ebb6f6f9..521cd703d9 100644 --- a/board/freescale/t208xqds/t208xqds.h +++ b/board/freescale/t208xqds/t208xqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xqds/t208xqds_qixis.h b/board/freescale/t208xqds/t208xqds_qixis.h index 0f9a45a6fd..ee0bb99bad 100644 --- a/board/freescale/t208xqds/t208xqds_qixis.h +++ b/board/freescale/t208xqds/t208xqds_qixis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xqds/tlb.c b/board/freescale/t208xqds/tlb.c index 3d220afc16..671200e7d2 100644 --- a/board/freescale/t208xqds/tlb.c +++ b/board/freescale/t208xqds/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2013 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t208xrdb/Makefile b/board/freescale/t208xrdb/Makefile index 7af3cd0ac4..91aadcb820 100644 --- a/board/freescale/t208xrdb/Makefile +++ b/board/freescale/t208xrdb/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/freescale/t208xrdb/cpld.c b/board/freescale/t208xrdb/cpld.c index 933fa0decc..95a1d18c3f 100644 --- a/board/freescale/t208xrdb/cpld.c +++ b/board/freescale/t208xrdb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t208xrdb/cpld.h b/board/freescale/t208xrdb/cpld.h index 3139c2b85f..46d13eaee3 100644 --- a/board/freescale/t208xrdb/cpld.h +++ b/board/freescale/t208xrdb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor * Copyright 2021 NXP diff --git a/board/freescale/t208xrdb/ddr.h b/board/freescale/t208xrdb/ddr.h index c00f178166..5204b0a4d8 100644 --- a/board/freescale/t208xrdb/ddr.h +++ b/board/freescale/t208xrdb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c index e4592eac15..b6c1fd72e9 100644 --- a/board/freescale/t208xrdb/eth_t208xrdb.c +++ b/board/freescale/t208xrdb/eth_t208xrdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/t208xrdb/law.c b/board/freescale/t208xrdb/law.c index 53a1369450..be6e27c0e9 100644 --- a/board/freescale/t208xrdb/law.c +++ b/board/freescale/t208xrdb/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t208xrdb/spl.c b/board/freescale/t208xrdb/spl.c index 130cb8847c..a491c3e58c 100644 --- a/board/freescale/t208xrdb/spl.c +++ b/board/freescale/t208xrdb/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t208xrdb/t2080_pbi.cfg b/board/freescale/t208xrdb/t2080_pbi.cfg index 43be8a864e..6966ea37da 100644 --- a/board/freescale/t208xrdb/t2080_pbi.cfg +++ b/board/freescale/t208xrdb/t2080_pbi.cfg @@ -1,7 +1,7 @@ # # Copyright 2013 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Refer doc/README.pblimage for more details about how-to configure # and create PBL boot image diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index e33e5d082d..26f7607a95 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2013 Freescale Semiconductor, Inc. * Copyright 2021-2023 NXP diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/freescale/t208xrdb/t208xrdb.h index 26998898e8..f3a4b85bea 100644 --- a/board/freescale/t208xrdb/t208xrdb.h +++ b/board/freescale/t208xrdb/t208xrdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/board/freescale/t208xrdb/tlb.c b/board/freescale/t208xrdb/tlb.c index 688a208c62..e935db1af1 100644 --- a/board/freescale/t208xrdb/tlb.c +++ b/board/freescale/t208xrdb/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t4rdb/Makefile b/board/freescale/t4rdb/Makefile index 3106848639..25c0c4979e 100644 --- a/board/freescale/t4rdb/Makefile +++ b/board/freescale/t4rdb/Makefile @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/freescale/t4rdb/cpld.c b/board/freescale/t4rdb/cpld.c index 8b1012086e..8ed7f7e1fe 100644 --- a/board/freescale/t4rdb/cpld.c +++ b/board/freescale/t4rdb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t4rdb/cpld.h b/board/freescale/t4rdb/cpld.h index fcac9244c8..09d8897e95 100644 --- a/board/freescale/t4rdb/cpld.h +++ b/board/freescale/t4rdb/cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * Copyright 2014 Freescale Semiconductor * diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c index 57cbde154f..f24ae4cc77 100644 --- a/board/freescale/t4rdb/ddr.c +++ b/board/freescale/t4rdb/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t4rdb/ddr.h b/board/freescale/t4rdb/ddr.h index 74a2779611..fe71c8b6d0 100644 --- a/board/freescale/t4rdb/ddr.h +++ b/board/freescale/t4rdb/ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t4rdb/eth.c b/board/freescale/t4rdb/eth.c index 2e52543847..0c9e6cd158 100644 --- a/board/freescale/t4rdb/eth.c +++ b/board/freescale/t4rdb/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t4rdb/law.c b/board/freescale/t4rdb/law.c index 43eeb884e2..c108503c4d 100644 --- a/board/freescale/t4rdb/law.c +++ b/board/freescale/t4rdb/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t4rdb/spl.c b/board/freescale/t4rdb/spl.c index 779457d296..641b2c542d 100644 --- a/board/freescale/t4rdb/spl.c +++ b/board/freescale/t4rdb/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index ab717769ed..e2a5dd02d8 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2023 NXP diff --git a/board/freescale/t4rdb/t4_pbi.cfg b/board/freescale/t4rdb/t4_pbi.cfg index 0b326fa163..75264befe4 100644 --- a/board/freescale/t4rdb/t4_pbi.cfg +++ b/board/freescale/t4rdb/t4_pbi.cfg @@ -1,7 +1,7 @@ # # Copyright 2014 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # #PBI commands diff --git a/board/freescale/t4rdb/t4rdb.h b/board/freescale/t4rdb/t4rdb.h index bb3ce216d7..5b8aba44af 100644 --- a/board/freescale/t4rdb/t4rdb.h +++ b/board/freescale/t4rdb/t4rdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/t4rdb/tlb.c b/board/freescale/t4rdb/tlb.c index f5af893c2d..629fdf78fc 100644 --- a/board/freescale/t4rdb/tlb.c +++ b/board/freescale/t4rdb/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/board/freescale/vf610twr/Makefile b/board/freescale/vf610twr/Makefile index 43934e8b2a..c61f7cb9d4 100644 --- a/board/freescale/vf610twr/Makefile +++ b/board/freescale/vf610twr/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/freescale/vf610twr/imximage.cfg b/board/freescale/vf610twr/imximage.cfg index e2fa1a582d..55b1b76cba 100644 --- a/board/freescale/vf610twr/imximage.cfg +++ b/board/freescale/vf610twr/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/board/freescale/vf610twr/vf610twr.c b/board/freescale/vf610twr/vf610twr.c index 98cb0140ad..9207c3ad4c 100644 --- a/board/freescale/vf610twr/vf610twr.c +++ b/board/freescale/vf610twr/vf610twr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/board/friendlyarm/nanopi2/Makefile b/board/friendlyarm/nanopi2/Makefile index 5c8b3b77fc..56ace1af94 100644 --- a/board/friendlyarm/nanopi2/Makefile +++ b/board/friendlyarm/nanopi2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Hyunseok, Jung <hsjung(a)nexell.co.kr> diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c index 393c5a447d..e1092d3a73 100644 --- a/board/friendlyarm/nanopi2/board.c +++ b/board/friendlyarm/nanopi2/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/board/friendlyarm/nanopi2/hwrev.c b/board/friendlyarm/nanopi2/hwrev.c index 585e08c944..6001e91852 100644 --- a/board/friendlyarm/nanopi2/hwrev.c +++ b/board/friendlyarm/nanopi2/hwrev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/board/friendlyarm/nanopi2/hwrev.h b/board/friendlyarm/nanopi2/hwrev.h index 403303131e..06b0946390 100644 --- a/board/friendlyarm/nanopi2/hwrev.h +++ b/board/friendlyarm/nanopi2/hwrev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/board/friendlyarm/nanopi2/lcds.c b/board/friendlyarm/nanopi2/lcds.c index 7303e53af9..beac846233 100644 --- a/board/friendlyarm/nanopi2/lcds.c +++ b/board/friendlyarm/nanopi2/lcds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 FriendlyARM (www.arm9.net) */ diff --git a/board/friendlyarm/nanopi2/nxp-fb.h b/board/friendlyarm/nanopi2/nxp-fb.h index d31a03d7ce..4f220f0bb0 100644 --- a/board/friendlyarm/nanopi2/nxp-fb.h +++ b/board/friendlyarm/nanopi2/nxp-fb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2017 FriendlyARM (www.arm9.net) * diff --git a/board/friendlyarm/nanopi2/onewire.c b/board/friendlyarm/nanopi2/onewire.c index 56f0f2dfce..4b8adb158d 100644 --- a/board/friendlyarm/nanopi2/onewire.c +++ b/board/friendlyarm/nanopi2/onewire.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/board/friendlyarm/nanopi2/onewire.h b/board/friendlyarm/nanopi2/onewire.h index 9f6d7cfe53..74bca9df77 100644 --- a/board/friendlyarm/nanopi2/onewire.h +++ b/board/friendlyarm/nanopi2/onewire.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/board/gardena/smart-gateway-at91sam/Makefile b/board/gardena/smart-gateway-at91sam/Makefile index a2ed79fd06..3c521a674f 100644 --- a/board/gardena/smart-gateway-at91sam/Makefile +++ b/board/gardena/smart-gateway-at91sam/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += board.o diff --git a/board/gardena/smart-gateway-at91sam/board.c b/board/gardena/smart-gateway-at91sam/board.c index d9dfb256b3..db09e7ccdb 100644 --- a/board/gardena/smart-gateway-at91sam/board.c +++ b/board/gardena/smart-gateway-at91sam/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Atmel Corporation * Copyright (C) 2019 Stefan Roese <sr(a)denx.de> diff --git a/board/gardena/smart-gateway-at91sam/spl.c b/board/gardena/smart-gateway-at91sam/spl.c index 2807c4e311..a786f1a391 100644 --- a/board/gardena/smart-gateway-at91sam/spl.c +++ b/board/gardena/smart-gateway-at91sam/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Atmel Corporation * Copyright (C) 2019 Stefan Roese <sr(a)denx.de> diff --git a/board/gardena/smart-gateway-mt7688/Makefile b/board/gardena/smart-gateway-mt7688/Makefile index 70cd7a8e56..330ae7b45e 100644 --- a/board/gardena/smart-gateway-mt7688/Makefile +++ b/board/gardena/smart-gateway-mt7688/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += board.o diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c index 0cfde91c94..37b6a3d6ef 100644 --- a/board/gardena/smart-gateway-mt7688/board.c +++ b/board/gardena/smart-gateway-mt7688/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> */ diff --git a/board/gateworks/gw_ventana/Makefile b/board/gateworks/gw_ventana/Makefile index c407f8e6c5..13214883d2 100644 --- a/board/gateworks/gw_ventana/Makefile +++ b/board/gateworks/gw_ventana/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2012-2013 Freescale Semiconductor, Inc. # Copyright (C) 2013, Gateworks Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := gw_ventana.o eeprom.o common.o diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 74328b2e1b..4307870a53 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Gateworks Corporation * diff --git a/board/gateworks/gw_ventana/common.h b/board/gateworks/gw_ventana/common.h index 480c6675d7..16e0c37dc5 100644 --- a/board/gateworks/gw_ventana/common.h +++ b/board/gateworks/gw_ventana/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Gateworks Corporation * diff --git a/board/gateworks/gw_ventana/eeprom.c b/board/gateworks/gw_ventana/eeprom.c index e622a9ba9e..bf4c6020dc 100644 --- a/board/gateworks/gw_ventana/eeprom.c +++ b/board/gateworks/gw_ventana/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Author: Tim Harvey <tharvey(a)gateworks.com> diff --git a/board/gateworks/gw_ventana/eeprom.h b/board/gateworks/gw_ventana/eeprom.h index 2354205e72..fa6c948a99 100644 --- a/board/gateworks/gw_ventana/eeprom.h +++ b/board/gateworks/gw_ventana/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Gateworks Corporation */ diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 683def7e9f..5dfbd1a854 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Gateworks Corporation * diff --git a/board/gateworks/gw_ventana/gw_ventana.env b/board/gateworks/gw_ventana/gw_ventana.env index 9a316c74f2..4d5cf71e20 100644 --- a/board/gateworks/gw_ventana/gw_ventana.env +++ b/board/gateworks/gw_ventana/gw_ventana.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Gateworks Corporation */ diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index 2f046c9c0b..d5379ed7b6 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Author: Tim Harvey <tharvey(a)gateworks.com> diff --git a/board/gateworks/venice/Makefile b/board/gateworks/venice/Makefile index faf1348cfa..7968a1a0d4 100644 --- a/board/gateworks/venice/Makefile +++ b/board/gateworks/venice/Makefile @@ -1,7 +1,7 @@ # # Copyright 2021 Gateworks Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += venice.o eeprom.o diff --git a/board/gateworks/venice/eeprom.c b/board/gateworks/venice/eeprom.c index 241be4ee63..61e299ff02 100644 --- a/board/gateworks/venice/eeprom.c +++ b/board/gateworks/venice/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gateworks/venice/eeprom.h b/board/gateworks/venice/eeprom.h index bb7a5fa9ad..ce330f53d4 100644 --- a/board/gateworks/venice/eeprom.h +++ b/board/gateworks/venice/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gateworks/venice/imximage-8mm-lpddr4.cfg b/board/gateworks/venice/imximage-8mm-lpddr4.cfg index 6bc457c6a2..487058edb8 100644 --- a/board/gateworks/venice/imximage-8mm-lpddr4.cfg +++ b/board/gateworks/venice/imximage-8mm-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gateworks/venice/imximage-8mn-lpddr4.cfg b/board/gateworks/venice/imximage-8mn-lpddr4.cfg index 8ff3e87d9d..02115c5186 100644 --- a/board/gateworks/venice/imximage-8mn-lpddr4.cfg +++ b/board/gateworks/venice/imximage-8mn-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Gateworks Corporation */ diff --git a/board/gateworks/venice/imximage-8mp-lpddr4.cfg b/board/gateworks/venice/imximage-8mp-lpddr4.cfg index 7731d54d4a..158ce209aa 100644 --- a/board/gateworks/venice/imximage-8mp-lpddr4.cfg +++ b/board/gateworks/venice/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Gateworks Corporation */ diff --git a/board/gateworks/venice/lpddr4_timing.h b/board/gateworks/venice/lpddr4_timing.h index d19902f10e..7fcc32a320 100644 --- a/board/gateworks/venice/lpddr4_timing.h +++ b/board/gateworks/venice/lpddr4_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gateworks/venice/lpddr4_timing_imx8mm.c b/board/gateworks/venice/lpddr4_timing_imx8mm.c index 78b431dc28..f328535f2e 100644 --- a/board/gateworks/venice/lpddr4_timing_imx8mm.c +++ b/board/gateworks/venice/lpddr4_timing_imx8mm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation * diff --git a/board/gateworks/venice/lpddr4_timing_imx8mm_512mb.c b/board/gateworks/venice/lpddr4_timing_imx8mm_512mb.c index 8803fbfdc7..35ae80c57f 100644 --- a/board/gateworks/venice/lpddr4_timing_imx8mm_512mb.c +++ b/board/gateworks/venice/lpddr4_timing_imx8mm_512mb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generated code from MX8M_DDR_tool v3.20 using RPAv20 * - 1x Micron MT53E128M32D2DS-046 32bit dual-channel for total of 512MiB diff --git a/board/gateworks/venice/lpddr4_timing_imx8mn.c b/board/gateworks/venice/lpddr4_timing_imx8mn.c index 9ba2d2571c..2724d93d54 100644 --- a/board/gateworks/venice/lpddr4_timing_imx8mn.c +++ b/board/gateworks/venice/lpddr4_timing_imx8mn.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <linux/kernel.h> #include <asm/arch/ddr.h> diff --git a/board/gateworks/venice/lpddr4_timing_imx8mp.c b/board/gateworks/venice/lpddr4_timing_imx8mp.c index 7bfd1b556b..47c5c55bcf 100644 --- a/board/gateworks/venice/lpddr4_timing_imx8mp.c +++ b/board/gateworks/venice/lpddr4_timing_imx8mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <linux/kernel.h> #include <asm/arch/ddr.h> diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index 31a2350417..6ea16f735c 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index a39ae58c8a..3823c6d82f 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Gateworks Corporation */ diff --git a/board/gdsys/a38x/Makefile b/board/gdsys/a38x/Makefile index 4b13859fed..795f72adef 100644 --- a/board/gdsys/a38x/Makefile +++ b/board/gdsys/a38x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> # Copyright (C) 2015 Reinhard Pfau <reinhard.pfau(a)gdsys.cc> diff --git a/board/gdsys/a38x/controlcenterdc.c b/board/gdsys/a38x/controlcenterdc.c index 0f620c2d91..6463571fbb 100644 --- a/board/gdsys/a38x/controlcenterdc.c +++ b/board/gdsys/a38x/controlcenterdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> * Copyright (C) 2016 Mario Six <mario.six(a)gdsys.cc> diff --git a/board/gdsys/a38x/dt_helpers.c b/board/gdsys/a38x/dt_helpers.c index 61d30c2e63..b78008c2f1 100644 --- a/board/gdsys/a38x/dt_helpers.c +++ b/board/gdsys/a38x/dt_helpers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/board/gdsys/a38x/dt_helpers.h b/board/gdsys/a38x/dt_helpers.h index 245fadd0d7..8f4e3a4757 100644 --- a/board/gdsys/a38x/dt_helpers.h +++ b/board/gdsys/a38x/dt_helpers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/board/gdsys/a38x/hre.c b/board/gdsys/a38x/hre.c index d16233ed78..479b552104 100644 --- a/board/gdsys/a38x/hre.c +++ b/board/gdsys/a38x/hre.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.pfau(a)gdsys.cc diff --git a/board/gdsys/a38x/hre.h b/board/gdsys/a38x/hre.h index da983aa452..aa94fb2ecd 100644 --- a/board/gdsys/a38x/hre.h +++ b/board/gdsys/a38x/hre.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Reinhard Pfau, Guntermann & Drunck GmbH, reinhard.pfau(a)gdsys.cc diff --git a/board/gdsys/a38x/keyprogram.c b/board/gdsys/a38x/keyprogram.c index 7020fae189..7f4edcc935 100644 --- a/board/gdsys/a38x/keyprogram.c +++ b/board/gdsys/a38x/keyprogram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/board/gdsys/a38x/keyprogram.h b/board/gdsys/a38x/keyprogram.h index 06889c67e4..c248138c77 100644 --- a/board/gdsys/a38x/keyprogram.h +++ b/board/gdsys/a38x/keyprogram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile index 94cbf3c5cc..f4b3592a71 100644 --- a/board/gdsys/common/Makefile +++ b/board/gdsys/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 # Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/board/gdsys/common/cmd_ioloop.c b/board/gdsys/common/cmd_ioloop.c index 1412421a02..de9cec6fd9 100644 --- a/board/gdsys/common/cmd_ioloop.c +++ b/board/gdsys/common/cmd_ioloop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/dp501.c b/board/gdsys/common/dp501.c index 9ca69ebcbb..a63938dfcc 100644 --- a/board/gdsys/common/dp501.c +++ b/board/gdsys/common/dp501.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/ihs_mdio.c b/board/gdsys/common/ihs_mdio.c index 5f1215e9e8..a1423c07f9 100644 --- a/board/gdsys/common/ihs_mdio.c +++ b/board/gdsys/common/ihs_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/ihs_mdio.h b/board/gdsys/common/ihs_mdio.h index d0a4b0d7a8..8795fc51a1 100644 --- a/board/gdsys/common/ihs_mdio.h +++ b/board/gdsys/common/ihs_mdio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/ioep-fpga.c b/board/gdsys/common/ioep-fpga.c index 7292d7ab5a..7c80629026 100644 --- a/board/gdsys/common/ioep-fpga.c +++ b/board/gdsys/common/ioep-fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/ioep-fpga.h b/board/gdsys/common/ioep-fpga.h index 53570b936a..c3516f62d5 100644 --- a/board/gdsys/common/ioep-fpga.h +++ b/board/gdsys/common/ioep-fpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index dc548efbc7..49aa525bce 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/osd.h b/board/gdsys/common/osd.h index 4e8e53ab43..c90d80acf1 100644 --- a/board/gdsys/common/osd.h +++ b/board/gdsys/common/osd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/common/osd_cmd.c b/board/gdsys/common/osd_cmd.c index 6a9c0b4c24..4933d31653 100644 --- a/board/gdsys/common/osd_cmd.c +++ b/board/gdsys/common/osd_cmd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/board/gdsys/mpc8308/Makefile b/board/gdsys/mpc8308/Makefile index f86d997bc7..3ec7077dc7 100644 --- a/board/gdsys/mpc8308/Makefile +++ b/board/gdsys/mpc8308/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 # Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/mpc8308/gazerbeam.c b/board/gdsys/mpc8308/gazerbeam.c index cc608c4ac4..4da8108221 100644 --- a/board/gdsys/mpc8308/gazerbeam.c +++ b/board/gdsys/mpc8308/gazerbeam.c @@ -2,7 +2,7 @@ * (C) Copyright 2015 * Dirk Eibach, Guntermann & Drunck GmbH, eibach(a)gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/board/gdsys/mpc8308/mpc8308.c b/board/gdsys/mpc8308/mpc8308.c index 0f90f8ad32..f89098b78e 100644 --- a/board/gdsys/mpc8308/mpc8308.c +++ b/board/gdsys/mpc8308/mpc8308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/board/gdsys/mpc8308/sdram.c b/board/gdsys/mpc8308/sdram.c index 4fac146353..38e9c71d14 100644 --- a/board/gdsys/mpc8308/sdram.c +++ b/board/gdsys/mpc8308/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 Freescale Semiconductor, Inc. * Copyright (C) 2010 Ilya Yanok, Emcraft Systems, yanok(a)emcraft.com diff --git a/board/ge/b1x5v2/Makefile b/board/ge/b1x5v2/Makefile index 8a27af52e1..e189080022 100644 --- a/board/ge/b1x5v2/Makefile +++ b/board/ge/b1x5v2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2018-2020 Collabora # Copyright 2018-2020 GE diff --git a/board/ge/b1x5v2/b1x5v2.c b/board/ge/b1x5v2/b1x5v2.c index a2cbd1512e..88553de019 100644 --- a/board/ge/b1x5v2/b1x5v2.c +++ b/board/ge/b1x5v2/b1x5v2.c @@ -4,7 +4,7 @@ * Copyright 2018-2020 GE Inc. * Copyright 2018-2020 Collabora Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <asm/arch/clock.h> diff --git a/board/ge/b1x5v2/spl.c b/board/ge/b1x5v2/spl.c index 460d3be1d8..8a27202a21 100644 --- a/board/ge/b1x5v2/spl.c +++ b/board/ge/b1x5v2/spl.c @@ -5,7 +5,7 @@ * Copyright 2018-2020 GE Inc. * Copyright 2018-2020 Collabora Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <asm/arch/clock.h> diff --git a/board/ge/bx50v3/Makefile b/board/ge/bx50v3/Makefile index 9b80e7c24c..8fa25f4ee3 100644 --- a/board/ge/bx50v3/Makefile +++ b/board/ge/bx50v3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2015 Timesys Corporation # Copyright 2015 General Electric Company diff --git a/board/ge/bx50v3/bx50v3.c b/board/ge/bx50v3/bx50v3.c index 2d8951964a..22963a69ba 100644 --- a/board/ge/bx50v3/bx50v3.c +++ b/board/ge/bx50v3/bx50v3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Timesys Corporation * Copyright 2015 General Electric Company diff --git a/board/ge/bx50v3/bx50v3.cfg b/board/ge/bx50v3/bx50v3.cfg index 1386516a16..a9815d8549 100644 --- a/board/ge/bx50v3/bx50v3.cfg +++ b/board/ge/bx50v3/bx50v3.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * Copyright 2015 Timesys Corporation. diff --git a/board/ge/common/Makefile b/board/ge/common/Makefile index 8bd44e3c8a..ef92743325 100644 --- a/board/ge/common/Makefile +++ b/board/ge/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2017 General Electric Company diff --git a/board/ge/common/ge_rtc.c b/board/ge/common/ge_rtc.c index 6437afc7bd..49aa3c8afb 100644 --- a/board/ge/common/ge_rtc.c +++ b/board/ge/common/ge_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 General Electric Company */ diff --git a/board/ge/common/ge_rtc.h b/board/ge/common/ge_rtc.h index d33486d082..26cc783c1d 100644 --- a/board/ge/common/ge_rtc.h +++ b/board/ge/common/ge_rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 General Electric Company */ diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c index c28d2c03cf..71e19bbafb 100644 --- a/board/ge/common/vpd_reader.c +++ b/board/ge/common/vpd_reader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 General Electric Company */ diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h index 0c51dc57e9..e3598bf810 100644 --- a/board/ge/common/vpd_reader.h +++ b/board/ge/common/vpd_reader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 General Electric Company */ diff --git a/board/ge/mx53ppd/Makefile b/board/ge/mx53ppd/Makefile index 9fae414399..3a27a7314a 100644 --- a/board/ge/mx53ppd/Makefile +++ b/board/ge/mx53ppd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2017 General Electric Company # # Based on board/freescale/mx53loco/Makefile: diff --git a/board/ge/mx53ppd/imximage.cfg b/board/ge/mx53ppd/imximage.cfg index 1ee8198390..45f050962d 100644 --- a/board/ge/mx53ppd/imximage.cfg +++ b/board/ge/mx53ppd/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 General Electric Company * diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index cc462d53da..64d979b23b 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 General Electric Company * diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c index 4e2c6ebde7..6e5e5b3ddb 100644 --- a/board/ge/mx53ppd/mx53ppd_video.c +++ b/board/ge/mx53ppd/mx53ppd_video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 General Electric Company * diff --git a/board/ge/mx53ppd/ppd_gpio.h b/board/ge/mx53ppd/ppd_gpio.h index 98c41d4d67..a9acbda1db 100644 --- a/board/ge/mx53ppd/ppd_gpio.h +++ b/board/ge/mx53ppd/ppd_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 General Electric Company */ diff --git a/board/google/Kconfig b/board/google/Kconfig index e4f9b5b68a..13527de21b 100644 --- a/board/google/Kconfig +++ b/board/google/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/google/chromebook_coral/Makefile b/board/google/chromebook_coral/Makefile index 846558d777..ea4419b179 100644 --- a/board/google/chromebook_coral/Makefile +++ b/board/google/chromebook_coral/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c index 9d9168d608..461b71f50d 100644 --- a/board/google/chromebook_coral/coral.c +++ b/board/google/chromebook_coral/coral.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC */ diff --git a/board/google/common/Makefile b/board/google/common/Makefile index d1f45c677a..a908c64101 100644 --- a/board/google/common/Makefile +++ b/board/google/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Google, Inc diff --git a/board/google/common/early_init.S b/board/google/common/early_init.S index 6ac64b3388..1ab0d2ccca 100644 --- a/board/google/common/early_init.S +++ b/board/google/common/early_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/board/google/gru/Makefile b/board/google/gru/Makefile index 9117534a49..65d1338209 100644 --- a/board/google/gru/Makefile +++ b/board/google/gru/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/board/google/gru/gru.c b/board/google/gru/gru.c index fbcf845e87..e6602f4b32 100644 --- a/board/google/gru/gru.c +++ b/board/google/gru/gru.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google */ diff --git a/board/google/imx8mq_phanbell/Makefile b/board/google/imx8mq_phanbell/Makefile index d6427cf8e9..95e4d30722 100644 --- a/board/google/imx8mq_phanbell/Makefile +++ b/board/google/imx8mq_phanbell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 NXP # diff --git a/board/google/imx8mq_phanbell/imx8mq_phanbell.c b/board/google/imx8mq_phanbell/imx8mq_phanbell.c index d0a740dd3f..49955025ea 100644 --- a/board/google/imx8mq_phanbell/imx8mq_phanbell.c +++ b/board/google/imx8mq_phanbell/imx8mq_phanbell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/board/google/imx8mq_phanbell/lpddr4_timing_1g.c b/board/google/imx8mq_phanbell/lpddr4_timing_1g.c index 7800011a04..5df3c0638c 100644 --- a/board/google/imx8mq_phanbell/lpddr4_timing_1g.c +++ b/board/google/imx8mq_phanbell/lpddr4_timing_1g.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP * diff --git a/board/google/imx8mq_phanbell/spl.c b/board/google/imx8mq_phanbell/spl.c index 83de5bfd75..5d5810df55 100644 --- a/board/google/imx8mq_phanbell/spl.c +++ b/board/google/imx8mq_phanbell/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP * diff --git a/board/google/veyron/Makefile b/board/google/veyron/Makefile index 98683579db..76d56d7ef4 100644 --- a/board/google/veyron/Makefile +++ b/board/google/veyron/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += veyron.o diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c index 32dbcdc4d1..afe7be031b 100644 --- a/board/google/veyron/veyron.c +++ b/board/google/veyron/veyron.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc */ diff --git a/board/grinn/chiliboard/Makefile b/board/grinn/chiliboard/Makefile index 2c33ccdbf2..027da2d900 100644 --- a/board/grinn/chiliboard/Makefile +++ b/board/grinn/chiliboard/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2017 Grinn obj-y := board.o diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c index b472ca5b94..bb8c79d70c 100644 --- a/board/grinn/chiliboard/board.c +++ b/board/grinn/chiliboard/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ * Copyright (C) 2017, Grinn - http://grinn-global.com/ diff --git a/board/grinn/liteboard/Makefile b/board/grinn/liteboard/Makefile index 06aa3eb562..7174efcf20 100644 --- a/board/grinn/liteboard/Makefile +++ b/board/grinn/liteboard/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 Grinn obj-y := board.o diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c index 48392c48e5..fe948f72bb 100644 --- a/board/grinn/liteboard/board.c +++ b/board/grinn/liteboard/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. * Copyright (C) 2016 Grinn diff --git a/board/hardkernel/odroid_go2/Makefile b/board/hardkernel/odroid_go2/Makefile index 51b9d24cfb..7fac9cad0d 100644 --- a/board/hardkernel/odroid_go2/Makefile +++ b/board/hardkernel/odroid_go2/Makefile @@ -1,7 +1,7 @@ # # Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += go2.o diff --git a/board/hardkernel/odroid_go2/go2.c b/board/hardkernel/odroid_go2/go2.c index a0338ead3b..00fda1f158 100644 --- a/board/hardkernel/odroid_go2/go2.c +++ b/board/hardkernel/odroid_go2/go2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/board/highbank/Makefile b/board/highbank/Makefile index 9e43211984..fa2929df82 100644 --- a/board/highbank/Makefile +++ b/board/highbank/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/highbank/ahci.c b/board/highbank/ahci.c index 9c057278ac..6ee7f89ff7 100644 --- a/board/highbank/ahci.c +++ b/board/highbank/ahci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Calxeda, Inc. */ diff --git a/board/highbank/hb_sregs.c b/board/highbank/hb_sregs.c index d9dd2c2bf6..d3b1cf8f81 100644 --- a/board/highbank/hb_sregs.c +++ b/board/highbank/hb_sregs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Calxeda Highbank/Midway "system registers" bus driver * diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index b5fa5101e8..7a8e293913 100644 --- a/board/highbank/highbank.c +++ b/board/highbank/highbank.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. */ diff --git a/board/hisilicon/hikey/Makefile b/board/hisilicon/hikey/Makefile index 5b8e76f0b9..00e31d5049 100644 --- a/board/hisilicon/hikey/Makefile +++ b/board/hisilicon/hikey/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index c9a2d60ee5..df05e8fb84 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/board/hisilicon/hikey960/Makefile b/board/hisilicon/hikey960/Makefile index ea5a70921f..8d03ee62d0 100644 --- a/board/hisilicon/hikey960/Makefile +++ b/board/hisilicon/hikey960/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := hikey960.o diff --git a/board/hisilicon/hikey960/hikey960.c b/board/hisilicon/hikey960/hikey960.c index f41fabbad0..ea14cc7e74 100644 --- a/board/hisilicon/hikey960/hikey960.c +++ b/board/hisilicon/hikey960/hikey960.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Linaro * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> diff --git a/board/hisilicon/poplar/Makefile b/board/hisilicon/poplar/Makefile index 9f2e9c4d48..55b01f1883 100644 --- a/board/hisilicon/poplar/Makefile +++ b/board/hisilicon/poplar/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Linaro # Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)linaro.org> diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index b89e7e8697..11423e1aee 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Linaro * Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)linaro.org> diff --git a/board/hoperun/hihope-rzg2/Makefile b/board/hoperun/hihope-rzg2/Makefile index e989e7aacc..edbe3b311b 100644 --- a/board/hoperun/hihope-rzg2/Makefile +++ b/board/hoperun/hihope-rzg2/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2021 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := hihope-rzg2.o ../../renesas/rcar-common/common.o diff --git a/board/hoperun/hihope-rzg2/hihope-rzg2.c b/board/hoperun/hihope-rzg2/hihope-rzg2.c index 3372290120..dfbe1b9faf 100644 --- a/board/hoperun/hihope-rzg2/hihope-rzg2.c +++ b/board/hoperun/hihope-rzg2/hihope-rzg2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/hoperun/hihope-rzg2/hihope-rzg2.c * This file is HiHope RZ/G2[HMN] board support. diff --git a/board/hpe/gxp/gxp.env b/board/hpe/gxp/gxp.env index 4760bf1663..e97c86336f 100644 --- a/board/hpe/gxp/gxp.env +++ b/board/hpe/gxp/gxp.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ recover_file=openbmc-hpe-recovery-image.mtd recover_cmd=usb start; mw.b 0xD100000D 0x40; diff --git a/board/hpe/gxp/gxp_board.c b/board/hpe/gxp/gxp_board.c index d94d9b8a19..8191977956 100644 --- a/board/hpe/gxp/gxp_board.c +++ b/board/hpe/gxp/gxp_board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GXP timer driver * diff --git a/board/htc/endeavoru/Makefile b/board/htc/endeavoru/Makefile index 0c6ba4af3b..dacc12c099 100644 --- a/board/htc/endeavoru/Makefile +++ b/board/htc/endeavoru/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/htc/endeavoru/endeavoru-spl.c b/board/htc/endeavoru/endeavoru-spl.c index 7921ff1a73..5358a9199d 100644 --- a/board/htc/endeavoru/endeavoru-spl.c +++ b/board/htc/endeavoru/endeavoru-spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * T30 HTC Endeavoru SPL stage configuration * diff --git a/board/htc/endeavoru/endeavoru.c b/board/htc/endeavoru/endeavoru.c index 1d92870f91..eaf960a3bd 100644 --- a/board/htc/endeavoru/endeavoru.c +++ b/board/htc/endeavoru/endeavoru.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/imgtec/boston/config.mk b/board/imgtec/boston/config.mk index c1e242f108..2e1252814a 100644 --- a/board/imgtec/boston/config.mk +++ b/board/imgtec/boston/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later quiet_cmd_srec_cat = SRECCAT $@ cmd_srec_cat = srec_cat -output $@ -$2 \ diff --git a/board/imgtec/ci20/Makefile b/board/imgtec/ci20/Makefile index 7843b46791..b8f8880256 100644 --- a/board/imgtec/ci20/Makefile +++ b/board/imgtec/ci20/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := ci20.o diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c index 89f5e7ad79..b928cc0514 100644 --- a/board/imgtec/ci20/ci20.c +++ b/board/imgtec/ci20/ci20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CI20 setup code * diff --git a/board/imgtec/malta/Makefile b/board/imgtec/malta/Makefile index d0d84010fc..d5c98ef2d5 100644 --- a/board/imgtec/malta/Makefile +++ b/board/imgtec/malta/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/imgtec/malta/flash-malta-boot.tcl b/board/imgtec/malta/flash-malta-boot.tcl index 972002a8e9..420b14443d 100644 --- a/board/imgtec/malta/flash-malta-boot.tcl +++ b/board/imgtec/malta/flash-malta-boot.tcl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013 Imagination Technologies # diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c index aba11e25be..c5d41dddec 100644 --- a/board/imgtec/malta/superio.c +++ b/board/imgtec/malta/superio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton(a)mips.com> diff --git a/board/imgtec/malta/superio.h b/board/imgtec/malta/superio.h index 11e9cef978..93a4752e9d 100644 --- a/board/imgtec/malta/superio.h +++ b/board/imgtec/malta/superio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton(a)mips.com> diff --git a/board/imgtec/xilfpga/Makefile b/board/imgtec/xilfpga/Makefile index 9aaf9ce263..5cd9090aab 100644 --- a/board/imgtec/xilfpga/Makefile +++ b/board/imgtec/xilfpga/Makefile @@ -2,6 +2,6 @@ # Copyright (C) 2016, Imagination Technologies Ltd. # Zubair Lutfullah Kakakhel <Zubair.Kakakhel(a)imgtec.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := xilfpga.o diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c index 7122692721..c122a2149e 100644 --- a/board/imgtec/xilfpga/xilfpga.c +++ b/board/imgtec/xilfpga/xilfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Imagination Technologies MIPSfpga platform code * diff --git a/board/intel/Kconfig b/board/intel/Kconfig index 7b16ec4dc1..42c109428d 100644 --- a/board/intel/Kconfig +++ b/board/intel/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/bayleybay/Makefile b/board/intel/bayleybay/Makefile index 8b9934f996..3df66cbdef 100644 --- a/board/intel/bayleybay/Makefile +++ b/board/intel/bayleybay/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/bayleybay/acpi/mainboard.asl b/board/intel/bayleybay/acpi/mainboard.asl index 2ab938a8d8..0dce938df8 100644 --- a/board/intel/bayleybay/acpi/mainboard.asl +++ b/board/intel/bayleybay/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/bayleybay/bayleybay.env b/board/intel/bayleybay/bayleybay.env index 89e1849fa8..ec5f7aa895 100644 --- a/board/intel/bayleybay/bayleybay.env +++ b/board/intel/bayleybay/bayleybay.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/bayleybay/dsdt.asl b/board/intel/bayleybay/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/intel/bayleybay/dsdt.asl +++ b/board/intel/bayleybay/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/cherryhill/Makefile b/board/intel/cherryhill/Makefile index ff6e14836a..e62f6b6361 100644 --- a/board/intel/cherryhill/Makefile +++ b/board/intel/cherryhill/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/cherryhill/cherryhill.c b/board/intel/cherryhill/cherryhill.c index c037d5b14c..99c842cf91 100644 --- a/board/intel/cherryhill/cherryhill.c +++ b/board/intel/cherryhill/cherryhill.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/cherryhill/cherryhill.env b/board/intel/cherryhill/cherryhill.env index 929b6a18a7..69849e48d5 100644 --- a/board/intel/cherryhill/cherryhill.env +++ b/board/intel/cherryhill/cherryhill.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/cougarcanyon2/Makefile b/board/intel/cougarcanyon2/Makefile index 13b19ae653..5d9fa65eda 100644 --- a/board/intel/cougarcanyon2/Makefile +++ b/board/intel/cougarcanyon2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c index 7f61ef8b36..97b6aa04b9 100644 --- a/board/intel/cougarcanyon2/cougarcanyon2.c +++ b/board/intel/cougarcanyon2/cougarcanyon2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/cougarcanyon2/cougarcanyon2.env b/board/intel/cougarcanyon2/cougarcanyon2.env index 6329b0f330..aebc1e82f0 100644 --- a/board/intel/cougarcanyon2/cougarcanyon2.env +++ b/board/intel/cougarcanyon2/cougarcanyon2.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/crownbay/Makefile b/board/intel/crownbay/Makefile index 6abd3eeb55..6251c3818e 100644 --- a/board/intel/crownbay/Makefile +++ b/board/intel/crownbay/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c index 55095deead..854b4d50fb 100644 --- a/board/intel/crownbay/crownbay.c +++ b/board/intel/crownbay/crownbay.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/crownbay/crownbay.env b/board/intel/crownbay/crownbay.env index 9e95414c00..d9eff8ab63 100644 --- a/board/intel/crownbay/crownbay.env +++ b/board/intel/crownbay/crownbay.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/edison/Makefile b/board/intel/edison/Makefile index f7f70dfaa7..bd6a0664ae 100644 --- a/board/intel/edison/Makefile +++ b/board/intel/edison/Makefile @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Intel Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += edison.o diff --git a/board/intel/edison/config.mk b/board/intel/edison/config.mk index 8c6087e290..5813f3c4ca 100644 --- a/board/intel/edison/config.mk +++ b/board/intel/edison/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Copyright (c) 2017 Intel Corporation diff --git a/board/intel/edison/dsdt.asl b/board/intel/edison/dsdt.asl index 3b75c4e76b..ccc286a32e 100644 --- a/board/intel/edison/dsdt.asl +++ b/board/intel/edison/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corporation * diff --git a/board/intel/edison/edison.c b/board/intel/edison/edison.c index 11e7f74e47..781c374c3b 100644 --- a/board/intel/edison/edison.c +++ b/board/intel/edison/edison.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/board/intel/edison/edison.env b/board/intel/edison/edison.env index c7d4de7b03..7ecb0b0aae 100644 --- a/board/intel/edison/edison.env +++ b/board/intel/edison/edison.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corp. */ diff --git a/board/intel/galileo/Makefile b/board/intel/galileo/Makefile index 7d5f4df0f9..b3ac525506 100644 --- a/board/intel/galileo/Makefile +++ b/board/intel/galileo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/board/intel/galileo/acpi/mainboard.asl b/board/intel/galileo/acpi/mainboard.asl index beb9d93ec9..ac436ab119 100644 --- a/board/intel/galileo/acpi/mainboard.asl +++ b/board/intel/galileo/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/galileo/dsdt.asl b/board/intel/galileo/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/intel/galileo/dsdt.asl +++ b/board/intel/galileo/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/galileo/galileo.c b/board/intel/galileo/galileo.c index 341b627a65..63c3f1fddf 100644 --- a/board/intel/galileo/galileo.c +++ b/board/intel/galileo/galileo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/galileo/galileo.env b/board/intel/galileo/galileo.env index 83e77bb300..363db9808b 100644 --- a/board/intel/galileo/galileo.env +++ b/board/intel/galileo/galileo.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/minnowmax/Makefile b/board/intel/minnowmax/Makefile index a20322a1a1..6dc9c72775 100644 --- a/board/intel/minnowmax/Makefile +++ b/board/intel/minnowmax/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015, Google, Inc diff --git a/board/intel/minnowmax/acpi/mainboard.asl b/board/intel/minnowmax/acpi/mainboard.asl index beb9d93ec9..ac436ab119 100644 --- a/board/intel/minnowmax/acpi/mainboard.asl +++ b/board/intel/minnowmax/acpi/mainboard.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/minnowmax/dsdt.asl b/board/intel/minnowmax/dsdt.asl index d2297ef595..7481b3daab 100644 --- a/board/intel/minnowmax/dsdt.asl +++ b/board/intel/minnowmax/dsdt.asl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c index b02e3f0d4e..04e3cdb485 100644 --- a/board/intel/minnowmax/minnowmax.c +++ b/board/intel/minnowmax/minnowmax.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Google, Inc */ diff --git a/board/intel/minnowmax/minnowmax.env b/board/intel/minnowmax/minnowmax.env index 71f3607843..36ac7823d4 100644 --- a/board/intel/minnowmax/minnowmax.env +++ b/board/intel/minnowmax/minnowmax.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc */ diff --git a/board/intel/slimbootloader/Kconfig b/board/intel/slimbootloader/Kconfig index 015ed51dc8..9388bd3fe8 100644 --- a/board/intel/slimbootloader/Kconfig +++ b/board/intel/slimbootloader/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Intel Corporation <www.intel.com> diff --git a/board/intel/slimbootloader/Makefile b/board/intel/slimbootloader/Makefile index 50330cc6e5..3d479d3ecd 100644 --- a/board/intel/slimbootloader/Makefile +++ b/board/intel/slimbootloader/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Intel Corporation <www.intel.com> diff --git a/board/intel/slimbootloader/slimbootloader.c b/board/intel/slimbootloader/slimbootloader.c index b20ddf0c68..a85d13037e 100644 --- a/board/intel/slimbootloader/slimbootloader.c +++ b/board/intel/slimbootloader/slimbootloader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/board/intel/slimbootloader/slimbootloader.env b/board/intel/slimbootloader/slimbootloader.env index 3fce487d16..ac825b4938 100644 --- a/board/intel/slimbootloader/slimbootloader.env +++ b/board/intel/slimbootloader/slimbootloader.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/board/inversepath/usbarmory/Makefile b/board/inversepath/usbarmory/Makefile index 9b8bd80ab3..85c71510c2 100644 --- a/board/inversepath/usbarmory/Makefile +++ b/board/inversepath/usbarmory/Makefile @@ -5,6 +5,6 @@ # Copyright (C) 2015, Inverse Path # Andrej Rosano <andrej(a)inversepath.com> # -# SPDX-License-Identifier:|____GPL-2.0+ +# SPDX-License-Identifier:|____GPL-2.0-or-later obj-y := usbarmory.o diff --git a/board/inversepath/usbarmory/imximage.cfg b/board/inversepath/usbarmory/imximage.cfg index d23885bed7..725bf4e11c 100644 --- a/board/inversepath/usbarmory/imximage.cfg +++ b/board/inversepath/usbarmory/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * USB armory MkI board imximage configuration * http://inversepath.com/usbarmory diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index f3a0de3967..0370226f33 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * USB armory MkI board initialization * http://inversepath.com/usbarmory diff --git a/board/iomega/iconnect/Makefile b/board/iomega/iconnect/Makefile index fd975b016a..825cd41522 100644 --- a/board/iomega/iconnect/Makefile +++ b/board/iomega/iconnect/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c index 0387160200..64c6a6c94a 100644 --- a/board/iomega/iconnect/iconnect.c +++ b/board/iomega/iconnect/iconnect.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2009-2012 diff --git a/board/iomega/iconnect/kwbimage.cfg b/board/iomega/iconnect/kwbimage.cfg index ffe87d86c2..6391195a25 100644 --- a/board/iomega/iconnect/kwbimage.cfg +++ b/board/iomega/iconnect/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009-2012 # Wojciech Dubowik <wojciech.dubowik(a)neratec.com> diff --git a/board/isee/igep003x/Makefile b/board/isee/igep003x/Makefile index c3e3974525..2550eecdc5 100644 --- a/board/isee/igep003x/Makefile +++ b/board/isee/igep003x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/isee/igep003x/board.c b/board/isee/igep003x/board.c index 7dbb080089..3c29c09346 100644 --- a/board/isee/igep003x/board.c +++ b/board/isee/igep003x/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for IGEP COM AQUILA and SMARC AM335x based boards * diff --git a/board/isee/igep003x/board.h b/board/isee/igep003x/board.h index ec54f860c8..39c35a8e67 100644 --- a/board/isee/igep003x/board.h +++ b/board/isee/igep003x/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * IGEP COM AQUILA boards information header * diff --git a/board/isee/igep00x0/Makefile b/board/isee/igep00x0/Makefile index e095bcada2..453d9e2df3 100644 --- a/board/isee/igep00x0/Makefile +++ b/board/isee/igep00x0/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/isee/igep00x0/common.c b/board/isee/igep00x0/common.c index 3fdf83e845..fc7c603e69 100644 --- a/board/isee/igep00x0/common.c +++ b/board/isee/igep00x0/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <twl4030.h> diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c index 0f0a9c592f..58b76748f5 100644 --- a/board/isee/igep00x0/igep00x0.c +++ b/board/isee/igep00x0/igep00x0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * ISEE 2007 SL, <www.iseebcn.com> diff --git a/board/isee/igep00x0/igep00x0.h b/board/isee/igep00x0/igep00x0.h index aa532acad9..9fea72398f 100644 --- a/board/isee/igep00x0/igep00x0.h +++ b/board/isee/igep00x0/igep00x0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * ISEE 2007 SL, <www.iseebcn.com> diff --git a/board/isee/igep00x0/spl.c b/board/isee/igep00x0/spl.c index f814fe1354..1cc8935940 100644 --- a/board/isee/igep00x0/spl.c +++ b/board/isee/igep00x0/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <serial.h> #include <asm/io.h> diff --git a/board/k+p/bootscripts/tpcboot.cmd b/board/k+p/bootscripts/tpcboot.cmd index b81494dd1b..e10e33d67e 100644 --- a/board/k+p/bootscripts/tpcboot.cmd +++ b/board/k+p/bootscripts/tpcboot.cmd @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 # Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/k+p/kp_imx53/Makefile b/board/k+p/kp_imx53/Makefile index 66629c98ab..8fd2342d6c 100644 --- a/board/k+p/kp_imx53/Makefile +++ b/board/k+p/kp_imx53/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2018, DENX Software Engineering # Lukasz Majewski <lukma(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += kp_imx53.o kp_id_rev.o diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c index 9f93cf008c..13c6ef2844 100644 --- a/board/k+p/kp_imx53/kp_id_rev.c +++ b/board/k+p/kp_imx53/kp_id_rev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/k+p/kp_imx53/kp_id_rev.h b/board/k+p/kp_imx53/kp_id_rev.h index aa64173926..2fa0ba5093 100644 --- a/board/k+p/kp_imx53/kp_id_rev.h +++ b/board/k+p/kp_imx53/kp_id_rev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c index 7c3a695cb2..df6bb33816 100644 --- a/board/k+p/kp_imx53/kp_imx53.c +++ b/board/k+p/kp_imx53/kp_imx53.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/k+p/kp_imx6q_tpc/Makefile b/board/k+p/kp_imx6q_tpc/Makefile index 6551b2bfa2..e8c279f582 100644 --- a/board/k+p/kp_imx6q_tpc/Makefile +++ b/board/k+p/kp_imx6q_tpc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Lukasz Majewski <lukma(a)denx.de> diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c index e6877e4c07..be7656c09a 100644 --- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c +++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K+P iMX6Q KP_IMX6Q_TPC board configuration * diff --git a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c index 5490243794..af1e8b6d89 100644 --- a/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c +++ b/board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K+P iMX6Q KP_IMX6Q_TPC board configuration * diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index c6576aa652..a01d201b76 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019, Pascal Linder <pascal.linder(a)edu.hefr.ch> diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 991022ac83..25f5320a90 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h index d16c82487b..c164824faf 100644 --- a/board/keymile/common/common.h +++ b/board/keymile/common/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 67db0c50f4..deeeee04d3 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Holger Brunck, Keymile GmbH Hannover, holger.brunck(a)keymile.com diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c index b433f69675..e0e24ea0ed 100644 --- a/board/keymile/common/qrio.c +++ b/board/keymile/common/qrio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Keymile AG * Valentin Longchamp <valentin.longchamp(a)keymile.com> diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h index 2b997d9059..09a14077b3 100644 --- a/board/keymile/common/qrio.h +++ b/board/keymile/common/qrio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 ABB * Valentin Longchamp <valentin.longchamp(a)hitachi-powergrids.com> diff --git a/board/keymile/km83xx/Makefile b/board/keymile/km83xx/Makefile index bdb358e2d2..61f736403b 100644 --- a/board/keymile/km83xx/Makefile +++ b/board/keymile/km83xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index acd13105dd..1c62002a39 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/board/keymile/kmcent2/Makefile b/board/keymile/kmcent2/Makefile index 6b26e861f6..f17c7d2f6b 100644 --- a/board/keymile/kmcent2/Makefile +++ b/board/keymile/kmcent2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 Keymile AG # Rainer Boschung <rainer.boschung(a)keymile.com> # diff --git a/board/keymile/kmcent2/ddr.c b/board/keymile/kmcent2/ddr.c index 4f778206fe..5c8b07920e 100644 --- a/board/keymile/kmcent2/ddr.c +++ b/board/keymile/kmcent2/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Keymile AG * Rainer Boschung <rainer.boschung(a)keymile.com> diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index 783853d5c6..550f64a551 100644 --- a/board/keymile/kmcent2/kmcent2.c +++ b/board/keymile/kmcent2/kmcent2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Keymile AG * Rainer Boschung <rainer.boschung(a)keymile.com> diff --git a/board/keymile/kmcent2/law.c b/board/keymile/kmcent2/law.c index ec3bb8fe80..44fb6a3cef 100644 --- a/board/keymile/kmcent2/law.c +++ b/board/keymile/kmcent2/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Keymile AG * Rainer Boschung <rainer.boschung(a)keymile.com> diff --git a/board/keymile/kmcent2/tlb.c b/board/keymile/kmcent2/tlb.c index 41b24e3943..d136a831bc 100644 --- a/board/keymile/kmcent2/tlb.c +++ b/board/keymile/kmcent2/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Keymile AG * Rainer Boschung <rainer.boschung(a)keymile.com> diff --git a/board/keymile/pg-wcom-ls102xa/Makefile b/board/keymile/pg-wcom-ls102xa/Makefile index 229b0c2827..027e748c17 100644 --- a/board/keymile/pg-wcom-ls102xa/Makefile +++ b/board/keymile/pg-wcom-ls102xa/Makefile @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Hitachi Power Grids. All rights reserved. # diff --git a/board/keymile/pg-wcom-ls102xa/ddr.c b/board/keymile/pg-wcom-ls102xa/ddr.c index 556d39d4d4..e42e8fc31c 100644 --- a/board/keymile/pg-wcom-ls102xa/ddr.c +++ b/board/keymile/pg-wcom-ls102xa/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020 Hitachi Power Grids. All rights reserved. diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index 21c21aac22..fa9a1cd3a8 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Hitachi Power Grids. All rights reserved. */ diff --git a/board/keymile/secu1/Makefile b/board/keymile/secu1/Makefile index 69531807ec..3915d4533c 100644 --- a/board/keymile/secu1/Makefile +++ b/board/keymile/secu1/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2020 Hitachi Power Grids # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := socfpga.o ../common/ivm.o diff --git a/board/keymile/secu1/socfpga.c b/board/keymile/secu1/socfpga.c index 6a4cb21786..cd5fc76935 100644 --- a/board/keymile/secu1/socfpga.c +++ b/board/keymile/secu1/socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2020 Hitachi Power Grids */ diff --git a/board/kobol/helios4/Makefile b/board/kobol/helios4/Makefile index 63f0796397..d55343759e 100644 --- a/board/kobol/helios4/Makefile +++ b/board/kobol/helios4/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Dennis Gilmore <dgilmore(a)redhat.com> diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c index 9c5b687b3e..6529b3c465 100644 --- a/board/kobol/helios4/helios4.c +++ b/board/kobol/helios4/helios4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Dennis Gilmore <dgilmore(a)redhat.com> * based on board/solidrun/clearfog/clearfog.c diff --git a/board/kontron/pitx_imx8m/Makefile b/board/kontron/pitx_imx8m/Makefile index 6ebe5d0770..03a896f903 100644 --- a/board/kontron/pitx_imx8m/Makefile +++ b/board/kontron/pitx_imx8m/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += pitx_imx8m.o pitx_misc.o diff --git a/board/kontron/pitx_imx8m/lpddr4_timing_2gb.c b/board/kontron/pitx_imx8m/lpddr4_timing_2gb.c index b4647b9847..53a99f399e 100644 --- a/board/kontron/pitx_imx8m/lpddr4_timing_2gb.c +++ b/board/kontron/pitx_imx8m/lpddr4_timing_2gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <linux/kernel.h> #include <asm/arch/ddr.h> diff --git a/board/kontron/pitx_imx8m/lpddr4_timing_4gb.c b/board/kontron/pitx_imx8m/lpddr4_timing_4gb.c index fd7173bff1..71e54620dd 100644 --- a/board/kontron/pitx_imx8m/lpddr4_timing_4gb.c +++ b/board/kontron/pitx_imx8m/lpddr4_timing_4gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <linux/kernel.h> #include <asm/arch/ddr.h> diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index 4548e7c1df..706fa30ce1 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "pitx_misc.h" #include <common.h> diff --git a/board/kontron/pitx_imx8m/pitx_misc.c b/board/kontron/pitx_imx8m/pitx_misc.c index 48b29c4bd3..768e42457d 100644 --- a/board/kontron/pitx_imx8m/pitx_misc.c +++ b/board/kontron/pitx_imx8m/pitx_misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <asm/arch/imx8mq_pins.h> #include <asm-generic/gpio.h> #include <asm/mach-imx/gpio.h> diff --git a/board/kontron/pitx_imx8m/spl.c b/board/kontron/pitx_imx8m/spl.c index a247803a4b..d3bfa06e07 100644 --- a/board/kontron/pitx_imx8m/spl.c +++ b/board/kontron/pitx_imx8m/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <errno.h> diff --git a/board/kontron/sl-mx6ul/Makefile b/board/kontron/sl-mx6ul/Makefile index 6af5f65450..8de5be96a2 100644 --- a/board/kontron/sl-mx6ul/Makefile +++ b/board/kontron/sl-mx6ul/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2018 Kontron Electronics GmbH ifdef CONFIG_SPL_BUILD diff --git a/board/kontron/sl-mx6ul/sl-mx6ul-common.c b/board/kontron/sl-mx6ul/sl-mx6ul-common.c index 1f24acdfa3..11518b5a68 100644 --- a/board/kontron/sl-mx6ul/sl-mx6ul-common.c +++ b/board/kontron/sl-mx6ul/sl-mx6ul-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx6ul/sl-mx6ul-common.h b/board/kontron/sl-mx6ul/sl-mx6ul-common.h index 58a0e77a8b..c0409bedef 100644 --- a/board/kontron/sl-mx6ul/sl-mx6ul-common.h +++ b/board/kontron/sl-mx6ul/sl-mx6ul-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx6ul/sl-mx6ul.c b/board/kontron/sl-mx6ul/sl-mx6ul.c index 0f45ea84fc..fc4bbace8d 100644 --- a/board/kontron/sl-mx6ul/sl-mx6ul.c +++ b/board/kontron/sl-mx6ul/sl-mx6ul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx6ul/spl.c b/board/kontron/sl-mx6ul/spl.c index b175885870..e78353af57 100644 --- a/board/kontron/sl-mx6ul/spl.c +++ b/board/kontron/sl-mx6ul/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx8mm/Makefile b/board/kontron/sl-mx8mm/Makefile index fceed684ed..80300d4ba2 100644 --- a/board/kontron/sl-mx8mm/Makefile +++ b/board/kontron/sl-mx8mm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2019 Kontron Electronics GmbH obj-y := sl-mx8mm.o diff --git a/board/kontron/sl-mx8mm/imximage.cfg b/board/kontron/sl-mx8mm/imximage.cfg index b538026711..e6969184cc 100644 --- a/board/kontron/sl-mx8mm/imximage.cfg +++ b/board/kontron/sl-mx8mm/imximage.cfg @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx8mm/lpddr4_timing.c b/board/kontron/sl-mx8mm/lpddr4_timing.c index 74b79c7a00..ab27f2d844 100644 --- a/board/kontron/sl-mx8mm/lpddr4_timing.c +++ b/board/kontron/sl-mx8mm/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kontron/sl-mx8mm/sl-mx8mm.c index 8dcc2ea54f..adef1cabac 100644 --- a/board/kontron/sl-mx8mm/sl-mx8mm.c +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index 54ee1e66a7..7d6b2c8230 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Kontron Electronics GmbH */ diff --git a/board/kontron/sl28/Makefile b/board/kontron/sl28/Makefile index 084c11da37..4315433ef1 100644 --- a/board/kontron/sl28/Makefile +++ b/board/kontron/sl28/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifndef CONFIG_SPL_BUILD obj-y += sl28.o cmds.o diff --git a/board/kontron/sl28/cmds.c b/board/kontron/sl28/cmds.c index 08a22b5d01..acd6d29741 100644 --- a/board/kontron/sl28/cmds.c +++ b/board/kontron/sl28/cmds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sl28 extension commands * diff --git a/board/kontron/sl28/common.c b/board/kontron/sl28/common.c index 331de29bae..34f2c18f5d 100644 --- a/board/kontron/sl28/common.c +++ b/board/kontron/sl28/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/global_data.h> diff --git a/board/kontron/sl28/ddr.c b/board/kontron/sl28/ddr.c index 315d9f99c7..58d225e902 100644 --- a/board/kontron/sl28/ddr.c +++ b/board/kontron/sl28/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/global_data.h> diff --git a/board/kontron/sl28/psci.c b/board/kontron/sl28/psci.c index 19f0ef3b6d..4844859da7 100644 --- a/board/kontron/sl28/psci.c +++ b/board/kontron/sl28/psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <asm/secure.h> #include <asm/psci.h> diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 4ab221c12b..299ed304d5 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <dm.h> diff --git a/board/kontron/sl28/sl28.h b/board/kontron/sl28/sl28.h index 7f0105049c..28ea048cb3 100644 --- a/board/kontron/sl28/sl28.h +++ b/board/kontron/sl28/sl28.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SL28_H #define __SL28_H diff --git a/board/kontron/sl28/spl.c b/board/kontron/sl28/spl.c index ffaf517a8b..8748ab43d0 100644 --- a/board/kontron/sl28/spl.c +++ b/board/kontron/sl28/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/board/kontron/sl28/spl_atf.c b/board/kontron/sl28/spl_atf.c index a9cd6850e9..6b693298e9 100644 --- a/board/kontron/sl28/spl_atf.c +++ b/board/kontron/sl28/spl_atf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LS1028A TF-A calling support * diff --git a/board/kosagi/novena/Makefile b/board/kosagi/novena/Makefile index 64d32f5a96..640b5d3bf9 100644 --- a/board/kosagi/novena/Makefile +++ b/board/kosagi/novena/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Marek Vasut <marex(a)denx.de> diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index f009a8afd4..48e4c9bfff 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Novena board support * diff --git a/board/kosagi/novena/novena.h b/board/kosagi/novena/novena.h index f62f3f7b83..9b9499ca95 100644 --- a/board/kosagi/novena/novena.h +++ b/board/kosagi/novena/novena.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Novena board support * diff --git a/board/kosagi/novena/novena_spl.c b/board/kosagi/novena/novena_spl.c index 24c0fb2226..f9e0ff5848 100644 --- a/board/kosagi/novena/novena_spl.c +++ b/board/kosagi/novena/novena_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Novena SPL * diff --git a/board/kosagi/novena/video.c b/board/kosagi/novena/video.c index a96a877f5f..b75e54f0e3 100644 --- a/board/kosagi/novena/video.c +++ b/board/kosagi/novena/video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Novena video output support * diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c index b3c176dd59..f91f800995 100644 --- a/board/l+g/vinco/vinco.c +++ b/board/l+g/vinco/vinco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board file for the VInCo platform * Based on the the SAMA5-EK board file diff --git a/board/lego/ev3/Makefile b/board/lego/ev3/Makefile index 11b52ca1da..afc5c49941 100644 --- a/board/lego/ev3/Makefile +++ b/board/lego/ev3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c index 8349260131..f49e870991 100644 --- a/board/lego/ev3/legoev3.c +++ b/board/lego/ev3/legoev3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 David Lechner <david(a)lechnology.com> * diff --git a/board/lg/sniper/Makefile b/board/lg/sniper/Makefile index 549dcca4e5..81abbef369 100644 --- a/board/lg/sniper/Makefile +++ b/board/lg/sniper/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # LG Optimus Black codename sniper board # diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index 86032d7fcd..4392772d1f 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LG Optimus Black codename sniper board * diff --git a/board/lg/sniper/sniper.h b/board/lg/sniper/sniper.h index db71ad86d8..680c5ecd04 100644 --- a/board/lg/sniper/sniper.h +++ b/board/lg/sniper/sniper.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LG Optimus Black codename sniper board * diff --git a/board/lg/x3-t30/Makefile b/board/lg/x3-t30/Makefile index 3eeb132f3c..1c60eb528c 100644 --- a/board/lg/x3-t30/Makefile +++ b/board/lg/x3-t30/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/lg/x3-t30/x3-t30-spl.c b/board/lg/x3-t30/x3-t30-spl.c index 864f2de45f..2d964a8cb1 100644 --- a/board/lg/x3-t30/x3-t30-spl.c +++ b/board/lg/x3-t30/x3-t30-spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * T30 LGE X3 SPL stage configuration * diff --git a/board/lg/x3-t30/x3-t30.c b/board/lg/x3-t30/x3-t30.c index 594563cf52..9179199f58 100644 --- a/board/lg/x3-t30/x3-t30.c +++ b/board/lg/x3-t30/x3-t30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/liebherr/display5/Makefile b/board/liebherr/display5/Makefile index ee503add75..217c1b175a 100644 --- a/board/liebherr/display5/Makefile +++ b/board/liebherr/display5/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017, DENX Software Engineering # Lukasz Majewski <lukma(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD obj-y = spl.o diff --git a/board/liebherr/display5/common.h b/board/liebherr/display5/common.h index 44c7470074..acf882b7e7 100644 --- a/board/liebherr/display5/common.h +++ b/board/liebherr/display5/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c index e3a59dbec0..f73461c655 100644 --- a/board/liebherr/display5/display5.c +++ b/board/liebherr/display5/display5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c index 97928e9221..97bcbb8367 100644 --- a/board/liebherr/display5/spl.c +++ b/board/liebherr/display5/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/mccmon6/Makefile b/board/liebherr/mccmon6/Makefile index 3c9786c6b7..21942a2c6f 100644 --- a/board/liebherr/mccmon6/Makefile +++ b/board/liebherr/mccmon6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016-2017 # Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/mccmon6/mccmon6.c b/board/liebherr/mccmon6/mccmon6.c index 1b49526fba..60a211d780 100644 --- a/board/liebherr/mccmon6/mccmon6.c +++ b/board/liebherr/mccmon6/mccmon6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/mccmon6/mon6_imximage_nor.cfg b/board/liebherr/mccmon6/mon6_imximage_nor.cfg index 6f966a7dd7..d4aac81451 100644 --- a/board/liebherr/mccmon6/mon6_imximage_nor.cfg +++ b/board/liebherr/mccmon6/mon6_imximage_nor.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016-2017 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/mccmon6/mon6_imximage_sd.cfg b/board/liebherr/mccmon6/mon6_imximage_sd.cfg index 5a65e0f54c..861fba3735 100644 --- a/board/liebherr/mccmon6/mon6_imximage_sd.cfg +++ b/board/liebherr/mccmon6/mon6_imximage_sd.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016-2017 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c index b1f6881275..1e58ba86e1 100644 --- a/board/liebherr/mccmon6/spl.c +++ b/board/liebherr/mccmon6/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Wandboard * Author: Tungyi Lin <tungyilin1127(a)gmail.com> diff --git a/board/liebherr/xea/Makefile b/board/liebherr/xea/Makefile index abf500857f..490bdd187d 100644 --- a/board/liebherr/xea/Makefile +++ b/board/liebherr/xea/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2019 # Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := xea.o diff --git a/board/liebherr/xea/spl_xea.c b/board/liebherr/xea/spl_xea.c index df354cac64..12c72a44d7 100644 --- a/board/liebherr/xea/spl_xea.c +++ b/board/liebherr/xea/spl_xea.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DENX M28 Boot setup * diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c index e4d2eb65cc..59b3f74454 100644 --- a/board/liebherr/xea/xea.c +++ b/board/liebherr/xea/xea.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * XEA iMX28 board * diff --git a/board/logicpd/am3517evm/Makefile b/board/logicpd/am3517evm/Makefile index c07a98e938..6ebec9ee8f 100644 --- a/board/logicpd/am3517evm/Makefile +++ b/board/logicpd/am3517evm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Author: Vaibhav Hiremath <hvaibhav(a)ti.com> # diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index e787441c74..c863d1d0cd 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am3517evm.c - board file for TI's AM3517 family of devices. * diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h index aec2b410c8..d537582815 100644 --- a/board/logicpd/am3517evm/am3517evm.h +++ b/board/logicpd/am3517evm/am3517evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am3517evm.h - Header file for the AM3517 EVM. * diff --git a/board/logicpd/imx6/Makefile b/board/logicpd/imx6/Makefile index dbaf18d3e0..cb31e6c60d 100644 --- a/board/logicpd/imx6/Makefile +++ b/board/logicpd/imx6/Makefile @@ -3,7 +3,7 @@ # # (C) Copyright 2011 Freescale Semiconductor, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := imx6logic.o diff --git a/board/logicpd/imx6/imx6logic.c b/board/logicpd/imx6/imx6logic.c index 0d53548dcb..65df870c13 100644 --- a/board/logicpd/imx6/imx6logic.c +++ b/board/logicpd/imx6/imx6logic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Logic PD, Inc. * diff --git a/board/logicpd/omap3som/Makefile b/board/logicpd/omap3som/Makefile index 61ef14e87a..14ac0cebf7 100644 --- a/board/logicpd/omap3som/Makefile +++ b/board/logicpd/omap3som/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 86992829ca..356a35b738 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Logic Product Development <www.logicpd.com> diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h index ba63aa04c3..8e0cafeb4c 100644 --- a/board/logicpd/omap3som/omap3logic.h +++ b/board/logicpd/omap3som/omap3logic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Logic Product Development <www.logicpd.com> diff --git a/board/maxbcm/Makefile b/board/maxbcm/Makefile index 07f81f59f3..04c24cfa66 100644 --- a/board/maxbcm/Makefile +++ b/board/maxbcm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Stefan Roese <sr(a)denx.de> diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c index aad3dc8642..c282333dbf 100644 --- a/board/maxbcm/maxbcm.c +++ b/board/maxbcm/maxbcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/board/menlo/m53menlo/Makefile b/board/menlo/m53menlo/Makefile index b4ab95a568..e2103f5c93 100644 --- a/board/menlo/m53menlo/Makefile +++ b/board/menlo/m53menlo/Makefile @@ -3,7 +3,7 @@ # Copyright (C) 2012-2017 Marek Vasut <marex(a)denx.de> # Copyright (C) 2014-2017 Olaf Mandel <o.mandel(a)menlosystems.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := m53menlo.o diff --git a/board/menlo/m53menlo/imximage.cfg b/board/menlo/m53menlo/imximage.cfg index 282caf65e0..082925ba70 100644 --- a/board/menlo/m53menlo/imximage.cfg +++ b/board/menlo/m53menlo/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * M53 DRAM init values * Copyright (C) 2012-2013 Marek Vasut <marex(a)denx.de> diff --git a/board/menlo/m53menlo/m53menlo.c b/board/menlo/m53menlo/m53menlo.c index b8dffb0e48..6d193f90a2 100644 --- a/board/menlo/m53menlo/m53menlo.c +++ b/board/menlo/m53menlo/m53menlo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Menlosystems M53Menlo board * diff --git a/board/menlo/mx8menlo/Makefile b/board/menlo/mx8menlo/Makefile index fd5ec82633..1ecb241521 100644 --- a/board/menlo/mx8menlo/Makefile +++ b/board/menlo/mx8menlo/Makefile @@ -2,7 +2,7 @@ # Menlosystems MX8Menlo # Copyright (C) 2021-2022 Marek Vasut <marex(a)denx.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := mx8menlo.o diff --git a/board/menlo/mx8menlo/mx8menlo.c b/board/menlo/mx8menlo/mx8menlo.c index 18f5fd5c5e..e2221c6625 100644 --- a/board/menlo/mx8menlo/mx8menlo.c +++ b/board/menlo/mx8menlo/mx8menlo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021-2022 Marek Vasut <marex(a)denx.de> */ diff --git a/board/microchip/mpfs_icicle/Makefile b/board/microchip/mpfs_icicle/Makefile index 72b0410dda..df5cdfac18 100644 --- a/board/microchip/mpfs_icicle/Makefile +++ b/board/microchip/mpfs_icicle/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 Microchip Technology Inc. # Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c index 0f5f82924e..e961924499 100644 --- a/board/microchip/mpfs_icicle/mpfs_icicle.c +++ b/board/microchip/mpfs_icicle/mpfs_icicle.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/board/microchip/pic32mzda/Makefile b/board/microchip/pic32mzda/Makefile index 36295302a1..029e8681fe 100644 --- a/board/microchip/pic32mzda/Makefile +++ b/board/microchip/pic32mzda/Makefile @@ -2,6 +2,6 @@ # (C) Copyright 2015 # Purna Chandra Mandal, purna.mandal(a)microchip.com. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := pic32mzda.o diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c index e7337deea7..3a3c6cb43d 100644 --- a/board/microchip/pic32mzda/pic32mzda.c +++ b/board/microchip/pic32mzda/pic32mzda.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Microchip PIC32MZ[DA] Starter Kit board * diff --git a/board/mikrotik/crs3xx-98dx3236/Makefile b/board/mikrotik/crs3xx-98dx3236/Makefile index 0b2930d3e2..76b77648bc 100644 --- a/board/mikrotik/crs3xx-98dx3236/Makefile +++ b/board/mikrotik/crs3xx-98dx3236/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c index 315169ba66..2ebb6187c9 100644 --- a/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c +++ b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/mntre/imx8mq_reform2/Makefile b/board/mntre/imx8mq_reform2/Makefile index 2efd56bb4a..b7d03002a4 100644 --- a/board/mntre/imx8mq_reform2/Makefile +++ b/board/mntre/imx8mq_reform2/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mq_reform2.o diff --git a/board/mntre/imx8mq_reform2/imx8mq_reform2.c b/board/mntre/imx8mq_reform2/imx8mq_reform2.c index be5c5060a2..f61069c7b6 100644 --- a/board/mntre/imx8mq_reform2/imx8mq_reform2.c +++ b/board/mntre/imx8mq_reform2/imx8mq_reform2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * Copyright (C) 2018, Boundary Devices <info(a)boundarydevices.com> diff --git a/board/mntre/imx8mq_reform2/lpddr4_timing.c b/board/mntre/imx8mq_reform2/lpddr4_timing.c index e5303db0f8..2713376225 100644 --- a/board/mntre/imx8mq_reform2/lpddr4_timing.c +++ b/board/mntre/imx8mq_reform2/lpddr4_timing.c @@ -1,7 +1,7 @@ /* * Copyright 2019 NXP * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Generated code from MX8M_DDR_tool * Align with uboot version: diff --git a/board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h b/board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h index a55086bb5e..fa5b6f1fe4 100644 --- a/board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h +++ b/board/mntre/imx8mq_reform2/lpddr4_timing_ch2.h @@ -1,7 +1,7 @@ /* * Copyright Boundary Devices * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> #include <linux/kernel.h> diff --git a/board/mntre/imx8mq_reform2/spl.c b/board/mntre/imx8mq_reform2/spl.c index 5120c628b9..ef78abf07f 100644 --- a/board/mntre/imx8mq_reform2/spl.c +++ b/board/mntre/imx8mq_reform2/spl.c @@ -1,8 +1,8 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg b/board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg index 8aadedb102..f2971bc99d 100644 --- a/board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg +++ b/board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/msc/sm2s_imx8mp/lpddr4_timing.c b/board/msc/sm2s_imx8mp/lpddr4_timing.c index e0d659af91..b6ed31ee6f 100644 --- a/board/msc/sm2s_imx8mp/lpddr4_timing.c +++ b/board/msc/sm2s_imx8mp/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/board/mscc/common/Makefile b/board/mscc/common/Makefile index 4f0eded85a..9c27fb152f 100644 --- a/board/mscc/common/Makefile +++ b/board/mscc/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_JR2) := spi.o obj-$(CONFIG_SOC_OCELOT) := spi.o diff --git a/board/mscc/common/spi.c b/board/mscc/common/spi.c index 45b9649336..8cb1a41d67 100644 --- a/board/mscc/common/spi.c +++ b/board/mscc/common/spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Coprporation */ diff --git a/board/mscc/jr2/Kconfig b/board/mscc/jr2/Kconfig index 68a2de8ca7..d709d69806 100644 --- a/board/mscc/jr2/Kconfig +++ b/board/mscc/jr2/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) config SYS_VENDOR default "mscc" diff --git a/board/mscc/jr2/Makefile b/board/mscc/jr2/Makefile index 56fd8d913e..26041eaacb 100644 --- a/board/mscc/jr2/Makefile +++ b/board/mscc/jr2/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_JR2) := jr2.o diff --git a/board/mscc/jr2/jr2.c b/board/mscc/jr2/jr2.c index 84b95be648..58dd50962a 100644 --- a/board/mscc/jr2/jr2.c +++ b/board/mscc/jr2/jr2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/board/mscc/luton/Kconfig b/board/mscc/luton/Kconfig index e1199808d5..55ee82071a 100644 --- a/board/mscc/luton/Kconfig +++ b/board/mscc/luton/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) if SOC_LUTON diff --git a/board/mscc/luton/Makefile b/board/mscc/luton/Makefile index b27f7c7739..fa41da1513 100644 --- a/board/mscc/luton/Makefile +++ b/board/mscc/luton/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_LUTON) := luton.o diff --git a/board/mscc/luton/luton.c b/board/mscc/luton/luton.c index 48170b3aa1..c6747f4b42 100644 --- a/board/mscc/luton/luton.c +++ b/board/mscc/luton/luton.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/board/mscc/ocelot/Kconfig b/board/mscc/ocelot/Kconfig index 9ddc0880b1..f8970617e9 100644 --- a/board/mscc/ocelot/Kconfig +++ b/board/mscc/ocelot/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) config SYS_VENDOR default "mscc" diff --git a/board/mscc/ocelot/Makefile b/board/mscc/ocelot/Makefile index 39ce9601b9..d4f94c066a 100644 --- a/board/mscc/ocelot/Makefile +++ b/board/mscc/ocelot/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_OCELOT) := ocelot.o diff --git a/board/mscc/ocelot/ocelot.c b/board/mscc/ocelot/ocelot.c index d69db04de6..483b8bebb1 100644 --- a/board/mscc/ocelot/ocelot.c +++ b/board/mscc/ocelot/ocelot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/board/mscc/serval/Kconfig b/board/mscc/serval/Kconfig index 64f1c683e4..0eb3b94b61 100644 --- a/board/mscc/serval/Kconfig +++ b/board/mscc/serval/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) config SYS_VENDOR default "mscc" diff --git a/board/mscc/serval/Makefile b/board/mscc/serval/Makefile index c7ba56e951..486b036800 100644 --- a/board/mscc/serval/Makefile +++ b/board/mscc/serval/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_SERVAL) := serval.o diff --git a/board/mscc/serval/serval.c b/board/mscc/serval/serval.c index 99d5f5be65..f272886e2f 100644 --- a/board/mscc/serval/serval.c +++ b/board/mscc/serval/serval.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/board/mscc/servalt/Kconfig b/board/mscc/servalt/Kconfig index 61140f89bf..447917ebc2 100644 --- a/board/mscc/servalt/Kconfig +++ b/board/mscc/servalt/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) config SYS_VENDOR default "mscc" diff --git a/board/mscc/servalt/Makefile b/board/mscc/servalt/Makefile index 9a37eeabaf..0610953f4f 100644 --- a/board/mscc/servalt/Makefile +++ b/board/mscc/servalt/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-$(CONFIG_SOC_SERVALT) := servalt.o diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c index 49993168c2..6ce30e7ddb 100644 --- a/board/mscc/servalt/servalt.c +++ b/board/mscc/servalt/servalt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/board/myir/mys_6ulx/Makefile b/board/myir/mys_6ulx/Makefile index 3c63e439ab..82e2a639a0 100644 --- a/board/myir/mys_6ulx/Makefile +++ b/board/myir/mys_6ulx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := mys_6ulx.o obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/myir/mys_6ulx/mys_6ulx.c b/board/myir/mys_6ulx/mys_6ulx.c index 847497bcba..695dff833d 100644 --- a/board/myir/mys_6ulx/mys_6ulx.c +++ b/board/myir/mys_6ulx/mys_6ulx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Linumiz * Author: Parthiban Nallathambi <parthiban(a)linumiz.com> diff --git a/board/myir/mys_6ulx/spl.c b/board/myir/mys_6ulx/spl.c index 3cf14e2bc6..3b54cc3f85 100644 --- a/board/myir/mys_6ulx/spl.c +++ b/board/myir/mys_6ulx/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Linumiz * Author: Parthiban Nallathambi <parthiban(a)linumiz.com> diff --git a/board/netgear/dgnd3700v2/Makefile b/board/netgear/dgnd3700v2/Makefile index 525f8ecdf7..ab69619905 100644 --- a/board/netgear/dgnd3700v2/Makefile +++ b/board/netgear/dgnd3700v2/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += dgnd3700v2.o diff --git a/board/netgear/dgnd3700v2/dgnd3700v2.c b/board/netgear/dgnd3700v2/dgnd3700v2.c index cfc3529c34..555496e36a 100644 --- a/board/netgear/dgnd3700v2/dgnd3700v2.c +++ b/board/netgear/dgnd3700v2/dgnd3700v2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/board/novtech/meerkat96/imximage.cfg b/board/novtech/meerkat96/imximage.cfg index a67ce53314..9f232ccd1f 100644 --- a/board/novtech/meerkat96/imximage.cfg +++ b/board/novtech/meerkat96/imximage.cfg @@ -1,7 +1,7 @@ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later * * Refer docs/README.imxmage for more details about how-to configure * and create imximage boot image diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c index 1edebe5db9..cf10584415 100644 --- a/board/novtech/meerkat96/meerkat96.c +++ b/board/novtech/meerkat96/meerkat96.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Linaro Ltd. * Copyright (C) 2016 NXP Semiconductors diff --git a/board/nuvoton/arbel_evb/arbel_evb.c b/board/nuvoton/arbel_evb/arbel_evb.c index e52e0a59ab..20cde433c1 100644 --- a/board/nuvoton/arbel_evb/arbel_evb.c +++ b/board/nuvoton/arbel_evb/arbel_evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/board/nuvoton/poleg_evb/poleg_evb.c b/board/nuvoton/poleg_evb/poleg_evb.c index 2052af6649..817f55ebd1 100644 --- a/board/nuvoton/poleg_evb/poleg_evb.c +++ b/board/nuvoton/poleg_evb/poleg_evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (c) 2021 Nuvoton Technology Corp. diff --git a/board/nvidia/cardhu/Makefile b/board/nvidia/cardhu/Makefile index 6f480cdfd3..d16681ad6c 100644 --- a/board/nvidia/cardhu/Makefile +++ b/board/nvidia/cardhu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010-2012 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c index 6848e34004..ca2aa7d588 100644 --- a/board/nvidia/cardhu/cardhu.c +++ b/board/nvidia/cardhu/cardhu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile index 2e1027bf9d..8e812bec3a 100644 --- a/board/nvidia/harmony/Makefile +++ b/board/nvidia/harmony/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c index 52236792e2..23d2928648 100644 --- a/board/nvidia/harmony/harmony.c +++ b/board/nvidia/harmony/harmony.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/jetson-tk1/Makefile b/board/nvidia/jetson-tk1/Makefile index 0f054117c4..bb35ef68f1 100644 --- a/board/nvidia/jetson-tk1/Makefile +++ b/board/nvidia/jetson-tk1/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2014 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ../venice2/as3722_init.o diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index 7f3cdd70fe..319c143fa7 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h index fc5cdd1eb1..4d43ce88c2 100644 --- a/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h +++ b/board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ diff --git a/board/nvidia/nyan-big/Makefile b/board/nvidia/nyan-big/Makefile index cd2f61dc9d..1488687397 100644 --- a/board/nvidia/nyan-big/Makefile +++ b/board/nvidia/nyan-big/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2014 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ../venice2/as3722_init.o diff --git a/board/nvidia/nyan-big/README b/board/nvidia/nyan-big/README index 0e53d8d92f..94328b89a7 100644 --- a/board/nvidia/nyan-big/README +++ b/board/nvidia/nyan-big/README @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2018 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c index 06a36f8ed3..913e0185ff 100644 --- a/board/nvidia/nyan-big/nyan-big.c +++ b/board/nvidia/nyan-big/nyan-big.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/nyan-big/pinmux-config-nyan-big.h b/board/nvidia/nyan-big/pinmux-config-nyan-big.h index 43c757e030..61eefaa0f5 100644 --- a/board/nvidia/nyan-big/pinmux-config-nyan-big.h +++ b/board/nvidia/nyan-big/pinmux-config-nyan-big.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ diff --git a/board/nvidia/p2371-0000/Makefile b/board/nvidia/p2371-0000/Makefile index 9f580ae5b2..405f0c0478 100644 --- a/board/nvidia/p2371-0000/Makefile +++ b/board/nvidia/p2371-0000/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2015 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += p2371-0000.o diff --git a/board/nvidia/p2371-0000/p2371-0000.c b/board/nvidia/p2371-0000/p2371-0000.c index b819b049f4..073a116c96 100644 --- a/board/nvidia/p2371-0000/p2371-0000.c +++ b/board/nvidia/p2371-0000/p2371-0000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2019 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/p2371-2180/Makefile b/board/nvidia/p2371-2180/Makefile index 10aefb071e..b40924d14a 100644 --- a/board/nvidia/p2371-2180/Makefile +++ b/board/nvidia/p2371-2180/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2015 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += p2371-2180.o diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c index 816c7bec6a..14eae8ba8e 100644 --- a/board/nvidia/p2371-2180/p2371-2180.c +++ b/board/nvidia/p2371-2180/p2371-2180.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2019 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/p2571/Makefile b/board/nvidia/p2571/Makefile index 627b7efa2a..d65e5ae9df 100644 --- a/board/nvidia/p2571/Makefile +++ b/board/nvidia/p2571/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2015 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += p2571.o diff --git a/board/nvidia/p2571/max77620_init.h b/board/nvidia/p2571/max77620_init.h index ea5402c1cd..c03fdbd2ab 100644 --- a/board/nvidia/p2571/max77620_init.h +++ b/board/nvidia/p2571/max77620_init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c index a4c4259eea..ab98613f71 100644 --- a/board/nvidia/p2571/p2571.c +++ b/board/nvidia/p2571/p2571.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2019 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/p3450-0000/Makefile b/board/nvidia/p3450-0000/Makefile index 993c506d82..f452241eee 100644 --- a/board/nvidia/p3450-0000/Makefile +++ b/board/nvidia/p3450-0000/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2018 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += p3450-0000.o diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c index fb1a224daa..1793a3f73c 100644 --- a/board/nvidia/p3450-0000/p3450-0000.c +++ b/board/nvidia/p3450-0000/p3450-0000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018-2019 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/seaboard/Makefile b/board/nvidia/seaboard/Makefile index 7793e7272a..efbf0c75f8 100644 --- a/board/nvidia/seaboard/Makefile +++ b/board/nvidia/seaboard/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 829751112f..4f33e32a27 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/venice2/Makefile b/board/nvidia/venice2/Makefile index 5fac5ab1f8..866ce24e37 100644 --- a/board/nvidia/venice2/Makefile +++ b/board/nvidia/venice2/Makefile @@ -2,7 +2,7 @@ # (C) Copyright 2013-2014 # NVIDIA Corporation <www.nvidia.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += as3722_init.o diff --git a/board/nvidia/venice2/as3722_init.c b/board/nvidia/venice2/as3722_init.c index 395bdd99c7..1b2e95dc5f 100644 --- a/board/nvidia/venice2/as3722_init.c +++ b/board/nvidia/venice2/as3722_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/venice2/pinmux-config-venice2.h b/board/nvidia/venice2/pinmux-config-venice2.h index fc7fea406d..7ecb2d94c6 100644 --- a/board/nvidia/venice2/pinmux-config-venice2.h +++ b/board/nvidia/venice2/pinmux-config-venice2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c index d89bbe5ecc..6fec8e7291 100644 --- a/board/nvidia/venice2/venice2.c +++ b/board/nvidia/venice2/venice2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile index 3bec3fe33a..280f5d77bc 100644 --- a/board/nvidia/ventana/Makefile +++ b/board/nvidia/ventana/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> diff --git a/board/olimex/mx23_olinuxino/Makefile b/board/olimex/mx23_olinuxino/Makefile index b2ea897434..3067fc540e 100644 --- a/board/olimex/mx23_olinuxino/Makefile +++ b/board/olimex/mx23_olinuxino/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c index bdd5fcd76a..ca1a18054f 100644 --- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c +++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Olimex MX23 Olinuxino board * diff --git a/board/olimex/mx23_olinuxino/spl_boot.c b/board/olimex/mx23_olinuxino/spl_boot.c index 248176c23c..fdf085f8eb 100644 --- a/board/olimex/mx23_olinuxino/spl_boot.c +++ b/board/olimex/mx23_olinuxino/spl_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Olimex MX23 Olinuxino Boot setup * diff --git a/board/opalkelly/zynq/Makefile b/board/opalkelly/zynq/Makefile index 19e893e43d..6636b69c07 100644 --- a/board/opalkelly/zynq/Makefile +++ b/board/opalkelly/zynq/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := board.o diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 0cbfc08183..0a113f8e09 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2017 Opal Kelly Inc. diff --git a/board/openpiton/riscv64/Makefile b/board/openpiton/riscv64/Makefile index 3bffa75a9a..808fa0c5d5 100644 --- a/board/openpiton/riscv64/Makefile +++ b/board/openpiton/riscv64/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 Tianrui Wei # Tianrui Wei <tianrui-wei(a)outlook.com> diff --git a/board/openpiton/riscv64/openpiton-riscv64.c b/board/openpiton/riscv64/openpiton-riscv64.c index f2282d1548..6eb09e622b 100644 --- a/board/openpiton/riscv64/openpiton-riscv64.c +++ b/board/openpiton/riscv64/openpiton-riscv64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 SiFive, Inc * Copyright (c) 2021 Tianrui Wei diff --git a/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg b/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg index 38c4572152..3c29d50065 100644 --- a/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg +++ b/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2016 Freescale Semiconductor, Inc. // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> diff --git a/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg b/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg index 497e7f8fc4..3dcdf1b652 100644 --- a/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg +++ b/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2016 Freescale Semiconductor, Inc. // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> diff --git a/board/out4/o4-imx6ull-nano/Makefile b/board/out4/o4-imx6ull-nano/Makefile index a3f4646d9e..fa158c2a2d 100644 --- a/board/out4/o4-imx6ull-nano/Makefile +++ b/board/out4/o4-imx6ull-nano/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> obj-y := o4-imx6ull-nano.o diff --git a/board/out4/o4-imx6ull-nano/o4-imx6ull-nano.c b/board/out4/o4-imx6ull-nano/o4-imx6ull-nano.c index edb200e9e5..31cd78add6 100644 --- a/board/out4/o4-imx6ull-nano/o4-imx6ull-nano.c +++ b/board/out4/o4-imx6ull-nano/o4-imx6ull-nano.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> #include <asm/arch-mx6/clock.h> diff --git a/board/phytec/common/Makefile b/board/phytec/common/Makefile index fe28964ce2..604456204a 100644 --- a/board/phytec/common/Makefile +++ b/board/phytec/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2023 PHYTEC Messtechnik GmbH # Author: Teresa Remmet <t.remmet(a)phytec.de> diff --git a/board/phytec/pcl063/Makefile b/board/phytec/pcl063/Makefile index 53c73c9b08..62008d2a38 100644 --- a/board/phytec/pcl063/Makefile +++ b/board/phytec/pcl063/Makefile @@ -1,6 +1,6 @@ # Copyright (C) 2018 Collabora Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := pcl063.o diff --git a/board/phytec/pcl063/pcl063.c b/board/phytec/pcl063/pcl063.c index b2e435f690..a89f82fdf7 100644 --- a/board/phytec/pcl063/pcl063.c +++ b/board/phytec/pcl063/pcl063.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Collabora Ltd. * diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c index b6d459fdfc..469620666e 100644 --- a/board/phytec/pcl063/spl.c +++ b/board/phytec/pcl063/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Collabora Ltd. * diff --git a/board/phytec/pcm052/Makefile b/board/phytec/pcm052/Makefile index ebbc9b237a..78b5b70cda 100644 --- a/board/phytec/pcm052/Makefile +++ b/board/phytec/pcm052/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/phytec/pcm052/imximage.cfg b/board/phytec/pcm052/imximage.cfg index cf72b84e77..14d8a7257d 100644 --- a/board/phytec/pcm052/imximage.cfg +++ b/board/phytec/pcm052/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 3ADEV <http://www.3adev.com> * diff --git a/board/phytec/pcm052/pcm052.c b/board/phytec/pcm052/pcm052.c index 0f7235979b..9807b131ba 100644 --- a/board/phytec/pcm052/pcm052.c +++ b/board/phytec/pcm052/pcm052.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. diff --git a/board/phytec/pcm058/Makefile b/board/phytec/pcm058/Makefile index 75b503d95d..d9867f7572 100644 --- a/board/phytec/pcm058/Makefile +++ b/board/phytec/pcm058/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/phytec/pcm058/pcm058.c b/board/phytec/pcm058/pcm058.c index b37c6fe218..4644ec6726 100644 --- a/board/phytec/pcm058/pcm058.c +++ b/board/phytec/pcm058/pcm058.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefano Babic <sbabic(a)denx.de> */ diff --git a/board/phytec/phycore_am335x_r2/Makefile b/board/phytec/phycore_am335x_r2/Makefile index ff6f8b4221..f7f7f36ffc 100644 --- a/board/phytec/phycore_am335x_r2/Makefile +++ b/board/phytec/phycore_am335x_r2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/phytec/phycore_am335x_r2/board.c b/board/phytec/phycore_am335x_r2/board.c index eb573d076d..e3d44a4028 100644 --- a/board/phytec/phycore_am335x_r2/board.c +++ b/board/phytec/phycore_am335x_r2/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/phytec/phycore_am335x_r2/board.h b/board/phytec/phycore_am335x_r2/board.h index 1b90861dd3..62fc5be19b 100644 --- a/board/phytec/phycore_am335x_r2/board.h +++ b/board/phytec/phycore_am335x_r2/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/phytec/phycore_am335x_r2/mux.c b/board/phytec/phycore_am335x_r2/mux.c index 7091c985ba..da14d54846 100644 --- a/board/phytec/phycore_am335x_r2/mux.c +++ b/board/phytec/phycore_am335x_r2/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg b/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg index 722e62c92d..7d0b2913c6 100644 --- a/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg +++ b/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Phytec Messtechnik GmbH */ diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg index 6dedf1724a..619b2d9a80 100644 --- a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg +++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/phytec/phycore_rk3288/Makefile b/board/phytec/phycore_rk3288/Makefile index f379fbe93a..967f91b622 100644 --- a/board/phytec/phycore_rk3288/Makefile +++ b/board/phytec/phycore_rk3288/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017 PHYTEC Messtechnik GmbH # Author: Wadim Egorov <w.egorov(a)phytec.de> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += phycore-rk3288.o diff --git a/board/phytec/phycore_rk3288/phycore-rk3288.c b/board/phytec/phycore_rk3288/phycore-rk3288.c index 3f49f39e3d..f53fe0ffbe 100644 --- a/board/phytec/phycore_rk3288/phycore-rk3288.c +++ b/board/phytec/phycore_rk3288/phycore-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 PHYTEC Messtechnik GmbH * Author: Wadim Egorov <w.egorov(a)phytec.de> diff --git a/board/phytec/phycore_rk3288/som.h b/board/phytec/phycore_rk3288/som.h index f627264f5f..e6f4f7c79f 100644 --- a/board/phytec/phycore_rk3288/som.h +++ b/board/phytec/phycore_rk3288/som.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 PHYTEC Messtechnik GmbH * Author: Wadim Egorov <w.egorov(a)phytec.de> diff --git a/board/phytium/durian/Makefile b/board/phytium/durian/Makefile index 8637ba4afc..ad780084d7 100644 --- a/board/phytium/durian/Makefile +++ b/board/phytium/durian/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019 # shuyiqi <shuyiqi(a)phytium.com.cn> diff --git a/board/phytium/durian/cpu.h b/board/phytium/durian/cpu.h index 696731ede1..9a3b5de714 100644 --- a/board/phytium/durian/cpu.h +++ b/board/phytium/durian/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 * Phytium Technology Ltd <www.phytium.com> diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c index 0a4048d498..03b3d6049a 100644 --- a/board/phytium/durian/durian.c +++ b/board/phytium/durian/durian.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * shuyiqi <shuyiqi(a)phytium.com.cn> diff --git a/board/phytium/pomelo/Makefile b/board/phytium/pomelo/Makefile index b9cb3609bd..534e2a1916 100644 --- a/board/phytium/pomelo/Makefile +++ b/board/phytium/pomelo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 # lixinde <lixinde(a)phytium.com.cn> diff --git a/board/phytium/pomelo/cpu.h b/board/phytium/pomelo/cpu.h index 005ea5982b..246d449070 100644 --- a/board/phytium/pomelo/cpu.h +++ b/board/phytium/pomelo/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 * Phytium Technology Ltd <www.phytium.com> diff --git a/board/phytium/pomelo/ddr.c b/board/phytium/pomelo/ddr.c index c6dbed9639..8b6724ee96 100644 --- a/board/phytium/pomelo/ddr.c +++ b/board/phytium/pomelo/ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/board/phytium/pomelo/pcie.c b/board/phytium/pomelo/pcie.c index 698d82fd8d..ba8133f2b6 100644 --- a/board/phytium/pomelo/pcie.c +++ b/board/phytium/pomelo/pcie.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/board/phytium/pomelo/pll.c b/board/phytium/pomelo/pll.c index a66ffddf09..e06fd95f80 100644 --- a/board/phytium/pomelo/pll.c +++ b/board/phytium/pomelo/pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/board/phytium/pomelo/pomelo.c b/board/phytium/pomelo/pomelo.c index 960e491c76..a203eb9366 100644 --- a/board/phytium/pomelo/pomelo.c +++ b/board/phytium/pomelo/pomelo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/board/phytium/pomelo/sec.c b/board/phytium/pomelo/sec.c index aeb3983f01..b059a83ea4 100644 --- a/board/phytium/pomelo/sec.c +++ b/board/phytium/pomelo/sec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c index 4ad780767e..a029f56ccb 100644 --- a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c +++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * (C) Copyright 2020 Peter Robinson <pbrobinson at gmail.com> diff --git a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c index b6ccbb9c1c..6c88719004 100644 --- a/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c +++ b/board/pine64/pinephone-pro-rk3399/pinephone-pro-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd * (C) Copyright 2022 Peter Robinson <pbrobinson at gmail.com> diff --git a/board/pine64/rockpro64_rk3399/Makefile b/board/pine64/rockpro64_rk3399/Makefile index b015c47e6f..4e5bd1d9f7 100644 --- a/board/pine64/rockpro64_rk3399/Makefile +++ b/board/pine64/rockpro64_rk3399/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2019 Vasily Khoruzhick # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += rockpro64-rk3399.o diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c index d79084614f..2e97c0808c 100644 --- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Vasily Khoruzhick <anarsoul(a)gmail.com> */ diff --git a/board/purism/librem5/Makefile b/board/purism/librem5/Makefile index 47f25f047b..63a835cf7f 100644 --- a/board/purism/librem5/Makefile +++ b/board/purism/librem5/Makefile @@ -2,7 +2,7 @@ # Copyright 2017 NXP # Copyright 2019 Purism # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += librem5.o diff --git a/board/purism/librem5/imximage-8mq-lpddr4.cfg b/board/purism/librem5/imximage-8mq-lpddr4.cfg index 3b5967105b..adf1165efc 100644 --- a/board/purism/librem5/imximage-8mq-lpddr4.cfg +++ b/board/purism/librem5/imximage-8mq-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/purism/librem5/librem5.c b/board/purism/librem5/librem5.c index 386ed1b4fb..b8f4f3a418 100644 --- a/board/purism/librem5/librem5.c +++ b/board/purism/librem5/librem5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * Copyright 2021 Purism diff --git a/board/purism/librem5/librem5.h b/board/purism/librem5/librem5.h index 0d24edea9b..b03e61fc53 100644 --- a/board/purism/librem5/librem5.h +++ b/board/purism/librem5/librem5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Purism */ diff --git a/board/purism/librem5/lpddr4_timing.c b/board/purism/librem5/lpddr4_timing.c index 46bc7f8591..a03fb1cd28 100644 --- a/board/purism/librem5/lpddr4_timing.c +++ b/board/purism/librem5/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/purism/librem5/lpddr4_timing_b0.c b/board/purism/librem5/lpddr4_timing_b0.c index ec68edaf69..ac16f0a4e6 100644 --- a/board/purism/librem5/lpddr4_timing_b0.c +++ b/board/purism/librem5/lpddr4_timing_b0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/purism/librem5/spl.c b/board/purism/librem5/spl.c index 581f092966..fb302c0e27 100644 --- a/board/purism/librem5/spl.c +++ b/board/purism/librem5/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * Copyright 2021 Purism diff --git a/board/qca/ap121/Makefile b/board/qca/ap121/Makefile index 7cdf53cf9e..8ca1ce855b 100644 --- a/board/qca/ap121/Makefile +++ b/board/qca/ap121/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y = ap121.o diff --git a/board/qca/ap121/ap121.c b/board/qca/ap121/ap121.c index 60a2e19143..53100c1105 100644 --- a/board/qca/ap121/ap121.c +++ b/board/qca/ap121/ap121.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/board/qca/ap143/Makefile b/board/qca/ap143/Makefile index bf9fd83af9..ecaf96c16d 100644 --- a/board/qca/ap143/Makefile +++ b/board/qca/ap143/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y = ap143.o diff --git a/board/qca/ap143/ap143.c b/board/qca/ap143/ap143.c index ac65054136..b1452f03bd 100644 --- a/board/qca/ap143/ap143.c +++ b/board/qca/ap143/ap143.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/board/qca/ap152/Makefile b/board/qca/ap152/Makefile index 4270afa129..1304e417ef 100644 --- a/board/qca/ap152/Makefile +++ b/board/qca/ap152/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y = ap152.o diff --git a/board/qca/ap152/ap152.c b/board/qca/ap152/ap152.c index 82458c3af4..2cd95d7e44 100644 --- a/board/qca/ap152/ap152.c +++ b/board/qca/ap152/ap152.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/board/qualcomm/dragonboard410c/Makefile b/board/qualcomm/dragonboard410c/Makefile index 1b99c8b0ef..2ccd8913f7 100644 --- a/board/qualcomm/dragonboard410c/Makefile +++ b/board/qualcomm/dragonboard410c/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c index 371b3262f8..4ecb5665fb 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.c +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for Dragonboard 410C * diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.env b/board/qualcomm/dragonboard410c/dragonboard410c.env index 9d9a575a0c..86304aac1b 100644 --- a/board/qualcomm/dragonboard410c/dragonboard410c.env +++ b/board/qualcomm/dragonboard410c/dragonboard410c.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Does what recovery does */ #define REFLASH(file, partnum) \ diff --git a/board/qualcomm/dragonboard820c/Makefile b/board/qualcomm/dragonboard820c/Makefile index 643311f5b3..f59bf7a4d3 100644 --- a/board/qualcomm/dragonboard820c/Makefile +++ b/board/qualcomm/dragonboard820c/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)gmail.com> diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c index f9cc762a25..28777f2cae 100644 --- a/board/qualcomm/dragonboard820c/dragonboard820c.c +++ b/board/qualcomm/dragonboard820c/dragonboard820c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for Dragonboard 820C * diff --git a/board/qualcomm/dragonboard820c/head.S b/board/qualcomm/dragonboard820c/head.S index b052a858fd..a735d18109 100644 --- a/board/qualcomm/dragonboard820c/head.S +++ b/board/qualcomm/dragonboard820c/head.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ARM64 header for proper chain-loading with Little Kernel. * diff --git a/board/qualcomm/dragonboard820c/readme.txt b/board/qualcomm/dragonboard820c/readme.txt index 966e9520e8..6e682af903 100644 --- a/board/qualcomm/dragonboard820c/readme.txt +++ b/board/qualcomm/dragonboard820c/readme.txt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)linaro.org> diff --git a/board/qualcomm/dragonboard820c/u-boot.lds b/board/qualcomm/dragonboard820c/u-boot.lds index 5251b59fbe..eeeab72aee 100644 --- a/board/qualcomm/dragonboard820c/u-boot.lds +++ b/board/qualcomm/dragonboard820c/u-boot.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Override linker script for fastboot-readable images * diff --git a/board/qualcomm/qcs404-evb/Makefile b/board/qualcomm/qcs404-evb/Makefile index 4665827e08..49ef8732a9 100644 --- a/board/qualcomm/qcs404-evb/Makefile +++ b/board/qualcomm/qcs404-evb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Sumit Garg <sumit.garg(a)linaro.org> # diff --git a/board/qualcomm/qcs404-evb/qcs404-evb.c b/board/qualcomm/qcs404-evb/qcs404-evb.c index 249dca7e72..ca8fb7e886 100644 --- a/board/qualcomm/qcs404-evb/qcs404-evb.c +++ b/board/qualcomm/qcs404-evb/qcs404-evb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for QCS404-EVB * diff --git a/board/radxa/rock5a-rk3588s/Makefile b/board/radxa/rock5a-rk3588s/Makefile index 48dd512455..a163d2dd33 100644 --- a/board/radxa/rock5a-rk3588s/Makefile +++ b/board/radxa/rock5a-rk3588s/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2023 Collabora Ltd. # diff --git a/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c b/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c index 2d7a8c07dc..c4faee3817 100644 --- a/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c +++ b/board/radxa/rock5a-rk3588s/rock5a-rk3588s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Collabora Ltd. */ diff --git a/board/radxa/rock5b-rk3588/Makefile b/board/radxa/rock5b-rk3588/Makefile index 95d813596d..fe586d8e99 100644 --- a/board/radxa/rock5b-rk3588/Makefile +++ b/board/radxa/rock5b-rk3588/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022 Collabora Ltd. # diff --git a/board/radxa/rock5b-rk3588/rock5b-rk3588.c b/board/radxa/rock5b-rk3588/rock5b-rk3588.c index 5c3b52b948..e482fc7110 100644 --- a/board/radxa/rock5b-rk3588/rock5b-rk3588.c +++ b/board/radxa/rock5b-rk3588/rock5b-rk3588.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Collabora Ltd. */ diff --git a/board/raidsonic/ib62x0/Makefile b/board/raidsonic/ib62x0/Makefile index 3e6bc688e7..9768824052 100644 --- a/board/raidsonic/ib62x0/Makefile +++ b/board/raidsonic/ib62x0/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2009 # Marvell Semiconductor <www.marvell.com> diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c index f9bc07649e..8ac2079fc5 100644 --- a/board/raidsonic/ib62x0/ib62x0.c +++ b/board/raidsonic/ib62x0/ib62x0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011-2012 * Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/raidsonic/ib62x0/ib62x0.h b/board/raidsonic/ib62x0/ib62x0.h index 3690e13533..a095c6f103 100644 --- a/board/raidsonic/ib62x0/ib62x0.h +++ b/board/raidsonic/ib62x0/ib62x0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011-2012 * Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/raidsonic/ib62x0/kwbimage.cfg b/board/raidsonic/ib62x0/kwbimage.cfg index 1249a0e4bc..a7e01c5feb 100644 --- a/board/raidsonic/ib62x0/kwbimage.cfg +++ b/board/raidsonic/ib62x0/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011-2012 # Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/raspberrypi/rpi/lowlevel_init.S b/board/raspberrypi/rpi/lowlevel_init.S index 8c39b3e12e..f2103c2b72 100644 --- a/board/raspberrypi/rpi/lowlevel_init.S +++ b/board/raspberrypi/rpi/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Cédric Schieli <cschieli(a)gmail.com> diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env index 30228285ed..12d2eb7558 100644 --- a/board/raspberrypi/rpi/rpi.env +++ b/board/raspberrypi/rpi/rpi.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* environment for Raspberry Pi boards */ diff --git a/board/renesas/condor/Makefile b/board/renesas/condor/Makefile index 19e6038430..4ef723bde9 100644 --- a/board/renesas/condor/Makefile +++ b/board/renesas/condor/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2019 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/draak/Makefile b/board/renesas/draak/Makefile index 1fc90d1dab..9115d7a0cf 100644 --- a/board/renesas/draak/Makefile +++ b/board/renesas/draak/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2015 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c index 1ed72d34a7..6fdc415760 100644 --- a/board/renesas/draak/draak.c +++ b/board/renesas/draak/draak.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/draak/draak.c * This file is Draak board support. diff --git a/board/renesas/eagle/Makefile b/board/renesas/eagle/Makefile index 9fb6a7c0f0..d1ec549281 100644 --- a/board/renesas/eagle/Makefile +++ b/board/renesas/eagle/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2015 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/ebisu/Makefile b/board/renesas/ebisu/Makefile index 956ce8a90f..4337791903 100644 --- a/board/renesas/ebisu/Makefile +++ b/board/renesas/ebisu/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2018 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/falcon/Makefile b/board/renesas/falcon/Makefile index 3b202c24fb..70626d8026 100644 --- a/board/renesas/falcon/Makefile +++ b/board/renesas/falcon/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2020 Renesas Electronics Corp. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/falcon/falcon.c b/board/renesas/falcon/falcon.c index 0aa0f1afcb..4610108b8b 100644 --- a/board/renesas/falcon/falcon.c +++ b/board/renesas/falcon/falcon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/falcon/falcon.c * This file is Falcon board support. diff --git a/board/renesas/grpeach/Makefile b/board/renesas/grpeach/Makefile index 48e185ce3e..4a43c3a101 100644 --- a/board/renesas/grpeach/Makefile +++ b/board/renesas/grpeach/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017 Renesas Electronics # Copyright (C) 2017 Chris Brandt # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := grpeach.o obj-y += lowlevel_init.o diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c index f609e4f072..1072f6b0f0 100644 --- a/board/renesas/grpeach/grpeach.c +++ b/board/renesas/grpeach/grpeach.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Renesas Electronics * Copyright (C) Chris Brandt diff --git a/board/renesas/grpeach/lowlevel_init.S b/board/renesas/grpeach/lowlevel_init.S index b83c4e8686..d8f6875054 100644 --- a/board/renesas/grpeach/lowlevel_init.S +++ b/board/renesas/grpeach/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Renesas Electronics * Copyright (C) 2017 Chris Brandt diff --git a/board/renesas/r2dplus/Makefile b/board/renesas/r2dplus/Makefile index 51d8d244df..e10e7fd6fd 100644 --- a/board/renesas/r2dplus/Makefile +++ b/board/renesas/r2dplus/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007,2008 # Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/board/renesas/r2dplus/r2dplus.c b/board/renesas/r2dplus/r2dplus.c index 4b9959a432..27a70b10d7 100644 --- a/board/renesas/r2dplus/r2dplus.c +++ b/board/renesas/r2dplus/r2dplus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007,2008 * Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> diff --git a/board/renesas/rcar-common/v3-common.c b/board/renesas/rcar-common/v3-common.c index 7c6202ea49..11207adc77 100644 --- a/board/renesas/rcar-common/v3-common.c +++ b/board/renesas/rcar-common/v3-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2023 Marek Vasut <marek.vasut+renesas(a)mailbox.org> */ diff --git a/board/renesas/rzg2l/Kconfig b/board/renesas/rzg2l/Kconfig index 1335fc7ae8..8dbdfb37e8 100644 --- a/board/renesas/rzg2l/Kconfig +++ b/board/renesas/rzg2l/Kconfig @@ -1,5 +1,5 @@ # Copyright (C) 2023 Renesas Electronics Corporation -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later if TARGET_RZG2L_SMARC_EVK diff --git a/board/renesas/rzg2l/Makefile b/board/renesas/rzg2l/Makefile index 466935fc81..0f5ffcbfa8 100644 --- a/board/renesas/rzg2l/Makefile +++ b/board/renesas/rzg2l/Makefile @@ -1,4 +1,4 @@ # Copyright (C) 2023 Renesas Electronics Corporation -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := rzg2l.o diff --git a/board/renesas/rzg2l/rzg2l.c b/board/renesas/rzg2l/rzg2l.c index 755747e665..abd7144115 100644 --- a/board/renesas/rzg2l/rzg2l.c +++ b/board/renesas/rzg2l/rzg2l.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RZ/G2L board support. * Copyright (C) 2023 Renesas Electronics Corporation diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile index 95258079e4..b6cc4d0c2d 100644 --- a/board/renesas/salvator-x/Makefile +++ b/board/renesas/salvator-x/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2015 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 939b48ee30..e6c6fdbb3e 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/salvator-x/salvator-x.c * This file is Salvator-X/Salvator-XS board support. diff --git a/board/renesas/spider/Makefile b/board/renesas/spider/Makefile index 545cb58a98..8be8435f27 100644 --- a/board/renesas/spider/Makefile +++ b/board/renesas/spider/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2020 Renesas Electronics Corp. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := spider.o ../rcar-common/common.o diff --git a/board/renesas/spider/spider.c b/board/renesas/spider/spider.c index fd83a72229..af5b262843 100644 --- a/board/renesas/spider/spider.c +++ b/board/renesas/spider/spider.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/spider/spider.c * This file is Spider board support. diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile index f4d24c68a6..d925754781 100644 --- a/board/renesas/ulcb/Makefile +++ b/board/renesas/ulcb/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2017 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c index 0c060a5323..7404036aea 100644 --- a/board/renesas/ulcb/cpld.c +++ b/board/renesas/ulcb/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ULCB board CPLD access support * diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 1477750f92..0301ccf507 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/ulcb/ulcb.c * This file is ULCB board support. diff --git a/board/renesas/v3hsk/Makefile b/board/renesas/v3hsk/Makefile index a9d597edd5..7b93a51475 100644 --- a/board/renesas/v3hsk/Makefile +++ b/board/renesas/v3hsk/Makefile @@ -4,7 +4,7 @@ # Copyright (C) 2019 Renesas Electronics Corporation # Copyright (C) 2019 Cogent Embedded, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/v3hsk/cpld.c b/board/renesas/v3hsk/cpld.c index 6016f6daef..b14619e699 100644 --- a/board/renesas/v3hsk/cpld.c +++ b/board/renesas/v3hsk/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * V3HSK board CPLD access support * diff --git a/board/renesas/v3msk/Makefile b/board/renesas/v3msk/Makefile index ec493e572f..28a198de34 100644 --- a/board/renesas/v3msk/Makefile +++ b/board/renesas/v3msk/Makefile @@ -4,7 +4,7 @@ # Copyright (C) 2019 Renesas Electronics Corporation # Copyright (C) 2019 Cogent Embedded, Inc. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/renesas/v3msk/cpld.c b/board/renesas/v3msk/cpld.c index aed616ac85..82926dde97 100644 --- a/board/renesas/v3msk/cpld.c +++ b/board/renesas/v3msk/cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * V3MSK board CPLD access support * diff --git a/board/renesas/whitehawk/Makefile b/board/renesas/whitehawk/Makefile index ed5bdc04e0..a80806e975 100644 --- a/board/renesas/whitehawk/Makefile +++ b/board/renesas/whitehawk/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2021 Renesas Electronics Corp. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := whitehawk.o ../rcar-common/common.o diff --git a/board/renesas/whitehawk/whitehawk.c b/board/renesas/whitehawk/whitehawk.c index 32284b2ecc..e80a7a1689 100644 --- a/board/renesas/whitehawk/whitehawk.c +++ b/board/renesas/whitehawk/whitehawk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/renesas/whitehawk/whitehawk.c * This file is White Hawk board support. diff --git a/board/rockchip/evb_rk3036/Makefile b/board/rockchip/evb_rk3036/Makefile index 0403836e13..0c5833558e 100644 --- a/board/rockchip/evb_rk3036/Makefile +++ b/board/rockchip/evb_rk3036/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evb_rk3036.o diff --git a/board/rockchip/evb_rk3036/evb_rk3036.c b/board/rockchip/evb_rk3036/evb_rk3036.c index 8c606463e4..25d197939e 100644 --- a/board/rockchip/evb_rk3036/evb_rk3036.c +++ b/board/rockchip/evb_rk3036/evb_rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/board/rockchip/evb_rk3308/Makefile b/board/rockchip/evb_rk3308/Makefile index 05de5560f1..bdb2184a94 100644 --- a/board/rockchip/evb_rk3308/Makefile +++ b/board/rockchip/evb_rk3308/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2018 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evb_rk3308.o diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c index e0c96fd70a..23a957bda9 100644 --- a/board/rockchip/evb_rk3308/evb_rk3308.c +++ b/board/rockchip/evb_rk3308/evb_rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Rockchip Electronics Co., Ltd */ diff --git a/board/rockchip/evb_rk3399/Makefile b/board/rockchip/evb_rk3399/Makefile index aaa51c212e..8b57329b80 100644 --- a/board/rockchip/evb_rk3399/Makefile +++ b/board/rockchip/evb_rk3399/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evb-rk3399.o diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index 3c773d0930..69f065d5b0 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/board/rockchip/evb_rk3588/Makefile b/board/rockchip/evb_rk3588/Makefile index 240d2ec597..4f0c0f61de 100644 --- a/board/rockchip/evb_rk3588/Makefile +++ b/board/rockchip/evb_rk3588/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2023 Rockchip Electronics Co,. Ltd. # diff --git a/board/rockchip/evb_rk3588/evb-rk3588.c b/board/rockchip/evb_rk3588/evb-rk3588.c index caf94d8d29..2bcf3fba28 100644 --- a/board/rockchip/evb_rk3588/evb-rk3588.c +++ b/board/rockchip/evb_rk3588/evb-rk3588.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Rockchip Electronics Co,. Ltd. */ diff --git a/board/rockchip/evb_rv1108/Makefile b/board/rockchip/evb_rv1108/Makefile index dd99054d56..cae20400d6 100644 --- a/board/rockchip/evb_rv1108/Makefile +++ b/board/rockchip/evb_rv1108/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evb_rv1108.o diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c index e6ac598648..bd9fb37a44 100644 --- a/board/rockchip/evb_rv1108/evb_rv1108.c +++ b/board/rockchip/evb_rv1108/evb_rv1108.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C)Copyright 2016 Rockchip Electronics Co., Ltd * Authors: Andy Yan <andy.yan(a)rock-chips.com> diff --git a/board/rockchip/kylin_rk3036/Makefile b/board/rockchip/kylin_rk3036/Makefile index 0663270506..676694ddc7 100644 --- a/board/rockchip/kylin_rk3036/Makefile +++ b/board/rockchip/kylin_rk3036/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += kylin_rk3036.o diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c index 0ca91cdeb0..0d5412ed08 100644 --- a/board/rockchip/kylin_rk3036/kylin_rk3036.c +++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/board/rockchip/tinker_rk3288/Makefile b/board/rockchip/tinker_rk3288/Makefile index 432367f4e2..558d3f938c 100644 --- a/board/rockchip/tinker_rk3288/Makefile +++ b/board/rockchip/tinker_rk3288/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2016 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += tinker-rk3288.o diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c index f85209c649..db02ddfd28 100644 --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/board/ronetix/imx7-cm/Makefile b/board/ronetix/imx7-cm/Makefile index 7e08f238a0..6468510df5 100644 --- a/board/ronetix/imx7-cm/Makefile +++ b/board/ronetix/imx7-cm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2017 NXP Semiconductors ifdef CONFIG_SPL_BUILD diff --git a/board/ronetix/imx7-cm/imx7-cm.c b/board/ronetix/imx7-cm/imx7-cm.c index c23097f047..a43b8bffd5 100644 --- a/board/ronetix/imx7-cm/imx7-cm.c +++ b/board/ronetix/imx7-cm/imx7-cm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Ronetix GmbH */ diff --git a/board/ronetix/imx7-cm/spl.c b/board/ronetix/imx7-cm/spl.c index b94cfd6ffc..9a011e8736 100644 --- a/board/ronetix/imx7-cm/spl.c +++ b/board/ronetix/imx7-cm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Ronetix GmbH * diff --git a/board/ronetix/imx8mq-cm/Makefile b/board/ronetix/imx8mq-cm/Makefile index 0d9d8e646d..73ca831807 100644 --- a/board/ronetix/imx8mq-cm/Makefile +++ b/board/ronetix/imx8mq-cm/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mq_cm.o diff --git a/board/ronetix/imx8mq-cm/imx8mq_cm.c b/board/ronetix/imx8mq-cm/imx8mq_cm.c index 9805a3a7da..b3b894f4de 100644 --- a/board/ronetix/imx8mq-cm/imx8mq_cm.c +++ b/board/ronetix/imx8mq-cm/imx8mq_cm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg b/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg index fae7ad8369..2668fafece 100644 --- a/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg +++ b/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 NXP */ diff --git a/board/ronetix/imx8mq-cm/lpddr4_timing.c b/board/ronetix/imx8mq-cm/lpddr4_timing.c index 685600ee62..f4c78e0968 100644 --- a/board/ronetix/imx8mq-cm/lpddr4_timing.c +++ b/board/ronetix/imx8mq-cm/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/ronetix/imx8mq-cm/spl.c b/board/ronetix/imx8mq-cm/spl.c index 1c675bcab2..04b71eb304 100644 --- a/board/ronetix/imx8mq-cm/spl.c +++ b/board/ronetix/imx8mq-cm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/ronetix/pm9261/Makefile b/board/ronetix/pm9261/Makefile index 70e197166b..66c41044a5 100644 --- a/board/ronetix/pm9261/Makefile +++ b/board/ronetix/pm9261/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 07febe69dc..fe4b27d1d3 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/ronetix/pm9263/Makefile b/board/ronetix/pm9263/Makefile index 5ad595d57b..8e78554095 100644 --- a/board/ronetix/pm9263/Makefile +++ b/board/ronetix/pm9263/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index 76f62ddde9..109afdbec0 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/ronetix/pm9g45/Makefile b/board/ronetix/pm9g45/Makefile index 04795c1970..303ebfc4a2 100644 --- a/board/ronetix/pm9g45/Makefile +++ b/board/ronetix/pm9g45/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index aa5c80ac64..9d081f27a6 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Ilko Iliev <iliev(a)ronetix.at> diff --git a/board/samsung/arndale/Makefile b/board/samsung/arndale/Makefile index 1fd6e180be..2bc45396f4 100644 --- a/board/samsung/arndale/Makefile +++ b/board/samsung/arndale/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013 Samsung Electronics diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index 3ebf600e1d..8fa10f724a 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Samsung Electronics */ diff --git a/board/samsung/arndale/arndale_spl.c b/board/samsung/arndale/arndale_spl.c index 6ad0273e04..78b92c8719 100644 --- a/board/samsung/arndale/arndale_spl.c +++ b/board/samsung/arndale/arndale_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/board/samsung/common/Makefile b/board/samsung/common/Makefile index d31b81abf1..e8f102ebd6 100644 --- a/board/samsung/common/Makefile +++ b/board/samsung/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics # Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 5a71982775..b93dffe8f8 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 SAMSUNG Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds index 73cd97a1b1..9db79b6a6a 100644 --- a/board/samsung/common/exynos-uboot-spl.lds +++ b/board/samsung/common/exynos-uboot-spl.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index 9294d36ba3..6179b8cca0 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/board/samsung/common/exynos5-dt.c b/board/samsung/common/exynos5-dt.c index 95cf6d2acc..8f6c814cd5 100644 --- a/board/samsung/common/exynos5-dt.c +++ b/board/samsung/common/exynos5-dt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics */ diff --git a/board/samsung/common/gadget.c b/board/samsung/common/gadget.c index 9487f9ec4e..d5b24eaede 100644 --- a/board/samsung/common/gadget.c +++ b/board/samsung/common/gadget.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index cc114aaaa6..4a5cc3429e 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/board/samsung/common/sromc.c b/board/samsung/common/sromc.c index 76e37dfe26..0c6ca5b3ff 100644 --- a/board/samsung/common/sromc.c +++ b/board/samsung/common/sromc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC */ diff --git a/board/samsung/goni/Makefile b/board/samsung/goni/Makefile index 2bf4141708..371c4a22af 100644 --- a/board/samsung/goni/Makefile +++ b/board/samsung/goni/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index c8f5a153bb..f9d472d704 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008-2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/board/samsung/goni/lowlevel_init.S b/board/samsung/goni/lowlevel_init.S index d38412e2c6..a6364d8a24 100644 --- a/board/samsung/goni/lowlevel_init.S +++ b/board/samsung/goni/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Memory Setup stuff - taken from blob memsetup.S * diff --git a/board/samsung/goni/onenand.c b/board/samsung/goni/onenand.c index c67c107b16..67eeafe041 100644 --- a/board/samsung/goni/onenand.c +++ b/board/samsung/goni/onenand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008-2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/board/samsung/odroid/Makefile b/board/samsung/odroid/Makefile index 5bf48313de..a3cce44687 100644 --- a/board/samsung/odroid/Makefile +++ b/board/samsung/odroid/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved. # Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/board/samsung/odroid/odroid.c b/board/samsung/odroid/odroid.c index 99e5613ced..50caa80798 100644 --- a/board/samsung/odroid/odroid.c +++ b/board/samsung/odroid/odroid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/board/samsung/odroid/setup.h b/board/samsung/odroid/setup.h index 5ee97ee25d..ae890e5df9 100644 --- a/board/samsung/odroid/setup.h +++ b/board/samsung/odroid/setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/board/samsung/origen/Makefile b/board/samsung/origen/Makefile index 44691af09f..78383c9542 100644 --- a/board/samsung/origen/Makefile +++ b/board/samsung/origen/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Samsung Electronics diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c index ddf6a2b72f..493f153d66 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics */ diff --git a/board/samsung/origen/tools/mkorigenspl.c b/board/samsung/origen/tools/mkorigenspl.c index f4be867245..e1eaf4c379 100644 --- a/board/samsung/origen/tools/mkorigenspl.c +++ b/board/samsung/origen/tools/mkorigenspl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics */ diff --git a/board/samsung/smdk5250/Makefile b/board/samsung/smdk5250/Makefile index bab0277277..c6ecab6e15 100644 --- a/board/samsung/smdk5250/Makefile +++ b/board/samsung/smdk5250/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics diff --git a/board/samsung/smdk5250/smdk5250_spl.c b/board/samsung/smdk5250/smdk5250_spl.c index b0ef34dd6a..ce6354bef3 100644 --- a/board/samsung/smdk5250/smdk5250_spl.c +++ b/board/samsung/smdk5250/smdk5250_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/board/samsung/smdk5420/Makefile b/board/samsung/smdk5420/Makefile index f236634096..1f59f06717 100644 --- a/board/samsung/smdk5420/Makefile +++ b/board/samsung/smdk5420/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013 Samsung Electronics diff --git a/board/samsung/smdk5420/smdk5420_spl.c b/board/samsung/smdk5420/smdk5420_spl.c index 84126f5608..a7cab8afab 100644 --- a/board/samsung/smdk5420/smdk5420_spl.c +++ b/board/samsung/smdk5420/smdk5420_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 The Chromium OS Authors. */ diff --git a/board/samsung/smdkc100/Makefile b/board/samsung/smdkc100/Makefile index 00535ee54e..9d4f33ce42 100644 --- a/board/samsung/smdkc100/Makefile +++ b/board/samsung/smdkc100/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/samsung/smdkc100/lowlevel_init.S b/board/samsung/smdkc100/lowlevel_init.S index 3fbe66e077..9634de2a1a 100644 --- a/board/samsung/smdkc100/lowlevel_init.S +++ b/board/samsung/smdkc100/lowlevel_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/board/samsung/smdkc100/onenand.c b/board/samsung/smdkc100/onenand.c index 04dc04a1a4..fe14aecae8 100644 --- a/board/samsung/smdkc100/onenand.c +++ b/board/samsung/smdkc100/onenand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008-2009 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c index 4f46911b0b..0fb55c49e9 100644 --- a/board/samsung/smdkc100/smdkc100.c +++ b/board/samsung/smdkc100/smdkc100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008-2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/board/samsung/smdkv310/Makefile b/board/samsung/smdkv310/Makefile index fccd8ffd2c..9400e7b02d 100644 --- a/board/samsung/smdkv310/Makefile +++ b/board/samsung/smdkv310/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Samsung Electronics diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c index 47483a26a6..7f4875ced7 100644 --- a/board/samsung/smdkv310/smdkv310.c +++ b/board/samsung/smdkv310/smdkv310.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics */ diff --git a/board/samsung/smdkv310/tools/mksmdkv310spl.c b/board/samsung/smdkv310/tools/mksmdkv310spl.c index 378b85d722..7930bff4a5 100644 --- a/board/samsung/smdkv310/tools/mksmdkv310spl.c +++ b/board/samsung/smdkv310/tools/mksmdkv310spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics */ diff --git a/board/samsung/trats/Makefile b/board/samsung/trats/Makefile index cb9ee5b596..b742249061 100644 --- a/board/samsung/trats/Makefile +++ b/board/samsung/trats/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Samsung Electronics # Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/board/samsung/trats/setup.h b/board/samsung/trats/setup.h index 739bdf95f8..cf6f128db3 100644 --- a/board/samsung/trats/setup.h +++ b/board/samsung/trats/setup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Machine Specific Values for TRATS board based on EXYNOS4210 * diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 6a3e5b29b9..22a996d0bd 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/board/samsung/trats2/Makefile b/board/samsung/trats2/Makefile index fd8325e4e4..6d5e23ebb2 100644 --- a/board/samsung/trats2/Makefile +++ b/board/samsung/trats2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. # Sanghee Kim <sh0130.kim(a)samsung.com> diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 81ccc124c8..1d64022239 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. * Sanghee Kim <sh0130.kim(a)samsung.com> diff --git a/board/samsung/universal_c210/Makefile b/board/samsung/universal_c210/Makefile index 1c90dac0f3..0b5aa5c4e4 100644 --- a/board/samsung/universal_c210/Makefile +++ b/board/samsung/universal_c210/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2010 Samsung Electronics # Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/board/samsung/universal_c210/onenand.c b/board/samsung/universal_c210/onenand.c index 265a2cde4b..66c7059f3a 100644 --- a/board/samsung/universal_c210/onenand.c +++ b/board/samsung/universal_c210/onenand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Samsung Electronics * Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 2d61dff89c..7bc3a98de4 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/board/sandbox/Makefile b/board/sandbox/Makefile index 411b53c2b8..84d462aa33 100644 --- a/board/sandbox/Makefile +++ b/board/sandbox/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 9d58860451..d066306b39 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/board/schneider/rzn1-snarc/Makefile b/board/schneider/rzn1-snarc/Makefile index e197ca8cb4..cbdc180a94 100644 --- a/board/schneider/rzn1-snarc/Makefile +++ b/board/schneider/rzn1-snarc/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := rzn1.o diff --git a/board/schneider/rzn1-snarc/rzn1.c b/board/schneider/rzn1-snarc/rzn1.c index 09241c3a95..942d128461 100644 --- a/board/schneider/rzn1-snarc/rzn1.c +++ b/board/schneider/rzn1-snarc/rzn1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <dm.h> diff --git a/board/schneider/rzn1-snarc/spkgimage.cfg b/board/schneider/rzn1-snarc/spkgimage.cfg index b5faf96b00..319ebe3b79 100644 --- a/board/schneider/rzn1-snarc/spkgimage.cfg +++ b/board/schneider/rzn1-snarc/spkgimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2022 Schneider Electric # diff --git a/board/seeed/linkit-smart-7688/Makefile b/board/seeed/linkit-smart-7688/Makefile index 70cd7a8e56..330ae7b45e 100644 --- a/board/seeed/linkit-smart-7688/Makefile +++ b/board/seeed/linkit-smart-7688/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += board.o diff --git a/board/seeed/linkit-smart-7688/board.c b/board/seeed/linkit-smart-7688/board.c index bf7c69ea83..246fed07b3 100644 --- a/board/seeed/linkit-smart-7688/board.c +++ b/board/seeed/linkit-smart-7688/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> */ diff --git a/board/seeed/npi_imx6ull/Makefile b/board/seeed/npi_imx6ull/Makefile index 93ea413517..63e5f7086e 100644 --- a/board/seeed/npi_imx6ull/Makefile +++ b/board/seeed/npi_imx6ull/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := npi_imx6ull.o obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c index c610d2c306..2ab8bd556f 100644 --- a/board/seeed/npi_imx6ull/npi_imx6ull.c +++ b/board/seeed/npi_imx6ull/npi_imx6ull.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Linumiz * Author: Navin Sankar Velliangiri <navin(a)linumiz.com> diff --git a/board/seeed/npi_imx6ull/spl.c b/board/seeed/npi_imx6ull/spl.c index b29da2c1fc..2069827353 100644 --- a/board/seeed/npi_imx6ull/spl.c +++ b/board/seeed/npi_imx6ull/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Linumiz * Author: Navin Sankar Velliangiri <navin(a)linumiz.com> diff --git a/board/siemens/capricorn/Makefile b/board/siemens/capricorn/Makefile index d5846cc8e3..8d07b78745 100644 --- a/board/siemens/capricorn/Makefile +++ b/board/siemens/capricorn/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Siemens AG # diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c index 924c88e8fa..27fec7c408 100644 --- a/board/siemens/capricorn/board.c +++ b/board/siemens/capricorn/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2019 NXP * diff --git a/board/siemens/capricorn/imximage.cfg b/board/siemens/capricorn/imximage.cfg index 4350e2967c..b0729a8f5c 100644 --- a/board/siemens/capricorn/imximage.cfg +++ b/board/siemens/capricorn/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP * diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c index e160c611a9..9dd42735f3 100644 --- a/board/siemens/capricorn/spl.c +++ b/board/siemens/capricorn/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/siemens/capricorn/uboot-container.cfg b/board/siemens/capricorn/uboot-container.cfg index b481c98f92..28d15d0db2 100644 --- a/board/siemens/capricorn/uboot-container.cfg +++ b/board/siemens/capricorn/uboot-container.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c index 8fa9197a6d..ad0e91532a 100644 --- a/board/siemens/common/board.c +++ b/board/siemens/common/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common board functions for siemens AM335X based boards * (C) Copyright 2013 Siemens Schweiz AG diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index 4e36a6f319..c5e2d8b5ef 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Read FactorySet information from EEPROM into global structure. diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/factoryset.h index 8fa6c3b3d3..b271e46282 100644 --- a/board/siemens/common/factoryset.h +++ b/board/siemens/common/factoryset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common board functions for siemens AM335X based boards * (C) Copyright 2013 Siemens Schweiz AG diff --git a/board/siemens/corvus/Makefile b/board/siemens/corvus/Makefile index c67acc613c..964fc8573d 100644 --- a/board/siemens/corvus/Makefile +++ b/board/siemens/corvus/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for siemens CORVUS (AT91SAM9G45) based board # (C) Copyright 2013 Siemens AG diff --git a/board/siemens/corvus/board.c b/board/siemens/corvus/board.c index 569b86db00..8907e79e3c 100644 --- a/board/siemens/corvus/board.c +++ b/board/siemens/corvus/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for Siemens CORVUS (AT91SAM9G45) based board * (C) Copyright 2013 Siemens AG diff --git a/board/siemens/draco/Makefile b/board/siemens/draco/Makefile index 3e3394a865..f85f5b7f60 100644 --- a/board/siemens/draco/Makefile +++ b/board/siemens/draco/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c index 8874659013..dcf61c579b 100644 --- a/board/siemens/draco/board.c +++ b/board/siemens/draco/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for TI AM335X based draco board * (C) Copyright 2013 Siemens Schweiz AG diff --git a/board/siemens/draco/board.h b/board/siemens/draco/board.h index 7c29a45c03..ef78d15a18 100644 --- a/board/siemens/draco/board.h +++ b/board/siemens/draco/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/siemens/draco/mux.c b/board/siemens/draco/mux.c index 3f2d41befe..f0e5c59c20 100644 --- a/board/siemens/draco/mux.c +++ b/board/siemens/draco/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinmux setup for siemens draco board * diff --git a/board/siemens/iot2050/Kconfig b/board/siemens/iot2050/Kconfig index a6170aae80..373d425306 100644 --- a/board/siemens/iot2050/Kconfig +++ b/board/siemens/iot2050/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) Siemens AG, 2018-2023 # diff --git a/board/siemens/iot2050/Makefile b/board/siemens/iot2050/Makefile index 619594ab8e..9579723feb 100644 --- a/board/siemens/iot2050/Makefile +++ b/board/siemens/iot2050/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for Siemens IOT2050 board # Copyright (c) Siemens AG, 2018-2021 diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c index e35e55fb5d..a4cc32f9a9 100644 --- a/board/siemens/iot2050/board.c +++ b/board/siemens/iot2050/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for IOT2050 * Copyright (c) Siemens AG, 2018-2023 diff --git a/board/siemens/iot2050/config.mk b/board/siemens/iot2050/config.mk index 267ec76c4e..8697f2fca7 100644 --- a/board/siemens/iot2050/config.mk +++ b/board/siemens/iot2050/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) Siemens AG, 2020-2021 # diff --git a/board/siemens/iot2050/iot2050.env b/board/siemens/iot2050/iot2050.env index 8bbd7abe98..decc0ca9b0 100644 --- a/board/siemens/iot2050/iot2050.env +++ b/board/siemens/iot2050/iot2050.env @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Siemens AG, 2023 * diff --git a/board/siemens/pxm2/Makefile b/board/siemens/pxm2/Makefile index 3e3394a865..f85f5b7f60 100644 --- a/board/siemens/pxm2/Makefile +++ b/board/siemens/pxm2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 47f19bcb8f..2b6d7801ef 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for TI AM335X based pxm2 board * (C) Copyright 2013 Siemens Schweiz AG diff --git a/board/siemens/pxm2/board.h b/board/siemens/pxm2/board.h index af21fc4743..542e76f95e 100644 --- a/board/siemens/pxm2/board.h +++ b/board/siemens/pxm2/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/siemens/pxm2/mux.c b/board/siemens/pxm2/mux.c index 2f35bb4a73..4f6c322151 100644 --- a/board/siemens/pxm2/mux.c +++ b/board/siemens/pxm2/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinmux setup for siemens pxm2 board * diff --git a/board/siemens/pxm2/pmic.h b/board/siemens/pxm2/pmic.h index 37660460aa..0c82bad40d 100644 --- a/board/siemens/pxm2/pmic.h +++ b/board/siemens/pxm2/pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/board/siemens/rut/Makefile b/board/siemens/rut/Makefile index 3e3394a865..f85f5b7f60 100644 --- a/board/siemens/rut/Makefile +++ b/board/siemens/rut/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index a8b196a65c..f0534f1b36 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for TI AM335X based rut board * (C) Copyright 2013 Siemens Schweiz AG diff --git a/board/siemens/rut/board.h b/board/siemens/rut/board.h index af21fc4743..542e76f95e 100644 --- a/board/siemens/rut/board.h +++ b/board/siemens/rut/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/siemens/rut/mux.c b/board/siemens/rut/mux.c index d80120bbdd..4b2679206b 100644 --- a/board/siemens/rut/mux.c +++ b/board/siemens/rut/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pinmux setup for siemens rut board * diff --git a/board/siemens/smartweb/Makefile b/board/siemens/smartweb/Makefile index 49cb324915..7d31475b48 100644 --- a/board/siemens/smartweb/Makefile +++ b/board/siemens/smartweb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index 15044c7d0e..6a2036b47e 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/board/siemens/taurus/Makefile b/board/siemens/taurus/Makefile index 8c3b1c1c67..6627dee904 100644 --- a/board/siemens/taurus/Makefile +++ b/board/siemens/taurus/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for Siemens TAURUS (AT91SAM9G20) based board # (C) Copyright 2013 Siemens AG diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index ad44a7c0d2..a99a2e7c9e 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for Siemens TAURUS (AT91SAM9G20) based boards * (C) Copyright Siemens AG diff --git a/board/sifive/unleashed/Makefile b/board/sifive/unleashed/Makefile index 98e9111cbc..eda55f6779 100644 --- a/board/sifive/unleashed/Makefile +++ b/board/sifive/unleashed/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019 Western Digital Corporation or its affiliates. diff --git a/board/sifive/unleashed/spl.c b/board/sifive/unleashed/spl.c index fe27316b2d..3395216dfb 100644 --- a/board/sifive/unleashed/spl.c +++ b/board/sifive/unleashed/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 SiFive, Inc * diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index 3c5dd50c36..165673599e 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Western Digital Corporation or its affiliates. * diff --git a/board/sifive/unmatched/Makefile b/board/sifive/unmatched/Makefile index 1345330089..0cc04709d6 100644 --- a/board/sifive/unmatched/Makefile +++ b/board/sifive/unmatched/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2020-2021 SiFive, Inc diff --git a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c index c82fb5763e..03bd0fba5e 100644 --- a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c +++ b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 SiFive, Inc. * diff --git a/board/sifive/unmatched/spl.c b/board/sifive/unmatched/spl.c index 7c0beedc08..37bb0c0893 100644 --- a/board/sifive/unmatched/spl.c +++ b/board/sifive/unmatched/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020-2021 SiFive, Inc * diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c index 6675548c2b..a74b749596 100644 --- a/board/sifive/unmatched/unmatched.c +++ b/board/sifive/unmatched/unmatched.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020-2021, SiFive Inc * diff --git a/board/silinux/ek874/Makefile b/board/silinux/ek874/Makefile index 4c8f0925f1..eaac93a982 100644 --- a/board/silinux/ek874/Makefile +++ b/board/silinux/ek874/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2021 Renesas Electronics Corporation # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/board/silinux/ek874/ek874.c b/board/silinux/ek874/ek874.c index 6dc804a0c0..8aa3770a72 100644 --- a/board/silinux/ek874/ek874.c +++ b/board/silinux/ek874/ek874.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board/silinux/ek874/ek874.c * This file is ek874 board support. diff --git a/board/sipeed/maix/Kconfig b/board/sipeed/maix/Kconfig index d34ea4be71..d2bd80349a 100644 --- a/board/sipeed/maix/Kconfig +++ b/board/sipeed/maix/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> if TARGET_SIPEED_MAIX diff --git a/board/sipeed/maix/Makefile b/board/sipeed/maix/Makefile index 4acff5b31e..c0d36c89b6 100644 --- a/board/sipeed/maix/Makefile +++ b/board/sipeed/maix/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019 Western Digital Corporation or its affiliates. diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c index 79e492f0a8..6a7e8d377d 100644 --- a/board/sipeed/maix/maix.c +++ b/board/sipeed/maix/maix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/board/skyworth/hc2910-2aghd05/hc2910-2aghd05.c b/board/skyworth/hc2910-2aghd05/hc2910-2aghd05.c index abad5efdaf..7fd50c03ed 100644 --- a/board/skyworth/hc2910-2aghd05/hc2910-2aghd05.c +++ b/board/skyworth/hc2910-2aghd05/hc2910-2aghd05.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board init file for Skyworth HC2910 2AGHD05 */ diff --git a/board/socionext/developerbox/Makefile b/board/socionext/developerbox/Makefile index 1acd067a7e..a6057a41b8 100644 --- a/board/socionext/developerbox/Makefile +++ b/board/socionext/developerbox/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2021 Linaro Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := developerbox.o diff --git a/board/socrates/Makefile b/board/socrates/Makefile index e14db8e5d4..16d52964e0 100644 --- a/board/socrates/Makefile +++ b/board/socrates/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2008 # Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/law.c b/board/socrates/law.c index e4427ecff1..62d8129550 100644 --- a/board/socrates/law.c +++ b/board/socrates/law.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/nand.c b/board/socrates/nand.c index b1e38c511e..47b3b954bf 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/sdram.c b/board/socrates/sdram.c index 61402a554b..573e8da280 100644 --- a/board/socrates/sdram.c +++ b/board/socrates/sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 1d63c81a9c..ad2fde5acf 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/tlb.c b/board/socrates/tlb.c index 631f6c3407..24ace5cff8 100644 --- a/board/socrates/tlb.c +++ b/board/socrates/tlb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/socrates/upm_table.h b/board/socrates/upm_table.h index 1fc9c5c9aa..1f008dac73 100644 --- a/board/socrates/upm_table.h +++ b/board/socrates/upm_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/board/softing/vining_2000/Makefile b/board/softing/vining_2000/Makefile index 84f66a67b5..5a9c2f6b16 100644 --- a/board/softing/vining_2000/Makefile +++ b/board/softing/vining_2000/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 samtec automotive software & electronics gmbh # Copyright (C) 2017-2019 softing automotive electronics gmbH diff --git a/board/softing/vining_2000/imximage.cfg b/board/softing/vining_2000/imximage.cfg index 300aafcae2..4e00e845f2 100644 --- a/board/softing/vining_2000/imximage.cfg +++ b/board/softing/vining_2000/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 samtec automotive software & electronics gmbh * Copyright (C) 2017-2019 softing automotive electronics gmbH diff --git a/board/softing/vining_2000/vining_2000.c b/board/softing/vining_2000/vining_2000.c index 4483bd7f7a..067770b1c7 100644 --- a/board/softing/vining_2000/vining_2000.c +++ b/board/softing/vining_2000/vining_2000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 samtec automotive software & electronics gmbh * Copyright (C) 2017-2019 softing automotive electronics gmbH diff --git a/board/softing/vining_fpga/Makefile b/board/softing/vining_fpga/Makefile index e1c8a6b3c7..97950a3ae5 100644 --- a/board/softing/vining_fpga/Makefile +++ b/board/softing/vining_fpga/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/softing/vining_fpga/socfpga.c b/board/softing/vining_fpga/socfpga.c index b3f9550742..e1555166a4 100644 --- a/board/softing/vining_fpga/socfpga.c +++ b/board/softing/vining_fpga/socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/board/solidrun/clearfog/Makefile b/board/solidrun/clearfog/Makefile index 5cfda3283c..ac88679249 100644 --- a/board/solidrun/clearfog/Makefile +++ b/board/solidrun/clearfog/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c index 6fa2fe5fe3..e0ab82e007 100644 --- a/board/solidrun/clearfog/clearfog.c +++ b/board/solidrun/clearfog/clearfog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/solidrun/common/Makefile b/board/solidrun/common/Makefile index a72ac1b7b9..05d01c6937 100644 --- a/board/solidrun/common/Makefile +++ b/board/solidrun/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) SolidRun diff --git a/board/solidrun/common/tlv_data.c b/board/solidrun/common/tlv_data.c index cf5824886c..6070dba7a0 100644 --- a/board/solidrun/common/tlv_data.c +++ b/board/solidrun/common/tlv_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 SolidRun */ diff --git a/board/solidrun/common/tlv_data.h b/board/solidrun/common/tlv_data.h index be3f782ac4..30e4c1236d 100644 --- a/board/solidrun/common/tlv_data.h +++ b/board/solidrun/common/tlv_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 SolidRun */ diff --git a/board/solidrun/mx6cuboxi/Makefile b/board/solidrun/mx6cuboxi/Makefile index 6e5becbd27..462037ff0c 100644 --- a/board/solidrun/mx6cuboxi/Makefile +++ b/board/solidrun/mx6cuboxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> # diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index e119330bc0..840d46e9d3 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Josua Mayer <josua(a)solid-run.com> * diff --git a/board/somlabs/visionsom-6ull/Makefile b/board/somlabs/visionsom-6ull/Makefile index 9c3768aa45..69d5acee6a 100644 --- a/board/somlabs/visionsom-6ull/Makefile +++ b/board/somlabs/visionsom-6ull/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2019 Arkadiusz Karas <arkadiusz.karas(a)somlabs.com> obj-y := visionsom-6ull.o diff --git a/board/somlabs/visionsom-6ull/imximage.cfg b/board/somlabs/visionsom-6ull/imximage.cfg index 370b303cfa..28f950dc25 100644 --- a/board/somlabs/visionsom-6ull/imximage.cfg +++ b/board/somlabs/visionsom-6ull/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 A. Karas * Copyright (C) 2015 Freescale Semiconductor, Inc. diff --git a/board/somlabs/visionsom-6ull/visionsom-6ull.c b/board/somlabs/visionsom-6ull/visionsom-6ull.c index 38d14f6bc2..38794d9374 100644 --- a/board/somlabs/visionsom-6ull/visionsom-6ull.c +++ b/board/somlabs/visionsom-6ull/visionsom-6ull.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2019 A. Karas, SomLabs * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. diff --git a/board/sr1500/Makefile b/board/sr1500/Makefile index e499116b67..fbb68f3177 100644 --- a/board/sr1500/Makefile +++ b/board/sr1500/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> diff --git a/board/sr1500/socfpga.c b/board/sr1500/socfpga.c index d9125a76bf..07846db1f4 100644 --- a/board/sr1500/socfpga.c +++ b/board/sr1500/socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/board/st/common/Makefile b/board/st/common/Makefile index b01245e4b4..4316e465a5 100644 --- a/board/st/common/Makefile +++ b/board/st/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2020, STMicroelectronics - All Rights Reserved # diff --git a/board/st/common/cmd_stboard.c b/board/st/common/cmd_stboard.c index 853ab78bbf..a2ff44710e 100644 --- a/board/st/common/cmd_stboard.c +++ b/board/st/common/cmd_stboard.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved * diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index a8eb8d5cae..2a5eba7d47 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c index 969ad48486..9fbccf4237 100644 --- a/board/st/common/stpmic1.c +++ b/board/st/common/stpmic1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/board/st/common/stpmic1.h b/board/st/common/stpmic1.h index 7a7169d7ce..fb49fd56eb 100644 --- a/board/st/common/stpmic1.h +++ b/board/st/common/stpmic1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2020, STMicroelectronics - All Rights Reserved */ diff --git a/board/st/common/stusb160x.c b/board/st/common/stusb160x.c index f0385e5e38..411af67f4e 100644 --- a/board/st/common/stusb160x.c +++ b/board/st/common/stusb160x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * STMicroelectronics STUSB Type-C controller driver * based on Linux drivers/usb/typec/stusb160x.c diff --git a/board/st/stih410-b2260/Makefile b/board/st/stih410-b2260/Makefile index ea573ca145..b952929c32 100644 --- a/board/st/stih410-b2260/Makefile +++ b/board/st/stih410-b2260/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c index e21cbc270e..bb5a859a71 100644 --- a/board/st/stih410-b2260/board.c +++ b/board/st/stih410-b2260/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32f429-discovery/Makefile b/board/st/stm32f429-discovery/Makefile index 6b02c0fdde..ba88b80605 100644 --- a/board/st/stm32f429-discovery/Makefile +++ b/board/st/stm32f429-discovery/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c index 8dda6a97bd..29fe8a5bc5 100644 --- a/board/st/stm32f429-discovery/led.c +++ b/board/st/stm32f429-discovery/led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c index 55e464cc7c..d9d18e04a6 100644 --- a/board/st/stm32f429-discovery/stm32f429-discovery.c +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011, 2012, 2013 * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com diff --git a/board/st/stm32f429-evaluation/Makefile b/board/st/stm32f429-evaluation/Makefile index 109fba876b..19fe79c919 100644 --- a/board/st/stm32f429-evaluation/Makefile +++ b/board/st/stm32f429-evaluation/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c index 25472f041f..e2720f6579 100644 --- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c +++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32f469-discovery/Makefile b/board/st/stm32f469-discovery/Makefile index 45480b72c5..2552c9348b 100644 --- a/board/st/stm32f469-discovery/Makefile +++ b/board/st/stm32f469-discovery/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) STMicroelectronics SA 2017 # Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c index 9ed6c1e676..67095944ce 100644 --- a/board/st/stm32f469-discovery/stm32f469-discovery.c +++ b/board/st/stm32f469-discovery/stm32f469-discovery.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) STMicroelectronics SA 2017 * Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32f746-disco/Makefile b/board/st/stm32f746-disco/Makefile index 369f17a2db..bec5403b52 100644 --- a/board/st/stm32f746-disco/Makefile +++ b/board/st/stm32f746-disco/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016, STMicroelectronics - All Rights Reserved # Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index 0f96660084..e27a25f200 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/board/st/stm32h743-disco/Makefile b/board/st/stm32h743-disco/Makefile index b6c22be1ea..c4c0b4a570 100644 --- a/board/st/stm32h743-disco/Makefile +++ b/board/st/stm32h743-disco/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c index 4ca5e84721..5e016a468e 100644 --- a/board/st/stm32h743-disco/stm32h743-disco.c +++ b/board/st/stm32h743-disco/stm32h743-disco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32h743-eval/Makefile b/board/st/stm32h743-eval/Makefile index 86ef19fc36..748a9bc14d 100644 --- a/board/st/stm32h743-eval/Makefile +++ b/board/st/stm32h743-eval/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, STMicroelectronics - All Rights Reserved # Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c index 4ca5e84721..5e016a468e 100644 --- a/board/st/stm32h743-eval/stm32h743-eval.c +++ b/board/st/stm32h743-eval/stm32h743-eval.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/board/st/stm32h750-art-pi/Makefile b/board/st/stm32h750-art-pi/Makefile index a06de87526..24162792de 100644 --- a/board/st/stm32h750-art-pi/Makefile +++ b/board/st/stm32h750-art-pi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021, RT-Thread - All Rights Reserved # Author(s): Dillon Min, <dillon.minfei(a)gmail.com> for RT-Thread. diff --git a/board/st/stm32h750-art-pi/stm32h750-art-pi.c b/board/st/stm32h750-art-pi/stm32h750-art-pi.c index 0d39ce849a..d6d86c214e 100644 --- a/board/st/stm32h750-art-pi/stm32h750-art-pi.c +++ b/board/st/stm32h750-art-pi/stm32h750-art-pi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, STMicroelectronics - All Rights Reserved * Author(s): Dillon Min <dillon.minfei(a)gmail.com> diff --git a/board/st/stm32mp1/Makefile b/board/st/stm32mp1/Makefile index f2d720b67b..bd977046df 100644 --- a/board/st/stm32mp1/Makefile +++ b/board/st/stm32mp1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # diff --git a/board/st/stm32mp1/spl.c b/board/st/stm32mp1/spl.c index 8b4a529f75..6aa327e751 100644 --- a/board/st/stm32mp1/spl.c +++ b/board/st/stm32mp1/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 8f5719c28b..1c18887e56 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/board/st/stv0991/Makefile b/board/st/stv0991/Makefile index 7f6d719c32..afa5031f3d 100644 --- a/board/st/stv0991/Makefile +++ b/board/st/stv0991/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, STMicroelectronics - All Rights Reserved # Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c index 57ca9f659c..eee3c92e9c 100644 --- a/board/st/stv0991/stv0991.c +++ b/board/st/stv0991/stv0991.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/board/starfive/visionfive2/Makefile b/board/starfive/visionfive2/Makefile index c7ba4f7ed6..bc38d034b3 100644 --- a/board/starfive/visionfive2/Makefile +++ b/board/starfive/visionfive2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 StarFive Technology Co., Ltd. # diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index ad5f71a201..a4d32b11fe 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 78e118d5a0..3a0cc2344f 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c index c36de1a512..ab8fda685f 100644 --- a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c +++ b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/board/storopack/smegw01/Makefile b/board/storopack/smegw01/Makefile index f02e7bb8b0..78192e4b2d 100644 --- a/board/storopack/smegw01/Makefile +++ b/board/storopack/smegw01/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 NXP Semiconductors obj-y := smegw01.o diff --git a/board/storopack/smegw01/smegw01.c b/board/storopack/smegw01/smegw01.c index 345191b31c..3b5199333d 100644 --- a/board/storopack/smegw01/smegw01.c +++ b/board/storopack/smegw01/smegw01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // Copyright (C) 2021 Fabio Estevam <festevam(a)denx.de> #include <init.h> diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env index 93de866910..595eed576c 100644 --- a/board/storopack/smegw01/smegw01.env +++ b/board/storopack/smegw01/smegw01.env @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifdef CONFIG_SYS_BOOT_LOCKED #define SETUP_BOOT_MENU setup_boot_menu=setenv bootmenu_0 eMMC=run bootcmd #else diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index d96b7897b6..ecc695dfc0 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> # diff --git a/board/sunxi/board.c b/board/sunxi/board.c index ebaa943198..48264cd4ea 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl(a)lkcl.net> diff --git a/board/sunxi/chip.c b/board/sunxi/chip.c index cde04bebe9..f70c630615 100644 --- a/board/sunxi/chip.c +++ b/board/sunxi/chip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 * Köry Maincent, Bootlin, <kory.maincent(a)bootlin.com> diff --git a/board/synopsys/axs10x/Makefile b/board/synopsys/axs10x/Makefile index dd5ee680e7..c380a659e6 100644 --- a/board/synopsys/axs10x/Makefile +++ b/board/synopsys/axs10x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c index 75e4d03762..075edb3ac2 100644 --- a/board/synopsys/axs10x/axs10x.c +++ b/board/synopsys/axs10x/axs10x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. */ diff --git a/board/synopsys/axs10x/axs10x.h b/board/synopsys/axs10x/axs10x.h index db5f062874..7221d17ab8 100644 --- a/board/synopsys/axs10x/axs10x.h +++ b/board/synopsys/axs10x/axs10x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Synopsys, Inc. All rights reserved. */ diff --git a/board/synopsys/axs10x/config.mk b/board/synopsys/axs10x/config.mk index ccac544290..c042a55441 100644 --- a/board/synopsys/axs10x/config.mk +++ b/board/synopsys/axs10x/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Synopsys, Inc. All rights reserved. diff --git a/board/synopsys/emsdp/Makefile b/board/synopsys/emsdp/Makefile index 733a48c46a..f954807cd1 100644 --- a/board/synopsys/emsdp/Makefile +++ b/board/synopsys/emsdp/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2018 Synopsys, Inc. All rights reserved. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += emsdp.o diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c index a3cee23411..e6c5ac11af 100644 --- a/board/synopsys/emsdp/emsdp.c +++ b/board/synopsys/emsdp/emsdp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/board/synopsys/hsdk/Makefile b/board/synopsys/hsdk/Makefile index e9cd6a63e0..f2e24e3831 100644 --- a/board/synopsys/hsdk/Makefile +++ b/board/synopsys/hsdk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Synopsys, Inc. All rights reserved. diff --git a/board/synopsys/hsdk/clk-lib.c b/board/synopsys/hsdk/clk-lib.c index be76d6c8f4..6deca73e71 100644 --- a/board/synopsys/hsdk/clk-lib.c +++ b/board/synopsys/hsdk/clk-lib.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/hsdk/clk-lib.h b/board/synopsys/hsdk/clk-lib.h index 970bcd4a17..a07b0f8954 100644 --- a/board/synopsys/hsdk/clk-lib.h +++ b/board/synopsys/hsdk/clk-lib.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/hsdk/config.mk b/board/synopsys/hsdk/config.mk index def944aad2..85c76b7168 100644 --- a/board/synopsys/hsdk/config.mk +++ b/board/synopsys/hsdk/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Synopsys, Inc. All rights reserved. diff --git a/board/synopsys/hsdk/env-lib.c b/board/synopsys/hsdk/env-lib.c index d85e816733..31a19f5cb2 100644 --- a/board/synopsys/hsdk/env-lib.c +++ b/board/synopsys/hsdk/env-lib.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/hsdk/env-lib.h b/board/synopsys/hsdk/env-lib.h index 48c17c4d4f..7965c751c5 100644 --- a/board/synopsys/hsdk/env-lib.h +++ b/board/synopsys/hsdk/env-lib.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/hsdk/headerize-hsdk.py b/board/synopsys/hsdk/headerize-hsdk.py index 327c93cdba..ebaed29f4e 100644 --- a/board/synopsys/hsdk/headerize-hsdk.py +++ b/board/synopsys/hsdk/headerize-hsdk.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Synopsys, Inc. All rights reserved. # Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/hsdk/hsdk.c b/board/synopsys/hsdk/hsdk.c index 6cbc89ae78..2567cb1243 100644 --- a/board/synopsys/hsdk/hsdk.c +++ b/board/synopsys/hsdk/hsdk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/board/synopsys/iot_devkit/Makefile b/board/synopsys/iot_devkit/Makefile index 1616024643..573d0aae40 100644 --- a/board/synopsys/iot_devkit/Makefile +++ b/board/synopsys/iot_devkit/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2018 Synopsys, Inc. All rights reserved. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += iot_devkit.o diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c index 650958f94c..77d0fd48d5 100644 --- a/board/synopsys/iot_devkit/iot_devkit.c +++ b/board/synopsys/iot_devkit/iot_devkit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/board/synopsys/iot_devkit/u-boot.lds b/board/synopsys/iot_devkit/u-boot.lds index e82e4987f6..08ee4f5179 100644 --- a/board/synopsys/iot_devkit/u-boot.lds +++ b/board/synopsys/iot_devkit/u-boot.lds @@ -1,7 +1,7 @@ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <config.h> diff --git a/board/synopsys/nsim/Makefile b/board/synopsys/nsim/Makefile index 6aaffffa73..f2863bc48b 100644 --- a/board/synopsys/nsim/Makefile +++ b/board/synopsys/nsim/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2020 Synopsys, Inc. All rights reserved. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += nsim.o diff --git a/board/synopsys/nsim/config.mk b/board/synopsys/nsim/config.mk index 40f9578a25..0f219f1ec7 100644 --- a/board/synopsys/nsim/config.mk +++ b/board/synopsys/nsim/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Synopsys, Inc. All rights reserved. diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c index 00e5cc3641..942cab5934 100644 --- a/board/synopsys/nsim/nsim.c +++ b/board/synopsys/nsim/nsim.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Synopsys, Inc. All rights reserved. */ diff --git a/board/sysam/amcore/Makefile b/board/sysam/amcore/Makefile index 051186f0d5..df7a08f52b 100644 --- a/board/sysam/amcore/Makefile +++ b/board/sysam/amcore/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y = amcore.o diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 086421d926..c96377ac41 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board functions for Sysam AMCORE (MCF5307 based) board * diff --git a/board/sysam/stmark2/Makefile b/board/sysam/stmark2/Makefile index 064a57ea05..b39d9434ef 100644 --- a/board/sysam/stmark2/Makefile +++ b/board/sysam/stmark2/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2014 Angelo Dureghello <angelo(a)sysam.it> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y = stmark2.o diff --git a/board/sysam/stmark2/sbf_dram_init.S b/board/sysam/stmark2/sbf_dram_init.S index b6f38731f1..719242ae87 100644 --- a/board/sysam/stmark2/sbf_dram_init.S +++ b/board/sysam/stmark2/sbf_dram_init.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board-specific early ddr/sdram init. * diff --git a/board/sysam/stmark2/stmark2.c b/board/sysam/stmark2/stmark2.c index 475e3edfa6..4708540221 100644 --- a/board/sysam/stmark2/stmark2.c +++ b/board/sysam/stmark2/stmark2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board-specific init. * diff --git a/board/tbs/tbs2910/Makefile b/board/tbs/tbs2910/Makefile index 78f4a3eecd..b5ccecad3f 100644 --- a/board/tbs/tbs2910/Makefile +++ b/board/tbs/tbs2910/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014 Soeren Moch <smoch(a)web.de> diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index 8d9eedb752..4908974517 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Soeren Moch <smoch(a)web.de> */ diff --git a/board/tbs/tbs2910/tbs2910.cfg b/board/tbs/tbs2910/tbs2910.cfg index 2fa70947ce..0720cade97 100644 --- a/board/tbs/tbs2910/tbs2910.cfg +++ b/board/tbs/tbs2910/tbs2910.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Soeren Moch <smoch(a)web.de> */ diff --git a/board/tcl/sl50/Makefile b/board/tcl/sl50/Makefile index 0ac0ba36cd..959111ea36 100644 --- a/board/tcl/sl50/Makefile +++ b/board/tcl/sl50/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index 839a692ce8..9bfbc01aae 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/tcl/sl50/board.h b/board/tcl/sl50/board.h index b8b9ed7e71..77b2aff68d 100644 --- a/board/tcl/sl50/board.h +++ b/board/tcl/sl50/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/tcl/sl50/mux.c b/board/tcl/sl50/mux.c index b0a1dad3aa..3b86b85f11 100644 --- a/board/tcl/sl50/mux.c +++ b/board/tcl/sl50/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/technexion/pico-imx6/Makefile b/board/technexion/pico-imx6/Makefile index ddb1604f1d..b2a424b4c2 100644 --- a/board/technexion/pico-imx6/Makefile +++ b/board/technexion/pico-imx6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c index 6b9c4f4373..81e073663a 100644 --- a/board/technexion/pico-imx6/pico-imx6.c +++ b/board/technexion/pico-imx6/pico-imx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * Copyright (C) 2014 O.S. Systems Software LTDA. diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c index 3b36bb8df1..665088bbcc 100644 --- a/board/technexion/pico-imx6/spl.c +++ b/board/technexion/pico-imx6/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Technexion Ltd. * diff --git a/board/technexion/pico-imx6ul/Makefile b/board/technexion/pico-imx6ul/Makefile index b7493df01c..8bd35992fc 100644 --- a/board/technexion/pico-imx6ul/Makefile +++ b/board/technexion/pico-imx6ul/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2015 Technexion Ltd. # (C) Copyright 2015 Freescale Semiconductor, Inc. diff --git a/board/technexion/pico-imx6ul/imximage.cfg b/board/technexion/pico-imx6ul/imximage.cfg index 98de178203..aa54071230 100644 --- a/board/technexion/pico-imx6ul/imximage.cfg +++ b/board/technexion/pico-imx6ul/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c index 682c88dee7..6d484395b6 100644 --- a/board/technexion/pico-imx6ul/pico-imx6ul.c +++ b/board/technexion/pico-imx6ul/pico-imx6ul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Technexion Ltd. * diff --git a/board/technexion/pico-imx6ul/spl.c b/board/technexion/pico-imx6ul/spl.c index ff56fd88d6..aacd96dfbb 100644 --- a/board/technexion/pico-imx6ul/spl.c +++ b/board/technexion/pico-imx6ul/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cpu_func.h> diff --git a/board/technexion/pico-imx7d/Makefile b/board/technexion/pico-imx7d/Makefile index 4ae3d606b5..3f2fcfdaed 100644 --- a/board/technexion/pico-imx7d/Makefile +++ b/board/technexion/pico-imx7d/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2017 NXP Semiconductors obj-y := pico-imx7d.o spl.o diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c index 6e98b85b28..008785cdf0 100644 --- a/board/technexion/pico-imx7d/pico-imx7d.c +++ b/board/technexion/pico-imx7d/pico-imx7d.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors */ diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c index c6b21aaa42..104201f0bc 100644 --- a/board/technexion/pico-imx7d/spl.c +++ b/board/technexion/pico-imx7d/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Technexion Ltd. * diff --git a/board/technexion/pico-imx8mq/Makefile b/board/technexion/pico-imx8mq/Makefile index 7cfe1e02ef..1460a38cc7 100644 --- a/board/technexion/pico-imx8mq/Makefile +++ b/board/technexion/pico-imx8mq/Makefile @@ -1,7 +1,7 @@ # # Copyright 2017 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += pico-imx8mq.o diff --git a/board/technexion/pico-imx8mq/lpddr4_timing.h b/board/technexion/pico-imx8mq/lpddr4_timing.h index 89b0b927bc..6e61b4ee36 100644 --- a/board/technexion/pico-imx8mq/lpddr4_timing.h +++ b/board/technexion/pico-imx8mq/lpddr4_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/board/technexion/pico-imx8mq/lpddr4_timing_1gb.c b/board/technexion/pico-imx8mq/lpddr4_timing_1gb.c index 97b9ee2752..6772a531a5 100644 --- a/board/technexion/pico-imx8mq/lpddr4_timing_1gb.c +++ b/board/technexion/pico-imx8mq/lpddr4_timing_1gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/technexion/pico-imx8mq/lpddr4_timing_2gb.c b/board/technexion/pico-imx8mq/lpddr4_timing_2gb.c index 1572a50a05..42a9b768a7 100644 --- a/board/technexion/pico-imx8mq/lpddr4_timing_2gb.c +++ b/board/technexion/pico-imx8mq/lpddr4_timing_2gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/technexion/pico-imx8mq/lpddr4_timing_3gb.c b/board/technexion/pico-imx8mq/lpddr4_timing_3gb.c index 3fc60a3eeb..0cc737f521 100644 --- a/board/technexion/pico-imx8mq/lpddr4_timing_3gb.c +++ b/board/technexion/pico-imx8mq/lpddr4_timing_3gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/technexion/pico-imx8mq/lpddr4_timing_4gb.c b/board/technexion/pico-imx8mq/lpddr4_timing_4gb.c index 93b3423516..e62d7803d6 100644 --- a/board/technexion/pico-imx8mq/lpddr4_timing_4gb.c +++ b/board/technexion/pico-imx8mq/lpddr4_timing_4gb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/board/technexion/pico-imx8mq/pico-imx8mq.c b/board/technexion/pico-imx8mq/pico-imx8mq.c index 2be3206f78..c2c310a0bb 100644 --- a/board/technexion/pico-imx8mq/pico-imx8mq.c +++ b/board/technexion/pico-imx8mq/pico-imx8mq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/technexion/pico-imx8mq/spl.c b/board/technexion/pico-imx8mq/spl.c index 1a9c7996cb..34333ce11a 100644 --- a/board/technexion/pico-imx8mq/spl.c +++ b/board/technexion/pico-imx8mq/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/board/terasic/de1-soc/Makefile b/board/terasic/de1-soc/Makefile index e1c8a6b3c7..97950a3ae5 100644 --- a/board/terasic/de1-soc/Makefile +++ b/board/terasic/de1-soc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/terasic/de1-soc/socfpga.c b/board/terasic/de1-soc/socfpga.c index 22fbee40ab..7e4183508c 100644 --- a/board/terasic/de1-soc/socfpga.c +++ b/board/terasic/de1-soc/socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/board/thead/th1520_lpi4a/Makefile b/board/thead/th1520_lpi4a/Makefile index 9671b3bbb0..7344598382 100644 --- a/board/thead/th1520_lpi4a/Makefile +++ b/board/thead/th1520_lpi4a/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2023, Yixun Lan <dlan(a)gentoo.org> diff --git a/board/thead/th1520_lpi4a/board.c b/board/thead/th1520_lpi4a/board.c index 16c3e456b3..c59a2824f3 100644 --- a/board/thead/th1520_lpi4a/board.c +++ b/board/thead/th1520_lpi4a/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023, Yixun Lan <dlan(a)gentoo.org> * diff --git a/board/theadorable/Makefile b/board/theadorable/Makefile index b85faa676d..0f486d2260 100644 --- a/board/theadorable/Makefile +++ b/board/theadorable/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015-2016 Stefan Roese <sr(a)denx.de> diff --git a/board/theadorable/fpga.c b/board/theadorable/fpga.c index bc8379cccf..cec751aa81 100644 --- a/board/theadorable/fpga.c +++ b/board/theadorable/fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/theadorable/theadorable.c b/board/theadorable/theadorable.c index 144f122bb2..5d2d94f6ee 100644 --- a/board/theadorable/theadorable.c +++ b/board/theadorable/theadorable.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2019 Stefan Roese <sr(a)denx.de> */ diff --git a/board/theadorable/theadorable.h b/board/theadorable/theadorable.h index d3c959de98..7cc9c6821f 100644 --- a/board/theadorable/theadorable.h +++ b/board/theadorable/theadorable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/board/thecus/n2350/Makefile b/board/thecus/n2350/Makefile index b220bb1925..47f8948ab3 100644 --- a/board/thecus/n2350/Makefile +++ b/board/thecus/n2350/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/thecus/n2350/n2350.c b/board/thecus/n2350/n2350.c index 05b125fd7f..77e2644301 100644 --- a/board/thecus/n2350/n2350.c +++ b/board/thecus/n2350/n2350.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/board/theobroma-systems/puma_rk3399/Makefile b/board/theobroma-systems/puma_rk3399/Makefile index d962b56f11..6d3c58ffc9 100644 --- a/board/theobroma-systems/puma_rk3399/Makefile +++ b/board/theobroma-systems/puma_rk3399/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += puma-rk3399.o diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index 614a60ee8f..82cf74f03a 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/board/theobroma-systems/ringneck_px30/Makefile b/board/theobroma-systems/ringneck_px30/Makefile index 31ada1a694..c4f6db6d75 100644 --- a/board/theobroma-systems/ringneck_px30/Makefile +++ b/board/theobroma-systems/ringneck_px30/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2022 Theobroma Systems Design und Consulting GmbH # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += ringneck-px30.o diff --git a/board/theobroma-systems/ringneck_px30/ringneck-px30.c b/board/theobroma-systems/ringneck_px30/ringneck-px30.c index bb1bb4acf5..2ebe4fe96b 100644 --- a/board/theobroma-systems/ringneck_px30/ringneck-px30.c +++ b/board/theobroma-systems/ringneck_px30/ringneck-px30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 Theobroma Systems Design und Consulting GmbH */ diff --git a/board/ti/am335x/Makefile b/board/ti/am335x/Makefile index 3ccf66be5b..5eb1c4cbd1 100644 --- a/board/ti/am335x/Makefile +++ b/board/ti/am335x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index ecb9fa02de..b5c33000a0 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/ti/am335x/board.h b/board/ti/am335x/board.h index c2962111c1..97cf9691b0 100644 --- a/board/ti/am335x/board.h +++ b/board/ti/am335x/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/ti/am43xx/Makefile b/board/ti/am43xx/Makefile index 8dc1d89e3a..93309d04e9 100644 --- a/board/ti/am43xx/Makefile +++ b/board/ti/am43xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 58bfe7cd45..445542c7b2 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/ti/am43xx/board.h b/board/ti/am43xx/board.h index 06b737445d..d1c5591e63 100644 --- a/board/ti/am43xx/board.h +++ b/board/ti/am43xx/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/ti/am43xx/mux.c b/board/ti/am43xx/mux.c index f59e93a0eb..527d33e632 100644 --- a/board/ti/am43xx/mux.c +++ b/board/ti/am43xx/mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mux.c * diff --git a/board/ti/am57xx/Makefile b/board/ti/am57xx/Makefile index 2a6fb9e42c..29dd815d5a 100644 --- a/board/ti/am57xx/Makefile +++ b/board/ti/am57xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 # Texas Instruments, <www.ti.com> diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 9ea507a8e9..ec30b21c2f 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com * diff --git a/board/ti/am57xx/mux_data.h b/board/ti/am57xx/mux_data.h index 54b7050a45..feffcdae5c 100644 --- a/board/ti/am57xx/mux_data.h +++ b/board/ti/am57xx/mux_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com * diff --git a/board/ti/am62ax/Kconfig b/board/ti/am62ax/Kconfig index 61f289facc..08ac2d06b3 100644 --- a/board/ti/am62ax/Kconfig +++ b/board/ti/am62ax/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ # diff --git a/board/ti/am62ax/Makefile b/board/ti/am62ax/Makefile index 4e8e7aa230..615b614cc7 100644 --- a/board/ti/am62ax/Makefile +++ b/board/ti/am62ax/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evm.o diff --git a/board/ti/am62ax/board-cfg.yaml b/board/ti/am62ax/board-cfg.yaml index 4aa8ddd104..3ceea35e03 100644 --- a/board/ti/am62ax/board-cfg.yaml +++ b/board/ti/am62ax/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for AM62ax diff --git a/board/ti/am62ax/evm.c b/board/ti/am62ax/evm.c index f2dd3b4192..a179fb5b47 100644 --- a/board/ti/am62ax/evm.c +++ b/board/ti/am62ax/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for AM62Ax platforms * diff --git a/board/ti/am62ax/pm-cfg.yaml b/board/ti/am62ax/pm-cfg.yaml index 3ad182ae17..8f06cc42c7 100644 --- a/board/ti/am62ax/pm-cfg.yaml +++ b/board/ti/am62ax/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for AM62ax diff --git a/board/ti/am62ax/rm-cfg.yaml b/board/ti/am62ax/rm-cfg.yaml index 15c4017bda..cef2900dd3 100644 --- a/board/ti/am62ax/rm-cfg.yaml +++ b/board/ti/am62ax/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM62ax diff --git a/board/ti/am62ax/sec-cfg.yaml b/board/ti/am62ax/sec-cfg.yaml index f0ad20c5a6..b019f5c51e 100644 --- a/board/ti/am62ax/sec-cfg.yaml +++ b/board/ti/am62ax/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security configuration for AM62ax diff --git a/board/ti/am62ax/tifs-rm-cfg.yaml b/board/ti/am62ax/tifs-rm-cfg.yaml index 0b1980eb7b..72c00864c4 100644 --- a/board/ti/am62ax/tifs-rm-cfg.yaml +++ b/board/ti/am62ax/tifs-rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM62AX diff --git a/board/ti/am62x/Kconfig b/board/ti/am62x/Kconfig index cd17e939e5..04de7f56a0 100644 --- a/board/ti/am62x/Kconfig +++ b/board/ti/am62x/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/ # Suman Anna <s-anna(a)ti.com> diff --git a/board/ti/am62x/Makefile b/board/ti/am62x/Makefile index f4c35edffa..41721cb171 100644 --- a/board/ti/am62x/Makefile +++ b/board/ti/am62x/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/ # Suman Anna <s-anna(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evm.o diff --git a/board/ti/am62x/board-cfg.yaml b/board/ti/am62x/board-cfg.yaml index 36cfb550ad..18fe1f26b5 100644 --- a/board/ti/am62x/board-cfg.yaml +++ b/board/ti/am62x/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for AM62 diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c index ad93908840..5929909361 100644 --- a/board/ti/am62x/evm.c +++ b/board/ti/am62x/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for AM62x platforms * diff --git a/board/ti/am62x/pm-cfg.yaml b/board/ti/am62x/pm-cfg.yaml index 5d04cf82ef..bb5321a413 100644 --- a/board/ti/am62x/pm-cfg.yaml +++ b/board/ti/am62x/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for AM62 diff --git a/board/ti/am62x/rm-cfg.yaml b/board/ti/am62x/rm-cfg.yaml index c28707be8e..dc0b25afaa 100644 --- a/board/ti/am62x/rm-cfg.yaml +++ b/board/ti/am62x/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM62 diff --git a/board/ti/am62x/sec-cfg.yaml b/board/ti/am62x/sec-cfg.yaml index 07081ce06c..f779fba023 100644 --- a/board/ti/am62x/sec-cfg.yaml +++ b/board/ti/am62x/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security management configuration for AM62 diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig index fb596e4adf..72adc63cd3 100644 --- a/board/ti/am64x/Kconfig +++ b/board/ti/am64x/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ diff --git a/board/ti/am64x/Makefile b/board/ti/am64x/Makefile index 8b98e6f5fd..e512c9bb2d 100644 --- a/board/ti/am64x/Makefile +++ b/board/ti/am64x/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ # Keerthy <j-keerthy(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evm.o diff --git a/board/ti/am64x/board-cfg.yaml b/board/ti/am64x/board-cfg.yaml index 62947c0820..a367dfe292 100644 --- a/board/ti/am64x/board-cfg.yaml +++ b/board/ti/am64x/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for AM64x diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c index a080b2b0d2..595f34c231 100644 --- a/board/ti/am64x/evm.c +++ b/board/ti/am64x/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for AM642 EVM * diff --git a/board/ti/am64x/pm-cfg.yaml b/board/ti/am64x/pm-cfg.yaml index 83c6a039f2..ddb5721487 100644 --- a/board/ti/am64x/pm-cfg.yaml +++ b/board/ti/am64x/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for AM64x diff --git a/board/ti/am64x/rm-cfg.yaml b/board/ti/am64x/rm-cfg.yaml index 1f4c6cf770..bfcae6dcb9 100644 --- a/board/ti/am64x/rm-cfg.yaml +++ b/board/ti/am64x/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM64x diff --git a/board/ti/am64x/sec-cfg.yaml b/board/ti/am64x/sec-cfg.yaml index 7c51fd3406..cd14290f26 100644 --- a/board/ti/am64x/sec-cfg.yaml +++ b/board/ti/am64x/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security configuration for AM64x diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig index 5fd19d652a..bb323fb23f 100644 --- a/board/ti/am65x/Kconfig +++ b/board/ti/am65x/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ # Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/board/ti/am65x/Makefile b/board/ti/am65x/Makefile index 94dddfcc4a..30e7136edc 100644 --- a/board/ti/am65x/Makefile +++ b/board/ti/am65x/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ # Lokesh Vutla <lokeshvutla(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y := evm.o diff --git a/board/ti/am65x/board-cfg.yaml b/board/ti/am65x/board-cfg.yaml index a8e06166d5..03936e6a15 100644 --- a/board/ti/am65x/board-cfg.yaml +++ b/board/ti/am65x/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for AM65x diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c index 8bb13ef5b2..2a2e6a3f47 100644 --- a/board/ti/am65x/evm.c +++ b/board/ti/am65x/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for AM654 EVM * diff --git a/board/ti/am65x/pm-cfg.yaml b/board/ti/am65x/pm-cfg.yaml index 73fe86c29a..6365eb3139 100644 --- a/board/ti/am65x/pm-cfg.yaml +++ b/board/ti/am65x/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for AM65x diff --git a/board/ti/am65x/rm-cfg.yaml b/board/ti/am65x/rm-cfg.yaml index 5903773e81..70367f7ea0 100644 --- a/board/ti/am65x/rm-cfg.yaml +++ b/board/ti/am65x/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM65x diff --git a/board/ti/am65x/sec-cfg.yaml b/board/ti/am65x/sec-cfg.yaml index 7fa12f0bed..0d29ba8f69 100644 --- a/board/ti/am65x/sec-cfg.yaml +++ b/board/ti/am65x/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security management configuration for AM65x diff --git a/board/ti/beagle/Makefile b/board/ti/beagle/Makefile index fc9288cf18..e35dea534b 100644 --- a/board/ti/beagle/Makefile +++ b/board/ti/beagle/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 847d596646..caece8520f 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004-2011 * Texas Instruments, <www.ti.com> diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h index ce78ea661b..434607858c 100644 --- a/board/ti/beagle/beagle.h +++ b/board/ti/beagle/beagle.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Dirk Behme <dirk.behme(a)gmail.com> diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c index e21c0169db..21f3afe62c 100644 --- a/board/ti/beagle/led.c +++ b/board/ti/beagle/led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010 Texas Instruments, Inc. * Jason Kridner <jkridner(a)beagleboard.org> diff --git a/board/ti/common/Makefile b/board/ti/common/Makefile index 3172d87b46..058db8cf43 100644 --- a/board/ti/common/Makefile +++ b/board/ti/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2015-2016 Texas Instruments Incorporated - http://www.ti.com/ obj-${CONFIG_TI_I2C_BOARD_DETECT} += board_detect.o diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index ac39b25cd4..4c1fbb3722 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Library to support early TI EVM EEPROM handling * diff --git a/board/ti/common/board_detect.h b/board/ti/common/board_detect.h index de7cb52dfc..56f9c7474e 100644 --- a/board/ti/common/board_detect.h +++ b/board/ti/common/board_detect.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Library to support early TI EVM EEPROM handling * diff --git a/board/ti/common/cape_detect.c b/board/ti/common/cape_detect.c index 2e6105cfbf..c79e9b7286 100644 --- a/board/ti/common/cape_detect.c +++ b/board/ti/common/cape_detect.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 * Köry Maincent, Bootlin, <kory.maincent(a)bootlin.com> diff --git a/board/ti/common/cape_detect.h b/board/ti/common/cape_detect.h index b0d5c9f18b..5a670ce0b8 100644 --- a/board/ti/common/cape_detect.h +++ b/board/ti/common/cape_detect.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 * Köry Maincent, Bootlin, <kory.maincent(a)bootlin.com> diff --git a/board/ti/common/schema.yaml b/board/ti/common/schema.yaml index c8dd2e79e7..2c5f805bd5 100644 --- a/board/ti/common/schema.yaml +++ b/board/ti/common/schema.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Config schema for TI K3 devices diff --git a/board/ti/dra7xx/Makefile b/board/ti/dra7xx/Makefile index 8d0ca56ade..9dd29332af 100644 --- a/board/ti/dra7xx/Makefile +++ b/board/ti/dra7xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2013 # Texas Instruments, <www.ti.com> diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index a8a216d034..8ebe7a1182 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index 75da5cb608..b8bd8c9c88 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig index e6cb21f77b..0507474e51 100644 --- a/board/ti/j721e/Kconfig +++ b/board/ti/j721e/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/ # Lokesh Vutla <lokeshvutla(a)ti.com> diff --git a/board/ti/j721e/Makefile b/board/ti/j721e/Makefile index 97535f5d86..98841b4d30 100644 --- a/board/ti/j721e/Makefile +++ b/board/ti/j721e/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/ # Lokesh Vutla <lokeshvutla(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evm.o diff --git a/board/ti/j721e/board-cfg.yaml b/board/ti/j721e/board-cfg.yaml index 1375dcad35..441b9d3bdd 100644 --- a/board/ti/j721e/board-cfg.yaml +++ b/board/ti/j721e/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for J721E diff --git a/board/ti/j721e/board-cfg_j7200.yaml b/board/ti/j721e/board-cfg_j7200.yaml index 0ac1ae93fe..955ad52415 100644 --- a/board/ti/j721e/board-cfg_j7200.yaml +++ b/board/ti/j721e/board-cfg_j7200.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for J7200 diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index d4f7c1d9f9..f6f4c82aba 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for J721E EVM * diff --git a/board/ti/j721e/pm-cfg.yaml b/board/ti/j721e/pm-cfg.yaml index 7ae52b3358..1ea4e51e13 100644 --- a/board/ti/j721e/pm-cfg.yaml +++ b/board/ti/j721e/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for J721E diff --git a/board/ti/j721e/pm-cfg_j7200.yaml b/board/ti/j721e/pm-cfg_j7200.yaml index daaefb1318..b1253270bb 100644 --- a/board/ti/j721e/pm-cfg_j7200.yaml +++ b/board/ti/j721e/pm-cfg_j7200.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for J7200 diff --git a/board/ti/j721e/rm-cfg.yaml b/board/ti/j721e/rm-cfg.yaml index 9f604cf1aa..850d63f01d 100644 --- a/board/ti/j721e/rm-cfg.yaml +++ b/board/ti/j721e/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for J721E diff --git a/board/ti/j721e/rm-cfg_j7200.yaml b/board/ti/j721e/rm-cfg_j7200.yaml index 263285ff42..50866b5515 100644 --- a/board/ti/j721e/rm-cfg_j7200.yaml +++ b/board/ti/j721e/rm-cfg_j7200.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for J7200 diff --git a/board/ti/j721e/sec-cfg.yaml b/board/ti/j721e/sec-cfg.yaml index 1eab5883a7..58977faf26 100644 --- a/board/ti/j721e/sec-cfg.yaml +++ b/board/ti/j721e/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security configuration for J721E diff --git a/board/ti/j721e/sec-cfg_j7200.yaml b/board/ti/j721e/sec-cfg_j7200.yaml index c346087a81..db6b614174 100644 --- a/board/ti/j721e/sec-cfg_j7200.yaml +++ b/board/ti/j721e/sec-cfg_j7200.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security management configuration for J7200 diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig index f6d1cb5765..716503f02f 100644 --- a/board/ti/j721s2/Kconfig +++ b/board/ti/j721s2/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/ # David Huang <d-huang(a)ti.com> diff --git a/board/ti/j721s2/Makefile b/board/ti/j721s2/Makefile index 9dced12699..4ecbe303c8 100644 --- a/board/ti/j721s2/Makefile +++ b/board/ti/j721s2/Makefile @@ -2,7 +2,7 @@ # Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/ # David Huang <d-huang(a)ti.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += evm.o diff --git a/board/ti/j721s2/board-cfg.yaml b/board/ti/j721s2/board-cfg.yaml index dd024110e7..171a724496 100644 --- a/board/ti/j721s2/board-cfg.yaml +++ b/board/ti/j721s2/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for J721S2 diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c index 7795300abc..95c5c17345 100644 --- a/board/ti/j721s2/evm.c +++ b/board/ti/j721s2/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Board specific initialization for J721S2 EVM * diff --git a/board/ti/j721s2/pm-cfg.yaml b/board/ti/j721s2/pm-cfg.yaml index a640460d30..4402f1b97d 100644 --- a/board/ti/j721s2/pm-cfg.yaml +++ b/board/ti/j721s2/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for J721S2 diff --git a/board/ti/j721s2/rm-cfg.yaml b/board/ti/j721s2/rm-cfg.yaml index f772832f19..10d1850bc7 100644 --- a/board/ti/j721s2/rm-cfg.yaml +++ b/board/ti/j721s2/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for J721S2 diff --git a/board/ti/j721s2/sec-cfg.yaml b/board/ti/j721s2/sec-cfg.yaml index b3601d2a1c..c20a2b76f9 100644 --- a/board/ti/j721s2/sec-cfg.yaml +++ b/board/ti/j721s2/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security management configuration for J721S2 diff --git a/board/ti/ks2_evm/Makefile b/board/ti/ks2_evm/Makefile index 879f8b5983..3bcae0baef 100644 --- a/board/ti/ks2_evm/Makefile +++ b/board/ti/ks2_evm/Makefile @@ -2,7 +2,7 @@ # KS2-EVM: board Makefile # (C) Copyright 2012-2015 # Texas Instruments Incorporated, <www.ti.com> -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += board.o diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 5dcda12105..1ac81e7919 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone : Board initialization * diff --git a/board/ti/ks2_evm/board.h b/board/ti/ks2_evm/board.h index 93fc3887f4..5e91460b16 100644 --- a/board/ti/ks2_evm/board.h +++ b/board/ti/ks2_evm/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2HK EVM : Board common header * diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c index 39abb24e15..6b74db40f7 100644 --- a/board/ti/ks2_evm/board_k2e.c +++ b/board/ti/ks2_evm/board_k2e.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2E EVM : Board initialization * diff --git a/board/ti/ks2_evm/board_k2g.c b/board/ti/ks2_evm/board_k2g.c index 5229afad63..255fbda15d 100644 --- a/board/ti/ks2_evm/board_k2g.c +++ b/board/ti/ks2_evm/board_k2g.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2G EVM : Board initialization * diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c index 12c4649c3c..a31e21d31d 100644 --- a/board/ti/ks2_evm/board_k2hk.c +++ b/board/ti/ks2_evm/board_k2hk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2HK EVM : Board initialization * diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c index f759ee3646..99f366316f 100644 --- a/board/ti/ks2_evm/board_k2l.c +++ b/board/ti/ks2_evm/board_k2l.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2L EVM : Board initialization * diff --git a/board/ti/ks2_evm/ddr3_cfg.c b/board/ti/ks2_evm/ddr3_cfg.c index 0ade75263f..b7ec02b0e6 100644 --- a/board/ti/ks2_evm/ddr3_cfg.c +++ b/board/ti/ks2_evm/ddr3_cfg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 configuration * diff --git a/board/ti/ks2_evm/ddr3_cfg.h b/board/ti/ks2_evm/ddr3_cfg.h index 4f7462dec6..c2073df6a3 100644 --- a/board/ti/ks2_evm/ddr3_cfg.h +++ b/board/ti/ks2_evm/ddr3_cfg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Keystone2: DDR3 configuration * diff --git a/board/ti/ks2_evm/ddr3_k2e.c b/board/ti/ks2_evm/ddr3_k2e.c index 95fe3a9021..ae56df6e54 100644 --- a/board/ti/ks2_evm/ddr3_k2e.c +++ b/board/ti/ks2_evm/ddr3_k2e.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 initialization * diff --git a/board/ti/ks2_evm/ddr3_k2g.c b/board/ti/ks2_evm/ddr3_k2g.c index 3000d7245e..d11adf3037 100644 --- a/board/ti/ks2_evm/ddr3_k2g.c +++ b/board/ti/ks2_evm/ddr3_k2g.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * K2G: DDR3 initialization * diff --git a/board/ti/ks2_evm/ddr3_k2hk.c b/board/ti/ks2_evm/ddr3_k2hk.c index 198c5da0e6..1a9720b8d9 100644 --- a/board/ti/ks2_evm/ddr3_k2hk.c +++ b/board/ti/ks2_evm/ddr3_k2hk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 initialization * diff --git a/board/ti/ks2_evm/ddr3_k2l.c b/board/ti/ks2_evm/ddr3_k2l.c index 805bf81f6b..26a5e97eb6 100644 --- a/board/ti/ks2_evm/ddr3_k2l.c +++ b/board/ti/ks2_evm/ddr3_k2l.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: DDR3 initialization * diff --git a/board/ti/ks2_evm/mux-k2g.h b/board/ti/ks2_evm/mux-k2g.h index f24e62850b..ecb9023797 100644 --- a/board/ti/ks2_evm/mux-k2g.h +++ b/board/ti/ks2_evm/mux-k2g.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K2G EVM: Pinmux configuration * diff --git a/board/ti/omap3evm/Makefile b/board/ti/omap3evm/Makefile index 17ee516d26..94d328ec81 100644 --- a/board/ti/omap3evm/Makefile +++ b/board/ti/omap3evm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ti/omap3evm/evm.c b/board/ti/omap3evm/evm.c index a4d6a0138d..cba291a132 100644 --- a/board/ti/omap3evm/evm.c +++ b/board/ti/omap3evm/evm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004-2011 * Texas Instruments, <www.ti.com> diff --git a/board/ti/omap3evm/evm.h b/board/ti/omap3evm/evm.h index 09b08b490a..e786cd6054 100644 --- a/board/ti/omap3evm/evm.h +++ b/board/ti/omap3evm/evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Nishanth Menon <menon.nishanth(a)gmail.com> diff --git a/board/ti/panda/Makefile b/board/ti/panda/Makefile index dd2ff33afa..5f77d933e5 100644 --- a/board/ti/panda/Makefile +++ b/board/ti/panda/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index 2209318601..c9b1237088 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h index ad9e36525b..7e381f3d47 100644 --- a/board/ti/panda/panda_mux_data.h +++ b/board/ti/panda/panda_mux_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/ti/sdp4430/Makefile b/board/ti/sdp4430/Makefile index ae06945612..ab15f5e6c0 100644 --- a/board/ti/sdp4430/Makefile +++ b/board/ti/sdp4430/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/ti/sdp4430/cmd_bat.c b/board/ti/sdp4430/cmd_bat.c index 6c1e6ca393..b0f1f2d9d4 100644 --- a/board/ti/sdp4430/cmd_bat.c +++ b/board/ti/sdp4430/cmd_bat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Texas Instruments */ diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 2c9ae794fd..389fce27ac 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/ti/sdp4430/sdp4430_mux_data.h b/board/ti/sdp4430/sdp4430_mux_data.h index 934419f40e..c2a2c51bc8 100644 --- a/board/ti/sdp4430/sdp4430_mux_data.h +++ b/board/ti/sdp4430/sdp4430_mux_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments Incorporated, <www.ti.com> diff --git a/board/timll/devkit3250/Makefile b/board/timll/devkit3250/Makefile index 056813995e..08b1516ba7 100644 --- a/board/timll/devkit3250/Makefile +++ b/board/timll/devkit3250/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 by Vladimir Zapolskiy <vz(a)mleia.com> # Copyright (C) 2008, Guennadi Liakhovetski <lg(a)denx.de> diff --git a/board/timll/devkit3250/devkit3250.c b/board/timll/devkit3250/devkit3250.c index efef855b3d..d941aff3fa 100644 --- a/board/timll/devkit3250/devkit3250.c +++ b/board/timll/devkit3250/devkit3250.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Embest/Timll DevKit3250 board support * diff --git a/board/timll/devkit3250/devkit3250_spl.c b/board/timll/devkit3250/devkit3250_spl.c index 12e8ae9c39..afe50f4034 100644 --- a/board/timll/devkit3250/devkit3250_spl.c +++ b/board/timll/devkit3250/devkit3250_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Timll DevKit3250 board support, SPL board configuration * diff --git a/board/timll/devkit8000/Makefile b/board/timll/devkit8000/Makefile index 4d681701cf..a7304639b7 100644 --- a/board/timll/devkit8000/Makefile +++ b/board/timll/devkit8000/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000, 2001, 2002 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 06009d8ad5..bf70270adb 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004-2008 * Texas Instruments, <www.ti.com> diff --git a/board/timll/devkit8000/devkit8000.h b/board/timll/devkit8000/devkit8000.h index c8d57d167e..8601810f2e 100644 --- a/board/timll/devkit8000/devkit8000.h +++ b/board/timll/devkit8000/devkit8000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Dirk Behme <dirk.behme(a)gmail.com> diff --git a/board/topic/zynq/Makefile b/board/topic/zynq/Makefile index cc100b0f42..6d1c0bf11b 100644 --- a/board/topic/zynq/Makefile +++ b/board/topic/zynq/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := board.o obj-y += ../../xilinx/common/board.o diff --git a/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c index e7cc2c2dec..729a762aad 100644 --- a/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c +++ b/board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2016 Topic Embedded Products. diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c index 0f141260ff..e33b416ec9 100644 --- a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2016 Topic Embedded Products. diff --git a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c index 717955808d..3442a76620 100644 --- a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c +++ b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2016 Topic Embedded Products. diff --git a/board/toradex/apalis-imx8/Makefile b/board/toradex/apalis-imx8/Makefile index a8c3eb7240..05943538e5 100644 --- a/board/toradex/apalis-imx8/Makefile +++ b/board/toradex/apalis-imx8/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Toradex # diff --git a/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg index 16183f9667..086ba2e338 100644 --- a/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg +++ b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Toradex * diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index e2bbaba8b8..3eb22c1cc3 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Toradex */ diff --git a/board/toradex/apalis-tk1/Makefile b/board/toradex/apalis-tk1/Makefile index 9ef06dd61d..d985b6b751 100644 --- a/board/toradex/apalis-tk1/Makefile +++ b/board/toradex/apalis-tk1/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2016 Toradex, Inc. -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += as3722_init.o obj-y += apalis-tk1.o diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index 8513431591..435e119439 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016-2018 Toradex, Inc. */ diff --git a/board/toradex/apalis-tk1/as3722_init.c b/board/toradex/apalis-tk1/as3722_init.c index e9bd1028be..51a92b83f5 100644 --- a/board/toradex/apalis-tk1/as3722_init.c +++ b/board/toradex/apalis-tk1/as3722_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012-2016 Toradex, Inc. */ diff --git a/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h b/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h index 6778a41e07..065165f374 100644 --- a/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h +++ b/board/toradex/apalis-tk1/pinmux-config-apalis-tk1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016-2019, Toradex, Inc. */ diff --git a/board/toradex/apalis_imx6/Makefile b/board/toradex/apalis_imx6/Makefile index 128f1794d1..e02972090f 100644 --- a/board/toradex/apalis_imx6/Makefile +++ b/board/toradex/apalis_imx6/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2012-2014 Toradex, Inc. -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := apalis_imx6.o do_fuse.o obj-$(CONFIG_TDX_CMD_IMX_MFGR) += pf0100.o diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index fa6b7226fe..3d3d47a7e8 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices <info(a)boundarydevices.com> diff --git a/board/toradex/apalis_imx6/do_fuse.c b/board/toradex/apalis_imx6/do_fuse.c index 6991b1bc13..eaf33a40d4 100644 --- a/board/toradex/apalis_imx6/do_fuse.c +++ b/board/toradex/apalis_imx6/do_fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016, Toradex AG */ diff --git a/board/toradex/apalis_imx6/pf0100.c b/board/toradex/apalis_imx6/pf0100.c index c89052ff5d..4c93879e75 100644 --- a/board/toradex/apalis_imx6/pf0100.c +++ b/board/toradex/apalis_imx6/pf0100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2019, Toradex AG */ diff --git a/board/toradex/apalis_imx6/pf0100.h b/board/toradex/apalis_imx6/pf0100.h index 9257620511..db1223af67 100644 --- a/board/toradex/apalis_imx6/pf0100.h +++ b/board/toradex/apalis_imx6/pf0100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2019, Toradex AG */ diff --git a/board/toradex/apalis_imx6/pf0100_otp.inc b/board/toradex/apalis_imx6/pf0100_otp.inc index a7790fd6c6..16bbe78457 100644 --- a/board/toradex/apalis_imx6/pf0100_otp.inc +++ b/board/toradex/apalis_imx6/pf0100_otp.inc @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016, Toradex AG */ diff --git a/board/toradex/apalis_t30/Makefile b/board/toradex/apalis_t30/Makefile index eed607043f..6c3ea803c0 100644 --- a/board/toradex/apalis_t30/Makefile +++ b/board/toradex/apalis_t30/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2014 Marcel Ziswiler -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) += apalis_t30-spl.o diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index ef71270d9f..237969185b 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014-2018 * Marcel Ziswiler <marcel(a)ziswiler.com> diff --git a/board/toradex/colibri-imx6ull/Makefile b/board/toradex/colibri-imx6ull/Makefile index f478e68049..6b233f5d1d 100644 --- a/board/toradex/colibri-imx6ull/Makefile +++ b/board/toradex/colibri-imx6ull/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2018 Toradex AG obj-y := colibri-imx6ull.o diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index 48fdb1e097..78cc81bbfe 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2019 Toradex AG */ diff --git a/board/toradex/colibri-imx6ull/imximage.cfg b/board/toradex/colibri-imx6ull/imximage.cfg index 0d81f9b2f4..e6131b1db1 100644 --- a/board/toradex/colibri-imx6ull/imximage.cfg +++ b/board/toradex/colibri-imx6ull/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright (C) 2018 Toradex AG diff --git a/board/toradex/colibri-imx8x/Makefile b/board/toradex/colibri-imx8x/Makefile index e3945c8f15..51537b5de5 100644 --- a/board/toradex/colibri-imx8x/Makefile +++ b/board/toradex/colibri-imx8x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Toradex # diff --git a/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg index fa176b0408..16dd24b2e4 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg +++ b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Toradex * diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c index 6c0b09787c..3cc1c6e06d 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8x.c +++ b/board/toradex/colibri-imx8x/colibri-imx8x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Toradex */ diff --git a/board/toradex/colibri_imx6/Makefile b/board/toradex/colibri_imx6/Makefile index c81bc2d741..e5a6f2a048 100644 --- a/board/toradex/colibri_imx6/Makefile +++ b/board/toradex/colibri_imx6/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2012-2014 Toradex, Inc. -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := colibri_imx6.o do_fuse.o obj-$(CONFIG_TDX_CMD_IMX_MFGR) += pf0100.o diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index e6c9b10570..6bfdfd21b2 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices <info(a)boundarydevices.com> diff --git a/board/toradex/colibri_imx6/do_fuse.c b/board/toradex/colibri_imx6/do_fuse.c index 6991b1bc13..eaf33a40d4 100644 --- a/board/toradex/colibri_imx6/do_fuse.c +++ b/board/toradex/colibri_imx6/do_fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016, Toradex AG */ diff --git a/board/toradex/colibri_imx6/pf0100.c b/board/toradex/colibri_imx6/pf0100.c index 8f08d8c733..47f79cbbc3 100644 --- a/board/toradex/colibri_imx6/pf0100.c +++ b/board/toradex/colibri_imx6/pf0100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2019, Toradex AG */ diff --git a/board/toradex/colibri_imx6/pf0100.h b/board/toradex/colibri_imx6/pf0100.h index 9257620511..db1223af67 100644 --- a/board/toradex/colibri_imx6/pf0100.h +++ b/board/toradex/colibri_imx6/pf0100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2019, Toradex AG */ diff --git a/board/toradex/colibri_imx6/pf0100_otp.inc b/board/toradex/colibri_imx6/pf0100_otp.inc index c3b1f67f81..5a23e41b7c 100644 --- a/board/toradex/colibri_imx6/pf0100_otp.inc +++ b/board/toradex/colibri_imx6/pf0100_otp.inc @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2016, Toradex AG */ diff --git a/board/toradex/colibri_imx7/Makefile b/board/toradex/colibri_imx7/Makefile index b212ff0f26..5a68cf8238 100644 --- a/board/toradex/colibri_imx7/Makefile +++ b/board/toradex/colibri_imx7/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2016 Toradex AG obj-y := colibri_imx7.o diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c index f0356af008..4e0e0679d6 100644 --- a/board/toradex/colibri_imx7/colibri_imx7.c +++ b/board/toradex/colibri_imx7/colibri_imx7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2018 Toradex AG */ diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg index 41b3577b10..4aa9c6b0dc 100644 --- a/board/toradex/colibri_imx7/imximage.cfg +++ b/board/toradex/colibri_imx7/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * 2015 Toradex AG diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile index c5528b37b2..cfb5d4c05b 100644 --- a/board/toradex/colibri_t20/Makefile +++ b/board/toradex/colibri_t20/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 Lucas Stach diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index 1df9697b97..56632cf247 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Lucas Stach */ diff --git a/board/toradex/colibri_t30/Makefile b/board/toradex/colibri_t30/Makefile index 8f333235b1..f0dd0ad4bb 100644 --- a/board/toradex/colibri_t30/Makefile +++ b/board/toradex/colibri_t30/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2013-2014 Stefan Agner -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) += colibri_t30-spl.o diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index b6b004669c..4c192c0bec 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014-2016 * Stefan Agner <stefan(a)agner.ch> diff --git a/board/toradex/colibri_vf/Makefile b/board/toradex/colibri_vf/Makefile index 9be2cbc037..ef86e6f3ab 100644 --- a/board/toradex/colibri_vf/Makefile +++ b/board/toradex/colibri_vf/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index dcef2db360..fe3dca2757 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2019 Toradex, Inc. * diff --git a/board/toradex/colibri_vf/imximage.cfg b/board/toradex/colibri_vf/imximage.cfg index 7e629d2f9e..ce7070ccaa 100644 --- a/board/toradex/colibri_vf/imximage.cfg +++ b/board/toradex/colibri_vf/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Toradex, Inc. * diff --git a/board/toradex/common/Kconfig b/board/toradex/common/Kconfig index 1f6a5e4db5..3a96b0b38a 100644 --- a/board/toradex/common/Kconfig +++ b/board/toradex/common/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Toradex, Inc. menuconfig TDX_CFG_BLOCK diff --git a/board/toradex/common/Makefile b/board/toradex/common/Makefile index 7b19b6e4c8..967b0f2f73 100644 --- a/board/toradex/common/Makefile +++ b/board/toradex/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Toradex, Inc. # Common for all Toradex modules diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 7187e1ba37..5da59b0846 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016-2020 Toradex */ diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index ea58bd43b1..647f15ee71 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016-2020 Toradex */ diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index d144914397..5f69edcd00 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Toradex, Inc. */ diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index d446e9f1d5..1fdb79a031 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Toradex, Inc. */ diff --git a/board/toradex/common/tdx-eeprom.c b/board/toradex/common/tdx-eeprom.c index 81bd9e68c2..f2951fe8c0 100644 --- a/board/toradex/common/tdx-eeprom.c +++ b/board/toradex/common/tdx-eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Toradex */ diff --git a/board/toradex/common/tdx-eeprom.h b/board/toradex/common/tdx-eeprom.h index a6772d2f3f..86032d1876 100644 --- a/board/toradex/common/tdx-eeprom.h +++ b/board/toradex/common/tdx-eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 Toradex */ diff --git a/board/toradex/verdin-am62/board-cfg.yaml b/board/toradex/verdin-am62/board-cfg.yaml index 36cfb550ad..18fe1f26b5 100644 --- a/board/toradex/verdin-am62/board-cfg.yaml +++ b/board/toradex/verdin-am62/board-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Board configuration for AM62 diff --git a/board/toradex/verdin-am62/pm-cfg.yaml b/board/toradex/verdin-am62/pm-cfg.yaml index 5d04cf82ef..bb5321a413 100644 --- a/board/toradex/verdin-am62/pm-cfg.yaml +++ b/board/toradex/verdin-am62/pm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Power management configuration for AM62 diff --git a/board/toradex/verdin-am62/rm-cfg.yaml b/board/toradex/verdin-am62/rm-cfg.yaml index c28707be8e..dc0b25afaa 100644 --- a/board/toradex/verdin-am62/rm-cfg.yaml +++ b/board/toradex/verdin-am62/rm-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Resource management configuration for AM62 diff --git a/board/toradex/verdin-am62/sec-cfg.yaml b/board/toradex/verdin-am62/sec-cfg.yaml index 07081ce06c..f779fba023 100644 --- a/board/toradex/verdin-am62/sec-cfg.yaml +++ b/board/toradex/verdin-am62/sec-cfg.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # # Security management configuration for AM62 diff --git a/board/toradex/verdin-imx8mm/Makefile b/board/toradex/verdin-imx8mm/Makefile index b38054254d..0559cba04f 100644 --- a/board/toradex/verdin-imx8mm/Makefile +++ b/board/toradex/verdin-imx8mm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 Toradex # diff --git a/board/toradex/verdin-imx8mm/imximage.cfg b/board/toradex/verdin-imx8mm/imximage.cfg index 0e02e44799..90d1852dab 100644 --- a/board/toradex/verdin-imx8mm/imximage.cfg +++ b/board/toradex/verdin-imx8mm/imximage.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020-2021 Toradex */ diff --git a/board/toradex/verdin-imx8mm/lpddr4_timing.c b/board/toradex/verdin-imx8mm/lpddr4_timing.c index 4dfec679b1..f2dfc9a1fa 100644 --- a/board/toradex/verdin-imx8mm/lpddr4_timing.c +++ b/board/toradex/verdin-imx8mm/lpddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Toradex * diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c index afa3686083..a7f52e01ef 100644 --- a/board/toradex/verdin-imx8mm/spl.c +++ b/board/toradex/verdin-imx8mm/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Toradex */ diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 55c02653da..8fca45768d 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020-2021 Toradex */ diff --git a/board/tplink/wdr4300/Makefile b/board/tplink/wdr4300/Makefile index 323a104bf3..9bfc6ce5cb 100644 --- a/board/tplink/wdr4300/Makefile +++ b/board/tplink/wdr4300/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y = wdr4300.o diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c index f2de039b6b..3274600a40 100644 --- a/board/tplink/wdr4300/wdr4300.c +++ b/board/tplink/wdr4300/wdr4300.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/board/tq/tqma6/Makefile b/board/tq/tqma6/Makefile index 7271297c70..0d8b8819cb 100644 --- a/board/tq/tqma6/Makefile +++ b/board/tq/tqma6/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, Markus Niebel <Markus.Niebel(a)tq-group.com> diff --git a/board/tq/tqma6/clocks.cfg b/board/tq/tqma6/clocks.cfg index 1f2001c75f..52c086c6fa 100644 --- a/board/tq/tqma6/clocks.cfg +++ b/board/tq/tqma6/clocks.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Boundary Devices * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel(a)tq-group.com> diff --git a/board/tq/tqma6/tqma6.c b/board/tq/tqma6/tqma6.c index 1c2228c77a..0b849d77ba 100644 --- a/board/tq/tqma6/tqma6.c +++ b/board/tq/tqma6/tqma6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/board/tq/tqma6/tqma6_bb.h b/board/tq/tqma6/tqma6_bb.h index ca81bdf585..83594ed214 100644 --- a/board/tq/tqma6/tqma6_bb.h +++ b/board/tq/tqma6/tqma6_bb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013, 2014 TQ-Systems * Author: Markus Niebel <markus.niebel(a)tq-group.com> diff --git a/board/tq/tqma6/tqma6_mba6.c b/board/tq/tqma6/tqma6_mba6.c index 52851dd5b5..101693e14e 100644 --- a/board/tq/tqma6/tqma6_mba6.c +++ b/board/tq/tqma6/tqma6_mba6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/board/tq/tqma6/tqma6_wru4.c b/board/tq/tqma6/tqma6_wru4.c index 5d239913fc..5f4162e6c0 100644 --- a/board/tq/tqma6/tqma6_wru4.c +++ b/board/tq/tqma6/tqma6_wru4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * Author: Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/board/tq/tqma6/tqma6dl.cfg b/board/tq/tqma6/tqma6dl.cfg index 8cd1885b43..b56b1891f8 100644 --- a/board/tq/tqma6/tqma6dl.cfg +++ b/board/tq/tqma6/tqma6dl.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 - 2015 Markus Niebel <Markus.Niebel(a)tq-group.com> * diff --git a/board/tq/tqma6/tqma6q.cfg b/board/tq/tqma6/tqma6q.cfg index a49489aed3..16999a4766 100644 --- a/board/tq/tqma6/tqma6q.cfg +++ b/board/tq/tqma6/tqma6q.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel(a)tq-group.com> * diff --git a/board/tq/tqma6/tqma6s.cfg b/board/tq/tqma6/tqma6s.cfg index 02f7e10910..4d6fcc3082 100644 --- a/board/tq/tqma6/tqma6s.cfg +++ b/board/tq/tqma6/tqma6s.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013, 2014 Markus Niebel <Markus.Niebel(a)tq-group.com> * diff --git a/board/traverse/common/ten64-controller.h b/board/traverse/common/ten64-controller.h index fed6af470d..9fc6715c51 100644 --- a/board/traverse/common/ten64-controller.h +++ b/board/traverse/common/ten64-controller.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef TEN64_CNTRL_H #define TEN64_CNTRL_H diff --git a/board/traverse/common/ten64_controller.c b/board/traverse/common/ten64_controller.c index d6ef8a8d0d..82eb8e9c5b 100644 --- a/board/traverse/common/ten64_controller.c +++ b/board/traverse/common/ten64_controller.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Ten64 Board Microcontroller Driver * Copyright 2021 Traverse Technologies Australia diff --git a/board/traverse/ten64/Makefile b/board/traverse/ten64/Makefile index fd8d5cc87b..826f96bac3 100644 --- a/board/traverse/ten64/Makefile +++ b/board/traverse/ten64/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += ten64.o obj-y += eth_ten64.o diff --git a/board/traverse/ten64/eth_ten64.c b/board/traverse/ten64/eth_ten64.c index 3f96e572b7..b9a09d7bc9 100644 --- a/board/traverse/ten64/eth_ten64.c +++ b/board/traverse/ten64/eth_ten64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * Copyright 2019-2021 Traverse Technologies Australia diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 6ff5312d6d..18b3bc64ff 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Traverse Ten64 Family board * Copyright 2017-2018 NXP diff --git a/board/udoo/Makefile b/board/udoo/Makefile index 66f67f7c15..514b19ee15 100644 --- a/board/udoo/Makefile +++ b/board/udoo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/udoo/neo/Makefile b/board/udoo/neo/Makefile index 831c084ce5..45c0cc2e71 100644 --- a/board/udoo/neo/Makefile +++ b/board/udoo/neo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2015 UDOO Team obj-y := neo.o diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 730e266469..519128b500 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. * Copyright (C) Jasbir Matharu diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c index 9e0365615d..23132ec19a 100644 --- a/board/udoo/udoo.c +++ b/board/udoo/udoo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c index 647380e1db..0c35b70d67 100644 --- a/board/udoo/udoo_spl.c +++ b/board/udoo/udoo_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Udoo * Author: Tungyi Lin <tungyilin1127(a)gmail.com> diff --git a/board/vamrs/rock960_rk3399/Makefile b/board/vamrs/rock960_rk3399/Makefile index 6c3e475b3a..ec5f540032 100644 --- a/board/vamrs/rock960_rk3399/Makefile +++ b/board/vamrs/rock960_rk3399/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> # diff --git a/board/vamrs/rock960_rk3399/rock960-rk3399.c b/board/vamrs/rock960_rk3399/rock960-rk3399.c index a7fc38d42f..e794c60c25 100644 --- a/board/vamrs/rock960_rk3399/rock960-rk3399.c +++ b/board/vamrs/rock960_rk3399/rock960-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> */ diff --git a/board/variscite/dart_6ul/Makefile b/board/variscite/dart_6ul/Makefile index 48aa361bf2..3054e3f591 100644 --- a/board/variscite/dart_6ul/Makefile +++ b/board/variscite/dart_6ul/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y := dart_6ul.o obj-$(CONFIG_SPL_BUILD) += spl.o diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c index 98d8d1c312..d5c2e76513 100644 --- a/board/variscite/dart_6ul/dart_6ul.c +++ b/board/variscite/dart_6ul/dart_6ul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2019 Variscite Ltd. * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c index 1dff69c827..a1e44d4deb 100644 --- a/board/variscite/dart_6ul/spl.c +++ b/board/variscite/dart_6ul/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2019 Variscite Ltd. * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> diff --git a/board/variscite/imx8mn_var_som/Makefile b/board/variscite/imx8mn_var_som/Makefile index a8b6a343ff..f503247242 100644 --- a/board/variscite/imx8mn_var_som/Makefile +++ b/board/variscite/imx8mn_var_som/Makefile @@ -1,7 +1,7 @@ # # Copyright 2021 Collabora Ltd. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += imx8mn_var_som.o diff --git a/board/variscite/imx8mn_var_som/ddr4_timing.c b/board/variscite/imx8mn_var_som/ddr4_timing.c index 0ed69eeb3d..cf41621bb3 100644 --- a/board/variscite/imx8mn_var_som/ddr4_timing.c +++ b/board/variscite/imx8mn_var_som/ddr4_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * diff --git a/board/variscite/imx8mn_var_som/imx8mn_var_som.c b/board/variscite/imx8mn_var_som/imx8mn_var_som.c index 61b9455a8f..000c42c21a 100644 --- a/board/variscite/imx8mn_var_som/imx8mn_var_som.c +++ b/board/variscite/imx8mn_var_som/imx8mn_var_som.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * Copyright 2018-2020 Variscite Ltd. diff --git a/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg b/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg index a0091cddfb..7da74d383e 100644 --- a/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg +++ b/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/board/variscite/imx8mn_var_som/spl.c b/board/variscite/imx8mn_var_som/spl.c index 01a63c6964..2d7f13ebe5 100644 --- a/board/variscite/imx8mn_var_som/spl.c +++ b/board/variscite/imx8mn_var_som/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Collabora Ltd. * diff --git a/board/vscom/baltos/Makefile b/board/vscom/baltos/Makefile index 3ccf66be5b..5eb1c4cbd1 100644 --- a/board/vscom/baltos/Makefile +++ b/board/vscom/baltos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile # diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index 8f23cda8e4..5f618fa81c 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * board.c * diff --git a/board/vscom/baltos/board.h b/board/vscom/baltos/board.h index 630c9bba73..216383843e 100644 --- a/board/vscom/baltos/board.h +++ b/board/vscom/baltos/board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * board.h * diff --git a/board/wandboard/Makefile b/board/wandboard/Makefile index c3d80536b3..dc60d5dfec 100644 --- a/board/wandboard/Makefile +++ b/board/wandboard/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2013 Freescale Semiconductor, Inc. diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c index 717e02a039..3668a62943 100644 --- a/board/wandboard/spl.c +++ b/board/wandboard/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Wandboard * Author: Tungyi Lin <tungyilin1127(a)gmail.com> diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 48914450a2..27fb6b5ac7 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * Copyright (C) 2014 O.S. Systems Software LTDA. diff --git a/board/warp7/Makefile b/board/warp7/Makefile index 92b0ca9060..7042703ef0 100644 --- a/board/warp7/Makefile +++ b/board/warp7/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2016 NXP Semiconductors obj-y := warp7.o diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index ead52d5a49..06f6233a50 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 NXP Semiconductors * Author: Fabio Estevam <fabio.estevam(a)nxp.com> diff --git a/board/work-microwave/work_92105/Makefile b/board/work-microwave/work_92105/Makefile index b837e7b0dd..95ee76be04 100644 --- a/board/work-microwave/work_92105/Makefile +++ b/board/work-microwave/work_92105/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 DENX Software Engineering GmbH # Written-by: Albert ARIBAUD <albert.aribaud(a)3adev.fr> diff --git a/board/work-microwave/work_92105/work_92105.c b/board/work-microwave/work_92105/work_92105.c index c8e791a4da..7e06a737b9 100644 --- a/board/work-microwave/work_92105/work_92105.c +++ b/board/work-microwave/work_92105/work_92105.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * WORK Microwave work_92105 board support * diff --git a/board/work-microwave/work_92105/work_92105_display.c b/board/work-microwave/work_92105/work_92105_display.c index 64dd5d4072..61b3098e42 100644 --- a/board/work-microwave/work_92105/work_92105_display.c +++ b/board/work-microwave/work_92105/work_92105_display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * work_92105 display support * diff --git a/board/work-microwave/work_92105/work_92105_display.h b/board/work-microwave/work_92105/work_92105_display.h index 17a9aa04e0..94d14a4bef 100644 --- a/board/work-microwave/work_92105/work_92105_display.h +++ b/board/work-microwave/work_92105/work_92105_display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * work_92105 display support interface * diff --git a/board/work-microwave/work_92105/work_92105_spl.c b/board/work-microwave/work_92105/work_92105_spl.c index d9401145f2..50b7fd074b 100644 --- a/board/work-microwave/work_92105/work_92105_spl.c +++ b/board/work-microwave/work_92105/work_92105_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * WORK Microwave work_92105 board support * diff --git a/board/xen/xenguest_arm64/Makefile b/board/xen/xenguest_arm64/Makefile index 1cf87a728f..da9c382a03 100644 --- a/board/xen/xenguest_arm64/Makefile +++ b/board/xen/xenguest_arm64/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 EPAM Systems Inc. diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 9309b07126..f62440f611 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2022, Xilinx, Inc. * (C) Copyright 2022 - 2023, Advanced Micro Devices, Inc. diff --git a/board/xilinx/common/cpu-info.c b/board/xilinx/common/cpu-info.c index bfe7f5b7e3..c705e1dbaf 100644 --- a/board/xilinx/common/cpu-info.c +++ b/board/xilinx/common/cpu-info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2020 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/board/xilinx/common/fru.h b/board/xilinx/common/fru.h index 2b3fa05a61..0551b7e56e 100644 --- a/board/xilinx/common/fru.h +++ b/board/xilinx/common/fru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Xilinx, Inc. * Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu(a)amd.com>> diff --git a/board/xilinx/microblaze-generic/Makefile b/board/xilinx/microblaze-generic/Makefile index cfd8337522..a97cb8c479 100644 --- a/board/xilinx/microblaze-generic/Makefile +++ b/board/xilinx/microblaze-generic/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/xilinx/microblaze-generic/config.mk b/board/xilinx/microblaze-generic/config.mk index a9539776d3..18fdf2a889 100644 --- a/board/xilinx/microblaze-generic/config.mk +++ b/board/xilinx/microblaze-generic/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 - 2016 Michal Simek # diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index a427ac94a1..cf809bcfc7 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2018 Michal Simek * diff --git a/board/xilinx/versal/Makefile b/board/xilinx/versal/Makefile index d912f2e74f..83fb66c2b7 100644 --- a/board/xilinx/versal/Makefile +++ b/board/xilinx/versal/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 - 2018 Xilinx, Inc. # Michal Simek <michal.simek(a)amd.com> diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 8c2e614ad8..93d23e2ad6 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2018 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile index 8566171589..cfd1935628 100644 --- a/board/xilinx/zynq/Makefile +++ b/board/xilinx/zynq/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 3b6581e304..ff1ee3bf78 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Michal Simek <monstr(a)monstr.eu> * (C) Copyright 2013 - 2018 Xilinx, Inc. diff --git a/board/xilinx/zynq/bootimg.c b/board/xilinx/zynq/bootimg.c index 2f55078dd7..c3be6c6d35 100644 --- a/board/xilinx/zynq/bootimg.c +++ b/board/xilinx/zynq/bootimg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Xilinx, Inc. */ diff --git a/board/xilinx/zynq/cmds.c b/board/xilinx/zynq/cmds.c index d7c7b2f229..da4f25b21f 100644 --- a/board/xilinx/zynq/cmds.c +++ b/board/xilinx/zynq/cmds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Xilinx, Inc. */ diff --git a/board/xilinx/zynq/xil_io.h b/board/xilinx/zynq/xil_io.h index e933f7b5fb..354b000175 100644 --- a/board/xilinx/zynq/xil_io.h +++ b/board/xilinx/zynq/xil_io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef XIL_IO_H /* prevent circular inclusions */ #define XIL_IO_H diff --git a/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c b/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c index 82f270c2e1..b4c616d9ac 100644 --- a/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c b/board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c index 75095ee3d4..a491637b39 100644 --- a/board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-dlc20-rev1.0/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 602a789e77..3fa040264f 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. ******************************************************************************/ diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index 9343683f4d..bbbc13fec9 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. ******************************************************************************/ diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index 6b153aa379..7e4fda7ecf 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. ******************************************************************************/ diff --git a/board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c index b4663818dd..40d3dc1f12 100644 --- a/board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc770-xm010/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c index 254a512ccb..45dc764bde 100644 --- a/board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc770-xm011-x16/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c index f4362b943b..b213f78031 100644 --- a/board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc770-xm011/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c index 621de09cc6..b678219373 100644 --- a/board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc770-xm012/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c index eefd46d932..d9755b54b8 100644 --- a/board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc770-xm013/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 6f2edf16c2..c824dc70be 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. ******************************************************************************/ diff --git a/board/xilinx/zynq/zynq-zturn-v5/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zturn-v5/ps7_init_gpl.c index 5d573868cb..4e58b31d2a 100644 --- a/board/xilinx/zynq/zynq-zturn-v5/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zturn-v5/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Xilinx, Inc. */ diff --git a/board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c index 5d573868cb..4e58b31d2a 100644 --- a/board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zturn/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Xilinx, Inc. */ diff --git a/board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c index a376ba574e..14b8f06f2e 100644 --- a/board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zybo-z7/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * diff --git a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c index 04d2e5f137..ab859025e0 100644 --- a/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zybo/ps7_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Xilinx, Inc. */ diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile index 204e4fadf0..0c3a69802e 100644 --- a/board/xilinx/zynqmp/Makefile +++ b/board/xilinx/zynqmp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 - 2016 Xilinx, Inc. # Michal Simek <michal.simek(a)amd.com> diff --git a/board/xilinx/zynqmp/pm_cfg_obj.S b/board/xilinx/zynqmp/pm_cfg_obj.S index c4ca77e396..e2990a4e47 100644 --- a/board/xilinx/zynqmp/pm_cfg_obj.S +++ b/board/xilinx/zynqmp/pm_cfg_obj.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ .section .rodata diff --git a/board/xilinx/zynqmp/pm_cfg_obj.h b/board/xilinx/zynqmp/pm_cfg_obj.h index 86e785490c..8e4dc9259e 100644 --- a/board/xilinx/zynqmp/pm_cfg_obj.h +++ b/board/xilinx/zynqmp/pm_cfg_obj.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Luca Ceresoli <luca(a)lucaceresoli.net> * diff --git a/board/xilinx/zynqmp/xil_io.h b/board/xilinx/zynqmp/xil_io.h index e6caa7c850..2c57e54beb 100644 --- a/board/xilinx/zynqmp/xil_io.h +++ b/board/xilinx/zynqmp/xil_io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef XIL_IO_H /* prevent circular inclusions */ #define XIL_IO_H diff --git a/board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c index be9992c90f..9b52180eb2 100644 --- a/board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-a2197-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c index dae81e60cc..077ee5814c 100644 --- a/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c index 5ec327134b..da19fcb77d 100644 --- a/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c index 166e61431b..00a99e67a5 100644 --- a/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-sm-k24-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c index e5598807e8..ec5c80292b 100644 --- a/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c index 333510bfe9..0469853fe0 100644 --- a/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c index b8ea291f8b..e5d5848418 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1232-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c index 520fff28f9..d4a1d26679 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1254-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c index 6b0705df38..700250be21 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1751-xm015-dc1/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c index 59de4373b6..1b3906ea1a 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1751-xm016-dc2/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c index 59de4373b6..1b3906ea1a 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1751-xm017-dc3/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c index 59de4373b6..1b3906ea1a 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1751-xm018-dc4/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c index e0b71abd51..1862f303e1 100644 --- a/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zc1751-xm019-dc5/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c index e01915f7ed..af85557422 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu100-revC/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c index 6adbf5e234..61ee587a9c 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.0/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c index f1fdc7dad1..4ebaa65765 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c index f99e06acf6..97b948e29d 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu102-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c index 383e3d0c7e..24d2a9c877 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu104-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0/psu_init_gpl.c index 3dc9bf8f3a..25c6f37e8e 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c index cbc436289f..1d39cd4f15 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c index 8963aa4a07..1fdb54d944 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c index 2d93b2005b..41f826eba2 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu1275-revB/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c index f98ad8af82..027615798e 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c index 5d47cd1abc..9b0b8b364e 100644 --- a/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c +++ b/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f162803084..1fba417c27 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/board/zyxel/nsa310s/Kconfig b/board/zyxel/nsa310s/Kconfig index 801d6966ea..dfa29145d2 100644 --- a/board/zyxel/nsa310s/Kconfig +++ b/board/zyxel/nsa310s/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 # Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/zyxel/nsa310s/Makefile b/board/zyxel/nsa310s/Makefile index 2131e28db3..162623ec16 100644 --- a/board/zyxel/nsa310s/Makefile +++ b/board/zyxel/nsa310s/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 # Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/zyxel/nsa310s/kwbimage.cfg b/board/zyxel/nsa310s/kwbimage.cfg index 9ebdeab94d..6211b5e20b 100644 --- a/board/zyxel/nsa310s/kwbimage.cfg +++ b/board/zyxel/nsa310s/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 # Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c index b3ea660891..f8800af3e7 100644 --- a/board/zyxel/nsa310s/nsa310s.c +++ b/board/zyxel/nsa310s/nsa310s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, 2021-2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2015 Gerald Kerma <dreagle(a)doukki.net> diff --git a/board/zyxel/nsa325/Makefile b/board/zyxel/nsa325/Makefile index 2887ba2d13..1ba18503e6 100644 --- a/board/zyxel/nsa325/Makefile +++ b/board/zyxel/nsa325/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015-2023 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/zyxel/nsa325/kwbimage.cfg b/board/zyxel/nsa325/kwbimage.cfg index a497300873..7d3c61b881 100644 --- a/board/zyxel/nsa325/kwbimage.cfg +++ b/board/zyxel/nsa325/kwbimage.cfg @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015-2023 Tony Dinh <mibodhi(a)gmail.com> # diff --git a/board/zyxel/nsa325/nsa325.c b/board/zyxel/nsa325/nsa325.c index f5f63ee5d3..60724bd73d 100644 --- a/board/zyxel/nsa325/nsa325.c +++ b/board/zyxel/nsa325/nsa325.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2023 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/boot/Makefile b/boot/Makefile index ad608598d2..36cb77f9ea 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2004-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/boot/boot_fit.c b/boot/boot_fit.c index 9d39412656..b8f339bb7c 100644 --- a/boot/boot_fit.c +++ b/boot/boot_fit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Texas Instruments, <www.ti.com> diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 44ae98a926..7a5e0169a9 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/boot/bootflow.c b/boot/bootflow.c index e03932e65a..4731671e24 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/boot/bootflow_internal.h b/boot/bootflow_internal.h index 38cf02a55b..5210ca765a 100644 --- a/boot/bootflow_internal.h +++ b/boot/bootflow_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal header file for bootflow * diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c index 7c1abe5772..808f341568 100644 --- a/boot/bootflow_menu.c +++ b/boot/bootflow_menu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Provide a menu of available bootflows and related options * diff --git a/boot/bootm.c b/boot/bootm.c index 8f96a80d42..5fb1fcb44e 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/boot/bootm_os.c b/boot/bootm_os.c index 9c035b5be8..3642375582 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index 1d157d54db..e5ccee5a93 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index 20e0b1e89c..24026aae63 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for ChromiumOS * diff --git a/boot/bootmeth_cros.h b/boot/bootmeth_cros.h index 8e3038571d..0088b2e635 100644 --- a/boot/bootmeth_cros.h +++ b/boot/bootmeth_cros.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Structures used by the ChromiumOS bootmeth * diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index ae936c8daa..b7ec6060ae 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for distro boot via EFI * diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index e9d973429f..75a432ab79 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for EFI boot manager * diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index aa2a4591eb..6d60f08c7d 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for extlinux boot from a block device * diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index 8d489a11aa..c449bf3ed1 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for extlinux boot using PXE (network boot) * diff --git a/boot/bootmeth_qfw.c b/boot/bootmeth_qfw.c index 8ebbc3ebcd..9077296b0a 100644 --- a/boot/bootmeth_qfw.c +++ b/boot/bootmeth_qfw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for QEMU qfw * diff --git a/boot/bootmeth_sandbox.c b/boot/bootmeth_sandbox.c index aabc57e635..2121d49bcd 100644 --- a/boot/bootmeth_sandbox.c +++ b/boot/bootmeth_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for sandbox testing * diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 345114dabf..b09d11b10f 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootmethod for booting via a U-Boot script * diff --git a/boot/bootretry.c b/boot/bootretry.c index 8d850df9d4..e15a9c3c47 100644 --- a/boot/bootretry.c +++ b/boot/bootretry.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 81555d341e..16333cbb2d 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Uclass implementation for standard boot * diff --git a/boot/cedit.c b/boot/cedit.c index 8c654dba6d..5120f1d3e8 100644 --- a/boot/cedit.c +++ b/boot/cedit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implementation of configuration editor * diff --git a/boot/common_fit.c b/boot/common_fit.c index cde2dc45e9..805941d40d 100644 --- a/boot/common_fit.c +++ b/boot/common_fit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/boot/expo.c b/boot/expo.c index 139d684f8e..5786eeccd5 100644 --- a/boot/expo.c +++ b/boot/expo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implementation of a expo, a collection of scenes providing menu options * diff --git a/boot/expo_build.c b/boot/expo_build.c index 04d88a2c30..41d4082fea 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Building an expo from an FDT description * diff --git a/boot/fdt_region.c b/boot/fdt_region.c index 295ea08ac9..01a694cabf 100644 --- a/boot/fdt_region.c +++ b/boot/fdt_region.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2013 Google, Inc diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c index 069ced75a7..cccf70fff1 100644 --- a/boot/fdt_simplefb.c +++ b/boot/fdt_simplefb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simplefb device tree support * diff --git a/boot/fdt_support.c b/boot/fdt_support.c index 5e49078f8c..9492702762 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com diff --git a/boot/image-android-dt.c b/boot/image-android-dt.c index fb014190d4..f7c31e5b67 100644 --- a/boot/image-android-dt.c +++ b/boot/image-android-dt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Linaro Ltd. * Sam Protsenko <semen.protsenko(a)linaro.org> diff --git a/boot/image-android.c b/boot/image-android.c index 88e40bc7ec..68ee6c387e 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> */ diff --git a/boot/image-board.c b/boot/image-board.c index d500da1b4b..fb6dc1a038 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Image code used by boards (and not host tools) * diff --git a/boot/image-cipher.c b/boot/image-cipher.c index b906148939..b05e2781c8 100644 --- a/boot/image-cipher.c +++ b/boot/image-cipher.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Softathome */ diff --git a/boot/image-fdt.c b/boot/image-fdt.c index f10200f647..25ddfa7ae3 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. * diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c index 12369896fe..a194a4e653 100644 --- a/boot/image-fit-sig.c +++ b/boot/image-fit-sig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/boot/image-fit.c b/boot/image-fit.c index 3cc556b727..a59c65c540 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. * diff --git a/boot/image-host.c b/boot/image-host.c index 20a9521948..6ed3810d32 100644 --- a/boot/image-host.c +++ b/boot/image-host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Image code used by host tools (and not boards) * diff --git a/boot/image-pre-load.c b/boot/image-pre-load.c index b504ab42a5..bed9f13953 100644 --- a/boot/image-pre-load.c +++ b/boot/image-pre-load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/boot/image-sig.c b/boot/image-sig.c index b5692d58b2..7141156e3f 100644 --- a/boot/image-sig.c +++ b/boot/image-sig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/boot/image.c b/boot/image.c index 88b67bc3a1..d0fe43e27e 100644 --- a/boot/image.c +++ b/boot/image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index a92bb896c6..801ed11467 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. diff --git a/boot/scene.c b/boot/scene.c index d4dfb49ada..caa1e23671 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implementation of a scene, a collection of text/image/menu items in an expo * diff --git a/boot/scene_internal.h b/boot/scene_internal.h index e72202c982..a03d8ca72a 100644 --- a/boot/scene_internal.h +++ b/boot/scene_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal header file for scenes * diff --git a/boot/scene_menu.c b/boot/scene_menu.c index 63994165ef..7ee873b17a 100644 --- a/boot/scene_menu.c +++ b/boot/scene_menu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implementation of a menu in a scene * diff --git a/boot/scene_textline.c b/boot/scene_textline.c index 6ea072a1c2..a8dc2b591f 100644 --- a/boot/scene_textline.c +++ b/boot/scene_textline.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implementation of a menu in a scene * diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 12682abd39..ad6c878ca6 100644 --- a/boot/vbe_simple.c +++ b/boot/vbe_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Verified Boot for Embedded (VBE) 'simple' method * diff --git a/cmd/Makefile b/cmd/Makefile index 44db5f2286..f4002ddece 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2004-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/abootimg.c b/cmd/abootimg.c index 2653b555b1..9b4c6d46eb 100644 --- a/cmd/abootimg.c +++ b/cmd/abootimg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 * Sam Protsenko <joe.skb7(a)gmail.com> diff --git a/cmd/acpi.c b/cmd/acpi.c index 7e397d1a74..26898e76fa 100644 --- a/cmd/acpi.c +++ b/cmd/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/adc.c b/cmd/adc.c index 4cb18b66d4..5c31268456 100644 --- a/cmd/adc.c +++ b/cmd/adc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/cmd/addrmap.c b/cmd/addrmap.c index bd23549f3a..be12c106a9 100644 --- a/cmd/addrmap.c +++ b/cmd/addrmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/cmd/adtimg.c b/cmd/adtimg.c index f4b5cbf35b..11fc1e7ed3 100644 --- a/cmd/adtimg.c +++ b/cmd/adtimg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Linaro Ltd. * Sam Protsenko <semen.protsenko(a)linaro.org> diff --git a/cmd/aes.c b/cmd/aes.c index 1264675aa0..0d37b657ee 100644 --- a/cmd/aes.c +++ b/cmd/aes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> * diff --git a/cmd/arm/Makefile b/cmd/arm/Makefile index 94367dcb45..949325793a 100644 --- a/cmd/arm/Makefile +++ b/cmd/arm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_ARM64 obj-$(CONFIG_CMD_EXCEPTION) += exception64.o diff --git a/cmd/arm/exception.c b/cmd/arm/exception.c index 522f6dff53..f92ba4507e 100644 --- a/cmd/arm/exception.c +++ b/cmd/arm/exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'exception' command can be used for testing exception handling. * diff --git a/cmd/arm/exception64.c b/cmd/arm/exception64.c index 589a23115b..f017683f50 100644 --- a/cmd/arm/exception64.c +++ b/cmd/arm/exception64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'exception' command can be used for testing exception handling. * diff --git a/cmd/armffa.c b/cmd/armffa.c index 9585150b96..995d5159e1 100644 --- a/cmd/armffa.c +++ b/cmd/armffa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/cmd/armflash.c b/cmd/armflash.c index d1466f73aa..2b6a08ef63 100644 --- a/cmd/armflash.c +++ b/cmd/armflash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Linus Walleij, Linaro diff --git a/cmd/avb.c b/cmd/avb.c index 783f51b816..2f62540fd4 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -2,7 +2,7 @@ /* * (C) Copyright 2018, Linaro Limited * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <avb_verify.h> diff --git a/cmd/axi.c b/cmd/axi.c index 5620891db2..0ba6684850 100644 --- a/cmd/axi.c +++ b/cmd/axi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc @@ -6,7 +6,7 @@ * (C) Copyright 2017, 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/cmd/bcb.c b/cmd/bcb.c index 02d0c70d87..ab318d59fb 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Eugeniu Rosca <rosca.eugeniu(a)gmail.com> * diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 1fe13ca13a..8d2590b0f1 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Implements the 'bd' command to show board information * diff --git a/cmd/bind.c b/cmd/bind.c index 4d1b7885e6..17862aeec7 100644 --- a/cmd/bind.c +++ b/cmd/bind.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 JJ Hiblot <jjhiblot(a)ti.com> */ diff --git a/cmd/binop.c b/cmd/binop.c index 592e914690..81bcdb26cc 100644 --- a/cmd/binop.c +++ b/cmd/binop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <command.h> diff --git a/cmd/blk_common.c b/cmd/blk_common.c index 02ac92837b..d5b722c616 100644 --- a/cmd/blk_common.c +++ b/cmd/blk_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Handling of common block commands * diff --git a/cmd/blkcache.c b/cmd/blkcache.c index 1456654df6..d8c67d607d 100644 --- a/cmd/blkcache.c +++ b/cmd/blkcache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Nelson Integration, LLC 2016 * Author: Eric Nelson<eric(a)nelint.com> diff --git a/cmd/blkmap.c b/cmd/blkmap.c index ef74ebc003..3d4fa4ec85 100644 --- a/cmd/blkmap.c +++ b/cmd/blkmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Addiva Elektronik * Author: Tobias Waldekranz <tobias(a)waldekranz.com> diff --git a/cmd/blob.c b/cmd/blob.c index 7c77c410d5..566a750c33 100644 --- a/cmd/blob.c +++ b/cmd/blob.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Command for encapsulating/decapsulating blob of memory. diff --git a/cmd/bloblist.c b/cmd/bloblist.c index 26548ecf84..a4c204ac63 100644 --- a/cmd/bloblist.c +++ b/cmd/bloblist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Command-line access to bloblist features * diff --git a/cmd/bmp.c b/cmd/bmp.c index 8f43a40daf..d1671cc334 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Detlev Zundel, DENX Software Engineering, dzu(a)denx.de. diff --git a/cmd/boot.c b/cmd/boot.c index 14839c1ced..9829370fee 100644 --- a/cmd/boot.c +++ b/cmd/boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 30ce5dba30..d6b6bc3bfc 100644 --- a/cmd/bootcount.c +++ b/cmd/bootcount.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <command.h> diff --git a/cmd/bootdev.c b/cmd/bootdev.c index 471189cda4..1dbdbbd0e8 100644 --- a/cmd/bootdev.c +++ b/cmd/bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 'bootdev' command * diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 20e5c94a33..40844afadc 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application loader * diff --git a/cmd/bootflow.c b/cmd/bootflow.c index ad39ebe437..a15b91d85c 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 'bootflow' command * diff --git a/cmd/booti.c b/cmd/booti.c index 1d531bdd06..baea03ef41 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/bootm.c b/cmd/bootm.c index 3e504ccfe8..7ec5be93cf 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 987b16889f..2f8a7abc7d 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011-2013 Pali Rohár <pali(a)kernel.org> */ diff --git a/cmd/bootmeth.c b/cmd/bootmeth.c index f5b01343c4..a85e83c6af 100644 --- a/cmd/bootmeth.c +++ b/cmd/bootmeth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 'bootmeth' command * diff --git a/cmd/bootstage.c b/cmd/bootstage.c index 77a4bc66ff..0187382f20 100644 --- a/cmd/bootstage.c +++ b/cmd/bootstage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, Google Inc. All rights reserved. */ diff --git a/cmd/bootz.c b/cmd/bootz.c index 742889f21d..90967004d7 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/broadcom/Makefile b/cmd/broadcom/Makefile index 62268d98d0..6639313ed5 100644 --- a/cmd/broadcom/Makefile +++ b/cmd/broadcom/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2020 Broadcom obj-y += chimp_boot.o diff --git a/cmd/broadcom/chimp_boot.c b/cmd/broadcom/chimp_boot.c index 16f2b612c4..38642af0ca 100644 --- a/cmd/broadcom/chimp_boot.c +++ b/cmd/broadcom/chimp_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Broadcom */ diff --git a/cmd/broadcom/chimp_handshake.c b/cmd/broadcom/chimp_handshake.c index a90a73a6d7..bae1caab37 100644 --- a/cmd/broadcom/chimp_handshake.c +++ b/cmd/broadcom/chimp_handshake.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Broadcom */ diff --git a/cmd/broadcom/nitro_image_load.c b/cmd/broadcom/nitro_image_load.c index 93b5cb4ceb..b7717ac7ef 100644 --- a/cmd/broadcom/nitro_image_load.c +++ b/cmd/broadcom/nitro_image_load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Broadcom */ diff --git a/cmd/btrfs.c b/cmd/btrfs.c index 98daea99e9..8925c5b63c 100644 --- a/cmd/btrfs.c +++ b/cmd/btrfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 2017 by Marek Behún <kabel(a)kernel.org> */ diff --git a/cmd/cache.c b/cmd/cache.c index b68d45b98b..252980f27e 100644 --- a/cmd/cache.c +++ b/cmd/cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/cat.c b/cmd/cat.c index 18aa6ca7aa..01c6ee04bd 100644 --- a/cmd/cat.c +++ b/cmd/cat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 * Roger Knecht <rknecht(a)pm.de> diff --git a/cmd/cbfs.c b/cmd/cbfs.c index 8a61f2c26f..d59c59ed4b 100644 --- a/cmd/cbfs.c +++ b/cmd/cbfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. */ diff --git a/cmd/cedit.c b/cmd/cedit.c index 6352e6369d..1ac0a81c52 100644 --- a/cmd/cedit.c +++ b/cmd/cedit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 'cedit' command * diff --git a/cmd/clk.c b/cmd/clk.c index c7c379d7a6..aec2f0ca53 100644 --- a/cmd/clk.c +++ b/cmd/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Xilinx, Inc. */ diff --git a/cmd/clone.c b/cmd/clone.c index a906207757..f07da25235 100644 --- a/cmd/clone.c +++ b/cmd/clone.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 John Chau <john(a)harmon.hk> * diff --git a/cmd/cls.c b/cmd/cls.c index 1125a3f81b..b3a1a315e6 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * DENX Software Engineering, Anatolij Gustschin <agust(a)denx.de> diff --git a/cmd/config.c b/cmd/config.c index cf30841a35..6e833d6f3b 100644 --- a/cmd/config.c +++ b/cmd/config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/cmd/conitrace.c b/cmd/conitrace.c index 9a1bc35184..fced0cb6b4 100644 --- a/cmd/conitrace.c +++ b/cmd/conitrace.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'conitrace' command prints the codes received from the console input as * hexadecimal numbers. diff --git a/cmd/console.c b/cmd/console.c index 58c2cf1c89..7ea5f8f7b5 100644 --- a/cmd/console.c +++ b/cmd/console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/cpu.c b/cmd/cpu.c index 245a82fa3e..ed23744659 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/cramfs.c b/cmd/cramfs.c index 57e2afa247..a28a8718cd 100644 --- a/cmd/cramfs.c +++ b/cmd/cramfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * based on: cmd_jffs2.c diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index 90921cecf6..5d7cb5e6a2 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver * diff --git a/cmd/cyclic.c b/cmd/cyclic.c index ad7fc3b975..6a6e14575a 100644 --- a/cmd/cyclic.c +++ b/cmd/cyclic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A general-purpose cyclic execution infrastructure, to allow "small" * (run-time wise) functions to be executed at a specified frequency. diff --git a/cmd/date.c b/cmd/date.c index 4f98b470ca..c1993caae1 100644 --- a/cmd/date.c +++ b/cmd/date.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/demo.c b/cmd/demo.c index ebd5a241c3..de890eab78 100644 --- a/cmd/demo.c +++ b/cmd/demo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/cmd/dfu.c b/cmd/dfu.c index d7bfb535dc..ba6f6a71c8 100644 --- a/cmd/dfu.c +++ b/cmd/dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_dfu.c -- dfu command * diff --git a/cmd/diag.c b/cmd/diag.c index f51536dbfa..c705498e16 100644 --- a/cmd/diag.c +++ b/cmd/diag.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/disk.c b/cmd/disk.c index 3d7bc2f601..a65962aeee 100644 --- a/cmd/disk.c +++ b/cmd/disk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2011 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/dm.c b/cmd/dm.c index fb605c2da1..669b661d75 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/cmd/echo.c b/cmd/echo.c index fda844ee9d..a6b42090f2 100644 --- a/cmd/echo.c +++ b/cmd/echo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/eeprom.c b/cmd/eeprom.c index 0b6ca8c505..ae175cc27b 100644 --- a/cmd/eeprom.c +++ b/cmd/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000, 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/efi.c b/cmd/efi.c index 6cd5361aca..f8feae8ea6 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/efi_common.c b/cmd/efi_common.c index f4056096cd..5be205e6b5 100644 --- a/cmd/efi_common.c +++ b/cmd/efi_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common code for EFI commands * diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index e6e8a0a488..01c30fedee 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Menu-driven UEFI Variable maintenance * diff --git a/cmd/eficonfig_sbkey.c b/cmd/eficonfig_sbkey.c index caca27495e..a3e37ab417 100644 --- a/cmd/eficonfig_sbkey.c +++ b/cmd/eficonfig_sbkey.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Menu-driven UEFI Secure Boot Key Maintenance * diff --git a/cmd/efidebug.c b/cmd/efidebug.c index 201531ac19..ab39855dc3 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UEFI Shell-like command * diff --git a/cmd/erofs.c b/cmd/erofs.c index add80b8b59..db2d807e6b 100644 --- a/cmd/erofs.c +++ b/cmd/erofs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Huang Jianan <jnhuang95(a)gmail.com> * diff --git a/cmd/ethsw.c b/cmd/ethsw.c index f8b8a798bf..cdd2dd42e8 100644 --- a/cmd/ethsw.c +++ b/cmd/ethsw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/cmd/event.c b/cmd/event.c index f6cdb55fc9..f5fb4b131c 100644 --- a/cmd/event.c +++ b/cmd/event.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Command-line access to events * diff --git a/cmd/exit.c b/cmd/exit.c index 7bf241ec73..223dcd83e4 100644 --- a/cmd/exit.c +++ b/cmd/exit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/ext2.c b/cmd/ext2.c index 57a99516a6..cca465cdb1 100644 --- a/cmd/ext2.c +++ b/cmd/ext2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/cmd/ext4.c b/cmd/ext4.c index 4791b69fd9..66b3dc6f33 100644 --- a/cmd/ext4.c +++ b/cmd/ext4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/cmd/extension_board.c b/cmd/extension_board.c index 2b672d888c..fd781f1e92 100644 --- a/cmd/extension_board.c +++ b/cmd/extension_board.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 * Köry Maincent, Bootlin, <kory.maincent(a)bootlin.com> diff --git a/cmd/fastboot.c b/cmd/fastboot.c index c3c19231c9..59c5e0a696 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008 - 2009 Windriver, <www.windriver.com> * Author: Tom Rix <Tom.Rix(a)windriver.com> diff --git a/cmd/fat.c b/cmd/fat.c index 69ce1fa530..9e1f5a5c82 100644 --- a/cmd/fat.c +++ b/cmd/fat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Richard Jones, rjones(a)nexus-tech.net diff --git a/cmd/fdt.c b/cmd/fdt.c index 331564c13b..6c80e13a6e 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com diff --git a/cmd/flash.c b/cmd/flash.c index f4f85ecc7a..395c8c4cf6 100644 --- a/cmd/flash.c +++ b/cmd/flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/font.c b/cmd/font.c index cb39c88063..f7d2a2576a 100644 --- a/cmd/font.c +++ b/cmd/font.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * video commands * diff --git a/cmd/fpga.c b/cmd/fpga.c index 8c64e957db..fe4c16c425 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000, 2001 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/cmd/fpgad.c b/cmd/fpgad.c index dfc6220b5e..3008868c3b 100644 --- a/cmd/fpgad.c +++ b/cmd/fpgad.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/cmd/fs_uuid.c b/cmd/fs_uuid.c index 5dc94aa640..333e16bbca 100644 --- a/cmd/fs_uuid.c +++ b/cmd/fs_uuid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_fs_uuid.c -- fsuuid command * diff --git a/cmd/fuse.c b/cmd/fuse.c index 0676bb7a81..2dc294f786 100644 --- a/cmd/fuse.c +++ b/cmd/fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009-2013 ADVANSEE * Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> diff --git a/cmd/gettime.c b/cmd/gettime.c index 2e74e02b49..44e7f78308 100644 --- a/cmd/gettime.c +++ b/cmd/gettime.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. * diff --git a/cmd/gpt.c b/cmd/gpt.c index d7e96529a6..519c14bfb3 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_gpt.c -- GPT (GUID Partition Table) handling command * diff --git a/cmd/hash.c b/cmd/hash.c index e163cd6774..641e2c502b 100644 --- a/cmd/hash.c +++ b/cmd/hash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/cmd/help.c b/cmd/help.c index 9f8393eefd..28fe577558 100644 --- a/cmd/help.c +++ b/cmd/help.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/history.c b/cmd/history.c index b6bf4670b1..288dbfaf6d 100644 --- a/cmd/history.c +++ b/cmd/history.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/host.c b/cmd/host.c index c33c2a9787..e7e4c471b5 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, Google Inc. */ diff --git a/cmd/i2c.c b/cmd/i2c.c index 80831561c6..dda66ca441 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Sergey Kubushyn, himself, ksi(a)koi8.net diff --git a/cmd/ide.c b/cmd/ide.c index ddc87d3a0b..99d881afd1 100644 --- a/cmd/ide.c +++ b/cmd/ide.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2011 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/io.c b/cmd/io.c index 2de1111998..adca6054f1 100644 --- a/cmd/io.c +++ b/cmd/io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/cmd/iotrace.c b/cmd/iotrace.c index f28359e287..87674565d5 100644 --- a/cmd/iotrace.c +++ b/cmd/iotrace.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/cmd/irq.c b/cmd/irq.c index 1d3e28cb3c..9448563241 100644 --- a/cmd/irq.c +++ b/cmd/irq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008 Freescale Semiconductor, Inc. */ diff --git a/cmd/itest.c b/cmd/itest.c index 74414cbdc4..7520718b62 100644 --- a/cmd/itest.c +++ b/cmd/itest.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Tait Electronics Limited, Christchurch, New Zealand diff --git a/cmd/jffs2.c b/cmd/jffs2.c index e00fcc2022..9a13c9f462 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/kaslrseed.c b/cmd/kaslrseed.c index 9acb8e1638..eaff1069f2 100644 --- a/cmd/kaslrseed.c +++ b/cmd/kaslrseed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'kaslrseed' command takes bytes from the hardware random number * generator and uses them to set the kaslr-seed value in the chosen node. diff --git a/cmd/led.c b/cmd/led.c index 48a02baf50..398523b1cf 100644 --- a/cmd/led.c +++ b/cmd/led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/legacy-mtd-utils.c b/cmd/legacy-mtd-utils.c index 5903a90fe5..e5ee09bf45 100644 --- a/cmd/legacy-mtd-utils.c +++ b/cmd/legacy-mtd-utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <jffs2/jffs2.h> diff --git a/cmd/legacy-mtd-utils.h b/cmd/legacy-mtd-utils.h index ac441d5558..913d1fe9ff 100644 --- a/cmd/legacy-mtd-utils.h +++ b/cmd/legacy-mtd-utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __LEGACY_MTD_UTILS_H #define __LEGACY_MTD_UTILS_H diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c index 5256255f05..585e87f926 100644 --- a/cmd/legacy_led.c +++ b/cmd/legacy_led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Jason Kridner <jkridner(a)beagleboard.org> diff --git a/cmd/license.c b/cmd/license.c index 15411b5a92..7380d1c337 100644 --- a/cmd/license.c +++ b/cmd/license.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 by OpenMoko, Inc. * Author: Harald Welte <laforge(a)openmoko.org> diff --git a/cmd/load.c b/cmd/load.c index 2715cf5957..d8bf1dd56c 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/log.c b/cmd/log.c index c9a23e4ae0..2d79fc6229 100644 --- a/cmd/log.c +++ b/cmd/log.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/lsblk.c b/cmd/lsblk.c index d214dafc3b..37d2faff24 100644 --- a/cmd/lsblk.c +++ b/cmd/lsblk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 * Niel Fourie, DENX Software Engineering, lusus(a)denx.de. diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c index 81924da461..0b2fc22e70 100644 --- a/cmd/lzmadec.c +++ b/cmd/lzmadec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Patrice Bouchand <pbfwdlist_gmail_com> * lzma uncompress command in Uboot diff --git a/cmd/mbr.c b/cmd/mbr.c index ec99b66283..49b3c26701 100644 --- a/cmd/mbr.c +++ b/cmd/mbr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_mbr.c -- MBR (Master Boot Record) handling command * diff --git a/cmd/md5sum.c b/cmd/md5sum.c index 0f0e1d3dd6..379cabdcc9 100644 --- a/cmd/md5sum.c +++ b/cmd/md5sum.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/cmd/mdio.c b/cmd/mdio.c index 3c74326161..271193ce5b 100644 --- a/cmd/mdio.c +++ b/cmd/mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 Freescale Semiconductor, Inc * Andy Fleming diff --git a/cmd/mem.c b/cmd/mem.c index 66c2d36a14..4893e325ad 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/meson/Makefile b/cmd/meson/Makefile index ee26c175cf..9fe4bc67af 100644 --- a/cmd/meson/Makefile +++ b/cmd/meson/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022, SberDevices. All rights reserved. diff --git a/cmd/meson/sm.c b/cmd/meson/sm.c index de9a242e17..a9677a14b5 100644 --- a/cmd/meson/sm.c +++ b/cmd/meson/sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Beniamino Galvani * diff --git a/cmd/mii.c b/cmd/mii.c index fab420ee29..2bcc61d2af 100644 --- a/cmd/mii.c +++ b/cmd/mii.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com diff --git a/cmd/misc.c b/cmd/misc.c index ec32b41ed1..4093745334 100644 --- a/cmd/misc.c +++ b/cmd/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Wind River Systems, Inc. * diff --git a/cmd/mmc.c b/cmd/mmc.c index c6bd81cebb..73efb5e986 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Kyle Harris, kharris(a)nexus-tech.net diff --git a/cmd/mp.c b/cmd/mp.c index 1b4373f258..ae60b0a1d4 100644 --- a/cmd/mp.c +++ b/cmd/mp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2009 Freescale Semiconductor, Inc. */ diff --git a/cmd/mtd.c b/cmd/mtd.c index e63c011e79..77171ef341 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mtd.c * diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index b31db73ebf..a529b02840 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/net.c b/cmd/net.c index d407d8320a..462fbb2f4a 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/nvedit.c b/cmd/nvedit.c index daf1ad37f9..ff4e697701 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2013 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c index 7a30b5cc8f..8416997280 100644 --- a/cmd/nvedit_efi.c +++ b/cmd/nvedit_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Integrate UEFI variables to u-boot env interface * diff --git a/cmd/nvme.c b/cmd/nvme.c index 09d5f438fb..ae0f09fe40 100644 --- a/cmd/nvme.c +++ b/cmd/nvme.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/cmd/optee_rpmb.c b/cmd/optee_rpmb.c index e0e44bbed0..1bc291cf2e 100644 --- a/cmd/optee_rpmb.c +++ b/cmd/optee_rpmb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/cmd/osd.c b/cmd/osd.c index 210bc5d4c2..754680bdf3 100644 --- a/cmd/osd.c +++ b/cmd/osd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/cmd/panic.c b/cmd/panic.c index f13b3f094f..fade1cc1b8 100644 --- a/cmd/panic.c +++ b/cmd/panic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH */ diff --git a/cmd/part.c b/cmd/part.c index 0ce190005d..e6380e2915 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. * diff --git a/cmd/pause.c b/cmd/pause.c index c97833c0d7..9393b7d9be 100644 --- a/cmd/pause.c +++ b/cmd/pause.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 * Samuel Dionne-Riel <samuel(a)dionne-riel.com> diff --git a/cmd/pcap.c b/cmd/pcap.c index a0149203fa..62688f157f 100644 --- a/cmd/pcap.c +++ b/cmd/pcap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Ramon Fried <rfried.dev(a)gmail.com> diff --git a/cmd/pci.c b/cmd/pci.c index d89e71c16a..26d05e488f 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel(a)sysgo.de> diff --git a/cmd/pci_mps.c b/cmd/pci_mps.c index 98161da93a..d22f0dcfd8 100644 --- a/cmd/pci_mps.c +++ b/cmd/pci_mps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 Microsoft Corporation <www.microsoft.com> * Stephen Carlson <stcarlso(a)linux.microsoft.com> diff --git a/cmd/pinmux.c b/cmd/pinmux.c index f17cf4110d..0c2c42a315 100644 --- a/cmd/pinmux.c +++ b/cmd/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/cmd/pmic.c b/cmd/pmic.c index 49a405fa29..c1195db2fe 100644 --- a/cmd/pmic.c +++ b/cmd/pmic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/cmd/printf.c b/cmd/printf.c index 0c6887e0d6..b430d48492 100644 --- a/cmd/printf.c +++ b/cmd/printf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Weidmüller Interface GmbH & Co. KG * Roland Gaudig <roland.gaudig(a)weidmueller.com> diff --git a/cmd/printf.h b/cmd/printf.h index dcaff6d097..d685cba363 100644 --- a/cmd/printf.h +++ b/cmd/printf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PRINTF_H #define __PRINTF_H diff --git a/cmd/pstore.c b/cmd/pstore.c index cd6f6feb2f..d271fae210 100644 --- a/cmd/pstore.c +++ b/cmd/pstore.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright © 2019 Collabora Ltd */ diff --git a/cmd/pvblock.c b/cmd/pvblock.c index 1b604c3737..7ff9a1594a 100644 --- a/cmd/pvblock.c +++ b/cmd/pvblock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 EPAM Systems Inc. * diff --git a/cmd/pwm.c b/cmd/pwm.c index 7e82955239..5c4a143e4d 100644 --- a/cmd/pwm.c +++ b/cmd/pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Control PWM channels * diff --git a/cmd/pxe.c b/cmd/pxe.c index 704589702f..0ff011993a 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. diff --git a/cmd/qfw.c b/cmd/qfw.c index d6ecfa60d5..67f6dd40f7 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Miao Yan <yanmiaobest(a)gmail.com> */ diff --git a/cmd/reginfo.c b/cmd/reginfo.c index c8a04b1754..ae1bf3f672 100644 --- a/cmd/reginfo.c +++ b/cmd/reginfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Subodh Nijsure, SkyStream Networks, snijsure(a)skystream.com diff --git a/cmd/regulator.c b/cmd/regulator.c index 635a9add58..6edbfeebf9 100644 --- a/cmd/regulator.c +++ b/cmd/regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/cmd/reiser.c b/cmd/reiser.c index 707167fcd5..140a3493a9 100644 --- a/cmd/reiser.c +++ b/cmd/reiser.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 - 2004 * Sysgo Real-Time Solutions, AG <www.elinos.com> diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c index ca3b436242..b91a2b6da6 100644 --- a/cmd/remoteproc.c +++ b/cmd/remoteproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ diff --git a/cmd/riscv/Makefile b/cmd/riscv/Makefile index 1e6ac364e3..7b622f5c80 100644 --- a/cmd/riscv/Makefile +++ b/cmd/riscv/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CMD_EXCEPTION) += exception.o obj-$(CONFIG_CMD_SBI) += sbi.o diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index f38f454a0b..5b3115c51c 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'exception' command can be used for testing exception handling. * diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c index 940d9bc168..2b3fd5932e 100644 --- a/cmd/riscv/sbi.c +++ b/cmd/riscv/sbi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'sbi' command displays information about the SBI implementation. * diff --git a/cmd/rng.c b/cmd/rng.c index 52f722c7af..6f7af9a7b6 100644 --- a/cmd/rng.c +++ b/cmd/rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'rng' command prints bytes from the hardware random number generator. * diff --git a/cmd/rockusb.c b/cmd/rockusb.c index 07088564a1..672f7fe265 100644 --- a/cmd/rockusb.c +++ b/cmd/rockusb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Eddie Cai <eddie.cai.linux(a)gmail.com> */ diff --git a/cmd/rtc.c b/cmd/rtc.c index a344cfa76b..b4b74ba125 100644 --- a/cmd/rtc.c +++ b/cmd/rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <command.h> diff --git a/cmd/sandbox/Makefile b/cmd/sandbox/Makefile index 24df023ece..6697c67382 100644 --- a/cmd/sandbox/Makefile +++ b/cmd/sandbox/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CMD_EXCEPTION) += exception.o diff --git a/cmd/sandbox/exception.c b/cmd/sandbox/exception.c index c082401ce6..1827410d9c 100644 --- a/cmd/sandbox/exception.c +++ b/cmd/sandbox/exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'exception' command can be used for testing exception handling. * diff --git a/cmd/sata.c b/cmd/sata.c index 9c9fe111d1..038c8d5c7b 100644 --- a/cmd/sata.c +++ b/cmd/sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2000-2005, DENX Software Engineering * Wolfgang Denk <wd(a)denx.de> diff --git a/cmd/sb.c b/cmd/sb.c index 0d55818e3c..d3b80b052c 100644 --- a/cmd/sb.c +++ b/cmd/sb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, Google Inc. * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/scp03.c b/cmd/scp03.c index 2b8d5aecf3..543d7cc5aa 100644 --- a/cmd/scp03.c +++ b/cmd/scp03.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021, Foundries.IO * diff --git a/cmd/scsi.c b/cmd/scsi.c index 4549995ba7..fb40abfd53 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/cmd/seama.c b/cmd/seama.c index 3aafb43c48..9a9cfe86fd 100644 --- a/cmd/seama.c +++ b/cmd/seama.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Linus Walleij <linus.walleij(a)linaro.org> * Support for the "SEAttle iMAge" SEAMA NAND image format diff --git a/cmd/setexpr.c b/cmd/setexpr.c index 233471f6cb..386edffae3 100644 --- a/cmd/setexpr.c +++ b/cmd/setexpr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008 Freescale Semiconductor, Inc. * Copyright 2013 Wolfgang Denk <wd(a)denx.de> diff --git a/cmd/sf.c b/cmd/sf.c index 30b2bd5ef6..35f4a321d8 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Command for accessing SPI flash. * diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c index bcc665a5a6..51762c637d 100644 --- a/cmd/sha1sum.c +++ b/cmd/sha1sum.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/cmd/sleep.c b/cmd/sleep.c index c741b4aa02..972392bec7 100644 --- a/cmd/sleep.c +++ b/cmd/sleep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/smccc.c b/cmd/smccc.c index fb80431ad1..9cef6ea9ed 100644 --- a/cmd/smccc.c +++ b/cmd/smccc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 * Michalis Pappas <mpappas(a)fastmail.fm> diff --git a/cmd/sound.c b/cmd/sound.c index 0b7f959971..8b984bdb6c 100644 --- a/cmd/sound.c +++ b/cmd/sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/cmd/source.c b/cmd/source.c index 0ba9736b1a..4c1fc148a3 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Kyle Harris, kharris(a)nexus-tech.net diff --git a/cmd/spi.c b/cmd/spi.c index f30018f33b..6d18398115 100644 --- a/cmd/spi.c +++ b/cmd/spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com diff --git a/cmd/spl.c b/cmd/spl.c index 8a2ded72be..64daa13236 100644 --- a/cmd/spl.c +++ b/cmd/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz(a)corscience.de> diff --git a/cmd/stackprot_test.c b/cmd/stackprot_test.c index f3470288fa..54aa0d0044 100644 --- a/cmd/stackprot_test.c +++ b/cmd/stackprot_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Broadcom */ diff --git a/cmd/sysboot.c b/cmd/sysboot.c index 63a7806deb..fefd4e023c 100644 --- a/cmd/sysboot.c +++ b/cmd/sysboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <command.h> diff --git a/cmd/terminal.c b/cmd/terminal.c index 9e32a4191e..2c68bfa5f8 100644 --- a/cmd/terminal.c +++ b/cmd/terminal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 OpenMoko, Inc. * Written by Harald Welte <laforge(a)openmoko.org> diff --git a/cmd/test.c b/cmd/test.c index fa7c48fb9f..738a10cee5 100644 --- a/cmd/test.c +++ b/cmd/test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/thordown.c b/cmd/thordown.c index 48e22b31d0..715dd3f246 100644 --- a/cmd/thordown.c +++ b/cmd/thordown.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_thordown.c -- USB TIZEN "THOR" Downloader gadget * diff --git a/cmd/ti/Makefile b/cmd/ti/Makefile index 87f85b2c23..e22b7b91dc 100644 --- a/cmd/ti/Makefile +++ b/cmd/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ obj-$(CONFIG_CMD_DDR3) += ddr3.o diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c index bbd406fc66..42238155c8 100644 --- a/cmd/ti/ddr3.c +++ b/cmd/ti/ddr3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EMIF: DDR3 test commands * diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c index a0492a5fde..a524041729 100644 --- a/cmd/ti/pd.c +++ b/cmd/ti/pd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Power Domain test commands * diff --git a/cmd/time.c b/cmd/time.c index db8c1892df..e4068136aa 100644 --- a/cmd/time.c +++ b/cmd/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/cmd/timer.c b/cmd/timer.c index 551be5dd54..b6906ac5be 100644 --- a/cmd/timer.c +++ b/cmd/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c index 79796394c5..d6ce330c9d 100644 --- a/cmd/tlv_eeprom.c +++ b/cmd/tlv_eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * See file CREDITS for list of people who contributed to this * project. diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c index a7dc23d85d..1917c99958 100644 --- a/cmd/tpm-common.c +++ b/cmd/tpm-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors. */ diff --git a/cmd/tpm-user-utils.h b/cmd/tpm-user-utils.h index dfa11353e1..e326a013df 100644 --- a/cmd/tpm-user-utils.h +++ b/cmd/tpm-user-utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c index 1b1efcd204..7b46cf2586 100644 --- a/cmd/tpm-v1.c +++ b/cmd/tpm-v1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors. */ diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c index 7e479b9dfe..6f8774873c 100644 --- a/cmd/tpm-v2.c +++ b/cmd/tpm-v2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Bootlin * Author: Miquel Raynal <miquel.raynal(a)bootlin.com> diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c index c7fa6e775f..65a2e0c923 100644 --- a/cmd/tpm_test.c +++ b/cmd/tpm_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/cmd/trace.c b/cmd/trace.c index 2e3ee1d3ba..52c4d1dd75 100644 --- a/cmd/trace.c +++ b/cmd/trace.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/cmd/tsi148.c b/cmd/tsi148.c index 0d849d9979..e19bad4264 100644 --- a/cmd/tsi148.c +++ b/cmd/tsi148.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Reinhard Arlt, reinhard.arlt(a)esd-electronics.com * diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 2a035bc7ae..31dac116dd 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/cmd/ufs.c b/cmd/ufs.c index 143e946370..da27e18c7d 100644 --- a/cmd/ufs.c +++ b/cmd/ufs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * ufs.c - UFS specific U-Boot commands * diff --git a/cmd/universe.c b/cmd/universe.c index fb3a32d4d5..c2169fa2f6 100644 --- a/cmd/universe.c +++ b/cmd/universe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 Stefan Roese, stefan.roese(a)esd-electronics.com */ diff --git a/cmd/unlz4.c b/cmd/unlz4.c index 5f20838e89..24c4548d7f 100644 --- a/cmd/unlz4.c +++ b/cmd/unlz4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 * FUJITSU COMPUTERTECHNOLOGIES LIMITED. All rights reserved. diff --git a/cmd/unzip.c b/cmd/unzip.c index bc6cee0604..d986a20c5d 100644 --- a/cmd/unzip.c +++ b/cmd/unzip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/usb.c b/cmd/usb.c index 23253f2223..ef74b0efd8 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c index cbdda73353..6d539e4dfe 100644 --- a/cmd/usb_gadget_sdp.c +++ b/cmd/usb_gadget_sdp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * cmd_sdp.c -- sdp command * diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index a8ddeb4946..d1ba498853 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/cmd/vbe.c b/cmd/vbe.c index 0e84b0e97a..035024f95f 100644 --- a/cmd/vbe.c +++ b/cmd/vbe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Verified Boot for Embedded (VBE) command * diff --git a/cmd/version.c b/cmd/version.c index 87e1fa4159..2551f663bc 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/video.c b/cmd/video.c index 942f81c163..90b3d84458 100644 --- a/cmd/video.c +++ b/cmd/video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * video commands * diff --git a/cmd/virtio.c b/cmd/virtio.c index 019e317e75..2ae195ee67 100644 --- a/cmd/virtio.c +++ b/cmd/virtio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/cmd/w1.c b/cmd/w1.c index 3209e65f37..29f81ff8dc 100644 --- a/cmd/w1.c +++ b/cmd/w1.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2018 * Microchip Technology, Inc. diff --git a/cmd/wdt.c b/cmd/wdt.c index b9fdf7ad15..df9738ef43 100644 --- a/cmd/wdt.c +++ b/cmd/wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog commands * diff --git a/cmd/wol.c b/cmd/wol.c index f0d6343227..c7827ae8fd 100644 --- a/cmd/wol.c +++ b/cmd/wol.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Lothar Felte, lothar.felten(a)gmail.com diff --git a/cmd/x86/Makefile b/cmd/x86/Makefile index 5f82204c87..5f7cedc7a4 100644 --- a/cmd/x86/Makefile +++ b/cmd/x86/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CMD_CBSYSINFO) += cbsysinfo.o obj-y += mtrr.o diff --git a/cmd/x86/cbsysinfo.c b/cmd/x86/cbsysinfo.c index 84822a3e32..d88d770137 100644 --- a/cmd/x86/cbsysinfo.c +++ b/cmd/x86/cbsysinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/cmd/x86/exception.c b/cmd/x86/exception.c index 82faaa913e..6a36d316e7 100644 --- a/cmd/x86/exception.c +++ b/cmd/x86/exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * The 'exception' command can be used for testing exception handling. * diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c index 82e4415b16..984510f866 100644 --- a/cmd/x86/fsp.c +++ b/cmd/x86/fsp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c index 04d092dbe7..3ee7c2bb43 100644 --- a/cmd/x86/hob.c +++ b/cmd/x86/hob.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c index 6ad7a123a4..02768e0d62 100644 --- a/cmd/x86/mtrr.c +++ b/cmd/x86/mtrr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Google, Inc */ diff --git a/cmd/ximg.c b/cmd/ximg.c index a50dd20b19..8fae8e7814 100644 --- a/cmd/ximg.c +++ b/cmd/ximg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/cmd/xxd.c b/cmd/xxd.c index 446ac1915e..dddb847611 100644 --- a/cmd/xxd.c +++ b/cmd/xxd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 * Roger Knecht <rknecht(a)pm.de> diff --git a/cmd/zfs.c b/cmd/zfs.c index 6ef1b56ab1..32a584563c 100644 --- a/cmd/zfs.c +++ b/cmd/zfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * ZFS filesystem porting to Uboot by diff --git a/cmd/zip.c b/cmd/zip.c index 08afd62b97..02d5b039e4 100644 --- a/cmd/zip.c +++ b/cmd/zip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Lei Wen <leiwen(a)marvell.com>, Marvell Inc. diff --git a/common/Makefile b/common/Makefile index cdeadf7202..33eb218719 100644 --- a/common/Makefile +++ b/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2004-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/autoboot.c b/common/autoboot.c index 5d331991c1..c4b62fa561 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/avb_verify.c b/common/avb_verify.c index 48ba8db51e..5708cd7b3a 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2018, Linaro Limited * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <avb_verify.h> diff --git a/common/bloblist.c b/common/bloblist.c index a22f6c12b0..7c8dde4bff 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later BSD-3-Clause /* * Copyright 2018 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/common/board_f.c b/common/board_f.c index d4d7d01f8f..ab1dbd5d3d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002-2006 diff --git a/common/board_info.c b/common/board_info.c index e0f2d93922..b82ee7b400 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <dm.h> diff --git a/common/board_r.c b/common/board_r.c index 52786901be..de3c7a2f60 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002-2006 diff --git a/common/bootstage.c b/common/bootstage.c index a68d883c68..bfd6281b24 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011, Google Inc. All rights reserved. */ diff --git a/common/bouncebuf.c b/common/bouncebuf.c index 934b83f7ec..8f296dd39f 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic bounce buffer implementation * diff --git a/common/cli.c b/common/cli.c index 3916a7b10a..526007cf6f 100644 --- a/common/cli.c +++ b/common/cli.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/cli_getch.c b/common/cli_getch.c index 61d4cb261b..f06e826062 100644 --- a/common/cli_getch.c +++ b/common/cli_getch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/cli_hush.c b/common/cli_hush.c index 9cda97f30e..7d5ee737d6 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sh.c -- a prototype Bourne shell grammar parser * Intended to follow the original Thompson and Ritchie diff --git a/common/cli_readline.c b/common/cli_readline.c index 06b8d46504..8402824f31 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/cli_simple.c b/common/cli_simple.c index e80ba488a5..3a6025748a 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/command.c b/common/command.c index 846e16e2ad..0ef77f493d 100644 --- a/common/command.c +++ b/common/command.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/console.c b/common/console.c index 98c3ee6ca6..bf8c55ac21 100644 --- a/common/console.c +++ b/common/console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/common/cyclic.c b/common/cyclic.c index a49bfc88f5..1dfb902ec2 100644 --- a/common/cyclic.c +++ b/common/cyclic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A general-purpose cyclic execution infrastructure, to allow "small" * (run-time wise) functions to be executed at a specified frequency. diff --git a/common/dfu.c b/common/dfu.c index 0d154e8d4c..93c66e0f11 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dfu.c -- dfu command * diff --git a/common/dlmalloc.c b/common/dlmalloc.c index de3f04225f..aff473fd05 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This code is based on a version (aka dlmalloc) of malloc/free/realloc written * by Doug Lea and released to the public domain, as explained at diff --git a/common/edid.c b/common/edid.c index 556c4e3434..00b9277dc4 100644 --- a/common/edid.c +++ b/common/edid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c index f56eebe679..3cfea03f54 100644 --- a/common/eeprom/eeprom_field.c +++ b/common/eeprom/eeprom_field.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009-2016 CompuLab, Ltd. * diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c index 5a9be1da06..2be378af90 100644 --- a/common/eeprom/eeprom_layout.c +++ b/common/eeprom/eeprom_layout.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009-2016 CompuLab, Ltd. * diff --git a/common/event.c b/common/event.c index 3080d9ed75..add5a4f219 100644 --- a/common/event.c +++ b/common/event.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Events provide a general-purpose way to react to / subscribe to changes * within U-Boot diff --git a/common/flash.c b/common/flash.c index 848f44e59d..96566aee2d 100644 --- a/common/flash.c +++ b/common/flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/hash.c b/common/hash.c index e837c56d44..98cde30450 100644 --- a/common/hash.c +++ b/common/hash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/common/hwconfig.c b/common/hwconfig.c index cac0b6348f..d8da15abba 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * An inteface for configuring a hardware via u-boot environment. * diff --git a/common/init/Makefile b/common/init/Makefile index 853b56d1e5..d3aecfd1b6 100644 --- a/common/init/Makefile +++ b/common/init/Makefile @@ -1,7 +1,7 @@ # # Copyright (c) 2015 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += board_init.o diff --git a/common/init/board_init.c b/common/init/board_init.c index ed2365daa3..4456330983 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Code shared between SPL and U-Boot proper * diff --git a/common/init/handoff.c b/common/init/handoff.c index d0be1bb17a..31d70f6322 100644 --- a/common/init/handoff.c +++ b/common/init/handoff.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Passing basic information from SPL to U-Boot proper * diff --git a/common/iomux.c b/common/iomux.c index c428f7110a..a8468936db 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj(a)denx.de. diff --git a/common/iotrace.c b/common/iotrace.c index 63d0cca3a0..78c1ae6cf0 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc. */ diff --git a/common/log.c b/common/log.c index b2de57fcb3..88d741388a 100644 --- a/common/log.c +++ b/common/log.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Logging support * diff --git a/common/log_console.c b/common/log_console.c index bb091ce21a..9a3d130a42 100644 --- a/common/log_console.c +++ b/common/log_console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Logging support * diff --git a/common/log_syslog.c b/common/log_syslog.c index 53c4def5d1..2c379f7d2f 100644 --- a/common/log_syslog.c +++ b/common/log_syslog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Log to syslog. * diff --git a/common/main.c b/common/main.c index 7c70de2e59..e3d2db07bd 100644 --- a/common/main.c +++ b/common/main.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 0a004d40e1..e336d76d57 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple malloc implementation * diff --git a/common/memsize.c b/common/memsize.c index d646df8b04..2af1ee107e 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/menu.c b/common/menu.c index b55cf7b999..178fe596f1 100644 --- a/common/menu.c +++ b/common/menu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 194c84e7e8..be5b699bac 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com. diff --git a/common/qfw.c b/common/qfw.c index 45e87d3ae2..f940aaf8e9 100644 --- a/common/qfw.c +++ b/common/qfw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Miao Yan <yanmiaobest(a)gmail.com> * (C) Copyright 2021 Asherah Connor <ashe(a)kivikakk.ee> diff --git a/common/s_record.c b/common/s_record.c index 2b7651fcff..95fa890b69 100644 --- a/common/s_record.c +++ b/common/s_record.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/scp03.c b/common/scp03.c index 09ef7b5ba3..085f630ca6 100644 --- a/common/scp03.c +++ b/common/scp03.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021, Foundries.IO * diff --git a/common/spl/Makefile b/common/spl/Makefile index 4f8eb2ec0c..78b8543e99 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 # Texas Instruments Incorporated - http://www.ti.com/ diff --git a/common/spl/spl.c b/common/spl/spl.c index 732d90d39e..c089fbd04a 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index 63825d620d..3a5f4a6a39 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 * Ventana Micro Systems Inc. diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 0eefd39a51..59e8eaee19 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH */ diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index 8a779da8fa..9db55a8712 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index af836ca15b..6ede25f714 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <env.h> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 014074f85b..c25fdbff0b 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 70d8d5942d..7a0bbe750e 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c index 127802f5cb..64536b6574 100644 --- a/common/spl/spl_imx_container.c +++ b/common/spl/spl_imx_container.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2021 NXP */ diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 51656fb961..47ff50f575 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 0b01368d9d..e5fa8623b6 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 07916bedbb..03633095b0 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz(a)corscience.de> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index f01d4df8bc..ea70f5ee2b 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 236b071828..d5145b2277 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Stefan Roese <sr(a)denx.de> */ diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c index c8774d67ec..377145c5e3 100644 --- a/common/spl/spl_nvme.c +++ b/common/spl/spl_nvme.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 * Ventana Micro Systems Inc. diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index 53a8c6de89..938d69dc25 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 * ISEE 2007 SL - Enric Balletbo i Serra <eballetbo(a)iseebcn.com> diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index 9801d38c0b..cb57401b97 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Fraunhofer AISEC, * Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S index a269904d38..56b8f46558 100644 --- a/common/spl/spl_optee.S +++ b/common/spl/spl_optee.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Rockchip Electronic Co.,Ltd */ diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 4158ed1c32..5d1087ea6b 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Xilinx, Inc. diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 32746ce9f3..5c6f4b49b8 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 9143c27bbf..f0ff00a8eb 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Toradex * Author: Stefan Agner <stefan.agner(a)toradex.com> diff --git a/common/spl/spl_semihosting.c b/common/spl/spl_semihosting.c index f7dd289286..3901167a80 100644 --- a/common/spl/spl_semihosting.c +++ b/common/spl/spl_semihosting.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 3ac4b1b509..e872d38349 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 OMICRON electronics GmbH * diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index d7ab9efd11..5979c82315 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2016 * Ladislav Michl <ladis(a)linux-mips.org> diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 479e2dc182..0a0a1609f1 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 959915ffa6..2bf5a7660d 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 038b443845..4433d10bce 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/common/splash_source.c b/common/splash_source.c index 7223a1aae7..c12bff98ea 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> * diff --git a/common/stackprot.c b/common/stackprot.c index d5b7061665..396799271c 100644 --- a/common/stackprot.c +++ b/common/stackprot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Broadcom */ diff --git a/common/stdio.c b/common/stdio.c index e3354f092d..0fdbf217d5 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Sergey Kubushyn <ksi(a)koi8.net> * diff --git a/common/update.c b/common/update.c index ec302ca68f..359b2484a7 100644 --- a/common/update.c +++ b/common/update.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/common/usb.c b/common/usb.c index 836506dcd9..1e861d9630 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Most of this source has been derived from the Linux USB * project: diff --git a/common/usb_hub.c b/common/usb_hub.c index 85c0822d8b..11b3ea5d8d 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Most of this source has been derived from the Linux USB * project: diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 4cbc9acb73..9766a1f668 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/common/usb_storage.c b/common/usb_storage.c index 35c656db0d..84f3e3eecd 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Most of this source has been derived from the Linux USB * project: diff --git a/config.mk b/config.mk index b915c29b3f..614442b8f8 100644 --- a/config.mk +++ b/config.mk @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2013 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/disk/Makefile b/disk/Makefile index 45588cf66e..ef5590b3fd 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c index efe4bf1f94..d46ff7a48f 100644 --- a/disk/disk-uclass.c +++ b/disk/disk-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Software partition device (UCLASS_PARTITION) * diff --git a/disk/part.c b/disk/part.c index 85244b09f3..a9a1c6fdc9 100644 --- a/disk/part.c +++ b/disk/part.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/disk/part_amiga.c b/disk/part_amiga.c index 65e30fea55..2cc6c542f3 100644 --- a/disk/part_amiga.c +++ b/disk/part_amiga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Hans-Joerg Frieden, Hyperion Entertainment diff --git a/disk/part_amiga.h b/disk/part_amiga.h index 42f5eb0f94..b56b2c711d 100644 --- a/disk/part_amiga.h +++ b/disk/part_amiga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Hans-Joerg Frieden, Hyperion Entertainment diff --git a/disk/part_dos.c b/disk/part_dos.c index 3337438437..8c224bb293 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Raymond Lo, lo(a)routefree.com diff --git a/disk/part_dos.h b/disk/part_dos.h index 5055822422..d998131e81 100644 --- a/disk/part_dos.h +++ b/disk/part_dos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/disk/part_efi.c b/disk/part_efi.c index 4ce9243ef2..c1e1f61aed 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008 RuggedCom, Inc. * Richard Retanubun <RichardRetanubun(a)RuggedCom.com> diff --git a/disk/part_iso.c b/disk/part_iso.c index 6ac6d95be9..1ee357ec07 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland, d.peter(a)mpl.ch. diff --git a/disk/part_iso.h b/disk/part_iso.h index eb2c3ab66f..6e1c550afe 100644 --- a/disk/part_iso.h +++ b/disk/part_iso.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland, d.peter(a)mpl.ch. diff --git a/disk/part_mac.c b/disk/part_mac.c index db5e203be5..96344d6570 100644 --- a/disk/part_mac.c +++ b/disk/part_mac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/disk/part_mac.h b/disk/part_mac.h index 5f396c9408..72691eb390 100644 --- a/disk/part_mac.h +++ b/disk/part_mac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/doc/README.autoboot b/doc/README.autoboot index 5e9a5e1cf7..d6d6910f14 100644 --- a/doc/README.autoboot +++ b/doc/README.autoboot @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Dave Ellis, SIXNET, dge(a)sixnetio.com diff --git a/doc/README.bootcount b/doc/README.bootcount index f6c5f82f98..ccb09e6eed 100644 --- a/doc/README.bootcount +++ b/doc/README.bootcount @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Boot Count Limit ================ diff --git a/doc/README.console b/doc/README.console index 9f5812c89d..acb71e2d63 100644 --- a/doc/README.console +++ b/doc/README.console @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/doc/README.dfutftp b/doc/README.dfutftp index 1206507911..991afdaf0c 100644 --- a/doc/README.dfutftp +++ b/doc/README.dfutftp @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 # diff --git a/doc/README.esbc_validate b/doc/README.esbc_validate index 540923215e..d4ea8436ff 100644 --- a/doc/README.esbc_validate +++ b/doc/README.esbc_validate @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 */ diff --git a/doc/README.generic-board b/doc/README.generic-board index bc35179fbf..ce3e52191f 100644 --- a/doc/README.generic-board +++ b/doc/README.generic-board @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Google, Inc # Simon Glass <sjg(a)chromium.org> diff --git a/doc/README.gpt b/doc/README.gpt index 386ac2e0fc..062036cf71 100644 --- a/doc/README.gpt +++ b/doc/README.gpt @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics # diff --git a/doc/README.iomux b/doc/README.iomux index c428811ce4..9cc1f1e1a2 100644 --- a/doc/README.iomux +++ b/doc/README.iomux @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH <garyj(a)denx.de> diff --git a/doc/README.mediatek b/doc/README.mediatek index 246579d4be..c7ffc00f63 100644 --- a/doc/README.mediatek +++ b/doc/README.mediatek @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 MediaTek Inc. # Ryder Lee <ryder.lee(a)kernel.org> diff --git a/doc/README.nand b/doc/README.nand index 3765751253..b93402bd04 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later NAND FLASH commands and notes See NOTE below!!! diff --git a/doc/README.power-framework b/doc/README.power-framework index 1f6fd43203..3fce048282 100644 --- a/doc/README.power-framework +++ b/doc/README.power-framework @@ -2,7 +2,7 @@ # (C) Copyright 2014 Samsung Electronics # Lukasz Majewski <l.majewski(a)samsung.com> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Introduction diff --git a/doc/README.pxe b/doc/README.pxe index 172201093d..b5edc87fe2 100644 --- a/doc/README.pxe +++ b/doc/README.pxe @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. */ diff --git a/doc/README.rockchip b/doc/README.rockchip index 84caff8a24..a469a1841b 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Google. Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/doc/README.usb b/doc/README.usb index 650a6daae0..71a22af485 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/doc/README.video b/doc/README.video index ced35bd2db..adaf34ac94 100644 --- a/doc/README.video +++ b/doc/README.video @@ -1,4 +1,4 @@ -SPDX-License-Identifier: GPL-2.0+ +SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/doc/android/ab.rst b/doc/android/ab.rst index 2adf88781d..83b93364ce 100644 --- a/doc/android/ab.rst +++ b/doc/android/ab.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Android A/B updates =================== diff --git a/doc/android/avb2.rst b/doc/android/avb2.rst index a072119574..1fd8983115 100644 --- a/doc/android/avb2.rst +++ b/doc/android/avb2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Android Verified Boot 2.0 ========================= diff --git a/doc/android/bcb.rst b/doc/android/bcb.rst index 8861608300..7bec2d1ba6 100644 --- a/doc/android/bcb.rst +++ b/doc/android/bcb.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Android Bootloader Control Block (BCB) ====================================== diff --git a/doc/android/boot-image.rst b/doc/android/boot-image.rst index 8f247c7093..d4240d78f4 100644 --- a/doc/android/boot-image.rst +++ b/doc/android/boot-image.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Sam Protsenko <joe.skb7(a)gmail.com> Android Boot Image diff --git a/doc/android/fastboot-protocol.rst b/doc/android/fastboot-protocol.rst index e8cbd7f24e..0d028e5a8a 100644 --- a/doc/android/fastboot-protocol.rst +++ b/doc/android/fastboot-protocol.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later FastBoot Version 0.4 ==================== diff --git a/doc/android/fastboot.rst b/doc/android/fastboot.rst index 1ad8a897c8..3d2a4f74a4 100644 --- a/doc/android/fastboot.rst +++ b/doc/android/fastboot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Android Fastboot ================ diff --git a/doc/android/index.rst b/doc/android/index.rst index 225d6f125a..19b10898f2 100644 --- a/doc/android/index.rst +++ b/doc/android/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Android-specific doc ==================== diff --git a/doc/api/clk.rst b/doc/api/clk.rst index 7c27066928..c87e7bb571 100644 --- a/doc/api/clk.rst +++ b/doc/api/clk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Clock API ========= diff --git a/doc/api/dfu.rst b/doc/api/dfu.rst index 5bd9e292a5..4878161915 100644 --- a/doc/api/dfu.rst +++ b/doc/api/dfu.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Device firmware update ====================== diff --git a/doc/api/dm.rst b/doc/api/dm.rst index df605dae9d..50ea885b4a 100644 --- a/doc/api/dm.rst +++ b/doc/api/dm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Driver Model ============ diff --git a/doc/api/efi.rst b/doc/api/efi.rst index 43d6f936fb..f62e54584d 100644 --- a/doc/api/efi.rst +++ b/doc/api/efi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later UEFI subsystem ============== diff --git a/doc/api/event.rst b/doc/api/event.rst index 8a57d43832..7e8aaf9f94 100644 --- a/doc/api/event.rst +++ b/doc/api/event.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Events ====== diff --git a/doc/api/getopt.rst b/doc/api/getopt.rst index 773f79aeb6..2fbd5defab 100644 --- a/doc/api/getopt.rst +++ b/doc/api/getopt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> Option Parsing diff --git a/doc/api/index.rst b/doc/api/index.rst index 2f0218c47a..66f3bcef20 100644 --- a/doc/api/index.rst +++ b/doc/api/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot API documentation ======================== diff --git a/doc/api/linker_lists.rst b/doc/api/linker_lists.rst index 3cd447f187..3a89ec92f8 100644 --- a/doc/api/linker_lists.rst +++ b/doc/api/linker_lists.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Linker-Generated Arrays ======================= diff --git a/doc/api/lmb.rst b/doc/api/lmb.rst index 2095bfa161..13b602a667 100644 --- a/doc/api/lmb.rst +++ b/doc/api/lmb.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Logical memory blocks ===================== diff --git a/doc/api/logging.rst b/doc/api/logging.rst index 1e6cbc4931..2ae3eca23c 100644 --- a/doc/api/logging.rst +++ b/doc/api/logging.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Logging API =========== diff --git a/doc/api/nvmem.rst b/doc/api/nvmem.rst index d923784652..720ab02bb3 100644 --- a/doc/api/nvmem.rst +++ b/doc/api/nvmem.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later NVMEM API ========= diff --git a/doc/api/part.rst b/doc/api/part.rst index d1df1d8494..0cd12fc89e 100644 --- a/doc/api/part.rst +++ b/doc/api/part.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Partition API ============= diff --git a/doc/api/pinctrl.rst b/doc/api/pinctrl.rst index 043bd57efa..4db52c8168 100644 --- a/doc/api/pinctrl.rst +++ b/doc/api/pinctrl.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Pinctrl and Pinmux ================== diff --git a/doc/api/rng.rst b/doc/api/rng.rst index b826d4fd4a..06f70a4f7d 100644 --- a/doc/api/rng.rst +++ b/doc/api/rng.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2018 Heinrich Schuchardt Random number generation diff --git a/doc/api/sandbox.rst b/doc/api/sandbox.rst index 724776399b..20c2618804 100644 --- a/doc/api/sandbox.rst +++ b/doc/api/sandbox.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Sandbox ======= diff --git a/doc/api/serial.rst b/doc/api/serial.rst index ed34e592a4..b737d5a21b 100644 --- a/doc/api/serial.rst +++ b/doc/api/serial.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Serial system ============= diff --git a/doc/api/sysreset.rst b/doc/api/sysreset.rst index a51b06c387..db1755bd92 100644 --- a/doc/api/sysreset.rst +++ b/doc/api/sysreset.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later System reset ============ diff --git a/doc/api/timer.rst b/doc/api/timer.rst index b0695174d7..c8d5e2f4c3 100644 --- a/doc/api/timer.rst +++ b/doc/api/timer.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> Timer Subsystem diff --git a/doc/api/unicode.rst b/doc/api/unicode.rst index 3fb6745f84..3f52f41fdd 100644 --- a/doc/api/unicode.rst +++ b/doc/api/unicode.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Unicode support =============== diff --git a/doc/arch/arc.rst b/doc/arch/arc.rst index f8e04a34f1..c698b7b3e2 100644 --- a/doc/arch/arc.rst +++ b/doc/arch/arc.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ARC === diff --git a/doc/arch/arm64.ffa.rst b/doc/arch/arm64.ffa.rst index 4ecdc31716..6d31f0c3b5 100644 --- a/doc/arch/arm64.ffa.rst +++ b/doc/arch/arm64.ffa.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Arm FF-A Support ================ diff --git a/doc/arch/arm64.rst b/doc/arch/arm64.rst index 7c0713504c..2a0bcdfedb 100644 --- a/doc/arch/arm64.rst +++ b/doc/arch/arm64.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ARM64 ===== diff --git a/doc/arch/index.rst b/doc/arch/index.rst index 60c93b3b66..0954de4e49 100644 --- a/doc/arch/index.rst +++ b/doc/arch/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Architecture-specific doc ========================= diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst index 8474ece62c..42497e9d8f 100644 --- a/doc/arch/m68k.rst +++ b/doc/arch/m68k.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later M68K / ColdFire =============== diff --git a/doc/arch/mips.rst b/doc/arch/mips.rst index b8166087dd..58ba4ffb12 100644 --- a/doc/arch/mips.rst +++ b/doc/arch/mips.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later MIPS ==== diff --git a/doc/arch/nios2.rst b/doc/arch/nios2.rst index 34a75e7fb0..43c7e5e3e2 100644 --- a/doc/arch/nios2.rst +++ b/doc/arch/nios2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Nios II ======= diff --git a/doc/arch/riscv.rst b/doc/arch/riscv.rst index af0c48b898..109dd83d2f 100644 --- a/doc/arch/riscv.rst +++ b/doc/arch/riscv.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2023, Yu Chien Peter Lin <peterlin(a)andestech.com> RISC-V diff --git a/doc/arch/sandbox/block_impl.rst b/doc/arch/sandbox/block_impl.rst index 344c74f718..72151aa08d 100644 --- a/doc/arch/sandbox/block_impl.rst +++ b/doc/arch/sandbox/block_impl.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ */ +.. SPDX-License-Identifier: GPL-2.0-or-later */ .. Copyright (c) 2014 The Chromium OS Authors. .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/arch/sandbox/index.rst b/doc/arch/sandbox/index.rst index 1f1f5de4b0..96a75aba15 100644 --- a/doc/arch/sandbox/index.rst +++ b/doc/arch/sandbox/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ */ +.. SPDX-License-Identifier: GPL-2.0-or-later */ .. Copyright 2022 Google LLC .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst index 23902dee89..c39573b065 100644 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ */ +.. SPDX-License-Identifier: GPL-2.0-or-later */ .. Copyright (c) 2014 The Chromium OS Authors. .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/arch/sh.rst b/doc/arch/sh.rst index 3e3759d68b..a8340a308b 100644 --- a/doc/arch/sh.rst +++ b/doc/arch/sh.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2007,2008 Nobuhiro Iwamatsu <iwamatsu(a)nigaur.org> SuperH diff --git a/doc/arch/x86/index.rst b/doc/arch/x86/index.rst index 69db0a5d64..152ca47982 100644 --- a/doc/arch/x86/index.rst +++ b/doc/arch/x86/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ */ +.. SPDX-License-Identifier: GPL-2.0-or-later */ .. Copyright 2023 Google LLC .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/arch/x86/x86.rst b/doc/arch/x86/x86.rst index f67216d6ce..aaba78db88 100644 --- a/doc/arch/x86/x86.rst +++ b/doc/arch/x86/x86.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2014, Simon Glass <sjg(a)chromium.org> .. Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/doc/arch/xtensa.rst b/doc/arch/xtensa.rst index 176410d96b..dddb47c648 100644 --- a/doc/arch/xtensa.rst +++ b/doc/arch/xtensa.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Xtensa ====== diff --git a/doc/board/AndesTech/adp-ag101p.rst b/doc/board/AndesTech/adp-ag101p.rst index f867eeae3e..692f01c1fe 100644 --- a/doc/board/AndesTech/adp-ag101p.rst +++ b/doc/board/AndesTech/adp-ag101p.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ADP-AG101P ========== diff --git a/doc/board/AndesTech/ae350.rst b/doc/board/AndesTech/ae350.rst index 42a2b4d0b5..dc98c3e18b 100644 --- a/doc/board/AndesTech/ae350.rst +++ b/doc/board/AndesTech/ae350.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later AE350 ====== diff --git a/doc/board/AndesTech/index.rst b/doc/board/AndesTech/index.rst index cacc5791a9..c7be43e5a7 100644 --- a/doc/board/AndesTech/index.rst +++ b/doc/board/AndesTech/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Andes Tech ========== diff --git a/doc/board/actions/cubieboard7.rst b/doc/board/actions/cubieboard7.rst index 74f2b12e41..21b572fa9c 100644 --- a/doc/board/actions/cubieboard7.rst +++ b/doc/board/actions/cubieboard7.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2020 Amit Singh Tomar <amittomer25(a)gmail.com> CUBIEBOARD7 diff --git a/doc/board/actions/index.rst b/doc/board/actions/index.rst index c596879158..aed1beac0e 100644 --- a/doc/board/actions/index.rst +++ b/doc/board/actions/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2020 Amit Singh Tomar <amittomer25(a)gmail.com> Actions diff --git a/doc/board/advantech/imx8qm-dmsse20-a1.rst b/doc/board/advantech/imx8qm-dmsse20-a1.rst index b83e678cd9..32a5d381cc 100644 --- a/doc/board/advantech/imx8qm-dmsse20-a1.rst +++ b/doc/board/advantech/imx8qm-dmsse20-a1.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later NXP i.MX8QM DMSSE20-a1 board ============================ diff --git a/doc/board/advantech/imx8qm-rom7720-a1.rst b/doc/board/advantech/imx8qm-rom7720-a1.rst index 13ea2eb19e..783932ba5b 100644 --- a/doc/board/advantech/imx8qm-rom7720-a1.rst +++ b/doc/board/advantech/imx8qm-rom7720-a1.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the NXP i.MX8QM ROM 7720a1 board =========================================== diff --git a/doc/board/advantech/index.rst b/doc/board/advantech/index.rst index 125b98c1f7..0a659be362 100644 --- a/doc/board/advantech/index.rst +++ b/doc/board/advantech/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Advantech ========= diff --git a/doc/board/allwinner/index.rst b/doc/board/allwinner/index.rst index 7352ccd5c0..904b3f3ddf 100644 --- a/doc/board/allwinner/index.rst +++ b/doc/board/allwinner/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Allwinner (sunxi) boards ======================== diff --git a/doc/board/allwinner/sunxi.rst b/doc/board/allwinner/sunxi.rst index 797222d8d3..3d3600141f 100644 --- a/doc/board/allwinner/sunxi.rst +++ b/doc/board/allwinner/sunxi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2021 Arm Ltd. Allwinner SoC based boards diff --git a/doc/board/amlogic/bananapi-cm4io.rst b/doc/board/amlogic/bananapi-cm4io.rst index 672cbee7d8..02a8c2d2da 100644 --- a/doc/board/amlogic/bananapi-cm4io.rst +++ b/doc/board/amlogic/bananapi-cm4io.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for BananaPi CM4 with CM4IO (A311D) ========================================== diff --git a/doc/board/amlogic/bananapi-m2pro.rst b/doc/board/amlogic/bananapi-m2pro.rst index 6c35943bac..517742988f 100644 --- a/doc/board/amlogic/bananapi-m2pro.rst +++ b/doc/board/amlogic/bananapi-m2pro.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for BananaPi BPI-M2-PRO (S905X3) ======================================= diff --git a/doc/board/amlogic/bananapi-m2s.rst b/doc/board/amlogic/bananapi-m2s.rst index 4a1be47b35..c8363e9b31 100644 --- a/doc/board/amlogic/bananapi-m2s.rst +++ b/doc/board/amlogic/bananapi-m2s.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for BananaPi M2S (A311D & S922X) ======================================= diff --git a/doc/board/amlogic/bananapi-m5.rst b/doc/board/amlogic/bananapi-m5.rst index 009ea0ba94..3918444084 100644 --- a/doc/board/amlogic/bananapi-m5.rst +++ b/doc/board/amlogic/bananapi-m5.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for BananaPi BPI-M5 (S905X3) =================================== diff --git a/doc/board/amlogic/beelink-gskingx.rst b/doc/board/amlogic/beelink-gskingx.rst index 8a8296e863..fb04b191a5 100644 --- a/doc/board/amlogic/beelink-gskingx.rst +++ b/doc/board/amlogic/beelink-gskingx.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Beelink GS-King-X (S922X) ==================================== diff --git a/doc/board/amlogic/beelink-gt1-ultimate.rst b/doc/board/amlogic/beelink-gt1-ultimate.rst index a78a1a2ff2..8e220ed977 100644 --- a/doc/board/amlogic/beelink-gt1-ultimate.rst +++ b/doc/board/amlogic/beelink-gt1-ultimate.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Beelink GT1 Ultimate (S912) ====================================== diff --git a/doc/board/amlogic/beelink-gtking.rst b/doc/board/amlogic/beelink-gtking.rst index 8171b698c7..ebc699d3dd 100644 --- a/doc/board/amlogic/beelink-gtking.rst +++ b/doc/board/amlogic/beelink-gtking.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Beelink GT-King (S922X) ================================== diff --git a/doc/board/amlogic/beelink-gtkingpro.rst b/doc/board/amlogic/beelink-gtkingpro.rst index eb0b7d4fd1..b8e1d2f1fc 100644 --- a/doc/board/amlogic/beelink-gtkingpro.rst +++ b/doc/board/amlogic/beelink-gtkingpro.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Beelink GT-King Pro (S922X) ====================================== diff --git a/doc/board/amlogic/boot-flow.rst b/doc/board/amlogic/boot-flow.rst index 041297c512..cd5c858a0f 100644 --- a/doc/board/amlogic/boot-flow.rst +++ b/doc/board/amlogic/boot-flow.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Amlogic SoC Boot Flow ===================== diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst index 46f44bf34e..7e7c38a4b8 100644 --- a/doc/board/amlogic/index.rst +++ b/doc/board/amlogic/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Amlogic ======= diff --git a/doc/board/amlogic/jethub-j100.rst b/doc/board/amlogic/jethub-j100.rst index 86acdafa06..4f1042eb85 100644 --- a/doc/board/amlogic/jethub-j100.rst +++ b/doc/board/amlogic/jethub-j100.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for JetHub J100 (A113X) ============================== diff --git a/doc/board/amlogic/jethub-j80.rst b/doc/board/amlogic/jethub-j80.rst index 9195df6905..505393bfd2 100644 --- a/doc/board/amlogic/jethub-j80.rst +++ b/doc/board/amlogic/jethub-j80.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for JetHub J80 (S905W) ============================= diff --git a/doc/board/amlogic/khadas-vim.rst b/doc/board/amlogic/khadas-vim.rst index 20370ed49a..3ea54e28ea 100644 --- a/doc/board/amlogic/khadas-vim.rst +++ b/doc/board/amlogic/khadas-vim.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Khadas VIM (S905X) ============================= diff --git a/doc/board/amlogic/khadas-vim2.rst b/doc/board/amlogic/khadas-vim2.rst index 58f18701f7..f4f7ad8b6f 100644 --- a/doc/board/amlogic/khadas-vim2.rst +++ b/doc/board/amlogic/khadas-vim2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Khadas VIM2 (S912) ============================= diff --git a/doc/board/amlogic/khadas-vim3.rst b/doc/board/amlogic/khadas-vim3.rst index 4959590b8b..1b98a52b0a 100644 --- a/doc/board/amlogic/khadas-vim3.rst +++ b/doc/board/amlogic/khadas-vim3.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Khadas VIM3 (A311D) ============================== diff --git a/doc/board/amlogic/khadas-vim3l.rst b/doc/board/amlogic/khadas-vim3l.rst index cd21466f70..66819f5ca5 100644 --- a/doc/board/amlogic/khadas-vim3l.rst +++ b/doc/board/amlogic/khadas-vim3l.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Khadas VIM3L (S905D3) ================================ diff --git a/doc/board/amlogic/libretech-ac.rst b/doc/board/amlogic/libretech-ac.rst index fa151c0d00..d18726f533 100644 --- a/doc/board/amlogic/libretech-ac.rst +++ b/doc/board/amlogic/libretech-ac.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for LibreTech-AC 'LaFrite' (S805X) ========================================= diff --git a/doc/board/amlogic/libretech-cc.rst b/doc/board/amlogic/libretech-cc.rst index 08a84a41c0..a1421530c8 100644 --- a/doc/board/amlogic/libretech-cc.rst +++ b/doc/board/amlogic/libretech-cc.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for LibreTech CC 'LePotato' (S905X) ========================================== diff --git a/doc/board/amlogic/nanopi-k2.rst b/doc/board/amlogic/nanopi-k2.rst index 53a0a41c88..35859ed749 100644 --- a/doc/board/amlogic/nanopi-k2.rst +++ b/doc/board/amlogic/nanopi-k2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for NanoPi-K2 (S905) =========================== diff --git a/doc/board/amlogic/odroid-c2.rst b/doc/board/amlogic/odroid-c2.rst index 922ab0c0b4..c8fb0a9df9 100644 --- a/doc/board/amlogic/odroid-c2.rst +++ b/doc/board/amlogic/odroid-c2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-C2 (S905) =========================== diff --git a/doc/board/amlogic/odroid-c4.rst b/doc/board/amlogic/odroid-c4.rst index 6994b958cf..6ca05f9a84 100644 --- a/doc/board/amlogic/odroid-c4.rst +++ b/doc/board/amlogic/odroid-c4.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-C4 (S905X3) ============================= diff --git a/doc/board/amlogic/odroid-go-ultra.rst b/doc/board/amlogic/odroid-go-ultra.rst index caf0e38dee..e325eb06a1 100644 --- a/doc/board/amlogic/odroid-go-ultra.rst +++ b/doc/board/amlogic/odroid-go-ultra.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-GO-ULTRA (S922X) ================================== diff --git a/doc/board/amlogic/odroid-hc4.rst b/doc/board/amlogic/odroid-hc4.rst index 1d37be2d80..6ee9b893e6 100644 --- a/doc/board/amlogic/odroid-hc4.rst +++ b/doc/board/amlogic/odroid-hc4.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-HC4 (S905X3) ============================== diff --git a/doc/board/amlogic/odroid-n2.rst b/doc/board/amlogic/odroid-n2.rst index 883720f8fb..6f5e104152 100644 --- a/doc/board/amlogic/odroid-n2.rst +++ b/doc/board/amlogic/odroid-n2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-N2/N2+ (S922X) ================================ diff --git a/doc/board/amlogic/odroid-n2l.rst b/doc/board/amlogic/odroid-n2l.rst index 6d58175974..946999c239 100644 --- a/doc/board/amlogic/odroid-n2l.rst +++ b/doc/board/amlogic/odroid-n2l.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for ODROID-N2L (S922X) ============================= diff --git a/doc/board/amlogic/p200.rst b/doc/board/amlogic/p200.rst index e223897a19..dd037ebb57 100644 --- a/doc/board/amlogic/p200.rst +++ b/doc/board/amlogic/p200.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic P200 (S905) ============================== diff --git a/doc/board/amlogic/p201.rst b/doc/board/amlogic/p201.rst index 13b732fc7e..376cc98410 100644 --- a/doc/board/amlogic/p201.rst +++ b/doc/board/amlogic/p201.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic P201 (S905) ============================== diff --git a/doc/board/amlogic/p212.rst b/doc/board/amlogic/p212.rst index a872f32f0f..083322ba52 100644 --- a/doc/board/amlogic/p212.rst +++ b/doc/board/amlogic/p212.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic P212 ======================= diff --git a/doc/board/amlogic/pre-generated-fip.rst b/doc/board/amlogic/pre-generated-fip.rst index 6a43d776d4..b29d908db9 100644 --- a/doc/board/amlogic/pre-generated-fip.rst +++ b/doc/board/amlogic/pre-generated-fip.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Pre-Generated FIP File Repo =========================== @@ -76,8 +76,9 @@ The following files are generated from the Amlogic U-Boot fork: - bl301.bin: Contains the DVFS & suspend-resume handling code for the board - bl33.bin: U-boot binary image -The acs.bin and bl301.bin files use U-Boot GPL-2.0+ headers and U-Boot build system and -are thus considered to be issued from GPL-2.0+ source code. +The acs.bin and bl301.bin files use U-Boot GPL-2.0-or-later headers and U-Boot +build system and are thus considered to be issued from GPL-2.0-or-later source +code. Amlogic alo provides pre-compiled x86_64 and Python2 binaries: diff --git a/doc/board/amlogic/q200.rst b/doc/board/amlogic/q200.rst index 32ea4722e4..bc544de3cc 100644 --- a/doc/board/amlogic/q200.rst +++ b/doc/board/amlogic/q200.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic Q200 (S912) ============================== diff --git a/doc/board/amlogic/radxa-zero.rst b/doc/board/amlogic/radxa-zero.rst index 14ce3cfd49..1e907b3943 100644 --- a/doc/board/amlogic/radxa-zero.rst +++ b/doc/board/amlogic/radxa-zero.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Radxa Zero (S905Y2) ============================== diff --git a/doc/board/amlogic/radxa-zero2.rst b/doc/board/amlogic/radxa-zero2.rst index dccf592459..fdc2b4526f 100644 --- a/doc/board/amlogic/radxa-zero2.rst +++ b/doc/board/amlogic/radxa-zero2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Radxa Zero2 (A311D) ============================== diff --git a/doc/board/amlogic/s400.rst b/doc/board/amlogic/s400.rst index 205e7c38fa..b343839b22 100644 --- a/doc/board/amlogic/s400.rst +++ b/doc/board/amlogic/s400.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic S400 (A113X) =============================== diff --git a/doc/board/amlogic/sei510.rst b/doc/board/amlogic/sei510.rst index 87cb701a08..7452f74195 100644 --- a/doc/board/amlogic/sei510.rst +++ b/doc/board/amlogic/sei510.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic SEI510 (S905X2) ================================== diff --git a/doc/board/amlogic/sei610.rst b/doc/board/amlogic/sei610.rst index 64f62575e2..b16957584a 100644 --- a/doc/board/amlogic/sei610.rst +++ b/doc/board/amlogic/sei610.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic SEI610 (S905X3) ================================== diff --git a/doc/board/amlogic/u200.rst b/doc/board/amlogic/u200.rst index 8254d4dfdb..118706b121 100644 --- a/doc/board/amlogic/u200.rst +++ b/doc/board/amlogic/u200.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic U200 (S905X2) ================================ diff --git a/doc/board/amlogic/videostrong-kii-pro.rst b/doc/board/amlogic/videostrong-kii-pro.rst index 1c6adac996..88d3201c3f 100644 --- a/doc/board/amlogic/videostrong-kii-pro.rst +++ b/doc/board/amlogic/videostrong-kii-pro.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Videostrong KII Pro (S905) ===================================== diff --git a/doc/board/amlogic/w400.rst b/doc/board/amlogic/w400.rst index d2a8107b58..671980e7a2 100644 --- a/doc/board/amlogic/w400.rst +++ b/doc/board/amlogic/w400.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Amlogic W400 (S922X) =============================== diff --git a/doc/board/amlogic/wetek-core2.rst b/doc/board/amlogic/wetek-core2.rst index 137262ec30..e3cdceb4ed 100644 --- a/doc/board/amlogic/wetek-core2.rst +++ b/doc/board/amlogic/wetek-core2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for WeTek Core2 (S912) ============================= diff --git a/doc/board/amlogic/wetek-hub.rst b/doc/board/amlogic/wetek-hub.rst index 212f044781..d51897a017 100644 --- a/doc/board/amlogic/wetek-hub.rst +++ b/doc/board/amlogic/wetek-hub.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for WeTek Hub (S905) =========================== diff --git a/doc/board/amlogic/wetek-play2.rst b/doc/board/amlogic/wetek-play2.rst index 74580b9d95..6de0e9a270 100644 --- a/doc/board/amlogic/wetek-play2.rst +++ b/doc/board/amlogic/wetek-play2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for WeTek Play2 (S905) ============================= diff --git a/doc/board/anbernic/index.rst b/doc/board/anbernic/index.rst index 03758d8613..733192f8a3 100644 --- a/doc/board/anbernic/index.rst +++ b/doc/board/anbernic/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Anbernic ======== diff --git a/doc/board/anbernic/rgxx3.rst b/doc/board/anbernic/rgxx3.rst index 7d1beb423c..a7598293a9 100644 --- a/doc/board/anbernic/rgxx3.rst +++ b/doc/board/anbernic/rgxx3.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Anbernic RGxx3 Devices ================================= diff --git a/doc/board/apple/index.rst b/doc/board/apple/index.rst index 8446847818..07e39675aa 100644 --- a/doc/board/apple/index.rst +++ b/doc/board/apple/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Apple ===== diff --git a/doc/board/apple/m1.rst b/doc/board/apple/m1.rst index 8fa7637629..c8aa6f0e51 100644 --- a/doc/board/apple/m1.rst +++ b/doc/board/apple/m1.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for Apple Silicon Macs ============================= diff --git a/doc/board/asus/grouper_common.rst b/doc/board/asus/grouper_common.rst index 2e4450b40e..6c357a7200 100644 --- a/doc/board/asus/grouper_common.rst +++ b/doc/board/asus/grouper_common.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the ASUS/Google Nexus 7 (2012) ========================================= diff --git a/doc/board/asus/index.rst b/doc/board/asus/index.rst index 87e535fe34..10a7ae1f85 100644 --- a/doc/board/asus/index.rst +++ b/doc/board/asus/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ASUS ==== diff --git a/doc/board/asus/transformer_t30.rst b/doc/board/asus/transformer_t30.rst index b6b6101540..0a06723b01 100644 --- a/doc/board/asus/transformer_t30.rst +++ b/doc/board/asus/transformer_t30.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the ASUS Transformer device family ============================================= diff --git a/doc/board/atmel/at91ek.rst b/doc/board/atmel/at91ek.rst index 6185b1dfb2..2f74cd7851 100644 --- a/doc/board/atmel/at91ek.rst +++ b/doc/board/atmel/at91ek.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later AT91 Evaluation kits ==================== diff --git a/doc/board/atmel/index.rst b/doc/board/atmel/index.rst index 8ba00fc227..6acfd52053 100644 --- a/doc/board/atmel/index.rst +++ b/doc/board/atmel/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Atmel ===== diff --git a/doc/board/beacon/beacon-imx8mm.rst b/doc/board/beacon/beacon-imx8mm.rst index 8bf983bff7..5949f6f51d 100644 --- a/doc/board/beacon/beacon-imx8mm.rst +++ b/doc/board/beacon/beacon-imx8mm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the Beacon EmbeddedWorks i.MX8M Mini Devkit ====================================================== diff --git a/doc/board/beacon/beacon-imx8mn.rst b/doc/board/beacon/beacon-imx8mn.rst index bb4a86369b..c1c134c587 100644 --- a/doc/board/beacon/beacon-imx8mn.rst +++ b/doc/board/beacon/beacon-imx8mn.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the Beacon EmbeddedWorks i.MX8M Nano Devkit ====================================================== diff --git a/doc/board/beacon/beacon-imx8mp.rst b/doc/board/beacon/beacon-imx8mp.rst index 375931c07d..c0bea52606 100644 --- a/doc/board/beacon/beacon-imx8mp.rst +++ b/doc/board/beacon/beacon-imx8mp.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the Beacon EmbeddedWorks i.MX8M Plus Devkit ====================================================== diff --git a/doc/board/beacon/index.rst b/doc/board/beacon/index.rst index bf62b09fba..68476aa09f 100644 --- a/doc/board/beacon/index.rst +++ b/doc/board/beacon/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Beacon ====== diff --git a/doc/board/broadcom/bcm7xxx.rst b/doc/board/broadcom/bcm7xxx.rst index f1994d9f97..62232912e0 100644 --- a/doc/board/broadcom/bcm7xxx.rst +++ b/doc/board/broadcom/bcm7xxx.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2018, 2023 Thomas Fitzsimmons <fitzsim(a)fitzsim.org> BCM7445 and BCM7260 diff --git a/doc/board/broadcom/index.rst b/doc/board/broadcom/index.rst index ca34afc82b..4415003f4d 100644 --- a/doc/board/broadcom/index.rst +++ b/doc/board/broadcom/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2022 Matthias Brugger <mbrugger(a)suse.com> Broadcom diff --git a/doc/board/broadcom/northstar.rst b/doc/board/broadcom/northstar.rst index f4bc0acd01..9ed39f9192 100644 --- a/doc/board/broadcom/northstar.rst +++ b/doc/board/broadcom/northstar.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2023 Linus Walleij <linus.walleij(a)linaro.org> Broadcom Northstar Boards diff --git a/doc/board/broadcom/raspberrypi.rst b/doc/board/broadcom/raspberrypi.rst index 1d00b38bb2..b6b29984b3 100644 --- a/doc/board/broadcom/raspberrypi.rst +++ b/doc/board/broadcom/raspberrypi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2022 Matthias Brugger <mbrugger(a)suse.com> Raspberry Pi diff --git a/doc/board/bsh/imx8mn_bsh_smm_s2.rst b/doc/board/bsh/imx8mn_bsh_smm_s2.rst index 2e85c1a218..e33e78bb8b 100644 --- a/doc/board/bsh/imx8mn_bsh_smm_s2.rst +++ b/doc/board/bsh/imx8mn_bsh_smm_s2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mn_bsh_smm_s2 ================= diff --git a/doc/board/bsh/index.rst b/doc/board/bsh/index.rst index 570ee4d72e..4ceb88ba0e 100644 --- a/doc/board/bsh/index.rst +++ b/doc/board/bsh/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later BSH Hausgeraete GmbH ==================== diff --git a/doc/board/cloos/imx8mm_phg.rst b/doc/board/cloos/imx8mm_phg.rst index 173f02d4ae..a6fb143039 100644 --- a/doc/board/cloos/imx8mm_phg.rst +++ b/doc/board/cloos/imx8mm_phg.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Cloos i.MX8MM PHG board ======================= diff --git a/doc/board/cloos/index.rst b/doc/board/cloos/index.rst index 02c84152db..7a06f35c6d 100644 --- a/doc/board/cloos/index.rst +++ b/doc/board/cloos/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Cloos ===== diff --git a/doc/board/congatec/cgtqmx8.rst b/doc/board/congatec/cgtqmx8.rst index a970cb82a1..2dfe69432a 100644 --- a/doc/board/congatec/cgtqmx8.rst +++ b/doc/board/congatec/cgtqmx8.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the Congatec conga-QMX8 board ======================================== diff --git a/doc/board/congatec/index.rst b/doc/board/congatec/index.rst index cc57b36b2e..1cab3e868c 100644 --- a/doc/board/congatec/index.rst +++ b/doc/board/congatec/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Congatec ======== diff --git a/doc/board/coreboot/coreboot.rst b/doc/board/coreboot/coreboot.rst index 10a251c2b6..98bac13786 100644 --- a/doc/board/coreboot/coreboot.rst +++ b/doc/board/coreboot/coreboot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Coreboot diff --git a/doc/board/coreboot/index.rst b/doc/board/coreboot/index.rst index d148db95f3..dec234b0c2 100644 --- a/doc/board/coreboot/index.rst +++ b/doc/board/coreboot/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Coreboot ======== diff --git a/doc/board/emulation/blkdev.rst b/doc/board/emulation/blkdev.rst index f187ff22a8..017161bd13 100644 --- a/doc/board/emulation/blkdev.rst +++ b/doc/board/emulation/blkdev.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Emulation of block devices -------------------------- diff --git a/doc/board/emulation/index.rst b/doc/board/emulation/index.rst index 932c65adeb..3f421ae0e9 100644 --- a/doc/board/emulation/index.rst +++ b/doc/board/emulation/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Emulation ========= diff --git a/doc/board/emulation/qemu-arm.rst b/doc/board/emulation/qemu-arm.rst index 1c91c7f3ac..a94b83d126 100644 --- a/doc/board/emulation/qemu-arm.rst +++ b/doc/board/emulation/qemu-arm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2017, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> QEMU ARM diff --git a/doc/board/emulation/qemu-mips.rst b/doc/board/emulation/qemu-mips.rst index 5fd8a0a23b..d40c9560a6 100644 --- a/doc/board/emulation/qemu-mips.rst +++ b/doc/board/emulation/qemu-mips.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> QEMU MIPS diff --git a/doc/board/emulation/qemu-ppce500.rst b/doc/board/emulation/qemu-ppce500.rst index 82b50a01de..4b0b82c2a3 100644 --- a/doc/board/emulation/qemu-ppce500.rst +++ b/doc/board/emulation/qemu-ppce500.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> QEMU PPC E500 diff --git a/doc/board/emulation/qemu-riscv.rst b/doc/board/emulation/qemu-riscv.rst index 61137bcbf1..da75e7b801 100644 --- a/doc/board/emulation/qemu-riscv.rst +++ b/doc/board/emulation/qemu-riscv.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> QEMU RISC-V diff --git a/doc/board/emulation/qemu-x86.rst b/doc/board/emulation/qemu-x86.rst index c604e42990..a6b7029260 100644 --- a/doc/board/emulation/qemu-x86.rst +++ b/doc/board/emulation/qemu-x86.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> QEMU x86 diff --git a/doc/board/gateworks/imx8mm_venice.rst b/doc/board/gateworks/imx8mm_venice.rst index ea78dfd7ae..0917ed230e 100644 --- a/doc/board/gateworks/imx8mm_venice.rst +++ b/doc/board/gateworks/imx8mm_venice.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mm_venice ============= diff --git a/doc/board/gateworks/imx8mn_venice.rst b/doc/board/gateworks/imx8mn_venice.rst index 7015f4ef31..e10fd64df7 100644 --- a/doc/board/gateworks/imx8mn_venice.rst +++ b/doc/board/gateworks/imx8mn_venice.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mn_venice ============= diff --git a/doc/board/gateworks/imx8mp_venice.rst b/doc/board/gateworks/imx8mp_venice.rst index a219caadff..6cf85a7ad8 100644 --- a/doc/board/gateworks/imx8mp_venice.rst +++ b/doc/board/gateworks/imx8mp_venice.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mp_venice ============= diff --git a/doc/board/gateworks/index.rst b/doc/board/gateworks/index.rst index 6cf0839814..a3032b78db 100644 --- a/doc/board/gateworks/index.rst +++ b/doc/board/gateworks/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Gateworks ========= diff --git a/doc/board/google/chromebook_coral.rst b/doc/board/google/chromebook_coral.rst index 1eda769c75..164b58e1c2 100644 --- a/doc/board/google/chromebook_coral.rst +++ b/doc/board/google/chromebook_coral.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Chromebook Coral diff --git a/doc/board/google/chromebook_link.rst b/doc/board/google/chromebook_link.rst index 16080304d6..3f87bb7902 100644 --- a/doc/board/google/chromebook_link.rst +++ b/doc/board/google/chromebook_link.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Chromebook Link diff --git a/doc/board/google/chromebook_samus.rst b/doc/board/google/chromebook_samus.rst index 822ba575e2..fc3001fe5e 100644 --- a/doc/board/google/chromebook_samus.rst +++ b/doc/board/google/chromebook_samus.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Chromebook Samus diff --git a/doc/board/google/index.rst b/doc/board/google/index.rst index 061c797718..68397f70ad 100644 --- a/doc/board/google/index.rst +++ b/doc/board/google/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Google ====== diff --git a/doc/board/highbank/index.rst b/doc/board/highbank/index.rst index b6975ca496..89305e8f96 100644 --- a/doc/board/highbank/index.rst +++ b/doc/board/highbank/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Highbank ======== diff --git a/doc/board/htc/endeavoru.rst b/doc/board/htc/endeavoru.rst index 950c713f2f..5bea225300 100644 --- a/doc/board/htc/endeavoru.rst +++ b/doc/board/htc/endeavoru.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the HTC One X (endeavoru) ==================================== diff --git a/doc/board/htc/index.rst b/doc/board/htc/index.rst index 955c9b9e03..e0b5c2181c 100644 --- a/doc/board/htc/index.rst +++ b/doc/board/htc/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later HTC === diff --git a/doc/board/index.rst b/doc/board/index.rst index 35dd3bcf5f..c4b3e028a3 100644 --- a/doc/board/index.rst +++ b/doc/board/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Board-specific doc ================== diff --git a/doc/board/intel/bayleybay.rst b/doc/board/intel/bayleybay.rst index db97f645fd..dba00b7394 100644 --- a/doc/board/intel/bayleybay.rst +++ b/doc/board/intel/bayleybay.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Bayley Bay CRB diff --git a/doc/board/intel/cherryhill.rst b/doc/board/intel/cherryhill.rst index 151f0613f8..b1391380a9 100644 --- a/doc/board/intel/cherryhill.rst +++ b/doc/board/intel/cherryhill.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Cherry Hill CRB diff --git a/doc/board/intel/cougarcanyon2.rst b/doc/board/intel/cougarcanyon2.rst index 5e3e7a1820..2eba7e3dbc 100644 --- a/doc/board/intel/cougarcanyon2.rst +++ b/doc/board/intel/cougarcanyon2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Cougar Canyon 2 CRB diff --git a/doc/board/intel/crownbay.rst b/doc/board/intel/crownbay.rst index 4fcf9811c1..47452c8af2 100644 --- a/doc/board/intel/crownbay.rst +++ b/doc/board/intel/crownbay.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Crown Bay CRB diff --git a/doc/board/intel/edison.rst b/doc/board/intel/edison.rst index 782d75a674..ebe355168f 100644 --- a/doc/board/intel/edison.rst +++ b/doc/board/intel/edison.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Edison diff --git a/doc/board/intel/galileo.rst b/doc/board/intel/galileo.rst index f51a06bb9e..6a236e315d 100644 --- a/doc/board/intel/galileo.rst +++ b/doc/board/intel/galileo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Galileo diff --git a/doc/board/intel/index.rst b/doc/board/intel/index.rst index f545dee87a..be8ae19f0f 100644 --- a/doc/board/intel/index.rst +++ b/doc/board/intel/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Intel ===== diff --git a/doc/board/intel/minnowmax.rst b/doc/board/intel/minnowmax.rst index d0286bd993..d30d722a38 100644 --- a/doc/board/intel/minnowmax.rst +++ b/doc/board/intel/minnowmax.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Minnowboard MAX diff --git a/doc/board/intel/slimbootloader.rst b/doc/board/intel/slimbootloader.rst index 87d71a55bd..23c0ab3f74 100644 --- a/doc/board/intel/slimbootloader.rst +++ b/doc/board/intel/slimbootloader.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Aiden Park <aiden.park(a)intel.com> Slim Bootloader diff --git a/doc/board/kontron/index.rst b/doc/board/kontron/index.rst index cb1906e626..d07f7eb23e 100644 --- a/doc/board/kontron/index.rst +++ b/doc/board/kontron/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kontron ======= diff --git a/doc/board/kontron/pitx-imx8m.rst b/doc/board/kontron/pitx-imx8m.rst index 1f64cbd9b2..5b3f10903c 100644 --- a/doc/board/kontron/pitx-imx8m.rst +++ b/doc/board/kontron/pitx-imx8m.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kontron pitx-imx8m ================== diff --git a/doc/board/kontron/sl-mx6ul.rst b/doc/board/kontron/sl-mx6ul.rst index b0b0f44db2..b9786e2b81 100644 --- a/doc/board/kontron/sl-mx6ul.rst +++ b/doc/board/kontron/sl-mx6ul.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kontron Electronics SL i.MX6UL/ULL SoM ====================================== diff --git a/doc/board/kontron/sl-mx8mm.rst b/doc/board/kontron/sl-mx8mm.rst index 702db60fe3..9c8a8e8a02 100644 --- a/doc/board/kontron/sl-mx8mm.rst +++ b/doc/board/kontron/sl-mx8mm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kontron Electronics i.MX8MM SoMs and Boards =========================================== diff --git a/doc/board/kontron/sl28.rst b/doc/board/kontron/sl28.rst index 2cb8ec62be..ec6c8a1d50 100644 --- a/doc/board/kontron/sl28.rst +++ b/doc/board/kontron/sl28.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kontron SMARC-sAL28 =================== diff --git a/doc/board/lg/index.rst b/doc/board/lg/index.rst index 3af3681e0b..54bd08921a 100644 --- a/doc/board/lg/index.rst +++ b/doc/board/lg/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later LG == diff --git a/doc/board/lg/x3_t30.rst b/doc/board/lg/x3_t30.rst index 5c564aabc6..7feee4fc95 100644 --- a/doc/board/lg/x3_t30.rst +++ b/doc/board/lg/x3_t30.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot for the LG X3 T30 device family ====================================== diff --git a/doc/board/mediatek/index.rst b/doc/board/mediatek/index.rst index 38cd8cb5b2..e75d41f38a 100644 --- a/doc/board/mediatek/index.rst +++ b/doc/board/mediatek/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Mediatek ========= diff --git a/doc/board/microchip/index.rst b/doc/board/microchip/index.rst index affc5a9e01..da6d90c296 100644 --- a/doc/board/microchip/index.rst +++ b/doc/board/microchip/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Microchip ========= diff --git a/doc/board/microchip/mpfs_icicle.rst b/doc/board/microchip/mpfs_icicle.rst index 1464e536e9..39d8818eab 100644 --- a/doc/board/microchip/mpfs_icicle.rst +++ b/doc/board/microchip/mpfs_icicle.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Microchip PolarFire SoC Icicle Kit ================================== diff --git a/doc/board/nxp/imx8mm_evk.rst b/doc/board/nxp/imx8mm_evk.rst index 327ce6e49c..a731542a15 100644 --- a/doc/board/nxp/imx8mm_evk.rst +++ b/doc/board/nxp/imx8mm_evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mm_evk ========== diff --git a/doc/board/nxp/imx8mn_evk.rst b/doc/board/nxp/imx8mn_evk.rst index 4f225ea660..d5abc2239c 100644 --- a/doc/board/nxp/imx8mn_evk.rst +++ b/doc/board/nxp/imx8mn_evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mn_evk ========== diff --git a/doc/board/nxp/imx8mp_evk.rst b/doc/board/nxp/imx8mp_evk.rst index 72175dbe78..707494ff19 100644 --- a/doc/board/nxp/imx8mp_evk.rst +++ b/doc/board/nxp/imx8mp_evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mp_evk ========== diff --git a/doc/board/nxp/imx8mq_evk.rst b/doc/board/nxp/imx8mq_evk.rst index 4b0624e7e8..5fd5de2195 100644 --- a/doc/board/nxp/imx8mq_evk.rst +++ b/doc/board/nxp/imx8mq_evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mq_evk ========== diff --git a/doc/board/nxp/imx8qxp_mek.rst b/doc/board/nxp/imx8qxp_mek.rst index bdd38368f1..251016956f 100644 --- a/doc/board/nxp/imx8qxp_mek.rst +++ b/doc/board/nxp/imx8qxp_mek.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8qxp_mek =========== diff --git a/doc/board/nxp/imxrt1020-evk.rst b/doc/board/nxp/imxrt1020-evk.rst index 267f80c517..05b6628416 100644 --- a/doc/board/nxp/imxrt1020-evk.rst +++ b/doc/board/nxp/imxrt1020-evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imxrt1020-evk ============= diff --git a/doc/board/nxp/imxrt1050-evk.rst b/doc/board/nxp/imxrt1050-evk.rst index c1fb48f0cd..e0521e0287 100644 --- a/doc/board/nxp/imxrt1050-evk.rst +++ b/doc/board/nxp/imxrt1050-evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imxrt1050-evk ============= diff --git a/doc/board/nxp/index.rst b/doc/board/nxp/index.rst index 4514b8951b..7434879caf 100644 --- a/doc/board/nxp/index.rst +++ b/doc/board/nxp/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later NXP Semiconductors ================== diff --git a/doc/board/nxp/ls1046ardb.rst b/doc/board/nxp/ls1046ardb.rst index 49b4842b30..ddff6d5719 100644 --- a/doc/board/nxp/ls1046ardb.rst +++ b/doc/board/nxp/ls1046ardb.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later LS1046ARDB ========== diff --git a/doc/board/nxp/mx6sabreauto.rst b/doc/board/nxp/mx6sabreauto.rst index fe4cd9d214..ef827c9682 100644 --- a/doc/board/nxp/mx6sabreauto.rst +++ b/doc/board/nxp/mx6sabreauto.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later mx6sabreauto ============ diff --git a/doc/board/nxp/mx6sabresd.rst b/doc/board/nxp/mx6sabresd.rst index c9869f4a73..36fcb5ebe3 100644 --- a/doc/board/nxp/mx6sabresd.rst +++ b/doc/board/nxp/mx6sabresd.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later mx6sabresd ========== diff --git a/doc/board/nxp/mx6ul_14x14_evk.rst b/doc/board/nxp/mx6ul_14x14_evk.rst index 3e57ba1ee8..5eb0a8e16c 100644 --- a/doc/board/nxp/mx6ul_14x14_evk.rst +++ b/doc/board/nxp/mx6ul_14x14_evk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later mx6ul_14x14_evk =============== diff --git a/doc/board/nxp/mx6ullevk.rst b/doc/board/nxp/mx6ullevk.rst index a26248a1e3..0d15a5e629 100644 --- a/doc/board/nxp/mx6ullevk.rst +++ b/doc/board/nxp/mx6ullevk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later mx6ullevk ========= diff --git a/doc/board/openpiton/index.rst b/doc/board/openpiton/index.rst index c469102c4b..fdaf683784 100644 --- a/doc/board/openpiton/index.rst +++ b/doc/board/openpiton/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later OpenPiton ========= diff --git a/doc/board/openpiton/riscv64.rst b/doc/board/openpiton/riscv64.rst index 3a97793f07..82376d5ee6 100644 --- a/doc/board/openpiton/riscv64.rst +++ b/doc/board/openpiton/riscv64.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Openpiton RISC-V SoC ==================== diff --git a/doc/board/phytec/index.rst b/doc/board/phytec/index.rst index a5b442045e..58db3e2d74 100644 --- a/doc/board/phytec/index.rst +++ b/doc/board/phytec/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later PHYTEC ====== diff --git a/doc/board/phytec/phycore-imx8mm.rst b/doc/board/phytec/phycore-imx8mm.rst index e9dc225990..493a458ea0 100644 --- a/doc/board/phytec/phycore-imx8mm.rst +++ b/doc/board/phytec/phycore-imx8mm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later phyCORE-i.MX 8M Mini ==================== diff --git a/doc/board/phytec/phycore-imx8mp.rst b/doc/board/phytec/phycore-imx8mp.rst index fda751aeff..2ec2f1ad2e 100644 --- a/doc/board/phytec/phycore-imx8mp.rst +++ b/doc/board/phytec/phycore-imx8mp.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later phyCORE-i.MX 8M Plus ==================== diff --git a/doc/board/purism/index.rst b/doc/board/purism/index.rst index a9cdc312d4..8bc0432c26 100644 --- a/doc/board/purism/index.rst +++ b/doc/board/purism/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Purism SPC ========== diff --git a/doc/board/purism/librem5.rst b/doc/board/purism/librem5.rst index fb050c6302..50dead73c7 100644 --- a/doc/board/purism/librem5.rst +++ b/doc/board/purism/librem5.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Librem5 ========== diff --git a/doc/board/qualcomm/dragonboard410c.rst b/doc/board/qualcomm/dragonboard410c.rst index d0de9dbcbc..bb4470f568 100644 --- a/doc/board/qualcomm/dragonboard410c.rst +++ b/doc/board/qualcomm/dragonboard410c.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Stephan Gerhold <stephan(a)gerhold.net> DragonBoard 410c diff --git a/doc/board/qualcomm/index.rst b/doc/board/qualcomm/index.rst index 0f9c429956..640bf47f57 100644 --- a/doc/board/qualcomm/index.rst +++ b/doc/board/qualcomm/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Qualcomm ======== diff --git a/doc/board/qualcomm/qcs404.rst b/doc/board/qualcomm/qcs404.rst index 0cb71d97c9..02cbd3704e 100644 --- a/doc/board/qualcomm/qcs404.rst +++ b/doc/board/qualcomm/qcs404.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Sumit Garg <sumit.garg(a)linaro.org> QCS404 EVB diff --git a/doc/board/qualcomm/sdm845.rst b/doc/board/qualcomm/sdm845.rst index d3f218e835..e056882849 100644 --- a/doc/board/qualcomm/sdm845.rst +++ b/doc/board/qualcomm/sdm845.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Dzmitry Sankouski <dsankouski(a)gmail.com> Snapdragon 845 diff --git a/doc/board/renesas/index.rst b/doc/board/renesas/index.rst index fb6558ec11..948c6fe059 100644 --- a/doc/board/renesas/index.rst +++ b/doc/board/renesas/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Renesas ======= diff --git a/doc/board/renesas/renesas.rst b/doc/board/renesas/renesas.rst index 7d961e862e..157b2d5a35 100644 --- a/doc/board/renesas/renesas.rst +++ b/doc/board/renesas/renesas.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Renesas ======= diff --git a/doc/board/renesas/rzn1.rst b/doc/board/renesas/rzn1.rst index e6d636b89e..e62cf67cab 100644 --- a/doc/board/renesas/rzn1.rst +++ b/doc/board/renesas/rzn1.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Renesas RZ/N1 ============= diff --git a/doc/board/rockchip/index.rst b/doc/board/rockchip/index.rst index 0c377e9bbb..583074efc9 100644 --- a/doc/board/rockchip/index.rst +++ b/doc/board/rockchip/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> Rockchip diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 8262fc0d32..62d0ba50db 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2019 Jagan Teki <jagan(a)amarulasolutions.com> ROCKCHIP diff --git a/doc/board/samsung/axy17lte.rst b/doc/board/samsung/axy17lte.rst index b7f299d1c7..91788252d8 100644 --- a/doc/board/samsung/axy17lte.rst +++ b/doc/board/samsung/axy17lte.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Dzmitry Sankouski <dsankouski(a)gmail.com> Samsung 2017 A series phones diff --git a/doc/board/samsung/index.rst b/doc/board/samsung/index.rst index c904372dff..297ce1fc6d 100644 --- a/doc/board/samsung/index.rst +++ b/doc/board/samsung/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Samsung ======== diff --git a/doc/board/siemens/index.rst b/doc/board/siemens/index.rst index 082936ea7e..4b634eb61a 100644 --- a/doc/board/siemens/index.rst +++ b/doc/board/siemens/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Siemens ======= diff --git a/doc/board/siemens/iot2050.rst b/doc/board/siemens/iot2050.rst index ee3c5c9584..5131addfa7 100644 --- a/doc/board/siemens/iot2050.rst +++ b/doc/board/siemens/iot2050.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Jan Kiszka <jan.kiszka(a)siemens.com> SIMATIC IOT2050 BASIC and ADVANCED diff --git a/doc/board/sifive/index.rst b/doc/board/sifive/index.rst index a43937a3e0..671e0339d0 100644 --- a/doc/board/sifive/index.rst +++ b/doc/board/sifive/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later SiFive ====== diff --git a/doc/board/sifive/unleashed.rst b/doc/board/sifive/unleashed.rst index ce38b701d7..9ea1a6bd54 100644 --- a/doc/board/sifive/unleashed.rst +++ b/doc/board/sifive/unleashed.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later HiFive Unleashed ================ diff --git a/doc/board/sifive/unmatched.rst b/doc/board/sifive/unmatched.rst index c515949066..6a13696abe 100644 --- a/doc/board/sifive/unmatched.rst +++ b/doc/board/sifive/unmatched.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later HiFive Unmatched ================ diff --git a/doc/board/sipeed/index.rst b/doc/board/sipeed/index.rst index 3518e2d8f4..8f4522783c 100644 --- a/doc/board/sipeed/index.rst +++ b/doc/board/sipeed/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Sipeed ====== diff --git a/doc/board/sipeed/maix.rst b/doc/board/sipeed/maix.rst index 4568bb3e4b..61dd1eed65 100644 --- a/doc/board/sipeed/maix.rst +++ b/doc/board/sipeed/maix.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> MAIX diff --git a/doc/board/socionext/developerbox.rst b/doc/board/socionext/developerbox.rst index aa7080e26c..b6d0a80ade 100644 --- a/doc/board/socionext/developerbox.rst +++ b/doc/board/socionext/developerbox.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Introduction ============ diff --git a/doc/board/socionext/index.rst b/doc/board/socionext/index.rst index 4673dcc45b..3765c97a19 100644 --- a/doc/board/socionext/index.rst +++ b/doc/board/socionext/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Socionext ========= diff --git a/doc/board/st/index.rst b/doc/board/st/index.rst index 2a8a4ef3b8..0a39d450c8 100644 --- a/doc/board/st/index.rst +++ b/doc/board/st/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later STMicroelectronics ================== diff --git a/doc/board/st/st-dt.rst b/doc/board/st/st-dt.rst index 67e16ef165..c4f4fb87f1 100644 --- a/doc/board/st/st-dt.rst +++ b/doc/board/st/st-dt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Patrick Delaunay <patrick.delaunay(a)foss.st.com> U-Boot device tree bindings diff --git a/doc/board/st/stm32_MCU.rst b/doc/board/st/stm32_MCU.rst index 7ff7c730fa..ad34a9b3d0 100644 --- a/doc/board/st/stm32_MCU.rst +++ b/doc/board/st/stm32_MCU.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Patrice Chotard <patrice.chotardy(a)foss.st.com> STM32 MCU boards diff --git a/doc/board/st/stm32mp1.rst b/doc/board/st/stm32mp1.rst index 63b44776ff..528975d1cc 100644 --- a/doc/board/st/stm32mp1.rst +++ b/doc/board/st/stm32mp1.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Patrick Delaunay <patrick.delaunay(a)foss.st.com> STM32MP1xx boards diff --git a/doc/board/starfive/index.rst b/doc/board/starfive/index.rst index 0c52dc7b09..b1d39ca53d 100644 --- a/doc/board/starfive/index.rst +++ b/doc/board/starfive/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later StarFive ======== diff --git a/doc/board/starfive/visionfive2.rst b/doc/board/starfive/visionfive2.rst index 9ee758e56c..fa3aea5ba3 100644 --- a/doc/board/starfive/visionfive2.rst +++ b/doc/board/starfive/visionfive2.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later StarFive VisionFive2 ==================== diff --git a/doc/board/ste/index.rst b/doc/board/ste/index.rst index bef520ce63..0f781e3499 100644 --- a/doc/board/ste/index.rst +++ b/doc/board/ste/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ST-Ericsson =========== diff --git a/doc/board/ste/stemmy.rst b/doc/board/ste/stemmy.rst index 6d77fe9c83..562ba21540 100644 --- a/doc/board/ste/stemmy.rst +++ b/doc/board/ste/stemmy.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Stephan Gerhold <stephan(a)gerhold.net> ST-Ericsson U8500 Samsung "stemmy" board diff --git a/doc/board/tbs/index.rst b/doc/board/tbs/index.rst index b677bc624f..b588aa8af5 100644 --- a/doc/board/tbs/index.rst +++ b/doc/board/tbs/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later TBS === diff --git a/doc/board/thead/index.rst b/doc/board/thead/index.rst index 41566d3a36..27d51e3cd5 100644 --- a/doc/board/thead/index.rst +++ b/doc/board/thead/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later T-HEAD ======== diff --git a/doc/board/thead/lpi4a.rst b/doc/board/thead/lpi4a.rst index e395c6ae12..04935d04ef 100644 --- a/doc/board/thead/lpi4a.rst +++ b/doc/board/thead/lpi4a.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Sipeed's Lichee PI 4A based on T-HEAD TH1520 SoC ================================================ diff --git a/doc/board/ti/am335x_evm.rst b/doc/board/ti/am335x_evm.rst index 2ba651eb6d..baba4824e6 100644 --- a/doc/board/ti/am335x_evm.rst +++ b/doc/board/ti/am335x_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Tom Rini <trini(a)konsulko.com> AM335x Generation diff --git a/doc/board/ti/am43xx_evm.rst b/doc/board/ti/am43xx_evm.rst index 543526cd28..e2e67f4412 100644 --- a/doc/board/ti/am43xx_evm.rst +++ b/doc/board/ti/am43xx_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Neha Malcom Francis <n-francis(a)ti.com> AM43xx Generation diff --git a/doc/board/ti/am62x_beagleplay.rst b/doc/board/ti/am62x_beagleplay.rst index 39913b29ab..0c032d86ca 100644 --- a/doc/board/ti/am62x_beagleplay.rst +++ b/doc/board/ti/am62x_beagleplay.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Nishanth Menon <nm(a)ti.com> AM62x Beagleboard.org Beagleplay diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst index d7437c6d22..c6929aef8f 100644 --- a/doc/board/ti/am62x_sk.rst +++ b/doc/board/ti/am62x_sk.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Vignesh Raghavendra <vigneshr(a)ti.com> AM62 Platforms diff --git a/doc/board/ti/am64x_evm.rst b/doc/board/ti/am64x_evm.rst index db27461cb1..802a1179b9 100644 --- a/doc/board/ti/am64x_evm.rst +++ b/doc/board/ti/am64x_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Nishanth Menon <nm(a)ti.com> AM64 Platforms diff --git a/doc/board/ti/am65x_evm.rst b/doc/board/ti/am65x_evm.rst index 7cebb1ca62..cced1766a8 100644 --- a/doc/board/ti/am65x_evm.rst +++ b/doc/board/ti/am65x_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Neha Francis <n-francis(a)ti.com> AM65x Platforms diff --git a/doc/board/ti/dra7xx_evm.rst b/doc/board/ti/dra7xx_evm.rst index 4503b5e922..40ea464d75 100644 --- a/doc/board/ti/dra7xx_evm.rst +++ b/doc/board/ti/dra7xx_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Neha Malcom Francis <n-francis(a)ti.com> DRA7xx Generation diff --git a/doc/board/ti/index.rst b/doc/board/ti/index.rst index b9cdf23e68..033d8ad7f5 100644 --- a/doc/board/ti/index.rst +++ b/doc/board/ti/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Texas Instruments ################# diff --git a/doc/board/ti/j7200_evm.rst b/doc/board/ti/j7200_evm.rst index bcf8dc1c5f..0391b68df4 100644 --- a/doc/board/ti/j7200_evm.rst +++ b/doc/board/ti/j7200_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Udit Kumar <u-kumar1(a)ti.com> J7200 Platforms diff --git a/doc/board/ti/j721e_evm.rst b/doc/board/ti/j721e_evm.rst index cadaac0178..4b3e2f0b53 100644 --- a/doc/board/ti/j721e_evm.rst +++ b/doc/board/ti/j721e_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Lokesh Vutla <lokeshvutla(a)ti.com> J721E Platforms diff --git a/doc/board/ti/j721s2_evm.rst b/doc/board/ti/j721s2_evm.rst index fec2acabe8..0bce1b00fe 100644 --- a/doc/board/ti/j721s2_evm.rst +++ b/doc/board/ti/j721s2_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Manorit Chawdhry <m-chawdhry(a)ti.com> J721S2 and AM68 Platforms diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst index 89d70db886..be0028c528 100644 --- a/doc/board/ti/k3.rst +++ b/doc/board/ti/k3.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Bryan Brattlof <bb(a)ti.com> K3 Generation diff --git a/doc/board/ti/ks2_evm.rst b/doc/board/ti/ks2_evm.rst index 0a789037a6..3d594fa1b7 100644 --- a/doc/board/ti/ks2_evm.rst +++ b/doc/board/ti/ks2_evm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +.. SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause .. sectionauthor:: Neha Malcom Francis <n-francis(a)ti.com> Keystone II EVM Generation diff --git a/doc/board/toradex/index.rst b/doc/board/toradex/index.rst index 89fbdcbb9e..d493a4b87f 100644 --- a/doc/board/toradex/index.rst +++ b/doc/board/toradex/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Toradex ======= diff --git a/doc/board/variscite/imx8mn_var_som.rst b/doc/board/variscite/imx8mn_var_som.rst index aca881ea31..f3631a4773 100644 --- a/doc/board/variscite/imx8mn_var_som.rst +++ b/doc/board/variscite/imx8mn_var_som.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later imx8mn_var_som ============== diff --git a/doc/board/variscite/index.rst b/doc/board/variscite/index.rst index 4186896b66..18303c2f1c 100644 --- a/doc/board/variscite/index.rst +++ b/doc/board/variscite/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Variscite ========= diff --git a/doc/board/xen/index.rst b/doc/board/xen/index.rst index e58fe9e351..e9f78f58ef 100644 --- a/doc/board/xen/index.rst +++ b/doc/board/xen/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later XenGuestARM64 ============= diff --git a/doc/board/xen/xenguest_arm64.rst b/doc/board/xen/xenguest_arm64.rst index 92be9d4376..de74bb9afc 100644 --- a/doc/board/xen/xenguest_arm64.rst +++ b/doc/board/xen/xenguest_arm64.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Xen guest ARM64 board ===================== diff --git a/doc/board/xilinx/index.rst b/doc/board/xilinx/index.rst index 2e31fe3f3a..1a95c52e53 100644 --- a/doc/board/xilinx/index.rst +++ b/doc/board/xilinx/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Xilinx ====== diff --git a/doc/board/xilinx/xilinx.rst b/doc/board/xilinx/xilinx.rst index 8c9afb482d..09103bfdd6 100644 --- a/doc/board/xilinx/xilinx.rst +++ b/doc/board/xilinx/xilinx.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2019 Xilinx, Inc. U-Boot device tree bindings diff --git a/doc/board/xilinx/zynq.rst b/doc/board/xilinx/zynq.rst index 76d67bd62e..8129983a18 100644 --- a/doc/board/xilinx/zynq.rst +++ b/doc/board/xilinx/zynq.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2013 Xilinx, Inc. ZYNQ diff --git a/doc/build/documentation.rst b/doc/build/documentation.rst index 20b0fefa2d..1867af5b74 100644 --- a/doc/build/documentation.rst +++ b/doc/build/documentation.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: Building documentation ====================== diff --git a/doc/build/index.rst b/doc/build/index.rst index 7a4507b574..41067592e4 100644 --- a/doc/build/index.rst +++ b/doc/build/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Build U-Boot ============ diff --git a/doc/build/tools.rst b/doc/build/tools.rst index 5bfa05b232..281f470880 100644 --- a/doc/build/tools.rst +++ b/doc/build/tools.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> Host tools diff --git a/doc/chromium/chainload.rst b/doc/chromium/chainload.rst index b00ee94eaa..b41f4f3a4f 100644 --- a/doc/chromium/chainload.rst +++ b/doc/chromium/chainload.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020 Google LLC Running U-Boot from coreboot on Chromebooks diff --git a/doc/chromium/index.rst b/doc/chromium/index.rst index 0722c25003..95fb6f415c 100644 --- a/doc/chromium/index.rst +++ b/doc/chromium/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020 Google LLC Chromium OS-specific doc diff --git a/doc/chromium/overview.rst b/doc/chromium/overview.rst index 790233cb66..5eba4c6624 100644 --- a/doc/chromium/overview.rst +++ b/doc/chromium/overview.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020 Google LLC Chromium OS Support in U-Boot diff --git a/doc/chromium/run_vboot.rst b/doc/chromium/run_vboot.rst index a9e4408d55..4bb342a61e 100644 --- a/doc/chromium/run_vboot.rst +++ b/doc/chromium/run_vboot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020 Google LLC .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/develop/bloblist.rst b/doc/develop/bloblist.rst index 81643c7674..aaaed39563 100644 --- a/doc/develop/bloblist.rst +++ b/doc/develop/bloblist.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Blob Lists - bloblist ===================== diff --git a/doc/develop/board_best_practices.rst b/doc/develop/board_best_practices.rst index f44401eab7..15b3c37949 100644 --- a/doc/develop/board_best_practices.rst +++ b/doc/develop/board_best_practices.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: Best Practices for Board Ports ============================== diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst index 51cd573662..67f2d46f00 100644 --- a/doc/develop/bootstd.rst +++ b/doc/develop/bootstd.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: U-Boot Standard Boot ==================== diff --git a/doc/develop/cedit.rst b/doc/develop/cedit.rst index 82305b921f..e9d3dc8a3f 100644 --- a/doc/develop/cedit.rst +++ b/doc/develop/cedit.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Configuration Editor ==================== diff --git a/doc/develop/ci_testing.rst b/doc/develop/ci_testing.rst index ffaacedc3d..a1512cddd8 100644 --- a/doc/develop/ci_testing.rst +++ b/doc/develop/ci_testing.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Continuous Integration testing ============================== diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst index b25bfbd271..10de605910 100644 --- a/doc/develop/codingstyle.rst +++ b/doc/develop/codingstyle.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: U-Boot Coding Style =================== diff --git a/doc/develop/commands.rst b/doc/develop/commands.rst index ede880d248..aa2d19523c 100644 --- a/doc/develop/commands.rst +++ b/doc/develop/commands.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Implementing shell commands =========================== diff --git a/doc/develop/config_binding.rst b/doc/develop/config_binding.rst index c90e99c7ba..92bd98a7bf 100644 --- a/doc/develop/config_binding.rst +++ b/doc/develop/config_binding.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot configuration node ========================= diff --git a/doc/develop/crash_dumps.rst b/doc/develop/crash_dumps.rst index 4237b073bc..01bdba36cc 100644 --- a/doc/develop/crash_dumps.rst +++ b/doc/develop/crash_dumps.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2020 Heinrich Schuchardt Analyzing crash dumps diff --git a/doc/develop/cyclic.rst b/doc/develop/cyclic.rst index 67831496a7..4650a48ca7 100644 --- a/doc/develop/cyclic.rst +++ b/doc/develop/cyclic.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Cyclic functions ================ diff --git a/doc/develop/designprinciples.rst b/doc/develop/designprinciples.rst index f01d562d6f..a2dfcb2757 100644 --- a/doc/develop/designprinciples.rst +++ b/doc/develop/designprinciples.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: U-Boot Design Principles ======================== diff --git a/doc/develop/devicetree/control.rst b/doc/develop/devicetree/control.rst index cbb65c9b17..5ea04f1be7 100644 --- a/doc/develop/devicetree/control.rst +++ b/doc/develop/devicetree/control.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Copyright 2011 The Chromium OS Authors Devicetree Control in U-Boot diff --git a/doc/develop/devicetree/dt_qemu.rst b/doc/develop/devicetree/dt_qemu.rst index 8ba2b22559..58ba6dc000 100644 --- a/doc/develop/devicetree/dt_qemu.rst +++ b/doc/develop/devicetree/dt_qemu.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Devicetree in QEMU ================== diff --git a/doc/develop/devicetree/index.rst b/doc/develop/devicetree/index.rst index 2edb69572d..33171aa701 100644 --- a/doc/develop/devicetree/index.rst +++ b/doc/develop/devicetree/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Devicetree in U-Boot ==================== diff --git a/doc/develop/devicetree/intro.rst b/doc/develop/devicetree/intro.rst index 36e8cc0d44..fb63269cc3 100644 --- a/doc/develop/devicetree/intro.rst +++ b/doc/develop/devicetree/intro.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Devicetree Introduction ======================= diff --git a/doc/develop/distro.rst b/doc/develop/distro.rst index 8016acad09..89ebc2046a 100644 --- a/doc/develop/distro.rst +++ b/doc/develop/distro.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Generic Distro Configuration Concept ==================================== diff --git a/doc/develop/docstyle.rst b/doc/develop/docstyle.rst index 50506d6857..62fab10635 100644 --- a/doc/develop/docstyle.rst +++ b/doc/develop/docstyle.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: Documentation Style =================== diff --git a/doc/develop/driver-model/bind.rst b/doc/develop/driver-model/bind.rst index 0d0d40734c..6b65389727 100644 --- a/doc/develop/driver-model/bind.rst +++ b/doc/develop/driver-model/bind.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Patrice Chotard <patrice.chotard(a)foss.st.com> Binding/unbinding a driver diff --git a/doc/develop/driver-model/debugging.rst b/doc/develop/driver-model/debugging.rst index bbb2794340..2d16073efe 100644 --- a/doc/develop/driver-model/debugging.rst +++ b/doc/develop/driver-model/debugging.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Debugging driver model diff --git a/doc/develop/driver-model/design.rst b/doc/develop/driver-model/design.rst index 8c2c81d7ac..5d7e16d5a2 100644 --- a/doc/develop/driver-model/design.rst +++ b/doc/develop/driver-model/design.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Design Details diff --git a/doc/develop/driver-model/fdt-fixup.rst b/doc/develop/driver-model/fdt-fixup.rst index 974c09031e..c6fefa8e6e 100644 --- a/doc/develop/driver-model/fdt-fixup.rst +++ b/doc/develop/driver-model/fdt-fixup.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. 2017-01-06, Mario Six <mario.six(a)gdsys.cc> Pre-relocation device tree manipulation diff --git a/doc/develop/driver-model/fs_firmware_loader.rst b/doc/develop/driver-model/fs_firmware_loader.rst index 149b8b436e..711dde4de7 100644 --- a/doc/develop/driver-model/fs_firmware_loader.rst +++ b/doc/develop/driver-model/fs_firmware_loader.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2018-2019 Intel Corporation <www.intel.com> File System Firmware Loader diff --git a/doc/develop/driver-model/i2c-howto.rst b/doc/develop/driver-model/i2c-howto.rst index 27e7440cd4..0fd3d94544 100644 --- a/doc/develop/driver-model/i2c-howto.rst +++ b/doc/develop/driver-model/i2c-howto.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later How to port an I2C driver to driver model ========================================= diff --git a/doc/develop/driver-model/index.rst b/doc/develop/driver-model/index.rst index 8e12bbd936..99dd3e43b5 100644 --- a/doc/develop/driver-model/index.rst +++ b/doc/develop/driver-model/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Driver Model ============ diff --git a/doc/develop/driver-model/livetree.rst b/doc/develop/driver-model/livetree.rst index 20055d559a..4e5ffd7afd 100644 --- a/doc/develop/driver-model/livetree.rst +++ b/doc/develop/driver-model/livetree.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Simon Glass <sjg(a)chromium.org> Live Device Tree diff --git a/doc/develop/driver-model/migration.rst b/doc/develop/driver-model/migration.rst index fe1ae210de..257703cf17 100644 --- a/doc/develop/driver-model/migration.rst +++ b/doc/develop/driver-model/migration.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Migration Schedule ================== diff --git a/doc/develop/driver-model/nvme.rst b/doc/develop/driver-model/nvme.rst index 7551813312..02cd8ce274 100644 --- a/doc/develop/driver-model/nvme.rst +++ b/doc/develop/driver-model/nvme.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2017 NXP Semiconductors .. Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/doc/develop/driver-model/nvmxip.rst b/doc/develop/driver-model/nvmxip.rst index e85dc220b9..ba35897549 100644 --- a/doc/develop/driver-model/nvmxip.rst +++ b/doc/develop/driver-model/nvmxip.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later NVM XIP Block Storage Emulation Driver ======================================= diff --git a/doc/develop/driver-model/of-plat.rst b/doc/develop/driver-model/of-plat.rst index 01724ba72c..45bf16eb39 100644 --- a/doc/develop/driver-model/of-plat.rst +++ b/doc/develop/driver-model/of-plat.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Compiled-in Device Tree / Platform Data ======================================= diff --git a/doc/develop/driver-model/pci-info.rst b/doc/develop/driver-model/pci-info.rst index dea595b6cf..cf7da25a26 100644 --- a/doc/develop/driver-model/pci-info.rst +++ b/doc/develop/driver-model/pci-info.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later PCI with Driver Model ===================== diff --git a/doc/develop/driver-model/pmic-framework.rst b/doc/develop/driver-model/pmic-framework.rst index d24a1badd6..a1bee80590 100644 --- a/doc/develop/driver-model/pmic-framework.rst +++ b/doc/develop/driver-model/pmic-framework.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2014-2015 Samsung Electronics .. sectionauthor:: Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/doc/develop/driver-model/remoteproc-framework.rst b/doc/develop/driver-model/remoteproc-framework.rst index 566495a21c..fe6f53d712 100644 --- a/doc/develop/driver-model/remoteproc-framework.rst +++ b/doc/develop/driver-model/remoteproc-framework.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2015 .. Texas Instruments Incorporated - http://www.ti.com/ diff --git a/doc/develop/driver-model/serial-howto.rst b/doc/develop/driver-model/serial-howto.rst index 17b53e3cab..7b973deb16 100644 --- a/doc/develop/driver-model/serial-howto.rst +++ b/doc/develop/driver-model/serial-howto.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later How to port a serial driver to driver model =========================================== diff --git a/doc/develop/driver-model/soc-framework.rst b/doc/develop/driver-model/soc-framework.rst index 2609fda644..f508c7c313 100644 --- a/doc/develop/driver-model/soc-framework.rst +++ b/doc/develop/driver-model/soc-framework.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2020 .. Texas Instruments Incorporated - http://www.ti.com/ diff --git a/doc/develop/driver-model/spi-howto.rst b/doc/develop/driver-model/spi-howto.rst index 97fbf750cb..2a674e0ef1 100644 --- a/doc/develop/driver-model/spi-howto.rst +++ b/doc/develop/driver-model/spi-howto.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later How to port a SPI driver to driver model ======================================== diff --git a/doc/develop/driver-model/usb-info.rst b/doc/develop/driver-model/usb-info.rst index 24d1e81a6c..20983f9e19 100644 --- a/doc/develop/driver-model/usb-info.rst +++ b/doc/develop/driver-model/usb-info.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later How USB works with driver model =============================== diff --git a/doc/develop/driver-model/virtio.rst b/doc/develop/driver-model/virtio.rst index 8ac9c94caf..7f256a709f 100644 --- a/doc/develop/driver-model/virtio.rst +++ b/doc/develop/driver-model/virtio.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. sectionauthor:: Bin Meng <bmeng.cn(a)gmail.com> VirtIO Support diff --git a/doc/develop/environment.rst b/doc/develop/environment.rst index e1783462bb..879f4f50a3 100644 --- a/doc/develop/environment.rst +++ b/doc/develop/environment.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Environment implementation ========================== diff --git a/doc/develop/event.rst b/doc/develop/event.rst index d5043ec4f4..f597c95ba7 100644 --- a/doc/develop/event.rst +++ b/doc/develop/event.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Events ====== diff --git a/doc/develop/expo.rst b/doc/develop/expo.rst index c87b6ec812..ae14d9cf41 100644 --- a/doc/develop/expo.rst +++ b/doc/develop/expo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Expo menu ========= diff --git a/doc/develop/global_data.rst b/doc/develop/global_data.rst index d143f27eed..455d570db1 100644 --- a/doc/develop/global_data.rst +++ b/doc/develop/global_data.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Global data =========== diff --git a/doc/develop/index.rst b/doc/develop/index.rst index f82e148b10..6b6366d7a9 100644 --- a/doc/develop/index.rst +++ b/doc/develop/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Develop U-Boot ============== diff --git a/doc/develop/logging.rst b/doc/develop/logging.rst index 704a6bf1d8..47edd23beb 100644 --- a/doc/develop/logging.rst +++ b/doc/develop/logging.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2017 Simon Glass <sjg(a)chromium.org> Logging in U-Boot diff --git a/doc/develop/menus.rst b/doc/develop/menus.rst index dda8f963fb..a51de4cf22 100644 --- a/doc/develop/menus.rst +++ b/doc/develop/menus.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2010-2011 Calxeda, Inc. Menus diff --git a/doc/develop/package/index.rst b/doc/develop/package/index.rst index 4f448313f9..b2d3f64cd6 100644 --- a/doc/develop/package/index.rst +++ b/doc/develop/package/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Package U-Boot ============== diff --git a/doc/develop/printf.rst b/doc/develop/printf.rst index 99d05061b1..d68062f910 100644 --- a/doc/develop/printf.rst +++ b/doc/develop/printf.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Printf() format codes ===================== diff --git a/doc/develop/process.rst b/doc/develop/process.rst index 92477d05dd..e662b0d20d 100644 --- a/doc/develop/process.rst +++ b/doc/develop/process.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: U-Boot Development Process ========================== diff --git a/doc/develop/python_cq.rst b/doc/develop/python_cq.rst index 1e209ff197..202ef08119 100644 --- a/doc/develop/python_cq.rst +++ b/doc/develop/python_cq.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Python code quality =================== diff --git a/doc/develop/qconfig.rst b/doc/develop/qconfig.rst index 8efb1eb268..0c38473828 100644 --- a/doc/develop/qconfig.rst +++ b/doc/develop/qconfig.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later qconfig - Querying CONFIG options ================================= diff --git a/doc/develop/security.rst b/doc/develop/security.rst index 84b130646f..167c7d39e7 100644 --- a/doc/develop/security.rst +++ b/doc/develop/security.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: Handling of security vulnerabilities ==================================== diff --git a/doc/develop/sending_patches.rst b/doc/develop/sending_patches.rst index ba73d0d11b..35284d9d70 100644 --- a/doc/develop/sending_patches.rst +++ b/doc/develop/sending_patches.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Sending patches =============== @@ -150,7 +150,7 @@ Attributing Code, Copyrights, Signing (C) Copyright 2010 Joe Hacker <jh(a)hackers.paradise.com> - SPDX-License-Identifier:<TAB>GPL-2.0+ + SPDX-License-Identifier:<TAB>GPL-2.0-or-later * If you are copying or adapting code from other projects, like the Linux kernel, or BusyBox, or similar, please make sure to state clearly where you @@ -307,7 +307,7 @@ Notes 2022) version 2 of the GPL applies. Please see :download:`Licensing <../../Licenses/README>` for details. To allow that later versions of U-Boot may be released under a later version of the GPL, all new code that gets - added to U-Boot shall use a "GPL-2.0+" SPDX-License-Identifier. + added to U-Boot shall use a "GPL-2.0-or-later" SPDX-License-Identifier. 2. All code must follow the :doc:`codingstyle` requirements. diff --git a/doc/develop/smbios.rst b/doc/develop/smbios.rst index a4efb0a0a3..2cbee915d0 100644 --- a/doc/develop/smbios.rst +++ b/doc/develop/smbios.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later SMBIOS tables ============= diff --git a/doc/develop/system_configuration.rst b/doc/develop/system_configuration.rst index 40be46b082..c64ab9981f 100644 --- a/doc/develop/system_configuration.rst +++ b/doc/develop/system_configuration.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later System configuration ==================== diff --git a/doc/develop/testing.rst b/doc/develop/testing.rst index 5afeb42f69..57336701c7 100644 --- a/doc/develop/testing.rst +++ b/doc/develop/testing.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Introduction to testing ======================= diff --git a/doc/develop/tests_sandbox.rst b/doc/develop/tests_sandbox.rst index bfd3bdb927..99bd875cb8 100644 --- a/doc/develop/tests_sandbox.rst +++ b/doc/develop/tests_sandbox.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Sandbox tests ============= diff --git a/doc/develop/tests_writing.rst b/doc/develop/tests_writing.rst index bb1145da26..ba991988aa 100644 --- a/doc/develop/tests_writing.rst +++ b/doc/develop/tests_writing.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2021 Google LLC .. sectionauthor:: Simon Glass <sjg(a)chromium.org> diff --git a/doc/develop/trace.rst b/doc/develop/trace.rst index 546862020b..78babbe03f 100644 --- a/doc/develop/trace.rst +++ b/doc/develop/trace.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2013 The Chromium OS Authors. Tracing in U-Boot diff --git a/doc/develop/uefi/fwu_updates.rst b/doc/develop/uefi/fwu_updates.rst index e4709d82b4..65a0c37ded 100644 --- a/doc/develop/uefi/fwu_updates.rst +++ b/doc/develop/uefi/fwu_updates.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2022 Linaro Limited FWU Multi Bank Updates in U-Boot diff --git a/doc/develop/uefi/index.rst b/doc/develop/uefi/index.rst index e26b1fbe05..1f39ef3a61 100644 --- a/doc/develop/uefi/index.rst +++ b/doc/develop/uefi/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Unified Extensible Firmware (UEFI) ================================== diff --git a/doc/develop/uefi/iscsi.rst b/doc/develop/uefi/iscsi.rst index 51d38cde24..5b8610f3f3 100644 --- a/doc/develop/uefi/iscsi.rst +++ b/doc/develop/uefi/iscsi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2018 Heinrich Schuchardt iSCSI booting with U-Boot and iPXE diff --git a/doc/develop/uefi/u-boot_on_efi.rst b/doc/develop/uefi/u-boot_on_efi.rst index 245b4af1fa..899f17a041 100644 --- a/doc/develop/uefi/u-boot_on_efi.rst +++ b/doc/develop/uefi/u-boot_on_efi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2015 Google, Inc U-Boot on EFI diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index fb16ac743a..8c8ed9a0c0 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2018 Heinrich Schuchardt UEFI on U-Boot diff --git a/doc/develop/vbe.rst b/doc/develop/vbe.rst index cca193c8fd..3f8e2dcdbc 100644 --- a/doc/develop/vbe.rst +++ b/doc/develop/vbe.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Verified Boot for Embedded (VBE) ================================ diff --git a/doc/develop/version.rst b/doc/develop/version.rst index 5c9046aa17..2d52413724 100644 --- a/doc/develop/version.rst +++ b/doc/develop/version.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2013 The Chromium OS Authors. Version information diff --git a/doc/index.rst b/doc/index.rst index 57b42c68e4..ec9e302b00 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. _u-boot_doc: diff --git a/doc/learn/index.rst b/doc/learn/index.rst index 8075c01d1d..e4b9bd7c19 100644 --- a/doc/learn/index.rst +++ b/doc/learn/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Learn about U-Boot ================== diff --git a/doc/learn/talks.rst b/doc/learn/talks.rst index d65e3b92be..b34e9969d4 100644 --- a/doc/learn/talks.rst +++ b/doc/learn/talks.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot Talks ============ diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1 index c4c2057d5c..1dd7b27f2e 100644 --- a/doc/mkeficapsule.1 +++ b/doc/mkeficapsule.1 @@ -1,4 +1,4 @@ -.\" SPDX-License-Identifier: GPL-2.0+ +.\" SPDX-License-Identifier: GPL-2.0-or-later .\" Copyright (c) 2021, Linaro Limited .\" written by AKASHI Takahiro <takahiro.akashi(a)linaro.org> .TH MAEFICAPSULE 1 "May 2021" diff --git a/doc/sphinx/parallel-wrapper.sh b/doc/sphinx/parallel-wrapper.sh index e54c44ce11..aedf306ded 100644 --- a/doc/sphinx/parallel-wrapper.sh +++ b/doc/sphinx/parallel-wrapper.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Figure out if we should follow a specific parallelism from the make # environment (as exported by scripts/jobserver-exec), or fall back to diff --git a/doc/usage/blkmap.rst b/doc/usage/blkmap.rst index 7337ea507a..ef045b0d80 100644 --- a/doc/usage/blkmap.rst +++ b/doc/usage/blkmap.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. .. Copyright (c) 2023 Addiva Elektronik .. Author: Tobias Waldekranz <tobias(a)waldekranz.com> diff --git a/doc/usage/cmd/acpi.rst b/doc/usage/cmd/acpi.rst index 6b9b8949f3..e74076b357 100644 --- a/doc/usage/cmd/acpi.rst +++ b/doc/usage/cmd/acpi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: acpi command ============ diff --git a/doc/usage/cmd/addrmap.rst b/doc/usage/cmd/addrmap.rst index 472fd547f3..722bf4df95 100644 --- a/doc/usage/cmd/addrmap.rst +++ b/doc/usage/cmd/addrmap.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later addrmap command =============== diff --git a/doc/usage/cmd/armffa.rst b/doc/usage/cmd/armffa.rst index 13fa90c129..4194fbff51 100644 --- a/doc/usage/cmd/armffa.rst +++ b/doc/usage/cmd/armffa.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> armffa command diff --git a/doc/usage/cmd/askenv.rst b/doc/usage/cmd/askenv.rst index 347bd59458..d885e28ebb 100644 --- a/doc/usage/cmd/askenv.rst +++ b/doc/usage/cmd/askenv.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: askenv command =============== diff --git a/doc/usage/cmd/base.rst b/doc/usage/cmd/base.rst index db9cd4d978..ac61eb7cb0 100644 --- a/doc/usage/cmd/base.rst +++ b/doc/usage/cmd/base.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later base command ============ diff --git a/doc/usage/cmd/bdinfo.rst b/doc/usage/cmd/bdinfo.rst index 5261085a06..ad8153c4c7 100644 --- a/doc/usage/cmd/bdinfo.rst +++ b/doc/usage/cmd/bdinfo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> bdinfo command diff --git a/doc/usage/cmd/bind.rst b/doc/usage/cmd/bind.rst index 1a5cffcb72..311debd279 100644 --- a/doc/usage/cmd/bind.rst +++ b/doc/usage/cmd/bind.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bind command ============ diff --git a/doc/usage/cmd/blkcache.rst b/doc/usage/cmd/blkcache.rst index d3b2254cfa..87d450057f 100644 --- a/doc/usage/cmd/blkcache.rst +++ b/doc/usage/cmd/blkcache.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> blkcache command diff --git a/doc/usage/cmd/bootd.rst b/doc/usage/cmd/bootd.rst index 380ef15283..57cac25181 100644 --- a/doc/usage/cmd/bootd.rst +++ b/doc/usage/cmd/bootd.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bootd command ============= diff --git a/doc/usage/cmd/bootdev.rst b/doc/usage/cmd/bootdev.rst index 6c68d0bf84..4bfc86970d 100644 --- a/doc/usage/cmd/bootdev.rst +++ b/doc/usage/cmd/bootdev.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bootdev command =============== diff --git a/doc/usage/cmd/bootefi.rst b/doc/usage/cmd/bootefi.rst index cb03df4e1c..146b3e6b59 100644 --- a/doc/usage/cmd/bootefi.rst +++ b/doc/usage/cmd/bootefi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> bootefi command diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst index 9c5ea9c5d8..9fe712301f 100644 --- a/doc/usage/cmd/bootflow.rst +++ b/doc/usage/cmd/bootflow.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bootflow command ================ diff --git a/doc/usage/cmd/booti.rst b/doc/usage/cmd/booti.rst index d631fb571d..8b6cacd6ac 100644 --- a/doc/usage/cmd/booti.rst +++ b/doc/usage/cmd/booti.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: booti command ============= diff --git a/doc/usage/cmd/bootm.rst b/doc/usage/cmd/bootm.rst index a7e5f6ce69..b21c06912b 100644 --- a/doc/usage/cmd/bootm.rst +++ b/doc/usage/cmd/bootm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later bootm command ============= diff --git a/doc/usage/cmd/bootmenu.rst b/doc/usage/cmd/bootmenu.rst index 684a18d8e1..fc9ae2ee5d 100644 --- a/doc/usage/cmd/bootmenu.rst +++ b/doc/usage/cmd/bootmenu.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2011-2012 Pali Rohár <pali(a)kernel.org> bootmenu command diff --git a/doc/usage/cmd/bootmeth.rst b/doc/usage/cmd/bootmeth.rst index f632d74e1d..c600237496 100644 --- a/doc/usage/cmd/bootmeth.rst +++ b/doc/usage/cmd/bootmeth.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bootmeth command ================ diff --git a/doc/usage/cmd/bootz.rst b/doc/usage/cmd/bootz.rst index 78953e9ca2..580283c080 100644 --- a/doc/usage/cmd/bootz.rst +++ b/doc/usage/cmd/bootz.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: bootz command ============= diff --git a/doc/usage/cmd/button.rst b/doc/usage/cmd/button.rst index ea41762757..c546b5bb4d 100644 --- a/doc/usage/cmd/button.rst +++ b/doc/usage/cmd/button.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later button command ============== diff --git a/doc/usage/cmd/cat.rst b/doc/usage/cmd/cat.rst index 5ef4731fe3..c0f11218d3 100644 --- a/doc/usage/cmd/cat.rst +++ b/doc/usage/cmd/cat.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: cat command =============== diff --git a/doc/usage/cmd/cbsysinfo.rst b/doc/usage/cmd/cbsysinfo.rst index 8c03a85169..45e9632e86 100644 --- a/doc/usage/cmd/cbsysinfo.rst +++ b/doc/usage/cmd/cbsysinfo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later cbsysinfo ========= diff --git a/doc/usage/cmd/cedit.rst b/doc/usage/cmd/cedit.rst index f415b48699..3592dcae74 100644 --- a/doc/usage/cmd/cedit.rst +++ b/doc/usage/cmd/cedit.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: cedit command ============= diff --git a/doc/usage/cmd/cls.rst b/doc/usage/cmd/cls.rst index b5c43e0a2e..8037d40d9d 100644 --- a/doc/usage/cmd/cls.rst +++ b/doc/usage/cmd/cls.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later cls command =========== diff --git a/doc/usage/cmd/cmp.rst b/doc/usage/cmd/cmp.rst index 8d196ee578..6cd6d26818 100644 --- a/doc/usage/cmd/cmp.rst +++ b/doc/usage/cmd/cmp.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: cmp command =========== diff --git a/doc/usage/cmd/coninfo.rst b/doc/usage/cmd/coninfo.rst index f913148c44..ca989ed143 100644 --- a/doc/usage/cmd/coninfo.rst +++ b/doc/usage/cmd/coninfo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: coninfo command =============== diff --git a/doc/usage/cmd/cp.rst b/doc/usage/cmd/cp.rst index 12a24e19fe..bb11bb8f48 100644 --- a/doc/usage/cmd/cp.rst +++ b/doc/usage/cmd/cp.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: cp command ========== diff --git a/doc/usage/cmd/cyclic.rst b/doc/usage/cmd/cyclic.rst index 3085cc7204..d380afda67 100644 --- a/doc/usage/cmd/cyclic.rst +++ b/doc/usage/cmd/cyclic.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later cyclic command ============== diff --git a/doc/usage/cmd/dm.rst b/doc/usage/cmd/dm.rst index 12b7edeed6..6f430042c3 100644 --- a/doc/usage/cmd/dm.rst +++ b/doc/usage/cmd/dm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: dm command ========== diff --git a/doc/usage/cmd/ebtupdate.rst b/doc/usage/cmd/ebtupdate.rst index d90474ccec..ab58c15647 100644 --- a/doc/usage/cmd/ebtupdate.rst +++ b/doc/usage/cmd/ebtupdate.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: ebtupdate command ================= diff --git a/doc/usage/cmd/efi.rst b/doc/usage/cmd/efi.rst index ef37ff2f4c..efc8715cdb 100644 --- a/doc/usage/cmd/efi.rst +++ b/doc/usage/cmd/efi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> efi command diff --git a/doc/usage/cmd/eficonfig.rst b/doc/usage/cmd/eficonfig.rst index 30eb72bfd0..413a5dfffe 100644 --- a/doc/usage/cmd/eficonfig.rst +++ b/doc/usage/cmd/eficonfig.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. (C) Copyright 2022, Masahisa Kojima <masahisa.kojima(a)linaro.org> eficonfig command diff --git a/doc/usage/cmd/event.rst b/doc/usage/cmd/event.rst index 47c900d17e..50b0dfea41 100644 --- a/doc/usage/cmd/event.rst +++ b/doc/usage/cmd/event.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later event command ============= diff --git a/doc/usage/cmd/extension.rst b/doc/usage/cmd/extension.rst index 6366cf56e7..40ff621413 100644 --- a/doc/usage/cmd/extension.rst +++ b/doc/usage/cmd/extension.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2021, Kory Maincent <kory.maincent(a)bootlin.com> extension command diff --git a/doc/usage/cmd/fatinfo.rst b/doc/usage/cmd/fatinfo.rst index af2eba4344..18b6187351 100644 --- a/doc/usage/cmd/fatinfo.rst +++ b/doc/usage/cmd/fatinfo.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: fatinfo command =============== diff --git a/doc/usage/cmd/fatload.rst b/doc/usage/cmd/fatload.rst index 93acb27a53..1e3338e309 100644 --- a/doc/usage/cmd/fatload.rst +++ b/doc/usage/cmd/fatload.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: fatload command =============== diff --git a/doc/usage/cmd/fdt.rst b/doc/usage/cmd/fdt.rst index 36b8230877..2bbe9afc89 100644 --- a/doc/usage/cmd/fdt.rst +++ b/doc/usage/cmd/fdt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later fdt command =========== diff --git a/doc/usage/cmd/font.rst b/doc/usage/cmd/font.rst index 8ba149d759..7a7975581b 100644 --- a/doc/usage/cmd/font.rst +++ b/doc/usage/cmd/font.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: font command ============ diff --git a/doc/usage/cmd/fwu_mdata.rst b/doc/usage/cmd/fwu_mdata.rst index ea3c22724a..71ac083b31 100644 --- a/doc/usage/cmd/fwu_mdata.rst +++ b/doc/usage/cmd/fwu_mdata.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later fwu_mdata_read command ====================== diff --git a/doc/usage/cmd/gpio.rst b/doc/usage/cmd/gpio.rst index ee902138f1..d888c494a1 100644 --- a/doc/usage/cmd/gpio.rst +++ b/doc/usage/cmd/gpio.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: gpio command ============ diff --git a/doc/usage/cmd/gpt.rst b/doc/usage/cmd/gpt.rst index f6115ecb0e..57a52e317b 100644 --- a/doc/usage/cmd/gpt.rst +++ b/doc/usage/cmd/gpt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later gpt command =========== diff --git a/doc/usage/cmd/history.rst b/doc/usage/cmd/history.rst index 33d3fcd624..e5ce749b71 100644 --- a/doc/usage/cmd/history.rst +++ b/doc/usage/cmd/history.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: history command =============== diff --git a/doc/usage/cmd/host.rst b/doc/usage/cmd/host.rst index e14508986c..cefffc8ad1 100644 --- a/doc/usage/cmd/host.rst +++ b/doc/usage/cmd/host.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later host command ============ diff --git a/doc/usage/cmd/imxtract.rst b/doc/usage/cmd/imxtract.rst index eb64b1cefa..d4c66b8761 100644 --- a/doc/usage/cmd/imxtract.rst +++ b/doc/usage/cmd/imxtract.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: imxtract command ================ diff --git a/doc/usage/cmd/load.rst b/doc/usage/cmd/load.rst index 2c892ee1cb..3dc45dc308 100644 --- a/doc/usage/cmd/load.rst +++ b/doc/usage/cmd/load.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: load command ============ diff --git a/doc/usage/cmd/loadb.rst b/doc/usage/cmd/loadb.rst index 0464b1f41c..e5ddc6ba8b 100644 --- a/doc/usage/cmd/loadb.rst +++ b/doc/usage/cmd/loadb.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: loadb command ============= diff --git a/doc/usage/cmd/loadm.rst b/doc/usage/cmd/loadm.rst index b657114043..5248813016 100644 --- a/doc/usage/cmd/loadm.rst +++ b/doc/usage/cmd/loadm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: loadm command ============= diff --git a/doc/usage/cmd/loads.rst b/doc/usage/cmd/loads.rst index e4cb063df6..63f829e84b 100644 --- a/doc/usage/cmd/loads.rst +++ b/doc/usage/cmd/loads.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: loads command ============= diff --git a/doc/usage/cmd/loadx.rst b/doc/usage/cmd/loadx.rst index facca9b969..5b182ac0e2 100644 --- a/doc/usage/cmd/loadx.rst +++ b/doc/usage/cmd/loadx.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: loadx command ============= diff --git a/doc/usage/cmd/loady.rst b/doc/usage/cmd/loady.rst index 3f8227ecf2..bc01438fac 100644 --- a/doc/usage/cmd/loady.rst +++ b/doc/usage/cmd/loady.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: loady command ============= diff --git a/doc/usage/cmd/mbr.rst b/doc/usage/cmd/mbr.rst index bddf2f612a..965fb3e75a 100644 --- a/doc/usage/cmd/mbr.rst +++ b/doc/usage/cmd/mbr.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later mbr command =========== diff --git a/doc/usage/cmd/md.rst b/doc/usage/cmd/md.rst index 7e9944e0dc..128500d73a 100644 --- a/doc/usage/cmd/md.rst +++ b/doc/usage/cmd/md.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: md command ========== diff --git a/doc/usage/cmd/mmc.rst b/doc/usage/cmd/mmc.rst index 71a0303109..f61a2d8f77 100644 --- a/doc/usage/cmd/mmc.rst +++ b/doc/usage/cmd/mmc.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: mmc command ============ diff --git a/doc/usage/cmd/mtest.rst b/doc/usage/cmd/mtest.rst index 81d1f8fd1b..26d71bc64e 100644 --- a/doc/usage/cmd/mtest.rst +++ b/doc/usage/cmd/mtest.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2022, Heinrich Schuchardt <xypron.glpk(a)gmx.de> mtest command diff --git a/doc/usage/cmd/mtrr.rst b/doc/usage/cmd/mtrr.rst index 531153bb3e..e3cefafe46 100644 --- a/doc/usage/cmd/mtrr.rst +++ b/doc/usage/cmd/mtrr.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: mtrr command ============ diff --git a/doc/usage/cmd/panic.rst b/doc/usage/cmd/panic.rst index 115eba5bde..ce9d8fe861 100644 --- a/doc/usage/cmd/panic.rst +++ b/doc/usage/cmd/panic.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: panic command ============= diff --git a/doc/usage/cmd/part.rst b/doc/usage/cmd/part.rst index 8a594aaff2..566133c2ca 100644 --- a/doc/usage/cmd/part.rst +++ b/doc/usage/cmd/part.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: part command =============== diff --git a/doc/usage/cmd/pinmux.rst b/doc/usage/cmd/pinmux.rst index 9f4392cd0d..bc3d530009 100644 --- a/doc/usage/cmd/pinmux.rst +++ b/doc/usage/cmd/pinmux.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: pinmux command ============== diff --git a/doc/usage/cmd/printenv.rst b/doc/usage/cmd/printenv.rst index d4184fd65e..6eabdada63 100644 --- a/doc/usage/cmd/printenv.rst +++ b/doc/usage/cmd/printenv.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: printenv command ================ diff --git a/doc/usage/cmd/pstore.rst b/doc/usage/cmd/pstore.rst index 1c8374513a..5e872c1545 100644 --- a/doc/usage/cmd/pstore.rst +++ b/doc/usage/cmd/pstore.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later pstore command ============== diff --git a/doc/usage/cmd/qfw.rst b/doc/usage/cmd/qfw.rst index ec13e0967a..fa39259aae 100644 --- a/doc/usage/cmd/qfw.rst +++ b/doc/usage/cmd/qfw.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later qfw command =========== diff --git a/doc/usage/cmd/reset.rst b/doc/usage/cmd/reset.rst index 384d5d60f8..1289d85b2b 100644 --- a/doc/usage/cmd/reset.rst +++ b/doc/usage/cmd/reset.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later reset command ============= diff --git a/doc/usage/cmd/rng.rst b/doc/usage/cmd/rng.rst index 1a352da41a..a475447547 100644 --- a/doc/usage/cmd/rng.rst +++ b/doc/usage/cmd/rng.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later rng command =========== diff --git a/doc/usage/cmd/saves.rst b/doc/usage/cmd/saves.rst index 5823f88379..433b6226ca 100644 --- a/doc/usage/cmd/saves.rst +++ b/doc/usage/cmd/saves.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: saves command ============= diff --git a/doc/usage/cmd/sbi.rst b/doc/usage/cmd/sbi.rst index 713e0b9c81..4fb0171d1e 100644 --- a/doc/usage/cmd/sbi.rst +++ b/doc/usage/cmd/sbi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later sbi command =========== diff --git a/doc/usage/cmd/scp03.rst b/doc/usage/cmd/scp03.rst index 7ff87ed85a..db6880c4bc 100644 --- a/doc/usage/cmd/scp03.rst +++ b/doc/usage/cmd/scp03.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later scp03 command ============= diff --git a/doc/usage/cmd/seama.rst b/doc/usage/cmd/seama.rst index 356c00a723..d950b71157 100644 --- a/doc/usage/cmd/seama.rst +++ b/doc/usage/cmd/seama.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: seama command ============= diff --git a/doc/usage/cmd/setexpr.rst b/doc/usage/cmd/setexpr.rst index 4d19fa340d..ea8ab58e36 100644 --- a/doc/usage/cmd/setexpr.rst +++ b/doc/usage/cmd/setexpr.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later setexpr command =============== diff --git a/doc/usage/cmd/sf.rst b/doc/usage/cmd/sf.rst index 71bd1be517..922c6cacbf 100644 --- a/doc/usage/cmd/sf.rst +++ b/doc/usage/cmd/sf.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: sf command ========== diff --git a/doc/usage/cmd/size.rst b/doc/usage/cmd/size.rst index f0c35e4826..b186633b03 100644 --- a/doc/usage/cmd/size.rst +++ b/doc/usage/cmd/size.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later size command ============ diff --git a/doc/usage/cmd/sleep.rst b/doc/usage/cmd/sleep.rst index d19e5b3af8..d2fe6059c3 100644 --- a/doc/usage/cmd/sleep.rst +++ b/doc/usage/cmd/sleep.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> sleep command diff --git a/doc/usage/cmd/sm.rst b/doc/usage/cmd/sm.rst index f6524a1c2e..351e06b657 100644 --- a/doc/usage/cmd/sm.rst +++ b/doc/usage/cmd/sm.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: sm command ========== diff --git a/doc/usage/cmd/sound.rst b/doc/usage/cmd/sound.rst index 2cfe9b7ad1..82087f1d24 100644 --- a/doc/usage/cmd/sound.rst +++ b/doc/usage/cmd/sound.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2022, Heinrich Schuchardt <xypron.glpk(a)gmx.de> sound command diff --git a/doc/usage/cmd/source.rst b/doc/usage/cmd/source.rst index 697f644745..b6da89aa42 100644 --- a/doc/usage/cmd/source.rst +++ b/doc/usage/cmd/source.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2022, Heinrich Schuchardt <xypron.glpk(a)gmx.de> source command diff --git a/doc/usage/cmd/tftpput.rst b/doc/usage/cmd/tftpput.rst index 52ba7b179a..fa744b0e1f 100644 --- a/doc/usage/cmd/tftpput.rst +++ b/doc/usage/cmd/tftpput.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: tftpput command =============== diff --git a/doc/usage/cmd/trace.rst b/doc/usage/cmd/trace.rst index 3bdf4f0a86..b9e7af2a7f 100644 --- a/doc/usage/cmd/trace.rst +++ b/doc/usage/cmd/trace.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: trace command ============= diff --git a/doc/usage/cmd/ums.rst b/doc/usage/cmd/ums.rst index 3cde5fa1f2..8a6cb16fe1 100644 --- a/doc/usage/cmd/ums.rst +++ b/doc/usage/cmd/ums.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later ums command =========== diff --git a/doc/usage/cmd/unbind.rst b/doc/usage/cmd/unbind.rst index 594e4f0689..35d3f35938 100644 --- a/doc/usage/cmd/unbind.rst +++ b/doc/usage/cmd/unbind.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: unbind command ============== diff --git a/doc/usage/cmd/ut.rst b/doc/usage/cmd/ut.rst index a3039634f2..0ca2086aa0 100644 --- a/doc/usage/cmd/ut.rst +++ b/doc/usage/cmd/ut.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: ut command ========== diff --git a/doc/usage/cmd/wdt.rst b/doc/usage/cmd/wdt.rst index 8d80433c1f..e84051ae5e 100644 --- a/doc/usage/cmd/wdt.rst +++ b/doc/usage/cmd/wdt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: wdt command ============ diff --git a/doc/usage/cmd/wget.rst b/doc/usage/cmd/wget.rst index e1e7f8d814..028aebdcbb 100644 --- a/doc/usage/cmd/wget.rst +++ b/doc/usage/cmd/wget.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: wget command ============ diff --git a/doc/usage/cmd/xxd.rst b/doc/usage/cmd/xxd.rst index 0de1223dce..185a633b1b 100644 --- a/doc/usage/cmd/xxd.rst +++ b/doc/usage/cmd/xxd.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+: +.. SPDX-License-Identifier: GPL-2.0-or-later: xxd command =============== diff --git a/doc/usage/cmdline.rst b/doc/usage/cmdline.rst index 58240c5279..e2d0505b73 100644 --- a/doc/usage/cmdline.rst +++ b/doc/usage/cmdline.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Command-line Parsing ==================== diff --git a/doc/usage/dfu.rst b/doc/usage/dfu.rst index 68cacbbef6..998158ca48 100644 --- a/doc/usage/dfu.rst +++ b/doc/usage/dfu.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Device Firmware Upgrade (DFU) ============================= diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index c57b717caa..30d677e85d 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Environment Variables ===================== diff --git a/doc/usage/fdt_overlays.rst b/doc/usage/fdt_overlays.rst index 81d0d37f3f..5830c79a89 100644 --- a/doc/usage/fdt_overlays.rst +++ b/doc/usage/fdt_overlays.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2017, Pantelis Antoniou <pantelis.antoniou(a)konsulko.com> Device Tree Overlays diff --git a/doc/usage/fit/beaglebone_vboot.rst b/doc/usage/fit/beaglebone_vboot.rst index 0580ee10bd..e3ccc629a7 100644 --- a/doc/usage/fit/beaglebone_vboot.rst +++ b/doc/usage/fit/beaglebone_vboot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Verified Boot on the Beaglebone Black ===================================== diff --git a/doc/usage/fit/howto.rst b/doc/usage/fit/howto.rst index def12a70f7..618e39fd30 100644 --- a/doc/usage/fit/howto.rst +++ b/doc/usage/fit/howto.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later How to use images in the new image format ========================================= diff --git a/doc/usage/fit/index.rst b/doc/usage/fit/index.rst index bd25bd30b2..21da8d7ba9 100644 --- a/doc/usage/fit/index.rst +++ b/doc/usage/fit/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Flat Image Tree (FIT) ===================== diff --git a/doc/usage/fit/kernel.rst b/doc/usage/fit/kernel.rst index 012a81efea..faaebf8de7 100644 --- a/doc/usage/fit/kernel.rst +++ b/doc/usage/fit/kernel.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Single kernel ============= diff --git a/doc/usage/fit/kernel_fdt.rst b/doc/usage/fit/kernel_fdt.rst index 8eee13af78..3864d12be4 100644 --- a/doc/usage/fit/kernel_fdt.rst +++ b/doc/usage/fit/kernel_fdt.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Single kernel and FDT blob ========================== diff --git a/doc/usage/fit/kernel_fdts_compressed.rst b/doc/usage/fit/kernel_fdts_compressed.rst index 0b169c7c27..eda5129461 100644 --- a/doc/usage/fit/kernel_fdts_compressed.rst +++ b/doc/usage/fit/kernel_fdts_compressed.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Kernel and multiple compressed FDT blobs ======================================== diff --git a/doc/usage/fit/multi-with-fpga.rst b/doc/usage/fit/multi-with-fpga.rst index 28d7d5d262..46df6fe1f1 100644 --- a/doc/usage/fit/multi-with-fpga.rst +++ b/doc/usage/fit/multi-with-fpga.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Multiple kernels, ramdisks and FDT blobs with FPGA ================================================== diff --git a/doc/usage/fit/multi-with-loadables.rst b/doc/usage/fit/multi-with-loadables.rst index a0241df96c..9783bef194 100644 --- a/doc/usage/fit/multi-with-loadables.rst +++ b/doc/usage/fit/multi-with-loadables.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Multiple kernels, ramdisks and FDT blobs with Xen ================================================= diff --git a/doc/usage/fit/multi.rst b/doc/usage/fit/multi.rst index 2e6ae58c40..f990f464e9 100644 --- a/doc/usage/fit/multi.rst +++ b/doc/usage/fit/multi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Multiple kernels, ramdisks and FDT blobs ======================================== diff --git a/doc/usage/fit/multi_spl.rst b/doc/usage/fit/multi_spl.rst index 74b6f865ab..71348d68a8 100644 --- a/doc/usage/fit/multi_spl.rst +++ b/doc/usage/fit/multi_spl.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Multiple images for SPL ======================= diff --git a/doc/usage/fit/overlay-fdt-boot.rst b/doc/usage/fit/overlay-fdt-boot.rst index a7db1a37f7..0b77fad9ab 100644 --- a/doc/usage/fit/overlay-fdt-boot.rst +++ b/doc/usage/fit/overlay-fdt-boot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot FDT Overlay FIT usage ============================ diff --git a/doc/usage/fit/sec_firmware_ppa.rst b/doc/usage/fit/sec_firmware_ppa.rst index 4cb292cb4e..b52bc263d0 100644 --- a/doc/usage/fit/sec_firmware_ppa.rst +++ b/doc/usage/fit/sec_firmware_ppa.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later SEC Firmware and multiple loadable images ========================================= diff --git a/doc/usage/fit/sign-configs.rst b/doc/usage/fit/sign-configs.rst index 6a3df8f2c5..a25bf45798 100644 --- a/doc/usage/fit/sign-configs.rst +++ b/doc/usage/fit/sign-configs.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Signed configurations ===================== diff --git a/doc/usage/fit/sign-images.rst b/doc/usage/fit/sign-images.rst index 7d54d702c9..d65c407f6f 100644 --- a/doc/usage/fit/sign-images.rst +++ b/doc/usage/fit/sign-images.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Signed Images ============= diff --git a/doc/usage/fit/signature.rst b/doc/usage/fit/signature.rst index 0804bffd1e..c5f4b6b301 100644 --- a/doc/usage/fit/signature.rst +++ b/doc/usage/fit/signature.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot FIT Signature Verification ================================= diff --git a/doc/usage/fit/source_file_format.rst b/doc/usage/fit/source_file_format.rst index b2b1e42bd7..3e479b22d6 100644 --- a/doc/usage/fit/source_file_format.rst +++ b/doc/usage/fit/source_file_format.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Flattened Image Tree (FIT) Format ================================= diff --git a/doc/usage/fit/uefi.rst b/doc/usage/fit/uefi.rst index 3bbacb5cad..2a8c090f05 100644 --- a/doc/usage/fit/uefi.rst +++ b/doc/usage/fit/uefi.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later UEFI ==== diff --git a/doc/usage/fit/update3.rst b/doc/usage/fit/update3.rst index 4ff3950c01..d044c10afb 100644 --- a/doc/usage/fit/update3.rst +++ b/doc/usage/fit/update3.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Automatic software update: multiple files ========================================= diff --git a/doc/usage/fit/update_uboot.rst b/doc/usage/fit/update_uboot.rst index a9288ee636..8c2da45318 100644 --- a/doc/usage/fit/update_uboot.rst +++ b/doc/usage/fit/update_uboot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Automatic software update ========================= diff --git a/doc/usage/fit/verified-boot.rst b/doc/usage/fit/verified-boot.rst index 301207711d..8059998fb3 100644 --- a/doc/usage/fit/verified-boot.rst +++ b/doc/usage/fit/verified-boot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later U-Boot Verified Boot ==================== diff --git a/doc/usage/fit/x86-fit-boot.rst b/doc/usage/fit/x86-fit-boot.rst index 93b73bb901..a5056ba69e 100644 --- a/doc/usage/fit/x86-fit-boot.rst +++ b/doc/usage/fit/x86-fit-boot.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Booting Linux on x86 with FIT ============================= diff --git a/doc/usage/os/plan9.rst b/doc/usage/os/plan9.rst index f91712c009..4d82828938 100644 --- a/doc/usage/os/plan9.rst +++ b/doc/usage/os/plan9.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Steven Stallion .. June 2013 diff --git a/doc/usage/os/vxworks.rst b/doc/usage/os/vxworks.rst index 0fe33d2d34..f175804f1c 100644 --- a/doc/usage/os/vxworks.rst +++ b/doc/usage/os/vxworks.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (C) 2013, Miao Yan <miao.yan(a)windriver.com> .. Copyright (C) 2015-2018, Bin Meng <bmeng.cn(a)gmail.com> .. Copyright (C) 2019, Lihua Zhao <lihua.zhao(a)windriver.com> diff --git a/doc/usage/partitions.rst b/doc/usage/partitions.rst index 628469bbec..6bea0c9601 100644 --- a/doc/usage/partitions.rst +++ b/doc/usage/partitions.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. _partitions: Partitions diff --git a/doc/usage/semihosting.rst b/doc/usage/semihosting.rst index 9303a6364d..249779e1ce 100644 --- a/doc/usage/semihosting.rst +++ b/doc/usage/semihosting.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright 2014 Broadcom Corporation. Semihosting diff --git a/drivers/Makefile b/drivers/Makefile index 74f940a57d..5e902f99dd 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_$(SPL_TPL_)BIOSEMU) += bios_emulator/ obj-$(CONFIG_$(SPL_TPL_)BLK) += block/ diff --git a/drivers/adc/Makefile b/drivers/adc/Makefile index 5336c82097..18176be12e 100644 --- a/drivers/adc/Makefile +++ b/drivers/adc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Samsung Electronics # Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/adc/adc-uclass.c b/drivers/adc/adc-uclass.c index 1b35bf2201..aedb618795 100644 --- a/drivers/adc/adc-uclass.c +++ b/drivers/adc/adc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/adc/exynos-adc.c b/drivers/adc/exynos-adc.c index 2bda733af9..72f3f09494 100644 --- a/drivers/adc/exynos-adc.c +++ b/drivers/adc/exynos-adc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/adc/imx93-adc.c b/drivers/adc/imx93-adc.c index 41d04e0426..17cbe6163b 100644 --- a/drivers/adc/imx93-adc.c +++ b/drivers/adc/imx93-adc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 ASEM Srl * Author: Luca Ellero <l.ellero(a)asem.it> diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index c15c7fea47..ac74a921f5 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> * Copyright (C) 2018 BayLibre, SAS diff --git a/drivers/adc/rockchip-saradc.c b/drivers/adc/rockchip-saradc.c index 03caca78b5..06d77dbe21 100644 --- a/drivers/adc/rockchip-saradc.c +++ b/drivers/adc/rockchip-saradc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017, Fuzhou Rockchip Electronics Co., Ltd * diff --git a/drivers/adc/sandbox.c b/drivers/adc/sandbox.c index 43cad34ffe..3c05baf680 100644 --- a/drivers/adc/sandbox.c +++ b/drivers/adc/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 6e30180b8b..64689dd0c2 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/ata/ahci-pci.c b/drivers/ata/ahci-pci.c index 5356b9d83d..c7de678350 100644 --- a/drivers/ata/ahci-pci.c +++ b/drivers/ata/ahci-pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c index d398b50b9a..31b6f38a54 100644 --- a/drivers/ata/ahci-uclass.c +++ b/drivers/ata/ahci-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index cb2c648a91..747fd61280 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Freescale Semiconductor, Inc. 2006. * Author: Jason Jin<Jason.jin(a)freescale.com> diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index f05150d61d..280fdebb1a 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c index 15fd3e365b..c78dd49074 100644 --- a/drivers/ata/dwc_ahci.c +++ b/drivers/ata/dwc_ahci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DWC SATA platform driver * diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c index b4d4e39c9b..b37160c6e7 100644 --- a/drivers/ata/dwc_ahsata.c +++ b/drivers/ata/dwc_ahsata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. * Terry Lv <r65388(a)freescale.com> diff --git a/drivers/ata/dwc_ahsata_priv.h b/drivers/ata/dwc_ahsata_priv.h index 5b0579ae11..b798c8475b 100644 --- a/drivers/ata/dwc_ahsata_priv.h +++ b/drivers/ata/dwc_ahsata_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Freescale Semiconductor, Inc. * Terry Lv <r65388(a)freescale.com> diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c index 969bc191f8..0941a3e030 100644 --- a/drivers/ata/fsl_sata.c +++ b/drivers/ata/fsl_sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008,2010 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/drivers/ata/fsl_sata.h b/drivers/ata/fsl_sata.h index e1ea8eb3a1..18c382ec1b 100644 --- a/drivers/ata/fsl_sata.h +++ b/drivers/ata/fsl_sata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2008 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c index 47e2c5c1cc..fb7ade7713 100644 --- a/drivers/ata/libata.c +++ b/drivers/ata/libata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c index 2c5227df30..3d38a8623d 100644 --- a/drivers/ata/mtk_ahci.c +++ b/drivers/ata/mtk_ahci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MTK SATA platform driver * diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c index ce3e9b5a40..94361e0b3c 100644 --- a/drivers/ata/sata.c +++ b/drivers/ata/sata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2000-2005, DENX Software Engineering * Wolfgang Denk <wd(a)denx.de> diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 7769d4f99e..6134d7bcb2 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 - 2016 Xilinx, Inc. * Michal Simek <michal.simek(a)amd.com> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 94d7369351..040f3559c2 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Excito Elektronik i Skåne AB, 2010. * Author: Tor Krill <tor(a)excito.com> diff --git a/drivers/ata/sata_sandbox.c b/drivers/ata/sata_sandbox.c index e64cc4a5c1..919665222b 100644 --- a/drivers/ata/sata_sandbox.c +++ b/drivers/ata/sata_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 43a91a7912..7a353d6dfd 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/drivers/ata/sata_sil.h b/drivers/ata/sata_sil.h index 9ad09e5461..82d00caa37 100644 --- a/drivers/ata/sata_sil.h +++ b/drivers/ata/sata_sil.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/drivers/axi/Makefile b/drivers/axi/Makefile index 045db1ab30..838691656e 100644 --- a/drivers/axi/Makefile +++ b/drivers/axi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 # Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c index e6f3ef0720..b5d2102d11 100644 --- a/drivers/axi/axi-emul-uclass.c +++ b/drivers/axi/axi-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/axi/axi-uclass.c b/drivers/axi/axi-uclass.c index 41551ae85c..11e7d61bba 100644 --- a/drivers/axi/axi-uclass.c +++ b/drivers/axi/axi-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/axi/axi_sandbox.c b/drivers/axi/axi_sandbox.c index b91c91f6b3..f24d2de610 100644 --- a/drivers/axi/axi_sandbox.c +++ b/drivers/axi/axi_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/axi/ihs_axi.c b/drivers/axi/ihs_axi.c index a7e9761fbf..95e0178ca1 100644 --- a/drivers/axi/ihs_axi.c +++ b/drivers/axi/ihs_axi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/drivers/axi/sandbox_store.c b/drivers/axi/sandbox_store.c index ef349a50b7..e05ea2965c 100644 --- a/drivers/axi/sandbox_store.c +++ b/drivers/axi/sandbox_store.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile index d9cf6ad5d1..4de182eb28 100644 --- a/drivers/bios_emulator/Makefile +++ b/drivers/bios_emulator/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later X86DIR = x86emu diff --git a/drivers/block/Makefile b/drivers/block/Makefile index a161d145fd..f2b1835105 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index f126547cc7..ae194dea7a 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c index 5bf1d04715..b85ea2ce17 100644 --- a/drivers/block/blk_legacy.c +++ b/drivers/block/blk_legacy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c index 26bcbea435..4d6ed725c6 100644 --- a/drivers/block/blkcache.c +++ b/drivers/block/blkcache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Nelson Integration, LLC 2016 * Author: Eric Nelson<eric(a)nelint.com> diff --git a/drivers/block/blkmap.c b/drivers/block/blkmap.c index 149a4cac3e..dce4b9f301 100644 --- a/drivers/block/blkmap.c +++ b/drivers/block/blkmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Addiva Elektronik * Author: Tobias Waldekranz <tobias(a)waldekranz.com> diff --git a/drivers/block/efi-media-uclass.c b/drivers/block/efi-media-uclass.c index e012f6f2f4..7048eb1187 100644 --- a/drivers/block/efi-media-uclass.c +++ b/drivers/block/efi-media-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Uclass for EFI media devices * diff --git a/drivers/block/efi_blk.c b/drivers/block/efi_blk.c index 917a19f602..a737678b66 100644 --- a/drivers/block/efi_blk.c +++ b/drivers/block/efi_blk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Block driver for EFI devices * This supports a media driver of UCLASS_EFI with a child UCLASS_BLK diff --git a/drivers/block/host-uclass.c b/drivers/block/host-uclass.c index b3647e3ce3..0a8b1dc4c2 100644 --- a/drivers/block/host-uclass.c +++ b/drivers/block/host-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Uclass for sandbox host interface, used to access files on the host which * contain partitions and filesystem diff --git a/drivers/block/host_dev.c b/drivers/block/host_dev.c index 30c7415793..d51ceb2a70 100644 --- a/drivers/block/host_dev.c +++ b/drivers/block/host_dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for sandbox host interface, used to access files on the host which * contain partitions and filesystem diff --git a/drivers/block/ide.c b/drivers/block/ide.c index c698f9cbd5..048e3b3733 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2011 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c index be4e02cb60..38d3d21729 100644 --- a/drivers/block/sandbox.c +++ b/drivers/block/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> */ diff --git a/drivers/block/sb_efi_media.c b/drivers/block/sb_efi_media.c index 52af155a60..964c17f873 100644 --- a/drivers/block/sb_efi_media.c +++ b/drivers/block/sb_efi_media.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI_MEDIA driver for sandbox * diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index b65959a384..e4281ef77e 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_BOOTCOUNT_GENERIC) += bootcount.o obj-$(CONFIG_BOOTCOUNT_MEM) += bootcount.o diff --git a/drivers/bootcount/bootcount-uclass.c b/drivers/bootcount/bootcount-uclass.c index 5a369c82f1..dffd9f324c 100644 --- a/drivers/bootcount/bootcount-uclass.c +++ b/drivers/bootcount/bootcount-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index 343b8a3441..f6d93fe705 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2012 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/drivers/bootcount/bootcount_at91.c b/drivers/bootcount/bootcount_at91.c index c4ab5ceafa..3e92b35757 100644 --- a/drivers/bootcount/bootcount_at91.c +++ b/drivers/bootcount/bootcount_at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c index 6326957d7b..a9d2b3d835 100644 --- a/drivers/bootcount/bootcount_davinci.c +++ b/drivers/bootcount/bootcount_davinci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c index b75c9002b2..7e8e9dc1ea 100644 --- a/drivers/bootcount/bootcount_env.c +++ b/drivers/bootcount/bootcount_env.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/bootcount/bootcount_ext.c b/drivers/bootcount/bootcount_ext.c index 9639e638e9..86e5e6005c 100644 --- a/drivers/bootcount/bootcount_ext.c +++ b/drivers/bootcount/bootcount_ext.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 General Electric Company. All rights reserved. */ diff --git a/drivers/bootcount/bootcount_i2c.c b/drivers/bootcount/bootcount_i2c.c index b3ac67ea35..973c4906a5 100644 --- a/drivers/bootcount/bootcount_i2c.c +++ b/drivers/bootcount/bootcount_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/bootcount/bootcount_nvmem.c b/drivers/bootcount/bootcount_nvmem.c index 5f266d5ec8..ede81be0d0 100644 --- a/drivers/bootcount/bootcount_nvmem.c +++ b/drivers/bootcount/bootcount_nvmem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c index 8cc30cf40e..b594ee744b 100644 --- a/drivers/bootcount/bootcount_ram.c +++ b/drivers/bootcount/bootcount_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c index 709be094b1..798baba978 100644 --- a/drivers/bootcount/i2c-eeprom.c +++ b/drivers/bootcount/i2c-eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Collabora * (C) Copyright 2019 GE diff --git a/drivers/bootcount/pmic_pfuze100.c b/drivers/bootcount/pmic_pfuze100.c index df046f1b0a..5c2518f65d 100644 --- a/drivers/bootcount/pmic_pfuze100.c +++ b/drivers/bootcount/pmic_pfuze100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018-2022 Denx Software Engineering GmbH * Heiko Schocher <hs(a)denx.de> diff --git a/drivers/bootcount/rtc.c b/drivers/bootcount/rtc.c index 483caaa80d..c7d2c96293 100644 --- a/drivers/bootcount/rtc.c +++ b/drivers/bootcount/rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/bootcount/spi-flash.c b/drivers/bootcount/spi-flash.c index 03050e6661..2ea86f5199 100644 --- a/drivers/bootcount/spi-flash.c +++ b/drivers/bootcount/spi-flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Collabora * (C) Copyright 2019 GE diff --git a/drivers/bus/ti-pwmss.c b/drivers/bus/ti-pwmss.c index 265b4cf83b..b92452dae8 100644 --- a/drivers/bus/ti-pwmss.c +++ b/drivers/bus/ti-pwmss.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pulse-Width Modulation Subsystem (pwmss) * diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 778c0654f6..1320788010 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments sysc interconnect target driver * diff --git a/drivers/button/Makefile b/drivers/button/Makefile index bbd18af149..73ff16ee60 100644 --- a/drivers/button/Makefile +++ b/drivers/button/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> diff --git a/drivers/button/button-uclass.c b/drivers/button/button-uclass.c index 032191d61a..f8f2449aa1 100644 --- a/drivers/button/button-uclass.c +++ b/drivers/button/button-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> * diff --git a/drivers/cache/cache-uclass.c b/drivers/cache/cache-uclass.c index 0c13dbdb75..6e2dead0ee 100644 --- a/drivers/cache/cache-uclass.c +++ b/drivers/cache/cache-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 26bf429acb..39e65818ec 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/clk/altera/Makefile b/drivers/clk/altera/Makefile index 33db092918..3c6c0e29d4 100644 --- a/drivers/clk/altera/Makefile +++ b/drivers/clk/altera/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018-2021 Marek Vasut <marex(a)denx.de> # diff --git a/drivers/clk/analogbits/Makefile b/drivers/clk/analogbits/Makefile index ec1bb4092b..72b9f8d803 100644 --- a/drivers/clk/analogbits/Makefile +++ b/drivers/clk/analogbits/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CLK_ANALOGBITS_WRPLL_CLN28HPC) += wrpll-cln28hpc.o diff --git a/drivers/clk/aspeed/Makefile b/drivers/clk/aspeed/Makefile index 84776e5265..0a75958fd6 100644 --- a/drivers/clk/aspeed/Makefile +++ b/drivers/clk/aspeed/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc # diff --git a/drivers/clk/at91/clk-generic.c b/drivers/clk/at91/clk-generic.c index 87738b7b5b..29c0927fc5 100644 --- a/drivers/clk/at91/clk-generic.c +++ b/drivers/clk/at91/clk-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic clock support for AT91 architectures. * diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index b52d926f33..b03eecc338 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Main clock support for AT91 architectures. * diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c index aec0bca7b3..803980e1ab 100644 --- a/drivers/clk/at91/clk-master.c +++ b/drivers/clk/at91/clk-master.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Master clock support for AT91 architectures. * diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c index 52cbc520ce..ca7ad789a1 100644 --- a/drivers/clk/at91/clk-peripheral.c +++ b/drivers/clk/at91/clk-peripheral.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Peripheral clock support for AT91 architectures. * diff --git a/drivers/clk/at91/clk-sam9x60-pll.c b/drivers/clk/at91/clk-sam9x60-pll.c index 383f79cfba..1d9e600861 100644 --- a/drivers/clk/at91/clk-sam9x60-pll.c +++ b/drivers/clk/at91/clk-sam9x60-pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAM9X60's PLL clock support. * diff --git a/drivers/clk/at91/clk-sam9x60-usb.c b/drivers/clk/at91/clk-sam9x60-usb.c index 798fa9eb3c..28c296a996 100644 --- a/drivers/clk/at91/clk-sam9x60-usb.c +++ b/drivers/clk/at91/clk-sam9x60-usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAM9X60's USB Clock support. * diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c index 82f79e74a1..03aba1f58e 100644 --- a/drivers/clk/at91/clk-system.c +++ b/drivers/clk/at91/clk-system.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * System clock support for AT91 architectures. * diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c index 7c8bcfb51d..e6f75c6a7d 100644 --- a/drivers/clk/at91/clk-utmi.c +++ b/drivers/clk/at91/clk-utmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UTMI clock support for AT91 architectures. * diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c index 2fdc2fbd55..51e5fa43b8 100644 --- a/drivers/clk/at91/compat.c +++ b/drivers/clk/at91/compat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Compatible code for non CCF AT91 platforms. * diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index 87d2069d89..e994854dd2 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Atmel Corporation * Wenyou.Yang <wenyou.yang(a)atmel.com> diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index ff464522aa..7ff90fbc06 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Atmel Corporation * Wenyou.Yang <wenyou.yang(a)atmel.com> diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index d858c860f6..bacb9007b6 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology Inc. and its subsidiaries * diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index 3e62fb1f58..14a877aef1 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMA7G5 PMC clock support. * diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c index 43136ab2e3..a5cd12c6fa 100644 --- a/drivers/clk/at91/sckc.c +++ b/drivers/clk/at91/sckc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Slow clock support for AT91 architectures. * diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c index f23465d7e1..134dd6a886 100644 --- a/drivers/clk/clk-cdce9xx.c +++ b/drivers/clk/clk-cdce9xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments CDCE913/925/937/949 clock synthesizer driver * diff --git a/drivers/clk/clk-gpio.c b/drivers/clk/clk-gpio.c index 26d795b978..2abd74c9ab 100644 --- a/drivers/clk/clk-gpio.c +++ b/drivers/clk/clk-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Marek Vasut <marek.vasut+renesas(a)mailbox.org> */ diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index f186fcbcdb..f7c0ee187f 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a5a3461b66..32beff0afc 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/clk_bcm6345.c b/drivers/clk/clk_bcm6345.c index 8c22ed2f43..5dcc51ac91 100644 --- a/drivers/clk/clk_bcm6345.c +++ b/drivers/clk/clk_bcm6345.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/clk_fixed_factor.c index 6c1139e5c5..e95020866c 100644 --- a/drivers/clk/clk_fixed_factor.c +++ b/drivers/clk/clk_fixed_factor.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Western Digital Corporation or its affiliates. * diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index b5e78c7055..c8d29bd97d 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c index c534cc07e0..ca56d39247 100644 --- a/drivers/clk/clk_k210.c +++ b/drivers/clk/clk_k210.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/drivers/clk/clk_octeon.c b/drivers/clk/clk_octeon.c index fa50265184..66790d439e 100644 --- a/drivers/clk/clk_octeon.c +++ b/drivers/clk/clk_octeon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/clk/clk_pic32.c b/drivers/clk/clk_pic32.c index ef06a7fb9f..b5b67aeb86 100644 --- a/drivers/clk/clk_pic32.c +++ b/drivers/clk/clk_pic32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c index fedcdd4044..004c0d56f6 100644 --- a/drivers/clk/clk_sandbox_ccf.c +++ b/drivers/clk/clk_sandbox_ccf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/clk_scmi.c b/drivers/clk/clk_scmi.c index 34a49363a5..e02c99326d 100644 --- a/drivers/clk/clk_scmi.c +++ b/drivers/clk/clk_scmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-2022 Linaro Limited */ diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index c473643603..9efce480be 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Xilinx, Inc. * Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu(a)amd.com>> diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c index 3b1e0208d4..13c33fc502 100644 --- a/drivers/clk/clk_vexpress_osc.c +++ b/drivers/clk/clk_vexpress_osc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Arm Ltd * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index e80500e382..77ed282be9 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Weidmüller Interface GmbH & Co. KG * Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> diff --git a/drivers/clk/clk_zynqmp.c b/drivers/clk/clk_zynqmp.c index 1cfe0e25b1..385233087a 100644 --- a/drivers/clk/clk_zynqmp.c +++ b/drivers/clk/clk_zynqmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ZynqMP clock driver * diff --git a/drivers/clk/exynos/Makefile b/drivers/clk/exynos/Makefile index c9f29c873e..a7fe128551 100644 --- a/drivers/clk/exynos/Makefile +++ b/drivers/clk/exynos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Samsung Electronics # Thomas Abraham <thomas.ab(a)samsung.com> diff --git a/drivers/clk/exynos/clk-exynos7420.c b/drivers/clk/exynos/clk-exynos7420.c index 7d869eb02b..895a8e570e 100644 --- a/drivers/clk/exynos/clk-exynos7420.c +++ b/drivers/clk/exynos/clk-exynos7420.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Samsung Exynos7420 clock driver. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/clk/exynos/clk-pll.c b/drivers/clk/exynos/clk-pll.c index 407fc71d41..eec3905015 100644 --- a/drivers/clk/exynos/clk-pll.c +++ b/drivers/clk/exynos/clk-pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Exynos PLL helper functions for clock drivers. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/clk/exynos/clk-pll.h b/drivers/clk/exynos/clk-pll.h index c79aac4425..129e0d428f 100644 --- a/drivers/clk/exynos/clk-pll.h +++ b/drivers/clk/exynos/clk-pll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Exynos PLL helper functions for clock drivers. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/clk/ics8n3qv01.c b/drivers/clk/ics8n3qv01.c index 33fb6ed0c7..ae7dca3b52 100644 --- a/drivers/clk/ics8n3qv01.c +++ b/drivers/clk/ics8n3qv01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/clk/imx/clk-composite-93.c b/drivers/clk/imx/clk-composite-93.c index 6d71c0c03f..51b3c6a67b 100644 --- a/drivers/clk/imx/clk-composite-93.c +++ b/drivers/clk/imx/clk-composite-93.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP * diff --git a/drivers/clk/imx/clk-gate-93.c b/drivers/clk/imx/clk-gate-93.c index bc85741371..1fe06db94b 100644 --- a/drivers/clk/imx/clk-gate-93.c +++ b/drivers/clk/imx/clk-gate-93.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/drivers/clk/imx/clk-gate2.c b/drivers/clk/imx/clk-gate2.c index da27230237..a6bd1dde70 100644 --- a/drivers/clk/imx/clk-gate2.c +++ b/drivers/clk/imx/clk-gate2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h index 6e850ba266..ed0c1aaf55 100644 --- a/drivers/clk/imx/clk-imx8.h +++ b/drivers/clk/imx/clk-imx8.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP * Peng Fan <peng.fan(a)nxp.com> diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c index dc91ac5adb..a5bbe622e6 100644 --- a/drivers/clk/imx/clk-imxrt1020.c +++ b/drivers/clk/imx/clk-imxrt1020.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright(C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c index d40635d17a..63b6b2489a 100644 --- a/drivers/clk/imx/clk-imxrt1050.c +++ b/drivers/clk/imx/clk-imxrt1050.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright(C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/drivers/clk/imx/clk-imxrt1170.c b/drivers/clk/imx/clk-imxrt1170.c index 077dd1bf02..4505407457 100644 --- a/drivers/clk/imx/clk-imxrt1170.c +++ b/drivers/clk/imx/clk-imxrt1170.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/drivers/clk/imx/clk-pfd.c b/drivers/clk/imx/clk-pfd.c index b8be3167c4..5853c2ae91 100644 --- a/drivers/clk/imx/clk-pfd.c +++ b/drivers/clk/imx/clk-pfd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index fad306aeed..d11b7cc19d 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 27a53ae558..a14813e8cd 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/clk/intel/Makefile b/drivers/clk/intel/Makefile index 45e93d7024..681ad23056 100644 --- a/drivers/clk/intel/Makefile +++ b/drivers/clk/intel/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2010 Google LLC # diff --git a/drivers/clk/intel/clk_intel.c b/drivers/clk/intel/clk_intel.c index 46ccbb1d83..0813e639fe 100644 --- a/drivers/clk/intel/clk_intel.c +++ b/drivers/clk/intel/clk_intel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/clk/meson/a1.c b/drivers/clk/meson/a1.c index 1075ba7333..7eab410252 100644 --- a/drivers/clk/meson/a1.c +++ b/drivers/clk/meson/a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 SberDevices, Inc. * Author: Igor Prusov <ivprusov(a)salutedevices.com> diff --git a/drivers/clk/meson/axg-ao.c b/drivers/clk/meson/axg-ao.c index 311ffc1cca..a7eea6b68b 100644 --- a/drivers/clk/meson/axg-ao.c +++ b/drivers/clk/meson/axg-ao.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <log.h> diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index d6da59d269..58a8f18bf6 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 - BayLibre, SAS diff --git a/drivers/clk/meson/clk_meson.h b/drivers/clk/meson/clk_meson.h index ef72a416c1..a85e1db9e2 100644 --- a/drivers/clk/meson/clk_meson.h +++ b/drivers/clk/meson/clk_meson.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 - BayLibre, SAS diff --git a/drivers/clk/meson/g12a-ao.c b/drivers/clk/meson/g12a-ao.c index 1a855a6896..606157a122 100644 --- a/drivers/clk/meson/g12a-ao.c +++ b/drivers/clk/meson/g12a-ao.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <log.h> diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index e4fed8ddfb..a0098f5d7f 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 - BayLibre, SAS diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index e379540dee..220cab600a 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 - Beniamino Galvani <b.galvani(a)gmail.com> * (C) Copyright 2018 - BayLibre, SAS diff --git a/drivers/clk/microchip/mpfs_clk.c b/drivers/clk/microchip/mpfs_clk.c index 08f8bfcecb..9f07ed5735 100644 --- a/drivers/clk/microchip/mpfs_clk.c +++ b/drivers/clk/microchip/mpfs_clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/drivers/clk/microchip/mpfs_clk.h b/drivers/clk/microchip/mpfs_clk.h index 72288cc971..1199191461 100644 --- a/drivers/clk/microchip/mpfs_clk.h +++ b/drivers/clk/microchip/mpfs_clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/drivers/clk/microchip/mpfs_clk_cfg.c b/drivers/clk/microchip/mpfs_clk_cfg.c index 5739fd66e8..98d6e30be1 100644 --- a/drivers/clk/microchip/mpfs_clk_cfg.c +++ b/drivers/clk/microchip/mpfs_clk_cfg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/drivers/clk/microchip/mpfs_clk_msspll.c b/drivers/clk/microchip/mpfs_clk_msspll.c index f37c0d8604..ffd8debf08 100644 --- a/drivers/clk/microchip/mpfs_clk_msspll.c +++ b/drivers/clk/microchip/mpfs_clk_msspll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Microchip Technology Inc. */ diff --git a/drivers/clk/microchip/mpfs_clk_periph.c b/drivers/clk/microchip/mpfs_clk_periph.c index ddeccb9145..478eaf0520 100644 --- a/drivers/clk/microchip/mpfs_clk_periph.c +++ b/drivers/clk/microchip/mpfs_clk_periph.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/drivers/clk/mpc83xx_clk.c b/drivers/clk/mpc83xx_clk.c index cc734450ef..624b0f6d0c 100644 --- a/drivers/clk/mpc83xx_clk.c +++ b/drivers/clk/mpc83xx_clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/clk/mpc83xx_clk.h b/drivers/clk/mpc83xx_clk.h index c06a51ecd4..f9b146e96a 100644 --- a/drivers/clk/mpc83xx_clk.h +++ b/drivers/clk/mpc83xx_clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c index e75052f383..2b6f807f5a 100644 --- a/drivers/clk/mvebu/armada-37xx-periph.c +++ b/drivers/clk/mvebu/armada-37xx-periph.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell Armada 37xx SoC Peripheral clocks * diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c index 846a73cd6b..078c0201cd 100644 --- a/drivers/clk/mvebu/armada-37xx-tbg.c +++ b/drivers/clk/mvebu/armada-37xx-tbg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell Armada 37xx SoC Time Base Generator clocks * diff --git a/drivers/clk/nuvoton/clk_npcm.c b/drivers/clk/nuvoton/clk_npcm.c index 8d71f2a24b..ffaa52b6e4 100644 --- a/drivers/clk/nuvoton/clk_npcm.c +++ b/drivers/clk/nuvoton/clk_npcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. * diff --git a/drivers/clk/nuvoton/clk_npcm.h b/drivers/clk/nuvoton/clk_npcm.h index 06b60dc8b8..1c0032a17b 100644 --- a/drivers/clk/nuvoton/clk_npcm.h +++ b/drivers/clk/nuvoton/clk_npcm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _CLK_NPCM_H_ #define _CLK_NPCM_H_ diff --git a/drivers/clk/nuvoton/clk_npcm7xx.c b/drivers/clk/nuvoton/clk_npcm7xx.c index b23dd37af6..5e0576d007 100644 --- a/drivers/clk/nuvoton/clk_npcm7xx.c +++ b/drivers/clk/nuvoton/clk_npcm7xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/clk/nuvoton/clk_npcm8xx.c b/drivers/clk/nuvoton/clk_npcm8xx.c index 27e3cfcf55..34c2bba53a 100644 --- a/drivers/clk/nuvoton/clk_npcm8xx.c +++ b/drivers/clk/nuvoton/clk_npcm8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/clk/owl/Makefile b/drivers/clk/owl/Makefile index 5218b6b4dc..70e39eaa24 100644 --- a/drivers/clk/owl/Makefile +++ b/drivers/clk/owl/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CLK_OWL) += clk_owl.o diff --git a/drivers/clk/owl/clk_owl.c b/drivers/clk/owl/clk_owl.c index 678fdd5a45..44def97738 100644 --- a/drivers/clk/owl/clk_owl.c +++ b/drivers/clk/owl/clk_owl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common clock driver for Actions Semi SoCs. * diff --git a/drivers/clk/owl/clk_owl.h b/drivers/clk/owl/clk_owl.h index a01f81a6a7..9869b939c3 100644 --- a/drivers/clk/owl/clk_owl.h +++ b/drivers/clk/owl/clk_owl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Actions Semi SoCs Clock Definitions * diff --git a/drivers/clk/renesas/clk-rcar-gen2.c b/drivers/clk/renesas/clk-rcar-gen2.c index 850d641119..49e2882c35 100644 --- a/drivers/clk/renesas/clk-rcar-gen2.c +++ b/drivers/clk/renesas/clk-rcar-gen2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen2 CPG MSSR driver * diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c index 0d274bb986..efd2861c8f 100644 --- a/drivers/clk/renesas/clk-rcar-gen3.c +++ b/drivers/clk/renesas/clk-rcar-gen3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen3 CPG MSSR driver * diff --git a/drivers/clk/renesas/rcar-cpg-lib.c b/drivers/clk/renesas/rcar-cpg-lib.c index a2fca660a8..40db9cd5ea 100644 --- a/drivers/clk/renesas/rcar-cpg-lib.c +++ b/drivers/clk/renesas/rcar-cpg-lib.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen3 CPG MSSR driver * diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index 10bd54d600..6abfb2f9e9 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen3 CPG MSSR driver * diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h index 71e409f3eb..81d08680e6 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.h +++ b/drivers/clk/renesas/renesas-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Renesas RCar Gen3 CPG MSSR driver * diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile index 9e379cc2e3..be1076c891 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Rockchip Electronics Co., Ltd # diff --git a/drivers/clk/sifive/Makefile b/drivers/clk/sifive/Makefile index 84859d92ab..bbb1177a63 100644 --- a/drivers/clk/sifive/Makefile +++ b/drivers/clk/sifive/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_CLK_SIFIVE_PRCI) += sifive-prci.o fu540-prci.o fu740-prci.o diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig index 9399ef6d51..a7f32e95e7 100644 --- a/drivers/clk/starfive/Kconfig +++ b/drivers/clk/starfive/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later config SPL_CLK_JH7110 bool "SPL clock support for JH7110" diff --git a/drivers/clk/starfive/Makefile b/drivers/clk/starfive/Makefile index ec0d157094..ef21b7de62 100644 --- a/drivers/clk/starfive/Makefile +++ b/drivers/clk/starfive/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += clk-jh7110.o obj-y += clk-jh7110-pll.o diff --git a/drivers/clk/starfive/clk-jh7110-pll.c b/drivers/clk/starfive/clk-jh7110-pll.c index 1568a1f4cd..5274abeab7 100644 --- a/drivers/clk/starfive/clk-jh7110-pll.c +++ b/drivers/clk/starfive/clk-jh7110-pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022-23 StarFive Technology Co., Ltd. * diff --git a/drivers/clk/starfive/clk-jh7110.c b/drivers/clk/starfive/clk-jh7110.c index 31aaf3340f..45000d732a 100644 --- a/drivers/clk/starfive/clk-jh7110.c +++ b/drivers/clk/starfive/clk-jh7110.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022-23 StarFive Technology Co., Ltd. * diff --git a/drivers/clk/starfive/clk.h b/drivers/clk/starfive/clk.h index 9d20ed0bba..2937a8a625 100644 --- a/drivers/clk/starfive/clk.h +++ b/drivers/clk/starfive/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/drivers/clk/stm32/clk-stm32f.c b/drivers/clk/stm32/clk-stm32f.c index ed7660196e..9ec1c5397b 100644 --- a/drivers/clk/stm32/clk-stm32f.c +++ b/drivers/clk/stm32/clk-stm32f.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/clk/stm32/clk-stm32h7.c b/drivers/clk/stm32/clk-stm32h7.c index d440c28eb4..6e014bb970 100644 --- a/drivers/clk/stm32/clk-stm32h7.c +++ b/drivers/clk/stm32/clk-stm32h7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/clk/stm32/clk-stm32mp1.c b/drivers/clk/stm32/clk-stm32mp1.c index f3ac8c7583..4266f9f6f9 100644 --- a/drivers/clk/stm32/clk-stm32mp1.c +++ b/drivers/clk/stm32/clk-stm32mp1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile index 895da02ebe..727bac4a7e 100644 --- a/drivers/clk/sunxi/Makefile +++ b/drivers/clk/sunxi/Makefile @@ -1,7 +1,7 @@ # # Copyright (C) 2018 Amarula Solutions. # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_CLK_SUNXI) += clk_sunxi.o diff --git a/drivers/clk/sunxi/clk_a10.c b/drivers/clk/sunxi/clk_a10.c index f27306fe33..55d7f8e2f8 100644 --- a/drivers/clk/sunxi/clk_a10.c +++ b/drivers/clk/sunxi/clk_a10.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a10s.c b/drivers/clk/sunxi/clk_a10s.c index 16ac589bb2..dd02f6de72 100644 --- a/drivers/clk/sunxi/clk_a10s.c +++ b/drivers/clk/sunxi/clk_a10s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a23.c b/drivers/clk/sunxi/clk_a23.c index 45d5ba75bf..f0d904d9af 100644 --- a/drivers/clk/sunxi/clk_a23.c +++ b/drivers/clk/sunxi/clk_a23.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions B.V. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a31.c b/drivers/clk/sunxi/clk_a31.c index 6ca800050e..2893d0bcfc 100644 --- a/drivers/clk/sunxi/clk_a31.c +++ b/drivers/clk/sunxi/clk_a31.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions B.V. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a31_r.c b/drivers/clk/sunxi/clk_a31_r.c index fa6887fa75..8ad843eaea 100644 --- a/drivers/clk/sunxi/clk_a31_r.c +++ b/drivers/clk/sunxi/clk_a31_r.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) Samuel Holland <samuel(a)sholland.org> */ diff --git a/drivers/clk/sunxi/clk_a64.c b/drivers/clk/sunxi/clk_a64.c index fd26cd4f5d..2c89ba0347 100644 --- a/drivers/clk/sunxi/clk_a64.c +++ b/drivers/clk/sunxi/clk_a64.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a80.c b/drivers/clk/sunxi/clk_a80.c index c5834f4410..cb7d19b406 100644 --- a/drivers/clk/sunxi/clk_a80.c +++ b/drivers/clk/sunxi/clk_a80.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_a83t.c b/drivers/clk/sunxi/clk_a83t.c index 760d98cd62..ea02c8f641 100644 --- a/drivers/clk/sunxi/clk_a83t.c +++ b/drivers/clk/sunxi/clk_a83t.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_f1c100s.c b/drivers/clk/sunxi/clk_f1c100s.c index 7b4c3ce517..f8d601befd 100644 --- a/drivers/clk/sunxi/clk_f1c100s.c +++ b/drivers/clk/sunxi/clk_f1c100s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+) +// SPDX-License-Identifier: (GPL-2.0-or-later) /* * Copyright (C) 2019 George Hilliard <thirtythreeforty(a)gmail.com>. */ diff --git a/drivers/clk/sunxi/clk_h3.c b/drivers/clk/sunxi/clk_h3.c index 32bc95fccc..5c38c2af4e 100644 --- a/drivers/clk/sunxi/clk_h3.c +++ b/drivers/clk/sunxi/clk_h3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_h6.c b/drivers/clk/sunxi/clk_h6.c index 071fd58100..dcc304d6da 100644 --- a/drivers/clk/sunxi/clk_h6.c +++ b/drivers/clk/sunxi/clk_h6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_h616.c b/drivers/clk/sunxi/clk_h616.c index 113dcff285..0939f598d2 100644 --- a/drivers/clk/sunxi/clk_h616.c +++ b/drivers/clk/sunxi/clk_h616.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2021 Jernej Skrabec <jernej.skrabec(a)siol.net> */ diff --git a/drivers/clk/sunxi/clk_h6_r.c b/drivers/clk/sunxi/clk_h6_r.c index ddcb3dae30..bc6ceeb1f8 100644 --- a/drivers/clk/sunxi/clk_h6_r.c +++ b/drivers/clk/sunxi/clk_h6_r.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) Samuel Holland <samuel(a)sholland.org> */ diff --git a/drivers/clk/sunxi/clk_r40.c b/drivers/clk/sunxi/clk_r40.c index 0fef6f3566..2c4067446b 100644 --- a/drivers/clk/sunxi/clk_r40.c +++ b/drivers/clk/sunxi/clk_r40.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_sun6i_rtc.c b/drivers/clk/sunxi/clk_sun6i_rtc.c index 697b187a82..85ef8bca41 100644 --- a/drivers/clk/sunxi/clk_sun6i_rtc.c +++ b/drivers/clk/sunxi/clk_sun6i_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Copyright (C) 2020 Samuel Holland <samuel(a)sholland.org> diff --git a/drivers/clk/sunxi/clk_sunxi.c b/drivers/clk/sunxi/clk_sunxi.c index ec02a2d037..322c55216e 100644 --- a/drivers/clk/sunxi/clk_sunxi.c +++ b/drivers/clk/sunxi/clk_sunxi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c index 6524c13540..5efdd450e9 100644 --- a/drivers/clk/sunxi/clk_v3s.c +++ b/drivers/clk/sunxi/clk_v3s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/clk/ti/Kconfig b/drivers/clk/ti/Kconfig index fbcdefd889..94d8735682 100644 --- a/drivers/clk/ti/Kconfig +++ b/drivers/clk/ti/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> # diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile index 07aa9a53e0..8db46e2ef5 100644 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> # diff --git a/drivers/clk/ti/clk-am3-dpll-x2.c b/drivers/clk/ti/clk-am3-dpll-x2.c index 3cf279d6a3..69d643910e 100644 --- a/drivers/clk/ti/clk-am3-dpll-x2.c +++ b/drivers/clk/ti/clk-am3-dpll-x2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI DPLL x2 clock support * diff --git a/drivers/clk/ti/clk-am3-dpll.c b/drivers/clk/ti/clk-am3-dpll.c index 398a011a5c..697d810331 100644 --- a/drivers/clk/ti/clk-am3-dpll.c +++ b/drivers/clk/ti/clk-am3-dpll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI DPLL clock support * diff --git a/drivers/clk/ti/clk-ctrl.c b/drivers/clk/ti/clk-ctrl.c index 8926e57ebc..e5ca1b6e1b 100644 --- a/drivers/clk/ti/clk-ctrl.c +++ b/drivers/clk/ti/clk-ctrl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP clock controller support * diff --git a/drivers/clk/ti/clk-divider.c b/drivers/clk/ti/clk-divider.c index 15941f1781..5af9f38a7f 100644 --- a/drivers/clk/ti/clk-divider.c +++ b/drivers/clk/ti/clk-divider.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI divider clock support * diff --git a/drivers/clk/ti/clk-gate.c b/drivers/clk/ti/clk-gate.c index eb15f6243f..adca1c61ca 100644 --- a/drivers/clk/ti/clk-gate.c +++ b/drivers/clk/ti/clk-gate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI gate clock support * diff --git a/drivers/clk/ti/clk-k3-pll.c b/drivers/clk/ti/clk-k3-pll.c index bf762c558e..06546e7837 100644 --- a/drivers/clk/ti/clk-k3-pll.c +++ b/drivers/clk/ti/clk-k3-pll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments K3 SoC PLL clock driver * diff --git a/drivers/clk/ti/clk-k3.c b/drivers/clk/ti/clk-k3.c index 10f7240f77..a18582534b 100644 --- a/drivers/clk/ti/clk-k3.c +++ b/drivers/clk/ti/clk-k3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments K3 clock driver * diff --git a/drivers/clk/ti/clk-mux.c b/drivers/clk/ti/clk-mux.c index 215241b161..3edd2ef7bf 100644 --- a/drivers/clk/ti/clk-mux.c +++ b/drivers/clk/ti/clk-mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI multiplexer clock support * diff --git a/drivers/clk/ti/clk-sci.c b/drivers/clk/ti/clk-sci.c index 8fc3254c99..b25f29805b 100644 --- a/drivers/clk/ti/clk-sci.c +++ b/drivers/clk/ti/clk-sci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments System Control Interface (TI SCI) clock driver * diff --git a/drivers/clk/ti/clk.c b/drivers/clk/ti/clk.c index 6e5cc90f0f..00371569f2 100644 --- a/drivers/clk/ti/clk.c +++ b/drivers/clk/ti/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI clock utilities * diff --git a/drivers/clk/ti/clk.h b/drivers/clk/ti/clk.h index 96859f9dea..26adea82d6 100644 --- a/drivers/clk/ti/clk.h +++ b/drivers/clk/ti/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * TI clock utilities header * diff --git a/drivers/clk/ti/omap4-cm.c b/drivers/clk/ti/omap4-cm.c index 3cdc9b2888..a13d4af8b2 100644 --- a/drivers/clk/ti/omap4-cm.c +++ b/drivers/clk/ti/omap4-cm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP4 clock manager (cm) * diff --git a/drivers/clk/uniphier/clk-uniphier-core.c b/drivers/clk/uniphier/clk-uniphier-core.c index c31e59641d..545119d010 100644 --- a/drivers/clk/uniphier/clk-uniphier-core.c +++ b/drivers/clk/uniphier/clk-uniphier-core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/clk/uniphier/clk-uniphier-mio.c b/drivers/clk/uniphier/clk-uniphier-mio.c index c201f818fc..2b07eb09fa 100644 --- a/drivers/clk/uniphier/clk-uniphier-mio.c +++ b/drivers/clk/uniphier/clk-uniphier-mio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index 3b8595fe61..131e365b24 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/clk/uniphier/clk-uniphier.h b/drivers/clk/uniphier/clk-uniphier.h index 1b595df793..e3cfa92910 100644 --- a/drivers/clk/uniphier/clk-uniphier.h +++ b/drivers/clk/uniphier/clk-uniphier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/core/Makefile b/drivers/core/Makefile index acbd2bf2ce..b018644e68 100644 --- a/drivers/core/Makefile +++ b/drivers/core/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013 Google, Inc diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 0ebd288ab4..1618cd02fd 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Core driver model support for ACPI table generation * diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c index a86b9325dd..ecbac134fc 100644 --- a/drivers/core/device-remove.c +++ b/drivers/core/device-remove.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device manager * diff --git a/drivers/core/device.c b/drivers/core/device.c index bf7f261cbc..479354073e 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device manager * diff --git a/drivers/core/devres.c b/drivers/core/devres.c index 78914bdf7f..c184c1f1ad 100644 --- a/drivers/core/devres.c +++ b/drivers/core/devres.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> * diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 841124830e..a806c0d36c 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index 8e774d49ce..6a34beefcd 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Device addresses * diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 8034a8f48d..af62fd3164 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index c8db743f52..8e57dca188 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Originally from Linux v4.9 * Paul Mackerras August 1996. diff --git a/drivers/core/of_addr.c b/drivers/core/of_addr.c index b3b3d7ccdd..d3cb01de9c 100644 --- a/drivers/core/of_addr.c +++ b/drivers/core/of_addr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Taken from Linux v4.9 drivers/of/address.c * diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c index 59ce9174ad..b769b90859 100644 --- a/drivers/core/of_extra.c +++ b/drivers/core/of_extra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 29a4294510..ac036bacd8 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/read.c b/drivers/core/read.c index 1a4a95cdde..f0082e7158 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/read_extra.c b/drivers/core/read_extra.c index 5138348827..1b596f2719 100644 --- a/drivers/core/read_extra.c +++ b/drivers/core/read_extra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c index dd32328098..1d035a0303 100644 --- a/drivers/core/regmap.c +++ b/drivers/core/regmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/root.c b/drivers/core/root.c index d4ae652bcf..a50af56a57 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c index 6022e7514e..ba8169e2dd 100644 --- a/drivers/core/simple-bus.c +++ b/drivers/core/simple-bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/core/simple-pm-bus.c b/drivers/core/simple-pm-bus.c index 1bb0d86e28..ad62c32e4e 100644 --- a/drivers/core/simple-pm-bus.c +++ b/drivers/core/simple-pm-bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index a47b8bd3c0..f82023f1c3 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/core/tag.c b/drivers/core/tag.c index a3c5cb7e57..cef438d2f3 100644 --- a/drivers/core/tag.c +++ b/drivers/core/tag.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Linaro Limited * Author: AKASHI Takahiro diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index e46d5717aa..a2d505138d 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/drivers/core/util.c b/drivers/core/util.c index 81497df85f..7ed1446644 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/cpu/Makefile b/drivers/cpu/Makefile index d4bbf6fa5e..ace5c4a5cf 100644 --- a/drivers/cpu/Makefile +++ b/drivers/cpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/cpu/at91_cpu.c b/drivers/cpu/at91_cpu.c index 34a3f61c7e..9ccbb3a289 100644 --- a/drivers/cpu/at91_cpu.c +++ b/drivers/cpu/at91_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Microchip Technology Inc. and its subsidiaries * diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 3dd04fa885..d0a6a6642d 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/cpu/cpu-uclass.c b/drivers/cpu/cpu-uclass.c index 9772578968..0914836cfe 100644 --- a/drivers/cpu/cpu-uclass.c +++ b/drivers/cpu/cpu-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c index 2e871fe313..05d0d392f7 100644 --- a/drivers/cpu/cpu_sandbox.c +++ b/drivers/cpu/cpu_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/cpu/imx8_cpu.c b/drivers/cpu/imx8_cpu.c index 98ff95f5ff..cded0fb162 100644 --- a/drivers/cpu/imx8_cpu.c +++ b/drivers/cpu/imx8_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/cpu/imx9_cpu.c b/drivers/cpu/imx9_cpu.c index 66534fe6d1..6396fa1ed5 100644 --- a/drivers/cpu/imx9_cpu.c +++ b/drivers/cpu/imx9_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/cpu/microblaze_cpu.c b/drivers/cpu/microblaze_cpu.c index a229f6913b..40e61daae2 100644 --- a/drivers/cpu/microblaze_cpu.c +++ b/drivers/cpu/microblaze_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022, Ovidiu Panait <ovpanait(a)gmail.com> */ diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index e451c11116..811323997b 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/cpu/mpc83xx_cpu.h b/drivers/cpu/mpc83xx_cpu.h index 2aaa4e1884..b83007dcb0 100644 --- a/drivers/cpu/mpc83xx_cpu.h +++ b/drivers/cpu/mpc83xx_cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/cpu/riscv_cpu.c b/drivers/cpu/riscv_cpu.c index d6484d7f4b..35884bf194 100644 --- a/drivers/cpu/riscv_cpu.c +++ b/drivers/cpu/riscv_cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * Copyright (C) 2020, Sean Anderson <seanga2(a)gmail.com> diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index b910518609..4191cebd2e 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013 Samsung Electronics Co., Ltd. # http://www.samsung.com diff --git a/drivers/crypto/ace_sha.c b/drivers/crypto/ace_sha.c index 261d3efe84..3e66dad5ca 100644 --- a/drivers/crypto/ace_sha.c +++ b/drivers/crypto/ace_sha.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Advanced Crypto Engine - SHA Firmware * Copyright (c) 2012 Samsung Electronics diff --git a/drivers/crypto/ace_sha.h b/drivers/crypto/ace_sha.h index ad9e81a586..f300530688 100644 --- a/drivers/crypto/ace_sha.h +++ b/drivers/crypto/ace_sha.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header file for Advanced Crypto Engine - SFR definitions * diff --git a/drivers/crypto/fsl/Makefile b/drivers/crypto/fsl/Makefile index 7a2543e16c..6aee33ad3c 100644 --- a/drivers/crypto/fsl/Makefile +++ b/drivers/crypto/fsl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Freescale Semiconductor, Inc. diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h index 5705c4f944..69bac6ed40 100644 --- a/drivers/crypto/fsl/desc.h +++ b/drivers/crypto/fsl/desc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * CAAM descriptor composition header * Definitions to support CAAM descriptor instruction generation diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h index 209557c4ff..0ea3c11c27 100644 --- a/drivers/crypto/fsl/desc_constr.h +++ b/drivers/crypto/fsl/desc_constr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * caam descriptor construction helper functions * diff --git a/drivers/crypto/fsl/error.c b/drivers/crypto/fsl/error.c index c76574919c..fe16f11a12 100644 --- a/drivers/crypto/fsl/error.c +++ b/drivers/crypto/fsl/error.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CAAM Error Reporting * diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index 9b6e4bca06..2516891e16 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/drivers/crypto/fsl/fsl_hash.c b/drivers/crypto/fsl/fsl_hash.c index f22f24b607..622ff3d5d5 100644 --- a/drivers/crypto/fsl/fsl_hash.c +++ b/drivers/crypto/fsl/fsl_hash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/drivers/crypto/fsl/fsl_hash.h b/drivers/crypto/fsl/fsl_hash.h index 82057c83c3..166b64e603 100644 --- a/drivers/crypto/fsl/fsl_hash.h +++ b/drivers/crypto/fsl/fsl_hash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/drivers/crypto/fsl/fsl_mfgprot.c b/drivers/crypto/fsl/fsl_mfgprot.c index 29af79f577..10be01ede1 100644 --- a/drivers/crypto/fsl/fsl_mfgprot.c +++ b/drivers/crypto/fsl/fsl_mfgprot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/crypto/fsl/fsl_rsa.c b/drivers/crypto/fsl/fsl_rsa.c index 335b7fe25a..e1741d5526 100644 --- a/drivers/crypto/fsl/fsl_rsa.c +++ b/drivers/crypto/fsl/fsl_rsa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Freescale Semiconductor, Inc. * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index d32c1fe5c3..a415077907 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SEC Descriptor Construction Library * Basic job descriptor construction diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h index c4501abd26..46254994b0 100644 --- a/drivers/crypto/fsl/jobdesc.h +++ b/drivers/crypto/fsl/jobdesc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index ceb66dd627..e1f99766d6 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * Copyright 2018, 2021 NXP diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index 4e4c4af580..900a68be17 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/drivers/crypto/fsl/rsa_caam.h b/drivers/crypto/fsl/rsa_caam.h index 9a6a8afa4a..3f27714298 100644 --- a/drivers/crypto/fsl/rsa_caam.h +++ b/drivers/crypto/fsl/rsa_caam.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/drivers/crypto/fsl/sec.c b/drivers/crypto/fsl/sec.c index 9de30a6112..5457b73486 100644 --- a/drivers/crypto/fsl/sec.c +++ b/drivers/crypto/fsl/sec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/drivers/crypto/fsl/type.h b/drivers/crypto/fsl/type.h index b7031a60fd..265b0aeef7 100644 --- a/drivers/crypto/fsl/type.h +++ b/drivers/crypto/fsl/type.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP * diff --git a/drivers/crypto/hash/Makefile b/drivers/crypto/hash/Makefile index 33d88161ed..09f3b75cfa 100644 --- a/drivers/crypto/hash/Makefile +++ b/drivers/crypto/hash/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2021 ASPEED Technology Inc. diff --git a/drivers/crypto/hash/hash-uclass.c b/drivers/crypto/hash/hash-uclass.c index 446eb9e56a..dd59188e3e 100644 --- a/drivers/crypto/hash/hash-uclass.c +++ b/drivers/crypto/hash/hash-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 ASPEED Technology Inc. * Author: ChiaWei Wang <chiawei_wang(a)aspeedtech.com> diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index d8065d68ea..bd66af7d71 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 ASPEED Technology Inc. * Author: ChiaWei Wang <chiawei_wang(a)aspeedtech.com> diff --git a/drivers/crypto/nuvoton/npcm_aes.c b/drivers/crypto/nuvoton/npcm_aes.c index 6493ea108e..9c80c7f852 100644 --- a/drivers/crypto/nuvoton/npcm_aes.c +++ b/drivers/crypto/nuvoton/npcm_aes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/crypto/nuvoton/npcm_sha.c b/drivers/crypto/nuvoton/npcm_sha.c index 7ebdfa16f4..67a9f944eb 100644 --- a/drivers/crypto/nuvoton/npcm_sha.c +++ b/drivers/crypto/nuvoton/npcm_sha.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/crypto/rsa_mod_exp/Makefile b/drivers/crypto/rsa_mod_exp/Makefile index 7e829d3c10..27923721ff 100644 --- a/drivers/crypto/rsa_mod_exp/Makefile +++ b/drivers/crypto/rsa_mod_exp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Freescale Semiconductor, Inc. diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c index 7bed444c3f..8ae67e3818 100644 --- a/drivers/crypto/rsa_mod_exp/mod_exp_sw.c +++ b/drivers/crypto/rsa_mod_exp/mod_exp_sw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Freescale Semiconductor, Inc. * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> diff --git a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c index 057cc74b10..503428db2c 100644 --- a/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c +++ b/drivers/crypto/rsa_mod_exp/mod_exp_uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Freescale Semiconductor, Inc * Author: Ruchika Gupta <ruchika.gupta(a)freescale.com> diff --git a/drivers/ddr/altera/Makefile b/drivers/ddr/altera/Makefile index 9fa5d85a27..0a5d534cb3 100644 --- a/drivers/ddr/altera/Makefile +++ b/drivers/ddr/altera/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2003 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 34d2a2789c..b487e53387 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright Altera Corporation (C) 2014-2015 */ diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index 9dada5e117..6d9a26d987 100644 --- a/drivers/ddr/fsl/arm_ddr_gen3.c +++ b/drivers/ddr/fsl/arm_ddr_gen3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 8f8c2c864c..f30727836d 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2016 Freescale Semiconductor, Inc. * Copyright 2017-2020 NXP Semiconductor diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c index ea79162262..5c6292a0ad 100644 --- a/drivers/ddr/fsl/ddr4_dimm_params.c +++ b/drivers/ddr/fsl/ddr4_dimm_params.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index f8d1468a26..17d5e1cff4 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2020 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c index 28f2219b2a..8334494149 100644 --- a/drivers/ddr/fsl/fsl_mmdc.c +++ b/drivers/ddr/fsl/fsl_mmdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index eb2f06e830..5f50863353 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index 7cff823458..bf38e67817 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor diff --git a/drivers/ddr/imx/imx8m/Makefile b/drivers/ddr/imx/imx8m/Makefile index aed91dc23f..dd9f62a0b7 100644 --- a/drivers/ddr/imx/imx8m/Makefile +++ b/drivers/ddr/imx/imx8m/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/drivers/ddr/imx/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m/ddr_init.c index 52a4aa6323..83d46c1924 100644 --- a/drivers/ddr/imx/imx8m/ddr_init.c +++ b/drivers/ddr/imx/imx8m/ddr_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019 NXP */ diff --git a/drivers/ddr/imx/imx8ulp/Makefile b/drivers/ddr/imx/imx8ulp/Makefile index 7f44a92180..e7ae63e17c 100644 --- a/drivers/ddr/imx/imx8ulp/Makefile +++ b/drivers/ddr/imx/imx8ulp/Makefile @@ -1,7 +1,7 @@ # # Copyright 2021 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/drivers/ddr/imx/imx8ulp/ddr_init.c b/drivers/ddr/imx/imx8ulp/ddr_init.c index c362a2da33..f2387488f0 100644 --- a/drivers/ddr/imx/imx8ulp/ddr_init.c +++ b/drivers/ddr/imx/imx8ulp/ddr_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR MIT +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT /* * Copyright 2021 NXP */ diff --git a/drivers/ddr/imx/imx9/Makefile b/drivers/ddr/imx/imx9/Makefile index 9403f988b3..b97de5bcf1 100644 --- a/drivers/ddr/imx/imx9/Makefile +++ b/drivers/ddr/imx/imx9/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/drivers/ddr/imx/imx9/ddr_init.c b/drivers/ddr/imx/imx9/ddr_init.c index 7a333880e6..3217c3c6c3 100644 --- a/drivers/ddr/imx/imx9/ddr_init.c +++ b/drivers/ddr/imx/imx9/ddr_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/drivers/ddr/imx/phy/Makefile b/drivers/ddr/imx/phy/Makefile index bb3d4ee5b7..415db8b61e 100644 --- a/drivers/ddr/imx/phy/Makefile +++ b/drivers/ddr/imx/phy/Makefile @@ -1,7 +1,7 @@ # # Copyright 2018 NXP # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # ifdef CONFIG_SPL_BUILD diff --git a/drivers/ddr/imx/phy/ddrphy_csr.c b/drivers/ddr/imx/phy/ddrphy_csr.c index 67dd4e7059..564bed5ca0 100644 --- a/drivers/ddr/imx/phy/ddrphy_csr.c +++ b/drivers/ddr/imx/phy/ddrphy_csr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/ddr/imx/phy/ddrphy_train.c b/drivers/ddr/imx/phy/ddrphy_train.c index cd905f952c..7b0587bf84 100644 --- a/drivers/ddr/imx/phy/ddrphy_train.c +++ b/drivers/ddr/imx/phy/ddrphy_train.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/ddr/imx/phy/ddrphy_utils.c b/drivers/ddr/imx/phy/ddrphy_utils.c index fd8b4113b7..daa8931f8c 100644 --- a/drivers/ddr/imx/phy/ddrphy_utils.c +++ b/drivers/ddr/imx/phy/ddrphy_utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/ddr/imx/phy/helper.c b/drivers/ddr/imx/phy/helper.c index 855a874ac1..60ea7533ac 100644 --- a/drivers/ddr/imx/phy/helper.c +++ b/drivers/ddr/imx/phy/helper.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/ddr/marvell/a38x/Makefile b/drivers/ddr/marvell/a38x/Makefile index fcfb615686..e9b20f16c8 100644 --- a/drivers/ddr/marvell/a38x/Makefile +++ b/drivers/ddr/marvell/a38x/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) += mv_ddr_plat.o obj-$(CONFIG_SPL_BUILD) += mv_ddr_sys_env_lib.o diff --git a/drivers/ddr/marvell/axp/Makefile b/drivers/ddr/marvell/axp/Makefile index d04d9a21db..4c7a2719b8 100644 --- a/drivers/ddr/marvell/axp/Makefile +++ b/drivers/ddr/marvell/axp/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_SPL_BUILD) += ddr3_dfs.o obj-$(CONFIG_SPL_BUILD) += ddr3_dqs.o diff --git a/drivers/ddr/microchip/Makefile b/drivers/ddr/microchip/Makefile index 3e2e93ba25..99bcf89bb0 100644 --- a/drivers/ddr/microchip/Makefile +++ b/drivers/ddr/microchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Microchip Technology Inc. obj-$(CONFIG_MACH_PIC32) += ddr2.o diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c index 149b6071cf..68ddd11408 100644 --- a/drivers/ddr/microchip/ddr2.c +++ b/drivers/ddr/microchip/ddr2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2015 Paul Thacker <paul.thacker(a)microchip.com> * diff --git a/drivers/ddr/microchip/ddr2_regs.h b/drivers/ddr/microchip/ddr2_regs.h index 0734585dc2..0e4f3dab10 100644 --- a/drivers/ddr/microchip/ddr2_regs.h +++ b/drivers/ddr/microchip/ddr2_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/drivers/ddr/microchip/ddr2_timing.h b/drivers/ddr/microchip/ddr2_timing.h index 8bf1616ecb..2eb1799703 100644 --- a/drivers/ddr/microchip/ddr2_timing.h +++ b/drivers/ddr/microchip/ddr2_timing.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/drivers/demo/Makefile b/drivers/demo/Makefile index 9acd918a28..bc87461bc5 100644 --- a/drivers/demo/Makefile +++ b/drivers/demo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013 Google, Inc diff --git a/drivers/demo/demo-pdata.c b/drivers/demo/demo-pdata.c index 818f77503a..59ed364c8c 100644 --- a/drivers/demo/demo-pdata.c +++ b/drivers/demo/demo-pdata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c index b6b29bcb31..dcb3069815 100644 --- a/drivers/demo/demo-shape.c +++ b/drivers/demo/demo-shape.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c index 28b271f779..c2d785e96c 100644 --- a/drivers/demo/demo-simple.c +++ b/drivers/demo/demo-simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c index 09f9a47d4d..427d9981cc 100644 --- a/drivers/demo/demo-uclass.c +++ b/drivers/demo/demo-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index dfbf64da66..0068ccf818 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics # Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 2adf26e2fe..f3aefd274b 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dfu.c -- DFU back-end routines * diff --git a/drivers/dfu/dfu_alt.c b/drivers/dfu/dfu_alt.c index ece3d2236f..227787a12a 100644 --- a/drivers/dfu/dfu_alt.c +++ b/drivers/dfu/dfu_alt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Lukasz Majewski <l.majewski(a)majess.pl> diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index cdb3c18b01..b4e6db248b 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dfu.c -- DFU back-end routines * diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c index 485586989c..5f38c0762c 100644 --- a/drivers/dfu/dfu_mtd.c +++ b/drivers/dfu/dfu_mtd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dfu_mtd.c -- DFU for MTD device. * diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c index 08e8cf5cdb..d5889859da 100644 --- a/drivers/dfu/dfu_nand.c +++ b/drivers/dfu/dfu_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dfu_nand.c -- DFU for NAND routines. * diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c index c4f4bd2e48..3f3fc5c281 100644 --- a/drivers/dfu/dfu_ram.c +++ b/drivers/dfu/dfu_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Afzal Mohammed <afzal.mohd.ma(a)gmail.com> diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 2dae159370..bed9457af4 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. */ diff --git a/drivers/dfu/dfu_virt.c b/drivers/dfu/dfu_virt.c index 29f7a08f67..d0a2f205a9 100644 --- a/drivers/dfu/dfu_virt.c +++ b/drivers/dfu/dfu_virt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c index af0e134522..68d0af755d 100644 --- a/drivers/dma/MCD_dmaApi.c +++ b/drivers/dma/MCD_dmaApi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/drivers/dma/MCD_tasks.c b/drivers/dma/MCD_tasks.c index 453d95413d..5b97b4cad0 100644 --- a/drivers/dma/MCD_tasks.c +++ b/drivers/dma/MCD_tasks.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/drivers/dma/MCD_tasksInit.c b/drivers/dma/MCD_tasksInit.c index 079cd0af3c..0a768a1fda 100644 --- a/drivers/dma/MCD_tasksInit.c +++ b/drivers/dma/MCD_tasksInit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index a75572fe5d..69eab848d4 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index da988f6bb6..777f6d5a6a 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 APBH DMA driver * diff --git a/drivers/dma/bcm6348-iudma.c b/drivers/dma/bcm6348-iudma.c index d4cfe0c186..25b1ba7089 100644 --- a/drivers/dma/bcm6348-iudma.c +++ b/drivers/dma/bcm6348-iudma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c index 0c1d88e10c..85d178d70b 100644 --- a/drivers/dma/dma-uclass.c +++ b/drivers/dma/dma-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Direct Memory Access U-Class driver * diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c index 700df2236b..787f816f7a 100644 --- a/drivers/dma/fsl_dma.c +++ b/drivers/dma/fsl_dma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004,2007,2008 Freescale Semiconductor, Inc. * (C) Copyright 2002, 2003 Motorola Inc. diff --git a/drivers/dma/keystone_nav.c b/drivers/dma/keystone_nav.c index 9a5ba79f3f..9693f5fea4 100644 --- a/drivers/dma/keystone_nav.c +++ b/drivers/dma/keystone_nav.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Multicore Navigator driver for TI Keystone 2 devices. * diff --git a/drivers/dma/keystone_nav_cfg.c b/drivers/dma/keystone_nav_cfg.c index 301419b6fd..5279d83bc3 100644 --- a/drivers/dma/keystone_nav_cfg.c +++ b/drivers/dma/keystone_nav_cfg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Multicore Navigator driver for TI Keystone 2 devices. * diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c index 0efdfd028c..cd94122ec8 100644 --- a/drivers/dma/lpc32xx_dma.c +++ b/drivers/dma/lpc32xx_dma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008 by NXP Semiconductors * @Author: Kevin Wells diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c index a19e5e37fb..352c1afc91 100644 --- a/drivers/dma/sandbox-dma-test.c +++ b/drivers/dma/sandbox-dma-test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Direct Memory Access U-Class Simulation driver * diff --git a/drivers/dma/ti-edma3.c b/drivers/dma/ti-edma3.c index 31ffff07f5..c09a89ba4b 100644 --- a/drivers/dma/ti-edma3.c +++ b/drivers/dma/ti-edma3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Enhanced Direct Memory Access (EDMA3) Controller * diff --git a/drivers/dma/ti/Kconfig b/drivers/dma/ti/Kconfig index 87c026e049..97d8de7842 100644 --- a/drivers/dma/ti/Kconfig +++ b/drivers/dma/ti/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later if ARCH_K3 diff --git a/drivers/dma/ti/Makefile b/drivers/dma/ti/Makefile index 6807eb8e8b..ede62afeb2 100644 --- a/drivers/dma/ti/Makefile +++ b/drivers/dma/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_TI_K3_NAVSS_UDMA) += k3-udma.o obj-$(CONFIG_TI_K3_PSIL) += k3-psil-data.o diff --git a/drivers/dma/ti/k3-udma-hwdef.h b/drivers/dma/ti/k3-udma-hwdef.h index 5d50bbcb03..5f5a36f868 100644 --- a/drivers/dma/ti/k3-udma-hwdef.h +++ b/drivers/dma/ti/k3-udma-hwdef.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com * diff --git a/drivers/dma/ti/k3-udma-u-boot.c b/drivers/dma/ti/k3-udma-u-boot.c index 3e04f551e2..5222a15071 100644 --- a/drivers/dma/ti/k3-udma-u-boot.c +++ b/drivers/dma/ti/k3-udma-u-boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com */ diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c index 9273c70e9d..568f2a2375 100644 --- a/drivers/dma/ti/k3-udma.c +++ b/drivers/dma/ti/k3-udma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com * Author: Peter Ujfalusi <peter.ujfalusi(a)ti.com> diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile index 3309f2aac2..da0b44bb5f 100644 --- a/drivers/extcon/Makefile +++ b/drivers/extcon/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2023 Svyatoslav Ryhel <clamor95(a)gmail.com> diff --git a/drivers/extcon/extcon-max14526.c b/drivers/extcon/extcon-max14526.c index a33b5ef919..3384992129 100644 --- a/drivers/extcon/extcon-max14526.c +++ b/drivers/extcon/extcon-max14526.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/extcon/extcon-sandbox.c b/drivers/extcon/extcon-sandbox.c index ab6a6c1cfd..6d26431ee6 100644 --- a/drivers/extcon/extcon-sandbox.c +++ b/drivers/extcon/extcon-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/extcon/extcon-uclass.c b/drivers/extcon/extcon-uclass.c index 9dd22b5762..09fd7dd45d 100644 --- a/drivers/extcon/extcon-uclass.c +++ b/drivers/extcon/extcon-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/fastboot/Makefile b/drivers/fastboot/Makefile index 048af5aa82..4cd533812b 100644 --- a/drivers/fastboot/Makefile +++ b/drivers/fastboot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += fb_common.o obj-y += fb_getvar.o diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 4e9d9b719c..4977498e6c 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2009 * Windriver, <www.windriver.com> diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 060918e491..cb2df52fe7 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c index bbe26ddcc9..38d8bd5555 100644 --- a/drivers/fastboot/fb_nand.c +++ b/drivers/fastboot/fb_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. * Copyright 2015 Free Electrons. diff --git a/drivers/firmware/arm-ffa/Makefile b/drivers/firmware/arm-ffa/Makefile index 318123a7f4..e81de8b8ba 100644 --- a/drivers/firmware/arm-ffa/Makefile +++ b/drivers/firmware/arm-ffa/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> # diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c index 8c17b19eaf..fc80cbe23f 100644 --- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c +++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/firmware/arm-ffa/arm-ffa.c b/drivers/firmware/arm-ffa/arm-ffa.c index ee0bf9a55b..98df5fb2a8 100644 --- a/drivers/firmware/arm-ffa/arm-ffa.c +++ b/drivers/firmware/arm-ffa/arm-ffa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c index 4bf9f6041f..933bdaa4a3 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/firmware/arm-ffa/sandbox_ffa.c b/drivers/firmware/arm-ffa/sandbox_ffa.c index 11142429c0..10befb7bf2 100644 --- a/drivers/firmware/arm-ffa/sandbox_ffa.c +++ b/drivers/firmware/arm-ffa/sandbox_ffa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/firmware/firmware-sandbox.c b/drivers/firmware/firmware-sandbox.c index d970d75f78..f3e7b87217 100644 --- a/drivers/firmware/firmware-sandbox.c +++ b/drivers/firmware/firmware-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sandbox firmware driver * diff --git a/drivers/firmware/firmware-uclass.c b/drivers/firmware/firmware-uclass.c index e83a147a00..67e2905036 100644 --- a/drivers/firmware/firmware-uclass.c +++ b/drivers/firmware/firmware-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #define LOG_CATEGORY UCLASS_FIRMWARE diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c6b9efab41..56528a4937 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Masahiro Yamada <yamada.masahiro(a)socionext.com> * diff --git a/drivers/firmware/scmi/base.c b/drivers/firmware/scmi/base.c index 1d41a8a98f..e6327b723e 100644 --- a/drivers/firmware/scmi/base.c +++ b/drivers/firmware/scmi/base.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SCMI Base protocol as U-Boot device * diff --git a/drivers/firmware/scmi/mailbox_agent.c b/drivers/firmware/scmi/mailbox_agent.c index 7ad3e8da9f..b7dbbcd5da 100644 --- a/drivers/firmware/scmi/mailbox_agent.c +++ b/drivers/firmware/scmi/mailbox_agent.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Linaro Limited. */ diff --git a/drivers/firmware/scmi/optee_agent.c b/drivers/firmware/scmi/optee_agent.c index 48dbb88a3f..5cb7a00cb4 100644 --- a/drivers/firmware/scmi/optee_agent.c +++ b/drivers/firmware/scmi/optee_agent.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2022 Linaro Limited. */ diff --git a/drivers/firmware/scmi/sandbox-scmi_agent.c b/drivers/firmware/scmi/sandbox-scmi_agent.c index eb567dd900..542a0a5bad 100644 --- a/drivers/firmware/scmi/sandbox-scmi_agent.c +++ b/drivers/firmware/scmi/sandbox-scmi_agent.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Linaro Limited */ diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c index 6f585b96f7..8909893af3 100644 --- a/drivers/firmware/scmi/scmi_agent-uclass.c +++ b/drivers/firmware/scmi/scmi_agent-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Linaro Limited. */ diff --git a/drivers/firmware/scmi/smccc_agent.c b/drivers/firmware/scmi/smccc_agent.c index 972c6addde..16eff0fafc 100644 --- a/drivers/firmware/scmi/smccc_agent.c +++ b/drivers/firmware/scmi/smccc_agent.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Linaro Limited. */ diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 166bd78ca5..a38e950b51 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments System Control Interface Protocol Driver * Based on drivers/firmware/ti_sci.c from Linux. diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c index 4c00cdf0b5..7668f7db5e 100644 --- a/drivers/fpga/ACEX1K.c +++ b/drivers/fpga/ACEX1K.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Steven Scholz, imc Measurement & Control, steven.scholz(a)imc-berlin.de diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 610c168fc3..01d7f076af 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c index 6a4f0cb9bc..d6ce89f246 100644 --- a/drivers/fpga/altera.c +++ b/drivers/fpga/altera.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Steven Scholz, imc Measurement & Control, steven.scholz(a)imc-berlin.de diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c index 6e8a313db3..2b91a16e89 100644 --- a/drivers/fpga/cyclon2.c +++ b/drivers/fpga/cyclon2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006 * Heiko Schocher, hs(a)denx.de diff --git a/drivers/fpga/fpga-uclass.c b/drivers/fpga/fpga-uclass.c index 4278ec28e5..f454b6f0bc 100644 --- a/drivers/fpga/fpga-uclass.c +++ b/drivers/fpga/fpga-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Alexander Dahl <post(a)lespocky.de> */ diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 81e6d8ffc0..a2814ae476 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/drivers/fpga/intel_sdm_mb.c b/drivers/fpga/intel_sdm_mb.c index 903d143a36..ac9114dbef 100644 --- a/drivers/fpga/intel_sdm_mb.c +++ b/drivers/fpga/intel_sdm_mb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Intel Corporation <www.intel.com> */ diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c index adc60919f3..ce0c886f12 100644 --- a/drivers/fpga/ivm_core.c +++ b/drivers/fpga/ivm_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Porting to u-boot: * diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c index e292d991cd..eb6a7ac3a2 100644 --- a/drivers/fpga/lattice.c +++ b/drivers/fpga/lattice.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/drivers/fpga/sandbox.c b/drivers/fpga/sandbox.c index f17a822179..b9ace69739 100644 --- a/drivers/fpga/sandbox.c +++ b/drivers/fpga/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Alexander Dahl <post(a)lespocky.de> */ diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c index 6eef87b78e..f9f3ab82bf 100644 --- a/drivers/fpga/spartan2.c +++ b/drivers/fpga/spartan2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index e892fa571f..66fdf9b217 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c index b450a81072..c790df36f6 100644 --- a/drivers/fpga/stratixII.c +++ b/drivers/fpga/stratixII.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Eran Liberty, Extricom , eran.liberty(a)gmail.com diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c index abae3b5b75..d64ae4da9d 100644 --- a/drivers/fpga/stratixv.c +++ b/drivers/fpga/stratixv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c index 3ded27f9b3..8973e61e63 100644 --- a/drivers/fpga/virtex2.c +++ b/drivers/fpga/virtex2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c index 8170c3368e..8e056115cb 100644 --- a/drivers/fpga/xilinx.c +++ b/drivers/fpga/xilinx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2013, Xilinx, Michal Simek * diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index a2e3b305fa..b084a852f4 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2013, Xilinx, Michal Simek * diff --git a/drivers/fuzz/Makefile b/drivers/fuzz/Makefile index 073743ba94..a8a48d1e83 100644 --- a/drivers/fuzz/Makefile +++ b/drivers/fuzz/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022 Google, Inc. # Written by Andrew Scull <ascull(a)google.com> diff --git a/drivers/fuzz/fuzzing_engine-uclass.c b/drivers/fuzz/fuzzing_engine-uclass.c index b16f1c4cfb..88eda18ba6 100644 --- a/drivers/fuzz/fuzzing_engine-uclass.c +++ b/drivers/fuzz/fuzzing_engine-uclass.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/drivers/fuzz/sandbox_fuzzing_engine.c b/drivers/fuzz/sandbox_fuzzing_engine.c index ebb938e5ba..4aec354e8b 100644 --- a/drivers/fuzz/sandbox_fuzzing_engine.c +++ b/drivers/fuzz/sandbox_fuzzing_engine.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c index 7a7cfe8611..f2149940b4 100644 --- a/drivers/gpio/74x164_gpio.c +++ b/drivers/gpio/74x164_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Take drivers/gpio/gpio-74x164.c as reference. * diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index c8b3fd7814..0baf11a5b2 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2000-2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/gpio/adp5585_gpio.c b/drivers/gpio/adp5585_gpio.c index ea0cb75459..1435de7075 100644 --- a/drivers/gpio/adp5585_gpio.c +++ b/drivers/gpio/adp5585_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP * diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index edc5a8093b..a5888fc3cf 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> * Copyright (C) 2011 Missing Link Electronics diff --git a/drivers/gpio/at91_gpio.c b/drivers/gpio/at91_gpio.c index 1409db5dc1..55cf1a3cc8 100644 --- a/drivers/gpio/at91_gpio.c +++ b/drivers/gpio/at91_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Bo Shen <voice.shen(a)atmel.com> * diff --git a/drivers/gpio/atmel_pio4.c b/drivers/gpio/atmel_pio4.c index 47ed297981..fcf8506392 100644 --- a/drivers/gpio/atmel_pio4.c +++ b/drivers/gpio/atmel_pio4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel PIO4 device driver * diff --git a/drivers/gpio/axp_gpio.c b/drivers/gpio/axp_gpio.c index 49672193ff..a402bbdab3 100644 --- a/drivers/gpio/axp_gpio.c +++ b/drivers/gpio/axp_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index 704a6fa712..71a7e575d6 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Vikram Narayananan * <vikram186(a)gmail.com> diff --git a/drivers/gpio/bcm6345_gpio.c b/drivers/gpio/bcm6345_gpio.c index e031f71a78..81964fed37 100644 --- a/drivers/gpio/bcm6345_gpio.c +++ b/drivers/gpio/bcm6345_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/gpio/cortina_gpio.c b/drivers/gpio/cortina_gpio.c index 72ef523be9..d76007da6f 100644 --- a/drivers/gpio/cortina_gpio.c +++ b/drivers/gpio/cortina_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Cortina-Access * diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index b310f2dbf6..cfcf5174f0 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GPIO driver for TI DaVinci DA8xx SOCs. * diff --git a/drivers/gpio/da8xx_gpio.h b/drivers/gpio/da8xx_gpio.h index ca59d6a90b..4ef291a76d 100644 --- a/drivers/gpio/da8xx_gpio.h +++ b/drivers/gpio/da8xx_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _GPIO_DA8XX_DEFS_H_ #define _GPIO_DA8XX_DEFS_H_ diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index e6e919444f..f6c6baff6e 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Marek Vasut <marex(a)denx.de> * diff --git a/drivers/gpio/ftgpio010.c b/drivers/gpio/ftgpio010.c index 6c091d4fd8..10371ef8c8 100644 --- a/drivers/gpio/ftgpio010.c +++ b/drivers/gpio/ftgpio010.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Faraday Technology's FTGPIO010 controller. */ diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index d6cfbd231a..847bba8cd3 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/drivers/gpio/gpio-rza1.c b/drivers/gpio/gpio-rza1.c index f14be871e8..7b1cfef39c 100644 --- a/drivers/gpio/gpio-rza1.c +++ b/drivers/gpio/gpio-rza1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 7aece85a70..d1416375c5 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c index 61c705b5ac..0db5addaea 100644 --- a/drivers/gpio/gpio-uniphier.c +++ b/drivers/gpio/gpio-uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016-2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/gpio/hi6220_gpio.c b/drivers/gpio/hi6220_gpio.c index e287c31b93..a945b5ec46 100644 --- a/drivers/gpio/hi6220_gpio.c +++ b/drivers/gpio/hi6220_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 175e460aff..106dfb0838 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * diff --git a/drivers/gpio/intel_broadwell_gpio.c b/drivers/gpio/intel_broadwell_gpio.c index 20af35de2c..c8dd9f3d01 100644 --- a/drivers/gpio/intel_broadwell_gpio.c +++ b/drivers/gpio/intel_broadwell_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c index 4a3ec6d635..aef61582fb 100644 --- a/drivers/gpio/intel_gpio.c +++ b/drivers/gpio/intel_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC */ diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c index 2ed0d0bea9..e32b7305eb 100644 --- a/drivers/gpio/intel_ich6_gpio.c +++ b/drivers/gpio/intel_ich6_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/drivers/gpio/iproc_gpio.c b/drivers/gpio/iproc_gpio.c index 7187d3257b..fc1ed285a4 100644 --- a/drivers/gpio/iproc_gpio.c +++ b/drivers/gpio/iproc_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Broadcom */ diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c index a15769793f..b9d2868d35 100644 --- a/drivers/gpio/kw_gpio.c +++ b/drivers/gpio/kw_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * arch/arm/plat-orion/gpio.c * diff --git a/drivers/gpio/lpc32xx_gpio.c b/drivers/gpio/lpc32xx_gpio.c index de66c765d1..5a3b981d14 100644 --- a/drivers/gpio/lpc32xx_gpio.c +++ b/drivers/gpio/lpc32xx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LPC32xxGPIO driver * diff --git a/drivers/gpio/mpc83xx_spisel_boot.c b/drivers/gpio/mpc83xx_spisel_boot.c index fd26a36a0f..7eb8f3fd21 100644 --- a/drivers/gpio/mpc83xx_spisel_boot.c +++ b/drivers/gpio/mpc83xx_spisel_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 DEIF A/S * diff --git a/drivers/gpio/mpc8xx_gpio.c b/drivers/gpio/mpc8xx_gpio.c index 2f65346533..fec5f84875 100644 --- a/drivers/gpio/mpc8xx_gpio.c +++ b/drivers/gpio/mpc8xx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 CS Group * Charles Frey <charles.frey(a)c-s.fr> diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c index f7ffd8926a..f7ad7d079f 100644 --- a/drivers/gpio/mpc8xxx_gpio.c +++ b/drivers/gpio/mpc8xxx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c index 51670f2637..4995f52016 100644 --- a/drivers/gpio/msm_gpio.c +++ b/drivers/gpio/msm_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm GPIO driver * diff --git a/drivers/gpio/mt7621_gpio.c b/drivers/gpio/mt7621_gpio.c index 43bb4df4da..dcea26ff6d 100644 --- a/drivers/gpio/mt7621_gpio.c +++ b/drivers/gpio/mt7621_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/gpio/mvebu_gpio.c b/drivers/gpio/mvebu_gpio.c index f706a6dfa4..03f14c734b 100644 --- a/drivers/gpio/mvebu_gpio.c +++ b/drivers/gpio/mvebu_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 1dec4e35e0..18ea09b6fd 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 * Guennadi Liakhovetski, DENX Software Engineering, <lg(a)denx.de> diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c index 1356f89ac2..a88159ea9f 100644 --- a/drivers/gpio/mxs_gpio.c +++ b/drivers/gpio/mxs_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 GPIO control code * diff --git a/drivers/gpio/nmk_gpio.c b/drivers/gpio/nmk_gpio.c index e1bb41b196..a4a56c895f 100644 --- a/drivers/gpio/nmk_gpio.c +++ b/drivers/gpio/nmk_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2019 Stephan Gerhold */ #include <common.h> diff --git a/drivers/gpio/npcm_gpio.c b/drivers/gpio/npcm_gpio.c index 98e5dc79c1..8e197d67d4 100644 --- a/drivers/gpio/npcm_gpio.c +++ b/drivers/gpio/npcm_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/gpio/nx_gpio.c b/drivers/gpio/nx_gpio.c index e2565d7095..886bfff058 100644 --- a/drivers/gpio/nx_gpio.c +++ b/drivers/gpio/nx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * DeokJin, Lee <truevirtue(a)nexell.co.kr> diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c index b0c66d1831..c87d57e5ef 100644 --- a/drivers/gpio/pca953x_gpio.c +++ b/drivers/gpio/pca953x_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Take linux kernel driver drivers/gpio/gpio-pca953x.c for reference. * diff --git a/drivers/gpio/pic32_gpio.c b/drivers/gpio/pic32_gpio.c index 975a2af3cc..3c55bad31b 100644 --- a/drivers/gpio/pic32_gpio.c +++ b/drivers/gpio/pic32_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Microchip Technology Inc * Purna Chandra Mandal <purna.mandal(a)microchip.com> diff --git a/drivers/gpio/qcom_pmic_gpio.c b/drivers/gpio/qcom_pmic_gpio.c index 65feb453eb..cf2955210e 100644 --- a/drivers/gpio/qcom_pmic_gpio.c +++ b/drivers/gpio/qcom_pmic_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm generic pmic gpio driver * diff --git a/drivers/gpio/qe_gpio.c b/drivers/gpio/qe_gpio.c index 16e8d1eae6..32305cf710 100644 --- a/drivers/gpio/qe_gpio.c +++ b/drivers/gpio/qe_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 CR GROUP France * Christophe Leroy <christophe.leroy(a)csgroup.eu> diff --git a/drivers/gpio/rk_gpio.c b/drivers/gpio/rk_gpio.c index 4a6ae554bf..32f8d02811 100644 --- a/drivers/gpio/rk_gpio.c +++ b/drivers/gpio/rk_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c index 06ed585f3d..5c1837365d 100644 --- a/drivers/gpio/s5p_gpio.c +++ b/drivers/gpio/s5p_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c index 305f9a6ff6..6a3cd15a7e 100644 --- a/drivers/gpio/sandbox.c +++ b/drivers/gpio/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/gpio/sifive-gpio.c b/drivers/gpio/sifive-gpio.c index 151f484e8f..4747c8fa1f 100644 --- a/drivers/gpio/sifive-gpio.c +++ b/drivers/gpio/sifive-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SiFive GPIO driver * diff --git a/drivers/gpio/sl28cpld-gpio.c b/drivers/gpio/sl28cpld-gpio.c index 700fc3df29..1cca62af8b 100644 --- a/drivers/gpio/sl28cpld-gpio.c +++ b/drivers/gpio/sl28cpld-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GPIO driver for the sl28cpld * diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c index 7a2ca91c76..c44451ad9d 100644 --- a/drivers/gpio/stm32_gpio.c +++ b/drivers/gpio/stm32_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/gpio/stm32_gpio_priv.h b/drivers/gpio/stm32_gpio_priv.h index 662a000fe7..504c658a67 100644 --- a/drivers/gpio/stm32_gpio_priv.h +++ b/drivers/gpio/stm32_gpio_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c index f0b42e4fdb..7e2854935b 100644 --- a/drivers/gpio/sunxi_gpio.c +++ b/drivers/gpio/sunxi_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 55105f2802..3c9e34d2f2 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NVIDIA Tegra20 GPIO handling. * (C) Copyright 2010-2012,2015 diff --git a/drivers/gpio/turris_omnia_mcu.c b/drivers/gpio/turris_omnia_mcu.c index 2d2bf2d1dd..4c2ac86f13 100644 --- a/drivers/gpio/turris_omnia_mcu.c +++ b/drivers/gpio/turris_omnia_mcu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // (C) 2022 Pali Rohár <pali(a)kernel.org> #include <common.h> diff --git a/drivers/gpio/vybrid_gpio.c b/drivers/gpio/vybrid_gpio.c index 339392dcd3..0b53f694fb 100644 --- a/drivers/gpio/vybrid_gpio.c +++ b/drivers/gpio/vybrid_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 * Bhuvanchandra DV, Toradex, Inc. diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index fa8d630b46..34a6e582ca 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 - 2018 Xilinx, Michal Simek */ diff --git a/drivers/gpio/zynq_gpio.c b/drivers/gpio/zynq_gpio.c index 71a56127c0..c7ec3ed929 100644 --- a/drivers/gpio/zynq_gpio.c +++ b/drivers/gpio/zynq_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx Zynq GPIO device driver * diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile index 289b12a256..447fed0b57 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved diff --git a/drivers/hwspinlock/hwspinlock-uclass.c b/drivers/hwspinlock/hwspinlock-uclass.c index e9a4d7f9fb..0dff79fee9 100644 --- a/drivers/hwspinlock/hwspinlock-uclass.c +++ b/drivers/hwspinlock/hwspinlock-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/hwspinlock/sandbox_hwspinlock.c b/drivers/hwspinlock/sandbox_hwspinlock.c index be920f5f99..4956b518fa 100644 --- a/drivers/hwspinlock/sandbox_hwspinlock.c +++ b/drivers/hwspinlock/sandbox_hwspinlock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c index 46ed64655a..0e908bbfc5 100644 --- a/drivers/hwspinlock/stm32_hwspinlock.c +++ b/drivers/hwspinlock/stm32_hwspinlock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index a96a8c7e95..a967d53cc0 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/i2c/acpi_i2c.c b/drivers/i2c/acpi_i2c.c index 142f41178c..24514c37f1 100644 --- a/drivers/i2c/acpi_i2c.c +++ b/drivers/i2c/acpi_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC */ diff --git a/drivers/i2c/acpi_i2c.h b/drivers/i2c/acpi_i2c.h index fc6616ade6..86c5115cee 100644 --- a/drivers/i2c/acpi_i2c.h +++ b/drivers/i2c/acpi_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/drivers/i2c/ast2600_i2c.c b/drivers/i2c/ast2600_i2c.c index e566b01fea..423974e33a 100644 --- a/drivers/i2c/ast2600_i2c.c +++ b/drivers/i2c/ast2600_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright ASPEED Technology Inc. */ diff --git a/drivers/i2c/ast2600_i2c.h b/drivers/i2c/ast2600_i2c.h index 69699ba84c..fdd55ed341 100644 --- a/drivers/i2c/ast2600_i2c.h +++ b/drivers/i2c/ast2600_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright ASPEED Technology Inc. */ diff --git a/drivers/i2c/ast_i2c.c b/drivers/i2c/ast_i2c.c index 1c1d5566da..324639d709 100644 --- a/drivers/i2c/ast_i2c.c +++ b/drivers/i2c/ast_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2020 ASPEED Technology Inc. * Copyright 2016 IBM Corporation diff --git a/drivers/i2c/ast_i2c.h b/drivers/i2c/ast_i2c.h index 928785989e..7fbdf36b17 100644 --- a/drivers/i2c/ast_i2c.h +++ b/drivers/i2c/ast_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2020 ASPEED Technology Inc. * Copyright 2016 IBM Corporation diff --git a/drivers/i2c/at91_i2c.c b/drivers/i2c/at91_i2c.c index e743d2a849..45359e00e1 100644 --- a/drivers/i2c/at91_i2c.c +++ b/drivers/i2c/at91_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel I2C driver. * diff --git a/drivers/i2c/cros_ec_ldo.c b/drivers/i2c/cros_ec_ldo.c index c593540ac1..212d924d31 100644 --- a/drivers/i2c/cros_ec_ldo.c +++ b/drivers/i2c/cros_ec_ldo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c index 75828b6e7c..9aadb4d265 100644 --- a/drivers/i2c/cros_ec_tunnel.c +++ b/drivers/i2c/cros_ec_tunnel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c index 25ef937dc0..4a36a1642b 100644 --- a/drivers/i2c/davinci_i2c.c +++ b/drivers/i2c/davinci_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI DaVinci (TMS320DM644x) I2C driver. * diff --git a/drivers/i2c/davinci_i2c.h b/drivers/i2c/davinci_i2c.h index 57377ce941..ce217f7602 100644 --- a/drivers/i2c/davinci_i2c.h +++ b/drivers/i2c/davinci_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2014 * Texas Instruments, <www.ti.com> diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index e54de42abc..308907e389 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Vipin Kumar, STMicroelectronics, vipin.kumar(a)st.com. diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h index 049976e8a2..46b8f7a23f 100644 --- a/drivers/i2c/designware_i2c.h +++ b/drivers/i2c/designware_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Vipin Kumar, STMicroelectronics, vipin.kumar(a)st.com. diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c index 28495a3f42..060e4c13c6 100644 --- a/drivers/i2c/designware_i2c_pci.c +++ b/drivers/i2c/designware_i2c_pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Vipin Kumar, STMicroelectronics, vipin.kumar(a)st.com. diff --git a/drivers/i2c/exynos_hs_i2c.c b/drivers/i2c/exynos_hs_i2c.c index a7349e06cf..97140d98dc 100644 --- a/drivers/i2c/exynos_hs_i2c.c +++ b/drivers/i2c/exynos_hs_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016, Google Inc * diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 935b2ac637..aed20e57ca 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Moritz Fischer <moritz.fischer(a)ettus.com> * IP from Cadence (ID T-CS-PE-0007-100, Version R1p10f2) diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c index 960ae8c700..0053b3de97 100644 --- a/drivers/i2c/i2c-cortina.c +++ b/drivers/i2c/i2c-cortina.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 * Arthur Li, Cortina Access, arthur.li(a)cortina-access.com. diff --git a/drivers/i2c/i2c-cortina.h b/drivers/i2c/i2c-cortina.h index 7e406b580e..e7b7a06206 100644 --- a/drivers/i2c/i2c-cortina.h +++ b/drivers/i2c/i2c-cortina.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 * Cortina Access, <www.cortina-access.com> diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c index d421ddfcbe..f037fe54d0 100644 --- a/drivers/i2c/i2c-emul-uclass.c +++ b/drivers/i2c/i2c-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/i2c/i2c-microchip.c b/drivers/i2c/i2c-microchip.c index d82b80f535..fa5bfd0a5a 100644 --- a/drivers/i2c/i2c-microchip.c +++ b/drivers/i2c/i2c-microchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Microchip I2C controller driver * diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index 8867a560bd..c30b5b28e6 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/i2c/i2c-uniphier-f.c b/drivers/i2c/i2c-uniphier-f.c index 3dcd382469..4eb7745fd1 100644 --- a/drivers/i2c/i2c-uniphier-f.c +++ b/drivers/i2c/i2c-uniphier-f.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/drivers/i2c/i2c-uniphier.c b/drivers/i2c/i2c-uniphier.c index 6eafbeeef4..80a8db0244 100644 --- a/drivers/i2c/i2c-uniphier.c +++ b/drivers/i2c/i2c-uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c index 0a1a85dfc2..762d349642 100644 --- a/drivers/i2c/i2c-versatile.c +++ b/drivers/i2c/i2c-versatile.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Arm Ltd. * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index fe0cd75d94..f664264b29 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Sergey Kubushyn <ksi(a)koi8.net> * diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c index d715714638..1835df3f20 100644 --- a/drivers/i2c/ihs_i2c.c +++ b/drivers/i2c/ihs_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/drivers/i2c/imx_lpi2c.c b/drivers/i2c/imx_lpi2c.c index ad9293c92e..89de6032ba 100644 --- a/drivers/i2c/imx_lpi2c.c +++ b/drivers/i2c/imx_lpi2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductors, Inc. */ diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index 4fc6f1a11a..10ade0c645 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/i2c/iproc_i2c.c b/drivers/i2c/iproc_i2c.c index 39af49c4ec..db060b4ea8 100644 --- a/drivers/i2c/iproc_i2c.c +++ b/drivers/i2c/iproc_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Broadcom * diff --git a/drivers/i2c/iproc_i2c.h b/drivers/i2c/iproc_i2c.h index 8c3d84f62b..e5342c0d93 100644 --- a/drivers/i2c/iproc_i2c.h +++ b/drivers/i2c/iproc_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Broadcom * diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c index 496f4feec5..9f7eca2380 100644 --- a/drivers/i2c/lpc32xx_i2c.c +++ b/drivers/i2c/lpc32xx_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LPC32xx I2C interface driver * diff --git a/drivers/i2c/meson_i2c.c b/drivers/i2c/meson_i2c.c index 434e3461b1..dd698ec43e 100644 --- a/drivers/i2c/meson_i2c.c +++ b/drivers/i2c/meson_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/drivers/i2c/mtk_i2c.c b/drivers/i2c/mtk_i2c.c index 5592fe9181..589bfab069 100644 --- a/drivers/i2c/mtk_i2c.c +++ b/drivers/i2c/mtk_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 MediaTek Inc. All Rights Reserved. * diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile index b690821199..67dfd2ebf9 100644 --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c index ad730e0e79..ac6ac69f23 100644 --- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c +++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 4ca206115f..3f69b80c45 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * I2C multiplexer using GPIO API * diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c index a5d1bb0576..b7fa889d2c 100644 --- a/drivers/i2c/muxes/i2c-mux-uclass.c +++ b/drivers/i2c/muxes/i2c-mux-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index 0034dfbf6d..04f71d8834 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 - 2016 Xilinx, Inc. * Copyright (C) 2017 National Instruments Corp diff --git a/drivers/i2c/mv_i2c.c b/drivers/i2c/mv_i2c.c index 5bc9cd7b29..fc53d20fa0 100644 --- a/drivers/i2c/mv_i2c.c +++ b/drivers/i2c/mv_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/drivers/i2c/mv_i2c.h b/drivers/i2c/mv_i2c.h index ec2d439e31..403b66d218 100644 --- a/drivers/i2c/mv_i2c.h +++ b/drivers/i2c/mv_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Marvell Inc, <www.marvell.com> diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 14cdb0f663..ee9fcfed03 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for the TWSI (i2c) controller found on the Marvell * orion5x and kirkwood SoC families. diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index d501133a0c..4f02a490c8 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * i2c driver for Freescale i.MX series * diff --git a/drivers/i2c/npcm_i2c.c b/drivers/i2c/npcm_i2c.c index ea4ef53256..1103b69fc3 100644 --- a/drivers/i2c/npcm_i2c.c +++ b/drivers/i2c/npcm_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/i2c/ocores_i2c.c b/drivers/i2c/ocores_i2c.c index 3b19ba78fa..3cf418daa4 100644 --- a/drivers/i2c/ocores_i2c.c +++ b/drivers/i2c/ocores_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ocores-i2c.c: I2C bus driver for OpenCores I2C controller * (https://opencores.org/projects/i2c) diff --git a/drivers/i2c/omap24xx_i2c.h b/drivers/i2c/omap24xx_i2c.h index 6904f2d9ad..461f270e0b 100644 --- a/drivers/i2c/omap24xx_i2c.h +++ b/drivers/i2c/omap24xx_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2010 * Texas Instruments, <www.ti.com> diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c index ff9a2d80dd..6e3c295453 100644 --- a/drivers/i2c/rcar_i2c.c +++ b/drivers/i2c/rcar_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * drivers/i2c/rcar_i2c.c * diff --git a/drivers/i2c/rcar_iic.c b/drivers/i2c/rcar_iic.c index f0e50914c6..7e2005a09b 100644 --- a/drivers/i2c/rcar_iic.c +++ b/drivers/i2c/rcar_iic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar IIC driver * diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index 9927af94a8..1e51e58fc5 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 505e20bc61..f4c7f2d156 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * David Mueller, ELSOFT AG, d.mueller(a)elsoft.ch diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h index ec8f1acaef..0b0cab52c9 100644 --- a/drivers/i2c/s3c24x0_i2c.h +++ b/drivers/i2c/s3c24x0_i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics */ diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c index c99e6de933..f8b37c7947 100644 --- a/drivers/i2c/sandbox_i2c.c +++ b/drivers/i2c/sandbox_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simulate an I2C port * diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c index 3335d9482a..d78f4d653d 100644 --- a/drivers/i2c/sh_i2c.c +++ b/drivers/i2c/sh_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011, 2013 Renesas Solutions Corp. * Copyright (C) 2011, 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index ed8ba47de4..b3d8f4cde2 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c index b6c71789ee..af60d31663 100644 --- a/drivers/i2c/stm32f7_i2c.c +++ b/drivers/i2c/stm32f7_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 STMicroelectronics */ diff --git a/drivers/i2c/sun6i_p2wi.c b/drivers/i2c/sun6i_p2wi.c index d221323295..63715fcc9b 100644 --- a/drivers/i2c/sun6i_p2wi.c +++ b/drivers/i2c/sun6i_p2wi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sunxi A31 Power Management Unit * diff --git a/drivers/i2c/sun8i_rsb.c b/drivers/i2c/sun8i_rsb.c index 47fa05b6d1..00d3ec9555 100644 --- a/drivers/i2c/sun8i_rsb.c +++ b/drivers/i2c/sun8i_rsb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/drivers/i2c/synquacer_i2c.c b/drivers/i2c/synquacer_i2c.c index 6672d9435e..e675f0b831 100644 --- a/drivers/i2c/synquacer_i2c.c +++ b/drivers/i2c/synquacer_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* */ diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index 57d77d56ea..caf0999044 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Copyright (c) 2010-2011 NVIDIA Corporation diff --git a/drivers/i2c/xilinx_xiic.c b/drivers/i2c/xilinx_xiic.c index 72199a62b2..78165ea655 100644 --- a/drivers/i2c/xilinx_xiic.c +++ b/drivers/i2c/xilinx_xiic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx AXI I2C driver * diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 71f315adf6..f57e8bf19b 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/input/apple_spi_kbd.c b/drivers/input/apple_spi_kbd.c index 7cf12f453a..6da806a5f9 100644 --- a/drivers/input/apple_spi_kbd.c +++ b/drivers/input/apple_spi_kbd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/input/button_kbd.c b/drivers/input/button_kbd.c index 74fadfca8b..3d509bc137 100644 --- a/drivers/input/button_kbd.c +++ b/drivers/input/button_kbd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 Dzmitry Sankouski <dsankouski(a)gmail.com> */ diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c index c485346373..8574be6253 100644 --- a/drivers/input/cros_ec_keyb.c +++ b/drivers/input/cros_ec_keyb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS Matrix Keyboard * diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index e6070ca015..87c36bfcd8 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 ELTEC Elektronik AG * Frank Gottschling <fgottschling(a)eltec.de> diff --git a/drivers/input/input.c b/drivers/input/input.c index 8a6506e7c6..2f7b7399d4 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Translate key codes into ASCII * diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c index e2fb2e1707..9112b2c802 100644 --- a/drivers/input/key_matrix.c +++ b/drivers/input/key_matrix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Manage Keyboard Matrices * diff --git a/drivers/input/keyboard-uclass.c b/drivers/input/keyboard-uclass.c index aefc8e825e..11c2c3d233 100644 --- a/drivers/input/keyboard-uclass.c +++ b/drivers/input/keyboard-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index d4741a7666..beb71deabc 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/drivers/input/twl4030.c b/drivers/input/twl4030.c index 3a1c46b304..c18dedfa7e 100644 --- a/drivers/input/twl4030.c +++ b/drivers/input/twl4030.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TWL4030 input * diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index e3e0900e17..d082cefe9a 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_IOMMU) += iommu-uclass.o diff --git a/drivers/iommu/apple_dart.c b/drivers/iommu/apple_dart.c index 6ecd84303b..842338e391 100644 --- a/drivers/iommu/apple_dart.c +++ b/drivers/iommu/apple_dart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/iommu/iommu-uclass.c b/drivers/iommu/iommu-uclass.c index 72f123df55..d124198f3c 100644 --- a/drivers/iommu/iommu-uclass.c +++ b/drivers/iommu/iommu-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/iommu/sandbox_iommu.c b/drivers/iommu/sandbox_iommu.c index 6ceb7fd5ec..a2b339fc6a 100644 --- a/drivers/iommu/sandbox_iommu.c +++ b/drivers/iommu/sandbox_iommu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/led/Makefile b/drivers/led/Makefile index 49ae91961d..c2e5d9cda1 100644 --- a/drivers/led/Makefile +++ b/drivers/led/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 68ca3c2970..f8b43fdd46 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c index f59a92fb1f..6014b2d218 100644 --- a/drivers/led/led_bcm6328.c +++ b/drivers/led/led_bcm6328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c index 25aa3994d0..798e4a2d6b 100644 --- a/drivers/led/led_bcm6358.c +++ b/drivers/led/led_bcm6358.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/drivers/led/led_bcm6753.c b/drivers/led/led_bcm6753.c index 2466d93011..003b46a625 100644 --- a/drivers/led/led_bcm6753.c +++ b/drivers/led/led_bcm6753.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Philippe Reynes <philippe.reynes(a)softathome.com> * diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c index 397dc0d869..efb1bedd6e 100644 --- a/drivers/led/led_bcm6858.c +++ b/drivers/led/led_bcm6858.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Philippe Reynes <philippe.reynes(a)softathome.com> * diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c index bcbe78d632..737641b4fe 100644 --- a/drivers/led/led_cortina.c +++ b/drivers/led/led_cortina.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Cortina-Access diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c index fbed151b5d..c32cf8a192 100644 --- a/drivers/led/led_gpio.c +++ b/drivers/led/led_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c index 7c8eae9337..cc3e095c02 100644 --- a/drivers/led/led_pwm.c +++ b/drivers/led/led_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 VK * Author: Ivan Vozvakhov <i.vozvakhov(a)vk.team> diff --git a/drivers/mailbox/apple-mbox.c b/drivers/mailbox/apple-mbox.c index 30c8e2f03f..6bca8117d0 100644 --- a/drivers/mailbox/apple-mbox.c +++ b/drivers/mailbox/apple-mbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/mailbox/k3-sec-proxy.c b/drivers/mailbox/k3-sec-proxy.c index e0a18d8a97..57454e2ce4 100644 --- a/drivers/mailbox/k3-sec-proxy.c +++ b/drivers/mailbox/k3-sec-proxy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 Secure proxy Driver * diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c index 3e4ec47389..86fd096e2b 100644 --- a/drivers/mailbox/zynqmp-ipi.c +++ b/drivers/mailbox/zynqmp-ipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx Zynq MPSoC Mailbox driver * diff --git a/drivers/memory/memory-sandbox.c b/drivers/memory/memory-sandbox.c index f2ede50863..5158c01eae 100644 --- a/drivers/memory/memory-sandbox.c +++ b/drivers/memory/memory-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/memory/memory-uclass.c b/drivers/memory/memory-uclass.c index d6d37fe777..33c6eacb68 100644 --- a/drivers/memory/memory-uclass.c +++ b/drivers/memory/memory-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c index 212bb4f5dc..94a338990d 100644 --- a/drivers/memory/stm32-fmc2-ebi.c +++ b/drivers/memory/stm32-fmc2-ebi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) STMicroelectronics 2020 */ diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c index c4bc88c151..5c5d8b749c 100644 --- a/drivers/memory/ti-aemif.c +++ b/drivers/memory/ti-aemif.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Keystone2: Asynchronous EMIF Configuration * diff --git a/drivers/memory/ti-gpmc.c b/drivers/memory/ti-gpmc.c index f511a529b1..bc78f313b7 100644 --- a/drivers/memory/ti-gpmc.c +++ b/drivers/memory/ti-gpmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments GPMC Driver * diff --git a/drivers/memory/ti-gpmc.h b/drivers/memory/ti-gpmc.h index 90f8e656c8..f3fc096785 100644 --- a/drivers/memory/ti-gpmc.h +++ b/drivers/memory/ti-gpmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments GPMC Driver * diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index b67b82358a..ae3c6698fe 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/misc/altera_sysid.c b/drivers/misc/altera_sysid.c index 878df12771..96f5f873c9 100644 --- a/drivers/misc/altera_sysid.c +++ b/drivers/misc/altera_sysid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 9c1e6a5e3e..1060438a4e 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver * diff --git a/drivers/misc/cros_ec_i2c.c b/drivers/misc/cros_ec_i2c.c index a1b78a3045..dd2feae94f 100644 --- a/drivers/misc/cros_ec_i2c.c +++ b/drivers/misc/cros_ec_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver - I2C interface * diff --git a/drivers/misc/cros_ec_lpc.c b/drivers/misc/cros_ec_lpc.c index 1a8a81349c..0e0c281bee 100644 --- a/drivers/misc/cros_ec_lpc.c +++ b/drivers/misc/cros_ec_lpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver - LPC interface * diff --git a/drivers/misc/cros_ec_sandbox.c b/drivers/misc/cros_ec_sandbox.c index 1201535f4a..982c7227da 100644 --- a/drivers/misc/cros_ec_sandbox.c +++ b/drivers/misc/cros_ec_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver - sandbox emulation * diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c index 001f0a85ca..8232127603 100644 --- a/drivers/misc/cros_ec_spi.c +++ b/drivers/misc/cros_ec_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Chromium OS cros_ec driver - SPI interface * diff --git a/drivers/misc/esm_pmic.c b/drivers/misc/esm_pmic.c index b971f32f6a..d05626fbf0 100644 --- a/drivers/misc/esm_pmic.c +++ b/drivers/misc/esm_pmic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PMIC Error Signal Monitor driver * diff --git a/drivers/misc/fsl_devdis.c b/drivers/misc/fsl_devdis.c index 179053a298..1286289769 100644 --- a/drivers/misc/fsl_devdis.c +++ b/drivers/misc/fsl_devdis.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * Author: Zhuoyu Zhang <Zhuoyu.Zhang(a)freescale.com> diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c index f165b8c36b..b3ede8a9af 100644 --- a/drivers/misc/fsl_ifc.c +++ b/drivers/misc/fsl_ifc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Author: Dipen Dudhat <dipen.dudhat(a)freescale.com> diff --git a/drivers/misc/fsl_iim.c b/drivers/misc/fsl_iim.c index 85cc3c26b2..614c61d6c0 100644 --- a/drivers/misc/fsl_iim.c +++ b/drivers/misc/fsl_iim.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009-2013 ADVANSEE * Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> diff --git a/drivers/misc/fsl_portals.c b/drivers/misc/fsl_portals.c index 6b831281e9..1646af29b6 100644 --- a/drivers/misc/fsl_portals.c +++ b/drivers/misc/fsl_portals.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/misc/fsl_sec_mon.c b/drivers/misc/fsl_sec_mon.c index 3597ee2224..6e05206e53 100644 --- a/drivers/misc/fsl_sec_mon.c +++ b/drivers/misc/fsl_sec_mon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/drivers/misc/gdsys_ioep.c b/drivers/misc/gdsys_ioep.c index 145cfa23c6..0d9a08210b 100644 --- a/drivers/misc/gdsys_ioep.c +++ b/drivers/misc/gdsys_ioep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc @@ -8,7 +8,7 @@ * (C) Copyright 2014 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/drivers/misc/gdsys_ioep.h b/drivers/misc/gdsys_ioep.h index f195388eda..0f06b2de7e 100644 --- a/drivers/misc/gdsys_ioep.h +++ b/drivers/misc/gdsys_ioep.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/gdsys_rxaui_ctrl.c b/drivers/misc/gdsys_rxaui_ctrl.c index 8f5cbe420f..7e80ce45fe 100644 --- a/drivers/misc/gdsys_rxaui_ctrl.c +++ b/drivers/misc/gdsys_rxaui_ctrl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Dirk Eibach, Guntermann & Drunck GmbH, eibach(a)gdsys.de diff --git a/drivers/misc/gdsys_soc.c b/drivers/misc/gdsys_soc.c index 27e7dc4832..484ce6800a 100644 --- a/drivers/misc/gdsys_soc.c +++ b/drivers/misc/gdsys_soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/gdsys_soc.h b/drivers/misc/gdsys_soc.h index 088d3b6523..a6e3f49484 100644 --- a/drivers/misc/gdsys_soc.h +++ b/drivers/misc/gdsys_soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/gsc.c b/drivers/misc/gsc.c index 65c9c2c6ce..04a421e664 100644 --- a/drivers/misc/gsc.c +++ b/drivers/misc/gsc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Gateworks Corporation */ diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c index bdd7e018cc..d511fb31a5 100644 --- a/drivers/misc/i2c_eeprom.c +++ b/drivers/misc/i2c_eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/misc/i2c_eeprom_emul.c b/drivers/misc/i2c_eeprom_emul.c index 6f32087ede..77f3c66bc2 100644 --- a/drivers/misc/i2c_eeprom_emul.c +++ b/drivers/misc/i2c_eeprom_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simulate an I2C eeprom * diff --git a/drivers/misc/ihs_fpga.c b/drivers/misc/ihs_fpga.c index a0fece985d..63e11aca9c 100644 --- a/drivers/misc/ihs_fpga.c +++ b/drivers/misc/ihs_fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/ihs_fpga.h b/drivers/misc/ihs_fpga.h index efb5dabb9c..4beb792003 100644 --- a/drivers/misc/ihs_fpga.h +++ b/drivers/misc/ihs_fpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/imx8/Makefile b/drivers/misc/imx8/Makefile index 48fdb5b61c..6d43fb11e7 100644 --- a/drivers/misc/imx8/Makefile +++ b/drivers/misc/imx8/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += scu_api.o scu.o obj-$(CONFIG_CMD_FUSE) += fuse.o diff --git a/drivers/misc/imx_ele/Makefile b/drivers/misc/imx_ele/Makefile index f8d8c55f98..92ced15b46 100644 --- a/drivers/misc/imx_ele/Makefile +++ b/drivers/misc/imx_ele/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += ele_api.o ele_mu.o obj-$(CONFIG_CMD_FUSE) += fuse.o diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c index 7b79ed2df4..0cad9cf916 100644 --- a/drivers/misc/irq-uclass.c +++ b/drivers/misc/irq-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google, LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/misc/jz4780_efuse.c b/drivers/misc/jz4780_efuse.c index 1fba3271db..baa751c35c 100644 --- a/drivers/misc/jz4780_efuse.c +++ b/drivers/misc/jz4780_efuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * JZ4780 EFUSE driver * diff --git a/drivers/misc/k3_avs.c b/drivers/misc/k3_avs.c index acfc731845..17cc8f7bfb 100644 --- a/drivers/misc/k3_avs.c +++ b/drivers/misc/k3_avs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 Clas 0 Adaptive Voltage Scaling driver * diff --git a/drivers/misc/k3_esm.c b/drivers/misc/k3_esm.c index 41faeb3d85..e11d6bea19 100644 --- a/drivers/misc/k3_esm.c +++ b/drivers/misc/k3_esm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 Error Signalling Module driver * diff --git a/drivers/misc/ls2_sfp.c b/drivers/misc/ls2_sfp.c index 2a81bc7de5..b18a314930 100644 --- a/drivers/misc/ls2_sfp.c +++ b/drivers/misc/ls2_sfp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> * diff --git a/drivers/misc/microchip_flexcom.c b/drivers/misc/microchip_flexcom.c index e0a6f2d388..51d3d63742 100644 --- a/drivers/misc/microchip_flexcom.c +++ b/drivers/misc/microchip_flexcom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019, Microchip Technology, Inc. * Author: Eugen Hristev <eugen.hristev(a)microchip.com> diff --git a/drivers/misc/misc-uclass.c b/drivers/misc/misc-uclass.c index cfe9d562fa..d26564b810 100644 --- a/drivers/misc/misc-uclass.c +++ b/drivers/misc/misc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/drivers/misc/misc_sandbox.c b/drivers/misc/misc_sandbox.c index 31cde2dbac..d98c2f48b9 100644 --- a/drivers/misc/misc_sandbox.c +++ b/drivers/misc/misc_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/mpc83xx_serdes.c b/drivers/misc/mpc83xx_serdes.c index 93c87e998c..2c73e9ecda 100644 --- a/drivers/misc/mpc83xx_serdes.c +++ b/drivers/misc/mpc83xx_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/mpc83xx_serdes.h b/drivers/misc/mpc83xx_serdes.h index 2a13c5892b..156735c107 100644 --- a/drivers/misc/mpc83xx_serdes.h +++ b/drivers/misc/mpc83xx_serdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c index 8ee18f29d9..36c5747c00 100644 --- a/drivers/misc/mxc_ocotp.c +++ b/drivers/misc/mxc_ocotp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 ADVANSEE * Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> diff --git a/drivers/misc/mxs_ocotp.c b/drivers/misc/mxs_ocotp.c index facc720c8e..3b311c0e25 100644 --- a/drivers/misc/mxs_ocotp.c +++ b/drivers/misc/mxs_ocotp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 OCOTP Driver * diff --git a/drivers/misc/npcm_host_intf.c b/drivers/misc/npcm_host_intf.c index 79f57f57d8..3c22727d3b 100644 --- a/drivers/misc/npcm_host_intf.c +++ b/drivers/misc/npcm_host_intf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Host interface (LPC or eSPI) configuration on Nuvoton BMC * Copyright (c) 2022 Nuvoton Technology Corp. diff --git a/drivers/misc/npcm_otp.c b/drivers/misc/npcm_otp.c index 08029724c0..62e88725ae 100644 --- a/drivers/misc/npcm_otp.c +++ b/drivers/misc/npcm_otp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/misc/nuvoton_nct6102d.c b/drivers/misc/nuvoton_nct6102d.c index daf5019d01..0c660d5a85 100644 --- a/drivers/misc/nuvoton_nct6102d.c +++ b/drivers/misc/nuvoton_nct6102d.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/misc/nvmem.c b/drivers/misc/nvmem.c index 5a2bd1f9f7..72184855b9 100644 --- a/drivers/misc/nvmem.c +++ b/drivers/misc/nvmem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c index f24857a151..cf59f88739 100644 --- a/drivers/misc/p2sb-uclass.c +++ b/drivers/misc/p2sb-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Uclass for Primary-to-sideband bus, used to access various peripherals * diff --git a/drivers/misc/p2sb_emul.c b/drivers/misc/p2sb_emul.c index 51f87161d5..59c60e6cd8 100644 --- a/drivers/misc/p2sb_emul.c +++ b/drivers/misc/p2sb_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI emulation device for an x86 Primary-to-Sideband bus * diff --git a/drivers/misc/pca9551_led.c b/drivers/misc/pca9551_led.c index cdc4390f81..7c393ca3f5 100644 --- a/drivers/misc/pca9551_led.c +++ b/drivers/misc/pca9551_led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/misc/pwrseq-uclass.c b/drivers/misc/pwrseq-uclass.c index a0f24e1bf3..e8503317ba 100644 --- a/drivers/misc/pwrseq-uclass.c +++ b/drivers/misc/pwrseq-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/misc/qcom-geni-se.c b/drivers/misc/qcom-geni-se.c index 281a5ec819..545fd4ca1b 100644 --- a/drivers/misc/qcom-geni-se.c +++ b/drivers/misc/qcom-geni-se.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm Generic Interface (GENI) Serial Engine (SE) Wrapper * diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c index 7c01bf23d5..50d7f50f16 100644 --- a/drivers/misc/qfw.c +++ b/drivers/misc/qfw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Miao Yan <yanmiaobest(a)gmail.com> * (C) Copyright 2021 Asherah Connor <ashe(a)kivikakk.ee> diff --git a/drivers/misc/qfw_mmio.c b/drivers/misc/qfw_mmio.c index f397384054..814f0b2271 100644 --- a/drivers/misc/qfw_mmio.c +++ b/drivers/misc/qfw_mmio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MMIO interface for QFW * diff --git a/drivers/misc/qfw_pio.c b/drivers/misc/qfw_pio.c index e2f628d338..54d7bd477a 100644 --- a/drivers/misc/qfw_pio.c +++ b/drivers/misc/qfw_pio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PIO interface for QFW * diff --git a/drivers/misc/qfw_sandbox.c b/drivers/misc/qfw_sandbox.c index 1002df7533..b2fdd6c4a8 100644 --- a/drivers/misc/qfw_sandbox.c +++ b/drivers/misc/qfw_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sandbox interface for QFW * diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index 2f96b79ea4..a497b2a6c1 100644 --- a/drivers/misc/rockchip-efuse.c +++ b/drivers/misc/rockchip-efuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * eFuse driver for Rockchip devices * diff --git a/drivers/misc/sl28cpld.c b/drivers/misc/sl28cpld.c index 01ef1c6178..02ee25017d 100644 --- a/drivers/misc/sl28cpld.c +++ b/drivers/misc/sl28cpld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Michael Walle <michael(a)walle.cc> */ diff --git a/drivers/misc/smsc_lpc47m.c b/drivers/misc/smsc_lpc47m.c index bda064f136..4918ba87c7 100644 --- a/drivers/misc/smsc_lpc47m.c +++ b/drivers/misc/smsc_lpc47m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/drivers/misc/smsc_sio1007.c b/drivers/misc/smsc_sio1007.c index 3b7b1c8bcf..8f948fd0d1 100644 --- a/drivers/misc/smsc_sio1007.c +++ b/drivers/misc/smsc_sio1007.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/drivers/misc/spltest_sandbox.c b/drivers/misc/spltest_sandbox.c index 6b9701a06a..26e261d75d 100644 --- a/drivers/misc/spltest_sandbox.c +++ b/drivers/misc/spltest_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c index a6e9c03a02..4c892be1f4 100644 --- a/drivers/misc/status_led.c +++ b/drivers/misc/status_led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c index c1e5428a6b..93cdded695 100644 --- a/drivers/misc/stm32_rcc.c +++ b/drivers/misc/stm32_rcc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/misc/stm32mp_fuse.c b/drivers/misc/stm32mp_fuse.c index 9fd6c367dc..368b5dd4e1 100644 --- a/drivers/misc/stm32mp_fuse.c +++ b/drivers/misc/stm32mp_fuse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index ee5c12bd0a..20c435c605 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI emulation device which swaps the case of text * diff --git a/drivers/misc/syscon_sandbox.c b/drivers/misc/syscon_sandbox.c index d5cef188d7..bc5809e11e 100644 --- a/drivers/misc/syscon_sandbox.c +++ b/drivers/misc/syscon_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/misc/test_drv.c b/drivers/misc/test_drv.c index 927618256f..ce3b9e2710 100644 --- a/drivers/misc/test_drv.c +++ b/drivers/misc/test_drv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/misc/twl4030_led.c b/drivers/misc/twl4030_led.c index 2d9a8c4fbc..6fc6b839e4 100644 --- a/drivers/misc/twl4030_led.c +++ b/drivers/misc/twl4030_led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix at windriver.com> diff --git a/drivers/misc/usb251xb.c b/drivers/misc/usb251xb.c index 92e92ba5e6..975ad7f87a 100644 --- a/drivers/misc/usb251xb.c +++ b/drivers/misc/usb251xb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for Microchip USB251xB USB 2.0 Hi-Speed Hub Controller * Configuration via SMBus. diff --git a/drivers/misc/vexpress_config.c b/drivers/misc/vexpress_config.c index 2baca48109..47d00e4e5c 100644 --- a/drivers/misc/vexpress_config.c +++ b/drivers/misc/vexpress_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Arm Ltd * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> diff --git a/drivers/misc/winbond_w83627.c b/drivers/misc/winbond_w83627.c index 3838b3f74f..84b02b9d81 100644 --- a/drivers/misc/winbond_w83627.c +++ b/drivers/misc/winbond_w83627.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 2c65c4765a..6de0f5f621 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index fd667aeafd..9c0e920b9c 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * diff --git a/drivers/mmc/arm_pl180_mmci.c b/drivers/mmc/arm_pl180_mmci.c index 9c5d48e90c..ffbe760ff8 100644 --- a/drivers/mmc/arm_pl180_mmci.c +++ b/drivers/mmc/arm_pl180_mmci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ARM PrimeCell MultiMedia Card Interface - PL180 * diff --git a/drivers/mmc/arm_pl180_mmci.h b/drivers/mmc/arm_pl180_mmci.h index fca15910a8..bcbad28c7f 100644 --- a/drivers/mmc/arm_pl180_mmci.h +++ b/drivers/mmc/arm_pl180_mmci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ARM PrimeCell MultiMedia Card Interface - PL180 * diff --git a/drivers/mmc/aspeed_sdhci.c b/drivers/mmc/aspeed_sdhci.c index 9d79bf58cc..31a18382cd 100644 --- a/drivers/mmc/aspeed_sdhci.c +++ b/drivers/mmc/aspeed_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 IBM Corp. * Eddie James <eajames(a)linux.ibm.com> diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index 5347ba9043..1dc312da7c 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Atmel Corporation * Wenyou.Yang <wenyou.yang(a)atmel.com> diff --git a/drivers/mmc/bcmstb_sdhci.c b/drivers/mmc/bcmstb_sdhci.c index dc96818cff..9715fcd50f 100644 --- a/drivers/mmc/bcmstb_sdhci.c +++ b/drivers/mmc/bcmstb_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Cisco Systems, Inc. * (C) Copyright 2019 Synamedia diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index a17ed8c11c..a65997c4d3 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Cortina Access * Arthur Li <arthur.li(a)cortina-access.com> diff --git a/drivers/mmc/davinci_mmc.c b/drivers/mmc/davinci_mmc.c index 3a3d23aec0..9be2f663c1 100644 --- a/drivers/mmc/davinci_mmc.c +++ b/drivers/mmc/davinci_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Davinci MMC Controller Driver * diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 400066fa99..6c3fd0f83b 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c index 2f849c43b1..7dcf46116d 100644 --- a/drivers/mmc/exynos_dw_mmc.c +++ b/drivers/mmc/exynos_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/mmc/f_sdh30.c b/drivers/mmc/f_sdh30.c index 3d587a464d..39b1935b2f 100644 --- a/drivers/mmc/f_sdh30.c +++ b/drivers/mmc/f_sdh30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Socionext F_SDH30 eMMC driver * Copyright 2021 Linaro Ltd. diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d506666669..22ddc7cff1 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc * Copyright 2019-2021 NXP diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 7c39c86c5e..770957332f 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2007, 2010-2011 Freescale Semiconductor, Inc * Copyright 2019, 2021 NXP diff --git a/drivers/mmc/fsl_esdhc_spl.c b/drivers/mmc/fsl_esdhc_spl.c index 6d7c0cff22..ac49e121a2 100644 --- a/drivers/mmc/fsl_esdhc_spl.c +++ b/drivers/mmc/fsl_esdhc_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c index cabb747fbb..731f4df76c 100644 --- a/drivers/mmc/ftsdc010_mci.c +++ b/drivers/mmc/ftsdc010_mci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Faraday MMC/SD Host Controller * diff --git a/drivers/mmc/ftsdc010_mci.h b/drivers/mmc/ftsdc010_mci.h index 782d92be2f..a935e739d0 100644 --- a/drivers/mmc/ftsdc010_mci.h +++ b/drivers/mmc/ftsdc010_mci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Faraday FTSDC010 Secure Digital Memory Card Host Controller * diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index d91819acfd..66bb9ee70e 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2010 * Rob Emanuele <rob(a)emanuele.us> diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index 71962cd47e..e5f01cd4cb 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Linaro * peter.griffin <peter.griffin(a)linaro.org> diff --git a/drivers/mmc/iproc_sdhci.c b/drivers/mmc/iproc_sdhci.c index 11d86ad658..f32d5571a5 100644 --- a/drivers/mmc/iproc_sdhci.c +++ b/drivers/mmc/iproc_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Broadcom. * diff --git a/drivers/mmc/jz_mmc.c b/drivers/mmc/jz_mmc.c index 61e48ee0f6..adf1a8aadc 100644 --- a/drivers/mmc/jz_mmc.c +++ b/drivers/mmc/jz_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Ingenic JZ MMC driver * diff --git a/drivers/mmc/kona_sdhci.c b/drivers/mmc/kona_sdhci.c index 2bbe673b91..15547c37de 100644 --- a/drivers/mmc/kona_sdhci.c +++ b/drivers/mmc/kona_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Broadcom Corporation. */ diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index fcf4f03d1e..99d5fc241b 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Carlo Caione <carlo(a)caione.org> */ diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h index 8974b78f55..87c5cce719 100644 --- a/drivers/mmc/meson_gx_mmc.h +++ b/drivers/mmc/meson_gx_mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Carlo Caione <carlo(a)caione.org> */ diff --git a/drivers/mmc/mmc-pwrseq.c b/drivers/mmc/mmc-pwrseq.c index 2539f61323..e30c138923 100644 --- a/drivers/mmc/mmc-pwrseq.c +++ b/drivers/mmc/mmc-pwrseq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 328456831d..e28d87ef5b 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Copyright 2020 NXP diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d96db7a0f8..e9a70448ac 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008, Freescale Semiconductor, Inc * Copyright 2020 NXP diff --git a/drivers/mmc/mmc_boot.c b/drivers/mmc/mmc_boot.c index 0a74b1fb77..f594b44cea 100644 --- a/drivers/mmc/mmc_boot.c +++ b/drivers/mmc/mmc_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Written by Amar <amarendra.xt(a)samsung.com> diff --git a/drivers/mmc/mmc_bootdev.c b/drivers/mmc/mmc_bootdev.c index 55ecead2dd..cbaca74462 100644 --- a/drivers/mmc/mmc_bootdev.c +++ b/drivers/mmc/mmc_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootdev for MMC * diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c index a101ee43fd..9b78e9680d 100644 --- a/drivers/mmc/mmc_legacy.c +++ b/drivers/mmc/mmc_legacy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Google, Inc * Copyright 2020 NXP diff --git a/drivers/mmc/mmc_private.h b/drivers/mmc/mmc_private.h index b32123758e..612fc5e3ac 100644 --- a/drivers/mmc/mmc_private.h +++ b/drivers/mmc/mmc_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2008,2010 Freescale Semiconductor, Inc * Copyright 2020 NXP diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index a6f93380dd..9f12c8656b 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008, Freescale Semiconductor, Inc * Andy Fleming diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c index 604f9c3ff9..f82393c52b 100644 --- a/drivers/mmc/msm_sdhci.c +++ b/drivers/mmc/msm_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm SDHCI driver - SD/eMMC controller * diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c index dbdd671c88..d38e58d9b8 100644 --- a/drivers/mmc/mv_sdhci.c +++ b/drivers/mmc/mv_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell SD Host Controller Interface */ diff --git a/drivers/mmc/mvebu_mmc.c b/drivers/mmc/mvebu_mmc.c index fea55c61ed..e216bfdcc2 100644 --- a/drivers/mmc/mvebu_mmc.c +++ b/drivers/mmc/mvebu_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell MMC/SD/SDIO driver * diff --git a/drivers/mmc/mxsmmc.c b/drivers/mmc/mxsmmc.c index 35a8e21058..e40a3daa47 100644 --- a/drivers/mmc/mxsmmc.c +++ b/drivers/mmc/mxsmmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 SSP MMC driver * diff --git a/drivers/mmc/nexell_dw_mmc.c b/drivers/mmc/nexell_dw_mmc.c index 2723e4887c..f9d107c27d 100644 --- a/drivers/mmc/nexell_dw_mmc.c +++ b/drivers/mmc/nexell_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Nexell * Youngbok, Park <park(a)nexell.co.kr> diff --git a/drivers/mmc/npcm_sdhci.c b/drivers/mmc/npcm_sdhci.c index d63521d685..eee7511113 100644 --- a/drivers/mmc/npcm_sdhci.c +++ b/drivers/mmc/npcm_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/mmc/owl_mmc.c b/drivers/mmc/owl_mmc.c index e84171a661..e02dc0f168 100644 --- a/drivers/mmc/owl_mmc.c +++ b/drivers/mmc/owl_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Amit Singh Tomar <amittomer25(a)gmail.com> * diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 9fb7044029..611285c71b 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Google, Inc * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/mmc/pic32_sdhci.c b/drivers/mmc/pic32_sdhci.c index fe555106a1..3355bdd453 100644 --- a/drivers/mmc/pic32_sdhci.c +++ b/drivers/mmc/pic32_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Support of SDHCI for Microchip PIC32 SoC. * diff --git a/drivers/mmc/piton_mmc.c b/drivers/mmc/piton_mmc.c index a330bbf8cb..5e1c2507ff 100644 --- a/drivers/mmc/piton_mmc.c +++ b/drivers/mmc/piton_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 1ea6e1066f..2f53d46387 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 72c820ee63..5a7a3d4644 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 285332d9f4..3c7cc57edd 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Fuzhou Rockchip Electronics Co., Ltd * diff --git a/drivers/mmc/rpmb.c b/drivers/mmc/rpmb.c index b68d98573c..28dce4abd3 100644 --- a/drivers/mmc/rpmb.c +++ b/drivers/mmc/rpmb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014, Staubli Faverges * Pierre Aubert diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 3b74feae68..9b23efbcd0 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index 0ba7940a4d..1c62aca9ef 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/mmc/sdhci-adma.c b/drivers/mmc/sdhci-adma.c index 8213223d3f..c38499099c 100644 --- a/drivers/mmc/sdhci-adma.c +++ b/drivers/mmc/sdhci-adma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SDHCI ADMA2 helper functions. */ diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c index 327a05ad11..635c1da977 100644 --- a/drivers/mmc/sdhci-cadence.c +++ b/drivers/mmc/sdhci-cadence.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index fc9c6c3799..15d34e8804 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen(a)marvell.com> diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index 50a8805e73..21dfe9312d 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Synopsys DesignWare Multimedia Card Interface driver * extensions used in various Synopsys ARC devboards. diff --git a/drivers/mmc/socfpga_dw_mmc.c b/drivers/mmc/socfpga_dw_mmc.c index be3d8bfb3d..6913079ea8 100644 --- a/drivers/mmc/socfpga_dw_mmc.c +++ b/drivers/mmc/socfpga_dw_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Altera Corporation <www.altera.com> */ diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index 23a1dd43c9..c965a3fbbe 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 5ff5e1a4d8..f5b5f998f1 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 23bc7da917..a993ba8518 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/drivers/mmc/tangier_sdhci.c b/drivers/mmc/tangier_sdhci.c index 1156427332..1cb36e22b4 100644 --- a/drivers/mmc/tangier_sdhci.c +++ b/drivers/mmc/tangier_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index f76fee3ea0..2c02aeffae 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index d1e2681599..c664d62c36 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index f489fb7076..67662075de 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 75003a0113..3b8fd2fe7a 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index 935540d171..197f247d57 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 - 2022, Xilinx, Inc. * (C) Copyright 2022, Advanced Micro Devices, Inc. diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index c638980ea2..2bcc72afcb 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index d31391f36a..5cc9f04574 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 8ade7949a6..3c88bd6901 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002-2004 * Brad Kemp, Seranoa Networks, Brad.Kemp(a)seranoa.com diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index bf4473ba9e..65febcbc4d 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c index 859c7fd4ec..7fcb96ccb3 100644 --- a/drivers/mtd/jedec_flash.c +++ b/drivers/mtd/jedec_flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Michael Schwingen, <michael(a)schwingen.org> diff --git a/drivers/mtd/mtd-uclass.c b/drivers/mtd/mtd-uclass.c index 0743fe7af9..4e7157ab9e 100644 --- a/drivers/mtd/mtd-uclass.c +++ b/drivers/mtd/mtd-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index 14ce726b10..9e97e5a3fc 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 51232581d9..e768a61b4e 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MTD device concatenation layer * diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index aa78d41a55..9e7115ef52 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Core registration and callback routines for MTD * drivers and users. diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 4886392a1c..c1ce66fe0d 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple MTD partitioning layer * diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 96e186600a..07f5ecfc19 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) nandcore-objs := core.o bbt.o diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index add2b4cf65..ef83a7278b 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/mtd/nand/raw/am335x_spl_bch.c b/drivers/mtd/nand/raw/am335x_spl_bch.c index 6ab3f1f42c..a4137cbae4 100644 --- a/drivers/mtd/nand/raw/am335x_spl_bch.c +++ b/drivers/mtd/nand/raw/am335x_spl_bch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Konstantin Kozhevnikov, Cogent Embedded diff --git a/drivers/mtd/nand/raw/arasan_nfc.c b/drivers/mtd/nand/raw/arasan_nfc.c index 14766401bf..ac831f6ce3 100644 --- a/drivers/mtd/nand/raw/arasan_nfc.c +++ b/drivers/mtd/nand/raw/arasan_nfc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Arasan NAND Flash Controller Driver * diff --git a/drivers/mtd/nand/raw/atmel_nand.c b/drivers/mtd/nand/raw/atmel_nand.c index 6b17e744a6..aa38a7b82c 100644 --- a/drivers/mtd/nand/raw/atmel_nand.c +++ b/drivers/mtd/nand/raw/atmel_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/drivers/mtd/nand/raw/atmel_nand_ecc.h b/drivers/mtd/nand/raw/atmel_nand_ecc.h index 05eeedb3f8..1bc964af55 100644 --- a/drivers/mtd/nand/raw/atmel_nand_ecc.h +++ b/drivers/mtd/nand/raw/atmel_nand_ecc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Error Corrected Code Controller (ECC) - System peripherals regsters. * Based on AT91SAM9260 datasheet revision B. diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index 0c6325aaa6..7ea1c464e3 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_NAND_BRCMNAND_6368) += bcm6368_nand.o obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_nand.o diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c index 4e6d99fd3c..073242b5ff 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c index 6164989b93..b429b12c43 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c index feae66ef25..10fda99aea 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c index dbd85af707..bd1eb0fca4 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c index ef3649688c..e5febe29de 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c index 027fdd37da..0a2eb9b4e2 100644 --- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c +++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index efbf9a3120..2faac29d40 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright © 2010-2015 Broadcom Corporation * diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h index 6946a62b06..d8e070687e 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BRCMNAND_H__ #define __BRCMNAND_H__ diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c index a6acf556bc..c45b76fe41 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <dm.h> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h index 52711d4978..82a524be9a 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BRCMNAND_COMPAT_H #define __BRCMNAND_COMPAT_H diff --git a/drivers/mtd/nand/raw/cortina_nand.c b/drivers/mtd/nand/raw/cortina_nand.c index b7be6602f7..5ee25416cd 100644 --- a/drivers/mtd/nand/raw/cortina_nand.c +++ b/drivers/mtd/nand/raw/cortina_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Cortina Access Inc.. */ diff --git a/drivers/mtd/nand/raw/cortina_nand.h b/drivers/mtd/nand/raw/cortina_nand.h index 1e3e3bfd05..4c938df874 100644 --- a/drivers/mtd/nand/raw/cortina_nand.h +++ b/drivers/mtd/nand/raw/cortina_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2020 Cortina Access Inc.. */ diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c index 71bbb8231b..570173651f 100644 --- a/drivers/mtd/nand/raw/davinci_nand.c +++ b/drivers/mtd/nand/raw/davinci_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NAND driver for TI DaVinci based boards. * diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index c827f80281..a1528cf166 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2013-2014, Altera Corporation <www.altera.com> diff --git a/drivers/mtd/nand/raw/denali.h b/drivers/mtd/nand/raw/denali.h index 6cd02b2e26..e34d3a72a9 100644 --- a/drivers/mtd/nand/raw/denali.h +++ b/drivers/mtd/nand/raw/denali.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2014 Altera Corporation <www.altera.com> * Copyright (C) 2009-2010, Intel Corporation and its suppliers. diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index cf4df0168a..759630dc4b 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mtd/nand/raw/denali_spl.c b/drivers/mtd/nand/raw/denali_spl.c index 690279c997..5f4aed83ee 100644 --- a/drivers/mtd/nand/raw/denali_spl.c +++ b/drivers/mtd/nand/raw/denali_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Panasonic Corporation * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c index 7853c3f74e..2e5b16a43d 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_nand.c +++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Freescale Enhanced Local Bus Controller FCM NAND driver * * Copyright (c) 2006-2008 Freescale Semiconductor diff --git a/drivers/mtd/nand/raw/fsl_elbc_spl.c b/drivers/mtd/nand/raw/fsl_elbc_spl.c index 26aaab08e8..c44dfa616c 100644 --- a/drivers/mtd/nand/raw/fsl_elbc_spl.c +++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NAND boot for Freescale Enhanced Local Bus Controller, Flash Control Machine * diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 1d7c1fddd3..86d7ca9d32 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Integrated Flash Controller NAND Machine Driver * * Copyright (c) 2012 Freescale Semiconductor, Inc diff --git a/drivers/mtd/nand/raw/fsl_ifc_spl.c b/drivers/mtd/nand/raw/fsl_ifc_spl.c index c67065eaf8..b5752cc973 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_spl.c +++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NAND boot for Freescale Integrated Flash Controller, NAND FCM * diff --git a/drivers/mtd/nand/raw/kirkwood_nand.c b/drivers/mtd/nand/raw/kirkwood_nand.c index 621d2d232c..5975644e8c 100644 --- a/drivers/mtd/nand/raw/kirkwood_nand.c +++ b/drivers/mtd/nand/raw/kirkwood_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/drivers/mtd/nand/raw/kmeter1_nand.c b/drivers/mtd/nand/raw/kmeter1_nand.c index dfe73d64e4..b5462cd008 100644 --- a/drivers/mtd/nand/raw/kmeter1_nand.c +++ b/drivers/mtd/nand/raw/kmeter1_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c index ac2e669d46..2622c02c81 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LPC32xx MLC NAND flash controller driver * diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index b21a0b9d29..9c9cf37fdc 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LPC32xx SLC NAND flash controller driver * diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c index dbdc5b0bca..a5223d1fe2 100644 --- a/drivers/mtd/nand/raw/mxc_nand.c +++ b/drivers/mtd/nand/raw/mxc_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2004-2007 Freescale Semiconductor, Inc. * Copyright 2008 Sascha Hauer, kernel(a)pengutronix.de diff --git a/drivers/mtd/nand/raw/mxc_nand.h b/drivers/mtd/nand/raw/mxc_nand.h index 084fac705a..82c1c3c601 100644 --- a/drivers/mtd/nand/raw/mxc_nand.h +++ b/drivers/mtd/nand/raw/mxc_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2009 Magnus Lilja <lilja.magnus(a)gmail.com> */ diff --git a/drivers/mtd/nand/raw/mxc_nand_spl.c b/drivers/mtd/nand/raw/mxc_nand_spl.c index 309e75d01e..4084f02c62 100644 --- a/drivers/mtd/nand/raw/mxc_nand_spl.c +++ b/drivers/mtd/nand/raw/mxc_nand_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Magnus Lilja <lilja.magnus(a)gmail.com> diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 65eab4c808..2bbce6c393 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 NAND flash driver * diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index a922a22b27..c917c89dd4 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -9,7 +9,7 @@ * * Based on denali_dt.c * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <dm.h> diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c index 300662994c..df121b8fb4 100644 --- a/drivers/mtd/nand/raw/mxs_nand_spl.c +++ b/drivers/mtd/nand/raw/mxs_nand_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Copyright 2019 NXP diff --git a/drivers/mtd/nand/raw/nand_amd.c b/drivers/mtd/nand/raw/nand_amd.c index e02b8c79db..563513f77d 100644 --- a/drivers/mtd/nand/raw/nand_amd.c +++ b/drivers/mtd/nand/raw/nand_amd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/nand_bch.c b/drivers/mtd/nand/raw/nand_bch.c index bb48ebbb96..1bfa43bb02 100644 --- a/drivers/mtd/nand/raw/nand_bch.c +++ b/drivers/mtd/nand/raw/nand_bch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file provides ECC correction for more than 1 bit per block of data, * using binary BCH codes. It relies on the generic BCH library lib/bch.c. diff --git a/drivers/mtd/nand/raw/nand_ecc.c b/drivers/mtd/nand/raw/nand_ecc.c index 2bc329be1a..dc09db5619 100644 --- a/drivers/mtd/nand/raw/nand_ecc.c +++ b/drivers/mtd/nand/raw/nand_ecc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file contains an ECC algorithm from Toshiba that detects and * corrects 1 bit errors in a 256 byte block of data. diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c index 547ce7c920..5734fa0ba8 100644 --- a/drivers/mtd/nand/raw/nand_hynix.c +++ b/drivers/mtd/nand/raw/nand_hynix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/nand_macronix.c b/drivers/mtd/nand/raw/nand_macronix.c index dc972e5909..f4a4a69dea 100644 --- a/drivers/mtd/nand/raw/nand_macronix.c +++ b/drivers/mtd/nand/raw/nand_macronix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c index 8b31c61981..56ac9e6096 100644 --- a/drivers/mtd/nand/raw/nand_micron.c +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/nand_samsung.c b/drivers/mtd/nand/raw/nand_samsung.c index 36ef48e5ec..9a84e869e0 100644 --- a/drivers/mtd/nand/raw/nand_samsung.c +++ b/drivers/mtd/nand/raw/nand_samsung.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/nand_spl_load.c b/drivers/mtd/nand/raw/nand_spl_load.c index 7ac9bf4d12..e274e1ccee 100644 --- a/drivers/mtd/nand/raw/nand_spl_load.c +++ b/drivers/mtd/nand/raw/nand_spl_load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/mtd/nand/raw/nand_spl_simple.c b/drivers/mtd/nand/raw/nand_spl_simple.c index 2f3af9edd4..15b8ca3aff 100644 --- a/drivers/mtd/nand/raw/nand_spl_simple.c +++ b/drivers/mtd/nand/raw/nand_spl_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006-2008 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/drivers/mtd/nand/raw/nand_toshiba.c b/drivers/mtd/nand/raw/nand_toshiba.c index 99dc44df67..0a30787d70 100644 --- a/drivers/mtd/nand/raw/nand_toshiba.c +++ b/drivers/mtd/nand/raw/nand_toshiba.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Free Electrons * Copyright (C) 2017 NextThing Co diff --git a/drivers/mtd/nand/raw/omap_elm.c b/drivers/mtd/nand/raw/omap_elm.c index 56a2c39e4f..eb2d58398a 100644 --- a/drivers/mtd/nand/raw/omap_elm.c +++ b/drivers/mtd/nand/raw/omap_elm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010-2011 Texas Instruments, <www.ti.com> * Mansoor Ahamed <mansoor.ahamed(a)ti.com> diff --git a/drivers/mtd/nand/raw/omap_elm.h b/drivers/mtd/nand/raw/omap_elm.h index a7f7bacb15..89dd099b00 100644 --- a/drivers/mtd/nand/raw/omap_elm.h +++ b/drivers/mtd/nand/raw/omap_elm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2011 Texas Instruments, <www.ti.com> * Mansoor Ahamed <mansoor.ahamed(a)ti.com> diff --git a/drivers/mtd/nand/raw/omap_gpmc.c b/drivers/mtd/nand/raw/omap_gpmc.c index 1a5ed0de31..3c4652dcbb 100644 --- a/drivers/mtd/nand/raw/omap_gpmc.c +++ b/drivers/mtd/nand/raw/omap_gpmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004-2008 Texas Instruments, <www.ti.com> * Rohit Choraria <rohitkc(a)ti.com> diff --git a/drivers/mtd/nand/raw/rockchip_nfc.c b/drivers/mtd/nand/raw/rockchip_nfc.c index 274489ecbc..456360e90a 100644 --- a/drivers/mtd/nand/raw/rockchip_nfc.c +++ b/drivers/mtd/nand/raw/rockchip_nfc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Rockchip NAND Flash controller driver. * Copyright (C) 2021 Rockchip Inc. diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c index 64be6486b4..ebdc88adc7 100644 --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) STMicroelectronics 2019 * Author: Christophe Kerello <christophe.kerello(a)st.com> diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c index 0b5b74dc24..a9ed3e70ae 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Boris BREZILLON <b.brezillon.dev(a)gmail.com> * Copyright (C) 2015 Roy Spliet <r.spliet(a)ultimaker.com> diff --git a/drivers/mtd/nand/raw/sunxi_nand_spl.c b/drivers/mtd/nand/raw/sunxi_nand_spl.c index 6de0b0a355..6ab1610f6d 100644 --- a/drivers/mtd/nand/raw/sunxi_nand_spl.c +++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014-2015, Antmicro Ltd <www.antmicro.com> * Copyright (c) 2015, AW-SOM Technologies <www.aw-som.com> diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c index 6086ecdfa3..fa95f170d2 100644 --- a/drivers/mtd/nand/raw/tegra_nand.c +++ b/drivers/mtd/nand/raw/tegra_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2011 NVIDIA Corporation <www.nvidia.com> diff --git a/drivers/mtd/nand/raw/tegra_nand.h b/drivers/mtd/nand/raw/tegra_nand.h index 7740160661..e3b8d06b64 100644 --- a/drivers/mtd/nand/raw/tegra_nand.h +++ b/drivers/mtd/nand/raw/tegra_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 NVIDIA Corporation <www.nvidia.com> */ diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c index d2363a0662..feeaf9b30a 100644 --- a/drivers/mtd/nand/raw/vf610_nfc.c +++ b/drivers/mtd/nand/raw/vf610_nfc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2015 Freescale Semiconductor, Inc. and others * diff --git a/drivers/mtd/nand/raw/zynq_nand.c b/drivers/mtd/nand/raw/zynq_nand.c index bacaf13c57..6fb638aa9c 100644 --- a/drivers/mtd/nand/raw/zynq_nand.c +++ b/drivers/mtd/nand/raw/zynq_nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Xilinx, Inc. * diff --git a/drivers/mtd/nvmxip/Kconfig b/drivers/mtd/nvmxip/Kconfig index 3ef7105026..99196a27e2 100644 --- a/drivers/mtd/nvmxip/Kconfig +++ b/drivers/mtd/nvmxip/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> # Authors: diff --git a/drivers/mtd/nvmxip/Makefile b/drivers/mtd/nvmxip/Makefile index 54eacc102e..f000731ff4 100644 --- a/drivers/mtd/nvmxip/Makefile +++ b/drivers/mtd/nvmxip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> # Authors: diff --git a/drivers/mtd/nvmxip/nvmxip-uclass.c b/drivers/mtd/nvmxip/nvmxip-uclass.c index 9a316d1de3..30035bb3a1 100644 --- a/drivers/mtd/nvmxip/nvmxip-uclass.c +++ b/drivers/mtd/nvmxip/nvmxip-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/mtd/nvmxip/nvmxip.c b/drivers/mtd/nvmxip/nvmxip.c index 0bd98d6427..0e593f03e0 100644 --- a/drivers/mtd/nvmxip/nvmxip.c +++ b/drivers/mtd/nvmxip/nvmxip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/mtd/nvmxip/nvmxip_qspi.c b/drivers/mtd/nvmxip/nvmxip_qspi.c index 4d7471118a..8210a1b50c 100644 --- a/drivers/mtd/nvmxip/nvmxip_qspi.c +++ b/drivers/mtd/nvmxip/nvmxip_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile index 4dc417a579..e70a2490ea 100644 --- a/drivers/mtd/onenand/Makefile +++ b/drivers/mtd/onenand/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2005-2007 Samsung Electronics. # Kyungmin Park <kyungmin.park(a)samsung.com> diff --git a/drivers/mtd/onenand/onenand_spl.c b/drivers/mtd/onenand/onenand_spl.c index 2699958a5d..ba7c4a6d7b 100644 --- a/drivers/mtd/onenand/onenand_spl.c +++ b/drivers/mtd/onenand/onenand_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Marek Vasut <marek.vasut(a)gmail.com> * diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index c415e5149a..e90dd1121d 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * S5PC100 OneNAND driver at U-Boot * diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 409395382f..1bd1448860 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/mtd/spi/fsl_espi_spl.c b/drivers/mtd/spi/fsl_espi_spl.c index cdbdbd6ea5..d5b1f3f9b9 100644 --- a/drivers/mtd/spi/fsl_espi_spl.c +++ b/drivers/mtd/spi/fsl_espi_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 2da0cf0dcf..d7a69a086a 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/mtd/spi/sf_bootdev.c b/drivers/mtd/spi/sf_bootdev.c index d6b47b11ce..9933cd166f 100644 --- a/drivers/mtd/spi/sf_bootdev.c +++ b/drivers/mtd/spi/sf_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Read a bootflow from SPI flash * diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 6a0d953a72..c6b645bf15 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel DataFlash probing * diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index d3ef69ec74..0252adaaee 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SPI flash internal definitions * diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c index 071b25ac67..db8c82d9b3 100644 --- a/drivers/mtd/spi/sf_mtd.c +++ b/drivers/mtd/spi/sf_mtd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2014 Daniel Schwierzeck, daniel.schwierzeck(a)gmail.com */ diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index de6516f106..374c88c813 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPI flash probing * diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index b03dd1cd08..ff1b1d23ca 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc. diff --git a/drivers/mtd/stm32_flash.c b/drivers/mtd/stm32_flash.c index 4523344ba6..60347742cc 100644 --- a/drivers/mtd/stm32_flash.c +++ b/drivers/mtd/stm32_flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index 30d00fbdfe..8e5935fa6c 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index 2ef8fde3d3..44585fb443 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index a1941b8eb8..cb016233bc 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * Copyright (c) Nokia Corporation, 2007 diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index b119cb6e9c..b6ad342fa3 100644 --- a/drivers/mtd/ubi/debug.c +++ b/drivers/mtd/ubi/debug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 2e13ebb2fb..8469bb61a8 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 9d4337bcff..ee10e059f9 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/fastmap-wl.c b/drivers/mtd/ubi/fastmap-wl.c index 4cb1377c42..8a50d6b073 100644 --- a/drivers/mtd/ubi/fastmap-wl.c +++ b/drivers/mtd/ubi/fastmap-wl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 Linutronix GmbH * Copyright (c) 2014 sigma star gmbh diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index b54b56375b..2c1c1dc213 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 Linutronix GmbH * Copyright (c) 2014 sigma star gmbh diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 14be95b74b..c761d0a759 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * Copyright (c) Nokia Corporation, 2006, 2007 diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index 41680cdad1..69e21173aa 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c index 81275deaeb..a1af860a02 100644 --- a/drivers/mtd/ubi/misc.c +++ b/drivers/mtd/ubi/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h index 4af85c4247..6fc22c3f49 100644 --- a/drivers/mtd/ubi/ubi-media.h +++ b/drivers/mtd/ubi/ubi-media.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 175988899c..a57317c4c1 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) International Business Machines Corp., 2006 * Copyright (c) Nokia Corporation, 2006, 2007 diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c index 28a362aa14..cc6d3068d6 100644 --- a/drivers/mtd/ubi/upd.c +++ b/drivers/mtd/ubi/upd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * Copyright (c) Nokia Corporation, 2006 diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index 0bfedd0deb..bd1f6bf7e2 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index a2b5352cb2..3f6d313751 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * Copyright (c) Nokia Corporation, 2006, 2007 diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index bae402418f..8fa99af917 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c index b58d8e8d56..8784e2e113 100644 --- a/drivers/mtd/ubispl/ubispl.c +++ b/drivers/mtd/ubispl/ubispl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (c) Thomas Gleixner <tglx(a)linutronix.de> * diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile index d4e24789d3..5b8ca4a8f5 100644 --- a/drivers/mux/Makefile +++ b/drivers/mux/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2019 # Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 1d444f5b4a..2e429dc1bf 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index da1f3f4580..f4602984e7 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atheros AR71xx / AR9xxx GMAC driver * diff --git a/drivers/net/aspeed_mdio.c b/drivers/net/aspeed_mdio.c index a99715a728..c92f8fdac6 100644 --- a/drivers/net/aspeed_mdio.c +++ b/drivers/net/aspeed_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Aspeed MDIO driver * diff --git a/drivers/net/bcm-sf2-eth-gmac.c b/drivers/net/bcm-sf2-eth-gmac.c index cbe1e85222..f65e196463 100644 --- a/drivers/net/bcm-sf2-eth-gmac.c +++ b/drivers/net/bcm-sf2-eth-gmac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2017 Broadcom. */ diff --git a/drivers/net/bcm-sf2-eth-gmac.h b/drivers/net/bcm-sf2-eth-gmac.h index 477667f4ea..29971602fc 100644 --- a/drivers/net/bcm-sf2-eth-gmac.h +++ b/drivers/net/bcm-sf2-eth-gmac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c index 1524f5c998..46831f5f94 100644 --- a/drivers/net/bcm-sf2-eth.c +++ b/drivers/net/bcm-sf2-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Broadcom Corporation. */ diff --git a/drivers/net/bcm-sf2-eth.h b/drivers/net/bcm-sf2-eth.h index f4dbb4e195..303df1d018 100644 --- a/drivers/net/bcm-sf2-eth.h +++ b/drivers/net/bcm-sf2-eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2017 Broadcom. */ diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c index 72dcd07d30..591709cd6c 100644 --- a/drivers/net/bcm6348-eth.c +++ b/drivers/net/bcm6348-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/net/bcm6368-eth.c b/drivers/net/bcm6368-eth.c index fdd938ce0d..d65fddb057 100644 --- a/drivers/net/bcm6368-eth.c +++ b/drivers/net/bcm6368-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index 4e1f8ed7a4..6d5ea64c46 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Amit Singh Tomar <amittomer25(a)gmail.com> * diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile index a9d6ce00d5..5745faa397 100644 --- a/drivers/net/bnxt/Makefile +++ b/drivers/net/bnxt/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019-2021 Broadcom. # Broadcom nxe Ethernet driver diff --git a/drivers/net/bnxt/bnxt.c b/drivers/net/bnxt/bnxt.c index 1c9a996240..0b65d9c68f 100644 --- a/drivers/net/bnxt/bnxt.c +++ b/drivers/net/bnxt/bnxt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2021 Broadcom. */ diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 6c648272af..0127e6f57a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 Broadcom. */ diff --git a/drivers/net/bnxt/bnxt_dbg.h b/drivers/net/bnxt/bnxt_dbg.h index e9e9f6efef..6ebc6202b4 100644 --- a/drivers/net/bnxt/bnxt_dbg.h +++ b/drivers/net/bnxt/bnxt_dbg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 Broadcom. */ diff --git a/drivers/net/bnxt/bnxt_hsi.h b/drivers/net/bnxt/bnxt_hsi.h index 81cc5da9e4..0be3d0f16a 100644 --- a/drivers/net/bnxt/bnxt_hsi.h +++ b/drivers/net/bnxt/bnxt_hsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 Broadcom. */ diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c index eb1e2a756c..1d657a0583 100644 --- a/drivers/net/calxedaxgmac.c +++ b/drivers/net/calxedaxgmac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010-2011 Calxeda, Inc. */ diff --git a/drivers/net/cortina_ni.c b/drivers/net/cortina_ni.c index ef6ecd88b0..5b9f65001f 100644 --- a/drivers/net/cortina_ni.c +++ b/drivers/net/cortina_ni.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Cortina Access Inc. diff --git a/drivers/net/cortina_ni.h b/drivers/net/cortina_ni.h index 0ced4687cd..1dc90a577b 100644 --- a/drivers/net/cortina_ni.h +++ b/drivers/net/cortina_ni.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Cortina Access Inc. diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 4e7af95b41..06347d1802 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <asm/io.h> diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 20b86e74ce..844c44035d 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Vipin Kumar, STMicroelectronics, vipin.kumar(a)st.com. diff --git a/drivers/net/designware.h b/drivers/net/designware.h index 9da4e902cb..c2c7dbe5ba 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Vipin Kumar, STMicroelectronics, vipin.kumar(a)st.com. diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index bec8d67dad..8d8e9b4f48 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dm9000.c: Version 1.2 12/15/2003 * diff --git a/drivers/net/dsa_sandbox.c b/drivers/net/dsa_sandbox.c index 235f2f22d9..a0ae9636ea 100644 --- a/drivers/net/dsa_sandbox.c +++ b/drivers/net/dsa_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2021 NXP */ diff --git a/drivers/net/dwc_eth_qos.h b/drivers/net/dwc_eth_qos.h index e3222e1e17..d5ddc0164e 100644 --- a/drivers/net/dwc_eth_qos.h +++ b/drivers/net/dwc_eth_qos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/drivers/net/dwc_eth_qos_qcom.c b/drivers/net/dwc_eth_qos_qcom.c index df83f1c5f9..8f6177d46b 100644 --- a/drivers/net/dwc_eth_qos_qcom.c +++ b/drivers/net/dwc_eth_qos_qcom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022-2023 Sumit Garg <sumit.garg(a)linaro.org> * diff --git a/drivers/net/dwc_eth_qos_starfive.c b/drivers/net/dwc_eth_qos_starfive.c index 5be8ac0f1a..a6894e07cf 100644 --- a/drivers/net/dwc_eth_qos_starfive.c +++ b/drivers/net/dwc_eth_qos_starfive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c index 871171e1be..f2bfe64a76 100644 --- a/drivers/net/dwmac_meson8b.c +++ b/drivers/net/dwmac_meson8b.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 BayLibre, SAS */ diff --git a/drivers/net/dwmac_s700.c b/drivers/net/dwmac_s700.c index 744b58bdd1..63b7b69065 100644 --- a/drivers/net/dwmac_s700.c +++ b/drivers/net/dwmac_s700.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Amit Singh Tomar <amittomer25(a)gmail.com> * diff --git a/drivers/net/dwmac_socfpga.c b/drivers/net/dwmac_socfpga.c index 82fdff51da..c9f47eabd4 100644 --- a/drivers/net/dwmac_socfpga.c +++ b/drivers/net/dwmac_socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> * diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 41e6ba760e..f4a3729be8 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /************************************************************************** Intel Pro 1000 for ppcboot/das-u-boot Drivers are port from Intel's Linux driver e1000-4.3.15 diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index f788394da8..1bf23aa2aa 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /******************************************************************************* diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 38d96ab72b..6201a4181a 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/eth-phy-uclass.c b/drivers/net/eth-phy-uclass.c index 9d1e8d38ff..05a0b47d02 100644 --- a/drivers/net/eth-phy-uclass.c +++ b/drivers/net/eth-phy-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index ac937676f9..a5e266c92e 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Ilya Yanok, Emcraft Systems Ltd <yanok(a)emcraft.com> * (C) Copyright 2008,2009 Eric Jarrige <eric.jarrige(a)armadeus.org> diff --git a/drivers/net/fec_mxc.h b/drivers/net/fec_mxc.h index 77bfc1cbf4..504fe28f92 100644 --- a/drivers/net/fec_mxc.h +++ b/drivers/net/fec_mxc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Ilya Yanok, Emcraft Systems Ltd <yanok(a)emcraft.com> * (C) Copyright 2008 Armadeus Systems, nc diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index b34209d2b3..e285592dbf 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2009-2011 Freescale Semiconductor, Inc. diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 1c5543e3c8..0f7d0eda46 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang(a)freescale.com> diff --git a/drivers/net/fm/dtsec.c b/drivers/net/fm/dtsec.c index c51a65cb94..ecee6c394e 100644 --- a/drivers/net/fm/dtsec.c +++ b/drivers/net/fm/dtsec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index 9fd26de0d7..38155a6d0f 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2012 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c index 9828753412..0501e3ee9e 100644 --- a/drivers/net/fm/fdt.c +++ b/drivers/net/fm/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 7dfa821909..303e219661 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index a2d5b03429..8ae89b874a 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index 3db5c907a2..00fec8b3e0 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c index 3b0ee98ddd..e82a4e6b89 100644 --- a/drivers/net/fm/ls1046.c +++ b/drivers/net/fm/ls1046.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index eeb67a39a7..989f9bdd10 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang(a)freescale.com> diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index e0b62b9449..f0812cb2a8 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * Andy Fleming <afleming(a)gmail.com> diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c index 9013b276bc..7738dfe21e 100644 --- a/drivers/net/fm/p1023.c +++ b/drivers/net/fm/p1023.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c index 7ad993221f..96c2a29199 100644 --- a/drivers/net/fm/p4080.c +++ b/drivers/net/fm/p4080.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c index f931491b11..db2d7c39b7 100644 --- a/drivers/net/fm/p5020.c +++ b/drivers/net/fm/p5020.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c index ef9f4bcce4..3c98be4528 100644 --- a/drivers/net/fm/p5040.c +++ b/drivers/net/fm/p5040.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c index 70ab4610cd..0bb3eec589 100644 --- a/drivers/net/fm/t1024.c +++ b/drivers/net/fm/t1024.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2014 Freescale Semiconductor, Inc. * * Shengzhou Liu <Shengzhou.Liu(a)freescale.com> diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c index 5c260bed7f..49d0710794 100644 --- a/drivers/net/fm/t1040.c +++ b/drivers/net/fm/t1040.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c index 6174934d2b..28cb7de24e 100644 --- a/drivers/net/fm/t2080.c +++ b/drivers/net/fm/t2080.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index f0a02bfe45..80b9be8f53 100644 --- a/drivers/net/fm/t4240.c +++ b/drivers/net/fm/t4240.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang(a)freescale.com> diff --git a/drivers/net/fm/tgec.c b/drivers/net/fm/tgec.c index 9cc9f3fde3..cdc21a6855 100644 --- a/drivers/net/fm/tgec.c +++ b/drivers/net/fm/tgec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/drivers/net/fm/tgec_phy.c b/drivers/net/fm/tgec_phy.c index 22225c2f82..dbc71905b1 100644 --- a/drivers/net/fm/tgec_phy.c +++ b/drivers/net/fm/tgec_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Andy Fleming <afleming(a)gmail.com> diff --git a/drivers/net/fsl-mc/Makefile b/drivers/net/fsl-mc/Makefile index 5a1acd576a..5f33d92c8b 100644 --- a/drivers/net/fsl-mc/Makefile +++ b/drivers/net/fsl-mc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Freescale Semiconductor, Inc. # Copyright 2018 NXP diff --git a/drivers/net/fsl-mc/dpbp.c b/drivers/net/fsl-mc/dpbp.c index 5e17ccf73d..aecde4efd7 100644 --- a/drivers/net/fsl-mc/dpbp.c +++ b/drivers/net/fsl-mc/dpbp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale Layerscape MC I/O wrapper * diff --git a/drivers/net/fsl-mc/dpio/Makefile b/drivers/net/fsl-mc/dpio/Makefile index 752226c733..93d4a42518 100644 --- a/drivers/net/fsl-mc/dpio/Makefile +++ b/drivers/net/fsl-mc/dpio/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2014 Freescale Semiconductor, Inc. diff --git a/drivers/net/fsl-mc/dpio/dpio.c b/drivers/net/fsl-mc/dpio/dpio.c index d17210bf45..c56e709084 100644 --- a/drivers/net/fsl-mc/dpio/dpio.c +++ b/drivers/net/fsl-mc/dpio/dpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c index 44ce00041e..f4f2976124 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.c +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.h b/drivers/net/fsl-mc/dpio/qbman_portal.h index 8cbc771a12..90f00470bd 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.h +++ b/drivers/net/fsl-mc/dpio/qbman_portal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/drivers/net/fsl-mc/dpio/qbman_private.h b/drivers/net/fsl-mc/dpio/qbman_private.h index 53f1300eaf..ff7bb0f4e1 100644 --- a/drivers/net/fsl-mc/dpio/qbman_private.h +++ b/drivers/net/fsl-mc/dpio/qbman_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/drivers/net/fsl-mc/dpio/qbman_sys.h b/drivers/net/fsl-mc/dpio/qbman_sys.h index 1c6e489130..50dfa1fe58 100644 --- a/drivers/net/fsl-mc/dpio/qbman_sys.h +++ b/drivers/net/fsl-mc/dpio/qbman_sys.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/drivers/net/fsl-mc/dpmac.c b/drivers/net/fsl-mc/dpmac.c index 5d4f6c67fd..3d52b4031f 100644 --- a/drivers/net/fsl-mc/dpmac.c +++ b/drivers/net/fsl-mc/dpmac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale Layerscape MC I/O wrapper * diff --git a/drivers/net/fsl-mc/dpmng.c b/drivers/net/fsl-mc/dpmng.c index 147ca6da9e..752d22f4bf 100644 --- a/drivers/net/fsl-mc/dpmng.c +++ b/drivers/net/fsl-mc/dpmng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright 2013-2015 Freescale Semiconductor Inc. * Copyright 2023 NXP */ diff --git a/drivers/net/fsl-mc/dpni.c b/drivers/net/fsl-mc/dpni.c index 5b815a45a9..a81fa48321 100644 --- a/drivers/net/fsl-mc/dpni.c +++ b/drivers/net/fsl-mc/dpni.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP diff --git a/drivers/net/fsl-mc/dprc.c b/drivers/net/fsl-mc/dprc.c index d1a74ab47a..a06c9d52d1 100644 --- a/drivers/net/fsl-mc/dprc.c +++ b/drivers/net/fsl-mc/dprc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale Layerscape MC I/O wrapper * diff --git a/drivers/net/fsl-mc/dpsparser.c b/drivers/net/fsl-mc/dpsparser.c index 09dfb8f1fc..98da7cf5bb 100644 --- a/drivers/net/fsl-mc/dpsparser.c +++ b/drivers/net/fsl-mc/dpsparser.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Data Path Soft Parser * diff --git a/drivers/net/fsl-mc/fsl_dpmng_cmd.h b/drivers/net/fsl-mc/fsl_dpmng_cmd.h index e6efceab7a..49f2d6991e 100644 --- a/drivers/net/fsl-mc/fsl_dpmng_cmd.h +++ b/drivers/net/fsl-mc/fsl_dpmng_cmd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP */ diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index f5c5057bec..ce8b692e80 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2017-2018, 2020-2021 NXP diff --git a/drivers/net/fsl-mc/mc_sys.c b/drivers/net/fsl-mc/mc_sys.c index 4d32516b00..7417627083 100644 --- a/drivers/net/fsl-mc/mc_sys.c +++ b/drivers/net/fsl-mc/mc_sys.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale Layerscape MC I/O wrapper * diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 1fd5089cc4..aacaac44b5 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ENETC ethernet controller driver * Copyright 2017-2021 NXP diff --git a/drivers/net/fsl_enetc.h b/drivers/net/fsl_enetc.h index f2acf367aa..49ec90724f 100644 --- a/drivers/net/fsl_enetc.h +++ b/drivers/net/fsl_enetc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ENETC ethernet controller driver * Copyright 2017-2021 NXP diff --git a/drivers/net/fsl_enetc_mdio.c b/drivers/net/fsl_enetc_mdio.c index 50ad76dfeb..caf6931386 100644 --- a/drivers/net/fsl_enetc_mdio.c +++ b/drivers/net/fsl_enetc_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ENETC ethernet controller driver * Copyright 2019 NXP diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c index fce7393750..747ad70696 100644 --- a/drivers/net/fsl_ls_mdio.c +++ b/drivers/net/fsl_ls_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index cc61a10740..813c332c25 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index 5fd11db05f..edcf01bd65 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009-2010, 2013 Freescale Semiconductor, Inc. * Jun-jie Zhang <b18070(a)freescale.com> diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 587d3658fa..8ddf4eb65f 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Faraday FTGMAC100 Ethernet * diff --git a/drivers/net/ftgmac100.h b/drivers/net/ftgmac100.h index f7874ae68b..bf6fca3f29 100644 --- a/drivers/net/ftgmac100.h +++ b/drivers/net/ftgmac100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Faraday FTGMAC100 Ethernet * diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index fae3adc3de..a1ce7c8ffb 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Faraday FTMAC100 Ethernet * diff --git a/drivers/net/ftmac100.h b/drivers/net/ftmac100.h index 21d339f835..d620dfb4cb 100644 --- a/drivers/net/ftmac100.h +++ b/drivers/net/ftmac100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Faraday FTMAC100 Ethernet * diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c index 04008d2b19..ba8179512c 100644 --- a/drivers/net/gmac_rockchip.c +++ b/drivers/net/gmac_rockchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> * diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 518548e3bb..3e40f8a3fc 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Micrel KS8851_MLL 16bit Network driver * Copyright (c) 2011 Roberto Cerati <roberto.cerati(a)bticino.it> diff --git a/drivers/net/ksz9477.c b/drivers/net/ksz9477.c index 43baa69961..c89355cc9c 100644 --- a/drivers/net/ksz9477.c +++ b/drivers/net/ksz9477.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 * Tim Harvey, Gateworks Corporation diff --git a/drivers/net/ldpaa_eth/Makefile b/drivers/net/ldpaa_eth/Makefile index 52ab828f0b..4b584175c2 100644 --- a/drivers/net/ldpaa_eth/Makefile +++ b/drivers/net/ldpaa_eth/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2015-2018 NXP # Copyright 2014 Freescale Semiconductor, Inc. diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 87fbada06b..836472dcde 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.h b/drivers/net/ldpaa_eth/ldpaa_eth.h index af082e34ca..363e34c701 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.h +++ b/drivers/net/ldpaa_eth/ldpaa_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c index adecb81357..b83b918162 100644 --- a/drivers/net/ldpaa_eth/ldpaa_wriop.c +++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor */ diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index 32bcb51725..d13382033b 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP */ diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c index 845a36bce8..2480ce1875 100644 --- a/drivers/net/ldpaa_eth/ls2080a.c +++ b/drivers/net/ldpaa_eth/ls2080a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c index c2641a92d7..331023c368 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018, 2020 NXP */ diff --git a/drivers/net/macb.c b/drivers/net/macb.c index bfc48dac07..cf47363ac8 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2005-2006 Atmel Corporation */ diff --git a/drivers/net/macb.h b/drivers/net/macb.h index 72b84ae96e..a15b18a07d 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005-2006 Atmel Corporation */ diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index ec1fae9688..4a44977802 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index eae2065451..2060982714 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew(a)freescale.com) diff --git a/drivers/net/mdio-ipq4019.c b/drivers/net/mdio-ipq4019.c index 50134b4d9b..df8d01913a 100644 --- a/drivers/net/mdio-ipq4019.c +++ b/drivers/net/mdio-ipq4019.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm IPQ4019 MDIO driver * diff --git a/drivers/net/mdio_mux_i2creg.c b/drivers/net/mdio_mux_i2creg.c index 3654230118..f6ba612212 100644 --- a/drivers/net/mdio_mux_i2creg.c +++ b/drivers/net/mdio_mux_i2creg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/drivers/net/mdio_mux_sandbox.c b/drivers/net/mdio_mux_sandbox.c index e1801c1426..fee283789f 100644 --- a/drivers/net/mdio_mux_sandbox.c +++ b/drivers/net/mdio_mux_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/drivers/net/mdio_sandbox.c b/drivers/net/mdio_sandbox.c index 2b50ffc3ac..47d8142f4e 100644 --- a/drivers/net/mdio_sandbox.c +++ b/drivers/net/mdio_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index 78337731e1..cc42e7e798 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/mscc_eswitch/Kconfig b/drivers/net/mscc_eswitch/Kconfig index f9780661c8..cd15c78218 100644 --- a/drivers/net/mscc_eswitch/Kconfig +++ b/drivers/net/mscc_eswitch/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019 Microsemi Corporation diff --git a/drivers/net/mscc_eswitch/felix_switch.c b/drivers/net/mscc_eswitch/felix_switch.c index 2e5f45e574..7fdf334ccd 100644 --- a/drivers/net/mscc_eswitch/felix_switch.c +++ b/drivers/net/mscc_eswitch/felix_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Felix (VSC9959) Ethernet switch driver * Copyright 2018-2021 NXP diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c index 7157428a68..9d47c13f23 100644 --- a/drivers/net/mscc_eswitch/jr2_switch.c +++ b/drivers/net/mscc_eswitch/jr2_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 5e4f00c4f4..f94f00cfcc 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.c b/drivers/net/mscc_eswitch/mscc_mac_table.c index 25b9cad42c..387a9ea539 100644 --- a/drivers/net/mscc_eswitch/mscc_mac_table.c +++ b/drivers/net/mscc_eswitch/mscc_mac_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_mac_table.h b/drivers/net/mscc_eswitch/mscc_mac_table.h index 17fed2e792..5a90805be7 100644 --- a/drivers/net/mscc_eswitch/mscc_mac_table.h +++ b/drivers/net/mscc_eswitch/mscc_mac_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_miim.c b/drivers/net/mscc_eswitch/mscc_miim.c index 6687787b1a..95513bf80b 100644 --- a/drivers/net/mscc_eswitch/mscc_miim.c +++ b/drivers/net/mscc_eswitch/mscc_miim.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_miim.h b/drivers/net/mscc_eswitch/mscc_miim.h index feb1f40ae5..a88f69d215 100644 --- a/drivers/net/mscc_eswitch/mscc_miim.h +++ b/drivers/net/mscc_eswitch/mscc_miim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_xfer.c b/drivers/net/mscc_eswitch/mscc_xfer.c index 6f74746457..09734de7d2 100644 --- a/drivers/net/mscc_eswitch/mscc_xfer.c +++ b/drivers/net/mscc_eswitch/mscc_xfer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/mscc_xfer.h b/drivers/net/mscc_eswitch/mscc_xfer.h index c880a4e7e6..0f2fcf3845 100644 --- a/drivers/net/mscc_eswitch/mscc_xfer.h +++ b/drivers/net/mscc_eswitch/mscc_xfer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c index 7ea1f551a1..61b7fe7242 100644 --- a/drivers/net/mscc_eswitch/ocelot_switch.c +++ b/drivers/net/mscc_eswitch/ocelot_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index be06e48337..9779a8e80a 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Microsemi Corporation */ diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c index 2d2329c204..71f8863a19 100644 --- a/drivers/net/mscc_eswitch/servalt_switch.c +++ b/drivers/net/mscc_eswitch/servalt_switch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Microsemi Corporation */ diff --git a/drivers/net/mt7628-eth.c b/drivers/net/mt7628-eth.c index b95de474fb..3676cb8143 100644 --- a/drivers/net/mt7628-eth.c +++ b/drivers/net/mt7628-eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MediaTek ethernet IP driver for U-Boot * diff --git a/drivers/net/mv88e6xxx.c b/drivers/net/mv88e6xxx.c index 64e860e324..7e4b9a2702 100644 --- a/drivers/net/mv88e6xxx.c +++ b/drivers/net/mv88e6xxx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 * Gateworks Corporation <www.gateworks.com> diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 3587ca2124..11cd108018 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 6514ab67ba..8adc46eed1 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/drivers/net/mvmdio.c b/drivers/net/mvmdio.c index 5ebcfe14b7..0d0c01b7b0 100644 --- a/drivers/net/mvmdio.c +++ b/drivers/net/mvmdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Marvell International Ltd. * Author: Ken Ma<make(a)marvell.com> diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 151bc55e07..e57267d1e9 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/npcm750_eth.c b/drivers/net/npcm750_eth.c index 2028f4ae28..bf54707604 100644 --- a/drivers/net/npcm750_eth.c +++ b/drivers/net/npcm750_eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile index c573411a62..ea040eb06d 100644 --- a/drivers/net/octeon/Makefile +++ b/drivers/net/octeon/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018-2022 Marvell International Ltd. # diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c index ecf8c28fe4..c3d39f73a6 100644 --- a/drivers/net/pch_gbe.c +++ b/drivers/net/pch_gbe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/net/pch_gbe.h b/drivers/net/pch_gbe.h index 7e0fdbfd5a..d1143f8942 100644 --- a/drivers/net/pch_gbe.h +++ b/drivers/net/pch_gbe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c index a1f3c2bd29..5b18a7afc2 100644 --- a/drivers/net/pcnet.c +++ b/drivers/net/pcnet.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 Wolfgang Grandegger, wg(a)denx.de. * diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile index ab5a7b2c72..c41b30c04f 100644 --- a/drivers/net/pfe_eth/Makefile +++ b/drivers/net/pfe_eth/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2015-2016 Freescale Semiconductor, Inc. # Copyright 2017 NXP diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c index 2fe0db0fe7..bffe846839 100644 --- a/drivers/net/pfe_eth/pfe_cmd.c +++ b/drivers/net/pfe_eth/pfe_cmd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c index 5e14f82de5..787a3bc6e7 100644 --- a/drivers/net/pfe_eth/pfe_driver.c +++ b/drivers/net/pfe_eth/pfe_driver.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index ab532c5a42..716d57d4c0 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index da4f2ca42a..aeb48831a9 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017,2021 NXP diff --git a/drivers/net/pfe_eth/pfe_hw.c b/drivers/net/pfe_eth/pfe_hw.c index 9f2f92d116..5f9cff833b 100644 --- a/drivers/net/pfe_eth/pfe_hw.c +++ b/drivers/net/pfe_eth/pfe_hw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/pfe_eth/pfe_mdio.c b/drivers/net/pfe_eth/pfe_mdio.c index ff48726dbf..981149f19a 100644 --- a/drivers/net/pfe_eth/pfe_mdio.c +++ b/drivers/net/pfe_eth/pfe_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 2487f366e1..bdb5578e7b 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index 0970449d0f..ed426306d5 100644 --- a/drivers/net/phy/adin.c +++ b/drivers/net/phy/adin.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Driver for Analog Devices Industrial Ethernet PHYs * diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index a958e88d44..5d829dbc73 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Aquantia PHY drivers * diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c index abb7bdf537..30b4356b1f 100644 --- a/drivers/net/phy/atheros.c +++ b/drivers/net/phy/atheros.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atheros PHY drivers * diff --git a/drivers/net/phy/b53.c b/drivers/net/phy/b53.c index 26e8e2fe64..15a6878f74 100644 --- a/drivers/net/phy/b53.c +++ b/drivers/net/phy/b53.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 * Broadcom diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 82e3bbef7d..014b7c2910 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Broadcom PHY drivers * diff --git a/drivers/net/phy/ca_phy.c b/drivers/net/phy/ca_phy.c index edef21867b..6e50fe00cf 100644 --- a/drivers/net/phy/ca_phy.c +++ b/drivers/net/phy/ca_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cortina CS4315/CS4340 10G PHY drivers * diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c index 1cf8b28f58..99351cbc87 100644 --- a/drivers/net/phy/cortina.c +++ b/drivers/net/phy/cortina.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cortina CS4315/CS4340 10G PHY drivers * diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index 31ffa1ac7a..a8072099ed 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Davicom PHY drivers * diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index fa4831427d..68ad1646ce 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ET1011C PHY driver * diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c index 877a51c3d0..5718b41b15 100644 --- a/drivers/net/phy/ethernet_id.c +++ b/drivers/net/phy/ethernet_id.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx ethernet phy reset driver * diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index 2f0823b836..abae664904 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Fixed-Link phy * diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c index 34ac51ea07..84e3363e79 100644 --- a/drivers/net/phy/generic_10g.c +++ b/drivers/net/phy/generic_10g.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic PHY Management code * diff --git a/drivers/net/phy/intel_xway.c b/drivers/net/phy/intel_xway.c index 9d1b97d349..82ad3f6c0c 100644 --- a/drivers/net/phy/intel_xway.c +++ b/drivers/net/phy/intel_xway.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <phy.h> #include <linux/bitfield.h> diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 20940033a3..2b7f566b53 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * LXT PHY drivers * diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 0a90f710df..382cc26ae9 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell PHY drivers * diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 9e64672f5c..f9aabdccc7 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell 10G 88x3310 PHY driver * diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c index b49c9b5f49..7b9c57478b 100644 --- a/drivers/net/phy/meson-gxl.c +++ b/drivers/net/phy/meson-gxl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson GXL Internal PHY Driver * diff --git a/drivers/net/phy/micrel_ksz8xxx.c b/drivers/net/phy/micrel_ksz8xxx.c index b0f3abcb03..1f285785e9 100644 --- a/drivers/net/phy/micrel_ksz8xxx.c +++ b/drivers/net/phy/micrel_ksz8xxx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Micrel PHY drivers * diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c index ffc3c987ea..932c18d2e1 100644 --- a/drivers/net/phy/micrel_ksz90x1.c +++ b/drivers/net/phy/micrel_ksz90x1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Micrel PHY drivers * diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index cf71f7d4e7..d470ae813c 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Industrie Dial Face S.p.A. * Luigi 'Comio' Mantellini <luigi.mantellini(a)idf-hit.com> diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c index 8635a960d6..ac63afe0cb 100644 --- a/drivers/net/phy/motorcomm.c +++ b/drivers/net/phy/motorcomm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Motorcomm 8531 PHY driver. * diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 85778106ed..dd085ddba5 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Elecsys Corporation <www.elecsyscorp.com> diff --git a/drivers/net/phy/mv88e6352.c b/drivers/net/phy/mv88e6352.c index 56060762d8..1ba540a4e1 100644 --- a/drivers/net/phy/mv88e6352.c +++ b/drivers/net/phy/mv88e6352.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Valentin Lontgchamp, Keymile AG, valentin.longchamp(a)keymile.com diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c index 6b9e99ea11..d93fe5f1f3 100644 --- a/drivers/net/phy/natsemi.c +++ b/drivers/net/phy/natsemi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * National Semiconductor PHY drivers * diff --git a/drivers/net/phy/ncsi.c b/drivers/net/phy/ncsi.c index eb3fd65bb4..01e6ef90ec 100644 --- a/drivers/net/phy/ncsi.c +++ b/drivers/net/phy/ncsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NC-SI protocol configuration * diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c index f701790194..c9a64f5a28 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NXP C45 PHY driver * diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 63b3e46f10..f824db0ead 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic PHY Management code * diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 396cac76d6..2343d76cd0 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RealTek PHY drivers * diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 056b607e0b..dadc70a741 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SMSC PHY drivers * diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index 15f2c12ed8..aaa9ed2c2a 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Teranetics PHY drivers * diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index c5cf0d7dfb..d7b4735ce1 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Vitesse PHY drivers * diff --git a/drivers/net/phy/xilinx_phy.c b/drivers/net/phy/xilinx_phy.c index c07c780193..c49c388304 100644 --- a/drivers/net/phy/xilinx_phy.c +++ b/drivers/net/phy/xilinx_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx PCS/PMA Core phy driver * diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 1333a3aa7e..246d94ce4a 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/drivers/net/pic32_eth.h b/drivers/net/pic32_eth.h index 7b873bc772..4f27498803 100644 --- a/drivers/net/pic32_eth.h +++ b/drivers/net/pic32_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/drivers/net/pic32_mdio.c b/drivers/net/pic32_mdio.c index d4049cfea5..d776b0f500 100644 --- a/drivers/net/pic32_mdio.c +++ b/drivers/net/pic32_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pic32_mdio.c: PIC32 MDIO/MII driver, part of pic32_eth.c. * diff --git a/drivers/net/qe/Kconfig b/drivers/net/qe/Kconfig index e795e913d4..e40da80d1f 100644 --- a/drivers/net/qe/Kconfig +++ b/drivers/net/qe/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Heiko Schocher <hs(a)denx.de> diff --git a/drivers/net/qe/Makefile b/drivers/net/qe/Makefile index 7d84757c17..6f167df117 100644 --- a/drivers/net/qe/Makefile +++ b/drivers/net/qe/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Heiko Schocher <hs(a)denx.de> diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index 6d1509d90c..447df168e5 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * QE UEC ethernet controller driver * diff --git a/drivers/net/qe/dm_qe_uec.h b/drivers/net/qe/dm_qe_uec.h index 690093caa2..18e5f37c22 100644 --- a/drivers/net/qe/dm_qe_uec.h +++ b/drivers/net/qe/dm_qe_uec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * QE UEC ethernet controller driver * diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c index a0bcc8d3e5..7ca9cdc39f 100644 --- a/drivers/net/qe/dm_qe_uec_phy.c +++ b/drivers/net/qe/dm_qe_uec_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * QE UEC ethernet phy controller driver * diff --git a/drivers/net/qe/uccf.c b/drivers/net/qe/uccf.c index 306f1ea1db..807ebafe51 100644 --- a/drivers/net/qe/uccf.c +++ b/drivers/net/qe/uccf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * diff --git a/drivers/net/qe/uccf.h b/drivers/net/qe/uccf.h index 99f8458edf..81cbe5dc89 100644 --- a/drivers/net/qe/uccf.h +++ b/drivers/net/qe/uccf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * diff --git a/drivers/net/qe/uec.h b/drivers/net/qe/uec.h index 4510205da3..d5ee60d0c3 100644 --- a/drivers/net/qe/uec.h +++ b/drivers/net/qe/uec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006-2010 Freescale Semiconductor, Inc. * diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 0bcd6cfd3f..65d0bf76fa 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * drivers/net/ravb.c * This file is driver for Renesas Ethernet AVB. diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c index 5a69ca1a0f..31dc846c4c 100644 --- a/drivers/net/rswitch.c +++ b/drivers/net/rswitch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for Renesas Ethernet RSwitch2 (Ethernet-TSN). * diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index 93e83661ce..06ea88586b 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * rtl8169.c : U-Boot driver for the RealTek RTL8169 * diff --git a/drivers/net/sandbox-raw-bus.c b/drivers/net/sandbox-raw-bus.c index fb1ba5a8c8..01d1ad75f8 100644 --- a/drivers/net/sandbox-raw-bus.c +++ b/drivers/net/sandbox-raw-bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 National Instruments * Copyright (c) 2018 Joe Hershberger <joe.hershberger(a)ni.com> diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 7b1f59dc49..6105e5856e 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sh_eth.c - Driver for Renesas ethernet controller. * diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index 1c07610e1a..23834840ce 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sh_eth.h - Driver for Renesas SuperH ethernet controller. * diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 5c5ad8b84a..1053eb0793 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SMSC LAN9[12]1[567] Network driver * diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 59018f00b2..f258ba068d 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SMSC LAN9[12]1[567] Network driver * diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 8eeecbc4cf..2391aef80c 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * sni_ave.c - Socionext UniPhier AVE ethernet driver * Copyright 2016-2018 Socionext inc. diff --git a/drivers/net/sni_netsec.c b/drivers/net/sni_netsec.c index 71afe78fd2..84bf4ac15e 100644 --- a/drivers/net/sni_netsec.c +++ b/drivers/net/sni_netsec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * netsec.c - Socionext Synquacer Netsec driver * Copyright 2021 Linaro Ltd. diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 04c3274fbe..7f2b17eb99 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Author: Amit Singh Tomar, amittomer25(a)gmail.com diff --git a/drivers/net/sunxi_emac.c b/drivers/net/sunxi_emac.c index 4c90d4b498..0a0039932d 100644 --- a/drivers/net/sunxi_emac.c +++ b/drivers/net/sunxi_emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * sunxi_emac.c -- Allwinner A10 ethernet driver * diff --git a/drivers/net/ti/Kconfig b/drivers/net/ti/Kconfig index 02660e4fbb..a450729423 100644 --- a/drivers/net/ti/Kconfig +++ b/drivers/net/ti/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/net/ti/Makefile b/drivers/net/ti/Makefile index 8d3808bb4b..319c72a8a8 100644 --- a/drivers/net/ti/Makefile +++ b/drivers/net/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 18a33c4c0e..f4afac6142 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments K3 AM65 Ethernet Switch SubSystem Driver * diff --git a/drivers/net/ti/cpsw-common.c b/drivers/net/ti/cpsw-common.c index d5428274d1..252e3349b0 100644 --- a/drivers/net/ti/cpsw-common.c +++ b/drivers/net/ti/cpsw-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CPSW common - libs used across TI ethernet devices. * diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 877be7fca5..33b2fc0941 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CPSW Ethernet Switch Driver * diff --git a/drivers/net/ti/cpsw_mdio.c b/drivers/net/ti/cpsw_mdio.c index ac791faa81..ba00f06545 100644 --- a/drivers/net/ti/cpsw_mdio.c +++ b/drivers/net/ti/cpsw_mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * CPSW MDIO generic driver for TI AMxx/K2x/EMAC devices. * diff --git a/drivers/net/ti/cpsw_mdio.h b/drivers/net/ti/cpsw_mdio.h index 9b98763656..a8f5f548c3 100644 --- a/drivers/net/ti/cpsw_mdio.h +++ b/drivers/net/ti/cpsw_mdio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * CPSW MDIO generic driver API for TI AMxx/K2x/EMAC devices. * diff --git a/drivers/net/ti/davinci_emac.c b/drivers/net/ti/davinci_emac.c index 034877a769..913d08d2f6 100644 --- a/drivers/net/ti/davinci_emac.c +++ b/drivers/net/ti/davinci_emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Ethernet driver for TI TMS320DM644x (DaVinci) chips. * diff --git a/drivers/net/ti/davinci_emac.h b/drivers/net/ti/davinci_emac.h index 695855b4d5..45bb3bb3a3 100644 --- a/drivers/net/ti/davinci_emac.h +++ b/drivers/net/ti/davinci_emac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Ilya Yanok, Emcraft Systems * diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index 43dbf3f106..8ac6b3dcc4 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Ethernet driver for TI K2HK EVM. * diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 8833e3098d..7b1ec8d330 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale Three Speed Ethernet Controller driver * diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 54f2232768..7475d7a06b 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Waymo LLC * Copyright (C) 2011 Michal Simek <monstr(a)monstr.eu> diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 16ba915fba..8c133eb5df 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2009 Michal Simek * (C) Copyright 2003 Xilinx Inc. diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 7c57d32614..1522d21002 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 Michal Simek * diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig index 73edb35516..e2400c05d8 100644 --- a/drivers/nvme/Kconfig +++ b/drivers/nvme/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile index fd3e68a91d..0a96324e0d 100644 --- a/drivers/nvme/Makefile +++ b/drivers/nvme/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/nvme-uclass.c b/drivers/nvme/nvme-uclass.c index f3af6a27b6..626edc4731 100644 --- a/drivers/nvme/nvme-uclass.c +++ b/drivers/nvme/nvme-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index c39cd41aa3..29460adf5d 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/nvme.h b/drivers/nvme/nvme.h index bc1d612dde..88fbfd6fa7 100644 --- a/drivers/nvme/nvme.h +++ b/drivers/nvme/nvme.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/nvme_apple.c b/drivers/nvme/nvme_apple.c index 819b748dc0..787ffcd6d5 100644 --- a/drivers/nvme/nvme_apple.c +++ b/drivers/nvme/nvme_apple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/nvme/nvme_pci.c b/drivers/nvme/nvme_pci.c index 5bb43d299f..96987e6600 100644 --- a/drivers/nvme/nvme_pci.c +++ b/drivers/nvme/nvme_pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/nvme/nvme_show.c b/drivers/nvme/nvme_show.c index 72cbac82bc..661c93a6fc 100644 --- a/drivers/nvme/nvme_show.c +++ b/drivers/nvme/nvme_show.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/pch/Makefile b/drivers/pch/Makefile index d5de3e48be..fb45653dc6 100644 --- a/drivers/pch/Makefile +++ b/drivers/pch/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += pch-uclass.o obj-$(CONFIG_X86_PCH7) += pch7.o diff --git a/drivers/pch/pch-uclass.c b/drivers/pch/pch-uclass.c index af028f9cec..2f51f70a3f 100644 --- a/drivers/pch/pch-uclass.c +++ b/drivers/pch/pch-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pch/pch7.c b/drivers/pch/pch7.c index 5fb35a19ef..6cca9cd28a 100644 --- a/drivers/pch/pch7.c +++ b/drivers/pch/pch7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Google, Inc */ diff --git a/drivers/pch/pch9.c b/drivers/pch/pch9.c index 3137eb2c28..e27baa667c 100644 --- a/drivers/pch/pch9.c +++ b/drivers/pch/pch9.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Google, Inc */ diff --git a/drivers/pch/sandbox_pch.c b/drivers/pch/sandbox_pch.c index 37c368954b..1a99b123b7 100644 --- a/drivers/pch/sandbox_pch.c +++ b/drivers/pch/sandbox_pch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC */ diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 72ef8b4bc7..c08b44b400 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index a0b8afb87a..4a4e2d0d6c 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index e0d01f6a85..8e68541229 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 01230360ba..ea3273553b 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI autoconfiguration library * diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 2f4aff0104..60bd1155d9 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI auto-configuration library * diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index a18251297f..6e4e5bcbce 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c index 9dddca8efe..a76f45e0dd 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Compatibility functions for pre-driver-model code * diff --git a/drivers/pci/pci_internal.h b/drivers/pci/pci_internal.h index 5a4c90e619..d6014a6be0 100644 --- a/drivers/pci/pci_internal.h +++ b/drivers/pci/pci_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal PCI functions, not exported outside drivers/pci * diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c index 8d363d6049..57077dd563 100644 --- a/drivers/pci/pci_msc01.c +++ b/drivers/pci/pci_msc01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton(a)mips.com> diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index ca44d00237..1ca6dc429e 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c index c1be56ce7a..e327d6ea16 100644 --- a/drivers/pci/pci_sh7751.c +++ b/drivers/pci/pci_sh7751.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SH7751 PCI Controller (PCIC) for U-Boot. * (C) Dustin McIntire (dustin(a)sensoria.com) diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c index 8d036930e7..2a0b0ca647 100644 --- a/drivers/pci/pci_x86.c +++ b/drivers/pci/pci_x86.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/pci/pcie_dw_common.c b/drivers/pci/pcie_dw_common.c index 74fb6df412..8edcc534cb 100644 --- a/drivers/pci/pcie_dw_common.c +++ b/drivers/pci/pcie_dw_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/pci/pcie_dw_common.h b/drivers/pci/pcie_dw_common.h index e0f7796f2a..67da1f639d 100644 --- a/drivers/pci/pcie_dw_common.h +++ b/drivers/pci/pcie_dw_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c index f953797908..e916d01a2f 100644 --- a/drivers/pci/pcie_dw_meson.c +++ b/drivers/pci/pcie_dw_meson.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Amlogic DesignWare based PCIe host controller driver * diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index c41f3f1530..b1b1286a9a 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marvell International Ltd. * diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index bc4635f671..2547d2dc24 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Rockchip DesignWare based PCIe host controller driver * diff --git a/drivers/pci/pcie_dw_sifive.c b/drivers/pci/pcie_dw_sifive.c index fac3f18237..4ad19d36ed 100644 --- a/drivers/pci/pcie_dw_sifive.c +++ b/drivers/pci/pcie_dw_sifive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SiFive FU740 DesignWare PCIe Controller * diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 4195a02de3..9751979e83 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments, Inc */ diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c index ec917ee7d5..13e62653b0 100644 --- a/drivers/pci/pcie_fsl.c +++ b/drivers/pci/pcie_fsl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 NXP * diff --git a/drivers/pci/pcie_fsl.h b/drivers/pci/pcie_fsl.h index ba84a232b8..afaaea23ac 100644 --- a/drivers/pci/pcie_fsl.h +++ b/drivers/pci/pcie_fsl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP * diff --git a/drivers/pci/pcie_fsl_fixup.c b/drivers/pci/pcie_fsl_fixup.c index f4e227895d..7a8c903ada 100644 --- a/drivers/pci/pcie_fsl_fixup.c +++ b/drivers/pci/pcie_fsl_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2019 NXP * diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c index d6d3a9e202..842f40de84 100644 --- a/drivers/pci/pcie_iproc.c +++ b/drivers/pci/pcie_iproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2021 Broadcom * diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 3c7c4ca18e..59bff3b382 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2020 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h index b7f692f645..02a85ec857 100644 --- a/drivers/pci/pcie_layerscape.h +++ b/drivers/pci/pcie_layerscape.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2020 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c index 83f7eebd62..7a6a69a237 100644 --- a/drivers/pci/pcie_layerscape_ep.c +++ b/drivers/pci/pcie_layerscape_ep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP * Layerscape PCIe EP driver diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index c519835395..abe2b2b17b 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index 095874a927..c9c04b8a79 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2021 NXP * diff --git a/drivers/pci/pcie_layerscape_fixup_common.h b/drivers/pci/pcie_layerscape_fixup_common.h index 70bd3f0cba..04b25aecf5 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.h +++ b/drivers/pci/pcie_layerscape_fixup_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2020 NXP * diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c index 021c975869..2aae4a27d4 100644 --- a/drivers/pci/pcie_layerscape_gen4.c +++ b/drivers/pci/pcie_layerscape_gen4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2018-2021 NXP * diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h index 805c23a7da..893e288306 100644 --- a/drivers/pci/pcie_layerscape_gen4.h +++ b/drivers/pci/pcie_layerscape_gen4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP * diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index b2a45bf105..c137efcd93 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 /* * Copyright 2018-2021 NXP * diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c index 6a5bf88da2..5b6e3600c7 100644 --- a/drivers/pci/pcie_layerscape_rc.c +++ b/drivers/pci/pcie_layerscape_rc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020,2021 NXP * Layerscape PCIe driver diff --git a/drivers/pci/pcie_octeon.c b/drivers/pci/pcie_octeon.c index 3b28bd8143..90054f36b7 100644 --- a/drivers/pci/pcie_octeon.c +++ b/drivers/pci/pcie_octeon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/drivers/pci/pcie_plda_common.c b/drivers/pci/pcie_plda_common.c index cd74bb4711..88447ea43f 100644 --- a/drivers/pci/pcie_plda_common.c +++ b/drivers/pci/pcie_plda_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PLDA XpressRich PCIe host controller common functions. * diff --git a/drivers/pci/pcie_plda_common.h b/drivers/pci/pcie_plda_common.h index 409949f534..d9e154ff74 100644 --- a/drivers/pci/pcie_plda_common.h +++ b/drivers/pci/pcie_plda_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 StarFive Technology Co., Ltd. * Author: Minda Chen <minda.chen(a)starfivetech.com> diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c index 624841e9d8..4a7299669d 100644 --- a/drivers/pci/pcie_rockchip.c +++ b/drivers/pci/pcie_rockchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Rockchip AXI PCIe host controller driver * diff --git a/drivers/pci/pcie_starfive_jh7110.c b/drivers/pci/pcie_starfive_jh7110.c index 903a544d37..654a472331 100644 --- a/drivers/pci/pcie_starfive_jh7110.c +++ b/drivers/pci/pcie_starfive_jh7110.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * StarFive PLDA PCIe host controller driver * diff --git a/drivers/pci_endpoint/Makefile b/drivers/pci_endpoint/Makefile index 3cd987259d..91c86ff303 100644 --- a/drivers/pci_endpoint/Makefile +++ b/drivers/pci_endpoint/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2019 # Ramon Fried <ramon.fried(a)gmail.com> diff --git a/drivers/pci_endpoint/pci_ep-uclass.c b/drivers/pci_endpoint/pci_ep-uclass.c index 6ee4cfbdb4..dc2c7dbeeb 100644 --- a/drivers/pci_endpoint/pci_ep-uclass.c +++ b/drivers/pci_endpoint/pci_ep-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI Endpoint uclass * diff --git a/drivers/pci_endpoint/pcie-cadence-ep.c b/drivers/pci_endpoint/pcie-cadence-ep.c index d58c64982b..b42785af2a 100644 --- a/drivers/pci_endpoint/pcie-cadence-ep.c +++ b/drivers/pci_endpoint/pcie-cadence-ep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 * Written by Ramon Fried <ramon.fried(a)gmail.com> diff --git a/drivers/pci_endpoint/pcie-cadence.h b/drivers/pci_endpoint/pcie-cadence.h index 8a659c36aa..05f71b85fc 100644 --- a/drivers/pci_endpoint/pcie-cadence.h +++ b/drivers/pci_endpoint/pcie-cadence.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Cadence PCIe controlloer definitions * Adapted from linux kernel driver. diff --git a/drivers/pci_endpoint/sandbox-pci_ep.c b/drivers/pci_endpoint/sandbox-pci_ep.c index de148cddb9..ba0f133163 100644 --- a/drivers/pci_endpoint/sandbox-pci_ep.c +++ b/drivers/pci_endpoint/sandbox-pci_ep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Ramon Fried <ramon.fried(a)gmail.com> */ diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index 5d4de86e71..905e0f8475 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ # Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/allwinner/Makefile b/drivers/phy/allwinner/Makefile index f2b60ce1a6..42e64211b0 100644 --- a/drivers/phy/allwinner/Makefile +++ b/drivers/phy/allwinner/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Amarula Solutions # diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 6624e9134f..9df00ab403 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -7,7 +7,7 @@ * * Modelled arch/arm/mach-sunxi/usb_phy.c to compatible with generic-phy. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/drivers/phy/allwinner/phy-sun50i-usb3.c b/drivers/phy/allwinner/phy-sun50i-usb3.c index 609d9d4ec9..6bd3b3b99c 100644 --- a/drivers/phy/allwinner/phy-sun50i-usb3.c +++ b/drivers/phy/allwinner/phy-sun50i-usb3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Allwinner sun50i(H6) USB 3.0 phy driver * diff --git a/drivers/phy/bcm6318-usbh-phy.c b/drivers/phy/bcm6318-usbh-phy.c index 1c10853940..ed8b3fca36 100644 --- a/drivers/phy/bcm6318-usbh-phy.c +++ b/drivers/phy/bcm6318-usbh-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/phy/bcm6348-usbh-phy.c b/drivers/phy/bcm6348-usbh-phy.c index ce6be3d7da..70c06c1063 100644 --- a/drivers/phy/bcm6348-usbh-phy.c +++ b/drivers/phy/bcm6348-usbh-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/phy/bcm6358-usbh-phy.c b/drivers/phy/bcm6358-usbh-phy.c index bfdcfb0d24..cdfa676f42 100644 --- a/drivers/phy/bcm6358-usbh-phy.c +++ b/drivers/phy/bcm6358-usbh-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/phy/bcm6368-usbh-phy.c b/drivers/phy/bcm6368-usbh-phy.c index d057f1f52e..1153372ebc 100644 --- a/drivers/phy/bcm6368-usbh-phy.c +++ b/drivers/phy/bcm6368-usbh-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/phy/keystone-usb-phy.c b/drivers/phy/keystone-usb-phy.c index 6799e23237..773a203065 100644 --- a/drivers/phy/keystone-usb-phy.c +++ b/drivers/phy/keystone-usb-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/marvell/Makefile b/drivers/phy/marvell/Makefile index 51be0399ea..440a40a672 100644 --- a/drivers/phy/marvell/Makefile +++ b/drivers/phy/marvell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_MVEBU_COMPHY_SUPPORT) += comphy_core.o obj-$(CONFIG_MVEBU_COMPHY_SUPPORT) += comphy_mux.o diff --git a/drivers/phy/marvell/comphy_a3700.c b/drivers/phy/marvell/comphy_a3700.c index c490dc69c6..bb9d4f9252 100644 --- a/drivers/phy/marvell/comphy_a3700.c +++ b/drivers/phy/marvell/comphy_a3700.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/comphy_a3700.h b/drivers/phy/marvell/comphy_a3700.h index 23c8ffbff4..1e213c6048 100644 --- a/drivers/phy/marvell/comphy_a3700.h +++ b/drivers/phy/marvell/comphy_a3700.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c index 7272dfb9fe..3926023535 100644 --- a/drivers/phy/marvell/comphy_core.c +++ b/drivers/phy/marvell/comphy_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Marvell International Ltd. * diff --git a/drivers/phy/marvell/comphy_core.h b/drivers/phy/marvell/comphy_core.h index f3d0493938..7f34630e96 100644 --- a/drivers/phy/marvell/comphy_core.h +++ b/drivers/phy/marvell/comphy_core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/comphy_cp110.c b/drivers/phy/marvell/comphy_cp110.c index bb15fbaf34..1db867c676 100644 --- a/drivers/phy/marvell/comphy_cp110.c +++ b/drivers/phy/marvell/comphy_cp110.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/comphy_mux.c b/drivers/phy/marvell/comphy_mux.c index 10981d25ec..f2205e34ca 100644 --- a/drivers/phy/marvell/comphy_mux.c +++ b/drivers/phy/marvell/comphy_mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/sata.h b/drivers/phy/marvell/sata.h index 41db7aa8ba..d2f0141814 100644 --- a/drivers/phy/marvell/sata.h +++ b/drivers/phy/marvell/sata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/marvell/utmi_phy.h b/drivers/phy/marvell/utmi_phy.h index 264d14b604..9f9f58284b 100644 --- a/drivers/phy/marvell/utmi_phy.h +++ b/drivers/phy/marvell/utmi_phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/drivers/phy/meson-axg-mipi-dphy.c b/drivers/phy/meson-axg-mipi-dphy.c index cf2a1cd14c..52779dcf95 100644 --- a/drivers/phy/meson-axg-mipi-dphy.c +++ b/drivers/phy/meson-axg-mipi-dphy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson AXG MIPI DPHY driver * diff --git a/drivers/phy/meson-axg-mipi-pcie-analog.c b/drivers/phy/meson-axg-mipi-pcie-analog.c index 236ea1ce5c..881f4ebc66 100644 --- a/drivers/phy/meson-axg-mipi-pcie-analog.c +++ b/drivers/phy/meson-axg-mipi-pcie-analog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Amlogic AXG MIPI + PCIE analog PHY driver * diff --git a/drivers/phy/meson-g12a-usb2.c b/drivers/phy/meson-g12a-usb2.c index 4ba3992bda..22fd9d1ebd 100644 --- a/drivers/phy/meson-g12a-usb2.c +++ b/drivers/phy/meson-g12a-usb2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson G12A USB2 PHY driver * diff --git a/drivers/phy/meson-g12a-usb3-pcie.c b/drivers/phy/meson-g12a-usb3-pcie.c index 40a5da948d..876bd3b515 100644 --- a/drivers/phy/meson-g12a-usb3-pcie.c +++ b/drivers/phy/meson-g12a-usb3-pcie.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson G12A USB3+PCIE Combo PHY driver * diff --git a/drivers/phy/meson-gxbb-usb2.c b/drivers/phy/meson-gxbb-usb2.c index 725b056a71..5707f0cd03 100644 --- a/drivers/phy/meson-gxbb-usb2.c +++ b/drivers/phy/meson-gxbb-usb2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson8, Meson8b and GXBB USB2 PHY driver * diff --git a/drivers/phy/meson-gxl-usb2.c b/drivers/phy/meson-gxl-usb2.c index 8f5e4a4366..6c9978b33f 100644 --- a/drivers/phy/meson-gxl-usb2.c +++ b/drivers/phy/meson-gxl-usb2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Meson GXL and GXM USB2 PHY driver * diff --git a/drivers/phy/mt76x8-usb-phy.c b/drivers/phy/mt76x8-usb-phy.c index 4069208b67..12d0910559 100644 --- a/drivers/phy/mt76x8-usb-phy.c +++ b/drivers/phy/mt76x8-usb-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c index d0904f4f07..1afc48f095 100644 --- a/drivers/phy/nop-phy.c +++ b/drivers/phy/nop-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c index 2a9604cdcc..ff29c9e463 100644 --- a/drivers/phy/omap-usb2-phy.c +++ b/drivers/phy/omap-usb2-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP USB2 PHY LAYER * diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c index 3d3d48c973..48f2313245 100644 --- a/drivers/phy/phy-ab8500-usb.c +++ b/drivers/phy/phy-ab8500-usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2019 Stephan Gerhold */ #include <common.h> diff --git a/drivers/phy/phy-apple-atc.c b/drivers/phy/phy-apple-atc.c index 15c5b8a1c2..6a3728e864 100644 --- a/drivers/phy/phy-apple-atc.c +++ b/drivers/phy/phy-apple-atc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/phy/phy-da8xx-usb.c b/drivers/phy/phy-da8xx-usb.c index d025188eae..da30728cab 100644 --- a/drivers/phy/phy-da8xx-usb.c +++ b/drivers/phy/phy-da8xx-usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Based on the DA8xx "glue layer" code. * Copyright (c) 2008-2019, MontaVista Software, Inc. <source(a)mvista.com> diff --git a/drivers/phy/phy-imx8mq-usb.c b/drivers/phy/phy-imx8mq-usb.c index b660eadecf..60a8295cea 100644 --- a/drivers/phy/phy-imx8mq-usb.c +++ b/drivers/phy/phy-imx8mq-usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 NXP * diff --git a/drivers/phy/phy-npcm-usb.c b/drivers/phy/phy-npcm-usb.c index 24eba66554..210a6d6123 100644 --- a/drivers/phy/phy-npcm-usb.c +++ b/drivers/phy/phy-npcm-usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/phy/phy-stm32-usbphyc.c b/drivers/phy/phy-stm32-usbphyc.c index 000e495dbd..aedc1d9269 100644 --- a/drivers/phy/phy-stm32-usbphyc.c +++ b/drivers/phy/phy-stm32-usbphyc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c index 70a746d2c9..4224fb8a8c 100644 --- a/drivers/phy/phy-ti-am654.c +++ b/drivers/phy/phy-ti-am654.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * PCIe SERDES driver for AM654x SoC * diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c index 22f2fe9148..76d868f29a 100644 --- a/drivers/phy/phy-uclass.c +++ b/drivers/phy/phy-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/qcom/msm8916-usbh-phy.c b/drivers/phy/qcom/msm8916-usbh-phy.c index 7c9d030a4d..c50415bd68 100644 --- a/drivers/phy/qcom/msm8916-usbh-phy.c +++ b/drivers/phy/qcom/msm8916-usbh-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> */ diff --git a/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c b/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c index 05a9a2cf1d..66e993e051 100644 --- a/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c +++ b/drivers/phy/qcom/phy-qcom-usb-hs-28nm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sumit Garg <sumit.garg(a)linaro.org> * diff --git a/drivers/phy/qcom/phy-qcom-usb-ss.c b/drivers/phy/qcom/phy-qcom-usb-ss.c index 1b03a3c43d..eb166d445c 100644 --- a/drivers/phy/qcom/phy-qcom-usb-ss.c +++ b/drivers/phy/qcom/phy-qcom-usb-ss.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sumit Garg <sumit.garg(a)linaro.org> * diff --git a/drivers/phy/rockchip/Makefile b/drivers/phy/rockchip/Makefile index 7fdbd10797..3363409395 100644 --- a/drivers/phy/rockchip/Makefile +++ b/drivers/phy/rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Amarula Solutions(India) # diff --git a/drivers/phy/sandbox-phy.c b/drivers/phy/sandbox-phy.c index 7b3d988613..0c3a1954e7 100644 --- a/drivers/phy/sandbox-phy.c +++ b/drivers/phy/sandbox-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/socionext/phy-uniphier-pcie.c b/drivers/phy/socionext/phy-uniphier-pcie.c index d352c4ca3a..1c9293199c 100644 --- a/drivers/phy/socionext/phy-uniphier-pcie.c +++ b/drivers/phy/socionext/phy-uniphier-pcie.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * phy_uniphier_pcie.c - Socionext UniPhier PCIe PHY driver * Copyright 2019-2021 Socionext, Inc. diff --git a/drivers/phy/socionext/phy-uniphier-usb3.c b/drivers/phy/socionext/phy-uniphier-usb3.c index 1d65b0b08f..b9d3d6af5e 100644 --- a/drivers/phy/socionext/phy-uniphier-usb3.c +++ b/drivers/phy/socionext/phy-uniphier-usb3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * phy_uniphier_usb3.c - Socionext UniPhier Usb3 PHY driver * Copyright 2019-2023 Socionext, Inc. diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c index 9e5ac9bfde..93d1804e6a 100644 --- a/drivers/phy/sti_usb_phy.c +++ b/drivers/phy/sti_usb_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/phy/ti-pipe3-phy.c b/drivers/phy/ti-pipe3-phy.c index 313735844a..56961c9159 100644 --- a/drivers/phy/ti-pipe3-phy.c +++ b/drivers/phy/ti-pipe3-phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/phy/ti/phy-j721e-wiz.c b/drivers/phy/ti/phy-j721e-wiz.c index 7261339907..97978a1356 100644 --- a/drivers/phy/ti/phy-j721e-wiz.c +++ b/drivers/phy/ti/phy-j721e-wiz.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ * Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index fc1f01a02c..9c07eec501 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += pinctrl-uclass.o obj-$(CONFIG_$(SPL_)PINCTRL_GENERIC) += pinctrl-generic.o diff --git a/drivers/pinctrl/aspeed/pinctrl_ast2500.c b/drivers/pinctrl/aspeed/pinctrl_ast2500.c index 93920a6389..94777cb8a4 100644 --- a/drivers/pinctrl/aspeed/pinctrl_ast2500.c +++ b/drivers/pinctrl/aspeed/pinctrl_ast2500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Google, Inc */ diff --git a/drivers/pinctrl/ath79/Makefile b/drivers/pinctrl/ath79/Makefile index c7d1e44882..0fd437f2cf 100644 --- a/drivers/pinctrl/ath79/Makefile +++ b/drivers/pinctrl/ath79/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_PINCTRL_AR933X) += pinctrl_ar933x.o obj-$(CONFIG_PINCTRL_QCA953X) += pinctrl_qca953x.o diff --git a/drivers/pinctrl/ath79/pinctrl_ar933x.c b/drivers/pinctrl/ath79/pinctrl_ar933x.c index eb673a9f69..33abfc1bf2 100644 --- a/drivers/pinctrl/ath79/pinctrl_ar933x.c +++ b/drivers/pinctrl/ath79/pinctrl_ar933x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/drivers/pinctrl/ath79/pinctrl_qca953x.c b/drivers/pinctrl/ath79/pinctrl_qca953x.c index 0d534268e9..1d0bda8495 100644 --- a/drivers/pinctrl/ath79/pinctrl_qca953x.c +++ b/drivers/pinctrl/ath79/pinctrl_qca953x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/drivers/pinctrl/exynos/Makefile b/drivers/pinctrl/exynos/Makefile index 07db970ca9..d4d23f84f7 100644 --- a/drivers/pinctrl/exynos/Makefile +++ b/drivers/pinctrl/exynos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Samsung Electronics # Thomas Abraham <thomas.ab(a)samsung.com> diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c index 898185479b..4a8cea1bb8 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Exynos pinctrl driver common code. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.h b/drivers/pinctrl/exynos/pinctrl-exynos.h index cbc5174b48..610253bf6e 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.h +++ b/drivers/pinctrl/exynos/pinctrl-exynos.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Exynos pinctrl driver header. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/pinctrl/exynos/pinctrl-exynos7420.c b/drivers/pinctrl/exynos/pinctrl-exynos7420.c index 07870b7f51..e4d33bb728 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos7420.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos7420.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Exynos7420 pinctrl driver. * Copyright (C) 2016 Samsung Electronics diff --git a/drivers/pinctrl/exynos/pinctrl-exynos78x0.c b/drivers/pinctrl/exynos/pinctrl-exynos78x0.c index 1b696fdfd2..82630bc2c1 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos78x0.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos78x0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Exynos78x0 pinctrl driver. * diff --git a/drivers/pinctrl/intel/Makefile b/drivers/pinctrl/intel/Makefile index 3aed8e9663..7f6727944e 100644 --- a/drivers/pinctrl/intel/Makefile +++ b/drivers/pinctrl/intel/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/drivers/pinctrl/meson/Makefile b/drivers/pinctrl/meson/Makefile index 8d10d027ac..4a1599cb68 100644 --- a/drivers/pinctrl/meson/Makefile +++ b/drivers/pinctrl/meson/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += pinctrl-meson.o obj-$(CONFIG_PINCTRL_MESON_GX_PMX) += pinctrl-meson-gx-pmx.o diff --git a/drivers/pinctrl/meson/pinctrl-meson-a1.c b/drivers/pinctrl/meson/pinctrl-meson-a1.c index 30cf3bc0be..e9c04e11c0 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-a1.c +++ b/drivers/pinctrl/meson/pinctrl-meson-a1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. * Author: Qianggui Song <qianggui.song(a)amlogic.com> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c index cfe94cf9e1..5bb5318abf 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Jerome Brunet <jbrunet(a)baylibre.com> * Copyright (C) 2017 Xingyu Chen <xingyu.chen(a)amlogic.com> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c index 820a6c9bb1..4b3860653d 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright (C) 2018 Neil Armstrong <narmstrong(a)baylibre.com> * diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.h b/drivers/pinctrl/meson/pinctrl-meson-axg.h index c8d2b3af03..48a5fefadb 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-axg.h +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Jerome Brunet <jbrunet(a)baylibre.com> * Copyright (C) 2017 Xingyu Chen <xingyu.chen(a)amlogic.com> diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c index 90a4f8056c..5279e7a57e 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * (C) Copyright (C) 2019 Jerome Brunet <jbrunet(a)baylibre.com> * diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c index 99502d89c6..164625c103 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx.h b/drivers/pinctrl/meson/pinctrl-meson-gx.h index c70c1f51c6..4ea83c1fa5 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gx.h +++ b/drivers/pinctrl/meson/pinctrl-meson-gx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Beniamino Galvani <b.galvani(a)gmail.com> * Copyright (C) 2017 Jerome Brunet <jbrunet(a)baylibre.com> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 93a895c9fa..4928dcdf86 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> * diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c index a44145e2d4..d075b94203 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> * diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index ee362d8464..1e306b8ba8 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h index 98010cdaf9..a0ee770e1c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 - Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/drivers/pinctrl/mscc/Kconfig b/drivers/pinctrl/mscc/Kconfig index aab67fabd2..122ea7e885 100644 --- a/drivers/pinctrl/mscc/Kconfig +++ b/drivers/pinctrl/mscc/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) config PINCTRL_MSCC bool diff --git a/drivers/pinctrl/mscc/Makefile b/drivers/pinctrl/mscc/Makefile index fd7eba2a0a..7cf5de7282 100644 --- a/drivers/pinctrl/mscc/Makefile +++ b/drivers/pinctrl/mscc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (GPL-2.0+ OR MIT) +# SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) obj-y += mscc-common.o obj-$(CONFIG_PINCTRL_MSCC_OCELOT) += pinctrl-ocelot.o diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index e834dddfd1..a18ca3de5b 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot Marvell 37xx SoC pinctrl driver * diff --git a/drivers/pinctrl/nexell/Makefile b/drivers/pinctrl/nexell/Makefile index 74df414d55..45da625f53 100644 --- a/drivers/pinctrl/nexell/Makefile +++ b/drivers/pinctrl/nexell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Bongyu, KOO <freestyle(a)nexell.co.kr> diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.c b/drivers/pinctrl/nexell/pinctrl-nexell.c index 20497a746d..cb024f556d 100644 --- a/drivers/pinctrl/nexell/pinctrl-nexell.c +++ b/drivers/pinctrl/nexell/pinctrl-nexell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pinctrl driver for Nexell SoCs * (C) Copyright 2016 Nexell diff --git a/drivers/pinctrl/nexell/pinctrl-nexell.h b/drivers/pinctrl/nexell/pinctrl-nexell.h index b21eefcabe..8034af48d9 100644 --- a/drivers/pinctrl/nexell/pinctrl-nexell.h +++ b/drivers/pinctrl/nexell/pinctrl-nexell.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Pinctrl driver for Nexell SoCs * (C) Copyright 2016 Nexell diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c index 863eb1455d..b7a48c07f3 100644 --- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.c +++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pinctrl driver for Nexell SoCs * (C) Copyright 2016 Nexell diff --git a/drivers/pinctrl/nexell/pinctrl-s5pxx18.h b/drivers/pinctrl/nexell/pinctrl-s5pxx18.h index 843a00b955..cb4d11b05f 100644 --- a/drivers/pinctrl/nexell/pinctrl-s5pxx18.h +++ b/drivers/pinctrl/nexell/pinctrl-s5pxx18.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Pinctrl driver for Nexell SoCs * (C) Copyright 2016 Nexell diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index 92513822e7..5663282b58 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Nuvoton Technology Corp. * Author: Joseph Liu <kwliu(a)nuvoton.com> diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c index 7976e3b3ed..02aae02e89 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c index 1596dcc474..be50d94f69 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.c +++ b/drivers/pinctrl/nxp/pinctrl-imx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Peng Fan <van.freenix(a)gmail.com> */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h b/drivers/pinctrl/nxp/pinctrl-imx.h index fa4c084e2f..a8ba4a0b3a 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.h +++ b/drivers/pinctrl/nxp/pinctrl-imx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Peng Fan <van.freenix(a)gmail.com> */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c index b32b748cfc..d5721f9371 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx5.c +++ b/drivers/pinctrl/nxp/pinctrl-imx5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Peng Fan <van.freenix(a)gmail.com> diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 6994dbb61a..2b4ddac674 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Peng Fan <van.freenix(a)gmail.com> diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c index 77ddb8e0b9..c36acf45f5 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Peng Fan <van.freenix(a)gmail.com> */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c index 6da9ff7c5b..bbef361874 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c index 46af44ecb1..e0a2ed6ef2 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c index 6ea66a080b..5ae483afa8 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8m.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c index 4e8fa08bc6..744490fc73 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP * diff --git a/drivers/pinctrl/nxp/pinctrl-imx93.c b/drivers/pinctrl/nxp/pinctrl-imx93.c index 9a5b9de6d7..b59f3db565 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx93.c +++ b/drivers/pinctrl/nxp/pinctrl-imx93.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 NXP */ diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c index 53b70da869..8a0dd33f38 100644 --- a/drivers/pinctrl/nxp/pinctrl-imxrt.c +++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.c b/drivers/pinctrl/nxp/pinctrl-mxs.c index eb90e28d4b..109e4209ed 100644 --- a/drivers/pinctrl/nxp/pinctrl-mxs.c +++ b/drivers/pinctrl/nxp/pinctrl-mxs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/pinctrl/nxp/pinctrl-mxs.h b/drivers/pinctrl/nxp/pinctrl-mxs.h index 20d6dea338..073852f18f 100644 --- a/drivers/pinctrl/nxp/pinctrl-mxs.h +++ b/drivers/pinctrl/nxp/pinctrl-mxs.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/drivers/pinctrl/nxp/pinctrl-scu.c b/drivers/pinctrl/nxp/pinctrl-scu.c index 4959834c0f..63a1278d92 100644 --- a/drivers/pinctrl/nxp/pinctrl-scu.c +++ b/drivers/pinctrl/nxp/pinctrl-scu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018-2019 NXP */ diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c index 14e2e9d3ee..34e105191d 100644 --- a/drivers/pinctrl/nxp/pinctrl-vf610.c +++ b/drivers/pinctrl/nxp/pinctrl-vf610.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/pinctrl/pinctrl-apple.c b/drivers/pinctrl/pinctrl-apple.c index 62476358c3..ce99b82785 100644 --- a/drivers/pinctrl/pinctrl-apple.c +++ b/drivers/pinctrl/pinctrl-apple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 84b398619c..5e8d28c504 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel PIO4 pinctrl driver * diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index b7aab12f11..ff8882c79c 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Atmel PIO pinctrl driver * diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c index 8909b57810..d323889497 100644 --- a/drivers/pinctrl/pinctrl-generic.c +++ b/drivers/pinctrl/pinctrl-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/drivers/pinctrl/pinctrl-k210.c b/drivers/pinctrl/pinctrl-k210.c index 13f0a34268..807ec9fea5 100644 --- a/drivers/pinctrl/pinctrl-k210.c +++ b/drivers/pinctrl/pinctrl-k210.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/drivers/pinctrl/pinctrl-qe-io.c b/drivers/pinctrl/pinctrl-qe-io.c index dc0be7ce3b..d81005f58f 100644 --- a/drivers/pinctrl/pinctrl-qe-io.c +++ b/drivers/pinctrl/pinctrl-qe-io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * diff --git a/drivers/pinctrl/pinctrl-sandbox.c b/drivers/pinctrl/pinctrl-sandbox.c index 7765977450..1ad80e157f 100644 --- a/drivers/pinctrl/pinctrl-sandbox.c +++ b/drivers/pinctrl/pinctrl-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index d1db377c13..88731f8147 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) EETS GmbH, 2017, Felix Brack <f.brack(a)eets.ch> * Copyright (C) 2021 Dario Binacchi <dariobin(a)libero.it> diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 1ff7ea0055..56d909ea67 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pinctrl driver for STMicroelectronics STi SoCs * diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c index 509e2a80e9..213ada81bd 100644 --- a/drivers/pinctrl/pinctrl-stmfx.c +++ b/drivers/pinctrl/pinctrl-stmfx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 73dd7b1038..7e3ce621e0 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/drivers/pinctrl/pinctrl_pic32.c b/drivers/pinctrl/pinctrl_pic32.c index 54d97ac0ae..5a28b2fd09 100644 --- a/drivers/pinctrl/pinctrl_pic32.c +++ b/drivers/pinctrl/pinctrl_pic32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Pinctrl driver for Microchip PIC32 SoCs * Copyright (c) 2015 Microchip Technology Inc. diff --git a/drivers/pinctrl/pinctrl_stm32.c b/drivers/pinctrl/pinctrl_stm32.c index 8bb7588714..96c1511ee8 100644 --- a/drivers/pinctrl/pinctrl_stm32.c +++ b/drivers/pinctrl/pinctrl_stm32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2020 STMicroelectronics - All Rights Reserved */ diff --git a/drivers/pinctrl/renesas/pinctrl-rza1.c b/drivers/pinctrl/renesas/pinctrl-rza1.c index a445cdba71..fd2d068373 100644 --- a/drivers/pinctrl/renesas/pinctrl-rza1.c +++ b/drivers/pinctrl/renesas/pinctrl-rza1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * R7S72100 processor support * diff --git a/drivers/pinctrl/rockchip/Makefile b/drivers/pinctrl/rockchip/Makefile index c91f650b04..0f17c46b2f 100644 --- a/drivers/pinctrl/rockchip/Makefile +++ b/drivers/pinctrl/rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Rockchip Electronics Co., Ltd diff --git a/drivers/pinctrl/rockchip/pinctrl-px30.c b/drivers/pinctrl/rockchip/pinctrl-px30.c index 2c35491b24..97276182bf 100644 --- a/drivers/pinctrl/rockchip/pinctrl-px30.c +++ b/drivers/pinctrl/rockchip/pinctrl-px30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3036.c b/drivers/pinctrl/rockchip/pinctrl-rk3036.c index afcd34396e..f04b204184 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3036.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3036.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3066.c b/drivers/pinctrl/rockchip/pinctrl-rk3066.c index 598b63223e..9797294c7b 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3066.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3066.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3128.c b/drivers/pinctrl/rockchip/pinctrl-rk3128.c index 355c45eb7f..07119b5d60 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3128.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3128.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3188.c b/drivers/pinctrl/rockchip/pinctrl-rk3188.c index 9a982cbfad..c4d61fba41 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3188.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3188.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk322x.c b/drivers/pinctrl/rockchip/pinctrl-rk322x.c index 351406da2d..91e7035d74 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk322x.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk322x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3288.c b/drivers/pinctrl/rockchip/pinctrl-rk3288.c index a976b7aeeb..1ee0fa622a 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3288.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3308.c b/drivers/pinctrl/rockchip/pinctrl-rk3308.c index f9ac6347ea..3fffcddada 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3308.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3328.c b/drivers/pinctrl/rockchip/pinctrl-rk3328.c index 65a7500767..9ad8d5892b 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3328.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3368.c b/drivers/pinctrl/rockchip/pinctrl-rk3368.c index ba867a8917..fae17c4bac 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3368.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3368.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3399.c b/drivers/pinctrl/rockchip/pinctrl-rk3399.c index ae785573ba..9e6ac82df2 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3399.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3568.c b/drivers/pinctrl/rockchip/pinctrl-rk3568.c index 1d43919826..34ef2afcb5 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3568.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3568.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3588.c b/drivers/pinctrl/rockchip/pinctrl-rk3588.c index 548cf09bcc..8566d9c77d 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rk3588.c +++ b/drivers/pinctrl/rockchip/pinctrl-rk3588.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c index 8ef089994f..ee0ab0aab3 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip.h b/drivers/pinctrl/rockchip/pinctrl-rockchip.h index df7bc684d2..ef95c84764 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rockchip.h +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1108.c b/drivers/pinctrl/rockchip/pinctrl-rv1108.c index 5b70b503d2..4bb0900289 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rv1108.c +++ b/drivers/pinctrl/rockchip/pinctrl-rv1108.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/rockchip/pinctrl-rv1126.c b/drivers/pinctrl/rockchip/pinctrl-rv1126.c index eefb8b1776..e636611a1b 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rv1126.c +++ b/drivers/pinctrl/rockchip/pinctrl-rv1126.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Rockchip Electronics Co., Ltd */ diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile index d3088d8754..7e9afa4d97 100644 --- a/drivers/pinctrl/uniphier/Makefile +++ b/drivers/pinctrl/uniphier/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += pinctrl-uniphier-core.o diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c index bdca3f2f71..865a7dc3de 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c index a1a3cd7385..4912f4ec09 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c index 7a92a46c17..112b4ee78f 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c index d33e4d7dd2..2455005155 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c index 0e3eb131ec..7a24c43ee7 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c index 7ba2266092..43b8ee4012 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c index 9ce2e2c270..16b9a14b86 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c index e8c2018097..9073e76bd0 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c index 8a8f1269bb..29cccd8abc 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2021 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c index 04c06fb280..ddb97fd95c 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier.h b/drivers/pinctrl/uniphier/pinctrl-uniphier.h index 5951835d6e..12db0a17f5 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier.h +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/power/Makefile b/drivers/power/Makefile index ba64b2c593..5936adc258 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2009 Wind River Systems, Inc. # Tom Rix <Tom.Rix at windriver.com> diff --git a/drivers/power/acpi_pmc/Makefile b/drivers/power/acpi_pmc/Makefile index 0db52a6582..f69f690b9e 100644 --- a/drivers/power/acpi_pmc/Makefile +++ b/drivers/power/acpi_pmc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2019 Google LLC diff --git a/drivers/power/acpi_pmc/pmc_emul.c b/drivers/power/acpi_pmc/pmc_emul.c index 8015031da8..6aa8b0f4ba 100644 --- a/drivers/power/acpi_pmc/pmc_emul.c +++ b/drivers/power/acpi_pmc/pmc_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PCI emulation device for an x86 Power-Management Controller (PMC) * diff --git a/drivers/power/axp152.c b/drivers/power/axp152.c index a93987c153..6282ff43fe 100644 --- a/drivers/power/axp152.c +++ b/drivers/power/axp152.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Henrik Nordstrom <henrik(a)henriknordstrom.net> diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 3447b9f011..ca51db5c1c 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Henrik Nordstrom <henrik(a)henriknordstrom.net> diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c index d251c314b9..64b0a0ab72 100644 --- a/drivers/power/axp221.c +++ b/drivers/power/axp221.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AXP221 and AXP223 driver * diff --git a/drivers/power/axp305.c b/drivers/power/axp305.c index 049ef07f74..143d376240 100644 --- a/drivers/power/axp305.c +++ b/drivers/power/axp305.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AXP305 driver * diff --git a/drivers/power/axp809.c b/drivers/power/axp809.c index d327a584de..9c024dc027 100644 --- a/drivers/power/axp809.c +++ b/drivers/power/axp809.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AXP809 driver based on AXP221 driver * diff --git a/drivers/power/axp818.c b/drivers/power/axp818.c index 08286ea3b5..1f76b7cff6 100644 --- a/drivers/power/axp818.c +++ b/drivers/power/axp818.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * AXP818 driver based on AXP221 driver * diff --git a/drivers/power/domain/apple-pmgr.c b/drivers/power/domain/apple-pmgr.c index 402c5b1fd1..2b693aa305 100644 --- a/drivers/power/domain/apple-pmgr.c +++ b/drivers/power/domain/apple-pmgr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c index 80144dd977..6309a3eef7 100644 --- a/drivers/power/domain/bcm6328-power-domain.c +++ b/drivers/power/domain/bcm6328-power-domain.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c index 676fded808..465974fd1a 100644 --- a/drivers/power/domain/meson-ee-pwrc.c +++ b/drivers/power/domain/meson-ee-pwrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/power/domain/meson-secure-pwrc.c b/drivers/power/domain/meson-secure-pwrc.c index f70f8e0242..38402145f8 100644 --- a/drivers/power/domain/meson-secure-pwrc.c +++ b/drivers/power/domain/meson-secure-pwrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 SberDevices, Inc. * Author: Alexey Romanov <avromanov(a)sberdevices.ru> diff --git a/drivers/power/domain/ti-power-domain.c b/drivers/power/domain/ti-power-domain.c index 9e7151307c..280c7d1cb9 100644 --- a/drivers/power/domain/ti-power-domain.c +++ b/drivers/power/domain/ti-power-domain.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments power domain driver * diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c index 0140e5e521..8eac13aa46 100644 --- a/drivers/power/domain/ti-sci-power-domain.c +++ b/drivers/power/domain/ti-sci-power-domain.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments System Control Interface (TI SCI) power domain driver * diff --git a/drivers/power/mt6323.c b/drivers/power/mt6323.c index 354817a037..cab594bb8a 100644 --- a/drivers/power/mt6323.c +++ b/drivers/power/mt6323.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Frank Wunderlich <frank-w(a)public-files.de> */ diff --git a/drivers/power/palmas.c b/drivers/power/palmas.c index 3ac9712340..0b5bc3d343 100644 --- a/drivers/power/palmas.c +++ b/drivers/power/palmas.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012-2013 * Texas Instruments, <www.ti.com> diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index 0b3b3d62d0..d79960cd9c 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics # Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/pmic/ab8500.c b/drivers/power/pmic/ab8500.c index 1f64f217c3..fdc2faa10c 100644 --- a/drivers/power/pmic/ab8500.c +++ b/drivers/power/pmic/ab8500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Stephan Gerhold * diff --git a/drivers/power/pmic/act8846.c b/drivers/power/pmic/act8846.c index 8f0f5a6d96..ac3a43591f 100644 --- a/drivers/power/pmic/act8846.c +++ b/drivers/power/pmic/act8846.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/pmic/as3722.c b/drivers/power/pmic/as3722.c index c7dd9705d1..c704f82a72 100644 --- a/drivers/power/pmic/as3722.c +++ b/drivers/power/pmic/as3722.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 NVIDIA Corporation */ diff --git a/drivers/power/pmic/as3722_gpio.c b/drivers/power/pmic/as3722_gpio.c index 987fbdf9bc..fba1572231 100644 --- a/drivers/power/pmic/as3722_gpio.c +++ b/drivers/power/pmic/as3722_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 NVIDIA Corporation */ diff --git a/drivers/power/pmic/axp.c b/drivers/power/pmic/axp.c index 025dac24f2..0eec9a62a8 100644 --- a/drivers/power/pmic/axp.c +++ b/drivers/power/pmic/axp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <axp_pmic.h> #include <dm.h> diff --git a/drivers/power/pmic/bd71837.c b/drivers/power/pmic/bd71837.c index ee6ae78e5c..3ed4fad589 100644 --- a/drivers/power/pmic/bd71837.c +++ b/drivers/power/pmic/bd71837.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/drivers/power/pmic/da9063.c b/drivers/power/pmic/da9063.c index ca95b82e6d..d0753a7ace 100644 --- a/drivers/power/pmic/da9063.c +++ b/drivers/power/pmic/da9063.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Flowbird * Martin Fuzzey <martin.fuzzey(a)flowbird.group> diff --git a/drivers/power/pmic/fan53555.c b/drivers/power/pmic/fan53555.c index d556b9a587..96c1c95598 100644 --- a/drivers/power/pmic/fan53555.c +++ b/drivers/power/pmic/fan53555.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/power/pmic/i2c_pmic_emul.c b/drivers/power/pmic/i2c_pmic_emul.c index f0a03742f8..d00cc73858 100644 --- a/drivers/power/pmic/i2c_pmic_emul.c +++ b/drivers/power/pmic/i2c_pmic_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/pmic/lp873x.c b/drivers/power/pmic/lp873x.c index fda5bc1516..c3e5994cf4 100644 --- a/drivers/power/pmic/lp873x.c +++ b/drivers/power/pmic/lp873x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Texas Instruments Incorporated, <www.ti.com> * Keerthy <j-keerthy(a)ti.com> diff --git a/drivers/power/pmic/lp87565.c b/drivers/power/pmic/lp87565.c index 904e02c4d8..9e2537aef9 100644 --- a/drivers/power/pmic/lp87565.c +++ b/drivers/power/pmic/lp87565.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Texas Instruments Incorporated, <www.ti.com> * Keerthy <j-keerthy(a)ti.com> diff --git a/drivers/power/pmic/max77686.c b/drivers/power/pmic/max77686.c index 7e6f7d1966..4ca753e090 100644 --- a/drivers/power/pmic/max77686.c +++ b/drivers/power/pmic/max77686.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/pmic/max8997.c b/drivers/power/pmic/max8997.c index 504a63bf74..7ac5f7b47f 100644 --- a/drivers/power/pmic/max8997.c +++ b/drivers/power/pmic/max8997.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Samsung Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/power/pmic/max8998.c b/drivers/power/pmic/max8998.c index d155474447..6fb4c71f91 100644 --- a/drivers/power/pmic/max8998.c +++ b/drivers/power/pmic/max8998.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Samsung Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/drivers/power/pmic/mc34708.c b/drivers/power/pmic/mc34708.c index 40d732224b..799bff6380 100644 --- a/drivers/power/pmic/mc34708.c +++ b/drivers/power/pmic/mc34708.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/drivers/power/pmic/mp5416.c b/drivers/power/pmic/mp5416.c index 6180adf77e..2a61f8d1c5 100644 --- a/drivers/power/pmic/mp5416.c +++ b/drivers/power/pmic/mp5416.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Gateworks Corporation */ diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c index eb83c88d56..762194e13f 100644 --- a/drivers/power/pmic/palmas.c +++ b/drivers/power/pmic/palmas.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Texas Instruments Incorporated, <www.ti.com> * Keerthy <j-keerthy(a)ti.com> diff --git a/drivers/power/pmic/pca9450.c b/drivers/power/pmic/pca9450.c index 0bbe98cd8a..380f908761 100644 --- a/drivers/power/pmic/pca9450.c +++ b/drivers/power/pmic/pca9450.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/power/pmic/pfuze100.c b/drivers/power/pmic/pfuze100.c index 15420acb47..557d32f18f 100644 --- a/drivers/power/pmic/pfuze100.c +++ b/drivers/power/pmic/pfuze100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc * Peng Fan <Peng.Fan(a)freescale.com> diff --git a/drivers/power/pmic/pmic-uclass.c b/drivers/power/pmic/pmic-uclass.c index 0e2f5e1f41..7d266f9e08 100644 --- a/drivers/power/pmic/pmic-uclass.c +++ b/drivers/power/pmic/pmic-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/pmic/pmic_hi6553.c b/drivers/power/pmic/pmic_hi6553.c index 80b9078cf8..30c8917e9b 100644 --- a/drivers/power/pmic/pmic_hi6553.c +++ b/drivers/power/pmic/pmic_hi6553.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c index af94f37b0f..1ea9bb547f 100644 --- a/drivers/power/pmic/pmic_ltc3676.c +++ b/drivers/power/pmic/pmic_ltc3676.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Tim Harvey <tharvey(a)gateworks.com> diff --git a/drivers/power/pmic/pmic_mc34vr500.c b/drivers/power/pmic/pmic_mc34vr500.c index 9dd1c46ea2..02369889e5 100644 --- a/drivers/power/pmic/pmic_mc34vr500.c +++ b/drivers/power/pmic/pmic_mc34vr500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Freescale Semiconductor, Inc. * Hou Zhiqiang <Zhiqiang.Hou(a)freescale.com> diff --git a/drivers/power/pmic/pmic_pca9450.c b/drivers/power/pmic/pmic_pca9450.c index 8c4d0a9230..21b6966668 100644 --- a/drivers/power/pmic/pmic_pca9450.c +++ b/drivers/power/pmic/pmic_pca9450.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c index 5115b55e49..1e83ca3b43 100644 --- a/drivers/power/pmic/pmic_pfuze100.c +++ b/drivers/power/pmic/pmic_pfuze100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Gateworks Corporation * Tim Harvey <tharvey(a)gateworks.com> diff --git a/drivers/power/pmic/pmic_pfuze3000.c b/drivers/power/pmic/pmic_pfuze3000.c index a6d97252bc..ac9b4f0d3a 100644 --- a/drivers/power/pmic/pmic_pfuze3000.c +++ b/drivers/power/pmic/pmic_pfuze3000.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * Peng Fan <Peng.Fan(a)freescale.com> diff --git a/drivers/power/pmic/pmic_qcom.c b/drivers/power/pmic/pmic_qcom.c index ad8daf43f0..77f20ed10a 100644 --- a/drivers/power/pmic/pmic_qcom.c +++ b/drivers/power/pmic/pmic_qcom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm generic pmic driver * diff --git a/drivers/power/pmic/pmic_tps62362.c b/drivers/power/pmic/pmic_tps62362.c index 59190d6f67..d646083d7a 100644 --- a/drivers/power/pmic/pmic_tps62362.c +++ b/drivers/power/pmic/pmic_tps62362.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Texas Instruments Incorporated - http://www.ti.com * Author: Felipe Balbi <balbi(a)ti.com> diff --git a/drivers/power/pmic/pmic_tps65217.c b/drivers/power/pmic/pmic_tps65217.c index ccbf223593..42aa9ca260 100644 --- a/drivers/power/pmic/pmic_tps65217.c +++ b/drivers/power/pmic/pmic_tps65217.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011-2013 * Texas Instruments, <www.ti.com> diff --git a/drivers/power/pmic/pmic_tps65218.c b/drivers/power/pmic/pmic_tps65218.c index 6717490180..24b1dce80a 100644 --- a/drivers/power/pmic/pmic_tps65218.c +++ b/drivers/power/pmic/pmic_tps65218.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011-2013 * Texas Instruments, <www.ti.com> diff --git a/drivers/power/pmic/pmic_tps65910.c b/drivers/power/pmic/pmic_tps65910.c index e3de730821..097c991401 100644 --- a/drivers/power/pmic/pmic_tps65910.c +++ b/drivers/power/pmic/pmic_tps65910.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011-2013 * Texas Instruments, <www.ti.com> diff --git a/drivers/power/pmic/pmic_tps65910_dm.c b/drivers/power/pmic/pmic_tps65910_dm.c index 8ead1db802..15663af133 100644 --- a/drivers/power/pmic/pmic_tps65910_dm.c +++ b/drivers/power/pmic/pmic_tps65910_dm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) EETS GmbH, 2017, Felix Brack <f.brack(a)eets.ch> */ diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 4e3a17337e..c7233a6e4a 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/pmic/rn5t567.c b/drivers/power/pmic/rn5t567.c index 9d103dd840..f6aed4fe7d 100644 --- a/drivers/power/pmic/rn5t567.c +++ b/drivers/power/pmic/rn5t567.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Toradex AG * Stefan Agner <stefan.agner(a)toradex.com> diff --git a/drivers/power/pmic/s2mps11.c b/drivers/power/pmic/s2mps11.c index 5ff4f20521..79c465796b 100644 --- a/drivers/power/pmic/s2mps11.c +++ b/drivers/power/pmic/s2mps11.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/pmic/s5m8767.c b/drivers/power/pmic/s5m8767.c index eea072ae82..f2b35ef0a6 100644 --- a/drivers/power/pmic/s5m8767.c +++ b/drivers/power/pmic/s5m8767.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/drivers/power/pmic/sandbox.c b/drivers/power/pmic/sandbox.c index 14b82455f5..673a8ca713 100644 --- a/drivers/power/pmic/sandbox.c +++ b/drivers/power/pmic/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c index 8701d4f971..97953109b2 100644 --- a/drivers/power/pmic/stpmic1.c +++ b/drivers/power/pmic/stpmic1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/power/pmic/tps65090.c b/drivers/power/pmic/tps65090.c index 2a04d5948a..6ee7ae3373 100644 --- a/drivers/power/pmic/tps65090.c +++ b/drivers/power/pmic/tps65090.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/pmic/tps65219.c b/drivers/power/pmic/tps65219.c index 9462afee77..bd8fb7a192 100644 --- a/drivers/power/pmic/tps65219.c +++ b/drivers/power/pmic/tps65219.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/power/pmic/tps65941.c b/drivers/power/pmic/tps65941.c index 727b42747a..50a3122798 100644 --- a/drivers/power/pmic/tps65941.c +++ b/drivers/power/pmic/tps65941.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 Texas Instruments Incorporated, <www.ti.com> * Keerthy <j-keerthy(a)ti.com> diff --git a/drivers/power/power_core.c b/drivers/power/power_core.c index 4f7ba099cd..cdfe546e8c 100644 --- a/drivers/power/power_core.c +++ b/drivers/power/power_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/power_dialog.c b/drivers/power/power_dialog.c index ad7aaf35a9..ca0652e052 100644 --- a/drivers/power/power_dialog.c +++ b/drivers/power/power_dialog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c index 9dc930fb30..efbf1c8660 100644 --- a/drivers/power/power_fsl.c +++ b/drivers/power/power_fsl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c index b67ac2f027..cfe90d5c6e 100644 --- a/drivers/power/power_i2c.c +++ b/drivers/power/power_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/power_spi.c b/drivers/power/power_spi.c index 1eaf9773ef..d5a09bccc0 100644 --- a/drivers/power/power_spi.c +++ b/drivers/power/power_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index d9e0cd5949..47e2caa40a 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Samsung Electronics # Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/regulator/act8846.c b/drivers/power/regulator/act8846.c index bdce97365d..7287a808b9 100644 --- a/drivers/power/regulator/act8846.c +++ b/drivers/power/regulator/act8846.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/regulator/anatop_regulator.c b/drivers/power/regulator/anatop_regulator.c index 096a1565d5..5d501bfc7e 100644 --- a/drivers/power/regulator/anatop_regulator.c +++ b/drivers/power/regulator/anatop_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright (C) 2021 Linaro diff --git a/drivers/power/regulator/as3722_regulator.c b/drivers/power/regulator/as3722_regulator.c index ec0776b440..55eb2fcabb 100644 --- a/drivers/power/regulator/as3722_regulator.c +++ b/drivers/power/regulator/as3722_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/regulator/axp_usb_power.c b/drivers/power/regulator/axp_usb_power.c index f32fb6a92d..518bcb7bf3 100644 --- a/drivers/power/regulator/axp_usb_power.c +++ b/drivers/power/regulator/axp_usb_power.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dm/device.h> #include <errno.h> diff --git a/drivers/power/regulator/da9063.c b/drivers/power/regulator/da9063.c index 8df1abcf78..b04bc396c1 100644 --- a/drivers/power/regulator/da9063.c +++ b/drivers/power/regulator/da9063.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Flowbird * Martin Fuzzey <martin.fuzzey(a)flowbird.group> diff --git a/drivers/power/regulator/fan53555.c b/drivers/power/regulator/fan53555.c index fa8d88f2e0..5dbf60c980 100644 --- a/drivers/power/regulator/fan53555.c +++ b/drivers/power/regulator/fan53555.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 590c288d65..277a1054b5 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index 74137b7b87..933d4ac28a 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Texas Instruments Incorporated, <www.ti.com> * Keerthy <j-keerthy(a)ti.com> diff --git a/drivers/power/regulator/lp873x_regulator.c b/drivers/power/regulator/lp873x_regulator.c index c326f8efa4..54f69ba0c0 100644 --- a/drivers/power/regulator/lp873x_regulator.c +++ b/drivers/power/regulator/lp873x_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/power/regulator/lp87565_regulator.c b/drivers/power/regulator/lp87565_regulator.c index 6bbc831d2c..011ad8d466 100644 --- a/drivers/power/regulator/lp87565_regulator.c +++ b/drivers/power/regulator/lp87565_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/power/regulator/max77686.c b/drivers/power/regulator/max77686.c index 3a20803993..11f6340ec9 100644 --- a/drivers/power/regulator/max77686.c +++ b/drivers/power/regulator/max77686.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2015 Samsung Electronics * diff --git a/drivers/power/regulator/npcm8xx_regulator.c b/drivers/power/regulator/npcm8xx_regulator.c index fcd1058cdf..3ad05ac90f 100644 --- a/drivers/power/regulator/npcm8xx_regulator.c +++ b/drivers/power/regulator/npcm8xx_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c index 3c4eb83be7..562d766a99 100644 --- a/drivers/power/regulator/palmas_regulator.c +++ b/drivers/power/regulator/palmas_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/power/regulator/pbias_regulator.c b/drivers/power/regulator/pbias_regulator.c index cf4e285844..0a641337e4 100644 --- a/drivers/power/regulator/pbias_regulator.c +++ b/drivers/power/regulator/pbias_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Texas Instruments Incorporated, <www.ti.com> * Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index 1d926689b3..20c765e617 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 NXP * diff --git a/drivers/power/regulator/pwm_regulator.c b/drivers/power/regulator/pwm_regulator.c index ca59f3ae3e..f3ab468633 100644 --- a/drivers/power/regulator/pwm_regulator.c +++ b/drivers/power/regulator/pwm_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Rockchip Electronics Co., Ltd * diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 77d101f262..4a02409cf5 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 0116fa01bb..02a05cdcc2 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Disruptive Technologies Research AS * Sven Schwermer <sven.svenschwermer(a)disruptive-technologies.com> diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index d4962899d8..284acfbbe9 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Disruptive Technologies Research AS * Sven Schwermer <sven.svenschwermer(a)disruptive-technologies.com> diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index e80bd6c372..63dc183ec2 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/power/regulator/s5m8767.c b/drivers/power/regulator/s5m8767.c index 23575831f3..26c34e47c8 100644 --- a/drivers/power/regulator/s5m8767.c +++ b/drivers/power/regulator/s5m8767.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/drivers/power/regulator/sandbox.c b/drivers/power/regulator/sandbox.c index 71ef0c5441..07444cef92 100644 --- a/drivers/power/regulator/sandbox.c +++ b/drivers/power/regulator/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/drivers/power/regulator/scmi_regulator.c b/drivers/power/regulator/scmi_regulator.c index 9c72c35d03..198b71fba6 100644 --- a/drivers/power/regulator/scmi_regulator.c +++ b/drivers/power/regulator/scmi_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020-2022 Linaro Limited */ diff --git a/drivers/power/regulator/stm32-vrefbuf.c b/drivers/power/regulator/stm32-vrefbuf.c index c37998a4ba..6264f400c9 100644 --- a/drivers/power/regulator/stm32-vrefbuf.c +++ b/drivers/power/regulator/stm32-vrefbuf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author: Fabrice Gasnier <fabrice.gasnier(a)st.com> diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c index 4839d83431..916883a8d7 100644 --- a/drivers/power/regulator/stpmic1.c +++ b/drivers/power/regulator/stpmic1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author: Christophe Kerello <christophe.kerello(a)st.com> diff --git a/drivers/power/regulator/tps62360_regulator.c b/drivers/power/regulator/tps62360_regulator.c index b9f4504539..6bee64ea17 100644 --- a/drivers/power/regulator/tps62360_regulator.c +++ b/drivers/power/regulator/tps62360_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * Tero Kristo <t-kristo(a)ti.com> diff --git a/drivers/power/regulator/tps65090_regulator.c b/drivers/power/regulator/tps65090_regulator.c index fa15e61a10..64b2ea2d11 100644 --- a/drivers/power/regulator/tps65090_regulator.c +++ b/drivers/power/regulator/tps65090_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/power/regulator/tps65219_regulator.c b/drivers/power/regulator/tps65219_regulator.c index f87d07e61f..9a04d491b3 100644 --- a/drivers/power/regulator/tps65219_regulator.c +++ b/drivers/power/regulator/tps65219_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/power/regulator/tps65910_regulator.c b/drivers/power/regulator/tps65910_regulator.c index a4b9d44927..7ffd0ae769 100644 --- a/drivers/power/regulator/tps65910_regulator.c +++ b/drivers/power/regulator/tps65910_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) EETS GmbH, 2017, Felix Brack <f.brack(a)eets.ch> */ diff --git a/drivers/power/regulator/tps65941_regulator.c b/drivers/power/regulator/tps65941_regulator.c index b041126775..268553709b 100644 --- a/drivers/power/regulator/tps65941_regulator.c +++ b/drivers/power/regulator/tps65941_regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Texas Instruments Incorporated, <www.ti.com> diff --git a/drivers/power/sy8106a.c b/drivers/power/sy8106a.c index 45f4793986..a81e1f5723 100644 --- a/drivers/power/sy8106a.c +++ b/drivers/power/sy8106a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Jelle van der Waa <jelle(a)vdwaa.nl> diff --git a/drivers/power/tps6586x.c b/drivers/power/tps6586x.c index 37f1c459a6..4cd70008ce 100644 --- a/drivers/power/tps6586x.c +++ b/drivers/power/tps6586x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com> diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c index 0c7c396090..a1022debb2 100644 --- a/drivers/power/twl4030.c +++ b/drivers/power/twl4030.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix at windriver.com> diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index 39c05f9b7d..4bdd6b0918 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index e4d10c8dc3..8b5d4bee79 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/pwm/cros_ec_pwm.c b/drivers/pwm/cros_ec_pwm.c index 4a39c319aa..dd3aaef998 100644 --- a/drivers/pwm/cros_ec_pwm.c +++ b/drivers/pwm/cros_ec_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cros_ec.h> diff --git a/drivers/pwm/exynos_pwm.c b/drivers/pwm/exynos_pwm.c index 609025d680..2313664abc 100644 --- a/drivers/pwm/exynos_pwm.c +++ b/drivers/pwm/exynos_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Google Inc. */ diff --git a/drivers/pwm/pwm-aspeed.c b/drivers/pwm/pwm-aspeed.c index ba98641c86..e30704166c 100644 --- a/drivers/pwm/pwm-aspeed.c +++ b/drivers/pwm/pwm-aspeed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Aspeed Technology Inc. * diff --git a/drivers/pwm/pwm-at91.c b/drivers/pwm/pwm-at91.c index 95597aee55..5f5c24aa94 100644 --- a/drivers/pwm/pwm-at91.c +++ b/drivers/pwm/pwm-at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PWM support for Microchip AT91 architectures. * diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c index 8fbb40cc27..2e0f682cf9 100644 --- a/drivers/pwm/pwm-imx.c +++ b/drivers/pwm/pwm-imx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/drivers/pwm/pwm-mtk.c b/drivers/pwm/pwm-mtk.c index 11e7444019..4ba7876690 100644 --- a/drivers/pwm/pwm-mtk.c +++ b/drivers/pwm/pwm-mtk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 MediaTek Inc. All Rights Reserved. * diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c index b9813a3b6b..a37a5eee3c 100644 --- a/drivers/pwm/pwm-sifive.c +++ b/drivers/pwm/pwm-sifive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 SiFive, Inc * For SiFive's PWM IP block documentation please refer Chapter 14 of diff --git a/drivers/pwm/pwm-ti-ehrpwm.c b/drivers/pwm/pwm-ti-ehrpwm.c index f09914519b..3ec9ebab92 100644 --- a/drivers/pwm/pwm-ti-ehrpwm.c +++ b/drivers/pwm/pwm-ti-ehrpwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EHRPWM PWM driver * diff --git a/drivers/pwm/pwm-uclass.c b/drivers/pwm/pwm-uclass.c index 648d0757ba..649749b2b3 100644 --- a/drivers/pwm/pwm-uclass.c +++ b/drivers/pwm/pwm-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pwm/rk_pwm.c b/drivers/pwm/rk_pwm.c index 1858d59733..ab2942dc50 100644 --- a/drivers/pwm/rk_pwm.c +++ b/drivers/pwm/rk_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c index 4df15f0a2e..bc27a797bc 100644 --- a/drivers/pwm/sandbox_pwm.c +++ b/drivers/pwm/sandbox_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/pwm/sunxi_pwm.c b/drivers/pwm/sunxi_pwm.c index bb1bec05ec..cd08137f55 100644 --- a/drivers/pwm/sunxi_pwm.c +++ b/drivers/pwm/sunxi_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017-2018 Vasily Khoruzhick <anarsoul(a)gmail.com> */ diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c index 8703470606..8996fd8c62 100644 --- a/drivers/pwm/tegra_pwm.c +++ b/drivers/pwm/tegra_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Google Inc. */ diff --git a/drivers/qe/Makefile b/drivers/qe/Makefile index 12d0b459fb..df74d56fc9 100644 --- a/drivers/qe/Makefile +++ b/drivers/qe/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2006 Freescale Semiconductor, Inc. diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c index 6195c7c444..427a78d9bb 100644 --- a/drivers/qe/fdt.c +++ b/drivers/qe/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2008 Freescale Semiconductor, Inc. * diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 2825dc6f9a..f9b116fa98 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. * diff --git a/drivers/ram/Makefile b/drivers/ram/Makefile index 6eb1a24135..c692452789 100644 --- a/drivers/ram/Makefile +++ b/drivers/ram/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/ram/aspeed/Makefile b/drivers/ram/aspeed/Makefile index 7ac10af1c2..d751836784 100644 --- a/drivers/ram/aspeed/Makefile +++ b/drivers/ram/aspeed/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_ASPEED_AST2500) += sdram_ast2500.o obj-$(CONFIG_ASPEED_AST2600) += sdram_ast2600.o diff --git a/drivers/ram/bmips_ram.c b/drivers/ram/bmips_ram.c index 98045248ec..c29f653673 100644 --- a/drivers/ram/bmips_ram.c +++ b/drivers/ram/bmips_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c index 6a15242c20..fef4240e2f 100644 --- a/drivers/ram/imxrt_sdram.c +++ b/drivers/ram/imxrt_sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c index 4a8a6a90bf..05e86a49e1 100644 --- a/drivers/ram/k3-am654-ddrss.c +++ b/drivers/ram/k3-am654-ddrss.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' AM654 DDRSS driver * diff --git a/drivers/ram/k3-am654-ddrss.h b/drivers/ram/k3-am654-ddrss.h index c87f186291..060a58fd4a 100644 --- a/drivers/ram/k3-am654-ddrss.h +++ b/drivers/ram/k3-am654-ddrss.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * AM654: DDRSS Register definitions and structures. * diff --git a/drivers/ram/k3-ddrss/Makefile b/drivers/ram/k3-ddrss/Makefile index ba5d9a2f4d..7eee3c5330 100644 --- a/drivers/ram/k3-ddrss/Makefile +++ b/drivers/ram/k3-ddrss/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019-2022 Texas Instruments Incorporated - http://www.ti.com/ # diff --git a/drivers/ram/k3-ddrss/k3-ddrss.c b/drivers/ram/k3-ddrss/k3-ddrss.c index 5b6089e852..b7afa10376 100644 --- a/drivers/ram/k3-ddrss/k3-ddrss.c +++ b/drivers/ram/k3-ddrss/k3-ddrss.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 DDRSS driver * diff --git a/drivers/ram/mpc83xx_sdram.c b/drivers/ram/mpc83xx_sdram.c index 11676d4fae..b77d6ab933 100644 --- a/drivers/ram/mpc83xx_sdram.c +++ b/drivers/ram/mpc83xx_sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/ram/ram-uclass.c b/drivers/ram/ram-uclass.c index 4e21240fd4..ab3ceda9fb 100644 --- a/drivers/ram/ram-uclass.c +++ b/drivers/ram/ram-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/ram/renesas/Makefile b/drivers/ram/renesas/Makefile index 705cc4b6fa..20815248b6 100644 --- a/drivers/ram/renesas/Makefile +++ b/drivers/ram/renesas/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_RZN1) += rzn1/ diff --git a/drivers/ram/renesas/rzn1/Makefile b/drivers/ram/renesas/rzn1/Makefile index 357c2a506e..64dbd62548 100644 --- a/drivers/ram/renesas/rzn1/Makefile +++ b/drivers/ram/renesas/rzn1/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += ddr_async.o diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 36dc0500da..01f74e175c 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH # diff --git a/drivers/ram/rockchip/sdram_rk3066.c b/drivers/ram/rockchip/sdram_rk3066.c index 39c0be56a6..d6c9b955ce 100644 --- a/drivers/ram/rockchip/sdram_rk3066.c +++ b/drivers/ram/rockchip/sdram_rk3066.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/ram/rockchip/sdram_rk3128.c b/drivers/ram/rockchip/sdram_rk3128.c index ded6539380..0dc39ee30b 100644 --- a/drivers/ram/rockchip/sdram_rk3128.c +++ b/drivers/ram/rockchip/sdram_rk3128.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c index ad9f936df5..f8c8bdde85 100644 --- a/drivers/ram/rockchip/sdram_rk3188.c +++ b/drivers/ram/rockchip/sdram_rk3188.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index 892766a8b4..916b16631a 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c index c99118fd61..8fbe88faf0 100644 --- a/drivers/ram/rockchip/sdram_rk3288.c +++ b/drivers/ram/rockchip/sdram_rk3288.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c index 10828e8082..8ff99735dd 100644 --- a/drivers/ram/rockchip/sdram_rk3308.c +++ b/drivers/ram/rockchip/sdram_rk3308.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd. */ diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c index b5ca8ca436..a47bedb8b1 100644 --- a/drivers/ram/rockchip/sdram_rk3328.c +++ b/drivers/ram/rockchip/sdram_rk3328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd. */ diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 2bf8d48d25..df7fae04b5 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2016-2017 Rockchip Inc. * diff --git a/drivers/ram/rockchip/sdram_rk3568.c b/drivers/ram/rockchip/sdram_rk3568.c index f661615c1b..731cdb7617 100644 --- a/drivers/ram/rockchip/sdram_rk3568.c +++ b/drivers/ram/rockchip/sdram_rk3568.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd. */ diff --git a/drivers/ram/rockchip/sdram_rk3588.c b/drivers/ram/rockchip/sdram_rk3588.c index cf56e2a941..eb7b8fcf6c 100644 --- a/drivers/ram/rockchip/sdram_rk3588.c +++ b/drivers/ram/rockchip/sdram_rk3588.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd. */ diff --git a/drivers/ram/sandbox_ram.c b/drivers/ram/sandbox_ram.c index 910dce623e..e619c17124 100644 --- a/drivers/ram/sandbox_ram.c +++ b/drivers/ram/sandbox_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/ram/sifive/Makefile b/drivers/ram/sifive/Makefile index 4ef89f85bb..9cd3cbc0cb 100644 --- a/drivers/ram/sifive/Makefile +++ b/drivers/ram/sifive/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2020 SiFive, Inc # diff --git a/drivers/ram/sifive/sifive_ddr.c b/drivers/ram/sifive/sifive_ddr.c index 4bd69a62be..f595dd0a34 100644 --- a/drivers/ram/sifive/sifive_ddr.c +++ b/drivers/ram/sifive/sifive_ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * (C) Copyright 2020-2021 SiFive, Inc. * diff --git a/drivers/ram/starfive/Makefile b/drivers/ram/starfive/Makefile index 1df42c377b..645c962b70 100644 --- a/drivers/ram/starfive/Makefile +++ b/drivers/ram/starfive/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022 StarFive, Inc # diff --git a/drivers/ram/starfive/ddrcsr_boot.c b/drivers/ram/starfive/ddrcsr_boot.c index f2dd55f74a..24b13aa99f 100644 --- a/drivers/ram/starfive/ddrcsr_boot.c +++ b/drivers/ram/starfive/ddrcsr_boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/starfive/ddrphy_start.c b/drivers/ram/starfive/ddrphy_start.c index 479b6ef104..a35e86ca6a 100644 --- a/drivers/ram/starfive/ddrphy_start.c +++ b/drivers/ram/starfive/ddrphy_start.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/starfive/ddrphy_train.c b/drivers/ram/starfive/ddrphy_train.c index 0740f49be5..d5a085f9a7 100644 --- a/drivers/ram/starfive/ddrphy_train.c +++ b/drivers/ram/starfive/ddrphy_train.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/starfive/ddrphy_utils.c b/drivers/ram/starfive/ddrphy_utils.c index 1c9fe0a784..163270086c 100644 --- a/drivers/ram/starfive/ddrphy_utils.c +++ b/drivers/ram/starfive/ddrphy_utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/starfive/starfive_ddr.c b/drivers/ram/starfive/starfive_ddr.c index a0a3d6b33d..5c198cd030 100644 --- a/drivers/ram/starfive/starfive_ddr.c +++ b/drivers/ram/starfive/starfive_ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/starfive/starfive_ddr.h b/drivers/ram/starfive/starfive_ddr.h index d0ec1c1da8..43e02e774d 100644 --- a/drivers/ram/starfive/starfive_ddr.h +++ b/drivers/ram/starfive/starfive_ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index 891f413781..4e43493d0b 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/ram/stm32mp1/Makefile b/drivers/ram/stm32mp1/Makefile index 71ded6bed4..708f753cd7 100644 --- a/drivers/ram/stm32mp1/Makefile +++ b/drivers/ram/stm32mp1/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c index 8ee4e24f39..a379643a60 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr.c +++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h index 861efff92b..6f77664742 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr.h +++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h index 42be1ba57c..0dcbbe191e 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h +++ b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_interactive.c b/drivers/ram/stm32mp1/stm32mp1_interactive.c index 2c19847c66..1abdda3a87 100644 --- a/drivers/ram/stm32mp1/stm32mp1_interactive.c +++ b/drivers/ram/stm32mp1/stm32mp1_interactive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c index a82b1db759..f51b0542e9 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ram.c +++ b/drivers/ram/stm32mp1/stm32mp1_ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.c b/drivers/ram/stm32mp1/stm32mp1_tests.c index c5f3354414..c28e02030b 100644 --- a/drivers/ram/stm32mp1/stm32mp1_tests.c +++ b/drivers/ram/stm32mp1/stm32mp1_tests.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/ram/stm32mp1/stm32mp1_tests.h b/drivers/ram/stm32mp1/stm32mp1_tests.h index 8436780790..b4c0556bde 100644 --- a/drivers/ram/stm32mp1/stm32mp1_tests.h +++ b/drivers/ram/stm32mp1/stm32mp1_tests.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/reboot-mode/Kconfig b/drivers/reboot-mode/Kconfig index d57baacc93..25fb5416b8 100644 --- a/drivers/reboot-mode/Kconfig +++ b/drivers/reboot-mode/Kconfig @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c), Vaisala Oyj # diff --git a/drivers/reboot-mode/Makefile b/drivers/reboot-mode/Makefile index 48c8ab7fe7..e4925d8d7c 100644 --- a/drivers/reboot-mode/Makefile +++ b/drivers/reboot-mode/Makefile @@ -1,5 +1,5 @@ # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c), Vaisala Oyj # diff --git a/drivers/reboot-mode/reboot-mode-gpio.c b/drivers/reboot-mode/reboot-mode-gpio.c index 305174736e..93b9c4032d 100644 --- a/drivers/reboot-mode/reboot-mode-gpio.c +++ b/drivers/reboot-mode/reboot-mode-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c), Vaisala Oyj */ diff --git a/drivers/reboot-mode/reboot-mode-nvmem.c b/drivers/reboot-mode/reboot-mode-nvmem.c index da41ca41d9..b36e00ba2b 100644 --- a/drivers/reboot-mode/reboot-mode-nvmem.c +++ b/drivers/reboot-mode/reboot-mode-nvmem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/drivers/reboot-mode/reboot-mode-rtc.c b/drivers/reboot-mode/reboot-mode-rtc.c index 972d0cdbcb..f38798f525 100644 --- a/drivers/reboot-mode/reboot-mode-rtc.c +++ b/drivers/reboot-mode/reboot-mode-rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c), Vaisala Oyj */ diff --git a/drivers/reboot-mode/reboot-mode-uclass.c b/drivers/reboot-mode/reboot-mode-uclass.c index 2b38aa26b8..7727e53907 100644 --- a/drivers/reboot-mode/reboot-mode-uclass.c +++ b/drivers/reboot-mode/reboot-mode-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c), Vaisala Oyj */ diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 27e4a60ff5..8a82d59d22 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 # Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index fbe9c172bc..d368ee13b7 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 # Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/remoteproc/k3_system_controller.c b/drivers/remoteproc/k3_system_controller.c index e2affe69c6..754b2b614c 100644 --- a/drivers/remoteproc/k3_system_controller.c +++ b/drivers/remoteproc/k3_system_controller.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 System Controller Driver * diff --git a/drivers/remoteproc/rproc-elf-loader.c b/drivers/remoteproc/rproc-elf-loader.c index 5e070e5076..1b32ccb133 100644 --- a/drivers/remoteproc/rproc-elf-loader.c +++ b/drivers/remoteproc/rproc-elf-loader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c index ece534c3c0..f6ee9da4eb 100644 --- a/drivers/remoteproc/rproc-uclass.c +++ b/drivers/remoteproc/rproc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c index d360cf3169..8a99d16ea0 100644 --- a/drivers/remoteproc/sandbox_testproc.c +++ b/drivers/remoteproc/sandbox_testproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/remoteproc/stm32_copro.c b/drivers/remoteproc/stm32_copro.c index 3e322c4d71..f5b4171cc7 100644 --- a/drivers/remoteproc/stm32_copro.c +++ b/drivers/remoteproc/stm32_copro.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c index 99f11000df..7bdbb46f47 100644 --- a/drivers/remoteproc/ti_k3_arm64_rproc.c +++ b/drivers/remoteproc/ti_k3_arm64_rproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 ARM64 Remoteproc driver * diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c index 1a2e9dd1f5..63b13cbc6a 100644 --- a/drivers/remoteproc/ti_k3_dsp_rproc.c +++ b/drivers/remoteproc/ti_k3_dsp_rproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 DSP Remoteproc driver * diff --git a/drivers/remoteproc/ti_k3_r5f_rproc.c b/drivers/remoteproc/ti_k3_r5f_rproc.c index 6f3e12d915..0af40ffdcf 100644 --- a/drivers/remoteproc/ti_k3_r5f_rproc.c +++ b/drivers/remoteproc/ti_k3_r5f_rproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 R5 Remoteproc driver * diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c index 6887a3c854..25d8d82225 100644 --- a/drivers/remoteproc/ti_power_proc.c +++ b/drivers/remoteproc/ti_power_proc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015-2016 * Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/reset/reset-at91.c b/drivers/reset/reset-at91.c index 165c87acdc..7b09302390 100644 --- a/drivers/reset/reset-at91.c +++ b/drivers/reset/reset-at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Support for Atmel/Microchip Reset Controller. * diff --git a/drivers/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c index 5383f59ca3..5b2ae4c810 100644 --- a/drivers/reset/reset-bcm6345.c +++ b/drivers/reset/reset-bcm6345.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c index 74b1173e88..81f3b94e6e 100644 --- a/drivers/reset/reset-hsdk.c +++ b/drivers/reset/reset-hsdk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * HSDK SoC Reset Controller driver * diff --git a/drivers/reset/reset-jh7110.c b/drivers/reset/reset-jh7110.c index d6bdf6bb00..eb9b0ee8db 100644 --- a/drivers/reset/reset-jh7110.c +++ b/drivers/reset/reset-jh7110.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang <yanhong.wang(a)starfivetech.com> diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c index b76711f0a8..09e0ce0921 100644 --- a/drivers/reset/reset-scmi.c +++ b/drivers/reset/reset-scmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019-2022 Linaro Limited */ diff --git a/drivers/reset/reset-sifive.c b/drivers/reset/reset-sifive.c index 23513b2f54..658eeec75e 100644 --- a/drivers/reset/reset-sifive.c +++ b/drivers/reset/reset-sifive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sifive, Inc. * Author: Sagar Kadam <sagar.kadam(a)sifive.com> diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 6e3f03e248..1fcf215325 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Socfpga Reset Controller Driver * diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c index e484d1fff4..8b2cba5c45 100644 --- a/drivers/reset/reset-sunxi.c +++ b/drivers/reset/reset-sunxi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c index f35332767b..1626aa81da 100644 --- a/drivers/reset/reset-ti-sci.c +++ b/drivers/reset/reset-ti-sci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments System Control Interface (TI SCI) reset driver * diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index 35e3ccebd7..72e20f2a68 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c index 5305270fbf..25257ab946 100644 --- a/drivers/reset/sti-reset.c +++ b/drivers/reset/sti-reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c index 0bbde29810..9b6a349c06 100644 --- a/drivers/reset/stm32-reset.c +++ b/drivers/reset/stm32-reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile index 47b323e61e..95877cf047 100644 --- a/drivers/rng/Makefile +++ b/drivers/rng/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019, Linaro Limited # diff --git a/drivers/rng/msm_rng.c b/drivers/rng/msm_rng.c index 29e7354ece..90abad23b7 100644 --- a/drivers/rng/msm_rng.c +++ b/drivers/rng/msm_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * PRNG driver for Qualcomm IPQ40xx * diff --git a/drivers/rng/npcm_rng.c b/drivers/rng/npcm_rng.c index 70c1c032b6..fdb43f18e1 100644 --- a/drivers/rng/npcm_rng.c +++ b/drivers/rng/npcm_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c index 53108e1b31..04d77f40a1 100644 --- a/drivers/rng/rng-uclass.c +++ b/drivers/rng/rng-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Linaro Limited */ diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 308fab8da9..19f0cfa776 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c index d0fe5dd7a8..264203f0d3 100644 --- a/drivers/rtc/armada38x.c +++ b/drivers/rtc/armada38x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RTC driver for the Armada 38x Marvell SoCs * diff --git a/drivers/rtc/davinci.c b/drivers/rtc/davinci.c index c7ce41bbf5..09eb330e07 100644 --- a/drivers/rtc/davinci.c +++ b/drivers/rtc/davinci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 DENX Software Engineering GmbH * Heiko Schocher <hs(a)denx.de> diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c index 0e9d3d24dd..1b5a65f33c 100644 --- a/drivers/rtc/ds1307.c +++ b/drivers/rtc/ds1307.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001, 2002, 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/rtc/ds1337.c b/drivers/rtc/ds1337.c index 2c780ab8ed..c1367a7e1d 100644 --- a/drivers/rtc/ds1337.c +++ b/drivers/rtc/ds1337.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001-2008 * Copyright 2020 NXP diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c index 89442f9386..f6958250c7 100644 --- a/drivers/rtc/ds1374.c +++ b/drivers/rtc/ds1374.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001, 2002, 2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/rtc/ds3231.c b/drivers/rtc/ds3231.c index bd32ed2dbf..55970e9e44 100644 --- a/drivers/rtc/ds3231.c +++ b/drivers/rtc/ds3231.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006 * Markus Klotzbuecher, mk(a)denx.de diff --git a/drivers/rtc/ds3232.c b/drivers/rtc/ds3232.c index 16501cfe5d..0343ee8565 100644 --- a/drivers/rtc/ds3232.c +++ b/drivers/rtc/ds3232.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019, Vaisala Oyj */ diff --git a/drivers/rtc/emul_rtc.c b/drivers/rtc/emul_rtc.c index 6f47d82522..17cc56ffb0 100644 --- a/drivers/rtc/emul_rtc.c +++ b/drivers/rtc/emul_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/drivers/rtc/ht1380.c b/drivers/rtc/ht1380.c index 85fcee3e71..238404369b 100644 --- a/drivers/rtc/ht1380.c +++ b/drivers/rtc/ht1380.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Holtek HT1380/HT1381 Serial Timekeeper Chip * diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c index c307d6036d..97ce22531a 100644 --- a/drivers/rtc/i2c_rtc_emul.c +++ b/drivers/rtc/i2c_rtc_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simulate an I2C real time clock * diff --git a/drivers/rtc/isl1208.c b/drivers/rtc/isl1208.c index 59a60b75b3..a7c7ddecb1 100644 --- a/drivers/rtc/isl1208.c +++ b/drivers/rtc/isl1208.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Tor Krill, Excito Elektronik i Skåne , tor(a)excito.com diff --git a/drivers/rtc/m41t62.c b/drivers/rtc/m41t62.c index 891fe09d31..d2d4716922 100644 --- a/drivers/rtc/m41t62.c +++ b/drivers/rtc/m41t62.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de. diff --git a/drivers/rtc/mc13xxx-rtc.c b/drivers/rtc/mc13xxx-rtc.c index 6c2aef8975..f63d0c2ff9 100644 --- a/drivers/rtc/mc13xxx-rtc.c +++ b/drivers/rtc/mc13xxx-rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008, Guennadi Liakhovetski <lg(a)denx.de> */ diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c index 03ce081d57..23ef36e09e 100644 --- a/drivers/rtc/mc146818.c +++ b/drivers/rtc/mc146818.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter MPL AG Switzerland. d.peter(a)mpl.ch diff --git a/drivers/rtc/mcfrtc.c b/drivers/rtc/mcfrtc.c index d2ac889c30..5b16c5645a 100644 --- a/drivers/rtc/mcfrtc.c +++ b/drivers/rtc/mcfrtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew(a)freescale.com) diff --git a/drivers/rtc/mvrtc.c b/drivers/rtc/mvrtc.c index 50240d57fa..4da1061c72 100644 --- a/drivers/rtc/mvrtc.c +++ b/drivers/rtc/mvrtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 * Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/drivers/rtc/mvrtc.h b/drivers/rtc/mvrtc.h index 87ff43299c..6c90cbab13 100644 --- a/drivers/rtc/mvrtc.h +++ b/drivers/rtc/mvrtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c index be899a9254..3bfd82a837 100644 --- a/drivers/rtc/mxsrtc.c +++ b/drivers/rtc/mxsrtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 RTC Driver * diff --git a/drivers/rtc/pcf8563.c b/drivers/rtc/pcf8563.c index 91a412440b..625a15f827 100644 --- a/drivers/rtc/pcf8563.c +++ b/drivers/rtc/pcf8563.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index a1d376611d..b4a30c7956 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 * Gururaja Hebbar gururajakr(a)sanyo.co.in diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c index e0a7bd3662..a471950407 100644 --- a/drivers/rtc/pt7c4338.c +++ b/drivers/rtc/pt7c4338.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2010 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/drivers/rtc/rtc-uclass.c b/drivers/rtc/rtc-uclass.c index e5ae6ea4d5..e227019b27 100644 --- a/drivers/rtc/rtc-uclass.c +++ b/drivers/rtc/rtc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/rtc/rv3028.c b/drivers/rtc/rv3028.c index 9f63afc14a..9e390e2b41 100644 --- a/drivers/rtc/rv3028.c +++ b/drivers/rtc/rv3028.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * RTC driver for the Micro Crystal RV3028 * diff --git a/drivers/rtc/rv3029.c b/drivers/rtc/rv3029.c index 3afe5b2fdd..46d81f3197 100644 --- a/drivers/rtc/rv3029.c +++ b/drivers/rtc/rv3029.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Theobroma Systems Design und Consulting GmbH * diff --git a/drivers/rtc/rv8803.c b/drivers/rtc/rv8803.c index 06a4ae89fa..cf5da7b19d 100644 --- a/drivers/rtc/rv8803.c +++ b/drivers/rtc/rv8803.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Date & Time support for Micro Crystal RV-8803-C7. * diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c index 1394c2306a..e15485ab86 100644 --- a/drivers/rtc/rx8025.c +++ b/drivers/rtc/rx8025.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 * Matthias Fuchs, esd gmbh, matthias.fuchs(a)esd-electronics.com. diff --git a/drivers/rtc/sandbox_rtc.c b/drivers/rtc/sandbox_rtc.c index 657e5c7be2..00ea9d45fb 100644 --- a/drivers/rtc/sandbox_rtc.c +++ b/drivers/rtc/sandbox_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/rtc/stm32_rtc.c b/drivers/rtc/stm32_rtc.c index 1753283460..06a3e4754a 100644 --- a/drivers/rtc/stm32_rtc.c +++ b/drivers/rtc/stm32_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index d8d6de5909..abeca6081d 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/scsi/sandbox_scsi.c b/drivers/scsi/sandbox_scsi.c index a7ac33cb1c..d2cea5249c 100644 --- a/drivers/scsi/sandbox_scsi.c +++ b/drivers/scsi/sandbox_scsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/scsi/scsi-uclass.c b/drivers/scsi/scsi-uclass.c index a7c1eaf0cf..8eb9c1aa29 100644 --- a/drivers/scsi/scsi-uclass.c +++ b/drivers/scsi/scsi-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 7411660d46..2c94f75aed 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/drivers/scsi/scsi_bootdev.c b/drivers/scsi/scsi_bootdev.c index 218221fa30..3e4ae5f791 100644 --- a/drivers/scsi/scsi_bootdev.c +++ b/drivers/scsi/scsi_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootdev for SCSI * diff --git a/drivers/scsi/scsi_emul.c b/drivers/scsi/scsi_emul.c index 6b8468f799..1149995f97 100644 --- a/drivers/scsi/scsi_emul.c +++ b/drivers/scsi/scsi_emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Emulation of enough SCSI commands to find and read from a unit * diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 403ab1ded6..b9c3a0717c 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006-2009 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c index 9e39da7dd2..dfda222293 100644 --- a/drivers/serial/altera_jtag_uart.c +++ b/drivers/serial/altera_jtag_uart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c index 3592048084..750fff858e 100644 --- a/drivers/serial/altera_uart.c +++ b/drivers/serial/altera_uart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 9853f49c94..36ec5f460a 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2004-2006 Atmel Corporation * diff --git a/drivers/serial/atmel_usart.h b/drivers/serial/atmel_usart.h index 8f27488158..43b5aa294c 100644 --- a/drivers/serial/atmel_usart.h +++ b/drivers/serial/atmel_usart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Register definitions for the Atmel USART3 module. * diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index f6ac3d2285..13a1a4b095 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 4a2da7a331..3e2081432f 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 The Chromium OS Authors. */ diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 787edd5360..9ba8f272f6 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c index 4f91634976..cea6e71f8e 100644 --- a/drivers/serial/serial_ar933x.c +++ b/drivers/serial/serial_ar933x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 7585f790d2..19660fe964 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Stephen Warren <swarren(a)wwwdotorg.org> * diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 09a9868a38..5e9464f8da 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Alexander Graf <agraf(a)suse.de> */ diff --git a/drivers/serial/serial_bcm6345.c b/drivers/serial/serial_bcm6345.c index 2359656a23..f75354be36 100644 --- a/drivers/serial/serial_bcm6345.c +++ b/drivers/serial/serial_bcm6345.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/serial/serial_coreboot.c b/drivers/serial/serial_coreboot.c index 23066e4d05..1cb4d98b8e 100644 --- a/drivers/serial/serial_coreboot.c +++ b/drivers/serial/serial_coreboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UART support for U-Boot when launched from Coreboot * diff --git a/drivers/serial/serial_cortina.c b/drivers/serial/serial_cortina.c index 6dc81a775d..7f8845bb44 100644 --- a/drivers/serial/serial_cortina.c +++ b/drivers/serial/serial_cortina.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 Cortina-Access Ltd. * Common UART Driver for Cortina Access CAxxxx line of SoCs diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c index 0067576389..73dc52e9fa 100644 --- a/drivers/serial/serial_efi.c +++ b/drivers/serial/serial_efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/serial/serial_htif.c b/drivers/serial/serial_htif.c index 5d2bf0aaeb..6ec2a87002 100644 --- a/drivers/serial/serial_htif.c +++ b/drivers/serial/serial_htif.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Ventana Micro Systems Inc. */ diff --git a/drivers/serial/serial_intel_mid.c b/drivers/serial/serial_intel_mid.c index bbf19057c4..e6b62f734c 100644 --- a/drivers/serial/serial_intel_mid.c +++ b/drivers/serial/serial_intel_mid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/drivers/serial/serial_linflexuart.c b/drivers/serial/serial_linflexuart.c index b449e55a65..15b5376f90 100644 --- a/drivers/serial/serial_linflexuart.c +++ b/drivers/serial/serial_linflexuart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013-2016 Freescale Semiconductor, Inc. */ diff --git a/drivers/serial/serial_lpuart.c b/drivers/serial/serial_lpuart.c index ce08a6b448..0bb72695f4 100644 --- a/drivers/serial/serial_lpuart.c +++ b/drivers/serial/serial_lpuart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP * Copyright 2013 Freescale Semiconductor, Inc. diff --git a/drivers/serial/serial_mcf.c b/drivers/serial/serial_mcf.c index bb2afd0d8c..9e7db24199 100644 --- a/drivers/serial/serial_mcf.c +++ b/drivers/serial/serial_mcf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew, Tsi-Chung.Liew(a)freescale.com. diff --git a/drivers/serial/serial_meson.c b/drivers/serial/serial_meson.c index 934de2ab23..3c5e7a0469 100644 --- a/drivers/serial/serial_meson.c +++ b/drivers/serial/serial_meson.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> */ diff --git a/drivers/serial/serial_mpc8xx.c b/drivers/serial/serial_mpc8xx.c index d82760c7f1..90455b7160 100644 --- a/drivers/serial/serial_mpc8xx.c +++ b/drivers/serial/serial_mpc8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index a22623c316..440d86aaba 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm UART driver * diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c index 78fd9389c0..b08fdee478 100644 --- a/drivers/serial/serial_msm_geni.c +++ b/drivers/serial/serial_msm_geni.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm GENI serial engine UART driver * diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index b2017c6455..2bb95720c4 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> * Copyright (C) 2021 Pali Rohár <pali(a)kernel.org> diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index cc85a50272..556846e6be 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2007 Sascha Hauer <s.hauer(a)pengutronix.de> */ diff --git a/drivers/serial/serial_mxs.c b/drivers/serial/serial_mxs.c index 3659948b87..4c0c7d7fdb 100644 --- a/drivers/serial/serial_mxs.c +++ b/drivers/serial/serial_mxs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Marek Vasut <marex(a)denx.de> */ diff --git a/drivers/serial/serial_npcm.c b/drivers/serial/serial_npcm.c index 76ac7cb80d..90de8d7158 100644 --- a/drivers/serial/serial_npcm.c +++ b/drivers/serial/serial_npcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 4014f68204..0f0baf3533 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Rob Taylor, Flying Pig Systems. robt(a)flyingpig.com. diff --git a/drivers/serial/serial_nulldev.c b/drivers/serial/serial_nulldev.c index f3ca7f5255..b729dc2f95 100644 --- a/drivers/serial/serial_nulldev.c +++ b/drivers/serial/serial_nulldev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 National Instruments */ diff --git a/drivers/serial/serial_octeon_bootcmd.c b/drivers/serial/serial_octeon_bootcmd.c index eff5c43e2a..37cdbfa5d5 100644 --- a/drivers/serial/serial_octeon_bootcmd.c +++ b/drivers/serial/serial_octeon_bootcmd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. * Copyright (C) 2021 Stefan Roese <sr(a)denx.de> diff --git a/drivers/serial/serial_octeon_pcie_console.c b/drivers/serial/serial_octeon_pcie_console.c index b0eafe7ad8..0851da4ef1 100644 --- a/drivers/serial/serial_octeon_pcie_console.c +++ b/drivers/serial/serial_octeon_pcie_console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. * Copyright (C) 2021 Stefan Roese <sr(a)denx.de> diff --git a/drivers/serial/serial_omap.c b/drivers/serial/serial_omap.c index 26310b0b74..57648b09ce 100644 --- a/drivers/serial/serial_omap.c +++ b/drivers/serial/serial_omap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' OMAP serial driver * diff --git a/drivers/serial/serial_owl.c b/drivers/serial/serial_owl.c index 3b795785f7..c795bdbcf3 100644 --- a/drivers/serial/serial_owl.c +++ b/drivers/serial/serial_owl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Actions Semi OWL SoCs UART driver * diff --git a/drivers/serial/serial_pic32.c b/drivers/serial/serial_pic32.c index 3c5d37ce0a..5e7ba8fc62 100644 --- a/drivers/serial/serial_pic32.c +++ b/drivers/serial/serial_pic32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) 2015 Paul Thacker <paul.thacker(a)microchip.com> * diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 428a4d210d..a5661061fa 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Rob Taylor, Flying Pig Systems. robt(a)flyingpig.com. diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index 71c52bb531..9984dd6f92 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003, 2004 * ARM Ltd. diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c index f4e9422ed9..049a77b135 100644 --- a/drivers/serial/serial_rockchip.c +++ b/drivers/serial/serial_rockchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 7aeb8c0f8c..0392a35cc7 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 SAMSUNG Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/drivers/serial/serial_s5p4418_pl011.c b/drivers/serial/serial_s5p4418_pl011.c index e4492e662e..eed79d4363 100644 --- a/drivers/serial/serial_s5p4418_pl011.c +++ b/drivers/serial/serial_s5p4418_pl011.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Stefan Bosch <stefan_b(a)posteo.net> */ diff --git a/drivers/serial/serial_sbi.c b/drivers/serial/serial_sbi.c index a51a96c1ef..c182cc9595 100644 --- a/drivers/serial/serial_sbi.c +++ b/drivers/serial/serial_sbi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <debug_uart.h> #include <asm/sbi.h> diff --git a/drivers/serial/serial_semihosting.c b/drivers/serial/serial_semihosting.c index cfa1ec3148..cd899b377d 100644 --- a/drivers/serial/serial_semihosting.c +++ b/drivers/serial/serial_semihosting.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index c034ab54e1..9d112def49 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SuperH SCIF device driver. * Copyright (C) 2013 Renesas Electronics Corporation diff --git a/drivers/serial/serial_sifive.c b/drivers/serial/serial_sifive.c index c449f3fd02..b93f278bf0 100644 --- a/drivers/serial/serial_sifive.c +++ b/drivers/serial/serial_sifive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Anup Patel <anup(a)brainfault.org> */ diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c index 40381b57b0..0f7d546090 100644 --- a/drivers/serial/serial_sti_asc.c +++ b/drivers/serial/serial_sti_asc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Support for Serial I/O using STMicroelectronics' on-chip ASC. * diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 23d476fba2..e25c8bfacd 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h index b7e7a90b93..4f1da1bad3 100644 --- a/drivers/serial/serial_stm32.h +++ b/drivers/serial/serial_stm32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index 27e4b92c39..4718e47560 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index b6197da97c..13de41f59d 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2015 Michal Simek <monstr(a)monstr.eu> * Clean driver and add xilinx constant from header file diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 1847d1f6ec..10cda59f7f 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Michal Simek <monstr(a)monstr.eu> * Copyright (C) 2011-2012 Xilinx, Inc. All rights reserved. diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index ecb6ba853d..2a0c7f9a86 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h index b176a7961b..50e4f72c28 100644 --- a/drivers/serial/usbtty.h +++ b/drivers/serial/usbtty.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/drivers/sm/meson-sm.c b/drivers/sm/meson-sm.c index 25adaf4560..2beffce39c 100644 --- a/drivers/sm/meson-sm.c +++ b/drivers/sm/meson-sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/drivers/sm/sandbox-sm.c b/drivers/sm/sandbox-sm.c index 109ddb2af5..7ed39205d4 100644 --- a/drivers/sm/sandbox-sm.c +++ b/drivers/sm/sandbox-sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/drivers/sm/sm-uclass.c b/drivers/sm/sm-uclass.c index 6a8b702629..456c561852 100644 --- a/drivers/sm/sm-uclass.c +++ b/drivers/sm/sm-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/drivers/smem/Makefile b/drivers/smem/Makefile index af3e9b5088..74a9d6a195 100644 --- a/drivers/smem/Makefile +++ b/drivers/smem/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for the U-Boot SMEM interface drivers diff --git a/drivers/smem/msm_smem.c b/drivers/smem/msm_smem.c index 17ee6c837c..1f434efae5 100644 --- a/drivers/smem/msm_smem.c +++ b/drivers/smem/msm_smem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015, Sony Mobile Communications AB. * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. diff --git a/drivers/smem/sandbox_smem.c b/drivers/smem/sandbox_smem.c index 7397e4407a..139e49c187 100644 --- a/drivers/smem/sandbox_smem.c +++ b/drivers/smem/sandbox_smem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Ramon Fried <ramon.fried(a)gmail.com> */ diff --git a/drivers/smem/smem-uclass.c b/drivers/smem/smem-uclass.c index 8469076915..358676f8c0 100644 --- a/drivers/smem/smem-uclass.c +++ b/drivers/smem/smem-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Ramon Fried <ramon.fried(a)gmail.com> */ diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 84385650d4..e9671b8007 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for the U-Boot SOC specific device drivers. diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c index dfad32d80d..419645fa8b 100644 --- a/drivers/soc/soc-uclass.c +++ b/drivers/soc/soc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ * Dave Gerlach <d-gerlach(a)ti.com> diff --git a/drivers/soc/soc_sandbox.c b/drivers/soc/soc_sandbox.c index 5c82ad84fc..46fdca5b1b 100644 --- a/drivers/soc/soc_sandbox.c +++ b/drivers/soc/soc_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sandbox driver for the SOC uclass * diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index b720131ae5..fe2fa59b0c 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ * Dave Gerlach <d-gerlach(a)ti.com> diff --git a/drivers/soc/ti/Kconfig b/drivers/soc/ti/Kconfig index 0ee21f9904..cad956866c 100644 --- a/drivers/soc/ti/Kconfig +++ b/drivers/soc/ti/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later menuconfig SOC_TI bool "TI SOC drivers support" diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 34f80aad29..97587c2107 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_TI_K3_NAVSS_RINGACC) += k3-navss-ringacc.o obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o diff --git a/drivers/soc/ti/k3-navss-ringacc-u-boot.c b/drivers/soc/ti/k3-navss-ringacc-u-boot.c index f958239c2a..513bc16aac 100644 --- a/drivers/soc/ti/k3-navss-ringacc-u-boot.c +++ b/drivers/soc/ti/k3-navss-ringacc-u-boot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * U-Boot specific helpers for TI K3 AM65x NAVSS Ring accelerator * Manager (RA) subsystem driver diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index e02889649b..c00f8e07bc 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI K3 AM65x NAVSS Ring accelerator Manager (RA) subsystem driver * diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c index 2ece1a8f64..6ae83d113f 100644 --- a/drivers/soc/ti/keystone_serdes.c +++ b/drivers/soc/ti/keystone_serdes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI serdes driver for keystone2. * diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile index 9b40c8012f..de2792710d 100644 --- a/drivers/sound/Makefile +++ b/drivers/sound/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2012 Samsung Electronics # R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/drivers/sound/broadwell_i2s.c b/drivers/sound/broadwell_i2s.c index 7f754e6567..496ca8741d 100644 --- a/drivers/sound/broadwell_i2s.c +++ b/drivers/sound/broadwell_i2s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Intel Broadwell I2S driver * diff --git a/drivers/sound/broadwell_i2s.h b/drivers/sound/broadwell_i2s.h index ba87abfc6a..b76fdac420 100644 --- a/drivers/sound/broadwell_i2s.h +++ b/drivers/sound/broadwell_i2s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Intel Broadwell I2S driver * diff --git a/drivers/sound/codec-uclass.c b/drivers/sound/codec-uclass.c index 2cb233bd30..fdf5f57e24 100644 --- a/drivers/sound/codec-uclass.c +++ b/drivers/sound/codec-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/da7219.c b/drivers/sound/da7219.c index c1edef4436..8c2eb78aa3 100644 --- a/drivers/sound/da7219.c +++ b/drivers/sound/da7219.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ACPI driver for DA7219 codec * diff --git a/drivers/sound/i2s-uclass.c b/drivers/sound/i2s-uclass.c index fc4f686b51..c14cded6c7 100644 --- a/drivers/sound/i2s-uclass.c +++ b/drivers/sound/i2s-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/i8254_beep.c b/drivers/sound/i8254_beep.c index 5572dc4d26..a023282025 100644 --- a/drivers/sound/i8254_beep.c +++ b/drivers/sound/i8254_beep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC */ diff --git a/drivers/sound/max98088.c b/drivers/sound/max98088.c index c0463b8e8a..14148a2118 100644 --- a/drivers/sound/max98088.c +++ b/drivers/sound/max98088.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * max98088.c -- MAX98088 ALSA SoC Audio driver * diff --git a/drivers/sound/max98088.h b/drivers/sound/max98088.h index b1307a7362..2bd2fb6f33 100644 --- a/drivers/sound/max98088.h +++ b/drivers/sound/max98088.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * max98088.h -- MAX98088 ALSA SoC Audio driver * diff --git a/drivers/sound/max98090.c b/drivers/sound/max98090.c index a798762f1e..d91146b72a 100644 --- a/drivers/sound/max98090.c +++ b/drivers/sound/max98090.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * max98090.c -- MAX98090 ALSA SoC Audio driver * diff --git a/drivers/sound/max98090.h b/drivers/sound/max98090.h index 3a6983b8e2..8fdd4df475 100644 --- a/drivers/sound/max98090.h +++ b/drivers/sound/max98090.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * max98090.h -- MAX98090 ALSA SoC Audio driver * diff --git a/drivers/sound/max98095.c b/drivers/sound/max98095.c index d0f701aaf1..0e0e87d11a 100644 --- a/drivers/sound/max98095.c +++ b/drivers/sound/max98095.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * max98095.c -- MAX98095 ALSA SoC Audio driver * diff --git a/drivers/sound/max98095.h b/drivers/sound/max98095.h index 1521f3f02f..ebc1651969 100644 --- a/drivers/sound/max98095.h +++ b/drivers/sound/max98095.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * max98095.h -- MAX98095 ALSA SoC Audio driver * diff --git a/drivers/sound/rockchip_i2s.c b/drivers/sound/rockchip_i2s.c index 4e9e68aaac..954b32698c 100644 --- a/drivers/sound/rockchip_i2s.c +++ b/drivers/sound/rockchip_i2s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Copyright 2014 Rockchip Electronics Co., Ltd. diff --git a/drivers/sound/rockchip_sound.c b/drivers/sound/rockchip_sound.c index 94058e603d..11801f32b0 100644 --- a/drivers/sound/rockchip_sound.c +++ b/drivers/sound/rockchip_sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google, LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/rt5677.c b/drivers/sound/rt5677.c index b655bb40b6..717861502f 100644 --- a/drivers/sound/rt5677.c +++ b/drivers/sound/rt5677.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC */ diff --git a/drivers/sound/rt5677.h b/drivers/sound/rt5677.h index 1ce3cec722..052580c1a3 100644 --- a/drivers/sound/rt5677.h +++ b/drivers/sound/rt5677.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * rt5677.h -- RealTek ALC5677 ALSA SoC Audio driver * diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c index dc5a2789ae..b1ac363fd9 100644 --- a/drivers/sound/samsung-i2s.c +++ b/drivers/sound/samsung-i2s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/drivers/sound/samsung_sound.c b/drivers/sound/samsung_sound.c index 473cedf7e9..a2b469cc12 100644 --- a/drivers/sound/samsung_sound.c +++ b/drivers/sound/samsung_sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google, LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c index c6cbd81fdb..59174f899f 100644 --- a/drivers/sound/sandbox.c +++ b/drivers/sound/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c index 2ffc4fc7c1..6213b59cce 100644 --- a/drivers/sound/sound-uclass.c +++ b/drivers/sound/sound-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/sound.c b/drivers/sound/sound.c index c0fc50c99d..80b4442998 100644 --- a/drivers/sound/sound.c +++ b/drivers/sound/sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/drivers/sound/tegra_ahub.c b/drivers/sound/tegra_ahub.c index 495a29c513..28f392504d 100644 --- a/drivers/sound/tegra_ahub.c +++ b/drivers/sound/tegra_ahub.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+159 +// SPDX-License-Identifier: GPL-2.0-or-later159 /* * Take from dc tegra_ahub.c * diff --git a/drivers/sound/tegra_i2s.c b/drivers/sound/tegra_i2s.c index 932f737900..3c3c72d56b 100644 --- a/drivers/sound/tegra_i2s.c +++ b/drivers/sound/tegra_i2s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/tegra_i2s_priv.h b/drivers/sound/tegra_i2s_priv.h index 65a3623ad9..f7fd35b4a1 100644 --- a/drivers/sound/tegra_i2s_priv.h +++ b/drivers/sound/tegra_i2s_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/tegra_sound.c b/drivers/sound/tegra_sound.c index aef6a2eb14..248e9b62cf 100644 --- a/drivers/sound/tegra_sound.c +++ b/drivers/sound/tegra_sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google, LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sound/wm8994.c b/drivers/sound/wm8994.c index fd646479b3..bedabab82c 100644 --- a/drivers/sound/wm8994.c +++ b/drivers/sound/wm8994.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/drivers/sound/wm8994.h b/drivers/sound/wm8994.h index e36e6269f0..da1126f947 100644 --- a/drivers/sound/wm8994.h +++ b/drivers/sound/wm8994.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * R. Chadrasekar <rcsekar(a)samsung.com> diff --git a/drivers/sound/wm8994_registers.h b/drivers/sound/wm8994_registers.h index f6f88bc3f6..0f2ba37015 100644 --- a/drivers/sound/wm8994_registers.h +++ b/drivers/sound/wm8994_registers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Samsung Electronics */ diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index c27b3327c3..e0eae30291 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 989679e881..ae17c150b2 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Altera SPI driver * diff --git a/drivers/spi/apple_spi.c b/drivers/spi/apple_spi.c index f35f5af1f6..5ce414514f 100644 --- a/drivers/spi/apple_spi.c +++ b/drivers/spi/apple_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> * Copyright The Asahi Linux Contributors diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index de9c14837c..77cb04924e 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Andestech ATCSPI200 SPI controller driver. * diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 205567ef54..8956fe722f 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index aec6f4eca9..70dab0da2a 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 Atmel Corporation */ diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index a24bb430cb..46b5005486 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index 0600d56c69..9ab85f9d61 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/spi/bcmbca_hsspi.c b/drivers/spi/bcmbca_hsspi.c index fbe315a7d4..10b9ebbd5a 100644 --- a/drivers/spi/bcmbca_hsspi.c +++ b/drivers/spi/bcmbca_hsspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/spi/bcmstb_spi.c b/drivers/spi/bcmstb_spi.c index 503c47a271..50b4053c80 100644 --- a/drivers/spi/bcmstb_spi.c +++ b/drivers/spi/bcmstb_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c index 38bddd3861..e59d089f95 100644 --- a/drivers/spi/ca_sflash.c +++ b/drivers/spi/ca_sflash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for Cortina SPI-FLASH Controller * diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index cc3a54f295..6de860c863 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 * Altera Corporation <www.altera.com> diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h index 1c59d1a9d9..b3205902d7 100644 --- a/drivers/spi/cadence_qspi.h +++ b/drivers/spi/cadence_qspi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 * Altera Corporation <www.altera.com> diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 1a841b5dce..cf5aa4acfd 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * (C) Copyright 2000-2003 diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 9ebc4ed48f..a52ed5f41b 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/ * diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 1bcc3ad318..767b77dcad 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 SAMSUNG Electronics * Padmavathi Venna <padma.v(a)samsung.com> diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index f8ec268812..aa1fbb2a54 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index b1d964d79d..f6ab3023fa 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * eSPI controller driver. * diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 3f97730bad..d11a6798af 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale QuadSPI driver. diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 9142ffd238..6ed6c641c9 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011-12 The Chromium OS Authors. * diff --git a/drivers/spi/ich.h b/drivers/spi/ich.h index 8fd150d44a..a2e00a695a 100644 --- a/drivers/spi/ich.h +++ b/drivers/spi/ich.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/drivers/spi/iproc_qspi.c b/drivers/spi/iproc_qspi.c index b5c274314b..9c5f11cd3e 100644 --- a/drivers/spi/iproc_qspi.c +++ b/drivers/spi/iproc_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020-2021 Broadcom */ diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 2bb7390bbf..63e6d49df6 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c index d99a151406..b1b2ed825e 100644 --- a/drivers/spi/meson_spifc.c +++ b/drivers/spi/meson_spifc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Beniamino Galvani <b.galvani(a)gmail.com> * Copyright (C) 2018 BayLibre, SAS diff --git a/drivers/spi/microchip_coreqspi.c b/drivers/spi/microchip_coreqspi.c index 5fe0c8e123..e33b181239 100644 --- a/drivers/spi/microchip_coreqspi.c +++ b/drivers/spi/microchip_coreqspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c index 5c8d760935..8a09f3fd54 100644 --- a/drivers/spi/mpc8xx_spi.c +++ b/drivers/spi/mpc8xx_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2001 Navin Boppuri / Prashant Patel * <nboppuri(a)trinetcommunication.com>, diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 7d15390c56..7a9ec6b6c5 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2006 Ben Warren, Qstreams Networks Inc. * With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c index 3d00809986..50f491c392 100644 --- a/drivers/spi/mt7621_spi.c +++ b/drivers/spi/mt7621_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> * diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c index 3decb3744d..652bd14d7f 100644 --- a/drivers/spi/mtk_snfi_spi.c +++ b/drivers/spi/mtk_snfi_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 MediaTek Inc. All Rights Reserved. * diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index 52882e8b26..f8a020e427 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marvell International Ltd. * diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index 33360a1832..d7b879a958 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008, Guennadi Liakhovetski <lg(a)denx.de> */ diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 773e26bbed..2059fc9702 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 SPI driver * diff --git a/drivers/spi/npcm_fiu_spi.c b/drivers/spi/npcm_fiu_spi.c index 73c506442a..e93f78a3f9 100644 --- a/drivers/spi/npcm_fiu_spi.c +++ b/drivers/spi/npcm_fiu_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. * NPCM Flash Interface Unit(FIU) SPI master controller driver. diff --git a/drivers/spi/npcm_pspi.c b/drivers/spi/npcm_pspi.c index 37bab70967..63b5bfea71 100644 --- a/drivers/spi/npcm_pspi.c +++ b/drivers/spi/npcm_pspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology. */ diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 5db27f9ae2..a16728131a 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NXP FlexSPI(FSPI) controller driver. * diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index ff7b55f870..5cfd162f72 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Jagan Teki <jteki(a)openedev.com> * Christophe Ricard <christophe.ricard(a)gmail.com> diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index 45f07f083d..4e2a13337f 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Microchip PIC32 SPI controller driver. * diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index e2b49ebd14..b6bfb66aca 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Armando Visconti, STMicroelectronics, armando.visconti(a)st.com. diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 51c37d72eb..de30061067 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RCar Gen3 RPC QSPI driver * diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index 7de943356a..52466af222 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * spi driver for rockchip * diff --git a/drivers/spi/rk_spi.h b/drivers/spi/rk_spi.h index 2e0d1eeb9f..3b9be89687 100644 --- a/drivers/spi/rk_spi.h +++ b/drivers/spi/rk_spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * SPI driver for rockchip * diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bd..ace7bfad00 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 3962031021..4a2ed645e9 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ASPEED FMC/SPI Controller driver * diff --git a/drivers/spi/spi-emul-uclass.c b/drivers/spi/spi-emul-uclass.c index 64bc19c001..b5b9758352 100644 --- a/drivers/spi/spi-emul-uclass.c +++ b/drivers/spi/spi-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c index 77ddb19a9f..1acbd3472b 100644 --- a/drivers/spi/spi-mem-nodm.c +++ b/drivers/spi/spi-mem-nodm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index b7eca58359..3b0148040d 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Exceet Electronics GmbH * Copyright (C) 2018 Bootlin diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 572cef1694..935719e38a 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for Qualcomm QUP SPI controller * FIFO and Block modes supported, no DMA diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index ea372a05f8..254dddbbee 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 SiFive, Inc. * Copyright 2019 Bhargav Shah <bhargavshah1988(a)gmail.com> diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index c56d82d998..6ac3fc941d 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -15,7 +15,7 @@ * Copyright (C) 2014 Maxime Ripard * Maxime Ripard <maxime.ripard(a)free-electrons.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include <common.h> diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c index 553f9687e3..d865496a5f 100644 --- a/drivers/spi/spi-synquacer.c +++ b/drivers/spi/spi-synquacer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * spi-synquacer.c - Socionext Synquacer SPI driver * Copyright 2021 Linaro Ltd. diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index f4795e6867..549ecf5301 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 22910de0dd..806cd47798 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 2ffa201a66..682ed62033 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index 82f6ed783f..8ea699d793 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved * diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 10e38cf839..0e5467cdf6 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2010-2013 NVIDIA Corporation * With help from the mpc8xxx SPI driver diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 5c8c1859cc..2a64244c54 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * NVIDIA Tegra210 QSPI controller driver * diff --git a/drivers/spi/tegra_spi.h b/drivers/spi/tegra_spi.h index ab69ea42e0..911d2eb0c2 100644 --- a/drivers/spi/tegra_spi.h +++ b/drivers/spi/tegra_spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Google, Inc */ diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 99acb10882..f6bcbb6b58 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI QSPI driver * diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index 6402acbf14..6b7ec7c3a0 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * uniphier_spi.c - Socionext UniPhier SPI driver * Copyright 2019 Socionext, Inc. diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index b58a3f632a..f9585a3c47 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx SPI driver * diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index cb52c0f307..a0c327c30d 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Xilinx, Inc. * (C) Copyright 2015 Jagan Teki <jteki(a)openedev.com> diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index b3e0858eb9..1f9217b3a4 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 Xilinx, Inc. * (C) Copyright 2015 Jagan Teki <jteki(a)openedev.com> diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index ec59ef5804..a29165ad82 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Xilinx * diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile index 1b3d57f36a..cb9b29b5a2 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> diff --git a/drivers/spmi/spmi-sandbox.c b/drivers/spmi/spmi-sandbox.c index f6772946bc..7a9358da11 100644 --- a/drivers/spmi/spmi-sandbox.c +++ b/drivers/spmi/spmi-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sample SPMI bus driver * diff --git a/drivers/spmi/spmi-uclass.c b/drivers/spmi/spmi-uclass.c index 9d9f46a37d..9fd7d44753 100644 --- a/drivers/spmi/spmi-uclass.c +++ b/drivers/spmi/spmi-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SPMI bus uclass driver * diff --git a/drivers/sysinfo/Makefile b/drivers/sysinfo/Makefile index 680dde77fe..ff5391da57 100644 --- a/drivers/sysinfo/Makefile +++ b/drivers/sysinfo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 # Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysinfo/gazerbeam.c b/drivers/sysinfo/gazerbeam.c index c1fae6ccf2..7ea1144458 100644 --- a/drivers/sysinfo/gazerbeam.c +++ b/drivers/sysinfo/gazerbeam.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysinfo/gazerbeam.h b/drivers/sysinfo/gazerbeam.h index 6bf3c0098d..81a6b01669 100644 --- a/drivers/sysinfo/gazerbeam.h +++ b/drivers/sysinfo/gazerbeam.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysinfo/gpio.c b/drivers/sysinfo/gpio.c index 82f90303bb..7b0ed00889 100644 --- a/drivers/sysinfo/gpio.c +++ b/drivers/sysinfo/gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/drivers/sysinfo/rcar3.c b/drivers/sysinfo/rcar3.c index 7b127986da..ff2805940e 100644 --- a/drivers/sysinfo/rcar3.c +++ b/drivers/sysinfo/rcar3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Marek Vasut <marek.vasut+renesas(a)gmail.com> */ diff --git a/drivers/sysinfo/sandbox.c b/drivers/sysinfo/sandbox.c index d270a26aa4..a5c8b6b1ef 100644 --- a/drivers/sysinfo/sandbox.c +++ b/drivers/sysinfo/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysinfo/sandbox.h b/drivers/sysinfo/sandbox.h index d9c5804c26..c97abec42a 100644 --- a/drivers/sysinfo/sandbox.h +++ b/drivers/sysinfo/sandbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysinfo/smbios.c b/drivers/sysinfo/smbios.c index 80ebd1921d..8b46526d49 100644 --- a/drivers/sysinfo/smbios.c +++ b/drivers/sysinfo/smbios.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sysinfo/sysinfo-uclass.c b/drivers/sysinfo/sysinfo-uclass.c index 10194d0e14..8ff99c8f7b 100644 --- a/drivers/sysinfo/sysinfo-uclass.c +++ b/drivers/sysinfo/sysinfo-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index 40c876764a..42ac09fdbf 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Cadence Design Systems Inc. diff --git a/drivers/sysreset/poweroff_gpio.c b/drivers/sysreset/poweroff_gpio.c index a5c24fd85b..d0cf05f985 100644 --- a/drivers/sysreset/poweroff_gpio.c +++ b/drivers/sysreset/poweroff_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Toggles a GPIO pin to power down a device * diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c index 81bfd67ad9..dadf57c198 100644 --- a/drivers/sysreset/sysreset-ti-sci.c +++ b/drivers/sysreset/sysreset-ti-sci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments System Control Interface (TI SCI) system reset driver * diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c index 6151b5fe03..60cdb98f57 100644 --- a/drivers/sysreset/sysreset-uclass.c +++ b/drivers/sysreset/sysreset-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index ca48328f7b..c3cd4b1b27 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysreset/sysreset_mpc83xx.h b/drivers/sysreset/sysreset_mpc83xx.h index dc3c05921f..c5814c4152 100644 --- a/drivers/sysreset/sysreset_mpc83xx.h +++ b/drivers/sysreset/sysreset_mpc83xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/sysreset/sysreset_psci.c b/drivers/sysreset/sysreset_psci.c index a8a41528a8..864a09de0f 100644 --- a/drivers/sysreset/sysreset_psci.c +++ b/drivers/sysreset/sysreset_psci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Masahiro Yamada <yamada.masahiro(a)socionext.com> */ diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index f485a13529..bc3146ea67 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/sysreset/sysreset_sbi.c b/drivers/sysreset/sysreset_sbi.c index 5e8090d62b..84bedd6987 100644 --- a/drivers/sysreset/sysreset_sbi.c +++ b/drivers/sysreset/sysreset_sbi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> */ diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c index edd90aab06..1dd7fcefa3 100644 --- a/drivers/sysreset/sysreset_sti.c +++ b/drivers/sysreset/sysreset_sti.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c index e468dac0e9..a62437a4ed 100644 --- a/drivers/sysreset/sysreset_syscon.c +++ b/drivers/sysreset/sysreset_syscon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c index ceada2e47b..befca986bd 100644 --- a/drivers/sysreset/sysreset_watchdog.c +++ b/drivers/sysreset/sysreset_watchdog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 4936fdb76c..65d31b0ae3 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/sysreset/sysreset_xtfpga.c b/drivers/sysreset/sysreset_xtfpga.c index 84fbc79016..66a84e8f96 100644 --- a/drivers/sysreset/sysreset_xtfpga.c +++ b/drivers/sysreset/sysreset_xtfpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Cadence Tensilica xtfpga system reset driver. * diff --git a/drivers/tee/Makefile b/drivers/tee/Makefile index ff844195ae..25256ad7f3 100644 --- a/drivers/tee/Makefile +++ b/drivers/tee/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += tee-uclass.o obj-$(CONFIG_SANDBOX) += sandbox.o diff --git a/drivers/tee/broadcom/Makefile b/drivers/tee/broadcom/Makefile index cb3cef16df..cd6589b4e1 100644 --- a/drivers/tee/broadcom/Makefile +++ b/drivers/tee/broadcom/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += chimp_optee.o diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile index 068c6e7aa1..8f69a317dc 100644 --- a/drivers/tee/optee/Makefile +++ b/drivers/tee/optee/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += core.o obj-y += supplicant.o diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 9a9b697e91..591e277310 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018-2020 Linaro Limited */ diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index 1f07a27ee4..da388fdad6 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Linaro Limited */ diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c index 86219a9bb1..0328e9c1c7 100644 --- a/drivers/tee/sandbox.c +++ b/drivers/tee/sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Linaro Limited */ diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c index 52412a4098..57538dfa05 100644 --- a/drivers/tee/tee-uclass.c +++ b/drivers/tee/tee-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018-2020 Linaro Limited */ diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 8acc7d20cb..d749a9eb78 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Freescale Semiconductor, Inc. # Author: Nitin Garg <nitin.garg(a)freescale.com> diff --git a/drivers/thermal/imx_scu_thermal.c b/drivers/thermal/imx_scu_thermal.c index 3ec131cbc6..f3d4c8cf5f 100644 --- a/drivers/thermal/imx_scu_thermal.c +++ b/drivers/thermal/imx_scu_thermal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 NXP */ diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 2f6343e7a1..65d6d9240c 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Freescale Semiconductor, Inc. * Author: Nitin Garg <nitin.garg(a)freescale.com> diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c index 4721cfbc02..c034501100 100644 --- a/drivers/thermal/imx_tmu.c +++ b/drivers/thermal/imx_tmu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017~2020 NXP * diff --git a/drivers/thermal/thermal-uclass.c b/drivers/thermal/thermal-uclass.c index 700df8af25..831373f314 100644 --- a/drivers/thermal/thermal-uclass.c +++ b/drivers/thermal/thermal-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Freescale Semiconductor, Inc */ diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index b93145e8d4..75f24aead2 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c index 040dc65f48..a82f5b8ca0 100644 --- a/drivers/timer/altera_timer.c +++ b/drivers/timer/altera_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/timer/andes_plmt_timer.c b/drivers/timer/andes_plmt_timer.c index 42dd4b6231..1bcff197f5 100644 --- a/drivers/timer/andes_plmt_timer.c +++ b/drivers/timer/andes_plmt_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Rick Chen <rick(a)andestech.com> * Copyright (C) 2020, Sean Anderson <seanga2(a)gmail.com> diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c index 497f8a0415..cbb9e1eab0 100644 --- a/drivers/timer/arc_timer.c +++ b/drivers/timer/arc_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Synopsys, Inc. All rights reserved. */ diff --git a/drivers/timer/arm_global_timer.c b/drivers/timer/arm_global_timer.c index 2e50d9fbc5..7ea04a85c6 100644 --- a/drivers/timer/arm_global_timer.c +++ b/drivers/timer/arm_global_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/timer/arm_twd_timer.c b/drivers/timer/arm_twd_timer.c index 40ccd16587..ded10c002a 100644 --- a/drivers/timer/arm_twd_timer.c +++ b/drivers/timer/arm_twd_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2022 Weidmüller Interface GmbH & Co. KG * Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c index 78adc96cc5..3412c8510b 100644 --- a/drivers/timer/ast_timer.c +++ b/drivers/timer/ast_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Google Inc. */ diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c index 5cf46f224a..12744cf135 100644 --- a/drivers/timer/atmel_pit_timer.c +++ b/drivers/timer/atmel_pit_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Microchip Corporation * Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/drivers/timer/atmel_tcb_timer.c b/drivers/timer/atmel_tcb_timer.c index 8c17987c7d..91366c4c90 100644 --- a/drivers/timer/atmel_tcb_timer.c +++ b/drivers/timer/atmel_tcb_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Microchip Corporation * diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c index b171232c48..84194d7803 100644 --- a/drivers/timer/dw-apb-timer.c +++ b/drivers/timer/dw-apb-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Designware APB Timer driver * diff --git a/drivers/timer/fttmr010_timer.c b/drivers/timer/fttmr010_timer.c index b6289e6461..5db6038bb4 100644 --- a/drivers/timer/fttmr010_timer.c +++ b/drivers/timer/fttmr010_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang <ratbert(a)faraday-tech.com> diff --git a/drivers/timer/imx-gpt-timer.c b/drivers/timer/imx-gpt-timer.c index 9c3b64ae5b..1ae5930aec 100644 --- a/drivers/timer/imx-gpt-timer.c +++ b/drivers/timer/imx-gpt-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/drivers/timer/mchp-pit64b-timer.c b/drivers/timer/mchp-pit64b-timer.c index c9806d7eee..04b9d6dc8b 100644 --- a/drivers/timer/mchp-pit64b-timer.c +++ b/drivers/timer/mchp-pit64b-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * 64-bit Periodic Interval Timer driver * diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 7814cb6a5d..246f5d0ed2 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/timer/npcm-timer.c b/drivers/timer/npcm-timer.c index 4562a6f231..2e067c243c 100644 --- a/drivers/timer/npcm-timer.c +++ b/drivers/timer/npcm-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/drivers/timer/omap-timer.c b/drivers/timer/omap-timer.c index 9b6d97dae6..b10dd7e063 100644 --- a/drivers/timer/omap-timer.c +++ b/drivers/timer/omap-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TI OMAP timer driver * diff --git a/drivers/timer/orion-timer.c b/drivers/timer/orion-timer.c index 9cab27f2e4..d726cf9c98 100644 --- a/drivers/timer/orion-timer.c +++ b/drivers/timer/orion-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <asm/io.h> #include <common.h> #include <div64.h> diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c index 3ec729d2c4..dad0013655 100644 --- a/drivers/timer/ostm_timer.c +++ b/drivers/timer/ostm_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas RZ/A1 R7S72100 OSTM Timer driver * diff --git a/drivers/timer/riscv_aclint_timer.c b/drivers/timer/riscv_aclint_timer.c index 73fb879128..441b239a41 100644 --- a/drivers/timer/riscv_aclint_timer.c +++ b/drivers/timer/riscv_aclint_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Sean Anderson <seanga2(a)gmail.com> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/timer/riscv_timer.c b/drivers/timer/riscv_timer.c index 169c03dcb5..7d6593453c 100644 --- a/drivers/timer/riscv_timer.c +++ b/drivers/timer/riscv_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Sean Anderson <seanga2(a)gmail.com> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c index e66c49aa6b..28ef466b9e 100644 --- a/drivers/timer/rockchip_timer.c +++ b/drivers/timer/rockchip_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c index 1da7e0c3a7..0376eadc55 100644 --- a/drivers/timer/sandbox_timer.c +++ b/drivers/timer/sandbox_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/drivers/timer/sp804_timer.c b/drivers/timer/sp804_timer.c index 8fd4afb15a..ec564688ed 100644 --- a/drivers/timer/sp804_timer.c +++ b/drivers/timer/sp804_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ARM PrimeCell Dual-Timer Module (SP804) driver * Copyright (C) 2022 Arm Ltd. diff --git a/drivers/timer/starfive-timer.c b/drivers/timer/starfive-timer.c index 816402fdbf..36810cc2ec 100644 --- a/drivers/timer/starfive-timer.c +++ b/drivers/timer/starfive-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 StarFive, Inc. All rights reserved. * Author: Lee Kuan Lim <kuanlim.lee(a)starfivetech.com> diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c index 1213a14ef1..d693e6d5ef 100644 --- a/drivers/timer/stm32_timer.c +++ b/drivers/timer/stm32_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/drivers/timer/tegra-timer.c b/drivers/timer/tegra-timer.c index a867c649c3..04974b21c9 100644 --- a/drivers/timer/tegra-timer.c +++ b/drivers/timer/tegra-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 0c2018bfe3..db511d7791 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index f86a0b8692..b4ea99aa81 100644 --- a/drivers/timer/tsc_timer.c +++ b/drivers/timer/tsc_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/drivers/timer/xilinx-timer.c b/drivers/timer/xilinx-timer.c index 172fd9f929..e6ce8761c8 100644 --- a/drivers/timer/xilinx-timer.c +++ b/drivers/timer/xilinx-timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 Advanced Micro Devices, Inc * Michal Simek <michal.simek(a)amd.com> diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index 9540fd7fe7..9db9dcf121 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. obj-$(CONFIG_$(SPL_TPL_)TPM) += tpm-uclass.o diff --git a/drivers/tpm/sandbox_common.c b/drivers/tpm/sandbox_common.c index 7e0b2502e3..e5a660fc43 100644 --- a/drivers/tpm/sandbox_common.c +++ b/drivers/tpm/sandbox_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common features for sandbox TPM1 and TPM2 implementations * diff --git a/drivers/tpm/sandbox_common.h b/drivers/tpm/sandbox_common.h index f423c50ec5..631bcbe2a2 100644 --- a/drivers/tpm/sandbox_common.h +++ b/drivers/tpm/sandbox_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common features for sandbox TPM1 and TPM2 implementations * diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index b2286f7e7e..2942aa25d9 100644 --- a/drivers/tpm/tpm-uclass.c +++ b/drivers/tpm/tpm-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c index e4004cfcca..e0abd790a3 100644 --- a/drivers/tpm/tpm2_tis_sandbox.c +++ b/drivers/tpm/tpm2_tis_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018, Bootlin * Author: Miquel Raynal <miquel.raynal(a)bootlin.com> diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c index fd2a45d34b..2640143672 100644 --- a/drivers/tpm/tpm_atmel_twi.c +++ b/drivers/tpm/tpm_atmel_twi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Guntermann & Drunck, GmbH * diff --git a/drivers/tpm/tpm_internal.h b/drivers/tpm/tpm_internal.h index 787cc6bf28..8b87aecb69 100644 --- a/drivers/tpm/tpm_internal.h +++ b/drivers/tpm/tpm_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/tpm/tpm_tis_lpc.c b/drivers/tpm/tpm_tis_lpc.c index 13a133d58e..15ac5703d0 100644 --- a/drivers/tpm/tpm_tis_lpc.c +++ b/drivers/tpm/tpm_tis_lpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c index 7350e1c4d5..8398529406 100644 --- a/drivers/tpm/tpm_tis_sandbox.c +++ b/drivers/tpm/tpm_tis_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c index e0eeabb933..e7870410f8 100644 --- a/drivers/tpm/tpm_tis_st33zp24_i2c.c +++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * STMicroelectronics TPM ST33ZP24 I2C UBOOT driver * diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c index f0de8a65b0..0c1ae101d3 100644 --- a/drivers/tpm/tpm_tis_st33zp24_spi.c +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * STMicroelectronics TPM ST33ZP24 SPI UBOOT driver * diff --git a/drivers/ufs/cdns-platform.c b/drivers/ufs/cdns-platform.c index 1e62e252e7..4414f0419f 100644 --- a/drivers/ufs/cdns-platform.c +++ b/drivers/ufs/cdns-platform.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * cdns-platform.c - Platform driver for Cadence UFSHCI device * diff --git a/drivers/ufs/ti-j721e-ufs.c b/drivers/ufs/ti-j721e-ufs.c index d875269760..43f4d1ce27 100644 --- a/drivers/ufs/ti-j721e-ufs.c +++ b/drivers/ufs/ti-j721e-ufs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ */ diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 7c48d57f99..ca7b86050d 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * ufs.c - Universal Flash Subsystem (UFS) driver * diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h index 9daaf03d22..de7f51f725 100644 --- a/drivers/ufs/ufs.h +++ b/drivers/ufs/ufs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __UFS_H #define __UFS_H diff --git a/drivers/ufs/unipro.h b/drivers/ufs/unipro.h index b30b17fa5a..7f762010e5 100644 --- a/drivers/ufs/unipro.h +++ b/drivers/ufs/unipro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _UNIPRO_H_ #define _UNIPRO_H_ diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index 2e9353b76a..ecb4e2c821 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Freescale Semiconductor, Inc. # diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 7137a569d9..f2aee091b2 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Provides code common for host and device side USB. * diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 00b8cd368b..6fd4c057e4 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009, 2011 Freescale Semiconductor, Inc. * diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c index 9eb1d23067..3b6df3af2c 100644 --- a/drivers/usb/common/fsl-errata.c +++ b/drivers/usb/common/fsl-errata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale USB Controller * diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 97b4f7191c..db27509dee 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_USB_DWC3) += dwc3.o diff --git a/drivers/usb/dwc3/dwc3-uniphier.c b/drivers/usb/dwc3/dwc3-uniphier.c index ab85428a70..dc1cf13513 100644 --- a/drivers/usb/dwc3/dwc3-uniphier.c +++ b/drivers/usb/dwc3/dwc3-uniphier.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UniPhier Specific Glue Layer for DWC3 * diff --git a/drivers/usb/dwc3/ti_usb_phy.c b/drivers/usb/dwc3/ti_usb_phy.c index f476810763..675787de3f 100644 --- a/drivers/usb/dwc3/ti_usb_phy.c +++ b/drivers/usb/dwc3/ti_usb_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * ti_usb_phy.c - USB3 and USB3 PHY programming for dwc3 * diff --git a/drivers/usb/emul/Makefile b/drivers/usb/emul/Makefile index bf2d49a532..66f13402ba 100644 --- a/drivers/usb/emul/Makefile +++ b/drivers/usb/emul/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 7c5c1ab3de..4963aaa983 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c index 084cc16cc6..ec1a2968f3 100644 --- a/drivers/usb/emul/sandbox_hub.c +++ b/drivers/usb/emul/sandbox_hub.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/emul/sandbox_keyb.c b/drivers/usb/emul/sandbox_keyb.c index 5ec1e98e4e..01fdd48c38 100644 --- a/drivers/usb/emul/sandbox_keyb.c +++ b/drivers/usb/emul/sandbox_keyb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/emul/usb-emul-uclass.c b/drivers/usb/emul/usb-emul-uclass.c index b31dc950e3..a6d0282000 100644 --- a/drivers/usb/emul/usb-emul-uclass.c +++ b/drivers/usb/emul/usb-emul-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/eth/Makefile b/drivers/usb/eth/Makefile index 2e5d0782e8..c30a36a18e 100644 --- a/drivers/usb/eth/Makefile +++ b/drivers/usb/eth/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 26dd312b7d..ddfb9de528 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 2e737e6066..af244953ed 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Rene Griessl <rgriessl(a)cit-ec.uni-bielefeld.de> * based on the U-Boot Asix driver as well as information diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c index 4effbc5c87..c407a3e9ad 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. */ diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index 1d8267c80b..febf8e0a15 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. */ diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c index 0a283619ae..b070954b3c 100644 --- a/drivers/usb/eth/lan7x.c +++ b/drivers/usb/eth/lan7x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. */ diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h index 9480f4f6d1..5000a1995c 100644 --- a/drivers/usb/eth/lan7x.h +++ b/drivers/usb/eth/lan7x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Microchip Technology Inc. All rights reserved. */ diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index d94204f22d..d34490f46b 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Gerhard Sittig <gsi(a)denx.de> * based on the U-Boot Asix driver as well as information diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index de6586e626..4ce8b0f72e 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Copyright (c) 2011 The Chromium OS Authors. diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c index 2e9af54fd6..dd412fef9f 100644 --- a/drivers/usb/eth/usb_ether.c +++ b/drivers/usb/eth/usb_ether.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 6abcce0d9c..2f18a139e3 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index e573a03477..7b70b5a239 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * from linux: * c94e289f195e: usb: gadget: remove incorrect __init/__exit annotations diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h index e18de0e2f0..6da8a6eb2c 100644 --- a/drivers/usb/gadget/at91_udc.h +++ b/drivers/usb/gadget/at91_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004 by Thomas Rathbone, HP Labs * Copyright (C) 2005 by Ivan Kokshaysky diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 4c420747b0..6f8f750b8f 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for the Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.c] diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/atmel_usba_udc.h index f6cb48c1cf..ae67158906 100644 --- a/drivers/usb/gadget/atmel_usba_udc.h +++ b/drivers/usb/gadget/atmel_usba_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Register definition for Atmel USBA high speed USB device controller * [Original from Linux kernel: drivers/usb/gadget/atmel_usba_udc.h] diff --git a/drivers/usb/gadget/bcm_udc_otg.h b/drivers/usb/gadget/bcm_udc_otg.h index 24cc936c6b..d663f57699 100644 --- a/drivers/usb/gadget/bcm_udc_otg.h +++ b/drivers/usb/gadget/bcm_udc_otg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Broadcom Corporation. */ diff --git a/drivers/usb/gadget/bcm_udc_otg_phy.c b/drivers/usb/gadget/bcm_udc_otg_phy.c index c89cd57c25..8da89ca275 100644 --- a/drivers/usb/gadget/bcm_udc_otg_phy.c +++ b/drivers/usb/gadget/bcm_udc_otg_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Broadcom Corporation. */ diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 2bfacfe59f..3078000639 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen(a)marvell.com> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 04b8541993..2663a32b88 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * composite.c - infrastructure for Composite USB Gadgets * diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index e96782644f..a785b67e36 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * usb/gadget/config.c -- simplify building config descriptors * diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 888f0cfea6..be14b23506 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 27082f5152..82ceffc719 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index 7f8e9564b9..498c5192a7 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * drivers/usb/gadget/dwc2_udc_otg.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers diff --git a/drivers/usb/gadget/dwc2_udc_otg_priv.h b/drivers/usb/gadget/dwc2_udc_otg_priv.h index e72b22ac61..6ff4923c93 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_priv.h +++ b/drivers/usb/gadget/dwc2_udc_otg_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Designware DWC2 on-chip full/high speed USB device controllers * Copyright (C) 2005 for Samsung Electronics diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h index 9ca6f42375..869e93395a 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_regs.h +++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* linux/arch/arm/plat-s3c/include/plat/regs-otg.h * * Copyright (C) 2004 Herbert Poetzl <herbert(a)13thfloor.at> diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 1c34b75351..1d67a0ae43 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c * Designware DWC2 on-chip full/high speed USB OTG 2.0 device controllers diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index c256cc31fb..5d807ae13e 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/drivers/usb/gadget/ep0.h b/drivers/usb/gadget/ep0.h index 976825ab93..ca7684dbe1 100644 --- a/drivers/usb/gadget/ep0.h +++ b/drivers/usb/gadget/ep0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index bb0d2971d0..6d1ecdab0b 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * epautoconf.c -- endpoint autoconfiguration for usb gadget drivers * diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 36618f0bdf..68df9555bc 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ether.c -- Ethernet gadget driver, with CDC and non-CDC options * diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index de42e0189e..ac7a2e17fe 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * USB CDC serial (ACM) function driver * diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c index 44877df4ec..16ce88f1ef 100644 --- a/drivers/usb/gadget/f_dfu.c +++ b/drivers/usb/gadget/f_dfu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * f_dfu.c -- Device Firmware Update USB function * diff --git a/drivers/usb/gadget/f_dfu.h b/drivers/usb/gadget/f_dfu.h index a175e3f134..d934affab6 100644 --- a/drivers/usb/gadget/f_dfu.h +++ b/drivers/usb/gadget/f_dfu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * f_dfu.h -- Device Firmware Update gadget * diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 741775a7bc..4da8dd82a8 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 - 2009 * Windriver, <www.windriver.com> diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1d17331cb0..682ff5ed35 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * f_mass_storage.c -- Mass Storage USB Composite Function * diff --git a/drivers/usb/gadget/f_rockusb.c b/drivers/usb/gadget/f_rockusb.c index 98a7ffa2a7..6b90b8b768 100644 --- a/drivers/usb/gadget/f_rockusb.c +++ b/drivers/usb/gadget/f_rockusb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index ee9384fb37..da19059bd6 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * f_sdp.c -- USB HID Serial Download Protocol * diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 0e7529dcdb..6ba321995e 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * f_thor.c -- USB TIZEN THOR Downloader gadget function * diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h index 8ba3fa21b7..40a8bf5f6d 100644 --- a/drivers/usb/gadget/f_thor.h +++ b/drivers/usb/gadget/f_thor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * f_thor.h - USB TIZEN THOR - internal gadget definitions * diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index afb7b74f30..151d203fa7 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * g_dnl.c -- USB Downloader Gadget * diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c index fa655c98dc..ad17751a91 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <linux/errno.h> diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 5674e8fe49..7931be40fa 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * storage_common.c -- Common definitions for mass storage functionality * diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile index 467c566f6d..3aa365127d 100644 --- a/drivers/usb/gadget/udc/Makefile +++ b/drivers/usb/gadget/udc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # USB peripheral controller drivers diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c index 3e433129ac..bc5bbbd1cf 100644 --- a/drivers/usb/gadget/udc/udc-uclass.c +++ b/drivers/usb/gadget/udc/udc-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 8dad36f936..8d20507ce4 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 637eb2dd06..f2b3860754 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Oleksandr Tymoshenko <gonzo(a)freebsd.org> * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> diff --git a/drivers/usb/host/dwc2.h b/drivers/usb/host/dwc2.h index 6f022e33a1..08791afb8d 100644 --- a/drivers/usb/host/dwc2.h +++ b/drivers/usb/host/dwc2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> */ diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c index 66b3e96b00..ed583b2ccc 100644 --- a/drivers/usb/host/dwc3-of-simple.c +++ b/drivers/usb/host/dwc3-of-simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * dwc3-of-simple.c - OF glue layer for simple integrations * diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 4a3ab61112..0a01b7fa93 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * STiH407 family DWC3 specific Glue layer * diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index fba3595e10..9a0e182ab1 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Atmel Semiconductor <www.atmel.com> diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index c1cdd4b088..71345e01ab 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG EXYNOS USB HOST EHCI Controller * diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 0569dd54ff..bc18ff3116 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009, 2011, 2016 Freescale Semiconductor, Inc. * diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 936e30438d..eed6f5fd5c 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Alexey Brodkin <abrodkin(a)synopsys.com> */ diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 6093c8fb0b..17c3e88136 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index dd0d153500..c76b603a74 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Qualcomm EHCI driver * diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c index c11279867c..65ec01d0e0 100644 --- a/drivers/usb/host/ehci-mx5.c +++ b/drivers/usb/host/ehci-mx5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Daniel Mack <daniel(a)caiaq.de> * Copyright (C) 2010 Freescale Semiconductor, Inc. diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index a9ed5e7a0d..da05ba7f66 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Daniel Mack <daniel(a)caiaq.de> * Copyright (C) 2010 Freescale Semiconductor, Inc. diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index ddf7cc2d00..8e0d70eca2 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 USB Host driver * diff --git a/drivers/usb/host/ehci-npcm.c b/drivers/usb/host/ehci-npcm.c index 357a5614ed..bc482016a2 100644 --- a/drivers/usb/host/ehci-npcm.c +++ b/drivers/usb/host/ehci-npcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 765336a3c4..b1f6ebdbf9 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 Ilya Yanok, Emcraft Systems * (C) Copyright 2004-2008 diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 2cf1625670..17abdadb58 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2009-2015 NVIDIA Corporation diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c index 648e136447..155b47a1b4 100644 --- a/drivers/usb/host/ehci-vf.c +++ b/drivers/usb/host/ehci-vf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Sanchayan Maity <sanchayan.maity(a)toradex.com> * Copyright (C) 2015 Toradex AG diff --git a/drivers/usb/host/ehci-zynq.c b/drivers/usb/host/ehci-zynq.c index f7e458cb15..82609cf810 100644 --- a/drivers/usb/host/ehci-zynq.c +++ b/drivers/usb/host/ehci-zynq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014, Xilinx, Inc * diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 9b955c1bd6..802bba17d4 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2006 * DENX Software Engineering <mk(a)denx.de> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 33c4a911a0..30bc5419c0 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Sughosh Ganu <urwithsughosh(a)gmail.com> */ diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index ceed1911a9..61b284a022 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Alexey Brodkin <abrodkin(a)synopsys.com> */ diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 3f4418198c..076748ceed 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * URB OHCI HCD (Host Controller Driver) for USB on the AT91RM9200 and PCI bus. * diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c index a04b2961b9..6aad337e55 100644 --- a/drivers/usb/host/ohci-lpc32xx.c +++ b/drivers/usb/host/ohci-lpc32xx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2008 by NXP Semiconductors * @Author: Based on code by Kevin Wells diff --git a/drivers/usb/host/ohci-npcm.c b/drivers/usb/host/ohci-npcm.c index 9e1d529880..d8be1b0378 100644 --- a/drivers/usb/host/ohci-npcm.c +++ b/drivers/usb/host/ohci-npcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/drivers/usb/host/usb-sandbox.c b/drivers/usb/host/usb-sandbox.c index 3d4f8d653b..b90f0c0a47 100644 --- a/drivers/usb/host/usb-sandbox.c +++ b/drivers/usb/host/usb-sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d6..c8439a72be 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/usb/host/usb_bootdev.c b/drivers/usb/host/usb_bootdev.c index 7fa1c601df..c69fe01bc3 100644 --- a/drivers/usb/host/usb_bootdev.c +++ b/drivers/usb/host/usb_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootdev for USB * diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c index fe17924028..40004bdf75 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Broadcom. */ diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 1dbd65dfaa..192ebf3ad2 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 270be934e7..aab2e33909 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * SAMSUNG EXYNOS5 USB HOST XHCI Controller * diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index e67e09e31e..d2995f39af 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2015,2016 Freescale Semiconductor, Inc. * diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 72b7530626..5aa5ed72ec 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * USB HOST XHCI Controller stack * diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 63dfb793c6..f1a924e280 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 MediaTek, Inc. * Authors: Chunfeng Yun <chunfeng.yun(a)mediatek.com> diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 46b89de85d..4d4fef336e 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Marvell International Ltd. * diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index 501129d769..d44e2c2f32 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP USB HOST xHCI Controller * diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 5fc7afb7d2..d5e0c70d22 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Marek Vasut <marek.vasut(a)gmail.com> * diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c8260cbdf9..fcb8e9fbf8 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * USB HOST XHCI Controller stack * diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 5cacf0769e..1d48a813c1 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * USB HOST XHCI Controller stack * diff --git a/drivers/usb/musb-new/Makefile b/drivers/usb/musb-new/Makefile index 396ff02654..6392382741 100644 --- a/drivers/usb/musb-new/Makefile +++ b/drivers/usb/musb-new/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # for USB OTG silicon based on Mentor Graphics INVENTRA designs diff --git a/drivers/usb/musb-new/musb_uboot.h b/drivers/usb/musb-new/musb_uboot.h index 6b162f03b1..5aa9f0830d 100644 --- a/drivers/usb/musb-new/musb_uboot.h +++ b/drivers/usb/musb-new/musb_uboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MUSB OTG driver u-boot specific functions * diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index 4ed5e6e90c..72d8cc055c 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Microchip PIC32 MUSB "glue layer" * diff --git a/drivers/usb/musb-new/ti-musb.c b/drivers/usb/musb-new/ti-musb.c index ed5e5194d8..88fe4bac23 100644 --- a/drivers/usb/musb-new/ti-musb.c +++ b/drivers/usb/musb-new/ti-musb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MISC driver for TI MUSB Glue. * diff --git a/drivers/usb/musb-new/ux500.c b/drivers/usb/musb-new/ux500.c index 57c7d5630d..dc23104725 100644 --- a/drivers/usb/musb-new/ux500.c +++ b/drivers/usb/musb-new/ux500.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2019 Stephan Gerhold */ #include <common.h> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 2508b6ed0d..8cabe637fb 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 # Adam Ford, Logic PD, aford173(a)gmail.com diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 744f2cfaa2..a8b9efcef5 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index f945f1f5e2..499f91ce3a 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * am35x.c - TI's AM35x platform specific usb wrapper functions. * diff --git a/drivers/usb/musb/am35x.h b/drivers/usb/musb/am35x.h index 82ad94329c..51d037e571 100644 --- a/drivers/usb/musb/am35x.h +++ b/drivers/usb/musb/am35x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am35x.h - TI's AM35x platform specific usb wrapper definitions. * diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 9651f074a4..245af02695 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Mentor USB OTG Core functionality common for both Host and Device * functionality. diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h index 2c5e192ab2..cd1bba171a 100644 --- a/drivers/usb/musb/musb_debug.h +++ b/drivers/usb/musb/musb_debug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index 4676cabae0..5b60f21756 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Mentor USB OTG Core host controller driver. * diff --git a/drivers/usb/musb/musb_hcd.h b/drivers/usb/musb/musb_hcd.h index a492e99ef9..caf089eca5 100644 --- a/drivers/usb/musb/musb_hcd.h +++ b/drivers/usb/musb/musb_hcd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Mentor USB OTG Core host controller driver. * diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index 2ffcb7caaa..6d9f4e5549 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/musb/omap3.c b/drivers/usb/musb/omap3.c index 080bd78523..6008a9b5b1 100644 --- a/drivers/usb/musb/omap3.c +++ b/drivers/usb/musb/omap3.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/musb/omap3.h b/drivers/usb/musb/omap3.h index 78fdb2959b..05f4b2c5fc 100644 --- a/drivers/usb/musb/omap3.h +++ b/drivers/usb/musb/omap3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index c505862f1e..b7b7176482 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 # Adam Ford, Logic PD, aford173(a)gmail.com diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile index b67a70bbe8..205b24e735 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2009 Wind River Systems, Inc. # Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/phy/rockchip_usb2_phy.c b/drivers/usb/phy/rockchip_usb2_phy.c index c46ad86d3d..5662e9994d 100644 --- a/drivers/usb/phy/rockchip_usb2_phy.c +++ b/drivers/usb/phy/rockchip_usb2_phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c index 676868bead..aea1c57134 100644 --- a/drivers/usb/phy/twl4030.c +++ b/drivers/usb/phy/twl4030.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix(a)windriver.com> diff --git a/drivers/usb/ulpi/Makefile b/drivers/usb/ulpi/Makefile index f05b774353..5f79f778f7 100644 --- a/drivers/usb/ulpi/Makefile +++ b/drivers/usb/ulpi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2011 Jana Rapava <fermata7(a)gmail.com> diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c index b5d2c2c2d1..d7e0ba9104 100644 --- a/drivers/usb/ulpi/ulpi.c +++ b/drivers/usb/ulpi/ulpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Jana Rapava <fermata7(a)gmail.com> * Copyright (C) 2011 CompuLab, Ltd. <www.compulab.co.il> diff --git a/drivers/video/Makefile b/drivers/video/Makefile index fdc2937632..3544b4038c 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c index 52b5988ba5..96e30ddb8f 100644 --- a/drivers/video/anx9804.c +++ b/drivers/video/anx9804.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2015 Hans de Goede <hdegoede(a)redhat.com> */ diff --git a/drivers/video/anx9804.h b/drivers/video/anx9804.h index ea6c9f2d55..b50ffdf364 100644 --- a/drivers/video/anx9804.h +++ b/drivers/video/anx9804.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2015 Hans de Goede <hdegoede(a)redhat.com> */ diff --git a/drivers/video/anx98xx-edp.h b/drivers/video/anx98xx-edp.h index ece36d41ee..769312dfa9 100644 --- a/drivers/video/anx98xx-edp.h +++ b/drivers/video/anx98xx-edp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Hans de Goede <hdegoede(a)redhat.com> * Copyright (C) 2017 Vasily Khoruzhick <anarsoul(a)gmail.com> diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 2bf19a6684..35782aa64e 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for AT91/AT32 MULTI LAYER LCD Controller * diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 5a7a54ada7..90e0ba055c 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for AT91/AT32 LCD Controller * diff --git a/drivers/video/backlight-uclass.c b/drivers/video/backlight-uclass.c index c14996d003..be0bd66f25 100644 --- a/drivers/video/backlight-uclass.c +++ b/drivers/video/backlight-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/backlight_gpio.c b/drivers/video/backlight_gpio.c index eea824ab5e..b5c4df64c4 100644 --- a/drivers/video/backlight_gpio.c +++ b/drivers/video/backlight_gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author: Patrick Delaunay <patrick.delaunay(a)foss.st.com> diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 14942526f1..260a13c0f4 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 Stephen Warren */ diff --git a/drivers/video/bmp.c b/drivers/video/bmp.c index bab6fa7265..1833f4eb45 100644 --- a/drivers/video/bmp.c +++ b/drivers/video/bmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Detlev Zundel, DENX Software Engineering, dzu(a)denx.de. diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile index 22625c8bc6..407e50c4a4 100644 --- a/drivers/video/bridge/Makefile +++ b/drivers/video/bridge/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2015 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/bridge/anx6345.c b/drivers/video/bridge/anx6345.c index 93fa25f16e..1e938e591a 100644 --- a/drivers/video/bridge/anx6345.c +++ b/drivers/video/bridge/anx6345.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Vasily Khoruzhick <anarsoul(a)gmail.com> */ diff --git a/drivers/video/bridge/ps862x.c b/drivers/video/bridge/ps862x.c index d1d22a6e23..4fb21c859a 100644 --- a/drivers/video/bridge/ps862x.c +++ b/drivers/video/bridge/ps862x.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/bridge/ptn3460.c b/drivers/video/bridge/ptn3460.c index 4760f04108..cd2d3d0459 100644 --- a/drivers/video/bridge/ptn3460.c +++ b/drivers/video/bridge/ptn3460.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/bridge/ssd2825.c b/drivers/video/bridge/ssd2825.c index cea20dcffa..e7ca9c7fb0 100644 --- a/drivers/video/bridge/ssd2825.c +++ b/drivers/video/bridge/ssd2825.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/video/bridge/video-bridge-uclass.c b/drivers/video/bridge/video-bridge-uclass.c index f389bc6b14..9d39735556 100644 --- a/drivers/video/bridge/video-bridge-uclass.c +++ b/drivers/video/bridge/video-bridge-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/console_core.c b/drivers/video/console_core.c index d17764d0b0..3822f3870f 100644 --- a/drivers/video/console_core.c +++ b/drivers/video/console_core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * (C) Copyright 2015 diff --git a/drivers/video/console_normal.c b/drivers/video/console_normal.c index a0231293f3..0b3933b305 100644 --- a/drivers/video/console_normal.c +++ b/drivers/video/console_normal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * (C) Copyright 2015 diff --git a/drivers/video/console_rotate.c b/drivers/video/console_rotate.c index 65358a1c6e..e72f9175d1 100644 --- a/drivers/video/console_rotate.c +++ b/drivers/video/console_rotate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * (C) Copyright 2015 diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 14fb81e956..da34742a2a 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc */ diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c index 5b718ae3e5..bbdcb51eb4 100644 --- a/drivers/video/coreboot.c +++ b/drivers/video/coreboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/drivers/video/display-uclass.c b/drivers/video/display-uclass.c index 2da3d1d14e..de6d07f6be 100644 --- a/drivers/video/display-uclass.c +++ b/drivers/video/display-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Google Inc. */ diff --git a/drivers/video/dsi-host-uclass.c b/drivers/video/dsi-host-uclass.c index 6e5256eb12..2a31076e88 100644 --- a/drivers/video/dsi-host-uclass.c +++ b/drivers/video/dsi-host-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Yannick Fertre <yannick.fertre(a)st.com> for STMicroelectronics. diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c index c4fbb18294..81fb92fd1f 100644 --- a/drivers/video/dw_hdmi.c +++ b/drivers/video/dw_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/video/dw_mipi_dsi.c b/drivers/video/dw_mipi_dsi.c index 22fef7e882..69faf3cfe8 100644 --- a/drivers/video/dw_mipi_dsi.c +++ b/drivers/video/dw_mipi_dsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Fuzhou Rockchip Electronics Co., Ltd * Copyright (C) 2019, STMicroelectronics - All Rights Reserved diff --git a/drivers/video/efi.c b/drivers/video/efi.c index 28ac15ff61..ea534e9daa 100644 --- a/drivers/video/efi.c +++ b/drivers/video/efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/video/endeavoru-panel.c b/drivers/video/endeavoru-panel.c index 79a272128b..686448089d 100644 --- a/drivers/video/endeavoru-panel.c +++ b/drivers/video/endeavoru-panel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/video/exynos/Makefile b/drivers/video/exynos/Makefile index 45067f562c..4cf9111afd 100644 --- a/drivers/video/exynos/Makefile +++ b/drivers/video/exynos/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/exynos/exynos_dp.c b/drivers/video/exynos/exynos_dp.c index a532d5ae1a..46722f3fe7 100644 --- a/drivers/video/exynos/exynos_dp.c +++ b/drivers/video/exynos/exynos_dp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c index ae500a7028..b3d0475fe4 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.c +++ b/drivers/video/exynos/exynos_dp_lowlevel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_dp_lowlevel.h b/drivers/video/exynos/exynos_dp_lowlevel.h index c3d3aec782..d44466900a 100644 --- a/drivers/video/exynos/exynos_dp_lowlevel.h +++ b/drivers/video/exynos/exynos_dp_lowlevel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_fb.c b/drivers/video/exynos/exynos_fb.c index 86970a6d5d..cf4610fbd5 100644 --- a/drivers/video/exynos/exynos_fb.c +++ b/drivers/video/exynos/exynos_fb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index 804fcd0b24..f9462c0223 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c index be67cebae7..8502bd8dcb 100644 --- a/drivers/video/exynos/exynos_mipi_dsi_common.c +++ b/drivers/video/exynos/exynos_mipi_dsi_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.h b/drivers/video/exynos/exynos_mipi_dsi_common.h index 06b440dd57..a9dc470de2 100644 --- a/drivers/video/exynos/exynos_mipi_dsi_common.h +++ b/drivers/video/exynos/exynos_mipi_dsi_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c index 8111acd9a0..23158e6bd7 100644 --- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c +++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.h b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.h index fb3aeeed04..155ba10b40 100644 --- a/drivers/video/exynos/exynos_mipi_dsi_lowlevel.h +++ b/drivers/video/exynos/exynos_mipi_dsi_lowlevel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/drivers/video/fonts/Makefile b/drivers/video/fonts/Makefile index 4fca120b73..a30122eeed 100644 --- a/drivers/video/fonts/Makefile +++ b/drivers/video/fonts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/himax-hx8394.c b/drivers/video/himax-hx8394.c index 63637b4db0..b895477581 100644 --- a/drivers/video/himax-hx8394.c +++ b/drivers/video/himax-hx8394.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Ondrej Jirman <megi(a)xff.cz> */ diff --git a/drivers/video/hitachi_tx18d42vm_lcd.c b/drivers/video/hitachi_tx18d42vm_lcd.c index 87c4d27438..acf6ec50a9 100644 --- a/drivers/video/hitachi_tx18d42vm_lcd.c +++ b/drivers/video/hitachi_tx18d42vm_lcd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hitachi tx18d42vm LVDS LCD panel driver * diff --git a/drivers/video/hitachi_tx18d42vm_lcd.h b/drivers/video/hitachi_tx18d42vm_lcd.h index 24ff3c375f..ffa777cb7a 100644 --- a/drivers/video/hitachi_tx18d42vm_lcd.h +++ b/drivers/video/hitachi_tx18d42vm_lcd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Hitachi tx18d42vm LVDS LCD panel driver * diff --git a/drivers/video/hx8238d.c b/drivers/video/hx8238d.c index 6ee97cb4ff..fe2d37262c 100644 --- a/drivers/video/hx8238d.c +++ b/drivers/video/hx8238d.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copied from simple-panel * Copyright (c) 2016 Google, Inc diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c index 73b8f4bd1c..84cf104eec 100644 --- a/drivers/video/ihs_video_out.c +++ b/drivers/video/ihs_video_out.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/video/imx/Makefile b/drivers/video/imx/Makefile index 179ea651fe..93f167bf25 100644 --- a/drivers/video/imx/Makefile +++ b/drivers/video/imx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/imx/ipu.h b/drivers/video/imx/ipu.h index 1e02c7ab6d..4075aa2eaf 100644 --- a/drivers/video/imx/ipu.h +++ b/drivers/video/imx/ipu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Porting to u-boot: * diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c index b0a99c9cd5..24f96fab3b 100644 --- a/drivers/video/imx/ipu_common.c +++ b/drivers/video/imx/ipu_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Porting to u-boot: * diff --git a/drivers/video/imx/ipu_disp.c b/drivers/video/imx/ipu_disp.c index 144322e4e2..5afb204ded 100644 --- a/drivers/video/imx/ipu_disp.c +++ b/drivers/video/imx/ipu_disp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Porting to u-boot: * diff --git a/drivers/video/imx/ipu_regs.h b/drivers/video/imx/ipu_regs.h index deb44002d7..a9449d8f6f 100644 --- a/drivers/video/imx/ipu_regs.h +++ b/drivers/video/imx/ipu_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Porting to u-boot: * diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 7e60385bcf..3f8a5fdbe2 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Porting to u-boot: * diff --git a/drivers/video/imx/mxcfb.h b/drivers/video/imx/mxcfb.h index 0dc3886193..d883e62e02 100644 --- a/drivers/video/imx/mxcfb.h +++ b/drivers/video/imx/mxcfb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Porting to u-boot: * diff --git a/drivers/video/lm3533_backlight.c b/drivers/video/lm3533_backlight.c index 00297a09b7..4d93179309 100644 --- a/drivers/video/lm3533_backlight.c +++ b/drivers/video/lm3533_backlight.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/video/logicore_dp_dpcd.h b/drivers/video/logicore_dp_dpcd.h index 858bbd609a..a8b5402c9a 100644 --- a/drivers/video/logicore_dp_dpcd.h +++ b/drivers/video/logicore_dp_dpcd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * logicore_dp_dpcd.h * diff --git a/drivers/video/logicore_dp_tx.c b/drivers/video/logicore_dp_tx.c index 624084d38b..aeffe8b2b5 100644 --- a/drivers/video/logicore_dp_tx.c +++ b/drivers/video/logicore_dp_tx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * logicore_dp_tx.c * diff --git a/drivers/video/logicore_dp_tx.h b/drivers/video/logicore_dp_tx.h index d8d82b2b13..9054ad6558 100644 --- a/drivers/video/logicore_dp_tx.h +++ b/drivers/video/logicore_dp_tx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * logicore_dp_tx.h * diff --git a/drivers/video/logicore_dp_tx_regif.h b/drivers/video/logicore_dp_tx_regif.h index e1affd2b67..b576b04a18 100644 --- a/drivers/video/logicore_dp_tx_regif.h +++ b/drivers/video/logicore_dp_tx_regif.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * logicore_dp_tx_regif.h * diff --git a/drivers/video/mali_dp.c b/drivers/video/mali_dp.c index cbcdb99e1f..8d4827e7c0 100644 --- a/drivers/video/mali_dp.c +++ b/drivers/video/mali_dp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016-2018 ARM Ltd. * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> diff --git a/drivers/video/mcde_simple.c b/drivers/video/mcde_simple.c index 0924ceee30..2d67d3d1e1 100644 --- a/drivers/video/mcde_simple.c +++ b/drivers/video/mcde_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2019 Stephan Gerhold */ #include <common.h> diff --git a/drivers/video/meson/Kconfig b/drivers/video/meson/Kconfig index 3c2d72d019..3f155778fc 100644 --- a/drivers/video/meson/Kconfig +++ b/drivers/video/meson/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 BayLibre, SAS # diff --git a/drivers/video/meson/Makefile b/drivers/video/meson/Makefile index 1e929b343e..5129daa30d 100644 --- a/drivers/video/meson/Makefile +++ b/drivers/video/meson/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018 BayLibre, SAS # diff --git a/drivers/video/meson/simplefb_common.c b/drivers/video/meson/simplefb_common.c index c8b5af501d..11e6145b3d 100644 --- a/drivers/video/meson/simplefb_common.c +++ b/drivers/video/meson/simplefb_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common code for Amlogic SimpleFB with pipeline. * diff --git a/drivers/video/meson/simplefb_common.h b/drivers/video/meson/simplefb_common.h index d0cc1b401f..4fddce0577 100644 --- a/drivers/video/meson/simplefb_common.h +++ b/drivers/video/meson/simplefb_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index d3d07e5f83..f4c353dd96 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Video driver for Marvell Armada XP SoC * diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index 10433949bb..3373e416de 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX23/i.MX28 LCDIF driver * diff --git a/drivers/video/nexell/Makefile b/drivers/video/nexell/Makefile index 111ab4533c..cda3f83f79 100644 --- a/drivers/video/nexell/Makefile +++ b/drivers/video/nexell/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Junghyun, kim<jhkim(a)nexell.co.kr> diff --git a/drivers/video/nexell/s5pxx18_dp.c b/drivers/video/nexell/s5pxx18_dp.c index 2248f47905..634861a032 100644 --- a/drivers/video/nexell/s5pxx18_dp.c +++ b/drivers/video/nexell/s5pxx18_dp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/s5pxx18_dp_hdmi.c b/drivers/video/nexell/s5pxx18_dp_hdmi.c index 3f1fb8a575..1ddc262eee 100644 --- a/drivers/video/nexell/s5pxx18_dp_hdmi.c +++ b/drivers/video/nexell/s5pxx18_dp_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/s5pxx18_dp_lvds.c b/drivers/video/nexell/s5pxx18_dp_lvds.c index f8ea63fdf1..964499e24c 100644 --- a/drivers/video/nexell/s5pxx18_dp_lvds.c +++ b/drivers/video/nexell/s5pxx18_dp_lvds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/s5pxx18_dp_mipi.c b/drivers/video/nexell/s5pxx18_dp_mipi.c index 670272b268..7454f7334f 100644 --- a/drivers/video/nexell/s5pxx18_dp_mipi.c +++ b/drivers/video/nexell/s5pxx18_dp_mipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/s5pxx18_dp_rgb.c b/drivers/video/nexell/s5pxx18_dp_rgb.c index 44e8edb02a..42d39b0103 100644 --- a/drivers/video/nexell/s5pxx18_dp_rgb.c +++ b/drivers/video/nexell/s5pxx18_dp_rgb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/Makefile b/drivers/video/nexell/soc/Makefile index a3036e52ee..a6b807fc2c 100644 --- a/drivers/video/nexell/soc/Makefile +++ b/drivers/video/nexell/soc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Nexell # Junghyun, kim<jhkim(a)nexell.co.kr> diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop.c b/drivers/video/nexell/soc/s5pxx18_soc_disptop.c index 626e53a876..87e5fdf7fb 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_disptop.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop.h b/drivers/video/nexell/soc/s5pxx18_soc_disptop.h index c7bf5043e6..1f917730a3 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_disptop.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c index 02361ba411..a75cde0aed 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.h b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.h index d55fef7730..def6b1c7c9 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_disptop_clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_disptype.h b/drivers/video/nexell/soc/s5pxx18_soc_disptype.h index b5df7a7344..7f5f0b90ec 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_disptype.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_disptype.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_dpc.c b/drivers/video/nexell/soc/s5pxx18_soc_dpc.c index fc15d6b4d0..7ef0a2c7b8 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_dpc.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_dpc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_dpc.h b/drivers/video/nexell/soc/s5pxx18_soc_dpc.h index cfa53c3fdb..d7868d1f0b 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_dpc.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_dpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_hdmi.c b/drivers/video/nexell/soc/s5pxx18_soc_hdmi.c index 7b8be7e2b5..fcb696fa86 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_hdmi.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_hdmi.h b/drivers/video/nexell/soc/s5pxx18_soc_hdmi.h index a4c5ab5e59..d373415784 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_hdmi.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_hdmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c index 18c101bda7..76d50e1ef9 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h index 08f8e5c406..44850c381f 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_lvds.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_lvds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mipi.c b/drivers/video/nexell/soc/s5pxx18_soc_mipi.c index 1000ddb642..ef51ee5906 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_mipi.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_mipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h index 63751ca83f..2562468610 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_mipi.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_mipi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mlc.c b/drivers/video/nexell/soc/s5pxx18_soc_mlc.c index c8cf833f30..c6f9c1ab5d 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_mlc.c +++ b/drivers/video/nexell/soc/s5pxx18_soc_mlc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell/soc/s5pxx18_soc_mlc.h b/drivers/video/nexell/soc/s5pxx18_soc_mlc.h index 77ceca6bd6..1190d9a5da 100644 --- a/drivers/video/nexell/soc/s5pxx18_soc_mlc.h +++ b/drivers/video/nexell/soc/s5pxx18_soc_mlc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/nexell_display.c b/drivers/video/nexell_display.c index af2698ffca..9329a98321 100644 --- a/drivers/video/nexell_display.c +++ b/drivers/video/nexell_display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Nexell Co., Ltd. * diff --git a/drivers/video/orisetech_otm8009a.c b/drivers/video/orisetech_otm8009a.c index 848f174b6e..dd06e2db5d 100644 --- a/drivers/video/orisetech_otm8009a.c +++ b/drivers/video/orisetech_otm8009a.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Yannick Fertre <yannick.fertre(a)st.com> for STMicroelectronics. diff --git a/drivers/video/panel-uclass.c b/drivers/video/panel-uclass.c index 1f7e20e0b5..f23cb04328 100644 --- a/drivers/video/panel-uclass.c +++ b/drivers/video/panel-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index aa0e292866..ec0b691c98 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/raydium-rm68200.c b/drivers/video/raydium-rm68200.c index f1fce55a2c..9a818dfbf5 100644 --- a/drivers/video/raydium-rm68200.c +++ b/drivers/video/raydium-rm68200.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Yannick Fertre <yannick.fertre(a)st.com> for STMicroelectronics. diff --git a/drivers/video/renesas-r61307.c b/drivers/video/renesas-r61307.c index 426fdc6224..3825698ae7 100644 --- a/drivers/video/renesas-r61307.c +++ b/drivers/video/renesas-r61307.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas R61307 panel driver * diff --git a/drivers/video/renesas-r69328.c b/drivers/video/renesas-r69328.c index d2f7169468..4c23ba95d3 100644 --- a/drivers/video/renesas-r69328.c +++ b/drivers/video/renesas-r69328.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Renesas R69328 panel driver * diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile index 8128289cc8..a3e5886554 100644 --- a/drivers/video/rockchip/Makefile +++ b/drivers/video/rockchip/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/rockchip/dw_mipi_dsi_rockchip.c b/drivers/video/rockchip/dw_mipi_dsi_rockchip.c index 1a5ab781e3..f7dbb8dca9 100644 --- a/drivers/video/rockchip/dw_mipi_dsi_rockchip.c +++ b/drivers/video/rockchip/dw_mipi_dsi_rockchip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Author(s): Chris Morgan <macromorgan(a)hotmail.com> * diff --git a/drivers/video/rockchip/rk3288_hdmi.c b/drivers/video/rockchip/rk3288_hdmi.c index 327ae78712..dbade07de2 100644 --- a/drivers/video/rockchip/rk3288_hdmi.c +++ b/drivers/video/rockchip/rk3288_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/video/rockchip/rk3399_hdmi.c b/drivers/video/rockchip/rk3399_hdmi.c index 3041360c6e..b8af640803 100644 --- a/drivers/video/rockchip/rk3399_hdmi.c +++ b/drivers/video/rockchip/rk3399_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/video/rockchip/rk_hdmi.c b/drivers/video/rockchip/rk_hdmi.c index 8dcd4d5964..319c4b03da 100644 --- a/drivers/video/rockchip/rk_hdmi.c +++ b/drivers/video/rockchip/rk_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH * Copyright (c) 2015 Google, Inc diff --git a/drivers/video/rockchip/rk_hdmi.h b/drivers/video/rockchip/rk_hdmi.h index 200dbaea74..bffaa5e1a6 100644 --- a/drivers/video/rockchip/rk_hdmi.h +++ b/drivers/video/rockchip/rk_hdmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/drivers/video/rockchip/rk_lvds.c b/drivers/video/rockchip/rk_lvds.c index 9cf3e3ca76..854948537e 100644 --- a/drivers/video/rockchip/rk_lvds.c +++ b/drivers/video/rockchip/rk_lvds.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2016 Rockchip Inc. */ diff --git a/drivers/video/sandbox_dsi_host.c b/drivers/video/sandbox_dsi_host.c index c84a27ee3b..0032760712 100644 --- a/drivers/video/sandbox_dsi_host.c +++ b/drivers/video/sandbox_dsi_host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/video/sandbox_osd.c b/drivers/video/sandbox_osd.c index 2a854d3958..520195bc3f 100644 --- a/drivers/video/sandbox_osd.c +++ b/drivers/video/sandbox_osd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/video/sandbox_osd.h b/drivers/video/sandbox_osd.h index 15a2c91c52..af3dc6a284 100644 --- a/drivers/video/sandbox_osd.h +++ b/drivers/video/sandbox_osd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/video/sandbox_sdl.c b/drivers/video/sandbox_sdl.c index 9081c7da62..5a7518ca82 100644 --- a/drivers/video/sandbox_sdl.c +++ b/drivers/video/sandbox_sdl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c index 6a6473eb0e..7fd5c39422 100644 --- a/drivers/video/simple_panel.c +++ b/drivers/video/simple_panel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/drivers/video/simplefb.c b/drivers/video/simplefb.c index 235ec761f7..7acd1b625e 100644 --- a/drivers/video/simplefb.c +++ b/drivers/video/simplefb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 Rob Clark */ diff --git a/drivers/video/ssd2828.c b/drivers/video/ssd2828.c index 4cdcbe7755..8b40bb598e 100644 --- a/drivers/video/ssd2828.c +++ b/drivers/video/ssd2828.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2015 Siarhei Siamashka <siarhei.siamashka(a)gmail.com> */ diff --git a/drivers/video/ssd2828.h b/drivers/video/ssd2828.h index 01ac6f40fc..9306a95ec3 100644 --- a/drivers/video/ssd2828.h +++ b/drivers/video/ssd2828.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) 2015 Siarhei Siamashka <siarhei.siamashka(a)gmail.com> */ diff --git a/drivers/video/stm32/Kconfig b/drivers/video/stm32/Kconfig index 48066063e4..b35c5eb1c7 100644 --- a/drivers/video/stm32/Kconfig +++ b/drivers/video/stm32/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) STMicroelectronics SA 2017 # diff --git a/drivers/video/stm32/Makefile b/drivers/video/stm32/Makefile index f8b42d1a4d..0861b6ffad 100644 --- a/drivers/video/stm32/Makefile +++ b/drivers/video/stm32/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) STMicroelectronics SA 2017 # diff --git a/drivers/video/stm32/stm32_dsi.c b/drivers/video/stm32/stm32_dsi.c index a18c1e027a..8b3b302bcc 100644 --- a/drivers/video/stm32/stm32_dsi.c +++ b/drivers/video/stm32/stm32_dsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Philippe Cornu <philippe.cornu(a)st.com> for STMicroelectronics. diff --git a/drivers/video/stm32/stm32_ltdc.c b/drivers/video/stm32/stm32_ltdc.c index 6fd90e3391..3ca3a0ab1b 100644 --- a/drivers/video/stm32/stm32_ltdc.c +++ b/drivers/video/stm32/stm32_ltdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2018 STMicroelectronics - All Rights Reserved * Author(s): Philippe Cornu <philippe.cornu(a)st.com> for STMicroelectronics. diff --git a/drivers/video/sunxi/Makefile b/drivers/video/sunxi/Makefile index 4321673312..c84e6b5bd0 100644 --- a/drivers/video/sunxi/Makefile +++ b/drivers/video/sunxi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c index 73033c3b85..c8785736b6 100644 --- a/drivers/video/sunxi/lcdc.c +++ b/drivers/video/sunxi/lcdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Timing controller driver for Allwinner SoCs. * diff --git a/drivers/video/sunxi/simplefb_common.c b/drivers/video/sunxi/simplefb_common.c index ce0dc8f171..7018d1257b 100644 --- a/drivers/video/sunxi/simplefb_common.c +++ b/drivers/video/sunxi/simplefb_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Common code for Allwinner SimpleFB with pipeline. * diff --git a/drivers/video/sunxi/simplefb_common.h b/drivers/video/sunxi/simplefb_common.h index 10292a095a..d45f1a0dfa 100644 --- a/drivers/video/sunxi/simplefb_common.h +++ b/drivers/video/sunxi/simplefb_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index e02d359cd2..c65b69dd8a 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Allwinner DE2 display driver * diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c index 9110a48482..65379c63b0 100644 --- a/drivers/video/sunxi/sunxi_display.c +++ b/drivers/video/sunxi/sunxi_display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Display driver for Allwinner SoCs. * diff --git a/drivers/video/sunxi/sunxi_dw_hdmi.c b/drivers/video/sunxi/sunxi_dw_hdmi.c index 0324a050d0..768602ad7a 100644 --- a/drivers/video/sunxi/sunxi_dw_hdmi.c +++ b/drivers/video/sunxi/sunxi_dw_hdmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Allwinner DW HDMI bridge * diff --git a/drivers/video/sunxi/sunxi_lcd.c b/drivers/video/sunxi/sunxi_lcd.c index 8b9c3b2bfa..149313d8d7 100644 --- a/drivers/video/sunxi/sunxi_lcd.c +++ b/drivers/video/sunxi/sunxi_lcd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Allwinner LCD driver * diff --git a/drivers/video/sunxi/tve_common.c b/drivers/video/sunxi/tve_common.c index 35251371d1..a811bb9587 100644 --- a/drivers/video/sunxi/tve_common.c +++ b/drivers/video/sunxi/tve_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * TV encoder driver for Allwinner SoCs. * diff --git a/drivers/video/tda19988.c b/drivers/video/tda19988.c index 2448743904..8e8a7c3404 100644 --- a/drivers/video/tda19988.c +++ b/drivers/video/tda19988.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Liviu Dudau <liviu(a)dudau.co.uk> * diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c index 273672db02..7c7da39c73 100644 --- a/drivers/video/tdo-tl070wsh30.c +++ b/drivers/video/tdo-tl070wsh30.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/drivers/video/tegra124/Makefile b/drivers/video/tegra124/Makefile index a378382628..57c4fd3e4b 100644 --- a/drivers/video/tegra124/Makefile +++ b/drivers/video/tegra124/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Google, Inc # diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index 9261cc9384..9b5d35d23e 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2014 Google Inc. * diff --git a/drivers/video/tegra20/Makefile b/drivers/video/tegra20/Makefile index f0b534c579..d1a3969e2d 100644 --- a/drivers/video/tegra20/Makefile +++ b/drivers/video/tegra20/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-$(CONFIG_VIDEO_TEGRA20) += tegra-dc.o obj-$(CONFIG_VIDEO_DSI_TEGRA30) += tegra-dsi.o mipi-phy.o diff --git a/drivers/video/tegra20/tegra-dc.c b/drivers/video/tegra20/tegra-dc.c index f53ad46397..4166b00bab 100644 --- a/drivers/video/tegra20/tegra-dc.c +++ b/drivers/video/tegra20/tegra-dc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/drivers/video/tegra20/tegra-dsi.c b/drivers/video/tegra20/tegra-dsi.c index 8c3404e085..6c925a5d88 100644 --- a/drivers/video/tegra20/tegra-dsi.c +++ b/drivers/video/tegra20/tegra-dsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 NVIDIA Corporation * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> diff --git a/drivers/video/tegra20/tegra-pwm-backlight.c b/drivers/video/tegra20/tegra-pwm-backlight.c index bb677daa8a..509374d642 100644 --- a/drivers/video/tegra20/tegra-pwm-backlight.c +++ b/drivers/video/tegra20/tegra-pwm-backlight.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/drivers/video/ti/Kconfig b/drivers/video/ti/Kconfig index 3081e9e8c0..e75eb59b7f 100644 --- a/drivers/video/ti/Kconfig +++ b/drivers/video/ti/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> # diff --git a/drivers/video/ti/Makefile b/drivers/video/ti/Makefile index 1f551c84f3..e5fdc93c56 100644 --- a/drivers/video/ti/Makefile +++ b/drivers/video/ti/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> # diff --git a/drivers/video/ti/tilcdc-panel.c b/drivers/video/ti/tilcdc-panel.c index df95086a51..9cdee5e214 100644 --- a/drivers/video/ti/tilcdc-panel.c +++ b/drivers/video/ti/tilcdc-panel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * OMAP panel support * diff --git a/drivers/video/ti/tilcdc-panel.h b/drivers/video/ti/tilcdc-panel.h index 6bcfbf8a8b..f678fd3cd0 100644 --- a/drivers/video/ti/tilcdc-panel.h +++ b/drivers/video/ti/tilcdc-panel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> */ diff --git a/drivers/video/ti/tilcdc.c b/drivers/video/ti/tilcdc.c index 2734754ecd..3878334bc3 100644 --- a/drivers/video/ti/tilcdc.c +++ b/drivers/video/ti/tilcdc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> */ diff --git a/drivers/video/ti/tilcdc.h b/drivers/video/ti/tilcdc.h index 2645921df6..7abe521b59 100644 --- a/drivers/video/ti/tilcdc.h +++ b/drivers/video/ti/tilcdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Dario Binacchi <dariobin(a)libero.it> */ diff --git a/drivers/video/tidss/Kconfig b/drivers/video/tidss/Kconfig index 95086f3a5d..d423bac5cb 100644 --- a/drivers/video/tidss/Kconfig +++ b/drivers/video/tidss/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2023 Texas Instruments Incorporated - https://www.ti.com/ # Nikhil M Jain, n-jain1(a)ti.com diff --git a/drivers/video/tidss/Makefile b/drivers/video/tidss/Makefile index a29cee2a41..8747b67778 100644 --- a/drivers/video/tidss/Makefile +++ b/drivers/video/tidss/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2023 Texas Instruments Incorporated - https://www.ti.com/ # Nikhil M Jain, n-jain1(a)ti.com diff --git a/drivers/video/tidss/tidss_drv.c b/drivers/video/tidss/tidss_drv.c index e285f255d7..173e2e45e7 100644 --- a/drivers/video/tidss/tidss_drv.c +++ b/drivers/video/tidss/tidss_drv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2023 Texas Instruments Incorporated - https://www.ti.com/ * Nikhil M Jain, n-jain1(a)ti.com diff --git a/drivers/video/tidss/tidss_drv.h b/drivers/video/tidss/tidss_drv.h index e229d975ff..586b2fa287 100644 --- a/drivers/video/tidss/tidss_drv.h +++ b/drivers/video/tidss/tidss_drv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2023 Texas Instruments Incorporated - https://www.ti.com/ * Nikhil M Jain, n-jain1(a)ti.com diff --git a/drivers/video/tidss/tidss_regs.h b/drivers/video/tidss/tidss_regs.h index 440db8d1c7..3147e518b7 100644 --- a/drivers/video/tidss/tidss_regs.h +++ b/drivers/video/tidss/tidss_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2023 Texas Instruments Incorporated - https://www.ti.com/ * Nikhil M Jain, n-jain1(a)ti.com diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c index 50912c5c8b..c9b5d0d746 100644 --- a/drivers/video/vesa.c +++ b/drivers/video/vesa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 22d55df71f..7a051072ce 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * (C) Copyright 2001-2015 diff --git a/drivers/video/vidconsole_internal.h b/drivers/video/vidconsole_internal.h index 0ec581b266..9dd09cc647 100644 --- a/drivers/video/vidconsole_internal.h +++ b/drivers/video/vidconsole_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * (C) Copyright 2015 diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f743ed74c8..4560a89337 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 45f003c825..0a5297019c 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc */ diff --git a/drivers/video/video_osd-uclass.c b/drivers/video/video_osd-uclass.c index 0d3aae4d82..edf7b13331 100644 --- a/drivers/video/video_osd-uclass.c +++ b/drivers/video/video_osd-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index 35955a5df7..93002523c2 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2004 * Pierre Aubert, Staubli Faverges , <p.aubert(a)staubli.com> diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h index 405f4e1fc2..ee47a690a1 100644 --- a/drivers/video/videomodes.h +++ b/drivers/video/videomodes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004 * Pierre Aubert, Staubli Faverges , <p.aubert(a)staubli.com> diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 852f6735b6..a589eb8678 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index 4c63a6c690..2898253d8b 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> # Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c index c542016273..ada877a324 100644 --- a/drivers/virtio/virtio-uclass.c +++ b/drivers/virtio/virtio-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c index 9581058286..ae8e04ae59 100644 --- a/drivers/virtio/virtio_blk.c +++ b/drivers/virtio/virtio_blk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 78c15c821b..bef9922a34 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_mmio.h b/drivers/virtio/virtio_mmio.h index b446674ccc..9d53b80778 100644 --- a/drivers/virtio/virtio_mmio.h +++ b/drivers/virtio/virtio_mmio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_net.c b/drivers/virtio/virtio_net.c index 1794f73a8d..0ed14435aa 100644 --- a/drivers/virtio/virtio_net.c +++ b/drivers/virtio/virtio_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index cf5dfb17a9..253273b3e3 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index 3cdc2d2d6f..fbd87db679 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index c9adcce5c0..3f4c416518 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c index b85545c2ee..6dbd5637c1 100644 --- a/drivers/virtio/virtio_rng.c +++ b/drivers/virtio/virtio_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Linaro Limited */ diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c index b34f1d6045..403d8b20a7 100644 --- a/drivers/virtio/virtio_sandbox.c +++ b/drivers/virtio/virtio_sandbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c index 4be378b43d..401814f3ea 100644 --- a/drivers/w1-eeprom/ds24xxx.c +++ b/drivers/w1-eeprom/ds24xxx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (c) 2015 Free Electrons diff --git a/drivers/w1-eeprom/ds2502.c b/drivers/w1-eeprom/ds2502.c index a67f5edd0f..c65373efe5 100644 --- a/drivers/w1-eeprom/ds2502.c +++ b/drivers/w1-eeprom/ds2502.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for DS-2502 One wire "Add only Memory". * diff --git a/drivers/w1-eeprom/eep_sandbox.c b/drivers/w1-eeprom/eep_sandbox.c index 27c7f9f1b6..06276ee7c2 100644 --- a/drivers/w1-eeprom/eep_sandbox.c +++ b/drivers/w1-eeprom/eep_sandbox.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2018 Microchip Technology, Inc. * diff --git a/drivers/w1-eeprom/w1-eeprom-uclass.c b/drivers/w1-eeprom/w1-eeprom-uclass.c index 70ba537243..dfc9b89a5f 100644 --- a/drivers/w1-eeprom/w1-eeprom-uclass.c +++ b/drivers/w1-eeprom/w1-eeprom-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (c) 2015 Free Electrons diff --git a/drivers/w1/mxc_w1.c b/drivers/w1/mxc_w1.c index b96c1a00bf..4d18f5aa22 100644 --- a/drivers/w1/mxc_w1.c +++ b/drivers/w1/mxc_w1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Driver for one wire controller in some i.MX Socs * diff --git a/drivers/w1/w1-gpio.c b/drivers/w1/w1-gpio.c index 9346f810ce..abb0f9e931 100644 --- a/drivers/w1/w1-gpio.c +++ b/drivers/w1/w1-gpio.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2015 Free Electrons * Copyright (c) 2015 NextThing Co diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index a4247ecd62..9565ad1579 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * Copyright (c) 2015 Free Electrons diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index eef786f5e7..eddeb503b5 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2008 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/drivers/watchdog/apple_wdt.c b/drivers/watchdog/apple_wdt.c index c7307f41cb..a8c28a8474 100644 --- a/drivers/watchdog/apple_wdt.c +++ b/drivers/watchdog/apple_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c index e09f5ac9e3..fd61bdac16 100644 --- a/drivers/watchdog/armada-37xx-wdt.c +++ b/drivers/watchdog/armada-37xx-wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Marvell Armada 37xx SoC Watchdog Driver * diff --git a/drivers/watchdog/ast2600_wdt.c b/drivers/watchdog/ast2600_wdt.c index bc9842089b..750e1dccfb 100644 --- a/drivers/watchdog/ast2600_wdt.c +++ b/drivers/watchdog/ast2600_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Aspeed Technology, Inc */ diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c index f7b5a1adc1..48cdedb380 100644 --- a/drivers/watchdog/ast_wdt.c +++ b/drivers/watchdog/ast_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Google, Inc */ diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 647ae325e9..f42a6c2f67 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * [origin: Linux kernel drivers/watchdog/at91sam9_wdt.c] * diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index 3c1ead3dda..dc5f28022a 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Lubomir Rintel <lkundrak(a)v3.sk> * Copyright (C) 2023 Etienne Dublé (CNRS) <etienne.duble(a)imag.fr> diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c index 677b1347ca..e908da422b 100644 --- a/drivers/watchdog/bcm6345_wdt.c +++ b/drivers/watchdog/bcm6345_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c index 7ab9d7b2db..7054280b40 100644 --- a/drivers/watchdog/cortina_wdt.c +++ b/drivers/watchdog/cortina_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Cortina-Access * diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index 447a22d3b3..ef22c466dc 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Altera Corporation <www.altera.com> */ diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index 1f5f301b12..408e795ca9 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the FTWDT010 Watch Dog Driver * diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c index 2920c2c751..32f5db4878 100644 --- a/drivers/watchdog/gpio_wdt.c +++ b/drivers/watchdog/gpio_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <dm.h> #include <dm/device_compat.h> diff --git a/drivers/watchdog/max6370_wdt.c b/drivers/watchdog/max6370_wdt.c index 584a4ed468..3aa211d6fe 100644 --- a/drivers/watchdog/max6370_wdt.c +++ b/drivers/watchdog/max6370_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // (C) 2022 Pali Rohár <pali(a)kernel.org> #include <asm/io.h> diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c index 6ab005813f..9569a304f9 100644 --- a/drivers/watchdog/meson_gxbb_wdt.c +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 BayLibre, SAS. */ diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index f28636ca90..f22ec3116b 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 CS Systemes d'Information */ diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index f7d201b921..4509ebe2fc 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Ralink / Mediatek RT288x/RT3xxx/MT76xx built-in hardware watchdog timer * diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index 57b61215a2..4f36ab2ef8 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Nuvoton Technology, Inc */ diff --git a/drivers/watchdog/octeontx_wdt.c b/drivers/watchdog/octeontx_wdt.c index c79d9539c1..0166389a26 100644 --- a/drivers/watchdog/octeontx_wdt.c +++ b/drivers/watchdog/octeontx_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Marvell International Ltd. * diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index 8d93f19b98..df71236e41 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) Siemens AG, 2020 * diff --git a/drivers/watchdog/s5p_wdt.c b/drivers/watchdog/s5p_wdt.c index 5ad7d2609f..df8e863019 100644 --- a/drivers/watchdog/s5p_wdt.c +++ b/drivers/watchdog/s5p_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c index 535614f04d..b94a1f89c6 100644 --- a/drivers/watchdog/sandbox_wdt.c +++ b/drivers/watchdog/sandbox_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Google, Inc */ diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 96d04665d5..e77f4c42e6 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for SBSA * diff --git a/drivers/watchdog/sl28cpld-wdt.c b/drivers/watchdog/sl28cpld-wdt.c index af5a6b1a28..86c5e003b2 100644 --- a/drivers/watchdog/sl28cpld-wdt.c +++ b/drivers/watchdog/sl28cpld-wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for the sl28cpld * diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index 6d58fd3cfd..b8193fd521 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Watchdog driver for SP805 on some Layerscape SoC * diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c index 7ebcd25526..8b9126ebdf 100644 --- a/drivers/watchdog/stm32mp_wdt.c +++ b/drivers/watchdog/stm32mp_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019, STMicroelectronics - All Rights Reserved */ diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index b40a1d29ca..7b04001840 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Derived from linux/drivers/watchdog/sunxi_wdt.c: * Copyright (C) 2013 Carlo Caione diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c index bdc65597dc..06a9240f9b 100644 --- a/drivers/watchdog/tangier_wdt.c +++ b/drivers/watchdog/tangier_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Intel Corporation */ diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c index 0eea04ed2c..9ec20c6e7a 100644 --- a/drivers/watchdog/ulp_wdog.c +++ b/drivers/watchdog/ulp_wdog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Freescale Semiconductor, Inc. */ diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index ed329284de..f52f5255c2 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Google, Inc */ diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index b38c400016..df66ef871b 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Xilinx AXI platforms watchdog timer driver. * diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 87157df69b..37cc99b603 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2020 EPAM Systems Inc. diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index 4ad548d599..94ce59a8cb 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2007-2008 Samuel Thibault. * (C) Copyright 2020 EPAM Systems Inc. diff --git a/dts/Makefile b/dts/Makefile index 3437e54033..279550b41f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. diff --git a/env/Makefile b/env/Makefile index 673b979fdf..7c64674c37 100644 --- a/env/Makefile +++ b/env/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2004-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/attr.c b/env/attr.c index a958c71482..6147a02a24 100644 --- a/env/attr.c +++ b/env/attr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/env/callback.c b/env/callback.c index 98ddba035e..b8806613db 100644 --- a/env/callback.c +++ b/env/callback.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/env/common.c b/env/common.c index eb1a913795..9386987797 100644 --- a/env/common.c +++ b/env/common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/eeprom.c b/env/eeprom.c index 7ce7e9972b..132bf77396 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/embedded.c b/env/embedded.c index 7cbe54c56e..736d7143bb 100644 --- a/env/embedded.c +++ b/env/embedded.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen(a)mindspring.com. diff --git a/env/env.c b/env/env.c index bae3f6482a..66fffd2348 100644 --- a/env/env.c +++ b/env/env.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/env/ext4.c b/env/ext4.c index 47e05a4891..f6b9483b2a 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2016 by VRT Technology * diff --git a/env/fat.c b/env/fat.c index 3172130d75..7cfb03bfdc 100644 --- a/env/fat.c +++ b/env/fat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2011 by Tigris Elektronik GmbH * diff --git a/env/flags.c b/env/flags.c index e2866361df..ccd105b280 100644 --- a/env/flags.c +++ b/env/flags.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/env/flash.c b/env/flash.c index 1e75f8c004..0420da04be 100644 --- a/env/flash.c +++ b/env/flash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/mmc.c b/env/mmc.c index cb14bbb58f..b408c9fe2d 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008-2011 Freescale Semiconductor, Inc. */ diff --git a/env/nand.c b/env/nand.c index df300b1317..04238ba1c4 100644 --- a/env/nand.c +++ b/env/nand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/nowhere.c b/env/nowhere.c index 9ebc357dbd..5d054036cb 100644 --- a/env/nowhere.c +++ b/env/nowhere.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/nvram.c b/env/nvram.c index 229c34f536..dcddc4d665 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/onenand.c b/env/onenand.c index 1faa2cb62a..28d79a0c75 100644 --- a/env/onenand.c +++ b/env/onenand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 DENX Software Engineering * Wolfgang Denk <wd(a)denx.de> diff --git a/env/remote.c b/env/remote.c index 166bebf52b..13cdf4268f 100644 --- a/env/remote.c +++ b/env/remote.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011-2012 Freescale Semiconductor, Inc. */ diff --git a/env/sf.c b/env/sf.c index a425ecc11c..0ceef576f3 100644 --- a/env/sf.c +++ b/env/sf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/env/ubi.c b/env/ubi.c index 445d34fedb..4787e855a8 100644 --- a/env/ubi.c +++ b/env/ubi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2012 by National Instruments, * Joe Hershberger <joe.hershberger(a)ni.com> diff --git a/examples/Makefile b/examples/Makefile index bf518bd221..f9bd2e1beb 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later ifdef CONFIG_EXAMPLES diff --git a/examples/api/Makefile b/examples/api/Makefile index ca4eb1f71a..045dc53aaa 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 Semihalf diff --git a/examples/api/crt0.S b/examples/api/crt0.S index 57bba9d851..f07d20f2ed 100644 --- a/examples/api/crt0.S +++ b/examples/api/crt0.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Semihalf * diff --git a/examples/api/demo.c b/examples/api/demo.c index d586174ce8..54558fc829 100644 --- a/examples/api/demo.c +++ b/examples/api/demo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 Semihalf * diff --git a/examples/api/glue.c b/examples/api/glue.c index 075d307ae2..136d0310ee 100644 --- a/examples/api/glue.c +++ b/examples/api/glue.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2008 Semihalf, Rafal Jaworowski <raj(a)semihalf.com> */ diff --git a/examples/api/glue.h b/examples/api/glue.h index f9745604b6..ddd0022aa5 100644 --- a/examples/api/glue.h +++ b/examples/api/glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 Semihalf * diff --git a/examples/api/libgenwrap.c b/examples/api/libgenwrap.c index 3aa222866f..f4b4f10410 100644 --- a/examples/api/libgenwrap.c +++ b/examples/api/libgenwrap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007 Semihalf * diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index 559170dd5c..eb4e108bac 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/examples/standalone/hello_world.c b/examples/standalone/hello_world.c index 27ec379315..2d82401ef6 100644 --- a/examples/standalone/hello_world.c +++ b/examples/standalone/hello_world.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/examples/standalone/sched.c b/examples/standalone/sched.c index 1c52960713..672a59df2f 100644 --- a/examples/standalone/sched.c +++ b/examples/standalone/sched.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <exports.h> diff --git a/examples/standalone/sparc.lds b/examples/standalone/sparc.lds index 30719a3c43..7424c6513c 100644 --- a/examples/standalone/sparc.lds +++ b/examples/standalone/sparc.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/fs/Makefile b/fs/Makefile index 4bed2ff2d9..c205776e09 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 31b426d572..45f4d02228 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # 2017 Marek Behún, CZ.NIC, kabel(a)kernel.org diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index 4cdbbbe3d0..99eca6c385 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index 2bc2f0fd6d..7f68557dfa 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/compat.h b/fs/btrfs/compat.h index 02173dea5f..fe5661e0e5 100644 --- a/fs/btrfs/compat.h +++ b/fs/btrfs/compat.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __BTRFS_COMPAT_H__ #define __BTRFS_COMPAT_H__ diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index c69524d38e..0fbae1c648 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/conv-funcs.h b/fs/btrfs/conv-funcs.h index 0a7af9dc87..4479cff8e3 100644 --- a/fs/btrfs/conv-funcs.h +++ b/fs/btrfs/conv-funcs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Functions to convert BTRFS structures from disk to CPU endianness and back. * diff --git a/fs/btrfs/crypto/hash.c b/fs/btrfs/crypto/hash.c index 0a0b35fe9b..0651f0f547 100644 --- a/fs/btrfs/crypto/hash.c +++ b/fs/btrfs/crypto/hash.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <asm/unaligned.h> #include <linux/xxhash.h> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 8e932adc42..493241088a 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index ffd095ffdd..3b6218c5d2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * From linux/fs/btrfs/ctree.h * Copyright (C) 2007,2008 Oracle. All rights reserved. diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index cb3b9713a5..dff89c409c 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 5f81d6414f..807779ecb2 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7eaa7e9496..9344748f6b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <fs_internal.h> #include <log.h> diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index a347912078..7e47341d20 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __BTRFS_DISK_IO_H__ #define __BTRFS_DISK_IO_H__ diff --git a/fs/btrfs/extent-cache.c b/fs/btrfs/extent-cache.c index bc8cf3a522..2827bb49bd 100644 --- a/fs/btrfs/extent-cache.c +++ b/fs/btrfs/extent-cache.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Crossported from the same named file of btrfs-progs. diff --git a/fs/btrfs/extent-cache.h b/fs/btrfs/extent-cache.h index 2fee81a66e..247287687a 100644 --- a/fs/btrfs/extent-cache.h +++ b/fs/btrfs/extent-cache.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Crossported from the same named file of btrfs-progs. diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c index f4d56a084b..2fd5234b36 100644 --- a/fs/btrfs/extent-io.c +++ b/fs/btrfs/extent-io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/extent-io.h b/fs/btrfs/extent-io.h index 5c5c579d1e..886c80718f 100644 --- a/fs/btrfs/extent-io.h +++ b/fs/btrfs/extent-io.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Crossported from btrfs-progs/extent_io.h diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 4691612eda..ed3b05a9dd 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index a39ad72067..5d9047d3e1 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "ctree.h" diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c index 68ca7e48e4..38f0a599a0 100644 --- a/fs/btrfs/subvolume.c +++ b/fs/btrfs/subvolume.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * BTRFS filesystem implementation for U-Boot * diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 7d4095d9ca..4e3f0992c0 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdlib.h> #include <common.h> #include <fs_internal.h> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 9d1a07ae78..7fb4d64cd7 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __BTRFS_VOLUMES_H__ #define __BTRFS_VOLUMES_H__ diff --git a/fs/cbfs/Makefile b/fs/cbfs/Makefile index e8e9dfe47a..0b2133383c 100644 --- a/fs/cbfs/Makefile +++ b/fs/cbfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. obj-y := cbfs.o diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 714f4baafc..d4e3bdea2e 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. */ diff --git a/fs/cramfs/Makefile b/fs/cramfs/Makefile index 2bf4187f85..9a17578347 100644 --- a/fs/cramfs/Makefile +++ b/fs/cramfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index ef94d2db45..456d86bd75 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_FS_EROFS) = fs.o \ diff --git a/fs/erofs/data.c b/fs/erofs/data.c index f4b21d7917..04656c3ca0 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "internal.h" #include "decompress.h" diff --git a/fs/erofs/decompress.c b/fs/erofs/decompress.c index e04e5c34a8..691fadf1fd 100644 --- a/fs/erofs/decompress.c +++ b/fs/erofs/decompress.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "decompress.h" #if IS_ENABLED(CONFIG_LZ4) diff --git a/fs/erofs/decompress.h b/fs/erofs/decompress.h index 4752f77950..9451aa7ca3 100644 --- a/fs/erofs/decompress.h +++ b/fs/erofs/decompress.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __EROFS_DECOMPRESS_H #define __EROFS_DECOMPRESS_H diff --git a/fs/erofs/fs.c b/fs/erofs/fs.c index 7bd2e8fcfc..1b3a61908f 100644 --- a/fs/erofs/fs.c +++ b/fs/erofs/fs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "internal.h" #include <fs_internal.h> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 1875f37fcd..f8c988a3c5 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __EROFS_INTERNAL_H #define __EROFS_INTERNAL_H diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c index bde995f1bf..450398c8ea 100644 --- a/fs/erofs/namei.c +++ b/fs/erofs/namei.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "internal.h" #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff))) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index d405d488fd..45ae96a938 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "internal.h" static bool check_layout_compatibility(struct erofs_sb_info *sbi, diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index 4f64258b00..bf540a8a33 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include "internal.h" static int z_erofs_do_map_blocks(struct erofs_inode *vi, diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile index 6ae44a2d0a..a80c97ff2a 100644 --- a/fs/ext4/Makefile +++ b/fs/ext4/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c index 168443de1f..1e88aba6d9 100644 --- a/fs/ext4/dev.c +++ b/fs/ext4/dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index f50de7c089..b19642ff00 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4_common.h b/fs/ext4/ext4_common.h index 504c708b06..a17aac9259 100644 --- a/fs/ext4/ext4_common.h +++ b/fs/ext4/ext4_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index 1a340b4764..4fed92b087 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h index 43fb8e7664..ccf86dbc2a 100644 --- a/fs/ext4/ext4_journal.h +++ b/fs/ext4/ext4_journal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index ea4c5d4157..7c9e682123 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 4c89152ce4..8d1b68f9e1 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/fs/fat/Makefile b/fs/fat/Makefile index f84efaccc7..ac82d6c274 100644 --- a/fs/fat/Makefile +++ b/fs/fat/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_$(SPL_)FS_FAT) = fat.o diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 8ff1fd0ec8..121e048e97 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * fat.c * diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 8b5d669b00..f464419d95 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * fat_write.c * diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile index ec7428c841..9ccecdd4b9 100644 --- a/fs/jffs2/Makefile +++ b/fs/jffs2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c index 3072eedd8c..31801a7890 100644 --- a/fs/jffs2/mini_inflate.c +++ b/fs/jffs2/mini_inflate.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /*------------------------------------------------------------------------- * Filename: mini_inflate.c * Version: $Id: mini_inflate.c,v 1.3 2002/01/24 22:58:42 rfeany Exp $ diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile index 63dd895753..924b9991af 100644 --- a/fs/reiserfs/Makefile +++ b/fs/reiserfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c index 5d9c26489a..3a62bc7ace 100644 --- a/fs/reiserfs/dev.c +++ b/fs/reiserfs/dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 - 2004 * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba(a)sysgo.com> diff --git a/fs/reiserfs/mode_string.c b/fs/reiserfs/mode_string.c index 638cf6368d..ae877ea5f6 100644 --- a/fs/reiserfs/mode_string.c +++ b/fs/reiserfs/mode_string.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * mode_string implementation for busybox * diff --git a/fs/reiserfs/reiserfs.c b/fs/reiserfs/reiserfs.c index 635aab2eba..15d9d6970b 100644 --- a/fs/reiserfs/reiserfs.c +++ b/fs/reiserfs/reiserfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README * diff --git a/fs/reiserfs/reiserfs_private.h b/fs/reiserfs/reiserfs_private.h index 5936f21400..933ef2c2ae 100644 --- a/fs/reiserfs/reiserfs_private.h +++ b/fs/reiserfs/reiserfs_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README * diff --git a/fs/sandbox/Kconfig b/fs/sandbox/Kconfig index b2af848242..a84651c975 100644 --- a/fs/sandbox/Kconfig +++ b/fs/sandbox/Kconfig @@ -1,2 +1,2 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # diff --git a/fs/sandbox/Makefile b/fs/sandbox/Makefile index 880d59dd69..8076ebb8fb 100644 --- a/fs/sandbox/Makefile +++ b/fs/sandbox/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2012, Google Inc. # diff --git a/fs/sandbox/host_bootdev.c b/fs/sandbox/host_bootdev.c index 3ef5362760..25dc9f2fa8 100644 --- a/fs/sandbox/host_bootdev.c +++ b/fs/sandbox/host_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootdev for sandbox host * diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index 4ae41d5b4d..3da58b4586 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, Google Inc. */ diff --git a/fs/semihostingfs.c b/fs/semihostingfs.c index 3592338a68..45f595132d 100644 --- a/fs/semihostingfs.c +++ b/fs/semihostingfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022, Sean Anderson <sean.anderson(a)seco.com> * Copyright (c) 2012, Google Inc. diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index ba66ee821c..71e81e9633 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-$(CONFIG_$(SPL_)FS_SQUASHFS) = sqfs.o \ diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile index 631ba5f438..f7ff4029bd 100644 --- a/fs/ubifs/Makefile +++ b/fs/ubifs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 514f15f58c..53e61776df 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index ff2a5719c3..9a0deb61b0 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index d8324aea5f..aa8debf22b 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file is part of UBIFS. * diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index 9962cbe7eb..f4dde073ab 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h index 70c2faf331..1b5841b82e 100644 --- a/fs/ubifs/key.h +++ b/fs/ubifs/key.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file is part of UBIFS. * diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index 77ff52575e..a3c153f2b2 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index a9e22abe6b..06ab2b32a6 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index 27835e60d2..c2738eee0f 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index 2e50c08f4d..ba4c9c6195 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 055c654ae8..b6a3116e96 100644 --- a/fs/ubifs/master.c +++ b/fs/ubifs/master.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 449bcfccbb..26d5a4c727 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file is part of UBIFS. * diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c index 6aa2890ff0..05668dee54 100644 --- a/fs/ubifs/orphan.c +++ b/fs/ubifs/orphan.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index 6b6884fb20..e54c327627 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index aa7f281ef6..f4edb9df5b 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 1d49285c7d..e1a0ee2c42 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c index 7a6e46df5d..4fd3028e11 100644 --- a/fs/ubifs/scan.c +++ b/fs/ubifs/scan.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 3e7160352e..20fe4371aa 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 4fb10045ff..59d9593cf0 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c index e4cd785b9f..bdabd44147 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of UBIFS. * diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index 2b5b26a01b..f95e2fd89a 100644 --- a/fs/ubifs/ubifs-media.h +++ b/fs/ubifs/ubifs-media.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file is part of UBIFS. * diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 67b13c83b5..e4aa882654 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file is part of UBIFS. * diff --git a/fs/zfs/Makefile b/fs/zfs/Makefile index 37a0547e8a..04de7990fd 100644 --- a/fs/zfs/Makefile +++ b/fs/zfs/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 # Jorgen Lundman <lundman at lundman.net> diff --git a/fs/zfs/dev.c b/fs/zfs/dev.c index 251e7d1f74..88e328c392 100644 --- a/fs/zfs/dev.c +++ b/fs/zfs/dev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * based on code of fs/reiserfs/dev.c by diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 1fec96cd5c..ec7730e308 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * ZFS filesystem ported to u-boot by diff --git a/fs/zfs/zfs_fletcher.c b/fs/zfs/zfs_fletcher.c index 008a303ec7..8212ff09dd 100644 --- a/fs/zfs/zfs_fletcher.c +++ b/fs/zfs/zfs_fletcher.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/fs/zfs/zfs_lzjb.c b/fs/zfs/zfs_lzjb.c index b42d498012..0258cfc02b 100644 --- a/fs/zfs/zfs_lzjb.c +++ b/fs/zfs/zfs_lzjb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/fs/zfs/zfs_sha256.c b/fs/zfs/zfs_sha256.c index cb5b1c0683..73d03e97ad 100644 --- a/fs/zfs/zfs_sha256.c +++ b/fs/zfs/zfs_sha256.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/ACEX1K.h b/include/ACEX1K.h index 7c5253c66c..6a50cd3bc1 100644 --- a/include/ACEX1K.h +++ b/include/ACEX1K.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Steven Scholz, imc Measurement & Control, steven.scholz(a)imc-berlin.de diff --git a/include/MCD_dma.h b/include/MCD_dma.h index 2f16c89044..41ecfb8f0a 100644 --- a/include/MCD_dma.h +++ b/include/MCD_dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/include/MCD_progCheck.h b/include/MCD_progCheck.h index 1ec8fbfbd2..eee3876089 100644 --- a/include/MCD_progCheck.h +++ b/include/MCD_progCheck.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/include/MCD_tasksInit.h b/include/MCD_tasksInit.h index 9f582beb51..dd08ded17b 100644 --- a/include/MCD_tasksInit.h +++ b/include/MCD_tasksInit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. */ diff --git a/include/abuf.h b/include/abuf.h index be98ec78c8..aea6858909 100644 --- a/include/abuf.h +++ b/include/abuf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Handles a buffer that can be allocated and freed * diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h index d3f271f948..000352446f 100644 --- a/include/acpi/acpi_s3.h +++ b/include/acpi/acpi_s3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 1f85de091d..aac526d2a1 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Helpers for ACPI table generation * diff --git a/include/adc.h b/include/adc.h index 0d1a666908..9cf0298f35 100644 --- a/include/adc.h +++ b/include/adc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/ahci.h b/include/ahci.h index d7f951c388..477e70434e 100644 --- a/include/ahci.h +++ b/include/ahci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) Freescale Semiconductor, Inc. 2006. * Author: Jason Jin<Jason.jin(a)freescale.com> diff --git a/include/altera.h b/include/altera.h index 946413c66e..8c8795a9a0 100644 --- a/include/altera.h +++ b/include/altera.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/ansi.h b/include/ansi.h index af1a3712c8..5791c3fabe 100644 --- a/include/ansi.h +++ b/include/ansi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Pali Rohár <pali(a)kernel.org> diff --git a/include/api.h b/include/api.h index 83412a7c87..ae6520d6c1 100644 --- a/include/api.h +++ b/include/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/api_public.h b/include/api_public.h index 5a4465ea89..64a8599b1b 100644 --- a/include/api_public.h +++ b/include/api_public.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause */ /* * (C) Copyright 2007-2008 Semihalf * diff --git a/include/arm_ffa.h b/include/arm_ffa.h index db9b1be995..ec27d3cc7c 100644 --- a/include/arm_ffa.h +++ b/include/arm_ffa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/include/arm_ffa_priv.h b/include/arm_ffa_priv.h index d564c33c64..d000dbd51a 100644 --- a/include/arm_ffa_priv.h +++ b/include/arm_ffa_priv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/include/armcoremodule.h b/include/armcoremodule.h index ee839c886d..1001520fb6 100644 --- a/include/armcoremodule.h +++ b/include/armcoremodule.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2005 * ARM Ltd. diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 94d0747194..a39e47bd71 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _ASM_GENERIC_ATOMIC_H #define _ASM_GENERIC_ATOMIC_H diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index e8c6412e3f..69150a8e06 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. * (C) Copyright 2002-2010 diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index a21c606f2b..fd0b486c8d 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * Copyright (c) 2011, NVIDIA Corp. All rights reserved. diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 7a2f0dba31..fd5bdcd54e 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Generic I/O functions. * diff --git a/include/asm-generic/pe.h b/include/asm-generic/pe.h index b9d674b6da..a5819d9ac6 100644 --- a/include/asm-generic/pe.h +++ b/include/asm-generic/pe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Portable Executable and Common Object Constants * diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 1e1657a016..a84f50fd5d 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/asm-generic/u-boot.h b/include/asm-generic/u-boot.h index 70303acd55..42a3714c6a 100644 --- a/include/asm-generic/u-boot.h +++ b/include/asm-generic/u-boot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/include/ata.h b/include/ata.h index a7bcee6a64..ebff9b8797 100644 --- a/include/ata.h +++ b/include/ata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/atmel_hlcdc.h b/include/atmel_hlcdc.h index 5e339f50f2..42d6937f0d 100644 --- a/include/atmel_hlcdc.h +++ b/include/atmel_hlcdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header file for AT91/AT32 MULTI LAYER LCD Controller * diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h index 66436b9b27..eaaedf440a 100644 --- a/include/atmel_lcd.h +++ b/include/atmel_lcd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * atmel_lcd.h - Atmel LCD Controller structures * diff --git a/include/atmel_lcdc.h b/include/atmel_lcdc.h index 759f8da31c..f08926654f 100644 --- a/include/atmel_lcdc.h +++ b/include/atmel_lcdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header file for AT91/AT32 LCD Controller * diff --git a/include/atmel_mci.h b/include/atmel_mci.h index c7591166ee..4c29620a9c 100644 --- a/include/atmel_mci.h +++ b/include/atmel_mci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005-2006 Atmel Corporation */ diff --git a/include/audio_codec.h b/include/audio_codec.h index a81a315157..0da3d28fba 100644 --- a/include/audio_codec.h +++ b/include/audio_codec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/autoboot.h b/include/autoboot.h index eb204995d0..0c8328120a 100644 --- a/include/autoboot.h +++ b/include/autoboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/avb_verify.h b/include/avb_verify.h index 1e787ba666..b42b7fd2b5 100644 --- a/include/avb_verify.h +++ b/include/avb_verify.h @@ -2,7 +2,7 @@ /* * (C) Copyright 2018, Linaro Limited * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _AVB_VERIFY_H diff --git a/include/axi.h b/include/axi.h index 59fb0b2e45..cf70ee009d 100644 --- a/include/axi.h +++ b/include/axi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017, 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/include/axp152.h b/include/axp152.h index bac6526a36..26ae8a6c87 100644 --- a/include/axp152.h +++ b/include/axp152.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> */ diff --git a/include/axp209.h b/include/axp209.h index d8bf44f1fa..1415b51cb7 100644 --- a/include/axp209.h +++ b/include/axp209.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> */ diff --git a/include/axp221.h b/include/axp221.h index 32b988f3a9..f9147d833c 100644 --- a/include/axp221.h +++ b/include/axp221.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Oliver Schinagl <oliver(a)schinagl.nl> * diff --git a/include/axp305.h b/include/axp305.h index 0a42bc6804..75653c8e3e 100644 --- a/include/axp305.h +++ b/include/axp305.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2020 Jernej Skrabec <jernej.skrabec(a)siol.net> */ diff --git a/include/axp809.h b/include/axp809.h index 71a7cb2aaa..20407c71d0 100644 --- a/include/axp809.h +++ b/include/axp809.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Chen-Yu Tsai <wens(a)csie.org> * diff --git a/include/axp818.h b/include/axp818.h index 08ac35d15f..f5c49d92e0 100644 --- a/include/axp818.h +++ b/include/axp818.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Vishnu Patekar <vishnupatekar0510(a)gmail.com> * diff --git a/include/axp_pmic.h b/include/axp_pmic.h index 4ac6486583..96c295ca02 100644 --- a/include/axp_pmic.h +++ b/include/axp_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/include/backlight.h b/include/backlight.h index c8418828d1..9c1fecec6f 100644 --- a/include/backlight.h +++ b/include/backlight.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/bcb.h b/include/bcb.h index 5edb17aa47..a92a1e93da 100644 --- a/include/bcb.h +++ b/include/bcb.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Eugeniu Rosca <rosca.eugeniu(a)gmail.com> * diff --git a/include/binman_sym.h b/include/binman_sym.h index 49a95eafad..102714fd16 100644 --- a/include/binman_sym.h +++ b/include/binman_sym.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Symbol access for symbols set up by binman as part of the build. * diff --git a/include/bitfield.h b/include/bitfield.h index d3ceeedccd..097eed581e 100644 --- a/include/bitfield.h +++ b/include/bitfield.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Broadcom Corporation. */ diff --git a/include/blk.h b/include/blk.h index 76bd5baf99..899844fff6 100644 --- a/include/blk.h +++ b/include/blk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/blkmap.h b/include/blkmap.h index af54583c7d..c43751d00a 100644 --- a/include/blkmap.h +++ b/include/blkmap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 Addiva Elektronik * Author: Tobias Waldekranz <tobias(a)waldekranz.com> diff --git a/include/bloblist.h b/include/bloblist.h index 080cc46a12..60fa435b57 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later BSD-3-Clause */ /* * This provides a standard way of passing information between boot phases * (TPL -> SPL -> U-Boot proper.) diff --git a/include/bmp_layout.h b/include/bmp_layout.h index a5c9498dc9..6aabb82953 100644 --- a/include/bmp_layout.h +++ b/include/bmp_layout.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* (C) Copyright 2002 * Detlev Zundel, DENX Software Engineering, dzu(a)denx.de. */ diff --git a/include/boot_fit.h b/include/boot_fit.h index 092cfb0b7f..96f97aa573 100644 --- a/include/boot_fit.h +++ b/include/boot_fit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Texas Instruments * Written by Franklin Cooper Jr. <fcooper(a)ti.com> diff --git a/include/bootcount.h b/include/bootcount.h index bfa5d46427..b29a70dd70 100644 --- a/include/bootcount.h +++ b/include/bootcount.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/include/bootdev.h b/include/bootdev.h index b079a91b5b..0cf113303a 100644 --- a/include/bootdev.h +++ b/include/bootdev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/bootflow.h b/include/bootflow.h index 44d3741eac..6c276bd958 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/bootm.h b/include/bootm.h index c3c7336207..fd5cc4e2fa 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/bootmeth.h b/include/bootmeth.h index 0fc36104ec..f5325bb1fe 100644 --- a/include/bootmeth.h +++ b/include/bootmeth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/bootretry.h b/include/bootretry.h index 1e8aa83a5b..b385fb3435 100644 --- a/include/bootretry.h +++ b/include/bootretry.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/bootstage.h b/include/bootstage.h index f9376c320c..79a023b7bc 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file implements recording of each stage of the boot process. It is * intended to implement timing of each stage, reporting this information diff --git a/include/bootstd.h b/include/bootstd.h index 7802564bcc..6b77a473ad 100644 --- a/include/bootstd.h +++ b/include/bootstd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Standard U-Boot boot framework * diff --git a/include/bouncebuf.h b/include/bouncebuf.h index 7427bd12e2..0da5a67faf 100644 --- a/include/bouncebuf.h +++ b/include/bouncebuf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Generic bounce buffer implementation * diff --git a/include/broadcom/chimp.h b/include/broadcom/chimp.h index 738f73eefd..e5f6d2e73a 100644 --- a/include/broadcom/chimp.h +++ b/include/broadcom/chimp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Broadcom. * diff --git a/include/btrfs.h b/include/btrfs.h index 2d73add18e..d8a76f1b33 100644 --- a/include/btrfs.h +++ b/include/btrfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * BTRFS filesystem implementation for U-Boot * diff --git a/include/bus_vcxk.h b/include/bus_vcxk.h index eecba407bf..3eed82345f 100644 --- a/include/bus_vcxk.h +++ b/include/bus_vcxk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2005-2009 * Jens Scharsig @ BuS Elektronik GmbH & Co. KG, <esw(a)bus-elektronik.de> diff --git a/include/button.h b/include/button.h index 207f4a0f4d..bc484a5568 100644 --- a/include/button.h +++ b/include/button.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/include/cavium/atf.h b/include/cavium/atf.h index 3cf05c43d7..9278f08270 100644 --- a/include/cavium/atf.h +++ b/include/cavium/atf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/include/cavium/atf_part.h b/include/cavium/atf_part.h index 6c00b019cf..4d7b1200b0 100644 --- a/include/cavium/atf_part.h +++ b/include/cavium/atf_part.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/include/cavium/thunderx_svc.h b/include/cavium/thunderx_svc.h index de36d66230..ff0e9a78dd 100644 --- a/include/cavium/thunderx_svc.h +++ b/include/cavium/thunderx_svc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/include/cbfs.h b/include/cbfs.h index 38efb1d2b0..6065628dc0 100644 --- a/include/cbfs.h +++ b/include/cbfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. All rights reserved. */ diff --git a/include/cedit.h b/include/cedit.h index f43cafa5aa..d6272e3781 100644 --- a/include/cedit.h +++ b/include/cedit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2023 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/charset.h b/include/charset.h index 44034c71d3..aa9e071bb9 100644 --- a/include/charset.h +++ b/include/charset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * charset conversion utils * diff --git a/include/circbuf.h b/include/circbuf.h index e8ec127635..620cc28e6a 100644 --- a/include/circbuf.h +++ b/include/circbuf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/include/cli.h b/include/cli.h index e183d56136..92db686fe2 100644 --- a/include/cli.h +++ b/include/cli.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Google, Inc * Simon Glass <sjg(a)chromium.org> diff --git a/include/cli_hush.h b/include/cli_hush.h index 2bd35670c7..12588f7a0e 100644 --- a/include/cli_hush.h +++ b/include/cli_hush.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/clk-uclass.h b/include/clk-uclass.h index a22f1a5d84..6c6ca23168 100644 --- a/include/clk-uclass.h +++ b/include/clk-uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/clk.h b/include/clk.h index d91285235f..b70f1b27ca 100644 --- a/include/clk.h +++ b/include/clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/clk/sunxi.h b/include/clk/sunxi.h index c298195c51..97be6a84db 100644 --- a/include/clk/sunxi.h +++ b/include/clk/sunxi.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Amarula Solutions. * Author: Jagan Teki <jagan(a)amarulasolutions.com> diff --git a/include/clock_legacy.h b/include/clock_legacy.h index efa483117d..18f2093f53 100644 --- a/include/clock_legacy.h +++ b/include/clock_legacy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/cmd_spl.h b/include/cmd_spl.h index 51ec12edb9..12bcc19071 100644 --- a/include/cmd_spl.h +++ b/include/cmd_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz(a)corscience.de> */ diff --git a/include/command.h b/include/command.h index 6262365e12..a4579dad9f 100644 --- a/include/command.h +++ b/include/command.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/common.h b/include/common.h index a79c2bb499..bde5e3420f 100644 --- a/include/common.h +++ b/include/common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common header file for U-Boot * diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 2a136b96a6..fd81009086 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 380c906ba8..3b329f55f5 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index b898ec0cc3..b8db2b7a72 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2005, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index e67338c202..df417c2680 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2005, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt(a)psyent.com> diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index d4c1e06688..f57188a94b 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Freescale MCF5208EVBe. * diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index e542818340..4b9d1dee4f 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Freescale MCF5329 FireEngine board. * diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 2f4743ce50..637631715a 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the esd TASREG board. * diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 0ff0bfce90..2f7bc079d1 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Hayden Fraser (Hayden.Fraser(a)freescale.com) */ diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 98a17181a4..5f2cd07554 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Motorola MC5272C3 board. * diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 77ddf71764..bd11304705 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Motorola MC5275EVB board. * diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index e289a23b80..58bf6c442f 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Motorola MC5282EVB board. * diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index dcc5701ee0..8372b96890 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Freescale MCF53017EVB. * diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index dd5d4c9802..e3811aad25 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Freescale MCF5329 FireEngine board. * diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 4bb9948750..b6972a0f7f 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Freescale MCF5373 FireEngine board. * diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 3967cc2836..9de9e2f465 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007 Freescale Semiconductor, Inc. * Kevin Lam <kevin.lam(a)freescale.com> diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 6f3e298a24..c5b4df6470 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2004, 2007, 2010-2011 Freescale Semiconductor. * Copyright 2020 NXP diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 9efae58ce9..d45373f82b 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 28f53ae78a..a37ed32ea8 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2012 Freescale Semiconductor, Inc. * Copyright 2020-2021 NXP diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index 19ae639947..7f64cc716c 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Allied Telesis <www.alliedtelesis.co.nz> */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index bdbf9d4758..61e030a2b1 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Allied Telesis <www.alliedtelesis.co.nz> */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 284291af2f..30efee64bd 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-2023 NXP diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 01db298f38..2cd680d58f 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-2023 NXP diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 2023d7497f..5dcbcbd2fe 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2013 Freescale Semiconductor, Inc. * Copyright 2020-2021 NXP diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 0b9dde3e0e..5a50c98af8 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-2023 NXP diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 78e136224e..ff9f61db0b 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2020-2023 NXP diff --git a/include/configs/ae350.h b/include/configs/ae350.h index 23e4801379..ed5ae3ec48 100644 --- a/include/configs/ae350.h +++ b/include/configs/ae350.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick(a)andestech.com> diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index a8fa61c7e5..d8c4a38729 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am335x_guardian_.h * diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index ee6f62275a..c915567942 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index f3d3d18c05..bc86496339 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am335x_sl50.h * diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index b75c648388..f62ea3b912 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am3517_evm.h - Default configuration for AM3517 EVM board. * diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 7ee7b7e4f4..c887cc30b4 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * am43xx_evm.h * diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 06edde6902..fe0ce943c8 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Texas Instruments Incorporated. diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index 57003f120f..3cc943c6b7 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 AM62Ax SoC family * diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index c8fe59b753..9769da23fb 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 AM625 SoC family * diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index f9f8c7bc2f..855622e87c 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 AM642 SoC family * diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 9e90239a1c..c680d849ea 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 AM654 EVM * diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 4c695fb9df..b6e4fb54ae 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sysam AMCORE board configuration * diff --git a/include/configs/anbernic-rgxx3-rk3566.h b/include/configs/anbernic-rgxx3-rk3566.h index 3c4ea4e7d8..cacb546775 100644 --- a/include/configs/anbernic-rgxx3-rk3566.h +++ b/include/configs/anbernic-rgxx3-rk3566.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ANBERNIC_RGXX3_RK3566_H #define __ANBERNIC_RGXX3_RK3566_H diff --git a/include/configs/ap121.h b/include/configs/ap121.h index 9c6f76383d..1459019dad 100644 --- a/include/configs/ap121.h +++ b/include/configs/ap121.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/include/configs/ap143.h b/include/configs/ap143.h index 034cd7a7cd..d00372f648 100644 --- a/include/configs/ap143.h +++ b/include/configs/ap143.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Wills Wang <wills.wang(a)live.com> */ diff --git a/include/configs/ap152.h b/include/configs/ap152.h index c56b35150a..e1fe29d252 100644 --- a/include/configs/ap152.h +++ b/include/configs/ap152.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Rosy Song <rosysong(a)rosinson.com> */ diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 845705c86d..c2c7878f4c 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 Toradex */ diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 71d4727ca9..2eefc7e4df 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Toradex, Inc. * diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 8a9f3ef75a..624969f0bf 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2019 Toradex, Inc. * diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 80204d706d..c6fe8c2663 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014-2016 Marcel Ziswiler * diff --git a/include/configs/arbel.h b/include/configs/arbel.h index 891257bc93..1e9e317db4 100644 --- a/include/configs/arbel.h +++ b/include/configs/arbel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Nuvoton Technology Corp. */ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 286435d6f8..f132b9bf4d 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/arndale.h b/include/configs/arndale.h index fa642564f4..f336c23ac6 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index bb1bd50838..96d5e0adc7 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2020 ASPEED Technology Inc. * Ryan Chen <ryan_chen(a)aspeedtech.com> diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index f3bfefa835..d0528a9b81 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Sentec Cobra Board. * diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 4aa876a9f7..a3970e259d 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common part of configuration settings for the AT91 SAMA5 board. * diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index b9cc7ba974..0adc3a42d7 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 39f6ff8a72..7ce3cc98ff 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 4101440ff5..4de3c74139 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 2ceb8067d5..1bb654eb81 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c59d4bb38c..fcfea3e8cb 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Atmel Corporation. * Josh Wu <josh.wu(a)atmel.com> diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index cad00f647b..ad4c12b6c6 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 509c458e5f..17d10c915c 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Atmel Corporation * diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index a82dfc9029..21491f090e 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. */ diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 9b0f5cedcd..a8a18991d1 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/bcm7260.h b/include/configs/bcm7260.h index dbe545c175..5444d5ef61 100644 --- a/include/configs/bcm7260.h +++ b/include/configs/bcm7260.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index b59048d175..b77a412ad7 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/include/configs/bcm947622.h b/include/configs/bcm947622.h index b02ed1bfe0..237947b8a7 100644 --- a/include/configs/bcm947622.h +++ b/include/configs/bcm947622.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm94908.h b/include/configs/bcm94908.h index 246feb66b2..d494cb943d 100644 --- a/include/configs/bcm94908.h +++ b/include/configs/bcm94908.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm94912.h b/include/configs/bcm94912.h index c428b1ab57..55bd487d59 100644 --- a/include/configs/bcm94912.h +++ b/include/configs/bcm94912.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm963138.h b/include/configs/bcm963138.h index c61acf6b86..5f7835b73b 100644 --- a/include/configs/bcm963138.h +++ b/include/configs/bcm963138.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm963146.h b/include/configs/bcm963146.h index 90dfa98311..92b558c57d 100644 --- a/include/configs/bcm963146.h +++ b/include/configs/bcm963146.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm963148.h b/include/configs/bcm963148.h index 54f6750c74..672448fe3c 100644 --- a/include/configs/bcm963148.h +++ b/include/configs/bcm963148.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm963158.h b/include/configs/bcm963158.h index 2fdd22d1b0..4de4866232 100644 --- a/include/configs/bcm963158.h +++ b/include/configs/bcm963158.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm963178.h b/include/configs/bcm963178.h index 32fc4a5e39..f43042e10f 100644 --- a/include/configs/bcm963178.h +++ b/include/configs/bcm963178.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96756.h b/include/configs/bcm96756.h index c69d177da2..31818b7a76 100644 --- a/include/configs/bcm96756.h +++ b/include/configs/bcm96756.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96813.h b/include/configs/bcm96813.h index 37d2d91d96..84a65f17dc 100644 --- a/include/configs/bcm96813.h +++ b/include/configs/bcm96813.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96846.h b/include/configs/bcm96846.h index 581fd55985..4aa6ec8171 100644 --- a/include/configs/bcm96846.h +++ b/include/configs/bcm96846.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96855.h b/include/configs/bcm96855.h index 3fb1ab9230..3dd24f2075 100644 --- a/include/configs/bcm96855.h +++ b/include/configs/bcm96855.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96856.h b/include/configs/bcm96856.h index 5f5af32189..c17ce8630c 100644 --- a/include/configs/bcm96856.h +++ b/include/configs/bcm96856.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96858.h b/include/configs/bcm96858.h index 9a0d89a751..58c44b5a65 100644 --- a/include/configs/bcm96858.h +++ b/include/configs/bcm96858.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm96878.h b/include/configs/bcm96878.h index 7702d1f568..0f4950cb75 100644 --- a/include/configs/bcm96878.h +++ b/include/configs/bcm96878.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Broadcom Ltd. */ diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h index 47de4bc201..680e69ca83 100644 --- a/include/configs/bcm_ns3.h +++ b/include/configs/bcm_ns3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Broadcom. * diff --git a/include/configs/bcmns.h b/include/configs/bcmns.h index 6f5f2b7ccf..53e32c3d3a 100644 --- a/include/configs/bcmns.h +++ b/include/configs/bcmns.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __BCM_NS_H #define __BCM_NS_H diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index c9280927b3..c33430125f 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Cisco Systems, Inc. * diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h index 65c01835cc..feb88aaa5c 100644 --- a/include/configs/beacon-rzg2m.h +++ b/include/configs/beacon-rzg2m.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Compass Electronics Group, LLC */ diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 5df8d03c70..65b5e668df 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/configs/bmips_bcm3380.h b/include/configs/bmips_bcm3380.h index 0d254cd7f9..4e9ca2a97c 100644 --- a/include/configs/bmips_bcm3380.h +++ b/include/configs/bmips_bcm3380.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6318.h b/include/configs/bmips_bcm6318.h index 7865b9c17e..adde044444 100644 --- a/include/configs/bmips_bcm6318.h +++ b/include/configs/bmips_bcm6318.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm63268.h b/include/configs/bmips_bcm63268.h index 93426d2661..fd59afee60 100644 --- a/include/configs/bmips_bcm63268.h +++ b/include/configs/bmips_bcm63268.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6328.h b/include/configs/bmips_bcm6328.h index e992fe6a56..9c1b4f702b 100644 --- a/include/configs/bmips_bcm6328.h +++ b/include/configs/bmips_bcm6328.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index 224b697774..59633e956c 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 3211d23049..53f501bc81 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index 7e2449ca24..2725ca5baa 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6362.h b/include/configs/bmips_bcm6362.h index 443ee47010..553eaac263 100644 --- a/include/configs/bmips_bcm6362.h +++ b/include/configs/bmips_bcm6362.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index c550f97b93..5d80d00444 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/bmips_bcm6838.h b/include/configs/bmips_bcm6838.h index f212914072..608d18b564 100644 --- a/include/configs/bmips_bcm6838.h +++ b/include/configs/bmips_bcm6838.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/include/configs/bmips_common.h b/include/configs/bmips_common.h index 3cdd0e47ea..6891c2c9cd 100644 --- a/include/configs/bmips_common.h +++ b/include/configs/bmips_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/broadcom_bcm968380gerg.h b/include/configs/broadcom_bcm968380gerg.h index bad143981a..46a47e9d9b 100644 --- a/include/configs/broadcom_bcm968380gerg.h +++ b/include/configs/broadcom_bcm968380gerg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 236d720a55..82a20b0854 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * brtpp1.h * diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index ffb4cd3027..85168eb35f 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * brsmarc1.h * diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 9ca6d6f863..1270586fcc 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * brxre1.h * diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index ab57e14392..49633a69b6 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * bur_am335x_common.h * diff --git a/include/configs/bur_cfg_common.h b/include/configs/bur_cfg_common.h index 304abc6d2e..f88c2ae98e 100644 --- a/include/configs/bur_cfg_common.h +++ b/include/configs/bur_cfg_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * bur_cfg_common.h * diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 9dcacad2fc..2621791362 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2018 NXP * Copyright 2019 Siemens AG diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 98d4d8cf4b..9a440dfc17 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP * Copyright 2018 congatec AG diff --git a/include/configs/cherryhill.h b/include/configs/cherryhill.h index a3009571de..fd9e2254bf 100644 --- a/include/configs/cherryhill.h +++ b/include/configs/cherryhill.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 850eb892db..01ae0cc501 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Grinn - http://grinn-global.com/ */ diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h index 43fdc39441..a6e0eb517f 100644 --- a/include/configs/chromebook_coral.h +++ b/include/configs/chromebook_coral.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 0787359674..a25d8a7778 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 diff --git a/include/configs/chromebook_samus.h b/include/configs/chromebook_samus.h index 03a1033c57..6483dc65eb 100644 --- a/include/configs/chromebook_samus.h +++ b/include/configs/chromebook_samus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 diff --git a/include/configs/chromebox_panther.h b/include/configs/chromebox_panther.h index a7c2606244..597c6bf63b 100644 --- a/include/configs/chromebox_panther.h +++ b/include/configs/chromebox_panther.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/configs/ci20.h b/include/configs/ci20.h index 446d5c4f3d..f1ceeae01c 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * CI20 configuration * diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 280ae1e9cc..1372547530 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 CompuLab, Ltd. * diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 062d3d8702..7f3df96e02 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 7d0f2b6dc1..ff402ee9cc 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Config file for Compulab CM-FX6 board * diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 743c8c8692..eea1b3747c 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * cm_t43.h * diff --git a/include/configs/cmpc885.h b/include/configs/cmpc885.h index 545365e112..6fff27699f 100644 --- a/include/configs/cmpc885.h +++ b/include/configs/cmpc885.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 CS Group */ diff --git a/include/configs/cmpcpro.h b/include/configs/cmpcpro.h index 24e62dfcf0..6df8350ffb 100644 --- a/include/configs/cmpcpro.h +++ b/include/configs/cmpcpro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006-2023 CS GROUP France */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 556705fb09..2fabb1d715 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the Sentec Cobra Board. * diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 561a61ebc0..0f6fb81718 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2021 Toradex AG * diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 042fcb8757..2d94dcc172 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Toradex */ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 4b2841833b..1d9faa6f39 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2019 Toradex, Inc. * diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 03f8ed1478..e614b08da1 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016-2018 Toradex AG * diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index ea7d648eb6..7622217ee6 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Lucas Stach * diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 7edb2c0b26..005acf068c 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013-2016 Stefan Agner * diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 60f31389fd..24c8783371 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2019 Toradex, Inc. * diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h index 7bfc8bbe36..24c60adf46 100644 --- a/include/configs/comtrend_ar5315u.h +++ b/include/configs/comtrend_ar5315u.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h index 36d6a7f88a..78473fdb72 100644 --- a/include/configs/comtrend_ar5387un.h +++ b/include/configs/comtrend_ar5387un.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h index 1ac107599d..f503e71e70 100644 --- a/include/configs/comtrend_ct5361.h +++ b/include/configs/comtrend_ct5361.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h index e8b0724988..6a8a5ebc12 100644 --- a/include/configs/comtrend_vr3032u.h +++ b/include/configs/comtrend_vr3032u.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h index d9d31289d7..940112cda4 100644 --- a/include/configs/comtrend_wap5813n.h +++ b/include/configs/comtrend_wap5813n.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/condor.h b/include/configs/condor.h index 50c8d17338..02d26d80c2 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/condor.h * This file is Condor board configuration. diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index 03c364f29f..f10f844402 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index 0e922b9664..18907c4b6d 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> * Copyright (C) 2016 Mario Six <mario.six(a)gdsys.cc> diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index e00c408f29..680256aff2 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h index 3347c11792..20ee53c22a 100644 --- a/include/configs/corstone1000.h +++ b/include/configs/corstone1000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 ARM Limited * (C) Copyright 2022 Linaro diff --git a/include/configs/corvus.h b/include/configs/corvus.h index f2675e0ec8..d2e548c43f 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common board functions for siemens AT91SAM9G45 based boards * (C) Copyright 2013 Siemens AG diff --git a/include/configs/cougarcanyon2.h b/include/configs/cougarcanyon2.h index 0406786f7c..8d3fdee326 100644 --- a/include/configs/cougarcanyon2.h +++ b/include/configs/cougarcanyon2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 0c842dd01e..7faac0b9ce 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/crs3xx-98dx3236.h b/include/configs/crs3xx-98dx3236.h index 6535730731..c07dc6976c 100644 --- a/include/configs/crs3xx-98dx3236.h +++ b/include/configs/crs3xx-98dx3236.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index cef404218e..a395c5596e 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ * diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h index c578167086..019fde25fa 100644 --- a/include/configs/dart_6ul.h +++ b/include/configs/dart_6ul.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board configuration file for Variscite DART-6UL Evaluation Kit * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 54de2d0d83..fc2c39a24f 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index c4ae397e3e..ed8bb3326c 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 2cbe4eb440..0b48f7f0c7 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 5c6d7fa1b7..f947381e1f 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2015 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/db-xc3-24g4xg.h b/include/configs/db-xc3-24g4xg.h index 0ee914e91d..447fe1a6ef 100644 --- a/include/configs/db-xc3-24g4xg.h +++ b/include/configs/db-xc3-24g4xg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/deneb.h b/include/configs/deneb.h index f155bb8bf5..757222fa81 100644 --- a/include/configs/deneb.h +++ b/include/configs/deneb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Siemens AG * diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index d85aeaafe5..cb46bf8223 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Embest/Timll DevKit3250 board configuration file * diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index c522d334dc..c0a8ec52cd 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments. diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index be095e28a1..c5cc8e0568 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 4b5ef4ad51..d30156ddfc 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * DHCOM DH-iMX6 PDK board configuration * diff --git a/include/configs/display5.h b/include/configs/display5.h index 3b96fff7d6..e8cc443af1 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 4842eccf40..8174741a70 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 * Stefan Herbrechtsmeier <stefan(a)herbrechtsmeier.net> diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h index 999389197c..3a5408c7b1 100644 --- a/include/configs/dockstar.h +++ b/include/configs/dockstar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2010 Eric C. Cooper <ecc(a)cmu.edu> diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 633ec1f32f..e0f4ba3aa7 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Texas Instruments Incorporated. diff --git a/include/configs/draak.h b/include/configs/draak.h index 946f1d9646..6a5249afd6 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/draak.h * This file is Draak board configuration. diff --git a/include/configs/draco.h b/include/configs/draco.h index 4c67174572..a7026ff45d 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 73aec34845..5ac12429ad 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board configuration file for Dragonboard 410C * diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 4997083711..afda365727 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board configuration file for Dragonboard 410C * diff --git a/include/configs/dragonboard845c.h b/include/configs/dragonboard845c.h index c1e590fae2..9615dacddb 100644 --- a/include/configs/dragonboard845c.h +++ b/include/configs/dragonboard845c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for Dragonboard 845c, based on Qualcomm SDA845 chip * diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 85b47a15d7..60e8c18128 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Tony Dinh <mibodhi(a)gmail.com> * (C) Copyright 2011 Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/include/configs/ds109.h b/include/configs/ds109.h index ea77abb474..2fca5d965b 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Jason Cooper <u-boot(a)lakedaemon.net> diff --git a/include/configs/ds116.h b/include/configs/ds116.h index 0883ec4d53..480979bfec 100644 --- a/include/configs/ds116.h +++ b/include/configs/ds116.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 9446acba79..9c2c4fe8f8 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/durian.h b/include/configs/durian.h index 9f11e18d34..5338932ab1 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * shuyiqi <shuyiqi(a)phytium.com.cn> diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index fc1c2aed77..34b9cad82b 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Embedded Artists LPC3250 DevKit v2 * Copyright (C) 2021 Trevor Woerner <twoerner(a)gmail.com> diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index e2c9d9c43c..e741369e90 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the BuS EB+CPU5283 boards (aka EB+MCF-EV123) * diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index ad5944230a..4a40a8f3be 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/ebisu.h * This file is Ebisu board configuration. diff --git a/include/configs/edison.h b/include/configs/edison.h index 127c2c4546..6da9d5b163 100644 --- a/include/configs/edison.h +++ b/include/configs/edison.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Intel Corp. */ diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h index d5824049d6..c9093ed2f3 100644 --- a/include/configs/efi-x86_app.h +++ b/include/configs/efi-x86_app.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h index e00c408f29..680256aff2 100644 --- a/include/configs/efi-x86_payload.h +++ b/include/configs/efi-x86_payload.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 78af42d045..fc6e8216b8 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) Stefano Babic <sbabic(a)denx.de> * diff --git a/include/configs/elgin_rv1108.h b/include/configs/elgin_rv1108.h index df04892e5f..b87e315759 100644 --- a/include/configs/elgin_rv1108.h +++ b/include/configs/elgin_rv1108.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 31c7e104f6..ea63d1f46a 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Eukréa Electromatique * Author: Eric Bénard <eric(a)eukrea.com> diff --git a/include/configs/emsdp.h b/include/configs/emsdp.h index 83aaa09cdb..934c37070c 100644 --- a/include/configs/emsdp.h +++ b/include/configs/emsdp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/include/configs/espresso7420.h b/include/configs/espresso7420.h index b4f14a9a58..b3d8f2cfaa 100644 --- a/include/configs/espresso7420.h +++ b/include/configs/espresso7420.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the SAMSUNG ESPRESSO7420 board. * Copyright (C) 2016 Samsung Electronics diff --git a/include/configs/etamin.h b/include/configs/etamin.h index d07b4e9536..2fb1046e25 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 182369def9..dc5b01dc51 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * egnite GmbH <info(a)egnite.de> diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index f304929263..fb04443f44 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2020 ASPEED Technology Inc. * Ryan Chen <ryan_chen(a)aspeedtech.com> diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index e1cce58fa9..70ada41daf 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) Aspeed Technology Inc. */ diff --git a/include/configs/evb_px30.h b/include/configs/evb_px30.h index 53781ba7ae..f7b6e5649d 100644 --- a/include/configs/evb_px30.h +++ b/include/configs/evb_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_px5.h b/include/configs/evb_px5.h index 13ddc18b34..51efeabfad 100644 --- a/include/configs/evb_px5.h +++ b/include/configs/evb_px5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3036.h b/include/configs/evb_rk3036.h index b03612cfcf..1d50c9677c 100644 --- a/include/configs/evb_rk3036.h +++ b/include/configs/evb_rk3036.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3128.h b/include/configs/evb_rk3128.h index 768004a43c..cb5e550bb7 100644 --- a/include/configs/evb_rk3128.h +++ b/include/configs/evb_rk3128.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h index 77d99d0a42..f78ab10c07 100644 --- a/include/configs/evb_rk3229.h +++ b/include/configs/evb_rk3229.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 053c9032e2..8ea1312fcb 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3328.h b/include/configs/evb_rk3328.h index d10e5b1d2e..df143d18db 100644 --- a/include/configs/evb_rk3328.h +++ b/include/configs/evb_rk3328.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3399.h b/include/configs/evb_rk3399.h index 70ab587795..9e10fb3b6b 100644 --- a/include/configs/evb_rk3399.h +++ b/include/configs/evb_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h index a0f2383bf2..9735554849 100644 --- a/include/configs/evb_rk3568.h +++ b/include/configs/evb_rk3568.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/evb_rk3588.h b/include/configs/evb_rk3588.h index 4568e2cace..ff569e9876 100644 --- a/include/configs/evb_rk3588.h +++ b/include/configs/evb_rk3588.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 Rockchip Electronics Co., Ltd. */ diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h index e7d866551a..cc150c95b0 100644 --- a/include/configs/evb_rv1108.h +++ b/include/configs/evb_rv1108.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 246aa9b7ab..f788a60070 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index e8c182bc2f..375afd9311 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index ec09f6cc5d..e7430b1c43 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index 8f2dac61cb..6b2ce1ae03 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Google, Inc * diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index cc0cf5ecbf..2cfb577085 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index b75fe1b0a8..ac616807e2 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index 9971385848..9f16f18c58 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Espresso7420 board. * Copyright (C) 2016 Samsung Electronics diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h index 92c84cd8ce..5b00ab3a17 100644 --- a/include/configs/exynos78x0-common.h +++ b/include/configs/exynos78x0-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the EXYNOS 78x0 based boards. * diff --git a/include/configs/falcon.h b/include/configs/falcon.h index 0b62ff9fbe..29e2e70332 100644 --- a/include/configs/falcon.h +++ b/include/configs/falcon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/falcon.h * This file is Falcon board configuration. diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index df96c32952..3199d6bd45 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/firefly_rk3308.h b/include/configs/firefly_rk3308.h index 28e3a547e3..d621df05d3 100644 --- a/include/configs/firefly_rk3308.h +++ b/include/configs/firefly_rk3308.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 9b0f5cedcd..a8a18991d1 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/gardena-smart-gateway-at91sam.h b/include/configs/gardena-smart-gateway-at91sam.h index 89e531649a..b2a75ff843 100644 --- a/include/configs/gardena-smart-gateway-at91sam.h +++ b/include/configs/gardena-smart-gateway-at91sam.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Atmel Corporation * Copyright (C) 2019 Stefan Roese <sr(a)denx.de> diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h index 1b97ae22fc..c74b4ed041 100644 --- a/include/configs/gardena-smart-gateway-mt7688.h +++ b/include/configs/gardena-smart-gateway-mt7688.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index 855aaa1aa5..5a2075faa7 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -3,7 +3,7 @@ * Dirk Eibach, Guntermann & Drunck GmbH, eibach(a)gdsys.de * * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CONFIG_H diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 49b058cb10..da47e835ec 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -4,7 +4,7 @@ * Copyright 2018-2020 GE Inc. * Copyright 2018-2020 Collabora Ltd. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __GE_B1X5V2_CONFIG_H diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 32960fb932..c379700ef1 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Timesys Corporation * Copyright (C) 2015 General Electric Company diff --git a/include/configs/geekbox.h b/include/configs/geekbox.h index 4b12eb7af9..4c5e19cf1b 100644 --- a/include/configs/geekbox.h +++ b/include/configs/geekbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Andreas Färber */ diff --git a/include/configs/giedi.h b/include/configs/giedi.h index 19a795bcf8..71c9877f63 100644 --- a/include/configs/giedi.h +++ b/include/configs/giedi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Siemens AG * diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index b7de159c86..09386f094a 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmai.com> * Copyright (C) 2013 Suriyan Ramasami <suriyan.r(a)gmail.com> diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 8de4a36e93..65ff57dc96 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Renesas GRPEACH board * diff --git a/include/configs/gru.h b/include/configs/gru.h index be2dc79968..1ecc159f37 100644 --- a/include/configs/gru.h +++ b/include/configs/gru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 44b4595440..4c6c01e049 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009-2014 * Gerald Kerma <dreagle(a)doukki.net> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index ebc5d03d0d..9341e28dbe 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Gateworks Corporation */ diff --git a/include/configs/gxp.h b/include/configs/gxp.h index 2b0b04891c..35ff85d46d 100644 --- a/include/configs/gxp.h +++ b/include/configs/gxp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GXP board * diff --git a/include/configs/harmony.h b/include/configs/harmony.h index cae7acdb70..6eb8e58a1c 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/hc2910-2aghd05.h b/include/configs/hc2910-2aghd05.h index 3db9a474ec..db69134fce 100644 --- a/include/configs/hc2910-2aghd05.h +++ b/include/configs/hc2910-2aghd05.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __HC2910_2AGHD05_CONFIG_H__ #define __HC2910_2AGHD05_CONFIG_H__ diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 7d81d1cf1e..b79ca9b186 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Dennis Gilmore <dgilmore(a)redhat.com> */ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 97bb439f73..8754732bbf 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Calxeda, Inc. */ diff --git a/include/configs/hihope-rzg2.h b/include/configs/hihope-rzg2.h index 54702985b9..06538a04db 100644 --- a/include/configs/hihope-rzg2.h +++ b/include/configs/hihope-rzg2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/hihope-rzg2.h * This file is HOPERUN HiHope RZ/G2 board configuration. diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 36bf22b187..fc8de9df25 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Linaro * diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index 40d5e653c3..59649e6b5e 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Linaro * Author: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> diff --git a/include/configs/hsdk-4xd.h b/include/configs/hsdk-4xd.h index f59da41773..007e4f98c0 100644 --- a/include/configs/hsdk-4xd.h +++ b/include/configs/hsdk-4xd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Synopsys, Inc. All rights reserved. * Author: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 2177fafcdc..c121965ef9 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. */ diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h index 5400d1256e..a2d2890905 100644 --- a/include/configs/huawei_hg556a.h +++ b/include/configs/huawei_hg556a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index e1b62f78b2..83d572100d 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011-2012 * Gerald Kerma <dreagle(a)doukki.net> diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index d372ffb802..fc4974ec97 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Tony Dinh <mibodhi(a)gmail.com> * (C) Copyright 2009-2012 diff --git a/include/configs/imgtec_xilfpga.h b/include/configs/imgtec_xilfpga.h index f1ca28b7ca..6b32d4c8c4 100644 --- a/include/configs/imgtec_xilfpga.h +++ b/include/configs/imgtec_xilfpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Imagination Technologies Ltd. * diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 786b70fe06..c84c275237 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Amarula Solutions B.V. * Copyright (C) 2016 Engicam S.r.l. diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h index 85c054451f..74154d3680 100644 --- a/include/configs/imx6_logic.h +++ b/include/configs/imx6_logic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Logic PD, Inc. * diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 6c61b3f448..e15c275035 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Simone CIANNI <simone.cianni(a)bticino.it> * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati(a)bticino.it> diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h index 2c998cdcfc..22ebb7c1ff 100644 --- a/include/configs/imx6q-bosch-acc.h +++ b/include/configs/imx6q-bosch-acc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2017 DENX Software Engineering GmbH, Heiko Schocher <hs(a)denx.de> * Copyright (c) 2019 Bosch Thermotechnik GmbH diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h index 9da98d0af2..3879a11ae0 100644 --- a/include/configs/imx6ulz_smm_m2.h +++ b/include/configs/imx6ulz_smm_m2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 Amarula Solutions B.V. * diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h index 106fbdb905..657fee4e87 100644 --- a/include/configs/imx7-cm.h +++ b/include/configs/imx7-cm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 Ronetix GmbH * diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 09d87cf214..4825282bd1 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/configs/imx8mm-mx8menlo.h b/include/configs/imx8mm-mx8menlo.h index a86bd76a3c..1d383ff4a0 100644 --- a/include/configs/imx8mm-mx8menlo.h +++ b/include/configs/imx8mm-mx8menlo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021-2022 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index fa20651d2d..c3e27e8795 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index f7d2b660c1..873aa47dc5 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d5642b9649..b824f5163e 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 2158b0af74..d68f582e38 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2020 Amarula Solutions(India) diff --git a/include/configs/imx8mm_phg.h b/include/configs/imx8mm_phg.h index d2d7ffa0f5..abffe5bf88 100644 --- a/include/configs/imx8mm_phg.h +++ b/include/configs/imx8mm_phg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 046d5685d0..0e6e9e4d67 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Gateworks Corporation */ diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 699e209044..06a39e5b69 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Compass Electronics Group, LLC */ diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h index deeed9c2f5..700bbd591a 100644 --- a/include/configs/imx8mn_bsh_smm_s2.h +++ b/include/configs/imx8mn_bsh_smm_s2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h index 204fc4b316..a62dedf065 100644 --- a/include/configs/imx8mn_bsh_smm_s2_common.h +++ b/include/configs/imx8mn_bsh_smm_s2_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/include/configs/imx8mn_bsh_smm_s2pro.h b/include/configs/imx8mn_bsh_smm_s2pro.h index 8619fdde7f..06af414a9c 100644 --- a/include/configs/imx8mn_bsh_smm_s2pro.h +++ b/include/configs/imx8mn_bsh_smm_s2pro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index b759b834b8..0001cd07a4 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h index 205337948c..d7da2d80e4 100644 --- a/include/configs/imx8mn_var_som.h +++ b/include/configs/imx8mn_var_som.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Collabora Ltd. */ diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index 1cc054a82b..c9b6f81655 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Gateworks Corporation */ diff --git a/include/configs/imx8mp_beacon.h b/include/configs/imx8mp_beacon.h index ee0fd07e65..8ff414087f 100644 --- a/include/configs/imx8mp_beacon.h +++ b/include/configs/imx8mp_beacon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2023 Logic PD, Inc dba Beacon EmbeddedWorks */ diff --git a/include/configs/imx8mp_data_modul_edm_sbc.h b/include/configs/imx8mp_data_modul_edm_sbc.h index 11ac3c00f7..fc8c05094a 100644 --- a/include/configs/imx8mp_data_modul_edm_sbc.h +++ b/include/configs/imx8mp_data_modul_edm_sbc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/imx8mp_dhcom_pdk2.h b/include/configs/imx8mp_dhcom_pdk2.h index d022faaa91..51b68847b7 100644 --- a/include/configs/imx8mp_dhcom_pdk2.h +++ b/include/configs/imx8mp_dhcom_pdk2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 1759318fdd..46507d27aa 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h index bbbd91776f..2f0e888df5 100644 --- a/include/configs/imx8mp_icore_mx8mp.h +++ b/include/configs/imx8mp_icore_mx8mp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 Engicam srl * Copyright (c) 2022 Amarula Solutions(India) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index e577f60ae7..bad36d3243 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP * Copyright 2022 Linaro diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 47413ecd7f..98b4ab5d02 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Gateworks Corporation */ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 7cf482d6de..fb2ffc5a71 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index d2e1649400..0c49b18468 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index b66fc18fa5..067ed9979a 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/include/configs/imx8mq_reform2.h b/include/configs/imx8mq_reform2.h index 3148e8622e..4cce0a5a36 100644 --- a/include/configs/imx8mq_reform2.h +++ b/include/configs/imx8mq_reform2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8qm_dmsse20.h b/include/configs/imx8qm_dmsse20.h index f9cda5eec7..72e81606f2 100644 --- a/include/configs/imx8qm_dmsse20.h +++ b/include/configs/imx8qm_dmsse20.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2019 NXP * Copyright 2019-2023 Kococonnector GmbH diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 4d5abe2d07..0acf9df84a 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index df2cb8d9ce..ca9eb4635a 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017-2018 NXP */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 9399950994..d00033b10f 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index d77510e168..7a51b53a65 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/include/configs/imx93_evk.h b/include/configs/imx93_evk.h index 2705587a01..46b4d0cdb3 100644 --- a/include/configs/imx93_evk.h +++ b/include/configs/imx93_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 NXP */ diff --git a/include/configs/imxrt1020-evk.h b/include/configs/imxrt1020-evk.h index cd6af93454..d23b9a929e 100644 --- a/include/configs/imxrt1020-evk.h +++ b/include/configs/imxrt1020-evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index 2af2dde2ae..be9b7a88fc 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/include/configs/imxrt1170-evk.h b/include/configs/imxrt1170-evk.h index 1ccaa15bc1..5d51673559 100644 --- a/include/configs/imxrt1170-evk.h +++ b/include/configs/imxrt1170-evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 7a55c6aeef..cc6f218d31 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Linaro diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 6bee098d6a..d2271d38fa 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Texas Instruments. diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index 596e4ff8c3..c114ab39b4 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Texas Instruments. diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 4968722d18..524443b64f 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for IOT2050 * Copyright (c) Siemens AG, 2018-2021 diff --git a/include/configs/iot_devkit.h b/include/configs/iot_devkit.h index 5a769e0787..35b1f9c57b 100644 --- a/include/configs/iot_devkit.h +++ b/include/configs/iot_devkit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index ea39d1bf82..693feb28d0 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 J721E EVM * diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h index 692c6bb5e4..f674c52b5f 100644 --- a/include/configs/j721s2_evm.h +++ b/include/configs/j721s2_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for K3 J721S2 EVM * diff --git a/include/configs/jethub.h b/include/configs/jethub.h index e22db4991d..3ae47598d2 100644 --- a/include/configs/jethub.h +++ b/include/configs/jethub.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for JetHome devices * Copyright (C) 2021 Vyacheslav Bocharov diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 5cdd87c0a1..218ea22cc1 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for TI's k2e-evm * diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 2f25d393a3..150431d97f 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for TI's k2g-evm * diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 5e52bbb98f..cf5436b68f 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for TI's k2hk-evm * diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 199959fbd4..6e3aa66071 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration header file for TI's k2l-evm * diff --git a/include/configs/khadas-vim3_android.h b/include/configs/khadas-vim3_android.h index da6adf6c41..17aa7861ca 100644 --- a/include/configs/khadas-vim3_android.h +++ b/include/configs/khadas-vim3_android.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for the khadas VIM3 Android * diff --git a/include/configs/khadas-vim3l_android.h b/include/configs/khadas-vim3l_android.h index b1768e2d82..da29788553 100644 --- a/include/configs/khadas-vim3l_android.h +++ b/include/configs/khadas-vim3l_android.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for the khadas VIM3L Android * diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 15ef68a050..c0dd2362f6 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Hitachi Power Grids. All rights reserved. */ diff --git a/include/configs/km832x.h b/include/configs/km832x.h index 69c28c2035..18a6ac1300 100644 --- a/include/configs/km832x.h +++ b/include/configs/km832x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index e7ae18ec5f..126ecdc3a2 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Keymile AG * Rainer Boschung <rainer.boschung(a)keymile.com> diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index 7835332fc0..b22c1e0b03 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Holger Brunck, Keymile GmbH Hannover, <holger.brunck(a)keymile.com> diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index f9be06fd25..1e06780664 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Holger Brunck, Keymile GmbH Hannover, <holger.brunck(a)keymile.com> diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 1c92cd7876..0c1f68f574 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Kontron Electronics GmbH * diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index eee3d2ddb0..19646a068e 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Kontron Electronics GmbH * diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 5cf6b5a6dd..22ab5af821 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __KONTRON_PITX_IMX8M_H #define __KONTRON_PITX_IMX8M_H diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 940bfd2b33..f4e8866bc5 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SL28_CONFIG_H #define __SL28_CONFIG_H diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index 6e383cbe75..bf6227e22b 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 1aa4b8ab59..5108795673 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * K+P iMX6Q KP_IMX6Q_TPC board configuration * diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index fea7c835fd..daa52bb149 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 7ad29f9299..511a066e18 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Simon Guinot <sguinot(a)lacie.com> */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index ff966586ba..0948f98712 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 David Lechner <david(a)lechnology.com> * diff --git a/include/configs/librem5.h b/include/configs/librem5.h index ce0a340ba2..7693259a9b 100644 --- a/include/configs/librem5.h +++ b/include/configs/librem5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * Copyright 2018 Emcraft Systems diff --git a/include/configs/libretech-ac.h b/include/configs/libretech-ac.h index bf20d31543..29abd4aa21 100644 --- a/include/configs/libretech-ac.h +++ b/include/configs/libretech-ac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for LibreTech AC * diff --git a/include/configs/linkit-smart-7688.h b/include/configs/linkit-smart-7688.h index e8f7a59c40..4da151f9e6 100644 --- a/include/configs/linkit-smart-7688.h +++ b/include/configs/linkit-smart-7688.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/lion_rk3368.h b/include/configs/lion_rk3368.h index c5b78f9c89..b95668b786 100644 --- a/include/configs/lion_rk3368.h +++ b/include/configs/lion_rk3368.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 5811059c8e..c7e1aaf199 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * Copyright (C) 2016 Grinn diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index d1e0ed5817..61afd2773b 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017, 2021 NXP */ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index a5f680db2d..ea5457bce3 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor */ diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 4243a21f1f..d11aae8a5b 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index 872296749c..f038e45268 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018, 2021 NXP */ diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 35e8ff0579..4ecadce10c 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2021 NXP diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index 1e843f896c..30a80fece6 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor, Inc. diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 83ab94ec44..b5f5fa3580 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index e4e5522a23..ec72242a52 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index eb8fb04272..a797e9d7eb 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * Copyright 2019, 2021 NXP diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 2ccb20192d..2ab021a472 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 NXP */ diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 769ece901c..92714f973a 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 NXP */ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index ee4f885c53..015ab2ba77 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019, 2021 NXP */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index ac2319c1b4..489047b328 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor * Copyright 2019-2021 NXP diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 7ccbb20bf2..eed8bbc754 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 60362b6a4d..cd7209976b 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor * Copyright 2022 NXP diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 867b098a07..8c4fd4dc4e 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor * Copyright 2019-2021 NXP diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index 5e03a962d1..889b623bcf 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2020 NXP */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 4b4bd7cbe4..16d22fdc7a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 0e42a51fc5..b915101ce7 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor * Copyright 2019 NXP diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 720a95d2f5..57943da7a1 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2018 NXP */ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 084ee064ae..650436bf22 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017, 2020-2021 NXP */ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index a1749149e5..ea7d5759d0 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017, 2020-2021 NXP */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index f51eb31ed0..b490780413 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * Copyright (C) 2014 Freescale Semiconductor diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 7ad2432a77..607c5a8ae2 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017, 2019-2021 NXP * Copyright 2015 Freescale Semiconductor diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 794ea84852..4de41b02d8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017, 2019-2021 NXP * Copyright 2015 Freescale Semiconductor diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 47d7ec57b8..daa9fd65c6 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 Michael Walle * Michael Walle <michael(a)walle.cc> diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 6f46ca78d4..bf3fe86918 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2021 NXP */ diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 3a316e7330..84c1fa6997 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2020 NXP */ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index 6404b35911..fe0b96bb71 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018,2020 NXP */ diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h index 54d7cea4c5..f3f96615da 100644 --- a/include/configs/lx2162aqds.h +++ b/include/configs/lx2162aqds.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020-2021 NXP */ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 1ecbba1b58..d4d808492d 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Menlosystems M53Menlo configuration diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 413597e09b..488a4bd37a 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index b64bf93bcb..f8068206c3 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016-2017 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/configs/mcr3000.h b/include/configs/mcr3000.h index a07761fdbb..755ea09859 100644 --- a/include/configs/mcr3000.h +++ b/include/configs/mcr3000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010-2017 CS Systemes d'Information * Christophe Leroy <christophe.leroy(a)c-s.fr> diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 8dbe741278..71baef306a 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index 6ffc128241..c5a2a3ee44 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Linaro Ltd. * Copyright (C) 2016 NXP Semiconductors diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 38da55c70b..38b0220fca 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 801cdae470..7a917f0ddd 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Amlogic Meson 64bits SoCs * (C) Copyright 2016 Beniamino Galvani <b.galvani(a)gmail.com> diff --git a/include/configs/meson64_android.h b/include/configs/meson64_android.h index c0e977abb0..ae0d87f787 100644 --- a/include/configs/meson64_android.h +++ b/include/configs/meson64_android.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Android Amlogic Meson 64bits SoCs * diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6740ab2be3..747fb24e3d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2010 Michal Simek * diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h index 5ced45b88b..334c97b75e 100644 --- a/include/configs/microchip_mpfs_icicle.h +++ b/include/configs/microchip_mpfs_icicle.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Microchip Technology Inc. * Padmarao Begari <padmarao.begari(a)microchip.com> diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 068a2af2c1..8a7ad01bbc 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc */ diff --git a/include/configs/miqi_rk3288.h b/include/configs/miqi_rk3288.h index 053c9032e2..8ea1312fcb 100644 --- a/include/configs/miqi_rk3288.h +++ b/include/configs/miqi_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/mk808.h b/include/configs/mk808.h index e2ab2b512c..91a54d92a5 100644 --- a/include/configs/mk808.h +++ b/include/configs/mk808.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index 1f973829bb..8efdcbc253 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for MT8183 based boards * diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index 73776e3705..853690a33b 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Pumpkin board * diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 3dfcb138b4..4c0d947a6a 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Marvell Semiconductor <www.marvell.com> diff --git a/include/configs/mvebu_alleycat-5.h b/include/configs/mvebu_alleycat-5.h index 39e37ffbf7..dbc4173160 100644 --- a/include/configs/mvebu_alleycat-5.h +++ b/include/configs/mvebu_alleycat-5.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Marvell International Ltd */ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 76e148f55e..eeec3a6a65 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 239a09763a..b70a03cd09 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index e769ba2e83..50b39f6f45 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 5ceba8b15f..7050d8e786 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX23 EVK board config * diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index f9f65f6968..6044e67c50 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 Freescale Semiconductor, Inc. * Author: Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index dff54d04a6..10abac44fe 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007, Guennadi Liakhovetski <lg(a)denx.de> * diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index e995776d30..9ca2994cb3 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Beckhoff Automation GmbH & Co. KG * Patrick Bruenn <p.bruenn(a)beckhoff.com> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 7398804e6b..d16b82c3f9 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Jason Liu <r64343(a)freescale.com> diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index df65dbeea4..5e9081c5fa 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Jason Liu <r64343(a)freescale.com> diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index f0d6405d30..44f802a002 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index f2edd13eb8..dbcc06404f 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010-2018 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 9c61350a33..fcffda6c31 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 91544c8a0e..51cb78c485 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 844f10e422..58aa02e03f 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 39c8ef060c..35c981c3e9 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 290996b51b..269d20c426 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2016 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 1c14a6beb0..b9643107b8 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index fe0ad34ef9..e0059c1a72 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 98b743b936..caa520afd9 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 2c3cd32cef..b81e9eecfb 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index d0718bfa03..2a9db57aae 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 94bee75fde..ba5f3f4d74 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index a310c64e79..b42b7990a7 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 5f4cd93062..30ad432bd3 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h index 2571098d06..bc975d2cf2 100644 --- a/include/configs/mys_6ulx.h +++ b/include/configs/mys_6ulx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2020 Linumiz * Author: Parthiban Nallathambi <parthiban(a)linumiz.com> diff --git a/include/configs/n2350.h b/include/configs/n2350.h index d8a9814d3e..629837ec7b 100644 --- a/include/configs/n2350.h +++ b/include/configs/n2350.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 358c3bb85a..5e307b73ef 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Evgeni Dobrev <evgeni(a)studio-punkt.com> * diff --git a/include/configs/netgear_cg3100d.h b/include/configs/netgear_cg3100d.h index 59468a4c55..e0a5ec121c 100644 --- a/include/configs/netgear_cg3100d.h +++ b/include/configs/netgear_cg3100d.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/netgear_dgnd3700v2.h b/include/configs/netgear_dgnd3700v2.h index c1508059ce..83bbc188a2 100644 --- a/include/configs/netgear_dgnd3700v2.h +++ b/include/configs/netgear_dgnd3700v2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/neural-compute-module-2.h b/include/configs/neural-compute-module-2.h index f0934ae00c..b98c61182d 100644 --- a/include/configs/neural-compute-module-2.h +++ b/include/configs/neural-compute-module-2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/include/configs/neural-compute-module-6.h b/include/configs/neural-compute-module-6.h index 52501b7ab8..3bd55d4c54 100644 --- a/include/configs/neural-compute-module-6.h +++ b/include/configs/neural-compute-module-6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index c9c599d076..0e1c5acf6c 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. * diff --git a/include/configs/novena.h b/include/configs/novena.h index 39d3afd1c8..7172486eff 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Novena U-Boot. * diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h index 5f933391cc..48893b02e0 100644 --- a/include/configs/npi_imx6ull.h +++ b/include/configs/npi_imx6ull.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2021 Linumiz * Author: Navin Sankar Velliangiri <navin(a)linumiz.com> diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index fa029a176b..2ac0dedc37 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, 2021-2022 Tony Dinh <mibodhi(a)gmail.com> * Copyright (C) 2015 diff --git a/include/configs/nsa325.h b/include/configs/nsa325.h index 00a148c6ae..6a2b4ed3cd 100644 --- a/include/configs/nsa325.h +++ b/include/configs/nsa325.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016-2023 Tony Dinh <mibodhi(a)gmail.com> * (C) Copyright 2014 Jason Plum <jplum(a)archlinuxarm.org> diff --git a/include/configs/nsim.h b/include/configs/nsim.h index 013a3491a3..f897752101 100644 --- a/include/configs/nsim.h +++ b/include/configs/nsim.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013-2016 Synopsys, Inc. All rights reserved. */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index c04d402deb..1c983cd2a6 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h index 9050da8738..4ad0afcfda 100644 --- a/include/configs/o4-imx6ull-nano.h +++ b/include/configs/o4-imx6ull-nano.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2021 Oleh Kravchenko <oleg(a)kaa.org.ua> */ #ifndef __O4_IMX6ULL_NANO_CONFIG_H diff --git a/include/configs/octeon_common.h b/include/configs/octeon_common.h index c0ea9e852d..218e8a608f 100644 --- a/include/configs/octeon_common.h +++ b/include/configs/octeon_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-2020 * Marvell <www.marvell.com> diff --git a/include/configs/octeon_ebb7304.h b/include/configs/octeon_ebb7304.h index 5479bdedee..dfb22fdcd0 100644 --- a/include/configs/octeon_ebb7304.h +++ b/include/configs/octeon_ebb7304.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-2020 * Marvell <www.marvell.com> diff --git a/include/configs/octeon_nic23.h b/include/configs/octeon_nic23.h index 7d99fd1b01..9fb9e98faf 100644 --- a/include/configs/octeon_nic23.h +++ b/include/configs/octeon_nic23.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-2020 * Marvell <www.marvell.com> diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 7255efc2df..28250195c7 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * Sanghee Kim <sh0130.kim(a)samsung.com> diff --git a/include/configs/odroid_go2.h b/include/configs/odroid_go2.h index 53781ba7ae..f7b6e5649d 100644 --- a/include/configs/odroid_go2.h +++ b/include/configs/odroid_go2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/odroid_m1.h b/include/configs/odroid_m1.h index 0d2e9fd94b..9cf45105cf 100644 --- a/include/configs/odroid_m1.h +++ b/include/configs/odroid_m1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __ODROID_M1_H #define __ODROID_M1_H diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 58b5ee6ea0..b99e7c2f8f 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Hyungwon Hwang <human.hwang(a)samsung.com> diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index af7cb3513f..ed597b06f6 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006-2008 * Texas Instruments. diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f44967787c..088bd500a6 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the TI OMAP3 EVM board. * diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 93d36353ff..3aa54c86c9 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common configuration settings for IGEP technology based boards * diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 957f1c369e..257cd8ea22 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 Logic Product Development <www.logicpd.com> * Peter Barada <peter.barada(a)logicpd.com> diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 69749ab630..d7abb99d77 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments Incorporated. diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index fb210ce69b..891be52a52 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments Incorporated. diff --git a/include/configs/openpiton-riscv64.h b/include/configs/openpiton-riscv64.h index 5adfc67195..02e91829fe 100644 --- a/include/configs/openpiton-riscv64.h +++ b/include/configs/openpiton-riscv64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 Western Digital Corporation or its affiliates. * Copyright (c) 2021 Tianrui Wei diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 1e6b16b4e7..497139a33c 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Net Insight <www.netinsight.net> diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h index 1edb1826c4..446f22a297 100644 --- a/include/configs/opos6uldev.h +++ b/include/configs/opos6uldev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Armadeus Systems * diff --git a/include/configs/origen.h b/include/configs/origen.h index fd4cc70a67..354dc0a7a9 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h index 8d0311cfb3..7614c5ad6f 100644 --- a/include/configs/owl-common.h +++ b/include/configs/owl-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board configuration file for Actions Semi Owl SoCs. * diff --git a/include/configs/p1_p2_bootsrc.h b/include/configs/p1_p2_bootsrc.h index c96deda61d..28ee055491 100644 --- a/include/configs/p1_p2_bootsrc.h +++ b/include/configs/p1_p2_bootsrc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index f5bd091344..5c1a78b11e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index a29d7135d0..100e593603 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 0b077aba65..4782780636 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 5155aa7b1d..225f387d9b 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h index e60f42eaa7..445917ad5b 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018-2019 NVIDIA Corporation. */ diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h index 38dcee0535..652a2f6d9c 100644 --- a/include/configs/pcl063.h +++ b/include/configs/pcl063.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Collabora Ltd. * diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h index d742201ce4..1093db38e2 100644 --- a/include/configs/pcl063_ull.h +++ b/include/configs/pcl063_ull.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Board configuration file for Phytec phyBOARD-i.MX6ULL-Segin SBC * Copyright (C) 2019 Parthiban Nallathambi <parthitce(a)gmail.com> diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 34994016c5..0b8e42aab5 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 2991076c50..3a81a4b9cd 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) Stefano Babic <sbabic(a)denx.de> */ diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 80b14b002a..97901eb21e 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * pdu001.h * diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index fb6eb572cf..c8acfe6990 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 09c6b4f8dd..47c68dc6f0 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index 2c38cffa8a..5033509f7d 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Hitachi ABB Power Grids */ diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index 9474d3bd7b..9962b1de19 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Hitachi Power Grids. All rights reserved. */ diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index 8668da6eba..916315ad70 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * phycore_am335x_r2.h * diff --git a/include/configs/phycore_rk3288.h b/include/configs/phycore_rk3288.h index 2b7a0670c0..87bb84bc93 100644 --- a/include/configs/phycore_rk3288.h +++ b/include/configs/phycore_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 PHYTEC Messtechnik GmbH * Author: Wadim Egorov <w.egorov(a)phytec.de> diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 0ae4fc55a9..82422f5924 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h index d806d7d9c5..0d7d42bbec 100644 --- a/include/configs/pico-imx6.h +++ b/include/configs/pico-imx6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 4caa823375..aeebdcc363 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Technexion Ltd. * diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 096e5bbe66..07e0ec44d6 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP Semiconductors * diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index be31f8a23c..73b03e1c38 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h index 141ffcd036..deb56658b6 100644 --- a/include/configs/pinebook-pro-rk3399.h +++ b/include/configs/pinebook-pro-rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Rockchip Electronics Co., Ltd * Copyright (C) 2020 Peter Robinson <pbrobinson at gmail.com> diff --git a/include/configs/pinephone-pro-rk3399.h b/include/configs/pinephone-pro-rk3399.h index 9cd4447343..d228158e27 100644 --- a/include/configs/pinephone-pro-rk3399.h +++ b/include/configs/pinephone-pro-rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Rockchip Electronics Co., Ltd * Copyright (C) 2022 Peter Robinson <pbrobinson at gmail.com> diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 30bfce9f50..fe8ece93d5 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index f4a34f261a..15dfac6895 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index cd9d21e420..d5c947d779 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 686411eee2..0f3b8840b3 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Ilko Iliev <iliev(a)ronetix.at> diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index b1354219c9..18a9535d41 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 * David Purdy <david.c.purdy(a)gmail.com> diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 3371579023..35ef7fc5b2 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2022 Tony Dinh <mibodhi(a)gmail.com> * diff --git a/include/configs/poleg.h b/include/configs/poleg.h index 1e96e838be..59f1b62058 100644 --- a/include/configs/poleg.h +++ b/include/configs/poleg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 Nuvoton Technology Corp. */ diff --git a/include/configs/pomelo.h b/include/configs/pomelo.h index 8e74dc4888..00770a5f16 100644 --- a/include/configs/pomelo.h +++ b/include/configs/pomelo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021 * lixinde <lixinde(a)phytium.com.cn> diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 6e8adf9187..ae325a3b4e 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Linaro * diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 222e5aae74..18d6a54ce1 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index df07df6a5a..e9a7b323ff 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Cortina Access Inc. * diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 969acc89b9..fac09d700a 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH */ diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 13ed901176..693d5aebf0 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/px30_core.h b/include/configs/px30_core.h index 01b4995598..cfb0b9fe94 100644 --- a/include/configs/px30_core.h +++ b/include/configs/px30_core.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020 Amarula Solutions(India) */ diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index b701e52076..0285097046 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * siemens pxm2 * (C) Copyright 2013 Siemens Schweiz AG diff --git a/include/configs/qcs404-evb.h b/include/configs/qcs404-evb.h index 8ea59aa21c..5d750e709c 100644 --- a/include/configs/qcs404-evb.h +++ b/include/configs/qcs404-evb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for QCS404 evaluation board * diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index e296f39879..13b63ee96b 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Tuomas Tynkkynen */ diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 20be4af462..6913615164 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011-2014 Freescale Semiconductor, Inc. */ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 584559cfa3..8db43957dc 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 9b0f5cedcd..a8a18991d1 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/configs/quartz64_rk3566.h b/include/configs/quartz64_rk3566.h index dfe0fee94c..bc0d96bb70 100644 --- a/include/configs/quartz64_rk3566.h +++ b/include/configs/quartz64_rk3566.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __QUARTZ64_RK3566_H #define __QUARTZ64_RK3566_H diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 2efb4d23cd..260ba97705 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 213caa7523..85f672306a 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/rcar-gen3-common.h * This file is R-Car Gen3 common configuration file. diff --git a/include/configs/rcar-gen4-common.h b/include/configs/rcar-gen4-common.h index c4f506df62..b690fc7a73 100644 --- a/include/configs/rcar-gen4-common.h +++ b/include/configs/rcar-gen4-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/rcar-gen4-common.h * This file is R-Car Gen4 common configuration file. diff --git a/include/configs/ringneck_px30.h b/include/configs/ringneck_px30.h index c63c935e9a..fd3816b5f5 100644 --- a/include/configs/ringneck_px30.h +++ b/include/configs/ringneck_px30.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Theobroma Systems Design und Consulting GmbH */ diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index c2abd14e11..29ff5a4d4e 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h index d70c8f77d4..4554f5140e 100644 --- a/include/configs/rk3066_common.h +++ b/include/configs/rk3066_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index d8269b0ec9..319683d736 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index a8cee1e44d..57ae96548e 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 15f77df3e1..293779e6a5 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 3063076a97..bd91cd10eb 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 861154fbeb..97e46c051c 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index e920ec7e5d..e3010032b1 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index ccb5369b90..f6b87d1931 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Andreas Färber */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 96ba19c659..a796f48ee7 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 1b7d3437b1..7a74f6638c 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h index 46389d087d..bdd2017723 100644 --- a/include/configs/rk3588_common.h +++ b/include/configs/rk3588_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 Rockchip Electronics Co., Ltd * Copyright (c) 2023 Edgeble AI Technologies Pvt. Ltd. diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index f99871cb9f..3286ac928b 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rock.h b/include/configs/rock.h index 96aefc1947..5478f67bc7 100644 --- a/include/configs/rock.h +++ b/include/configs/rock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/rock2.h b/include/configs/rock2.h index df96c32952..3199d6bd45 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/rock5a-rk3588s.h b/include/configs/rock5a-rk3588s.h index 9a2d3ee9f5..ea532df3c1 100644 --- a/include/configs/rock5a-rk3588s.h +++ b/include/configs/rock5a-rk3588s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 Collabora Ltd. */ diff --git a/include/configs/rock5b-rk3588.h b/include/configs/rock5b-rk3588.h index 4f75c80006..c5ffbf17e9 100644 --- a/include/configs/rock5b-rk3588.h +++ b/include/configs/rock5b-rk3588.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Collabora Ltd. */ diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h index b85978115f..a2d42ac870 100644 --- a/include/configs/rock960_rk3399.h +++ b/include/configs/rock960_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> */ diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba373..a187193f67 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rockpro64_rk3399.h b/include/configs/rockpro64_rk3399.h index 5381efac3f..06a2f91baa 100644 --- a/include/configs/rockpro64_rk3399.h +++ b/include/configs/rockpro64_rk3399.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Vasily Khoruzhick <anarsoul(a)gmail.com> */ diff --git a/include/configs/rut.h b/include/configs/rut.h index 4002bc4b6c..11e6e5dd31 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * siemens rut * (C) Copyright 2013 Siemens Schweiz AG diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h index 3bf70a0e0a..a6917e61e9 100644 --- a/include/configs/rv1108_common.h +++ b/include/configs/rv1108_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/rv1126_common.h b/include/configs/rv1126_common.h index a64c0c6364..db35102769 100644 --- a/include/configs/rv1126_common.h +++ b/include/configs/rv1126_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2019 Rockchip Electronics Co., Ltd * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd. diff --git a/include/configs/rzg2l-smarc.h b/include/configs/rzg2l-smarc.h index ea57d280cb..6afd194179 100644 --- a/include/configs/rzg2l-smarc.h +++ b/include/configs/rzg2l-smarc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Renesas Electronics Corporation */ diff --git a/include/configs/rzn1-snarc.h b/include/configs/rzn1-snarc.h index 9fee2ece54..166038ca71 100644 --- a/include/configs/rzn1-snarc.h +++ b/include/configs/rzn1-snarc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the Schneider RZ/N1 board */ diff --git a/include/configs/s5p4418_nanopi2.h b/include/configs/s5p4418_nanopi2.h index fec1bfd50e..08ad73e650 100644 --- a/include/configs/s5p4418_nanopi2.h +++ b/include/configs/s5p4418_nanopi2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) Guangzhou FriendlyARM Computer Tech. Co., Ltd. * (http://www.friendlyarm.com) diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d1ff00a27f..86b3ca1a6f 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index bf2d04a169..61b6cf3474 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2010 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/include/configs/sagem_f(a)st1704.h b/include/configs/sagem_f(a)st1704.h index d6d2014ef5..0d8486e58b 100644 --- a/include/configs/sagem_f(a)st1704.h +++ b/include/configs/sagem_f(a)st1704.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 8dc6702de4..1d2216a946 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/salvator-x.h * This file is Salvator-X board configuration. diff --git a/include/configs/sam9x60_curiosity.h b/include/configs/sam9x60_curiosity.h index e79f80f17f..fbb11017ab 100644 --- a/include/configs/sam9x60_curiosity.h +++ b/include/configs/sam9x60_curiosity.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the SAM9X60 CURIOSITY board. * diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index af504e0efa..db881c5b4c 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the SAM9X60EK board. * diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index d62146e779..3b6a56cff6 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D27 SOM1 EK Board. * diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h index 1979cb366e..584432c56c 100644 --- a/include/configs/sama5d27_wlsom1_ek.h +++ b/include/configs/sama5d27_wlsom1_ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D27 WLSOM1 EK Board. * diff --git a/include/configs/sama5d29_curiosity.h b/include/configs/sama5d29_curiosity.h index ef09b8b25b..c08b7b640d 100644 --- a/include/configs/sama5d29_curiosity.h +++ b/include/configs/sama5d29_curiosity.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D29 CURIOSITY board. * diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index a072b21dfb..9a70096ead 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D2 ICP Board. * diff --git a/include/configs/sama5d2_ptc_ek.h b/include/configs/sama5d2_ptc_ek.h index bf3c92bdf3..f28c3415e7 100644 --- a/include/configs/sama5d2_ptc_ek.h +++ b/include/configs/sama5d2_ptc_ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D2 PTC EK Board. * diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index da2ae964f9..59dc9f5c39 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA5D2 Xplained Board. * diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index 4b13a10117..a45abb552a 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the SAMA5D3 Xplained board. * diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 4f579ad9c5..a14e864490 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuation settings for the SAMA5D3xEK board. * diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 084cb4def6..83c2ced54a 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the SAMA5D4 Xplained ultra board. * diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index cbc1c0f465..fbf26f6b6f 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the SAMA5D4EK board. * diff --git a/include/configs/sama7g5ek.h b/include/configs/sama7g5ek.h index 59f13edbc8..9cdf31af3b 100644 --- a/include/configs/sama7g5ek.h +++ b/include/configs/sama7g5ek.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for the SAMA7G5EK Board. * diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 2372485c84..30537d7eaa 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h index f53688268e..b56edcb6c3 100644 --- a/include/configs/sandbox_spl.h +++ b/include/configs/sandbox_spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h index 673268dca9..73bac09b9f 100644 --- a/include/configs/sdm845.h +++ b/include/configs/sdm845.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration file for boards, based on Qualcomm SDM845 chip * diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 8e98620422..1f5806ed64 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/sei510.h b/include/configs/sei510.h index ea91a06157..60d12a2ef0 100644 --- a/include/configs/sei510.h +++ b/include/configs/sei510.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for the SEI510 * diff --git a/include/configs/sei610.h b/include/configs/sei610.h index 783eece271..39148827cf 100644 --- a/include/configs/sei610.h +++ b/include/configs/sei610.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for the SEI610 * diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h index 5400d1256e..a2d2890905 100644 --- a/include/configs/sfr_nb4_ser.h +++ b/include/configs/sfr_nb4_ser.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h index 08cc4bf356..b928b7858c 100644 --- a/include/configs/sheep_rk3368.h +++ b/include/configs/sheep_rk3368.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 4e0b3c663c..cbbebcb209 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 Tony Dinh <mibodhi(a)gmail.com> * (C) Copyright 2009-2014 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 7def657bcd..647b69d7ea 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * siemens am33x common board options * (C) Copyright 2013 Siemens Schweiz AG diff --git a/include/configs/siemens-env-common.h b/include/configs/siemens-env-common.h index 36fa5d936f..6770764118 100644 --- a/include/configs/siemens-env-common.h +++ b/include/configs/siemens-env-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Common env settings */ diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 2996b37572..608e0915ea 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 Western Digital Corporation or its affiliates. * diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 74150b7d4b..c3d1cff100 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020-2021 SiFive, Inc * diff --git a/include/configs/silinux-ek874.h b/include/configs/silinux-ek874.h index 346858c456..a13927d577 100644 --- a/include/configs/silinux-ek874.h +++ b/include/configs/silinux-ek874.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/silinux-ek874.h * This file is Silicon Linux EK874 board configuration. diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 760a0a5b91..45badeb8b1 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h index 85f6a968e0..beabc5560b 100644 --- a/include/configs/slimbootloader.h +++ b/include/configs/slimbootloader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Intel Corporation <www.intel.com> */ diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 75a1670e33..6afff98399 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2008 * Stelian Pop <stelian(a)popies.net> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index c6d2b23197..06374c33db 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 0cb70762d9..b1d348f3ee 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index c148757915..537eedc91e 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index f0604195ad..752cc70155 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 0aa25f9e2e..0356b66c60 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 NXP Semiconductors * Copyright (C) 2021 Fabio Estevam <festevam(a)denx.de> diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index df8ed451a4..17e73dc5f9 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Bluewater Systems Snapper 9G45 module * diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 45a3102aee..abd31b03b2 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * LG Optimus Black codename sniper config * diff --git a/include/configs/snow.h b/include/configs/snow.h index 00d9b4d416..4b80189df0 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 55168c2fb8..656eb70a3c 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017-2020 Hitachi Power Grids * diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index ca2d782744..319e9071b6 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 4838bfd4f1..a2feb930bf 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Altera Corporation <www.altera.com> */ diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index c23ba2325b..b68e049ee3 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_dbm_soc1.h b/include/configs/socfpga_dbm_soc1.h index 565a661258..a10e7594f5 100644 --- a/include/configs/socfpga_dbm_soc1.h +++ b/include/configs/socfpga_dbm_soc1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index a5e6511b51..a09215091e 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h index dfc22cf6e2..baa3ff521f 100644 --- a/include/configs/socfpga_de10_nano.h +++ b/include/configs/socfpga_de10_nano.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, Intel Corporation */ diff --git a/include/configs/socfpga_de10_standard.h b/include/configs/socfpga_de10_standard.h index b68b6e99dc..372d62514a 100644 --- a/include/configs/socfpga_de10_standard.h +++ b/include/configs/socfpga_de10_standard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022, Humberto Naves <hsnaves(a)gmail.com> * diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index 4b58bc48c4..46b38f058e 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index ad27179120..fd3fb3dcf8 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Marek Vasut <marex(a)denx.de> * Copyright (C) 2016 Pavel Machek <pavel(a)denx.de> diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index ac70d91e20..065a290481 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index a4aece9542..d1340aa8f6 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index f482005ce3..c48e9bbb13 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index caff0cf252..af90e2a0df 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 4bb15cf462..95975782b6 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2019 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 64cc17ca7c..8b46e101a6 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Sergei Poselenov, Emcraft Systems, sposelenov(a)emcraft.com. diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h index 5f7eabd3fc..8fe3c183d0 100644 --- a/include/configs/som-db5800-som-6867.h +++ b/include/configs/som-db5800-som-6867.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index 041a83b057..6f90067f03 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017-2019 A. Karas, SomLabs * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. diff --git a/include/configs/spider.h b/include/configs/spider.h index e9b7d6bad5..892fe542b5 100644 --- a/include/configs/spider.h +++ b/include/configs/spider.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/spider.h * This file is Spider board configuration. diff --git a/include/configs/spring.h b/include/configs/spring.h index 2f0a5807be..0b7eee0792 100644 --- a/include/configs/spring.h +++ b/include/configs/spring.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/configs/starfive-visionfive2.h b/include/configs/starfive-visionfive2.h index ff43113f24..ae3b15e194 100644 --- a/include/configs/starfive-visionfive2.h +++ b/include/configs/starfive-visionfive2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * Author: Yanhong Wang<yanhong.wang(a)starfivetech.com> diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index b3fce50316..daeff81f0b 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index de5019a364..5a5953a47c 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 * Kamil Lulko, <kamil.lulko(a)gmail.com> diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index a4f3e43dc5..04478c6e75 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) STMicroelectronics SA 2017 * Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 62a7e9af0c..01bc750a41 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) STMicroelectronics SA 2017 * Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 00ec9efba5..bc44afaf62 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index d36cd6fdd4..f9d4fde4df 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 8f242bf0ff..bb725bae72 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index d27b6a3d1d..a7643e30eb 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2021, STMicroelectronics - All Rights Reserved * Author(s): Dillon Min <dillon.minfei(a)gmail.com> diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index 29a1197b5a..21155c3ce5 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 8ff882264f..48177db87e 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2020 Marek Vasut <marex(a)denx.de> * diff --git a/include/configs/stm32mp15_st_common.h b/include/configs/stm32mp15_st_common.h index 60838cb0e3..8416740101 100644 --- a/include/configs/stm32mp15_st_common.h +++ b/include/configs/stm32mp15_st_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2021, STMicroelectronics - All Rights Reserved * diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index af5da096b7..c2041c3234 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sysam stmark2 board configuration * diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 7eadb6d421..217e94696a 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha(a)st.com> for STMicroelectronics. diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 70d451f224..7741dde81a 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index dfcb321d42..08a5df0ea6 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Placeholder wrapper to allow addressing Allwinner A64 (and later) sun50i * CPU based devices separately. Please do not add anything in here. diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index 3017307854..60391d96a8 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index cbe04ac3c2..03c35b6ad1 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl(a)lkcl.net> diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index ad24ab98b5..1e37bf2925 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013 Henrik Nordstrom <henrik(a)henriknordstrom.net> * (C) Copyright 2013 Luke Kenneth Casson Leighton <lkcl(a)lkcl.net> diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index b6cd8d39a8..8fe7772816 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Chen-Yu Tsai <wens(a)csie.org> * diff --git a/include/configs/sun9i.h b/include/configs/sun9i.h index 6bf5fc3f66..4132ea8e0d 100644 --- a/include/configs/sun9i.h +++ b/include/configs/sun9i.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Hans de Goede <hdegoede(a)redhat.com> * diff --git a/include/configs/suniv.h b/include/configs/suniv.h index 9cc1a77f6c..50365b44ee 100644 --- a/include/configs/suniv.h +++ b/include/configs/suniv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Placeholder wrapper to allow addressing Allwinner F-series (suniv) CPU * based devices separately. Please do not add anything in here. diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d2d70f0fc2..5b60fb29a6 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2012 Henrik Nordstrom <henrik(a)henriknordstrom.net> * diff --git a/include/configs/syzygy_hub.h b/include/configs/syzygy_hub.h index e8a207f541..dfeb9d86c2 100644 --- a/include/configs/syzygy_hub.h +++ b/include/configs/syzygy_hub.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Xilinx * (C) Copyright 2017 Opal Kelly Inc. diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 174b848e25..835301983a 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common board functions for Siemens TAURUS (AT91SAM9G20) based boards * (C) Copyright 2013 Siemens AG diff --git a/include/configs/tb100.h b/include/configs/tb100.h index 1318f5e5ee..b46102193e 100644 --- a/include/configs/tb100.h +++ b/include/configs/tb100.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011-2014 Pierrick Hascoet, Abilis Systems */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 256331ae17..ee4f4b1200 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Soeren Moch <smoch(a)web.de> * diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 5e49abb49f..37036318d2 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Avionic Design GmbH <www.avionic-design.de> diff --git a/include/configs/tec.h b/include/configs/tec.h index 05dd7c96f6..2edd8a424f 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0d0965ecce..a65cc82798 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index c558679d04..2c1cbb0f58 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h index b413e25121..c483042909 100644 --- a/include/configs/tegra124-common.h +++ b/include/configs/tegra124-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h index a313ac2041..24e7f2f4c8 100644 --- a/include/configs/tegra20-common.h +++ b/include/configs/tegra20-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h index 7f361d874a..4c2ea33330 100644 --- a/include/configs/tegra210-common.h +++ b/include/configs/tegra210-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2015 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h index c57d2d157e..5b8c610e52 100644 --- a/include/configs/tegra30-common.h +++ b/include/configs/tegra30-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/ten64.h b/include/configs/ten64.h index d2bef9b6e5..62060b3ea3 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP * Copyright 2019-2021 Traverse Technologies diff --git a/include/configs/th1520_lpi4a.h b/include/configs/th1520_lpi4a.h index 87496a52c4..739dc7a480 100644 --- a/include/configs/th1520_lpi4a.h +++ b/include/configs/th1520_lpi4a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 Yixun Lan <dlan(a)gentoo.org> * diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h index 46aef23821..496484ed6c 100644 --- a/include/configs/theadorable-x86-common.h +++ b/include/configs/theadorable-x86-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/theadorable-x86-conga-qa3-e3845.h b/include/configs/theadorable-x86-conga-qa3-e3845.h index 1c4362db51..569d041f61 100644 --- a/include/configs/theadorable-x86-conga-qa3-e3845.h +++ b/include/configs/theadorable-x86-conga-qa3-e3845.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/theadorable-x86-dfi-bt700.h b/include/configs/theadorable-x86-dfi-bt700.h index 663a49e7b6..46f68a0b44 100644 --- a/include/configs/theadorable-x86-dfi-bt700.h +++ b/include/configs/theadorable-x86-dfi-bt700.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 2ce92845f1..e3e41a59f7 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index a5913e1e7d..643a76ed97 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 Siemens Schweiz AG * (C) Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 2bca86bed9..d0203f241d 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /** * (C) Copyright 2014, Cavium Inc. **/ diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 20f8643771..92f2e9cea4 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ti_am335x_common.h * diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 4e30d0d2dd..3658adcebb 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ti_armv7_common.h * diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 72c04d8a99..fb7b7e562e 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common configuration header file for all Keystone II EVM platforms * diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index d34042af46..0db78b1686 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ti_armv7_omap.h * diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 36a05b6896..ee8b810332 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * ti_omap3_common.h * diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index c4f116aabf..e2d8efe6a1 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments Incorporated. diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 4e5aa74147..835b680194 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Texas Instruments Incorporated. diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h index 053c9032e2..8ea1312fcb 100644 --- a/include/configs/tinker_rk3288.h +++ b/include/configs/tinker_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 3795e6152f..f2c2d9eee8 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Topic Embedded Products * diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index a8bd8e259c..da63148e82 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Total Compute platform. Parts were derived from other ARM * configurations. diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 24943c8dcf..b902589684 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Marek Vasut <marex(a)denx.de> */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 8c75a75a9e..4424dd37f7 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013, 2014, 2017 Markus Niebel <Markus.Niebel(a)tq-group.com> * diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h index b5871424bc..424fc7345d 100644 --- a/include/configs/tqma6_mba6.h +++ b/include/configs/tqma6_mba6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 - 2017 Markus Niebel <Markus.Niebel(a)tq-group.com> * diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index e06fc7fe15..45fbc72911 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Stefan Roese <sr(a)denx.de> */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 2067327918..a5853ac6e3 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 9925531aba..5d1ca481d4 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Sanghee Kim <sh0130.kim(a)samsung.com> diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 7d1ff2afd1..d69d39e6c5 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 3443c80d06..89392a00bb 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Marek Behún <kabel(a)kernel.org> * diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 47b220ff9e..d1e78045b8 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Marek Behún <kabel(a)kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek(a)nic.cz> diff --git a/include/configs/udoo.h b/include/configs/udoo.h index d85cf7808c..8c325e6afb 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 4ecd71f965..b345890184 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2015 Freescale Semiconductor, Inc. * Copyright Jasbir Matharu diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index 6e03375c6c..81b733a5eb 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/ulcb.h * This file is ULCB board configuration. diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 0a14d0448c..2f25e196bc 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012-2015 Panasonic Corporation * Copyright (C) 2015-2016 Socionext Inc. diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index b90e047955..d5bf311124 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2013 * Stelian Pop <stelian.pop(a)leadtechdesign.com> diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 27e61f5b8f..f234c8c577 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * USB armory MkI board configuration settings * http://inversepath.com/usbarmory diff --git a/include/configs/v3hsk.h b/include/configs/v3hsk.h index 58c2e88c0b..d384de9c23 100644 --- a/include/configs/v3hsk.h +++ b/include/configs/v3hsk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/v3hsk.h * This file is V3HSK board configuration. diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h index 2e150276e7..ed3bd36dea 100644 --- a/include/configs/vcoreiii.h +++ b/include/configs/vcoreiii.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 353b5ea67c..0f9a5226ea 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013-2014 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 1d9c60ca7c..0c6b300e72 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 8072d5d503..ad1e459228 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020-2021 Toradex */ diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 43f7e454d8..b0f009a6d3 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Versatile Express. Parts were derived from other ARM * configurations. diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index ba3f9797a5..910eaab699 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 Linaro * Ryan Harkin, <ryan.harkin(a)linaro.org> diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 2c1507a818..a41dccc583 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 ARM Limited * (C) Copyright 2010 Linaro diff --git a/include/configs/veyron.h b/include/configs/veyron.h index ce9441d71f..5e990ecc05 100644 --- a/include/configs/veyron.h +++ b/include/configs/veyron.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc */ diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index d10b88f157..257e3195f2 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 68c56df543..cd2b7770d2 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration settings for the VInCo platform. * diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 30654191a2..0102175c58 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 samtec automotive software & electronics gmbh * diff --git a/include/configs/vocore2.h b/include/configs/vocore2.h index eb87633661..1c0fb7c728 100644 --- a/include/configs/vocore2.h +++ b/include/configs/vocore2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Mauro Condarelli <mc5686(a)mclink.it> */ diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h index 81ff61bf7a..9cdae845c6 100644 --- a/include/configs/vyasa-rk3288.h +++ b/include/configs/vyasa-rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Amarula Solutions * diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 7b8c5cbe7a..4532647664 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Freescale Semiconductor, Inc. * diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 5d2956a596..661c7bd889 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 NXP Semiconductors * diff --git a/include/configs/whitehawk.h b/include/configs/whitehawk.h index 4b4cf63596..6858bc355a 100644 --- a/include/configs/whitehawk.h +++ b/include/configs/whitehawk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/configs/whitehawk.h * This file is White Hawk board configuration. diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index f1a7853a80..6bfaf0e18f 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * WORK Microwave work_92105 board configuration file * diff --git a/include/configs/x240.h b/include/configs/x240.h index 3601df588d..dec1946298 100644 --- a/include/configs/x240.h +++ b/include/configs/x240.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Allied Telesis */ diff --git a/include/configs/x530.h b/include/configs/x530.h index e1678e79e4..4edc16e817 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Allied Telesis Labs */ diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 6bf90c7de4..2f6a35376d 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8bd0716c08..f61cc62b95 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2008 diff --git a/include/configs/xea.h b/include/configs/xea.h index 04ca5aa12a..1d735240d6 100644 --- a/include/configs/xea.h +++ b/include/configs/xea.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/configs/xenguest_arm64.h b/include/configs/xenguest_arm64.h index 3dce25b60e..ba3059c2a5 100644 --- a/include/configs/xenguest_arm64.h +++ b/include/configs/xenguest_arm64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) Copyright 2020 EPAM Systemc Inc. */ diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index b634bb1ab7..c6f82cba43 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Xilinx Versal * (C) Copyright 2016 - 2018 Xilinx, Inc. diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 5bc117e190..f8571a626d 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Xilinx ZynqMP * (C) Copyright 2014 - 2015 Xilinx, Inc. diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 8afccb7f73..220b1ca741 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Xilinx ZynqMP Flash utility * diff --git a/include/configs/xilinx_zynqmp_mini_nand.h b/include/configs/xilinx_zynqmp_mini_nand.h index cf3747aab1..7899d199ce 100644 --- a/include/configs/xilinx_zynqmp_mini_nand.h +++ b/include/configs/xilinx_zynqmp_mini_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Configuration for Xilinx ZynqMP Nand Flash utility * diff --git a/include/configs/xpress.h b/include/configs/xpress.h index a2aa31008e..51fe312a8a 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Stefan Roese <sr(a)denx.de> * diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 9655b666ed..410a6d229d 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2007-2013 Tensilica, Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 553bb1b45b..188138b067 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Michal Simek <monstr(a)monstr.eu> * (C) Copyright 2013 - 2018 Xilinx, Inc. diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index a9bb5bb90a..df13da2420 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 - 2017 Xilinx. * diff --git a/include/console.h b/include/console.h index ceb733b5cb..6b234f3fd5 100644 --- a/include/console.h +++ b/include/console.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/cortina.h b/include/cortina.h index ba7fafe9c4..e31f6f476f 100644 --- a/include/cortina.h +++ b/include/cortina.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Cortina PHY drivers * diff --git a/include/cp1250.h b/include/cp1250.h index adacf8a958..553ec5fe05 100644 --- a/include/cp1250.h +++ b/include/cp1250.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Constant CP1250 contains the Unicode code points for characters 0x80 - 0xff diff --git a/include/cp437.h b/include/cp437.h index 0b2b97132e..87a0766fc4 100644 --- a/include/cp437.h +++ b/include/cp437.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Constant CP437 contains the Unicode code points for characters 0x80 - 0xff diff --git a/include/cpu.h b/include/cpu.h index be02a16712..a2b54ae350 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/cpu_func.h b/include/cpu_func.h index 45e8a0a057..43f1b3b8dd 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/cros_ec.h b/include/cros_ec.h index 94c988a7d6..de0eebac5f 100644 --- a/include/cros_ec.h +++ b/include/cros_ec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chromium OS cros_ec driver * diff --git a/include/cros_ec_message.h b/include/cros_ec_message.h index 977951b30d..1fefa0ab34 100644 --- a/include/cros_ec_message.h +++ b/include/cros_ec_message.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Chromium OS Matrix Keyboard Message Protocol definitions * diff --git a/include/crypt.h b/include/crypt.h index 3301f3b769..386f11c663 100644 --- a/include/crypt.h +++ b/include/crypt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> */ /** diff --git a/include/crypto/ecdsa-uclass.h b/include/crypto/ecdsa-uclass.h index 189843820a..70f0781369 100644 --- a/include/crypto/ecdsa-uclass.h +++ b/include/crypto/ecdsa-uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Alexandru Gagniuc <mr.nuke.me(a)gmail.com> */ diff --git a/include/cyclic.h b/include/cyclic.h index 44ad3cb6b8..7bdce78406 100644 --- a/include/cyclic.h +++ b/include/cyclic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * A general-purpose cyclic execution infrastructure, to allow "small" * (run-time wise) functions to be executed at a specified frequency. diff --git a/include/debug_uart.h b/include/debug_uart.h index 714b369e6f..045d51466a 100644 --- a/include/debug_uart.h +++ b/include/debug_uart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Early debug UART support * diff --git a/include/dfu.h b/include/dfu.h index 07922224ef..291cc891e1 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * dfu.h - DFU flashable area description * diff --git a/include/dialog_pmic.h b/include/dialog_pmic.h index fbfc5360d0..f6840e0be4 100644 --- a/include/dialog_pmic.h +++ b/include/dialog_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * da9053 register declarations. * diff --git a/include/display.h b/include/display.h index 3d01217644..62013379c3 100644 --- a/include/display.h +++ b/include/display.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Google Inc. */ diff --git a/include/display_options.h b/include/display_options.h index 85dacbc759..e2cb24dbec 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * diff --git a/include/dm-demo.h b/include/dm-demo.h index 7b6d0d80ff..46a1b5b6e6 100644 --- a/include/dm-demo.h +++ b/include/dm-demo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc */ diff --git a/include/dm.h b/include/dm.h index a1b84169e6..345efe4cd2 100644 --- a/include/dm.h +++ b/include/dm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc */ diff --git a/include/dm/acpi.h b/include/dm/acpi.h index 3adfe21767..0ff146b3e9 100644 --- a/include/dm/acpi.h +++ b/include/dm/acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Core ACPI (Advanced Configuration and Power Interface) support * diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h index f31c470208..502a429e4e 100644 --- a/include/dm/device-internal.h +++ b/include/dm/device-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google, Inc * diff --git a/include/dm/device.h b/include/dm/device.h index add67f9ec0..c8e7f02bcf 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/device_compat.h b/include/dm/device_compat.h index aa9a6fbb5e..4b4c88170a 100644 --- a/include/dm/device_compat.h +++ b/include/dm/device_compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> * Copyright (c) 2013 Google, Inc diff --git a/include/dm/devres.h b/include/dm/devres.h index 697534aa5b..53753532e0 100644 --- a/include/dm/devres.h +++ b/include/dm/devres.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro(a)socionext.com> * diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h index bf8132deb8..3a92ac3827 100644 --- a/include/dm/fdtaddr.h +++ b/include/dm/fdtaddr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * diff --git a/include/dm/lists.h b/include/dm/lists.h index 97236f8fa0..3bb5ecbd70 100644 --- a/include/dm/lists.h +++ b/include/dm/lists.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/of.h b/include/dm/of.h index b1c934f610..055bc232f7 100644 --- a/include/dm/of.h +++ b/include/dm/of.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/dm/of_access.h b/include/dm/of_access.h index de740d4467..7e8cb37764 100644 --- a/include/dm/of_access.h +++ b/include/dm/of_access.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Originally from Linux v4.9 * Copyright (C) 1996-2005 Paul Mackerras. diff --git a/include/dm/of_addr.h b/include/dm/of_addr.h index e7f3a28081..a80c9f4b4f 100644 --- a/include/dm/of_addr.h +++ b/include/dm/of_addr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Taken from Linux v4.9 drivers/of/address.c * diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h index 17e85a819b..21c4d6743d 100644 --- a/include/dm/of_extra.h +++ b/include/dm/of_extra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 19e97a9032..96831ad586 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/dm/ofnode_decl.h b/include/dm/ofnode_decl.h index 5c2115aab0..d1a8bde20f 100644 --- a/include/dm/ofnode_decl.h +++ b/include/dm/ofnode_decl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/dm/pci.h b/include/dm/pci.h index d35d24d959..a4f3814d9e 100644 --- a/include/dm/pci.h +++ b/include/dm/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 Google, Inc */ diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index 70d8cc5eca..2089a3640c 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@com> */ diff --git a/include/dm/platdata.h b/include/dm/platdata.h index 47ba8aab7a..cb044eab5e 100644 --- a/include/dm/platdata.h +++ b/include/dm/platdata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/platform_data/fsl_espi.h b/include/dm/platform_data/fsl_espi.h index de2307f7fb..3b06a7ed7a 100644 --- a/include/dm/platform_data/fsl_espi.h +++ b/include/dm/platform_data/fsl_espi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/dm/platform_data/pfe_dm_eth.h b/include/dm/platform_data/pfe_dm_eth.h index 100a981a38..088dea2fbd 100644 --- a/include/dm/platform_data/pfe_dm_eth.h +++ b/include/dm/platform_data/pfe_dm_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/dm/platform_data/serial_bcm283x_mu.h b/include/dm/platform_data/serial_bcm283x_mu.h index 6c77272e80..3af8af061a 100644 --- a/include/dm/platform_data/serial_bcm283x_mu.h +++ b/include/dm/platform_data/serial_bcm283x_mu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 Stephen Warren <swarren(a)wwwdotorg.org> * diff --git a/include/dm/platform_data/serial_coldfire.h b/include/dm/platform_data/serial_coldfire.h index 5e265e9087..adc9eea8b4 100644 --- a/include/dm/platform_data/serial_coldfire.h +++ b/include/dm/platform_data/serial_coldfire.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/include/dm/platform_data/serial_mxc.h b/include/dm/platform_data/serial_mxc.h index cc59eeb1dd..3f4ac04d53 100644 --- a/include/dm/platform_data/serial_mxc.h +++ b/include/dm/platform_data/serial_mxc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/include/dm/platform_data/serial_pl01x.h b/include/dm/platform_data/serial_pl01x.h index 811697ce5c..c94d30c4c1 100644 --- a/include/dm/platform_data/serial_pl01x.h +++ b/include/dm/platform_data/serial_pl01x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/include/dm/platform_data/serial_sh.h b/include/dm/platform_data/serial_sh.h index 1a20285d92..5d88083926 100644 --- a/include/dm/platform_data/serial_sh.h +++ b/include/dm/platform_data/serial_sh.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> * Copyright (c) 2014 Renesas Electronics Corporation diff --git a/include/dm/platform_data/spi_coldfire.h b/include/dm/platform_data/spi_coldfire.h index 0d534b1d66..228d306e71 100644 --- a/include/dm/platform_data/spi_coldfire.h +++ b/include/dm/platform_data/spi_coldfire.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Angelo Dureghello <angelo(a)sysam.it> */ diff --git a/include/dm/platform_data/spi_davinci.h b/include/dm/platform_data/spi_davinci.h index 42a467e40b..481f9eb57d 100644 --- a/include/dm/platform_data/spi_davinci.h +++ b/include/dm/platform_data/spi_davinci.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2018 Jagan Teki <jagan(a)amarulasolutions.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __spi_davinci_h diff --git a/include/dm/read.h b/include/dm/read.h index 894bc698bb..2e40457d37 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Function to read values from the device tree node attached to a udevice. * diff --git a/include/dm/root.h b/include/dm/root.h index b2f30a842f..40681515dc 100644 --- a/include/dm/root.h +++ b/include/dm/root.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/simple_bus.h b/include/dm/simple_bus.h index b7104013c0..97c4f9cce8 100644 --- a/include/dm/simple_bus.h +++ b/include/dm/simple_bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Google LLC */ diff --git a/include/dm/tag.h b/include/dm/tag.h index 745088ffcf..36de13552f 100644 --- a/include/dm/tag.h +++ b/include/dm/tag.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 Linaro Limited * Author: AKASHI Takahiro diff --git a/include/dm/test.h b/include/dm/test.h index b593750921..de79d76c86 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc. */ diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index a6045f5cc8..78655684a8 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h index 3ddcdd2143..56892bdc22 100644 --- a/include/dm/uclass-internal.h +++ b/include/dm/uclass-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 456eef7f2f..26dc2d7697 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc * diff --git a/include/dm/util.h b/include/dm/util.h index 89206cc496..39973cd196 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc */ diff --git a/include/dma-uclass.h b/include/dma-uclass.h index ea721baae6..176c361b85 100644 --- a/include/dma-uclass.h +++ b/include/dma-uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * Copyright (C) 2015 - 2018 Texas Instruments Incorporated <www.ti.com> diff --git a/include/dma.h b/include/dma.h index 9b39221227..db076a5a86 100644 --- a/include/dma.h +++ b/include/dma.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * Copyright (C) 2015 - 2018 Texas Instruments Incorporated <www.ti.com> diff --git a/include/dsi_host.h b/include/dsi_host.h index 83f8839db6..99eb4bc179 100644 --- a/include/dsi_host.h +++ b/include/dsi_host.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Yannick Fertre <yannick.fertre(a)st.com> for STMicroelectronics. diff --git a/include/dt-bindings/clk/mpc83xx-clk.h b/include/dt-bindings/clk/mpc83xx-clk.h index db4ea15cf4..7721d85243 100644 --- a/include/dt-bindings/clk/mpc83xx-clk.h +++ b/include/dt-bindings/clk/mpc83xx-clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/include/dt-bindings/clock/actions,s900-cmu.h b/include/dt-bindings/clock/actions,s900-cmu.h index 7c1251565f..92bca909cd 100644 --- a/include/dt-bindings/clock/actions,s900-cmu.h +++ b/include/dt-bindings/clock/actions,s900-cmu.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later // // Device Tree binding constants for Actions Semi S900 Clock Management Unit // diff --git a/include/dt-bindings/clock/ast2600-clock.h b/include/dt-bindings/clock/ast2600-clock.h index 36294a5140..3bd6269db7 100644 --- a/include/dt-bindings/clock/ast2600-clock.h +++ b/include/dt-bindings/clock/ast2600-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) ASPEED Technology Inc. */ diff --git a/include/dt-bindings/clock/axg-aoclkc.h b/include/dt-bindings/clock/axg-aoclkc.h index 8ec4a269c7..0d5e126093 100644 --- a/include/dt-bindings/clock/axg-aoclkc.h +++ b/include/dt-bindings/clock/axg-aoclkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Copyright (c) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/clock/axg-clkc.h b/include/dt-bindings/clock/axg-clkc.h index 93752ea107..cf2112da71 100644 --- a/include/dt-bindings/clock/axg-clkc.h +++ b/include/dt-bindings/clock/axg-clkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Meson-AXG clock tree IDs * diff --git a/include/dt-bindings/clock/bcm3380-clock.h b/include/dt-bindings/clock/bcm3380-clock.h index 998d08f5bb..7e0d35a15b 100644 --- a/include/dt-bindings/clock/bcm3380-clock.h +++ b/include/dt-bindings/clock/bcm3380-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6318-clock.h b/include/dt-bindings/clock/bcm6318-clock.h index 3f10448cef..0ffae3317f 100644 --- a/include/dt-bindings/clock/bcm6318-clock.h +++ b/include/dt-bindings/clock/bcm6318-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm63268-clock.h b/include/dt-bindings/clock/bcm63268-clock.h index 2725dcd06b..f99d40d77d 100644 --- a/include/dt-bindings/clock/bcm63268-clock.h +++ b/include/dt-bindings/clock/bcm63268-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6328-clock.h b/include/dt-bindings/clock/bcm6328-clock.h index 6f1e018a74..9fd70fb3cc 100644 --- a/include/dt-bindings/clock/bcm6328-clock.h +++ b/include/dt-bindings/clock/bcm6328-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6338-clock.h b/include/dt-bindings/clock/bcm6338-clock.h index 489aa1f95a..b8e0b27d66 100644 --- a/include/dt-bindings/clock/bcm6338-clock.h +++ b/include/dt-bindings/clock/bcm6338-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6348-clock.h b/include/dt-bindings/clock/bcm6348-clock.h index c67a7fea2f..3768d4a7b1 100644 --- a/include/dt-bindings/clock/bcm6348-clock.h +++ b/include/dt-bindings/clock/bcm6348-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6358-clock.h b/include/dt-bindings/clock/bcm6358-clock.h index a7529bcc03..d6ed112892 100644 --- a/include/dt-bindings/clock/bcm6358-clock.h +++ b/include/dt-bindings/clock/bcm6358-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6362-clock.h b/include/dt-bindings/clock/bcm6362-clock.h index d3770c5049..86c1fc567a 100644 --- a/include/dt-bindings/clock/bcm6362-clock.h +++ b/include/dt-bindings/clock/bcm6362-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/bcm6368-clock.h b/include/dt-bindings/clock/bcm6368-clock.h index 0c85782632..3a94d94800 100644 --- a/include/dt-bindings/clock/bcm6368-clock.h +++ b/include/dt-bindings/clock/bcm6368-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h index e916e49ff2..bcedf83035 100644 --- a/include/dt-bindings/clock/g12a-aoclkc.h +++ b/include/dt-bindings/clock/g12a-aoclkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Copyright (c) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index a93b58c5e1..0ec5baef66 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */ /* * Meson-G12A clock tree IDs * diff --git a/include/dt-bindings/clock/imx7ulp-clock.h b/include/dt-bindings/clock/imx7ulp-clock.h index b58370d146..a7eb63ae15 100644 --- a/include/dt-bindings/clock/imx7ulp-clock.h +++ b/include/dt-bindings/clock/imx7ulp-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. * Copyright 2017~2018 NXP diff --git a/include/dt-bindings/clock/imx8qm-clock.h b/include/dt-bindings/clock/imx8qm-clock.h index 58de976e63..738165dc43 100644 --- a/include/dt-bindings/clock/imx8qm-clock.h +++ b/include/dt-bindings/clock/imx8qm-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/clock/imx8qxp-clock.h b/include/dt-bindings/clock/imx8qxp-clock.h index d0334ea398..aa5555b192 100644 --- a/include/dt-bindings/clock/imx8qxp-clock.h +++ b/include/dt-bindings/clock/imx8qxp-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/clock/imx8ulp-clock.h b/include/dt-bindings/clock/imx8ulp-clock.h index 953ecfe8eb..b1b3550ac3 100644 --- a/include/dt-bindings/clock/imx8ulp-clock.h +++ b/include/dt-bindings/clock/imx8ulp-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */ /* * Copyright 2021 NXP */ diff --git a/include/dt-bindings/clock/imx93-clock.h b/include/dt-bindings/clock/imx93-clock.h index 35a1f62053..d4ec3c118b 100644 --- a/include/dt-bindings/clock/imx93-clock.h +++ b/include/dt-bindings/clock/imx93-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */ /* * Copyright 2022 NXP */ diff --git a/include/dt-bindings/clock/imxrt1020-clock.h b/include/dt-bindings/clock/imxrt1020-clock.h index 836244358b..dd2405db52 100644 --- a/include/dt-bindings/clock/imxrt1020-clock.h +++ b/include/dt-bindings/clock/imxrt1020-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright(C) 2020 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/include/dt-bindings/clock/imxrt1050-clock.h b/include/dt-bindings/clock/imxrt1050-clock.h index 93bef0832d..40c7bce447 100644 --- a/include/dt-bindings/clock/imxrt1050-clock.h +++ b/include/dt-bindings/clock/imxrt1050-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright(C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/include/dt-bindings/clock/imxrt1170-clock.h b/include/dt-bindings/clock/imxrt1170-clock.h index 8ab8018a15..b8f40e50e4 100644 --- a/include/dt-bindings/clock/imxrt1170-clock.h +++ b/include/dt-bindings/clock/imxrt1170-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 * Author(s): Jesse Taube <Mr.Bossman075(a)gmail.com> diff --git a/include/dt-bindings/clock/intel-clock.h b/include/dt-bindings/clock/intel-clock.h index e1edd3c71d..4fac3b50f2 100644 --- a/include/dt-bindings/clock/intel-clock.h +++ b/include/dt-bindings/clock/intel-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header provides constants for Intel clocks. * diff --git a/include/dt-bindings/clock/jz4780-cgu.h b/include/dt-bindings/clock/jz4780-cgu.h index 73214c52c0..c11ef5753b 100644 --- a/include/dt-bindings/clock/jz4780-cgu.h +++ b/include/dt-bindings/clock/jz4780-cgu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header provides clock numbers for the ingenic,jz4780-cgu DT binding. * diff --git a/include/dt-bindings/clock/k210-sysctl.h b/include/dt-bindings/clock/k210-sysctl.h index 6b0d5b46f8..fbf16ba3ef 100644 --- a/include/dt-bindings/clock/k210-sysctl.h +++ b/include/dt-bindings/clock/k210-sysctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-21 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/dt-bindings/clock/microchip,clock.h b/include/dt-bindings/clock/microchip,clock.h index ea6f161f97..09c4446afc 100644 --- a/include/dt-bindings/clock/microchip,clock.h +++ b/include/dt-bindings/clock/microchip,clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (c) 2015 Purna Chandra Mandal <purna.mandal(a)microchip.com> * diff --git a/include/dt-bindings/clock/octeon-clock.h b/include/dt-bindings/clock/octeon-clock.h index 34e6a3bf41..52ca02f7c9 100644 --- a/include/dt-bindings/clock/octeon-clock.h +++ b/include/dt-bindings/clock/octeon-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Stefan Roese <sr(a)denx.de> */ diff --git a/include/dt-bindings/clock/r8a7790-cpg-mssr.h b/include/dt-bindings/clock/r8a7790-cpg-mssr.h index c5955b56b3..83773f8513 100644 --- a/include/dt-bindings/clock/r8a7790-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7790-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7791-cpg-mssr.h b/include/dt-bindings/clock/r8a7791-cpg-mssr.h index aadd06c566..8e3c14518e 100644 --- a/include/dt-bindings/clock/r8a7791-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7791-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7792-cpg-mssr.h b/include/dt-bindings/clock/r8a7792-cpg-mssr.h index 829c44db02..6fb44676bd 100644 --- a/include/dt-bindings/clock/r8a7792-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7792-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7793-cpg-mssr.h b/include/dt-bindings/clock/r8a7793-cpg-mssr.h index d1ff646c31..33d5dab8ab 100644 --- a/include/dt-bindings/clock/r8a7793-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7793-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h index 649f005782..221a1bf5d3 100644 --- a/include/dt-bindings/clock/r8a7794-clock.h +++ b/include/dt-bindings/clock/r8a7794-clock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2014 Renesas Electronics Corporation * Copyright 2013 Ideas On Board SPRL diff --git a/include/dt-bindings/clock/r8a7794-cpg-mssr.h b/include/dt-bindings/clock/r8a7794-cpg-mssr.h index 6314e23b51..6db15eb33a 100644 --- a/include/dt-bindings/clock/r8a7794-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7794-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7795-cpg-mssr.h b/include/dt-bindings/clock/r8a7795-cpg-mssr.h index 92b3e2a951..fb6ef37350 100644 --- a/include/dt-bindings/clock/r8a7795-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7795-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2015 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a7796-cpg-mssr.h b/include/dt-bindings/clock/r8a7796-cpg-mssr.h index c0957cf458..15136ec776 100644 --- a/include/dt-bindings/clock/r8a7796-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a7796-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a77961-cpg-mssr.h b/include/dt-bindings/clock/r8a77961-cpg-mssr.h index 7921d78554..10c31d8cb6 100644 --- a/include/dt-bindings/clock/r8a77961-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a77961-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2019 Renesas Electronics Corp. */ diff --git a/include/dt-bindings/clock/r8a77970-cpg-mssr.h b/include/dt-bindings/clock/r8a77970-cpg-mssr.h index 6145ebe663..1b72f71564 100644 --- a/include/dt-bindings/clock/r8a77970-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a77970-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2016 Renesas Electronics Corp. * Copyright (C) 2017 Cogent Embedded, Inc. diff --git a/include/dt-bindings/clock/r8a77980-cpg-mssr.h b/include/dt-bindings/clock/r8a77980-cpg-mssr.h index a4c0d76c39..0d3e31a18d 100644 --- a/include/dt-bindings/clock/r8a77980-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a77980-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Renesas Electronics Corp. * Copyright (C) 2018 Cogent Embedded, Inc. diff --git a/include/dt-bindings/clock/r8a77995-cpg-mssr.h b/include/dt-bindings/clock/r8a77995-cpg-mssr.h index fd701c4e87..a7819f73ca 100644 --- a/include/dt-bindings/clock/r8a77995-cpg-mssr.h +++ b/include/dt-bindings/clock/r8a77995-cpg-mssr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (C) 2017 Glider bvba */ diff --git a/include/dt-bindings/clock/rk3036-cru.h b/include/dt-bindings/clock/rk3036-cru.h index 2c0552d1a9..ac2d7a83b6 100644 --- a/include/dt-bindings/clock/rk3036-cru.h +++ b/include/dt-bindings/clock/rk3036-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/include/dt-bindings/clock/rk3066a-cru.h b/include/dt-bindings/clock/rk3066a-cru.h index 014eec5866..553f972835 100644 --- a/include/dt-bindings/clock/rk3066a-cru.h +++ b/include/dt-bindings/clock/rk3066a-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/include/dt-bindings/clock/rk3188-cru.h b/include/dt-bindings/clock/rk3188-cru.h index 1da306e178..c45916ae68 100644 --- a/include/dt-bindings/clock/rk3188-cru.h +++ b/include/dt-bindings/clock/rk3188-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 MundoReader S.L. * Author: Heiko Stuebner <heiko(a)sntech.de> diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h index 211faf8fa8..3c3c79f50d 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Rockchip Electronics Co. Ltd. */ diff --git a/include/dt-bindings/clock/rockchip,rv1126-cru.h b/include/dt-bindings/clock/rockchip,rv1126-cru.h index e89a3a5a4a..5efe9faa55 100644 --- a/include/dt-bindings/clock/rockchip,rv1126-cru.h +++ b/include/dt-bindings/clock/rockchip,rv1126-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2019 Rockchip Electronics Co. Ltd. * Author: Finley Xiao <finley.xiao(a)rock-chips.com> diff --git a/include/dt-bindings/clock/rv1108-cru.h b/include/dt-bindings/clock/rv1108-cru.h index 10ed9d140f..4b91a02dcd 100644 --- a/include/dt-bindings/clock/rv1108-cru.h +++ b/include/dt-bindings/clock/rv1108-cru.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Rockchip Electronics Co. Ltd. * Author: Shawn Lin <shawn.lin(a)rock-chips.com> diff --git a/include/dt-bindings/clock/starfive,jh7110-crg.h b/include/dt-bindings/clock/starfive,jh7110-crg.h index b51e3829ff..dafd35bf8e 100644 --- a/include/dt-bindings/clock/starfive,jh7110-crg.h +++ b/include/dt-bindings/clock/starfive,jh7110-crg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * diff --git a/include/dt-bindings/clock/stm32mp1-clksrc.h b/include/dt-bindings/clock/stm32mp1-clksrc.h index 002ad53512..7d5c49ff56 100644 --- a/include/dt-bindings/clock/stm32mp1-clksrc.h +++ b/include/dt-bindings/clock/stm32mp1-clksrc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved * diff --git a/include/dt-bindings/clock/sun50i-h6-ccu.h b/include/dt-bindings/clock/sun50i-h6-ccu.h index a1545cd60e..55addabfe2 100644 --- a/include/dt-bindings/clock/sun50i-h6-ccu.h +++ b/include/dt-bindings/clock/sun50i-h6-ccu.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/include/dt-bindings/clock/sun50i-h616-ccu.h b/include/dt-bindings/clock/sun50i-h616-ccu.h index 1191aca53a..f6420487c3 100644 --- a/include/dt-bindings/clock/sun50i-h616-ccu.h +++ b/include/dt-bindings/clock/sun50i-h616-ccu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (C) 2020 Arm Ltd. */ diff --git a/include/dt-bindings/clock/sun6i-rtc.h b/include/dt-bindings/clock/sun6i-rtc.h index c845493e4d..6a0db63130 100644 --- a/include/dt-bindings/clock/sun6i-rtc.h +++ b/include/dt-bindings/clock/sun6i-rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ #ifndef _DT_BINDINGS_CLK_SUN6I_RTC_H_ #define _DT_BINDINGS_CLK_SUN6I_RTC_H_ diff --git a/include/dt-bindings/clock/sun8i-de2.h b/include/dt-bindings/clock/sun8i-de2.h index 7768f73b05..199e40d7c4 100644 --- a/include/dt-bindings/clock/sun8i-de2.h +++ b/include/dt-bindings/clock/sun8i-de2.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2016 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) + * SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ #ifndef _DT_BINDINGS_CLOCK_SUN8I_DE2_H_ diff --git a/include/dt-bindings/clock/sun8i-tcon-top.h b/include/dt-bindings/clock/sun8i-tcon-top.h index 25164d7678..7e018f9749 100644 --- a/include/dt-bindings/clock/sun8i-tcon-top.h +++ b/include/dt-bindings/clock/sun8i-tcon-top.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* Copyright (C) 2018 Jernej Skrabec <jernej.skrabec(a)siol.net> */ #ifndef _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ diff --git a/include/dt-bindings/clock/suniv-ccu-f1c100s.h b/include/dt-bindings/clock/suniv-ccu-f1c100s.h index d7570765f4..4a87e165e3 100644 --- a/include/dt-bindings/clock/suniv-ccu-f1c100s.h +++ b/include/dt-bindings/clock/suniv-ccu-f1c100s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) * * Copyright (c) 2018 Icenowy Zheng <icenowy(a)aosc.xyz> * diff --git a/include/dt-bindings/comphy/comphy_data.h b/include/dt-bindings/comphy/comphy_data.h index 8a49241238..00d2efb470 100644 --- a/include/dt-bindings/comphy/comphy_data.h +++ b/include/dt-bindings/comphy/comphy_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/include/dt-bindings/dma/bcm6318-dma.h b/include/dt-bindings/dma/bcm6318-dma.h index ad7c5ac2df..0a095eb27a 100644 --- a/include/dt-bindings/dma/bcm6318-dma.h +++ b/include/dt-bindings/dma/bcm6318-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm63268-dma.h b/include/dt-bindings/dma/bcm63268-dma.h index 7d027119e6..638c0f67bf 100644 --- a/include/dt-bindings/dma/bcm63268-dma.h +++ b/include/dt-bindings/dma/bcm63268-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6328-dma.h b/include/dt-bindings/dma/bcm6328-dma.h index 7494df2feb..b3565a9b4d 100644 --- a/include/dt-bindings/dma/bcm6328-dma.h +++ b/include/dt-bindings/dma/bcm6328-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6338-dma.h b/include/dt-bindings/dma/bcm6338-dma.h index f2e0b20444..bfbf6201de 100644 --- a/include/dt-bindings/dma/bcm6338-dma.h +++ b/include/dt-bindings/dma/bcm6338-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6348-dma.h b/include/dt-bindings/dma/bcm6348-dma.h index 36c2ffd412..6ad3f3a0aa 100644 --- a/include/dt-bindings/dma/bcm6348-dma.h +++ b/include/dt-bindings/dma/bcm6348-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6358-dma.h b/include/dt-bindings/dma/bcm6358-dma.h index 3118b9da0a..515e8ba5ae 100644 --- a/include/dt-bindings/dma/bcm6358-dma.h +++ b/include/dt-bindings/dma/bcm6358-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6362-dma.h b/include/dt-bindings/dma/bcm6362-dma.h index 1e62236daa..ce7ddc32d9 100644 --- a/include/dt-bindings/dma/bcm6362-dma.h +++ b/include/dt-bindings/dma/bcm6362-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/dma/bcm6368-dma.h b/include/dt-bindings/dma/bcm6368-dma.h index 36c6caa0e1..72175b1255 100644 --- a/include/dt-bindings/dma/bcm6368-dma.h +++ b/include/dt-bindings/dma/bcm6368-dma.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/gpio/aspeed-gpio.h b/include/dt-bindings/gpio/aspeed-gpio.h index a49f5d5b5a..b1437d327a 100644 --- a/include/dt-bindings/gpio/aspeed-gpio.h +++ b/include/dt-bindings/gpio/aspeed-gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 IBM Corp. * diff --git a/include/dt-bindings/gpio/meson-a1-gpio.h b/include/dt-bindings/gpio/meson-a1-gpio.h index 40e57a5ff1..688b0b5485 100644 --- a/include/dt-bindings/gpio/meson-a1-gpio.h +++ b/include/dt-bindings/gpio/meson-a1-gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. * Author: Qianggui Song <qianggui.song(a)amlogic.com> diff --git a/include/dt-bindings/gpio/meson-axg-gpio.h b/include/dt-bindings/gpio/meson-axg-gpio.h index 25bb1fffa9..cd81fc22cd 100644 --- a/include/dt-bindings/gpio/meson-axg-gpio.h +++ b/include/dt-bindings/gpio/meson-axg-gpio.h @@ -2,7 +2,7 @@ * Copyright (c) 2017 Amlogic, Inc. All rights reserved. * Author: Xingyu Chen <xingyu.chen(a)amlogic.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _DT_BINDINGS_MESON_AXG_GPIO_H diff --git a/include/dt-bindings/gpio/meson-g12a-gpio.h b/include/dt-bindings/gpio/meson-g12a-gpio.h index f7bd69350d..4710813717 100644 --- a/include/dt-bindings/gpio/meson-g12a-gpio.h +++ b/include/dt-bindings/gpio/meson-g12a-gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2018 Amlogic, Inc. All rights reserved. * Author: Xingyu Chen <xingyu.chen(a)amlogic.com> diff --git a/include/dt-bindings/interrupt-router/intel-irq.h b/include/dt-bindings/interrupt-router/intel-irq.h index 2d1e671c1c..df2ebc297e 100644 --- a/include/dt-bindings/interrupt-router/intel-irq.h +++ b/include/dt-bindings/interrupt-router/intel-irq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/dt-bindings/memory/bcm-ns3-mc.h b/include/dt-bindings/memory/bcm-ns3-mc.h index d2478d9ae3..52aab81b68 100644 --- a/include/dt-bindings/memory/bcm-ns3-mc.h +++ b/include/dt-bindings/memory/bcm-ns3-mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Broadcom */ diff --git a/include/dt-bindings/memory/imxrt-sdram.h b/include/dt-bindings/memory/imxrt-sdram.h index 4b3b0c2f50..dde19eb928 100644 --- a/include/dt-bindings/memory/imxrt-sdram.h +++ b/include/dt-bindings/memory/imxrt-sdram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> diff --git a/include/dt-bindings/memory/mpc83xx-sdram.h b/include/dt-bindings/memory/mpc83xx-sdram.h index 7d4ce01cc4..b1156a32ad 100644 --- a/include/dt-bindings/memory/mpc83xx-sdram.h +++ b/include/dt-bindings/memory/mpc83xx-sdram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/include/dt-bindings/mfd/k210-sysctl.h b/include/dt-bindings/mfd/k210-sysctl.h index bfc918d3ba..e3fd002b4d 100644 --- a/include/dt-bindings/mfd/k210-sysctl.h +++ b/include/dt-bindings/mfd/k210-sysctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/dt-bindings/mrc/quark.h b/include/dt-bindings/mrc/quark.h index c763e74b5d..4ea1dd94b3 100644 --- a/include/dt-bindings/mrc/quark.h +++ b/include/dt-bindings/mrc/quark.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/include/dt-bindings/mscc/jr2_data.h b/include/dt-bindings/mscc/jr2_data.h index 2f06fc5c5d..c9ca788753 100644 --- a/include/dt-bindings/mscc/jr2_data.h +++ b/include/dt-bindings/mscc/jr2_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/include/dt-bindings/mscc/luton_data.h b/include/dt-bindings/mscc/luton_data.h index e488567729..51326b29da 100644 --- a/include/dt-bindings/mscc/luton_data.h +++ b/include/dt-bindings/mscc/luton_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2019 Microsemi Corporation */ diff --git a/include/dt-bindings/mscc/ocelot_data.h b/include/dt-bindings/mscc/ocelot_data.h index 7a5a1bf36e..f9e67aa71b 100644 --- a/include/dt-bindings/mscc/ocelot_data.h +++ b/include/dt-bindings/mscc/ocelot_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2019 Microsemi Corporation */ diff --git a/include/dt-bindings/mscc/serval_data.h b/include/dt-bindings/mscc/serval_data.h index b374fda05e..01a093d867 100644 --- a/include/dt-bindings/mscc/serval_data.h +++ b/include/dt-bindings/mscc/serval_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Copyright (c) 2018 Microsemi Corporation */ diff --git a/include/dt-bindings/net/mscc-phy-vsc8531.h b/include/dt-bindings/net/mscc-phy-vsc8531.h index 61f5287d75..95327a66d3 100644 --- a/include/dt-bindings/net/mscc-phy-vsc8531.h +++ b/include/dt-bindings/net/mscc-phy-vsc8531.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * Device Tree constants for Microsemi VSC8531 PHY * diff --git a/include/dt-bindings/pci/pci.h b/include/dt-bindings/pci/pci.h index e7290277b9..1ca8b7f41f 100644 --- a/include/dt-bindings/pci/pci.h +++ b/include/dt-bindings/pci/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This header provides common constants for PCI bindings. */ diff --git a/include/dt-bindings/phy/phy-imx8-pcie.h b/include/dt-bindings/phy/phy-imx8-pcie.h index 8bbe2d6538..c4ee513c9f 100644 --- a/include/dt-bindings/phy/phy-imx8-pcie.h +++ b/include/dt-bindings/phy/phy-imx8-pcie.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ /* * This header provides constants for i.MX8 PCIe. */ diff --git a/include/dt-bindings/pinctrl/apple.h b/include/dt-bindings/pinctrl/apple.h index ea0a6f4665..ec46b2ef88 100644 --- a/include/dt-bindings/pinctrl/apple.h +++ b/include/dt-bindings/pinctrl/apple.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR MIT */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR MIT */ /* * This header provides constants for Apple pinctrl bindings. */ diff --git a/include/dt-bindings/pinctrl/brcm,pinctrl-ns3.h b/include/dt-bindings/pinctrl/brcm,pinctrl-ns3.h index 81ebd58ca5..318744c6bc 100644 --- a/include/dt-bindings/pinctrl/brcm,pinctrl-ns3.h +++ b/include/dt-bindings/pinctrl/brcm,pinctrl-ns3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 Broadcom. */ diff --git a/include/dt-bindings/pinctrl/k210-pinctrl.h b/include/dt-bindings/pinctrl/k210-pinctrl.h index 26c1f23b0f..664f702707 100644 --- a/include/dt-bindings/pinctrl/k210-pinctrl.h +++ b/include/dt-bindings/pinctrl/k210-pinctrl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/dt-bindings/pinctrl/pads-imx8qm.h b/include/dt-bindings/pinctrl/pads-imx8qm.h index e980fd55ed..40d6c3aefb 100644 --- a/include/dt-bindings/pinctrl/pads-imx8qm.h +++ b/include/dt-bindings/pinctrl/pads-imx8qm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/pinctrl/pads-imx8qxp.h b/include/dt-bindings/pinctrl/pads-imx8qxp.h index 41f4fe564c..be3765190e 100644 --- a/include/dt-bindings/pinctrl/pads-imx8qxp.h +++ b/include/dt-bindings/pinctrl/pads-imx8qxp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/pinctrl/rockchip.h b/include/dt-bindings/pinctrl/rockchip.h index 1c28d6cb1f..20deea30a1 100644 --- a/include/dt-bindings/pinctrl/rockchip.h +++ b/include/dt-bindings/pinctrl/rockchip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header providing constants for Rockchip pinctrl bindings. * diff --git a/include/dt-bindings/pinctrl/stm32-pinfunc.h b/include/dt-bindings/pinctrl/stm32-pinfunc.h index e6fb8ada3f..ade32291d2 100644 --- a/include/dt-bindings/pinctrl/stm32-pinfunc.h +++ b/include/dt-bindings/pinctrl/stm32-pinfunc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Torgue Alexandre <alexandre.torgue(a)st.com> for STMicroelectronics. diff --git a/include/dt-bindings/pmic/sandbox_pmic.h b/include/dt-bindings/pmic/sandbox_pmic.h index 749c0d1f60..731afb5416 100644 --- a/include/dt-bindings/pmic/sandbox_pmic.h +++ b/include/dt-bindings/pmic/sandbox_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/dt-bindings/power-domain/bcm6318-power-domain.h b/include/dt-bindings/power-domain/bcm6318-power-domain.h index b213cae9ac..d840625c99 100644 --- a/include/dt-bindings/power-domain/bcm6318-power-domain.h +++ b/include/dt-bindings/power-domain/bcm6318-power-domain.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/dt-bindings/power-domain/bcm63268-power-domain.h b/include/dt-bindings/power-domain/bcm63268-power-domain.h index 7208506d5b..53793ffac4 100644 --- a/include/dt-bindings/power-domain/bcm63268-power-domain.h +++ b/include/dt-bindings/power-domain/bcm63268-power-domain.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/dt-bindings/power-domain/bcm6328-power-domain.h b/include/dt-bindings/power-domain/bcm6328-power-domain.h index 6b4b19988f..4335524204 100644 --- a/include/dt-bindings/power-domain/bcm6328-power-domain.h +++ b/include/dt-bindings/power-domain/bcm6328-power-domain.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/dt-bindings/power-domain/bcm6362-power-domain.h b/include/dt-bindings/power-domain/bcm6362-power-domain.h index 1a708a9ad2..9558dbfbb8 100644 --- a/include/dt-bindings/power-domain/bcm6362-power-domain.h +++ b/include/dt-bindings/power-domain/bcm6362-power-domain.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> */ diff --git a/include/dt-bindings/power/meson-a1-power.h b/include/dt-bindings/power/meson-a1-power.h index 8e39dfc0b6..86bda4de92 100644 --- a/include/dt-bindings/power/meson-a1-power.h +++ b/include/dt-bindings/power/meson-a1-power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2023 SberDevices, Inc. * Author: Alexey Romanov <avromanov(a)sberdevices.ru> diff --git a/include/dt-bindings/power/meson-axg-power.h b/include/dt-bindings/power/meson-axg-power.h index e5243884b2..9e956bf7e2 100644 --- a/include/dt-bindings/power/meson-axg-power.h +++ b/include/dt-bindings/power/meson-axg-power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2020 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/power/meson-g12a-power.h b/include/dt-bindings/power/meson-g12a-power.h index bb5e67a842..b61a00dbea 100644 --- a/include/dt-bindings/power/meson-g12a-power.h +++ b/include/dt-bindings/power/meson-g12a-power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/power/meson-gxbb-power.h b/include/dt-bindings/power/meson-gxbb-power.h index 1262dac696..56db666a9b 100644 --- a/include/dt-bindings/power/meson-gxbb-power.h +++ b/include/dt-bindings/power/meson-gxbb-power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/power/meson-sm1-power.h b/include/dt-bindings/power/meson-sm1-power.h index a020ab00c1..17f618f894 100644 --- a/include/dt-bindings/power/meson-sm1-power.h +++ b/include/dt-bindings/power/meson-sm1-power.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (c) 2019 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/power/owl-s700-powergate.h b/include/dt-bindings/power/owl-s700-powergate.h index 4cf1aefbf0..0065f515ed 100644 --- a/include/dt-bindings/power/owl-s700-powergate.h +++ b/include/dt-bindings/power/owl-s700-powergate.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) /* * Actions Semi S700 SPS * diff --git a/include/dt-bindings/reset/amlogic,meson-a1-reset.h b/include/dt-bindings/reset/amlogic,meson-a1-reset.h index 2c749c655e..70010d87ce 100644 --- a/include/dt-bindings/reset/amlogic,meson-a1-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-a1-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. * Author: Xingyu Chen <xingyu.chen(a)amlogic.com> diff --git a/include/dt-bindings/reset/amlogic,meson-axg-reset.h b/include/dt-bindings/reset/amlogic,meson-axg-reset.h index 0f2e0fe45c..afa74d2c4f 100644 --- a/include/dt-bindings/reset/amlogic,meson-axg-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-axg-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) 2016 BayLibre, SAS. * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h index 6d487c5eba..5d3a53a9e4 100644 --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) 2019 BayLibre, SAS. * Author: Jerome Brunet <jbrunet(a)baylibre.com> diff --git a/include/dt-bindings/reset/ast2500-reset.h b/include/dt-bindings/reset/ast2500-reset.h index cc85a31edf..23e64357eb 100644 --- a/include/dt-bindings/reset/ast2500-reset.h +++ b/include/dt-bindings/reset/ast2500-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 Google, Inc * Copyright 2020 ASPEED Technology Inc. diff --git a/include/dt-bindings/reset/ast2600-reset.h b/include/dt-bindings/reset/ast2600-reset.h index b6d0f79917..3d6cbf69d2 100644 --- a/include/dt-bindings/reset/ast2600-reset.h +++ b/include/dt-bindings/reset/ast2600-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) ASPEED Technology Inc. */ diff --git a/include/dt-bindings/reset/axg-aoclkc.h b/include/dt-bindings/reset/axg-aoclkc.h index d342c0b6b2..83867ab00c 100644 --- a/include/dt-bindings/reset/axg-aoclkc.h +++ b/include/dt-bindings/reset/axg-aoclkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Copyright (c) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/reset/bcm3380-reset.h b/include/dt-bindings/reset/bcm3380-reset.h index 4cbf4d289d..2cac0955cd 100644 --- a/include/dt-bindings/reset/bcm3380-reset.h +++ b/include/dt-bindings/reset/bcm3380-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6318-reset.h b/include/dt-bindings/reset/bcm6318-reset.h index 1422500f8f..8551239a4d 100644 --- a/include/dt-bindings/reset/bcm6318-reset.h +++ b/include/dt-bindings/reset/bcm6318-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm63268-reset.h b/include/dt-bindings/reset/bcm63268-reset.h index a45abed1ce..50c8f8d3b0 100644 --- a/include/dt-bindings/reset/bcm63268-reset.h +++ b/include/dt-bindings/reset/bcm63268-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6328-reset.h b/include/dt-bindings/reset/bcm6328-reset.h index f2dd4f79cc..9c137c5bd2 100644 --- a/include/dt-bindings/reset/bcm6328-reset.h +++ b/include/dt-bindings/reset/bcm6328-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6338-reset.h b/include/dt-bindings/reset/bcm6338-reset.h index 4aec7a4b59..602c450bcf 100644 --- a/include/dt-bindings/reset/bcm6338-reset.h +++ b/include/dt-bindings/reset/bcm6338-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6348-reset.h b/include/dt-bindings/reset/bcm6348-reset.h index b298c18316..9670cc796c 100644 --- a/include/dt-bindings/reset/bcm6348-reset.h +++ b/include/dt-bindings/reset/bcm6348-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6358-reset.h b/include/dt-bindings/reset/bcm6358-reset.h index 075706eff7..f2902dac50 100644 --- a/include/dt-bindings/reset/bcm6358-reset.h +++ b/include/dt-bindings/reset/bcm6358-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6362-reset.h b/include/dt-bindings/reset/bcm6362-reset.h index 8202e49919..153abfb7a5 100644 --- a/include/dt-bindings/reset/bcm6362-reset.h +++ b/include/dt-bindings/reset/bcm6362-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/bcm6368-reset.h b/include/dt-bindings/reset/bcm6368-reset.h index 0038a7ccf5..d012e27794 100644 --- a/include/dt-bindings/reset/bcm6368-reset.h +++ b/include/dt-bindings/reset/bcm6368-reset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Álvaro Fernández Rojas <noltari(a)gmail.com> * diff --git a/include/dt-bindings/reset/g12a-aoclkc.h b/include/dt-bindings/reset/g12a-aoclkc.h index bd2e233713..a30b1b9cc5 100644 --- a/include/dt-bindings/reset/g12a-aoclkc.h +++ b/include/dt-bindings/reset/g12a-aoclkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */ /* * Copyright (c) 2016 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/dt-bindings/reset/k210-sysctl.h b/include/dt-bindings/reset/k210-sysctl.h index 12bb3880d9..36a6384ca0 100644 --- a/include/dt-bindings/reset/k210-sysctl.h +++ b/include/dt-bindings/reset/k210-sysctl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/dt-bindings/reset/starfive,jh7110-crg.h b/include/dt-bindings/reset/starfive,jh7110-crg.h index 1d596581da..929f684f1b 100644 --- a/include/dt-bindings/reset/starfive,jh7110-crg.h +++ b/include/dt-bindings/reset/starfive,jh7110-crg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 StarFive Technology Co., Ltd. * diff --git a/include/dt-bindings/reset/sun50i-h6-ccu.h b/include/dt-bindings/reset/sun50i-h6-ccu.h index 81106f4550..1e46b2ae82 100644 --- a/include/dt-bindings/reset/sun50i-h6-ccu.h +++ b/include/dt-bindings/reset/sun50i-h6-ccu.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0-or-later or MIT) /* * Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> */ diff --git a/include/dt-bindings/reset/sun50i-h6-r-ccu.h b/include/dt-bindings/reset/sun50i-h6-r-ccu.h index 7950e799c7..074dda937c 100644 --- a/include/dt-bindings/reset/sun50i-h6-r-ccu.h +++ b/include/dt-bindings/reset/sun50i-h6-r-ccu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (C) 2016 Icenowy Zheng <icenowy(a)aosc.xyz> */ diff --git a/include/dt-bindings/reset/sun50i-h616-ccu.h b/include/dt-bindings/reset/sun50i-h616-ccu.h index cb6285a8d1..0d48d1fc96 100644 --- a/include/dt-bindings/reset/sun50i-h616-ccu.h +++ b/include/dt-bindings/reset/sun50i-h616-ccu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later or MIT) */ /* * Copyright (C) 2020 Arm Ltd. */ diff --git a/include/dt-bindings/reset/sun8i-de2.h b/include/dt-bindings/reset/sun8i-de2.h index 1c36a6ac86..33458b81f5 100644 --- a/include/dt-bindings/reset/sun8i-de2.h +++ b/include/dt-bindings/reset/sun8i-de2.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2016 Icenowy Zheng <icenowy(a)aosc.io> * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) + * SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ #ifndef _DT_BINDINGS_RESET_SUN8I_DE2_H_ diff --git a/include/dt-bindings/reset/suniv-ccu-f1c100s.h b/include/dt-bindings/reset/suniv-ccu-f1c100s.h index 6a4b4385fe..29207d04ce 100644 --- a/include/dt-bindings/reset/suniv-ccu-f1c100s.h +++ b/include/dt-bindings/reset/suniv-ccu-f1c100s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) * * Copyright (C) 2018 Icenowy Zheng <icenowy(a)aosc.xyz> * diff --git a/include/dt-bindings/soc/bcm2835-pm.h b/include/dt-bindings/soc/bcm2835-pm.h index 153d75b8d9..6690951eb0 100644 --- a/include/dt-bindings/soc/bcm2835-pm.h +++ b/include/dt-bindings/soc/bcm2835-pm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) */ #ifndef _DT_BINDINGS_ARM_BCM2835_PM_H #define _DT_BINDINGS_ARM_BCM2835_PM_H diff --git a/include/dt-bindings/soc/imx8_pd.h b/include/dt-bindings/soc/imx8_pd.h index 682b608eef..4d417b87ee 100644 --- a/include/dt-bindings/soc/imx8_pd.h +++ b/include/dt-bindings/soc/imx8_pd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/soc/imx_rsrc.h b/include/dt-bindings/soc/imx_rsrc.h index fb6878f6e2..43155a978c 100644 --- a/include/dt-bindings/soc/imx_rsrc.h +++ b/include/dt-bindings/soc/imx_rsrc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/dt-bindings/sound/azalia.h b/include/dt-bindings/sound/azalia.h index 10ace3ef56..881ada4059 100644 --- a/include/dt-bindings/sound/azalia.h +++ b/include/dt-bindings/sound/azalia.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Intel HDA audio codec config. This is a mechanicm to configure codecs when * using Intel HDA audio. diff --git a/include/dt-structs.h b/include/dt-structs.h index fa1622cb1d..62ad97528c 100644 --- a/include/dt-structs.h +++ b/include/dt-structs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h index 8acae3839f..7c86e53b61 100644 --- a/include/dw_hdmi.h +++ b/include/dw_hdmi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/include/dwc3-sti-glue.h b/include/dwc3-sti-glue.h index 546ffbaf7b..dd26a29a63 100644 --- a/include/dwc3-sti-glue.h +++ b/include/dwc3-sti-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Patrice Chotard, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/dwc_ahsata.h b/include/dwc_ahsata.h index 2aa93427f6..b80b4cb86e 100644 --- a/include/dwc_ahsata.h +++ b/include/dwc_ahsata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/dwmmc.h b/include/dwmmc.h index 136a95b8cd..1004a97379 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 SAMSUNG Electronics * Jaehoon Chung <jh80.chung(a)samsung.com> diff --git a/include/edid.h b/include/edid.h index cee7c4c763..815f21d42e 100644 --- a/include/edid.h +++ b/include/edid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. * diff --git a/include/eeprom.h b/include/eeprom.h index f9c6542ba7..584f7156a6 100644 --- a/include/eeprom.h +++ b/include/eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/eeprom_field.h b/include/eeprom_field.h index 05c0d14592..db28bff03c 100644 --- a/include/eeprom_field.h +++ b/include/eeprom_field.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009-2016 CompuLab, Ltd. * diff --git a/include/eeprom_layout.h b/include/eeprom_layout.h index 730d963ab9..ee8cff1aa4 100644 --- a/include/eeprom_layout.h +++ b/include/eeprom_layout.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009-2016 CompuLab, Ltd. * diff --git a/include/efi_config.h b/include/efi_config.h index d7c1601137..587ad1ef95 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Menu-driven UEFI Variable maintenance * diff --git a/include/efi_default_filename.h b/include/efi_default_filename.h index 77932984b5..9b22492d1b 100644 --- a/include/efi_default_filename.h +++ b/include/efi_default_filename.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * When a boot option does not provide a file path the EFI file to be * booted is \EFI\BOOT\$(BOOTEFI_NAME).EFI. The architecture specific diff --git a/include/efi_driver.h b/include/efi_driver.h index 63a95e4cf8..d54ac4da43 100644 --- a/include/efi_driver.h +++ b/include/efi_driver.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal structures for the EFI driver binding protocol * diff --git a/include/efi_dt_fixup.h b/include/efi_dt_fixup.h index 83382537d1..d9c7e18abc 100644 --- a/include/efi_dt_fixup.h +++ b/include/efi_dt_fixup.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * EFI_DT_FIXUP_PROTOCOL * diff --git a/include/efi_load_initrd.h b/include/efi_load_initrd.h index be5d5a7acb..a2a02006c4 100644 --- a/include/efi_load_initrd.h +++ b/include/efi_load_initrd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Linaro Limited */ diff --git a/include/efi_loader.h b/include/efi_loader.h index e24410505f..1f85e1a423 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * EFI application loader * diff --git a/include/efi_riscv.h b/include/efi_riscv.h index 4bd39c4366..3b5d40325c 100644 --- a/include/efi_riscv.h +++ b/include/efi_riscv.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * RISCV_EFI_BOOT_PROTOCOL * diff --git a/include/efi_rng.h b/include/efi_rng.h index 3c622381cb..724fe909da 100644 --- a/include/efi_rng.h +++ b/include/efi_rng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019, Linaro Limited */ diff --git a/include/efi_selftest.h b/include/efi_selftest.h index 7c69c3f376..7790dfcc9d 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * EFI application loader * diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index b1c3abd097..7ccc7b21e5 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Defines data structures and APIs that allow an OS to interact with UEFI * firmware to query information about the device diff --git a/include/efi_variable.h b/include/efi_variable.h index 805e6c5f1e..79e5b69a36 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ diff --git a/include/env.h b/include/env.h index 430c4fa94a..08bda7938a 100644 --- a/include/env.h +++ b/include/env.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common environment functions and definitions * diff --git a/include/env/distro/sf.h b/include/env/distro/sf.h index ee48a8a4e8..f16fae55e3 100644 --- a/include/env/distro/sf.h +++ b/include/env/distro/sf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Amarula Solutions(India) * diff --git a/include/env/ti/dfu.h b/include/env/ti/dfu.h index 3c90570107..338b44401f 100644 --- a/include/env/ti/dfu.h +++ b/include/env/ti/dfu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/ti/k3_dfu.h b/include/env/ti/k3_dfu.h index a16a3adeca..5376afd656 100644 --- a/include/env/ti/k3_dfu.h +++ b/include/env/ti/k3_dfu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/ti/k3_rproc.h b/include/env/ti/k3_rproc.h index 3418cb42be..e4d04e12ed 100644 --- a/include/env/ti/k3_rproc.h +++ b/include/env/ti/k3_rproc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/ti/mmc.h b/include/env/ti/mmc.h index 769ea9d5ef..a3fab60efd 100644 --- a/include/env/ti/mmc.h +++ b/include/env/ti/mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/ti/nand.h b/include/env/ti/nand.h index 7d00afa2b1..016861da69 100644 --- a/include/env/ti/nand.h +++ b/include/env/ti/nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/ti/ufs.h b/include/env/ti/ufs.h index 6619ec9c88..aa29c05ce0 100644 --- a/include/env/ti/ufs.h +++ b/include/env/ti/ufs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com * diff --git a/include/env/x86.env b/include/env/x86.env index d00d98f70a..4598efce83 100644 --- a/include/env/x86.env +++ b/include/env/x86.env @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. diff --git a/include/env_attr.h b/include/env_attr.h index e0846cccb1..35c6c26150 100644 --- a/include/env_attr.h +++ b/include/env_attr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/include/env_callback.h b/include/env_callback.h index 23bc650c16..b71454504b 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/include/env_default.h b/include/env_default.h index b16c22d5a2..6628b50894 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/env_flags.h b/include/env_flags.h index d785f87cdc..8a18269881 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Joe Hershberger, National Instruments, joe.hershberger(a)ni.com diff --git a/include/env_internal.h b/include/env_internal.h index 6a69494646..3f495f29d0 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal environment header file. This includes direct access to environment * information such as its size and offset, direct access to the default diff --git a/include/errno.h b/include/errno.h index 5a8816d0a1..cf6eb2fee5 100644 --- a/include/errno.h +++ b/include/errno.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/eth_phy.h b/include/eth_phy.h index be6c881527..5c9ddcbac2 100644 --- a/include/eth_phy.h +++ b/include/eth_phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2020 NXP */ diff --git a/include/ethsw.h b/include/ethsw.h index 04e002d39f..8ef5749eba 100644 --- a/include/ethsw.h +++ b/include/ethsw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/include/event.h b/include/event.h index c5646b713a..68fd1c496d 100644 --- a/include/event.h +++ b/include/event.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Events provide a general-purpose way to react to / subscribe to changes * within U-Boot diff --git a/include/event_internal.h b/include/event_internal.h index 8432c6f0e5..b1cbb3cb54 100644 --- a/include/event_internal.h +++ b/include/event_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Internal definitions for events * diff --git a/include/exception.h b/include/exception.h index a7f21e73d7..fdcefcabba 100644 --- a/include/exception.h +++ b/include/exception.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * The 'exception' command can be used for testing exception handling. * diff --git a/include/expo.h b/include/expo.h index 264745f7f0..780b80ffc7 100644 --- a/include/expo.h +++ b/include/expo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/ext_common.h b/include/ext_common.h index b09bbde116..5c0ecef443 100644 --- a/include/ext_common.h +++ b/include/ext_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 - 2012 Samsung Electronics * EXT4 filesystem implementation in Uboot by diff --git a/include/extcon.h b/include/extcon.h index d060f5a3c1..57f412872c 100644 --- a/include/extcon.h +++ b/include/extcon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/include/extension_board.h b/include/extension_board.h index 3b75b5ba9f..0ffdee3649 100644 --- a/include/extension_board.h +++ b/include/extension_board.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021 * Köry Maincent, Bootlin, <kory.maincent(a)bootlin.com> diff --git a/include/extlinux.h b/include/extlinux.h index 721ba46371..d5683323cc 100644 --- a/include/extlinux.h +++ b/include/extlinux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/faraday/ftsdc010.h b/include/faraday/ftsdc010.h index 30726dab85..2446218af3 100644 --- a/include/faraday/ftsdc010.h +++ b/include/faraday/ftsdc010.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Faraday FTSDC010 Secure Digital Memory Card Host Controller * diff --git a/include/faraday/ftsmc020.h b/include/faraday/ftsmc020.h index f902a791ef..51ddbbc62f 100644 --- a/include/faraday/ftsmc020.h +++ b/include/faraday/ftsmc020.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang <ratbert(a)faraday-tech.com> diff --git a/include/faraday/fttmr010.h b/include/faraday/fttmr010.h index 5b1bef38c7..1dd734054c 100644 --- a/include/faraday/fttmr010.h +++ b/include/faraday/fttmr010.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang <ratbert(a)faraday-tech.com> diff --git a/include/faraday/ftwdt010_wdt.h b/include/faraday/ftwdt010_wdt.h index d4c11e39a0..7695ac346c 100644 --- a/include/faraday/ftwdt010_wdt.h +++ b/include/faraday/ftwdt010_wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Watchdog driver for the FTWDT010 Watch Dog Driver * diff --git a/include/fastboot-internal.h b/include/fastboot-internal.h index bf2f2b3c89..ac107f5622 100644 --- a/include/fastboot-internal.h +++ b/include/fastboot-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _FASTBOOT_INTERNAL_H_ #define _FASTBOOT_INTERNAL_H_ diff --git a/include/fastboot.h b/include/fastboot.h index 296451f89d..776250f742 100644 --- a/include/fastboot.h +++ b/include/fastboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 - 2009 * Windriver, <www.windriver.com> diff --git a/include/fat.h b/include/fat.h index a9756fb4cd..6ecf4361e1 100644 --- a/include/fat.h +++ b/include/fat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * R/O (V)FAT 12/16/32 filesystem implementation by Marcus Sundberg * diff --git a/include/fb_mmc.h b/include/fb_mmc.h index 76ed7cd6be..031f67e765 100644 --- a/include/fb_mmc.h +++ b/include/fb_mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/include/fb_nand.h b/include/fb_nand.h index 6d7999f262..d5cc418e25 100644 --- a/include/fb_nand.h +++ b/include/fb_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. * Copyright 2015 Free Electrons. diff --git a/include/fdt_simplefb.h b/include/fdt_simplefb.h index af93e3be63..738034c7cc 100644 --- a/include/fdt_simplefb.h +++ b/include/fdt_simplefb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Simplefb device tree support * diff --git a/include/fdt_support.h b/include/fdt_support.h index 2cd8366898..9ce9350b9f 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 * Gerald Van Baren, Custom IDEAS, vanbaren(a)cideas.com diff --git a/include/fdtdec.h b/include/fdtdec.h index bd1149f46d..c311ea7854 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/firmware/imx/sci/rpc.h b/include/firmware/imx/sci/rpc.h index 85af6f3996..7274e44f35 100644 --- a/include/firmware/imx/sci/rpc.h +++ b/include/firmware/imx/sci/rpc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017-2018 NXP * diff --git a/include/firmware/imx/sci/sci.h b/include/firmware/imx/sci/sci.h index f832982b3d..4632970db0 100644 --- a/include/firmware/imx/sci/sci.h +++ b/include/firmware/imx/sci/sci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/firmware/imx/sci/svc/misc/api.h b/include/firmware/imx/sci/svc/misc/api.h index a4b92b86cc..77d20c5cd0 100644 --- a/include/firmware/imx/sci/svc/misc/api.h +++ b/include/firmware/imx/sci/svc/misc/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/firmware/imx/sci/svc/pad/api.h b/include/firmware/imx/sci/svc/pad/api.h index df368e8c8b..b9fdcb2066 100644 --- a/include/firmware/imx/sci/svc/pad/api.h +++ b/include/firmware/imx/sci/svc/pad/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/firmware/imx/sci/svc/pm/api.h b/include/firmware/imx/sci/svc/pm/api.h index d1b085d7f8..3f6bf8239d 100644 --- a/include/firmware/imx/sci/svc/pm/api.h +++ b/include/firmware/imx/sci/svc/pm/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/firmware/imx/sci/svc/rm/api.h b/include/firmware/imx/sci/svc/rm/api.h index f4e9abcd9b..e0d39eaa18 100644 --- a/include/firmware/imx/sci/svc/rm/api.h +++ b/include/firmware/imx/sci/svc/rm/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/firmware/imx/sci/svc/seco/api.h b/include/firmware/imx/sci/svc/seco/api.h index 7d4b6b92e1..caadec54e9 100644 --- a/include/firmware/imx/sci/svc/seco/api.h +++ b/include/firmware/imx/sci/svc/seco/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/firmware/imx/sci/svc/timer/api.h b/include/firmware/imx/sci/svc/timer/api.h index c2fe34aa75..bf19213d94 100644 --- a/include/firmware/imx/sci/svc/timer/api.h +++ b/include/firmware/imx/sci/svc/timer/api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP */ diff --git a/include/firmware/imx/sci/types.h b/include/firmware/imx/sci/types.h index adfed13e33..a37d363d82 100644 --- a/include/firmware/imx/sci/types.h +++ b/include/firmware/imx/sci/types.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP */ diff --git a/include/fis.h b/include/fis.h index 419807f1fe..85f9a1958e 100644 --- a/include/fis.h +++ b/include/fis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/include/flash.h b/include/flash.h index 3710a2731b..a7015aea6f 100644 --- a/include/flash.h +++ b/include/flash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/fm_eth.h b/include/fm_eth.h index 8b133e703b..e228521ccc 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2012 Freescale Semiconductor, Inc. * Copyright 2019 NXP diff --git a/include/fpga.h b/include/fpga.h index 44f2755a3f..509ddb5c62 100644 --- a/include/fpga.h +++ b/include/fpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/fsl-mc/fsl_dpaa_fd.h b/include/fsl-mc/fsl_dpaa_fd.h index 159756f71a..f27ddae651 100644 --- a/include/fsl-mc/fsl_dpaa_fd.h +++ b/include/fsl-mc/fsl_dpaa_fd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/include/fsl-mc/fsl_dpbp.h b/include/fsl-mc/fsl_dpbp.h index 3f3e6c4070..fed43c587c 100644 --- a/include/fsl-mc/fsl_dpbp.h +++ b/include/fsl-mc/fsl_dpbp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale Layerscape MC I/O wrapper * Data Path Buffer Pool API diff --git a/include/fsl-mc/fsl_dpio.h b/include/fsl-mc/fsl_dpio.h index 375590fd97..221a2c3227 100644 --- a/include/fsl-mc/fsl_dpio.h +++ b/include/fsl-mc/fsl_dpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP diff --git a/include/fsl-mc/fsl_dpmac.h b/include/fsl-mc/fsl_dpmac.h index a8e9e4684a..47db281161 100644 --- a/include/fsl-mc/fsl_dpmac.h +++ b/include/fsl-mc/fsl_dpmac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale Layerscape MC I/O wrapper * diff --git a/include/fsl-mc/fsl_dpmng.h b/include/fsl-mc/fsl_dpmng.h index 5dfc9ecc42..1932f546ef 100644 --- a/include/fsl-mc/fsl_dpmng.h +++ b/include/fsl-mc/fsl_dpmng.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 2013-2015 Freescale Semiconductor Inc. */ #ifndef __FSL_DPMNG_H diff --git a/include/fsl-mc/fsl_dpni.h b/include/fsl-mc/fsl_dpni.h index 9bc475475d..f9d3e26e86 100644 --- a/include/fsl-mc/fsl_dpni.h +++ b/include/fsl-mc/fsl_dpni.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017, 2023 NXP diff --git a/include/fsl-mc/fsl_dprc.h b/include/fsl-mc/fsl_dprc.h index fb95ac544a..642e745512 100644 --- a/include/fsl-mc/fsl_dprc.h +++ b/include/fsl-mc/fsl_dprc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale Layerscape MC I/O wrapper * diff --git a/include/fsl-mc/fsl_dpsparser.h b/include/fsl-mc/fsl_dpsparser.h index 9619bb1413..be0ef7e894 100644 --- a/include/fsl-mc/fsl_dpsparser.h +++ b/include/fsl-mc/fsl_dpsparser.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Data Path Soft Parser API * diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h index 258738dfc8..3fbed700b7 100644 --- a/include/fsl-mc/fsl_mc.h +++ b/include/fsl-mc/fsl_mc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor * Copyright 2021 NXP diff --git a/include/fsl-mc/fsl_mc_cmd.h b/include/fsl-mc/fsl_mc_cmd.h index c239595ed5..90a140d8cb 100644 --- a/include/fsl-mc/fsl_mc_cmd.h +++ b/include/fsl-mc/fsl_mc_cmd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright 2013-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP */ diff --git a/include/fsl-mc/fsl_mc_private.h b/include/fsl-mc/fsl_mc_private.h index 28b6d45023..0365369597 100644 --- a/include/fsl-mc/fsl_mc_private.h +++ b/include/fsl-mc/fsl_mc_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP diff --git a/include/fsl-mc/fsl_mc_sys.h b/include/fsl-mc/fsl_mc_sys.h index 9fb8164f50..18d423b7b1 100644 --- a/include/fsl-mc/fsl_mc_sys.h +++ b/include/fsl-mc/fsl_mc_sys.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale Layerscape Management Complex (MC) Environment-specific code * diff --git a/include/fsl-mc/fsl_qbman_base.h b/include/fsl-mc/fsl_qbman_base.h index 7818fc28e6..4c386c5077 100644 --- a/include/fsl-mc/fsl_qbman_base.h +++ b/include/fsl-mc/fsl_qbman_base.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/include/fsl-mc/fsl_qbman_portal.h b/include/fsl-mc/fsl_qbman_portal.h index ee0e4aa50d..1abec0a246 100644 --- a/include/fsl-mc/fsl_qbman_portal.h +++ b/include/fsl-mc/fsl_qbman_portal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Freescale Semiconductor */ diff --git a/include/fsl-mc/ldpaa_wriop.h b/include/fsl-mc/ldpaa_wriop.h index b55c39cbb2..c2bcab120c 100644 --- a/include/fsl-mc/ldpaa_wriop.h +++ b/include/fsl-mc/ldpaa_wriop.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor */ diff --git a/include/fsl_csu.h b/include/fsl_csu.h index 40c2968797..d5a4d60157 100644 --- a/include/fsl_csu.h +++ b/include/fsl_csu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor * diff --git a/include/fsl_ddrc_version.h b/include/fsl_ddrc_version.h index 7c1d0419de..1b6f4deaec 100644 --- a/include/fsl_ddrc_version.h +++ b/include/fsl_ddrc_version.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_devdis.h b/include/fsl_devdis.h index 1f1b033317..e1768e8864 100644 --- a/include/fsl_devdis.h +++ b/include/fsl_devdis.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_dspi.h b/include/fsl_dspi.h index ebe1803e46..0ebf57586f 100644 --- a/include/fsl_dspi.h +++ b/include/fsl_dspi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale DSPI Module Defines * diff --git a/include/fsl_dtsec.h b/include/fsl_dtsec.h index ccd6572ae2..0218019917 100644 --- a/include/fsl_dtsec.h +++ b/include/fsl_dtsec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_errata.h b/include/fsl_errata.h index 88f4268658..016369a473 100644 --- a/include/fsl_errata.h +++ b/include/fsl_errata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013 - 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 7ab1460abc..fbb389a350 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * FSL SD/MMC Defines *------------------------------------------------------------------- diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index b8efd2a166..f88b98cd5f 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * FSL SD/MMC Defines *------------------------------------------------------------------- diff --git a/include/fsl_fman.h b/include/fsl_fman.h index 74acdb2569..53d577d8dd 100644 --- a/include/fsl_fman.h +++ b/include/fsl_fman.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MPC85xx Internal Memory Map * diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h index de1e70a6d0..2a5bd2989c 100644 --- a/include/fsl_ifc.h +++ b/include/fsl_ifc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Freescale Semiconductor, Inc. * Author: Dipen Dudhat <dipen.dudhat(a)freescale.com> diff --git a/include/fsl_immap.h b/include/fsl_immap.h index 5297c0b3f9..185a48fabd 100644 --- a/include/fsl_immap.h +++ b/include/fsl_immap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common internal memory map for some Freescale SoCs * diff --git a/include/fsl_lpuart.h b/include/fsl_lpuart.h index 93c996b764..be9e38d534 100644 --- a/include/fsl_lpuart.h +++ b/include/fsl_lpuart.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h index b6c02cf342..2d9faf6a97 100644 --- a/include/fsl_mdio.h +++ b/include/fsl_mdio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2012, 2013 Freescale Semiconductor, Inc. * Jun-jie Zhang <b18070(a)freescale.com> diff --git a/include/fsl_memac.h b/include/fsl_memac.h index 6ac1e558b9..545728d6bb 100644 --- a/include/fsl_memac.h +++ b/include/fsl_memac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012 Freescale Semiconductor, Inc. * Roy Zang <tie-fei.zang(a)freescale.com> diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h index 05fb41f403..bd9a3dc34f 100644 --- a/include/fsl_mmdc.h +++ b/include/fsl_mmdc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_pmic.h b/include/fsl_pmic.h index 132db81757..40dac7a8a8 100644 --- a/include/fsl_pmic.h +++ b/include/fsl_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/include/fsl_qbman.h b/include/fsl_qbman.h index 4687eb9bb1..3d05322240 100644 --- a/include/fsl_qbman.h +++ b/include/fsl_qbman.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/include/fsl_qe.h b/include/fsl_qe.h index 48accb8d89..c35d68b8d0 100644 --- a/include/fsl_qe.h +++ b/include/fsl_qe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2006-2009 Freescale Semiconductor, Inc. * diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 9dad1d1ec4..81fbcc8a05 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common internal memory map for some Freescale SoCs * diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h index 3092a0ea62..d75381c426 100644 --- a/include/fsl_sec_mon.h +++ b/include/fsl_sec_mon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common internal memory map for some Freescale SoCs * diff --git a/include/fsl_secboot_err.h b/include/fsl_secboot_err.h index bc9dab230b..17b24e301b 100644 --- a/include/fsl_secboot_err.h +++ b/include/fsl_secboot_err.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h index e7674c1bff..474fbf7b73 100644 --- a/include/fsl_sfp.h +++ b/include/fsl_sfp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_tgec.h b/include/fsl_tgec.h index 59cd856ba0..0b8895efcf 100644 --- a/include/fsl_tgec.h +++ b/include/fsl_tgec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * Dave Liu <daveliu(a)freescale.com> diff --git a/include/fsl_usb.h b/include/fsl_usb.h index 1abd1e5e57..5d893c42dd 100644 --- a/include/fsl_usb.h +++ b/include/fsl_usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale USB Controller * diff --git a/include/fsl_validate.h b/include/fsl_validate.h index 66a5883f1f..986bb438db 100644 --- a/include/fsl_validate.h +++ b/include/fsl_validate.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h index 29f00d3b9f..d2ad19aaa2 100644 --- a/include/fsl_wdog.h +++ b/include/fsl_wdog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Freescale Semiconductor, Inc. */ diff --git a/include/fuse.h b/include/fuse.h index d48dcdfa64..7f086c281f 100644 --- a/include/fuse.h +++ b/include/fuse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009-2013 ADVANSEE * Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> diff --git a/include/fuzzing_engine.h b/include/fuzzing_engine.h index 357346e93d..af76117295 100644 --- a/include/fuzzing_engine.h +++ b/include/fuzzing_engine.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/include/g_dnl.h b/include/g_dnl.h index 836ee602c8..764df6640a 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index aa9b9f58b8..78880dc7ad 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, dirk.eibach(a)gdsys.cc diff --git a/include/generic-phy.h b/include/generic-phy.h index bee4de8a0b..47bca636c2 100644 --- a/include/generic-phy.h +++ b/include/generic-phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/include/gsc.h b/include/gsc.h index 132c312182..ec772d77da 100644 --- a/include/gsc.h +++ b/include/gsc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2022 Gateworks Corporation */ diff --git a/include/gzip.h b/include/gzip.h index e578b283ed..3af7e6e222 100644 --- a/include/gzip.h +++ b/include/gzip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/handoff.h b/include/handoff.h index 0104b834f2..3b0ee0f2d1 100644 --- a/include/handoff.h +++ b/include/handoff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Passing basic information from SPL to U-Boot proper * diff --git a/include/hang.h b/include/hang.h index 27cda49359..2b89732074 100644 --- a/include/hang.h +++ b/include/hang.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/hash.h b/include/hash.h index 8b3f79ec47..4cbe695bc1 100644 --- a/include/hash.h +++ b/include/hash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/include/hexdump.h b/include/hexdump.h index f2ca4793d6..e8698e2cc7 100644 --- a/include/hexdump.h +++ b/include/hexdump.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Synopsys, Inc. All rights reserved. * diff --git a/include/host_arch.h b/include/host_arch.h index 169d494513..8562c45550 100644 --- a/include/host_arch.h +++ b/include/host_arch.h @@ -1,5 +1,5 @@ #if 0 -# SPDX SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Constants defining the host architecture in assembler, C, and make files. # The values are arbitrary. diff --git a/include/hw_sha.h b/include/hw_sha.h index b9bb583810..bc2fb8875d 100644 --- a/include/hw_sha.h +++ b/include/hw_sha.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header file for SHA hardware acceleration * diff --git a/include/hwconfig.h b/include/hwconfig.h index cf47210756..9d2c5850ff 100644 --- a/include/hwconfig.h +++ b/include/hwconfig.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * An inteface for configuring a hardware via u-boot environment. * diff --git a/include/hwspinlock.h b/include/hwspinlock.h index d8556c0b4b..5b358f978c 100644 --- a/include/hwspinlock.h +++ b/include/hwspinlock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/include/i2c.h b/include/i2c.h index ef3820eaba..068d510a2e 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2009 Sergey Kubushyn <ksi(a)koi8.net> * Copyright (C) 2009 - 2013 Heiko Schocher <hs(a)denx.de> diff --git a/include/i2c_eeprom.h b/include/i2c_eeprom.h index 32dcb03497..092112606f 100644 --- a/include/i2c_eeprom.h +++ b/include/i2c_eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc */ diff --git a/include/i2s.h b/include/i2s.h index c9fbeb5d8a..6989162816 100644 --- a/include/i2s.h +++ b/include/i2s.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar <rcsekar(a)samsung.com> diff --git a/include/i8042.h b/include/i8042.h index 687632058c..1f6d420d33 100644 --- a/include/i8042.h +++ b/include/i8042.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 ELTEC Elektronik AG * Frank Gottschling <fgottschling(a)eltec.de> diff --git a/include/ide.h b/include/ide.h index 2c25e74ede..0df29ba733 100644 --- a/include/ide.h +++ b/include/ide.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/image-android-dt.h b/include/image-android-dt.h index 9a3aa8fa30..f0d26f8594 100644 --- a/include/image-android-dt.h +++ b/include/image-android-dt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2018 Linaro Ltd. * Sam Protsenko <semen.protsenko(a)linaro.org> diff --git a/include/image-sparse.h b/include/image-sparse.h index 282a0b2564..f6f0b99e7f 100644 --- a/include/image-sparse.h +++ b/include/image-sparse.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/include/image.h b/include/image.h index 5f85bf84a2..1abfd1e276 100644 --- a/include/image.h +++ b/include/image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 Semihalf * diff --git a/include/imx8image.h b/include/imx8image.h index 32064bfeeb..3212fef184 100644 --- a/include/imx8image.h +++ b/include/imx8image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018 NXP * diff --git a/include/imx_container.h b/include/imx_container.h index 54cd684e35..f1c35ca4b8 100644 --- a/include/imx_container.h +++ b/include/imx_container.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2018-2019 NXP */ diff --git a/include/imx_lpi2c.h b/include/imx_lpi2c.h index 3ce9edaf10..a08ed95392 100644 --- a/include/imx_lpi2c.h +++ b/include/imx_lpi2c.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductors, Inc. * diff --git a/include/imx_sip.h b/include/imx_sip.h index 8a5ca34f39..a9915c0048 100644 --- a/include/imx_sip.h +++ b/include/imx_sip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 NXP */ diff --git a/include/imx_thermal.h b/include/imx_thermal.h index 6f32cb50b3..3843f3587d 100644 --- a/include/imx_thermal.h +++ b/include/imx_thermal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * (C) Copyright 2014 Freescale Semiconductor, Inc diff --git a/include/imximage.h b/include/imximage.h index c1ecc0b7cb..c19af62fba 100644 --- a/include/imximage.h +++ b/include/imximage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/include/init.h b/include/init.h index 4e7fe26c20..c83206228f 100644 --- a/include/init.h +++ b/include/init.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/initcall.h b/include/initcall.h index 62d3bb67f0..4c43e4595e 100644 --- a/include/initcall.h +++ b/include/initcall.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/input.h b/include/input.h index e99dbb0d33..ce89d376bf 100644 --- a/include/input.h +++ b/include/input.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Keyboard input helper functions (too small to be called a layer) * diff --git a/include/inttypes.h b/include/inttypes.h index dcb6785228..7d19045cc3 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 1997-2001, 2004, 2007 Free Software Foundation, Inc. * diff --git a/include/iomux.h b/include/iomux.h index 35caa697eb..ba982fd0f5 100644 --- a/include/iomux.h +++ b/include/iomux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj(a)denx.de. diff --git a/include/iotrace.h b/include/iotrace.h index 7ff2e8332b..3f06dc3595 100644 --- a/include/iotrace.h +++ b/include/iotrace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2014 Google, Inc. */ diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h index 866ead0ec7..9e089b0cb6 100644 --- a/include/ipu_pixfmt.h +++ b/include/ipu_pixfmt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de diff --git a/include/irq_func.h b/include/irq_func.h index c7c4babbfc..6e8cf4a96b 100644 --- a/include/irq_func.h +++ b/include/irq_func.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Header file for interrupt functions * diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index 9346d7ee9f..5ee1c6c79f 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef load_kernel_h #define load_kernel_h /*------------------------------------------------------------------------- diff --git a/include/jffs2/mini_inflate.h b/include/jffs2/mini_inflate.h index 52eb30b4ec..f26a6532c1 100644 --- a/include/jffs2/mini_inflate.h +++ b/include/jffs2/mini_inflate.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /*------------------------------------------------------------------------- * Filename: mini_inflate.h * Version: $Id: mini_inflate.h,v 1.2 2002/01/17 00:53:20 nyet Exp $ diff --git a/include/k210/pll.h b/include/k210/pll.h index fd16a89cb2..d08bcdb11c 100644 --- a/include/k210/pll.h +++ b/include/k210/pll.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-20 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/k3-avs.h b/include/k3-avs.h index e3c3cafbb9..59e6bf0a77 100644 --- a/include/k3-avs.h +++ b/include/k3-avs.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Texas Instruments' K3 Adaptive Voltage Scaling driver * diff --git a/include/k3-clk.h b/include/k3-clk.h index 49ba53d20f..ac3186e75e 100644 --- a/include/k3-clk.h +++ b/include/k3-clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2020-2021 Texas Instruments Incorporated - http://www.ti.com * Tero Kristo <t-kristo(a)ti.com> diff --git a/include/k3-ddrss.h b/include/k3-ddrss.h index d7b3bf3c33..f7934190bd 100644 --- a/include/k3-ddrss.h +++ b/include/k3-ddrss.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments' K3 DDRSS Driver * diff --git a/include/k3-dev.h b/include/k3-dev.h index d288ae3be7..b477820729 100644 --- a/include/k3-dev.h +++ b/include/k3-dev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments K3 Device Platform Data * diff --git a/include/key_matrix.h b/include/key_matrix.h index e7420b9d79..e80950675e 100644 --- a/include/key_matrix.h +++ b/include/key_matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Keyboard matrix helper functions * diff --git a/include/lattice.h b/include/lattice.h index 80fafc00dc..c740574fa2 100644 --- a/include/lattice.h +++ b/include/lattice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Porting to U-Boot: * diff --git a/include/led.h b/include/led.h index 329041008c..6688937f8e 100644 --- a/include/led.h +++ b/include/led.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/libata.h b/include/libata.h index b03b29960d..65899ab8a7 100644 --- a/include/libata.h +++ b/include/libata.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2003-2004 Red Hat, Inc. All rights reserved. * Copyright 2003-2004 Jeff Garzik diff --git a/include/libtizen.h b/include/libtizen.h index 15e01454b9..20ee6cef69 100644 --- a/include/libtizen.h +++ b/include/libtizen.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 Samsung Electronics * Donghwa Lee <dh09.lee(a)samsung.com> diff --git a/include/linker_lists.h b/include/linker_lists.h index f9a2ee0c76..b48f5c40f8 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/linker_lists.h * diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index 32d1401770..c0e300e600 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _LINUX_APM_H #define _LINUX_APM_H diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 0a8503af9f..c0dd1426bc 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __LINUX_BITMAP_H #define __LINUX_BITMAP_H diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index b8acacd49e..4425fc97c0 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 DENX Software Engineering * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/linux/delay.h b/include/linux/delay.h index 71a38e15fb..9b3aac2e5f 100644 --- a/include/linux/delay.h +++ b/include/linux/delay.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _LINUX_DELAY_H #define _LINUX_DELAY_H diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 0d62aefa0d..e01ce91e62 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h index 45307f51c1..bb2234137b 100644 --- a/include/linux/immap_qe.h +++ b/include/linux/immap_qe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * QUICC Engine (QE) Internal Memory Map. * The Internal Memory Map for devices with QE on them. This diff --git a/include/linux/io.h b/include/linux/io.h index 79847886be..43312e7c31 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _LINUX_IO_H #define _LINUX_IO_H diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 0b24111d6a..950be53e2e 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * U-Boot - linkage.h * diff --git a/include/linux/log2.h b/include/linux/log2.h index d4e32ecfc6..00176f5f26 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Integer base 2 logarithm calculation * * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. diff --git a/include/linux/mfd/syscon/atmel-matrix.h b/include/linux/mfd/syscon/atmel-matrix.h index dd228cab67..e074443c7c 100644 --- a/include/linux/mfd/syscon/atmel-matrix.h +++ b/include/linux/mfd/syscon/atmel-matrix.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Atmel Corporation. * diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h index fb86f1ddef..675fee4919 100644 --- a/include/linux/mtd/bbm.h +++ b/include/linux/mtd/bbm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * linux/include/linux/mtd/bbm.h * diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h index c57e973775..dc406f9c9c 100644 --- a/include/linux/mtd/concat.h +++ b/include/linux/mtd/concat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MTD device concatenation layer definitions * diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index 265e89f02b..aafc94ba21 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2000 Red Hat UK Limited * Copyright © 2000-2010 David Woodhouse <dwmw2(a)infradead.org> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 09f5269887..9ad8769cf0 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 1999-2010 David Woodhouse <dwmw2(a)infradead.org> et al. * diff --git a/include/linux/mtd/omap_gpmc.h b/include/linux/mtd/omap_gpmc.h index f08e700a1d..3f708aa998 100644 --- a/include/linux/mtd/omap_gpmc.h +++ b/include/linux/mtd/omap_gpmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2004-2008 Texas Instruments, <www.ti.com> * Rohit Choraria <rohitkc(a)ti.com> diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index fb002ae641..6776284b3c 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 2000-2010 David Woodhouse <dwmw2(a)infradead.org> * Steven J. Hill <sjhill(a)realitydiluted.com> diff --git a/include/linux/mtd/samsung_onenand.h b/include/linux/mtd/samsung_onenand.h index 7774fecdf8..6655b42d67 100644 --- a/include/linux/mtd/samsung_onenand.h +++ b/include/linux/mtd/samsung_onenand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2005-2009 Samsung Electronics * Minkyu Kang <mk7.kang(a)samsung.com> diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h index badf6a0c6c..d2632123de 100644 --- a/include/linux/mtd/ubi.h +++ b/include/linux/mtd/ubi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) International Business Machines Corp., 2006 * diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 40dad25e40..f671e9c4bb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket diff --git a/include/linux/pruss_driver.h b/include/linux/pruss_driver.h index 25272e850e..4bbca984a3 100644 --- a/include/linux/pruss_driver.h +++ b/include/linux/pruss_driver.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __TI_PRUSS_H #define __TI_PRUSS_H diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index 1d2b1768c1..956c6e8209 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea(a)suse.de> diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h index da04156e8a..45536c0201 100644 --- a/include/linux/rbtree_augmented.h +++ b/include/linux/rbtree_augmented.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea(a)suse.de> diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 061371773c..0aa5a4bd81 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * include/linux/serial_reg.h * diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h index 0ad8f203da..2618661494 100644 --- a/include/linux/soc/ti/k3-navss-ringacc.h +++ b/include/linux/soc/ti/k3-navss-ringacc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * TI K3 AM65x NAVSS Ring accelerator Manager (RA) subsystem driver * diff --git a/include/linux/soc/ti/k3-sec-proxy.h b/include/linux/soc/ti/k3-sec-proxy.h index f34854ceeb..2a0e0cf708 100644 --- a/include/linux/soc/ti/k3-sec-proxy.h +++ b/include/linux/soc/ti/k3-sec-proxy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments' K3 Secure proxy * diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 7f9941894c..4e5026fc5f 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Texas Instruments System Control Interface Protocol * Based on include/linux/soc/ti/ti_sci_protocol.h from Linux. diff --git a/include/linux/usb/at91_udc.h b/include/linux/usb/at91_udc.h index 541e2ba62c..a9551d2a02 100644 --- a/include/linux/usb/at91_udc.h +++ b/include/linux/usb/at91_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Platform data definitions for Atmel USBA gadget driver * pieces copied from linux:include/linux/platform_data/atmel.h diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h index c1c810759c..5b4e287a29 100644 --- a/include/linux/usb/atmel_usba_udc.h +++ b/include/linux/usb/atmel_usba_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Platform data definitions for Atmel USBA gadget driver * [Original from Linux kernel: include/linux/usb/atmel_usba_udc.h] diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 935e5c0cbb..2601ed2247 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * composite.h -- framework for usb gadgets which are composite devices * diff --git a/include/linux/usb/dwc3-omap.h b/include/linux/usb/dwc3-omap.h index 62180e3973..b942177d49 100644 --- a/include/linux/usb/dwc3-omap.h +++ b/include/linux/usb/dwc3-omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* include/linux/usb/dwc3-omap.h * * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h index 9ceee0a1c9..faa3ee970b 100644 --- a/include/linux/usb/dwc3.h +++ b/include/linux/usb/dwc3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* include/linux/usb/dwc3.h * * Copyright (c) 2012 Samsung Electronics Co. Ltd diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 5d0dac950e..1a4bbeb05d 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* include/linux/usb/otg.h * * Copyright (c) 2015 Texas Instruments Incorporated - http://www.ti.com diff --git a/include/linux/usb/usb_urb_compat.h b/include/linux/usb/usb_urb_compat.h index 2e8c9d8db7..01f5eaa277 100644 --- a/include/linux/usb/usb_urb_compat.h +++ b/include/linux/usb/usb_urb_compat.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __USB_URB_COMPAT_H__ #define __USB_URB_COMPAT_H__ diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 40979f72fc..090ec4a98b 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Freescale Semiconductor, Inc. * diff --git a/include/linux/usb/xhci-omap.h b/include/linux/usb/xhci-omap.h index ce9c074b23..f840649519 100644 --- a/include/linux/usb/xhci-omap.h +++ b/include/linux/usb/xhci-omap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * Texas Instruments Inc, <www.ti.com> diff --git a/include/linux/zstd.h b/include/linux/zstd.h index 3cf54d11f7..a64c48624b 100644 --- a/include/linux/zstd.h +++ b/include/linux/zstd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/include/lmb.h b/include/lmb.h index 231b68b27d..ccd9a55d34 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _LINUX_LMB_H #define _LINUX_LMB_H #ifdef __KERNEL__ diff --git a/include/log.h b/include/log.h index 6e84f080ef..2bdd5ad4da 100644 --- a/include/log.h +++ b/include/log.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Logging support * diff --git a/include/lzma/LzmaDec.h b/include/lzma/LzmaDec.h index b96cf1d444..4243e76ce8 100644 --- a/include/lzma/LzmaDec.h +++ b/include/lzma/LzmaDec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Fake include for LzmaDec.h * diff --git a/include/lzma/LzmaTools.h b/include/lzma/LzmaTools.h index 4629e6b428..5372e0fa00 100644 --- a/include/lzma/LzmaTools.h +++ b/include/lzma/LzmaTools.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Fake include for LzmaTools.h * diff --git a/include/lzma/LzmaTypes.h b/include/lzma/LzmaTypes.h index 3670c3ff91..732d1d7df7 100644 --- a/include/lzma/LzmaTypes.h +++ b/include/lzma/LzmaTypes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Fake include for Types.h * diff --git a/include/malloc.h b/include/malloc.h index 161ccbd129..a9b496b414 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* This code is based on a version of malloc/free/realloc written by Doug Lea and released to the public domain. Send questions/comments/complaints/performance diff --git a/include/mc13892.h b/include/mc13892.h index 8e8b63e769..5cb7997f49 100644 --- a/include/mc13892.h +++ b/include/mc13892.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/include/memalign.h b/include/memalign.h index f67f0a74f2..48f65f62bb 100644 --- a/include/memalign.h +++ b/include/memalign.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/membuff.h b/include/membuff.h index 21051b0c54..8ff4abdf6c 100644 --- a/include/membuff.h +++ b/include/membuff.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/menu.h b/include/menu.h index 6571c39b14..a3b6fede3e 100644 --- a/include/menu.h +++ b/include/menu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2010-2011 Calxeda, Inc. */ diff --git a/include/meson/sm.h b/include/meson/sm.h index fbaab1f1ee..c3c813efab 100644 --- a/include/meson/sm.h +++ b/include/meson/sm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/include/misc.h b/include/misc.h index 6f042625c9..bf408cbd4f 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/include/mm_communication.h b/include/mm_communication.h index f38f1a5344..f815b69777 100644 --- a/include/mm_communication.h +++ b/include/mm_communication.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Headers for EFI variable service via StandAloneMM, EDK2 application running * in OP-TEE diff --git a/include/mmc.h b/include/mmc.h index 1022db3ffa..47f2c3e73d 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2008,2010 Freescale Semiconductor, Inc * Andy Fleming diff --git a/include/mpc83xx.h b/include/mpc83xx.h index 5926c8090a..4356abd9aa 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2004-2007, 2010 Freescale Semiconductor, Inc. */ diff --git a/include/mpc8xx.h b/include/mpc8xx.h index 0e0e0cb70d..e4582ebbf3 100644 --- a/include/mpc8xx.h +++ b/include/mpc8xx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/msc01.h b/include/msc01.h index 2015812349..1289dfd44b 100644 --- a/include/msc01.h +++ b/include/msc01.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton(a)mips.com> diff --git a/include/mtd.h b/include/mtd.h index f9e5082446..0127ffcd81 100644 --- a/include/mtd.h +++ b/include/mtd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index 52cd1c4dbc..e459ff2211 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index ea244fbaeb..a53221d844 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © 1999-2010 David Woodhouse <dwmw2(a)infradead.org> et al. * diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 8d472cc013..803b77ca96 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright © International Business Machines Corp., 2006 * diff --git a/include/mux-internal.h b/include/mux-internal.h index 93e3a5cdd7..80a6ec8411 100644 --- a/include/mux-internal.h +++ b/include/mux-internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on the linux multiplexer framework * diff --git a/include/mux.h b/include/mux.h index c92d887591..b95731a82c 100644 --- a/include/mux.h +++ b/include/mux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on the linux multiplexer framework * diff --git a/include/mv88e6352.h b/include/mv88e6352.h index 2e810c8183..5cbb61df4c 100644 --- a/include/mv88e6352.h +++ b/include/mv88e6352.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Valentin Lontgchamp, Keymile AG, valentin.longchamp(a)keymile.com diff --git a/include/mvebu/comphy.h b/include/mvebu/comphy.h index 14431576e6..f3555a474a 100644 --- a/include/mvebu/comphy.h +++ b/include/mvebu/comphy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015-2016 Marvell International Ltd. */ diff --git a/include/mvebu_mmc.h b/include/mvebu_mmc.h index 0f6f5c23de..2d9150a0be 100644 --- a/include/mvebu_mmc.h +++ b/include/mvebu_mmc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Marvell MMC/SD/SDIO driver * diff --git a/include/mxs_nand.h b/include/mxs_nand.h index bb5b84b8c2..8bda204c03 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * NXP GPMI NAND flash driver * diff --git a/include/ndisc.h b/include/ndisc.h index d0fe3acca4..c545382ea5 100644 --- a/include/ndisc.h +++ b/include/ndisc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Allied Telesis Labs NZ * Chris Packham, <judge.packham(a)gmail.com> diff --git a/include/net/dsa.h b/include/net/dsa.h index 9fa9d4e785..9b66a304d6 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019-2021 NXP */ diff --git a/include/net/ldpaa_eth.h b/include/net/ldpaa_eth.h index 7474bfaeec..b0903d95d6 100644 --- a/include/net/ldpaa_eth.h +++ b/include/net/ldpaa_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2023 NXP */ diff --git a/include/net/ncsi.h b/include/net/ncsi.h index 2800c842b7..50ced45715 100644 --- a/include/net/ncsi.h +++ b/include/net/ncsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * NC-SI PHY * diff --git a/include/net/pfe_eth/pfe/cbus.h b/include/net/pfe_eth/pfe/cbus.h index e8e9f34cbc..6325836bd7 100644 --- a/include/net/pfe_eth/pfe/cbus.h +++ b/include/net/pfe_eth/pfe/cbus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/bmu.h b/include/net/pfe_eth/pfe/cbus/bmu.h index 3a83e4dc1c..9d7bd373e8 100644 --- a/include/net/pfe_eth/pfe/cbus/bmu.h +++ b/include/net/pfe_eth/pfe/cbus/bmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/class_csr.h b/include/net/pfe_eth/pfe/cbus/class_csr.h index 80f1f96b44..02b8e94b4e 100644 --- a/include/net/pfe_eth/pfe/cbus/class_csr.h +++ b/include/net/pfe_eth/pfe/cbus/class_csr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/emac.h b/include/net/pfe_eth/pfe/cbus/emac.h index 5dc2113687..e9c72031d0 100644 --- a/include/net/pfe_eth/pfe/cbus/emac.h +++ b/include/net/pfe_eth/pfe/cbus/emac.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/gpi.h b/include/net/pfe_eth/pfe/cbus/gpi.h index 6b5ba5d233..85e8996fac 100644 --- a/include/net/pfe_eth/pfe/cbus/gpi.h +++ b/include/net/pfe_eth/pfe/cbus/gpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/hif.h b/include/net/pfe_eth/pfe/cbus/hif.h index aa4951ec0e..5b6d314996 100644 --- a/include/net/pfe_eth/pfe/cbus/hif.h +++ b/include/net/pfe_eth/pfe/cbus/hif.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/hif_nocpy.h b/include/net/pfe_eth/pfe/cbus/hif_nocpy.h index 21aa133860..7019063ecd 100644 --- a/include/net/pfe_eth/pfe/cbus/hif_nocpy.h +++ b/include/net/pfe_eth/pfe/cbus/hif_nocpy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/tmu_csr.h b/include/net/pfe_eth/pfe/cbus/tmu_csr.h index cfe8f8ce8f..dc2b463725 100644 --- a/include/net/pfe_eth/pfe/cbus/tmu_csr.h +++ b/include/net/pfe_eth/pfe/cbus/tmu_csr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/cbus/util_csr.h b/include/net/pfe_eth/pfe/cbus/util_csr.h index 40476cd9e5..e94ecc2eb6 100644 --- a/include/net/pfe_eth/pfe/cbus/util_csr.h +++ b/include/net/pfe_eth/pfe/cbus/util_csr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe/pfe_hw.h b/include/net/pfe_eth/pfe/pfe_hw.h index 71e4115afa..1e07cc90d5 100644 --- a/include/net/pfe_eth/pfe/pfe_hw.h +++ b/include/net/pfe_eth/pfe/pfe_hw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe_driver.h b/include/net/pfe_eth/pfe_driver.h index fa9f2fa65d..0ae8565174 100644 --- a/include/net/pfe_eth/pfe_driver.h +++ b/include/net/pfe_eth/pfe_driver.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe_eth.h b/include/net/pfe_eth/pfe_eth.h index 92dc46ee9a..804726e957 100644 --- a/include/net/pfe_eth/pfe_eth.h +++ b/include/net/pfe_eth/pfe_eth.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe_firmware.h b/include/net/pfe_eth/pfe_firmware.h index b4fe313eeb..b7660fa002 100644 --- a/include/net/pfe_eth/pfe_firmware.h +++ b/include/net/pfe_eth/pfe_firmware.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/pfe_eth/pfe_mdio.h b/include/net/pfe_eth/pfe_mdio.h index 972b87956f..9156d80322 100644 --- a/include/net/pfe_eth/pfe_mdio.h +++ b/include/net/pfe_eth/pfe_mdio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. * Copyright 2017 NXP diff --git a/include/net/sntp.h b/include/net/sntp.h index 30b44d1c06..0aa3b683df 100644 --- a/include/net/sntp.h +++ b/include/net/sntp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Masami Komiya <mkomiya(a)sonare.it> 2005 */ diff --git a/include/net/udp.h b/include/net/udp.h index 2ae56e8447..440f934e41 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/include/net6.h b/include/net6.h index 1e766aa720..645b5d4506 100644 --- a/include/net6.h +++ b/include/net6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Allied Telesis Labs NZ * Chris Packham, <judge.packham(a)gmail.com> diff --git a/include/netdev.h b/include/netdev.h index 2a7f40e504..13c549faef 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Benjamin Warren, biggerbadderben(a)gmail.com diff --git a/include/nuvoton_nct6102d.h b/include/nuvoton_nct6102d.h index a02f3927d7..95b86406bb 100644 --- a/include/nuvoton_nct6102d.h +++ b/include/nuvoton_nct6102d.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/nvme.h b/include/nvme.h index 2cdf8ce320..67c986778f 100644 --- a/include/nvme.h +++ b/include/nvme.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2017 Bin Meng <bmeng.cn(a)gmail.com> diff --git a/include/nvmem.h b/include/nvmem.h index 822e698bdd..d8a7c92282 100644 --- a/include/nvmem.h +++ b/include/nvmem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/include/nvmxip.h b/include/nvmxip.h index 726fffeb3e..7dd556a409 100644 --- a/include/nvmxip.h +++ b/include/nvmxip.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> * diff --git a/include/of_live.h b/include/of_live.h index 67bd5f02c7..6240072f1d 100644 --- a/include/of_live.h +++ b/include/of_live.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/omap3_spi.h b/include/omap3_spi.h index 5381431d43..59ef458d35 100644 --- a/include/omap3_spi.h +++ b/include/omap3_spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __OMAP3_SPI_H_ #define __OMAP3_SPI_H_ diff --git a/include/os.h b/include/os.h index fc8a1b15cb..fce871b196 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Operating System Interface * diff --git a/include/p2sb.h b/include/p2sb.h index 00acc8d935..8c8564e778 100644 --- a/include/p2sb.h +++ b/include/p2sb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/palmas.h b/include/palmas.h index e259a4d04b..fa563f1a4e 100644 --- a/include/palmas.h +++ b/include/palmas.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013 * Texas Instruments, <www.ti.com> diff --git a/include/panel.h b/include/panel.h index ab417bc91e..63cafd7d5c 100644 --- a/include/panel.h +++ b/include/panel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/part.h b/include/part.h index db34bc6bb7..e0b825023a 100644 --- a/include/part.h +++ b/include/part.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/part_efi.h b/include/part_efi.h index 59b7895b8a..d68f1a3909 100644 --- a/include/part_efi.h +++ b/include/part_efi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2008 RuggedCom, Inc. * Richard Retanubun <RichardRetanubun(a)RuggedCom.com> diff --git a/include/pch.h b/include/pch.h index d2b6862037..ede0811421 100644 --- a/include/pch.h +++ b/include/pch.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/pci.h b/include/pci.h index 2f5eb30b83..4dc5271088 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel(a)sysgo.de> diff --git a/include/pci_ep.h b/include/pci_ep.h index e8e5800096..53fe215cfa 100644 --- a/include/pci_ep.h +++ b/include/pci_ep.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Adapted from Linux kernel driver * Copyright (C) 2017 Texas Instruments diff --git a/include/pci_msc01.h b/include/pci_msc01.h index cdfd066f6b..cccb1bca5f 100644 --- a/include/pci_msc01.h +++ b/include/pci_msc01.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Imagination Technologies * Author: Paul Burton <paul.burton(a)mips.com> diff --git a/include/pci_rom.h b/include/pci_rom.h index 1cc61c387b..7272cfdd28 100644 --- a/include/pci_rom.h +++ b/include/pci_rom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * From coreboot file of same name */ diff --git a/include/pci_tegra.h b/include/pci_tegra.h index 11e92fc26d..743dd0e83b 100644 --- a/include/pci_tegra.h +++ b/include/pci_tegra.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Toradex, Inc. */ diff --git a/include/pe.h b/include/pe.h index 086f2b860e..2eb7dc7409 100644 --- a/include/pe.h +++ b/include/pe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Portable Executable binary format structures * diff --git a/include/phy-sun4i-usb.h b/include/phy-sun4i-usb.h index c37c59379f..983e725140 100644 --- a/include/phy-sun4i-usb.h +++ b/include/phy-sun4i-usb.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __GENERIC_PHY_SUN4I_USB_H diff --git a/include/phy.h b/include/phy.h index 27effdb576..9df1321f8f 100644 --- a/include/phy.h +++ b/include/phy.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. * Andy Fleming <afleming(a)gmail.com> diff --git a/include/phy_interface.h b/include/phy_interface.h index 31be3228c7..0a7f2e777d 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011 Freescale Semiconductor, Inc. * Copyright 2020 NXP diff --git a/include/phys2bus.h b/include/phys2bus.h index 866b8b51a8..85b7d9c793 100644 --- a/include/phys2bus.h +++ b/include/phys2bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2015 Stephen Warren */ diff --git a/include/post.h b/include/post.h index 6e88d55072..b48c687492 100644 --- a/include/post.h +++ b/include/post.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/power/act8846_pmic.h b/include/power/act8846_pmic.h index 84845c70f9..c2d975f6b8 100644 --- a/include/power/act8846_pmic.h +++ b/include/power/act8846_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/power/as3722.h b/include/power/as3722.h index f5398123f2..78f9eef41f 100644 --- a/include/power/as3722.h +++ b/include/power/as3722.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 NVIDIA Corporation */ diff --git a/include/power/battery.h b/include/power/battery.h index 1e3d59d76e..9ab8bfeebb 100644 --- a/include/power/battery.h +++ b/include/power/battery.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/da9063_pmic.h b/include/power/da9063_pmic.h index 273a07ef41..22a3c65206 100644 --- a/include/power/da9063_pmic.h +++ b/include/power/da9063_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Flowbird * Martin Fuzzey <martin.fuzzey(a)flowbird.group> diff --git a/include/power/fan53555.h b/include/power/fan53555.h index c039f06071..bb247c923e 100644 --- a/include/power/fan53555.h +++ b/include/power/fan53555.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 Vasily Khoruzhick <anarsoul(a)gmail.com> */ diff --git a/include/power/hi6553_pmic.h b/include/power/hi6553_pmic.h index d0abe20755..dc5cbb2b3f 100644 --- a/include/power/hi6553_pmic.h +++ b/include/power/hi6553_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Linaro * Peter Griffin <peter.griffin(a)linaro.org> diff --git a/include/power/ltc3676_pmic.h b/include/power/ltc3676_pmic.h index 36c79716fa..f7cb1ae5a9 100644 --- a/include/power/ltc3676_pmic.h +++ b/include/power/ltc3676_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Gateworks Corporation * Tim Harvey <tharvey(a)gateworks.com> diff --git a/include/power/max17042_fg.h b/include/power/max17042_fg.h index ec8377d370..615c8c78e8 100644 --- a/include/power/max17042_fg.h +++ b/include/power/max17042_fg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h index cf476c85ab..041cb11c40 100644 --- a/include/power/max77686_pmic.h +++ b/include/power/max77686_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Rajeshwari Shinde <rajeshwari.s(a)samsung.com> diff --git a/include/power/max77693_fg.h b/include/power/max77693_fg.h index c2ae62231e..7fd88e1f66 100644 --- a/include/power/max77693_fg.h +++ b/include/power/max77693_fg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Piotr Wilczek <p.wilczek(a)samsung.com> diff --git a/include/power/max77693_muic.h b/include/power/max77693_muic.h index c9afab218c..9600e32e20 100644 --- a/include/power/max77693_muic.h +++ b/include/power/max77693_muic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Piotr Wilczek <p.wilczek(a)samsung.com> diff --git a/include/power/max77693_pmic.h b/include/power/max77693_pmic.h index 9e0e05c56a..ac6cab460a 100644 --- a/include/power/max77693_pmic.h +++ b/include/power/max77693_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Samsung Electronics * Piotr Wilczek <p.wilczek(a)samsung.com> diff --git a/include/power/max8997_muic.h b/include/power/max8997_muic.h index e4ceab6f7a..1fa7d1d476 100644 --- a/include/power/max8997_muic.h +++ b/include/power/max8997_muic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/max8997_pmic.h b/include/power/max8997_pmic.h index 956eebb968..8504a73005 100644 --- a/include/power/max8997_pmic.h +++ b/include/power/max8997_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/max8998_pmic.h b/include/power/max8998_pmic.h index b1a87d66af..0458d93adc 100644 --- a/include/power/max8998_pmic.h +++ b/include/power/max8998_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/mc34vr500_pmic.h b/include/power/mc34vr500_pmic.h index d2edda6890..a8a36dd14f 100644 --- a/include/power/mc34vr500_pmic.h +++ b/include/power/mc34vr500_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2016 Freescale Semiconductor, Inc. * Hou Zhiqiang <Zhiqiang.Hou(a)freescale.com> diff --git a/include/power/pca9450.h b/include/power/pca9450.h index b8219d535a..0b9bb5bd83 100644 --- a/include/power/pca9450.h +++ b/include/power/pca9450.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 NXP */ diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h index 278f2549bf..0b0bb5b4e1 100644 --- a/include/power/pfuze100_pmic.h +++ b/include/power/pfuze100_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Gateworks Corporation * Tim Harvey <tharvey(a)gateworks.com> diff --git a/include/power/pfuze3000_pmic.h b/include/power/pfuze3000_pmic.h index b836d67fb6..74049dc177 100644 --- a/include/power/pfuze3000_pmic.h +++ b/include/power/pfuze3000_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Freescale Semiconductor, Inc * Peng Fan <Peng.Fan(a)freescale.com> diff --git a/include/power/pmic.h b/include/power/pmic.h index 636221692d..d676f34592 100644 --- a/include/power/pmic.h +++ b/include/power/pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/power/power_chrg.h b/include/power/power_chrg.h index db19953fb7..0174291697 100644 --- a/include/power/power_chrg.h +++ b/include/power/power_chrg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/power/regulator.h b/include/power/regulator.h index 200652cb3d..9a487b048d 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014-2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index 3cbfc02195..b115300df0 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/power/rn5t567_pmic.h b/include/power/rn5t567_pmic.h index 93bc7cba5a..8fcb9e0836 100644 --- a/include/power/rn5t567_pmic.h +++ b/include/power/rn5t567_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Toradex AG * Stefan Agner <stefan.agner(a)toradex.com> diff --git a/include/power/s5m8767.h b/include/power/s5m8767.h index f75ed5d928..48b900012a 100644 --- a/include/power/s5m8767.h +++ b/include/power/s5m8767.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/power/sandbox_pmic.h b/include/power/sandbox_pmic.h index 1dbd15b523..1050577ba3 100644 --- a/include/power/sandbox_pmic.h +++ b/include/power/sandbox_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/power/stpmic1.h b/include/power/stpmic1.h index 201b1df762..8565b99c0b 100644 --- a/include/power/stpmic1.h +++ b/include/power/stpmic1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/include/power/tps62362.h b/include/power/tps62362.h index f0fc538463..175e849653 100644 --- a/include/power/tps62362.h +++ b/include/power/tps62362.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 Texas Instruments Incorporated - http://www.ti.com * Author: Felipe Balbi <balbi(a)ti.com> diff --git a/include/power/tps65090.h b/include/power/tps65090.h index 2716968a8d..204ccd1414 100644 --- a/include/power/tps65090.h +++ b/include/power/tps65090.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/power/tps65217.h b/include/power/tps65217.h index 669a94a6c8..51daebe96c 100644 --- a/include/power/tps65217.h +++ b/include/power/tps65217.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011-2013 * Texas Instruments, <www.ti.com> diff --git a/include/power/tps65218.h b/include/power/tps65218.h index bb66c3f3ab..a21ae808fe 100644 --- a/include/power/tps65218.h +++ b/include/power/tps65218.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> diff --git a/include/power/tps65219.h b/include/power/tps65219.h index aa81b92266..117ae21cd1 100644 --- a/include/power/tps65219.h +++ b/include/power/tps65219.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2022 BayLibre, SAS * Author: Neil Armstrong <narmstrong(a)baylibre.com> diff --git a/include/power/tps65910.h b/include/power/tps65910.h index 21b2a21ee0..84510150ff 100644 --- a/include/power/tps65910.h +++ b/include/power/tps65910.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011-2013 * Texas Instruments, <www.ti.com> diff --git a/include/power/tps65910_pmic.h b/include/power/tps65910_pmic.h index 66214786d3..52527541bc 100644 --- a/include/power/tps65910_pmic.h +++ b/include/power/tps65910_pmic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) EETS GmbH, 2017, Felix Brack <f.brack(a)eets.ch> */ diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl index db7b1668d9..33ecf852c4 100644 --- a/include/ppc_asm.tmpl +++ b/include/ppc_asm.tmpl @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/ppc_defs.h b/include/ppc_defs.h index 42ddc3b403..7df3381025 100644 --- a/include/ppc_defs.h +++ b/include/ppc_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/pvblock.h b/include/pvblock.h index 1023a6ab3b..0a315ec013 100644 --- a/include/pvblock.h +++ b/include/pvblock.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * (C) 2020 EPAM Systems Inc. */ diff --git a/include/pwm.h b/include/pwm.h index bfdc1e3f30..acdf3ee15d 100644 --- a/include/pwm.h +++ b/include/pwm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * header file for pwm driver. * diff --git a/include/pwrseq.h b/include/pwrseq.h index fbf6376d24..e7eeea748f 100644 --- a/include/pwrseq.h +++ b/include/pwrseq.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc */ diff --git a/include/pxe_utils.h b/include/pxe_utils.h index 9f19593048..ba2e2f2959 100644 --- a/include/pxe_utils.h +++ b/include/pxe_utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __PXE_UTILS_H #define __PXE_UTILS_H diff --git a/include/qfw.h b/include/qfw.h index 42798fea7d..205b51ffd5 100644 --- a/include/qfw.h +++ b/include/qfw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Miao Yan <yanmiaobest(a)gmail.com> */ diff --git a/include/ram.h b/include/ram.h index 2fc971df46..d155f5063c 100644 --- a/include/ram.h +++ b/include/ram.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/rand.h b/include/rand.h index 4c54fbbd10..2798332f89 100644 --- a/include/rand.h +++ b/include/rand.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/rc4.h b/include/rc4.h index d1257f20a4..6f1f609cf4 100644 --- a/include/rc4.h +++ b/include/rc4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc * diff --git a/include/reboot-mode/reboot-mode-gpio.h b/include/reboot-mode/reboot-mode-gpio.h index 16b1185c69..7ba31e88aa 100644 --- a/include/reboot-mode/reboot-mode-gpio.h +++ b/include/reboot-mode/reboot-mode-gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) Vaisala Oyj. */ diff --git a/include/reboot-mode/reboot-mode-rtc.h b/include/reboot-mode/reboot-mode-rtc.h index 3613678f63..c4b98f8e86 100644 --- a/include/reboot-mode/reboot-mode-rtc.h +++ b/include/reboot-mode/reboot-mode-rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c), Vaisala Oyj */ diff --git a/include/reboot-mode/reboot-mode.h b/include/reboot-mode/reboot-mode.h index 5fbd7c801a..c7deae38e3 100644 --- a/include/reboot-mode/reboot-mode.h +++ b/include/reboot-mode/reboot-mode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c), Vaisala Oyj */ diff --git a/include/regmap.h b/include/regmap.h index 22b043408a..f430022adb 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/reiserfs.h b/include/reiserfs.h index b61bb60067..3f64c02edb 100644 --- a/include/reiserfs.h +++ b/include/reiserfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2000-2002 by Hans Reiser, licensing governed by reiserfs/README * diff --git a/include/relocate.h b/include/relocate.h index 8ca25e1105..b556f98cc2 100644 --- a/include/relocate.h +++ b/include/relocate.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Graeme Russ, <graeme.russ(a)gmail.com> diff --git a/include/rng.h b/include/rng.h index 37af554363..63f34a18b8 100644 --- a/include/rng.h +++ b/include/rng.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Linaro Limited */ diff --git a/include/rtc.h b/include/rtc.h index b6fdbb60dc..1dac1f2cf2 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/rtc_def.h b/include/rtc_def.h index 6cb490c420..0f3d7bfcae 100644 --- a/include/rtc_def.h +++ b/include/rtc_def.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/s_record.h b/include/s_record.h index 3ece695941..c977952627 100644 --- a/include/s_record.h +++ b/include/s_record.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/samsung-usb-phy-uboot.h b/include/samsung-usb-phy-uboot.h index f2bce578ab..440ec4eb2c 100644 --- a/include/samsung-usb-phy-uboot.h +++ b/include/samsung-usb-phy-uboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* include/samsung-usb-phy-uboot.h * * Copyright (c) 2015 Samsung Electronics diff --git a/include/sandbox-adc.h b/include/sandbox-adc.h index 2017b9cfc2..3b1d0991a7 100644 --- a/include/sandbox-adc.h +++ b/include/sandbox-adc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/sandbox-clk.h b/include/sandbox-clk.h index c2616c27a4..b74f46c825 100644 --- a/include/sandbox-clk.h +++ b/include/sandbox-clk.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/include/sandbox-sm.h b/include/sandbox-sm.h index 91c30d501d..6362876b33 100644 --- a/include/sandbox-sm.h +++ b/include/sandbox-sm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/include/sandbox_efi_capsule.h b/include/sandbox_efi_capsule.h index 3e288e8a84..68be0cda07 100644 --- a/include/sandbox_efi_capsule.h +++ b/include/sandbox_efi_capsule.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023, Linaro Limited */ diff --git a/include/sandbox_host.h b/include/sandbox_host.h index f7a5fc6723..6860360213 100644 --- a/include/sandbox_host.h +++ b/include/sandbox_host.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sandbox host uclass * diff --git a/include/sandboxtee.h b/include/sandboxtee.h index 419643a024..d4ea40fec5 100644 --- a/include/sandboxtee.h +++ b/include/sandboxtee.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Linaro Limited */ diff --git a/include/scmi_agent-uclass.h b/include/scmi_agent-uclass.h index 35d9606964..41eecca1cd 100644 --- a/include/scmi_agent-uclass.h +++ b/include/scmi_agent-uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019-2020 Linaro Limited. */ diff --git a/include/scp03.h b/include/scp03.h index 729667ccd1..3f4546d950 100644 --- a/include/scp03.h +++ b/include/scp03.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2021, Foundries.IO * diff --git a/include/scsi.h b/include/scsi.h index ee9d622680..c87a2332d3 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/include/scsi_emul.h b/include/scsi_emul.h index d439f7c00c..742dcf9ac6 100644 --- a/include/scsi_emul.h +++ b/include/scsi_emul.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Emulation of enough SCSI commands to find and read from a unit * diff --git a/include/sdhci.h b/include/sdhci.h index 70fefca2a9..3832192230 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen(a)marvell.com> diff --git a/include/sdp.h b/include/sdp.h index 5492f9c47d..7e7433c471 100644 --- a/include/sdp.h +++ b/include/sdp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * sdp.h - Serial Download Protocol * diff --git a/include/semihosting.h b/include/semihosting.h index 4e844cbad8..2045bd15af 100644 --- a/include/semihosting.h +++ b/include/semihosting.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/include/semihostingfs.h b/include/semihostingfs.h index 25ebdbbeff..d7141c3318 100644 --- a/include/semihostingfs.h +++ b/include/semihostingfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2022, Sean Anderson <sean.anderson(a)seco.com> * Copyright (c) 2012, Google Inc. diff --git a/include/sl28cpld.h b/include/sl28cpld.h index 9a7c6de31f..df792f9817 100644 --- a/include/sl28cpld.h +++ b/include/sl28cpld.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 Michael Walle <michael(a)walle.cc> */ diff --git a/include/sm-uclass.h b/include/sm-uclass.h index c114484044..a5d47e23f6 100644 --- a/include/sm-uclass.h +++ b/include/sm-uclass.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/include/sm.h b/include/sm.h index afa9c89055..c3b326598c 100644 --- a/include/sm.h +++ b/include/sm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/include/smbios.h b/include/smbios.h index c9df2706f5..75f99ef8cf 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/include/smem.h b/include/smem.h index b19c534ebc..bf4311825b 100644 --- a/include/smem.h +++ b/include/smem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * The shared memory system is an allocate-only heap structure that * consists of one of more memory areas that can be accessed by the processors diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h index 8a972acd4c..1c6e5b0420 100644 --- a/include/smsc_lpc47m.h +++ b/include/smsc_lpc47m.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/smsc_sio1007.h b/include/smsc_sio1007.h index ca3f3f7a71..d5d7726222 100644 --- a/include/smsc_sio1007.h +++ b/include/smsc_sio1007.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/soc.h b/include/soc.h index a52a300a84..4181f2554f 100644 --- a/include/soc.h +++ b/include/soc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ * Dave Gerlach <d-gerlach(a)ti.com> diff --git a/include/sort.h b/include/sort.h index 76483cff33..2fef5e58ea 100644 --- a/include/sort.h +++ b/include/sort.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/include/sound.h b/include/sound.h index dab9ea186e..e65072334e 100644 --- a/include/sound.h +++ b/include/sound.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2012 Samsung Electronics * R. Chandrasekar < rcsekar(a)samsung.com> diff --git a/include/sparse_defs.h b/include/sparse_defs.h index 4bbdffea56..171556204b 100644 --- a/include/sparse_defs.h +++ b/include/sparse_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Broadcom Corporation. */ diff --git a/include/spartan2.h b/include/spartan2.h index 618eddd838..af9dd18546 100644 --- a/include/spartan2.h +++ b/include/spartan2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/spartan3.h b/include/spartan3.h index cf98adcb95..d2eaed24af 100644 --- a/include/spartan3.h +++ b/include/spartan3.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/spd.h b/include/spd.h index 2bcf46de6d..6237b7b6ce 100644 --- a/include/spd.h +++ b/include/spd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2003 Arabella Software Ltd. * Yuli Barcohen <yuli(a)arabellasw.com> diff --git a/include/spi-mem.h b/include/spi-mem.h index b07cf2ed83..57785487fd 100644 --- a/include/spi-mem.h +++ b/include/spi-mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Exceet Electronics GmbH * Copyright (C) 2018 Bootlin diff --git a/include/spi.h b/include/spi.h index 1bc18e6552..0aa52b43c1 100644 --- a/include/spi.h +++ b/include/spi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common SPI Interface: Controller-specific definitions * diff --git a/include/spl.h b/include/spl.h index 0d49e4a454..9a798529e5 100644 --- a/include/spl.h +++ b/include/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012 * Texas Instruments, <www.ti.com> diff --git a/include/spl_gpio.h b/include/spl_gpio.h index e39ac3f624..bb231ea319 100644 --- a/include/spl_gpio.h +++ b/include/spl_gpio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Simple GPIO access from SPL. This only supports a single GPIO space, * typically the SoC GPIO banks. diff --git a/include/status_led.h b/include/status_led.h index 6707ab1d29..a44e68daa1 100644 --- a/include/status_led.h +++ b/include/status_led.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/stdint.h b/include/stdint.h index dea83c8226..9bb7d8299a 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Dummy file to allow libraries linked with U-Boot to include stdint.h without * getting the system version. diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 4e3c4708f8..65a7519679 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/include/stdlib.h b/include/stdlib.h index 9c175d4d74..04f39b6b7a 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2013 Google Inc. */ diff --git a/include/stm32_rcc.h b/include/stm32_rcc.h index b559ea7728..1a5f15f8b0 100644 --- a/include/stm32_rcc.h +++ b/include/stm32_rcc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) STMicroelectronics SA 2017 * Author(s): Patrice CHOTARD, <patrice.chotard(a)foss.st.com> for STMicroelectronics. diff --git a/include/stratixII.h b/include/stratixII.h index 3c06bb2955..2ccbb7d33b 100644 --- a/include/stratixII.h +++ b/include/stratixII.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007 * Eran Liberty, Extricom, eran.liberty(a)gmail.com diff --git a/include/sunxi_image.h b/include/sunxi_image.h index 379ca9196e..3c0d7716ab 100644 --- a/include/sunxi_image.h +++ b/include/sunxi_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/include/sy8106a.h b/include/sy8106a.h index 36bfdbd308..aec37d6785 100644 --- a/include/sy8106a.h +++ b/include/sy8106a.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2016 * Jelle van der Waa <jelle(a)vdwaa.nl> diff --git a/include/syscon.h b/include/syscon.h index 7a5ee3fa26..7132bd4aa1 100644 --- a/include/syscon.h +++ b/include/syscon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/sysinfo.h b/include/sysinfo.h index b140d742e9..5fc44bba96 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/include/sysreset.h b/include/sysreset.h index ff20abdeed..dd6f179834 100644 --- a/include/sysreset.h +++ b/include/sysreset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/system-constants.h b/include/system-constants.h index 59371568d1..7030227cb5 100644 --- a/include/system-constants.h +++ b/include/system-constants.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __SYSTEM_CONSTANTS_H__ #define __SYSTEM_CONSTANTS_H__ diff --git a/include/tables_csum.h b/include/tables_csum.h index 4812333093..e47c1939c5 100644 --- a/include/tables_csum.h +++ b/include/tables_csum.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/include/tee.h b/include/tee.h index ab0c583261..949b70dd46 100644 --- a/include/tee.h +++ b/include/tee.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2018 Linaro Limited */ diff --git a/include/test/cedit-test.h b/include/test/cedit-test.h index 475ecc9c2d..79b428a105 100644 --- a/include/test/cedit-test.h +++ b/include/test/cedit-test.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Binding shared between cedit.dtsi and test/boot/expo.c * diff --git a/include/test/compression.h b/include/test/compression.h index 02fcfa49f6..64d6524467 100644 --- a/include/test/compression.h +++ b/include/test/compression.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/test/export.h b/include/test/export.h index afc755a8ff..e917d6efe3 100644 --- a/include/test/export.h +++ b/include/test/export.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/test/fuzz.h b/include/test/fuzz.h index d4c57540eb..9606b8b91d 100644 --- a/include/test/fuzz.h +++ b/include/test/fuzz.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/include/test/optee.h b/include/test/optee.h index a8c6e6395f..288c41b5f6 100644 --- a/include/test/optee.h +++ b/include/test/optee.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ diff --git a/include/test/overlay.h b/include/test/overlay.h index c13f4d66e0..aa393ba819 100644 --- a/include/test/overlay.h +++ b/include/test/overlay.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons diff --git a/include/test/spl.h b/include/test/spl.h index c1f6465850..f82a5b3298 100644 --- a/include/test/spl.h +++ b/include/test/spl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/include/test/test.h b/include/test/test.h index 838e3ce8a8..225cb8109b 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 Google, Inc. */ diff --git a/include/test/ut.h b/include/test/ut.h index ea6ee95d73..16f486c84f 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Simple unit test library * diff --git a/include/thermal.h b/include/thermal.h index 52a3317fd5..28e649e4bf 100644 --- a/include/thermal.h +++ b/include/thermal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * (C) Copyright 2014 Freescale Semiconductor, Inc diff --git a/include/thor.h b/include/thor.h index 3cb56b654a..0dbbbe9578 100644 --- a/include/thor.h +++ b/include/thor.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * thor.h -- USB THOR Downloader protocol * diff --git a/include/ti-usb-phy-uboot.h b/include/ti-usb-phy-uboot.h index cd2ba40477..7fc60bf825 100644 --- a/include/ti-usb-phy-uboot.h +++ b/include/ti-usb-phy-uboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* include/ti_usb_phy_uboot.h * * Copyright (c) 2014 Texas Instruments Incorporated - http://www.ti.com diff --git a/include/time.h b/include/time.h index 3b2ba09124..cb276c80f3 100644 --- a/include/time.h +++ b/include/time.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _TIME_H #define _TIME_H diff --git a/include/timer.h b/include/timer.h index 091d8dfa22..d0b205da32 100644 --- a/include/timer.h +++ b/include/timer.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/include/timestamp.h b/include/timestamp.h index 643a5a4d54..6785fcee92 100644 --- a/include/timestamp.h +++ b/include/timestamp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2008 Extreme Engineering Solutions, Inc. */ diff --git a/include/tlv_eeprom.h b/include/tlv_eeprom.h index fd45e5f6eb..cb24cb48ac 100644 --- a/include/tlv_eeprom.h +++ b/include/tlv_eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * See file CREDITS for list of people who contributed to this * project. diff --git a/include/tpm-common.h b/include/tpm-common.h index 1ba81386ce..15963f9332 100644 --- a/include/tpm-common.h +++ b/include/tpm-common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/include/tpm-v1.h b/include/tpm-v1.h index 60b71e2a4b..0618d27797 100644 --- a/include/tpm-v1.h +++ b/include/tpm-v1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/include/tpm-v2.h b/include/tpm-v2.h index 2b6980e441..7af816ac69 100644 --- a/include/tpm-v2.h +++ b/include/tpm-v2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Defines APIs and structures that allow software to interact with a * TPM2 device diff --git a/include/tpm_api.h b/include/tpm_api.h index 022a8bbaec..3a517a92dd 100644 --- a/include/tpm_api.h +++ b/include/tpm_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/include/tps6586x.h b/include/tps6586x.h index b89074b8ac..18df6a0685 100644 --- a/include/tps6586x.h +++ b/include/tps6586x.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> diff --git a/include/trace.h b/include/trace.h index 763d6d1255..116be9cb40 100644 --- a/include/trace.h +++ b/include/trace.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/include/tsec.h b/include/tsec.h index 153337837a..e81d1c91e1 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * tsec.h * diff --git a/include/tsi148.h b/include/tsi148.h index a9f353b908..ac07c980bb 100644 --- a/include/tsi148.h +++ b/include/tsi148.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 Reinhard Arlt, reinhard.arlt(a)esd-electronics.com * diff --git a/include/twl4030.h b/include/twl4030.h index 0a6d85a7c1..554558005f 100644 --- a/include/twl4030.h +++ b/include/twl4030.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2009 Wind River Systems, Inc. * Tom Rix <Tom.Rix at windriver.com> diff --git a/include/twl6030.h b/include/twl6030.h index 05d476f804..043590f6c2 100644 --- a/include/twl6030.h +++ b/include/twl6030.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h index acbc50b9e6..b64bc06e0d 100644 --- a/include/u-boot/aes.h +++ b/include/u-boot/aes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2019, Softathome */ diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 5174bd7ac4..0a9f77f5a1 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2009 * Marvell Semiconductor <www.marvell.com> diff --git a/include/u-boot/ecdsa.h b/include/u-boot/ecdsa.h index 6e0269e3ae..19ca9e7482 100644 --- a/include/u-boot/ecdsa.h +++ b/include/u-boot/ecdsa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Alexandru Gagniuc <mr.nuke.me(a)gmail.com>. */ diff --git a/include/u-boot/fdt-libcrypto.h b/include/u-boot/fdt-libcrypto.h index b15d8a1eaf..8f847a91c7 100644 --- a/include/u-boot/fdt-libcrypto.h +++ b/include/u-boot/fdt-libcrypto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Alexandru Gagniuc <mr.nuke.me(a)gmail.com> * Copyright (c) 2013, Google Inc. diff --git a/include/u-boot/hash-checksum.h b/include/u-boot/hash-checksum.h index bcc6ba48fc..8c6fc1e5f0 100644 --- a/include/u-boot/hash-checksum.h +++ b/include/u-boot/hash-checksum.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013, Andreas Oetken. */ diff --git a/include/u-boot/hash.h b/include/u-boot/hash.h index f9d47a99a7..7e960a0459 100644 --- a/include/u-boot/hash.h +++ b/include/u-boot/hash.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2021 ASPEED Technology Inc. */ diff --git a/include/u-boot/lz4.h b/include/u-boot/lz4.h index 655adbfcd1..7d9a137e21 100644 --- a/include/u-boot/lz4.h +++ b/include/u-boot/lz4.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2019 Google LLC */ diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h index fc9557c781..001e3bb885 100644 --- a/include/u-boot/rsa-mod-exp.h +++ b/include/u-boot/rsa-mod-exp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2014 Freescale Semiconductor, Inc. */ diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h index 085363eb1e..cc1a348674 100644 --- a/include/u-boot/rsa.h +++ b/include/u-boot/rsa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013, Google Inc. * diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h index c5fa1b80e3..9fa57e9bd2 100644 --- a/include/u-boot/variadic-macro.h +++ b/include/u-boot/variadic-macro.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Helper for work with variadic macros * diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h index db8a29e9bb..9fa4ec5664 100644 --- a/include/ubifs_uboot.h +++ b/include/ubifs_uboot.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * UBIFS u-boot wrapper functions header * diff --git a/include/uboot_aes.h b/include/uboot_aes.h index d2583bed99..43e2d4b21a 100644 --- a/include/uboot_aes.h +++ b/include/uboot_aes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com> diff --git a/include/ufs.h b/include/ufs.h index 702b8359db..a2a47555a9 100644 --- a/include/ufs.h +++ b/include/ufs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef _UFS_H #define _UFS_H diff --git a/include/universe.h b/include/universe.h index c84bb58950..e98b9a99f7 100644 --- a/include/universe.h +++ b/include/universe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 Stefan Roese, stefan.roese(a)esd-electronics.com */ diff --git a/include/usb.h b/include/usb.h index 09e3f0cb30..2051870763 100644 --- a/include/usb.h +++ b/include/usb.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/include/usb/ci_udc.h b/include/usb/ci_udc.h index 06adb2bb4d..999f661329 100644 --- a/include/usb/ci_udc.h +++ b/include/usb/ci_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2011, Marvell Semiconductor Inc. * Lei Wen <leiwen(a)marvell.com> diff --git a/include/usb/dwc2_udc.h b/include/usb/dwc2_udc.h index aa37e957b4..2ab399459d 100644 --- a/include/usb/dwc2_udc.h +++ b/include/usb/dwc2_udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * drivers/usb/gadget/dwc2_udc.h * Designware DWC2 on-chip full/high speed USB device controllers diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index bc98093458..eae23f8163 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2005, 2009 Freescale Semiconductor, Inc * Copyright (c) 2005 MontaVista Software diff --git a/include/usb/udc.h b/include/usb/udc.h index 749b3a3f01..626d0be683 100644 --- a/include/usb/udc.h +++ b/include/usb/udc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef USB_UDC_H #define USB_UDC_H diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 4a4ac10229..3d09805c3c 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * USB HOST XHCI Controller * diff --git a/include/usb_cdc_acm.h b/include/usb_cdc_acm.h index 0ce6cc3874..5c2f991258 100644 --- a/include/usb_cdc_acm.h +++ b/include/usb_cdc_acm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2006 * Bryan O'Donoghue, deckard(a)codehermit.ie, CodeHermit diff --git a/include/usb_defs.h b/include/usb_defs.h index ec00161710..9bfb7790f4 100644 --- a/include/usb_defs.h +++ b/include/usb_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland diff --git a/include/usb_ether.h b/include/usb_ether.h index 18d7184711..cea2e2b42b 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2011 The Chromium OS Authors. */ diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h index 83ab93b530..5cd403e950 100644 --- a/include/usb_mass_storage.h +++ b/include/usb_mass_storage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2011 Samsung Electrnoics * Lukasz Majewski <l.majewski(a)samsung.com> diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h index 641b4a3e6f..166aee838a 100644 --- a/include/usbdescriptors.h +++ b/include/usbdescriptors.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/include/usbdevice.h b/include/usbdevice.h index 80c5af0cbc..c0eb647ed4 100644 --- a/include/usbdevice.h +++ b/include/usbdevice.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/include/usbroothubdes.h b/include/usbroothubdes.h index e743555d8e..d5952a8023 100644 --- a/include/usbroothubdes.h +++ b/include/usbroothubdes.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * USB virtual root hub descriptors * diff --git a/include/uuid.h b/include/uuid.h index f5a941250f..9dbe087442 100644 --- a/include/uuid.h +++ b/include/uuid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> diff --git a/include/valgrind/valgrind.h b/include/valgrind/valgrind.h index 5d4fa5f43b..421c22859f 100644 --- a/include/valgrind/valgrind.h +++ b/include/valgrind/valgrind.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ AND bzip2-1.0.6 */ +/* SPDX-License-Identifier: GPL-2.0-or-later AND bzip2-1.0.6 */ /* This file is part of Valgrind, a dynamic binary instrumentation framework. diff --git a/include/vbe.h b/include/vbe.h index 5ede8181b9..73ec4b9a74 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Verified Boot for Embedded (VBE) support * See doc/develop/vbe.rst diff --git a/include/version.h b/include/version.h index 5955b21e89..ae49e19c5e 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/version_string.h b/include/version_string.h index a7d07e4cc7..b691cd74d3 100644 --- a/include/version_string.h +++ b/include/version_string.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __VERSION_STRING_H__ #define __VERSION_STRING_H__ diff --git a/include/video_bridge.h b/include/video_bridge.h index 3b429eac57..2e9c2831ed 100644 --- a/include/video_bridge.h +++ b/include/video_bridge.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/video_console.h b/include/video_console.h index bde67fa9a5..f45d306c42 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2015 Google, Inc */ diff --git a/include/video_font.h b/include/video_font.h index 05d3f989a7..0390fe2f64 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/include/video_font_8x16.h b/include/video_font_8x16.h index d8a1d90cee..37b91b768e 100644 --- a/include/video_font_8x16.h +++ b/include/video_font_8x16.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/include/video_font_data.h b/include/video_font_data.h index 37c3e00336..f485a5a687 100644 --- a/include/video_font_data.h +++ b/include/video_font_data.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2023 Dzmitry Sankouski <dsankouski(a)gmail.com> */ diff --git a/include/video_osd.h b/include/video_osd.h index dc60bafa8a..2a9252fe28 100644 --- a/include/video_osd.h +++ b/include/video_osd.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/include/virtex2.h b/include/virtex2.h index 7e8d93f24d..648cef8256 100644 --- a/include/virtex2.h +++ b/include/virtex2.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/virtio.h b/include/virtio.h index 062a24630c..a78f717a2c 100644 --- a/include/virtio.h +++ b/include/virtio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> diff --git a/include/vsc9953.h b/include/vsc9953.h index fd52c93044..3d428ebe9d 100644 --- a/include/vsc9953.h +++ b/include/vsc9953.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2013, 2015 Freescale Semiconductor, Inc. * diff --git a/include/vsprintf.h b/include/vsprintf.h index ed8a060ee1..78fae07ad7 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/include/vxworks.h b/include/vxworks.h index c2585e61ce..03f5ab3800 100644 --- a/include/vxworks.h +++ b/include/vxworks.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Niklaus Giger, niklaus.giger(a)member.fsf.org diff --git a/include/w1-eeprom.h b/include/w1-eeprom.h index b3cf77a81e..d65470f1df 100644 --- a/include/w1-eeprom.h +++ b/include/w1-eeprom.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2015 Free Electrons * Copyright (c) 2015 NextThing Co diff --git a/include/w1.h b/include/w1.h index b18078ba15..de890e81ed 100644 --- a/include/w1.h +++ b/include/w1.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ +/* SPDX-License-Identifier: GPL-2.0-or-later * * Copyright (c) 2015 Free Electrons * Copyright (c) 2015 NextThing Co diff --git a/include/wait_bit.h b/include/wait_bit.h index f1d70aef87..835a5da5bd 100644 --- a/include/wait_bit.h +++ b/include/wait_bit.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Wait for bit with timeout and ctrlc * diff --git a/include/watchdog.h b/include/watchdog.h index ac5f11e376..0daab22238 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen(a)mindspring.com. diff --git a/include/wdt.h b/include/wdt.h index 5026f5a6db..f41efc594b 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2017 Google, Inc */ diff --git a/include/winbond_w83627.h b/include/winbond_w83627.h index a58d816927..d23169eccc 100644 --- a/include/winbond_w83627.h +++ b/include/winbond_w83627.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> */ diff --git a/include/xilinx.h b/include/xilinx.h index e4e2979798..f92b1c6a4b 100644 --- a/include/xilinx.h +++ b/include/xilinx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Rich Ireland, Enterasys Networks, rireland(a)enterasys.com. diff --git a/include/zfs/dmu.h b/include/zfs/dmu.h index f16982f8c0..f49054f135 100644 --- a/include/zfs/dmu.h +++ b/include/zfs/dmu.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/dmu_objset.h b/include/zfs/dmu_objset.h index 43aa5824bd..d480a2b84e 100644 --- a/include/zfs/dmu_objset.h +++ b/include/zfs/dmu_objset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/dnode.h b/include/zfs/dnode.h index f01772c2f9..3292290752 100644 --- a/include/zfs/dnode.h +++ b/include/zfs/dnode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/dsl_dataset.h b/include/zfs/dsl_dataset.h index b05be71aa2..f25e03d6bd 100644 --- a/include/zfs/dsl_dataset.h +++ b/include/zfs/dsl_dataset.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/dsl_dir.h b/include/zfs/dsl_dir.h index 7eeb0d8395..c01e60a0cd 100644 --- a/include/zfs/dsl_dir.h +++ b/include/zfs/dsl_dir.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/sa_impl.h b/include/zfs/sa_impl.h index 41c77b0973..0ee89b7bfe 100644 --- a/include/zfs/sa_impl.h +++ b/include/zfs/sa_impl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/spa.h b/include/zfs/spa.h index cd2ddf58e7..8b85abbe17 100644 --- a/include/zfs/spa.h +++ b/include/zfs/spa.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/uberblock_impl.h b/include/zfs/uberblock_impl.h index 8045687ba8..0f5430496f 100644 --- a/include/zfs/uberblock_impl.h +++ b/include/zfs/uberblock_impl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/vdev_impl.h b/include/zfs/vdev_impl.h index de0e802f46..e45ec40efb 100644 --- a/include/zfs/vdev_impl.h +++ b/include/zfs/vdev_impl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zap_impl.h b/include/zfs/zap_impl.h index 6fe9fb66f2..9d62815d7e 100644 --- a/include/zfs/zap_impl.h +++ b/include/zfs/zap_impl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zap_leaf.h b/include/zfs/zap_leaf.h index 2a778e2caf..d9359d92c3 100644 --- a/include/zfs/zap_leaf.h +++ b/include/zfs/zap_leaf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zfs.h b/include/zfs/zfs.h index 17b93c10c8..c9588066d1 100644 --- a/include/zfs/zfs.h +++ b/include/zfs/zfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zfs_acl.h b/include/zfs/zfs_acl.h index d6cc408d7f..2e8515c7fc 100644 --- a/include/zfs/zfs_acl.h +++ b/include/zfs/zfs_acl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zfs_znode.h b/include/zfs/zfs_znode.h index ed3cde6165..d2dba3d6a6 100644 --- a/include/zfs/zfs_znode.h +++ b/include/zfs/zfs_znode.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zil.h b/include/zfs/zil.h index b5bd2c8406..9c813295b9 100644 --- a/include/zfs/zil.h +++ b/include/zfs/zil.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zio.h b/include/zfs/zio.h index 959e6e936a..f5670459ce 100644 --- a/include/zfs/zio.h +++ b/include/zfs/zio.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zfs/zio_checksum.h b/include/zfs/zio_checksum.h index 2264374e33..b4cf7a063a 100644 --- a/include/zfs/zio_checksum.h +++ b/include/zfs/zio_checksum.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * GRUB -- GRand Unified Bootloader * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. diff --git a/include/zynq_bootimg.h b/include/zynq_bootimg.h index c39c0bf459..efd4ffc4a4 100644 --- a/include/zynq_bootimg.h +++ b/include/zynq_bootimg.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2018 Xilinx, Inc. */ diff --git a/include/zynqpl.h b/include/zynqpl.h index d7dc064585..bb50a96949 100644 --- a/include/zynqpl.h +++ b/include/zynqpl.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2012-2013, Xilinx, Michal Simek * diff --git a/lib/Makefile b/lib/Makefile index 2a76acf100..c39a052f37 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/abuf.c b/lib/abuf.c index ce2cff53dc..9f57eece5a 100644 --- a/lib/abuf.c +++ b/lib/abuf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Handles a buffer that can be allocated and freed * diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index c1c9675b5d..68fc37a138 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # obj-y += acpi.o diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index a8d4b47000..a2f734e0fc 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic code used to generate ACPI tables * diff --git a/lib/acpi/acpi_writer.c b/lib/acpi/acpi_writer.c index 946f90e8e7..7a1f638108 100644 --- a/lib/acpi/acpi_writer.c +++ b/lib/acpi/acpi_writer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Handles writing the declared ACPI tables * diff --git a/lib/acpi/base.c b/lib/acpi/base.c index 2057bd2bef..9f789dd705 100644 --- a/lib/acpi/base.c +++ b/lib/acpi/base.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write base ACPI tables * diff --git a/lib/acpi/csrt.c b/lib/acpi/csrt.c index 2ba86f2295..b0562ed698 100644 --- a/lib/acpi/csrt.c +++ b/lib/acpi/csrt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write an ACPI Core System Resource Table (CSRT) * diff --git a/lib/acpi/dsdt.c b/lib/acpi/dsdt.c index db98cc20e1..a409711b79 100644 --- a/lib/acpi/dsdt.c +++ b/lib/acpi/dsdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write the ACPI Differentiated System Description Table (DSDT) * diff --git a/lib/acpi/facs.c b/lib/acpi/facs.c index e89f43ca5c..265292b3ce 100644 --- a/lib/acpi/facs.c +++ b/lib/acpi/facs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write an ACPI Firmware ACPI Control Structure (FACS) table * diff --git a/lib/acpi/mcfg.c b/lib/acpi/mcfg.c index 7404ae586a..a9a5e920be 100644 --- a/lib/acpi/mcfg.c +++ b/lib/acpi/mcfg.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write an ACPI MCFG table * diff --git a/lib/acpi/ssdt.c b/lib/acpi/ssdt.c index 659c1aad40..869e5f5b66 100644 --- a/lib/acpi/ssdt.c +++ b/lib/acpi/ssdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Write an ACPI Secondary System Descriptor Table (SSDT) table * diff --git a/lib/aes.c b/lib/aes.c index 4fca85ebee..661863359b 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2011 NVIDIA Corporation www.nvidia.com diff --git a/lib/aes/Makefile b/lib/aes/Makefile index daed52a713..dd2d5b1e5c 100644 --- a/lib/aes/Makefile +++ b/lib/aes/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2019, Softathome diff --git a/lib/aes/aes-decrypt.c b/lib/aes/aes-decrypt.c index 345029fa78..f455763457 100644 --- a/lib/aes/aes-decrypt.c +++ b/lib/aes/aes-decrypt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, softathome */ diff --git a/lib/aes/aes-encrypt.c b/lib/aes/aes-encrypt.c index e74e35eaa2..00924e8070 100644 --- a/lib/aes/aes-encrypt.c +++ b/lib/aes/aes-encrypt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019,Softathome */ diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index 216d9716d0..2a545ad51a 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Adapted from Linux v2.6.36 kernel: arch/powerpc/kernel/asm-offsets.c * diff --git a/lib/at91/Makefile b/lib/at91/Makefile index f8d0b9d4d8..bf9f6c3824 100644 --- a/lib/at91/Makefile +++ b/lib/at91/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Microchip # Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/lib/at91/at91.c b/lib/at91/at91.c index 048597690b..174c47ae5c 100644 --- a/lib/at91/at91.c +++ b/lib/at91/at91.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Microchip * Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/lib/at91/atmel_logo_8bpp.h b/lib/at91/atmel_logo_8bpp.h index dff5047f09..1aa66ce4be 100644 --- a/lib/at91/atmel_logo_8bpp.h +++ b/lib/at91/atmel_logo_8bpp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Microchip * Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/lib/at91/microchip_logo_8bpp.h b/lib/at91/microchip_logo_8bpp.h index a56f1607cb..566884c3f0 100644 --- a/lib/at91/microchip_logo_8bpp.h +++ b/lib/at91/microchip_logo_8bpp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2017 Microchip * Wenyou.Yang <wenyou.yang(a)microchip.com> diff --git a/lib/bzip2/Makefile b/lib/bzip2/Makefile index ebdd2976de..f82f152e58 100644 --- a/lib/bzip2/Makefile +++ b/lib/bzip2/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o diff --git a/lib/charset.c b/lib/charset.c index 5e4c4f948a..7ec8820db6 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * charset conversion utils * diff --git a/lib/circbuf.c b/lib/circbuf.c index fa79c148da..6b3073cc54 100644 --- a/lib/circbuf.c +++ b/lib/circbuf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2003 * Gerry Hamel, geh(a)ti.com, Texas Instruments diff --git a/lib/crc32c.c b/lib/crc32c.c index 016b34a523..22dd087248 100644 --- a/lib/crc32c.c +++ b/lib/crc32c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copied from Linux kernel crypto/crc32c.c * Copyright (c) 2004 Cisco Systems, Inc. diff --git a/lib/crc8.c b/lib/crc8.c index 87b87b675b..c697d85ada 100644 --- a/lib/crc8.c +++ b/lib/crc8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/lib/crypt/Makefile b/lib/crypt/Makefile index d53b72b0c7..3f767ab3a2 100644 --- a/lib/crypt/Makefile +++ b/lib/crypt/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2021, Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> diff --git a/lib/crypt/alg-sha256.h b/lib/crypt/alg-sha256.h index 62e7b9d5c0..f25e892fb3 100644 --- a/lib/crypt/alg-sha256.h +++ b/lib/crypt/alg-sha256.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> */ #include "u-boot/sha256.h" diff --git a/lib/crypt/alg-sha512.h b/lib/crypt/alg-sha512.h index 47e45730cc..a5188068ac 100644 --- a/lib/crypt/alg-sha512.h +++ b/lib/crypt/alg-sha512.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> */ #include "u-boot/sha512.h" diff --git a/lib/crypt/crypt-port.h b/lib/crypt/crypt-port.h index 6b9542d75b..0c5892e7c3 100644 --- a/lib/crypt/crypt-port.h +++ b/lib/crypt/crypt-port.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> */ #include <linux/types.h> diff --git a/lib/crypt/crypt.c b/lib/crypt/crypt.c index 247c34b2a9..57a794e885 100644 --- a/lib/crypt/crypt.c +++ b/lib/crypt/crypt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 2020 Steffen Jaeckel <jaeckel-floss(a)eyet-services.de> */ #include <common.h> diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index bec1bc95a6..49795f7570 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Makefile for asymmetric cryptographic keys # diff --git a/lib/ctype.c b/lib/ctype.c index 1892e2022b..c01efa2ab8 100644 --- a/lib/ctype.c +++ b/lib/ctype.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/date.c b/lib/date.c index e3d22459cd..46200a96b4 100644 --- a/lib/date.c +++ b/lib/date.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/dhry/Makefile b/lib/dhry/Makefile index 10dd9eba0d..9f75ee6f5e 100644 --- a/lib/dhry/Makefile +++ b/lib/dhry/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 Google, Inc diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c index 77b52a2300..3a48ab7c7b 100644 --- a/lib/dhry/cmd_dhry.c +++ b/lib/dhry/cmd_dhry.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc */ diff --git a/lib/dhry/dhry.h b/lib/dhry/dhry.h index 892c9ed73b..46d0ee65e5 100644 --- a/lib/dhry/dhry.h +++ b/lib/dhry/dhry.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc * diff --git a/lib/dhry/dhry_1.c b/lib/dhry/dhry_1.c index dcc224fb38..cbd874b4d4 100644 --- a/lib/dhry/dhry_1.c +++ b/lib/dhry/dhry_1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * diff --git a/lib/dhry/dhry_2.c b/lib/dhry/dhry_2.c index 1ba879673e..ac0739fccb 100644 --- a/lib/dhry/dhry_2.c +++ b/lib/dhry/dhry_2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * diff --git a/lib/display_options.c b/lib/display_options.c index 80def5201f..fa3a2b05d8 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c index 5fa9be10b4..931adf5c67 100644 --- a/lib/ecdsa/ecdsa-libcrypto.c +++ b/lib/ecdsa/ecdsa-libcrypto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ECDSA image signing implementation using libcrypto backend * diff --git a/lib/ecdsa/ecdsa-verify.c b/lib/ecdsa/ecdsa-verify.c index 0601700c4f..9039e3248b 100644 --- a/lib/ecdsa/ecdsa-verify.c +++ b/lib/ecdsa/ecdsa-verify.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ECDSA signature verification for u-boot * diff --git a/lib/efi/Makefile b/lib/efi/Makefile index a790d2d554..d41c0c8d8d 100644 --- a/lib/efi/Makefile +++ b/lib/efi/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2015 Google, Inc diff --git a/lib/efi/efi.c b/lib/efi/efi.c index aa42f1842f..b5212b054f 100644 --- a/lib/efi/efi.c +++ b/lib/efi/efi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Functions shared by the app and stub * diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c index 2209410f35..84f987df40 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi/efi_app.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * diff --git a/lib/efi/efi_info.c b/lib/efi/efi_info.c index 4d78923c4d..0c02848ff9 100644 --- a/lib/efi/efi_info.c +++ b/lib/efi/efi_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index c9eb32ec10..bfd7cac973 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * diff --git a/lib/efi_driver/Makefile b/lib/efi_driver/Makefile index f2b6c05cc2..7248c72397 100644 --- a/lib/efi_driver/Makefile +++ b/lib/efi_driver/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Heinrich Schuchardt diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index e3abd90275..5216cf1940 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI block driver * diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 66a45e156d..79a73c1bd4 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Uclass for EFI drivers * diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 8d31fc61c6..0716868ca1 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2016 Alexander Graf # diff --git a/lib/efi_loader/boothart.c b/lib/efi_loader/boothart.c index df176ee481..feea38b718 100644 --- a/lib/efi_loader/boothart.c +++ b/lib/efi_loader/boothart.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Check RISC-V boot hart ID * diff --git a/lib/efi_loader/capsule_esl.dtsi.in b/lib/efi_loader/capsule_esl.dtsi.in index 61a9f2b25e..074967cd2e 100644 --- a/lib/efi_loader/capsule_esl.dtsi.in +++ b/lib/efi_loader/capsule_esl.dtsi.in @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /** * Devicetree file with the public key EFI Signature List(ESL) * node. This file is used to generate the dtsi file to be diff --git a/lib/efi_loader/dtbdump.c b/lib/efi_loader/dtbdump.c index 3ce2a07f9e..aa4513f73a 100644 --- a/lib/efi_loader/dtbdump.c +++ b/lib/efi_loader/dtbdump.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c index f755af76f8..645f3fa320 100644 --- a/lib/efi_loader/efi_acpi.c +++ b/lib/efi_loader/efi_acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application ACPI tables support * diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index a40762c74c..2cd7b2e236 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI boot manager * diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 0b7579cb5a..a59e959b9f 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application boot time services * diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index af8a2ee940..9c7269d26c 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI Capsule * diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index a2d137d7a9..9dc4456c4b 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application console interface * diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index ed7214f3a3..9f02d71481 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI device path from u-boot device-model mapping * diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index 8c76d8be60..46adeb2ccd 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI device path interface * diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c index a07d9bab3a..582f6a898a 100644 --- a/lib/efi_loader/efi_device_path_utilities.c +++ b/lib/efi_loader/efi_device_path_utilities.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI device path interface * diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index f0d76113b0..3b5ef1e172 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application disk support * diff --git a/lib/efi_loader/efi_dt_fixup.c b/lib/efi_loader/efi_dt_fixup.c index 838023c78f..93f40bbc1f 100644 --- a/lib/efi_loader/efi_dt_fixup.c +++ b/lib/efi_loader/efi_dt_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI_DT_FIXUP_PROTOCOL * diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 3c56cebf96..2b5b41dac4 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI_FILE_PROTOCOL * diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c index 9abb29f1df..d145c74e3a 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI Firmware management protocol * diff --git a/lib/efi_loader/efi_freestanding.c b/lib/efi_loader/efi_freestanding.c index 4b65fc64dd..b5673c06d8 100644 --- a/lib/efi_loader/efi_freestanding.c +++ b/lib/efi_loader/efi_freestanding.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Library for freestanding binary * diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 778b693f98..af0f659b9e 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application disk support * diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index cdfd16ea77..d3a3714c50 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Linaro Limited */ diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c index 3b54ecb11a..d07ef4cf9c 100644 --- a/lib/efi_loader/efi_hii.c +++ b/lib/efi_loader/efi_hii.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI Human Interface Infrastructure ... database and packages * diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c index 31b0c97eb2..33788991bf 100644 --- a/lib/efi_loader/efi_hii_config.c +++ b/lib/efi_loader/efi_hii_config.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI Human Interface Infrastructure ... Configuration * diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 97547571ce..c95f0982a1 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI image loader * diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c index 193433782c..2c58bb92d0 100644 --- a/lib/efi_loader/efi_load_initrd.c +++ b/lib/efi_loader/efi_load_initrd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Linaro Limited */ diff --git a/lib/efi_loader/efi_load_options.c b/lib/efi_loader/efi_load_options.c index 5f62184da1..6b860e11b7 100644 --- a/lib/efi_loader/efi_load_options.c +++ b/lib/efi_loader/efi_load_options.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI boot manager * diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index f752703b43..97e2313ae7 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application memory management * diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 96a5bcca27..a5d47d9cd8 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple network protocol * PXE base code protocol diff --git a/lib/efi_loader/efi_riscv.c b/lib/efi_loader/efi_riscv.c index 064172755b..8966eb896c 100644 --- a/lib/efi_loader/efi_riscv.c +++ b/lib/efi_loader/efi_riscv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Defines APIs that allow an OS to interact with UEFI firmware to query * information about the boot hart ID. diff --git a/lib/efi_loader/efi_rng.c b/lib/efi_loader/efi_rng.c index bb11d8d0e0..b26eaa60e6 100644 --- a/lib/efi_loader/efi_rng.c +++ b/lib/efi_loader/efi_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Linaro Limited */ diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 108c14b95b..0f8517f7dd 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Root node for system services * diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index bf54d6ad87..58aff5675d 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application runtime services * diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index e6de685e87..67d76aa808 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI setup code * diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 742d891940..df4488097c 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Patrick Wildt <patrick(a)blueri.se> * Copyright (c) 2019 Linaro Limited, Author: AKASHI Takahiro diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 48446f654d..4e0d7f0653 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI application tables support * diff --git a/lib/efi_loader/efi_string.c b/lib/efi_loader/efi_string.c index e21e09c946..6f231be0d1 100644 --- a/lib/efi_loader/efi_string.c +++ b/lib/efi_loader/efi_string.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * String functions * diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 7b7926a0d4..bb06d4cb7e 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Defines APIs that allow an OS to interact with UEFI firmware to query * information about the device. diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c index c4c7572063..eb2caf41da 100644 --- a/lib/efi_loader/efi_unicode_collation.c +++ b/lib/efi_loader/efi_unicode_collation.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI Unicode collation protocol * diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index ad50bffd2b..2a3d2ede0c 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UEFI runtime variable services * diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 62e071bd83..c86f617492 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * File interface for UEFI variables * diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index 5fa7dcb8d3..c03d3e1bb8 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * File interface for UEFI variables * diff --git a/lib/efi_loader/efi_var_seed.S b/lib/efi_loader/efi_var_seed.S index e0a40cf46c..834f51ef3a 100644 --- a/lib/efi_loader/efi_var_seed.S +++ b/lib/efi_loader/efi_var_seed.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Predefined UEFI variables * diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index be95ed44e6..67bb0c5ea2 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * UEFI runtime variable services * diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c index 09d03c0eee..edec41a2d0 100644 --- a/lib/efi_loader/efi_variable_tee.c +++ b/lib/efi_loader/efi_variable_tee.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI variable service via OP-TEE * diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c index d741076dcd..c98bc16175 100644 --- a/lib/efi_loader/efi_watchdog.c +++ b/lib/efi_loader/efi_watchdog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI watchdog * diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c index bd72822c0b..2f93c32ecb 100644 --- a/lib/efi_loader/helloworld.c +++ b/lib/efi_loader/helloworld.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Hello world EFI application * diff --git a/lib/efi_loader/initrddump.c b/lib/efi_loader/initrddump.c index 5b470f4819..096f395208 100644 --- a/lib/efi_loader/initrddump.c +++ b/lib/efi_loader/initrddump.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index e4d75420bf..3ceba23c00 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017, Heinrich Schuchardt <xypron.glpk(a)gmx.de> diff --git a/lib/efi_selftest/efi_freestanding.c b/lib/efi_selftest/efi_freestanding.c index 4b6c27e99f..530852ec66 100644 --- a/lib/efi_selftest/efi_freestanding.c +++ b/lib/efi_selftest/efi_freestanding.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Library for freestanding binary * diff --git a/lib/efi_selftest/efi_miniapp_tcg2_arm.h b/lib/efi_selftest/efi_miniapp_tcg2_arm.h index bddd78289a..897b2f61cc 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_arm.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_arm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_miniapp_tcg2_arm64.h b/lib/efi_selftest/efi_miniapp_tcg2_arm64.h index bfe589438f..a685e81b76 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_arm64.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_arm64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_miniapp_tcg2_ia32.h b/lib/efi_selftest/efi_miniapp_tcg2_ia32.h index aa8c13939c..84cfc6bd10 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_ia32.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_ia32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_miniapp_tcg2_riscv32.h b/lib/efi_selftest/efi_miniapp_tcg2_riscv32.h index c184d4decc..828243a3ad 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_riscv32.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_riscv32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_miniapp_tcg2_riscv64.h b/lib/efi_selftest/efi_miniapp_tcg2_riscv64.h index d5972df208..ec264b8933 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_riscv64.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_riscv64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_miniapp_tcg2_x86_64.h b/lib/efi_selftest/efi_miniapp_tcg2_x86_64.h index 9b0413facd..5b947acffc 100644 --- a/lib/efi_selftest/efi_miniapp_tcg2_x86_64.h +++ b/lib/efi_selftest/efi_miniapp_tcg2_x86_64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * This file contains a precompiled EFI binary built from * lib/efi_selftest/efi_miniapp_file_image_exit.c and converted to an include diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c index 191da7fc45..3f91c371be 100644 --- a/lib/efi_selftest/efi_selftest.c +++ b/lib/efi_selftest/efi_selftest.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI efi_selftest * diff --git a/lib/efi_selftest/efi_selftest_bitblt.c b/lib/efi_selftest/efi_selftest_bitblt.c index 605078b722..033d0c3cac 100644 --- a/lib/efi_selftest/efi_selftest_bitblt.c +++ b/lib/efi_selftest/efi_selftest_bitblt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_bitblt * diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index a367e8b89d..46f5e73139 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_block * diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c index 1961e29934..d40194b58f 100644 --- a/lib/efi_selftest/efi_selftest_config_table.c +++ b/lib/efi_selftest/efi_selftest_config_table.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_config_tables * diff --git a/lib/efi_selftest/efi_selftest_console.c b/lib/efi_selftest/efi_selftest_console.c index fd2b3d09ab..175a1c9e55 100644 --- a/lib/efi_selftest/efi_selftest_console.c +++ b/lib/efi_selftest/efi_selftest_console.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * EFI efi_selftest * diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c index 02f19574f8..acddd40494 100644 --- a/lib/efi_selftest/efi_selftest_controllers.c +++ b/lib/efi_selftest/efi_selftest_controllers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_controllers * diff --git a/lib/efi_selftest/efi_selftest_crc32.c b/lib/efi_selftest/efi_selftest_crc32.c index f2be35314a..3936c53ad1 100644 --- a/lib/efi_selftest/efi_selftest_crc32.c +++ b/lib/efi_selftest/efi_selftest_crc32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_crc32 * diff --git a/lib/efi_selftest/efi_selftest_devicepath.c b/lib/efi_selftest/efi_selftest_devicepath.c index 8a22a5d4d9..6516b2d6da 100644 --- a/lib/efi_selftest/efi_selftest_devicepath.c +++ b/lib/efi_selftest/efi_selftest_devicepath.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_devicepath * diff --git a/lib/efi_selftest/efi_selftest_devicepath_util.c b/lib/efi_selftest/efi_selftest_devicepath_util.c index 1801e30756..0f4f891f01 100644 --- a/lib/efi_selftest/efi_selftest_devicepath_util.c +++ b/lib/efi_selftest/efi_selftest_devicepath_util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_devicepath_util * diff --git a/lib/efi_selftest/efi_selftest_disk_image.h b/lib/efi_selftest/efi_selftest_disk_image.h index a0e0586608..e22f07e411 100644 --- a/lib/efi_selftest/efi_selftest_disk_image.h +++ b/lib/efi_selftest/efi_selftest_disk_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Non-zero 8 byte strings of a disk image * diff --git a/lib/efi_selftest/efi_selftest_ecpt.c b/lib/efi_selftest/efi_selftest_ecpt.c index 09c5e96c5e..25d4dba3e2 100644 --- a/lib/efi_selftest/efi_selftest_ecpt.c +++ b/lib/efi_selftest/efi_selftest_ecpt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_fdt * diff --git a/lib/efi_selftest/efi_selftest_event_groups.c b/lib/efi_selftest/efi_selftest_event_groups.c index 7a6d9fb162..94a0db32b2 100644 --- a/lib/efi_selftest/efi_selftest_event_groups.c +++ b/lib/efi_selftest/efi_selftest_event_groups.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_event_groups * diff --git a/lib/efi_selftest/efi_selftest_events.c b/lib/efi_selftest/efi_selftest_events.c index 743a6b9154..7cb489f871 100644 --- a/lib/efi_selftest/efi_selftest_events.c +++ b/lib/efi_selftest/efi_selftest_events.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_events * diff --git a/lib/efi_selftest/efi_selftest_exception.c b/lib/efi_selftest/efi_selftest_exception.c index 64e7b0ac33..87e94dfdf4 100644 --- a/lib/efi_selftest/efi_selftest_exception.c +++ b/lib/efi_selftest/efi_selftest_exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_exception * diff --git a/lib/efi_selftest/efi_selftest_exitbootservices.c b/lib/efi_selftest/efi_selftest_exitbootservices.c index b090ce74d2..6a4d5b9ae8 100644 --- a/lib/efi_selftest/efi_selftest_exitbootservices.c +++ b/lib/efi_selftest/efi_selftest_exitbootservices.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_exitbootservices * diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c index aa3b13ae3a..fe5a36ed7e 100644 --- a/lib/efi_selftest/efi_selftest_fdt.c +++ b/lib/efi_selftest/efi_selftest_fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_fdt * diff --git a/lib/efi_selftest/efi_selftest_gop.c b/lib/efi_selftest/efi_selftest_gop.c index e500752fda..bf7469bf6f 100644 --- a/lib/efi_selftest/efi_selftest_gop.c +++ b/lib/efi_selftest/efi_selftest_gop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_gop * diff --git a/lib/efi_selftest/efi_selftest_hii.c b/lib/efi_selftest/efi_selftest_hii.c index f219c0120a..07f997d6ec 100644 --- a/lib/efi_selftest/efi_selftest_hii.c +++ b/lib/efi_selftest/efi_selftest_hii.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_hii * diff --git a/lib/efi_selftest/efi_selftest_hii_data.c b/lib/efi_selftest/efi_selftest_hii_data.c index d19f0682af..c937652d4b 100644 --- a/lib/efi_selftest/efi_selftest_hii_data.c +++ b/lib/efi_selftest/efi_selftest_hii_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file's test data is derived from UEFI SCT. * The original copyright is attached below. diff --git a/lib/efi_selftest/efi_selftest_load_file.c b/lib/efi_selftest/efi_selftest_load_file.c index 14df761172..e72b1c128d 100644 --- a/lib/efi_selftest/efi_selftest_load_file.c +++ b/lib/efi_selftest/efi_selftest_load_file.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_load_file * diff --git a/lib/efi_selftest/efi_selftest_loaded_image.c b/lib/efi_selftest/efi_selftest_loaded_image.c index 5889ab1261..158d7b5b1c 100644 --- a/lib/efi_selftest/efi_selftest_loaded_image.c +++ b/lib/efi_selftest/efi_selftest_loaded_image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_loaded_image * diff --git a/lib/efi_selftest/efi_selftest_loadimage.c b/lib/efi_selftest/efi_selftest_loadimage.c index 24548f1ae6..696c7ecfd3 100644 --- a/lib/efi_selftest/efi_selftest_loadimage.c +++ b/lib/efi_selftest/efi_selftest_loadimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_loadimage * diff --git a/lib/efi_selftest/efi_selftest_manageprotocols.c b/lib/efi_selftest/efi_selftest_manageprotocols.c index 097b2ae354..8cd2439f50 100644 --- a/lib/efi_selftest/efi_selftest_manageprotocols.c +++ b/lib/efi_selftest/efi_selftest_manageprotocols.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_manageprotocols * diff --git a/lib/efi_selftest/efi_selftest_mem.c b/lib/efi_selftest/efi_selftest_mem.c index 51f0fec39b..44e7d57ade 100644 --- a/lib/efi_selftest/efi_selftest_mem.c +++ b/lib/efi_selftest/efi_selftest_mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_memory * diff --git a/lib/efi_selftest/efi_selftest_memory.c b/lib/efi_selftest/efi_selftest_memory.c index 4d32a28006..8af8afc689 100644 --- a/lib/efi_selftest/efi_selftest_memory.c +++ b/lib/efi_selftest/efi_selftest_memory.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_memory * diff --git a/lib/efi_selftest/efi_selftest_miniapp_exception.c b/lib/efi_selftest/efi_selftest_miniapp_exception.c index a9ad381001..d7df215428 100644 --- a/lib/efi_selftest/efi_selftest_miniapp_exception.c +++ b/lib/efi_selftest/efi_selftest_miniapp_exception.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_miniapp_return * diff --git a/lib/efi_selftest/efi_selftest_miniapp_exit.c b/lib/efi_selftest/efi_selftest_miniapp_exit.c index 1c42d6dd40..801eb87a11 100644 --- a/lib/efi_selftest/efi_selftest_miniapp_exit.c +++ b/lib/efi_selftest/efi_selftest_miniapp_exit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_miniapp_exit * diff --git a/lib/efi_selftest/efi_selftest_miniapp_return.c b/lib/efi_selftest/efi_selftest_miniapp_return.c index 45366aa9c6..e851af6ba8 100644 --- a/lib/efi_selftest/efi_selftest_miniapp_return.c +++ b/lib/efi_selftest/efi_selftest_miniapp_return.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_miniapp_return * diff --git a/lib/efi_selftest/efi_selftest_open_protocol.c b/lib/efi_selftest/efi_selftest_open_protocol.c index e3f351df72..6ec35196b8 100644 --- a/lib/efi_selftest/efi_selftest_open_protocol.c +++ b/lib/efi_selftest/efi_selftest_open_protocol.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_open_protocol * diff --git a/lib/efi_selftest/efi_selftest_register_notify.c b/lib/efi_selftest/efi_selftest_register_notify.c index adf5dd00a1..752eaaf659 100644 --- a/lib/efi_selftest/efi_selftest_register_notify.c +++ b/lib/efi_selftest/efi_selftest_register_notify.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_register_notify * diff --git a/lib/efi_selftest/efi_selftest_reset.c b/lib/efi_selftest/efi_selftest_reset.c index 5dfe517de4..f231b77ac6 100644 --- a/lib/efi_selftest/efi_selftest_reset.c +++ b/lib/efi_selftest/efi_selftest_reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_reset * diff --git a/lib/efi_selftest/efi_selftest_rng.c b/lib/efi_selftest/efi_selftest_rng.c index 007d1c82e9..abfafe45c0 100644 --- a/lib/efi_selftest/efi_selftest_rng.c +++ b/lib/efi_selftest/efi_selftest_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_rng * diff --git a/lib/efi_selftest/efi_selftest_rtc.c b/lib/efi_selftest/efi_selftest_rtc.c index e9e47e96c4..b9cba7f319 100644 --- a/lib/efi_selftest/efi_selftest_rtc.c +++ b/lib/efi_selftest/efi_selftest_rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_rtc * diff --git a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c index d28ed83eb3..1d957de767 100644 --- a/lib/efi_selftest/efi_selftest_set_virtual_address_map.c +++ b/lib/efi_selftest/efi_selftest_set_virtual_address_map.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_set_virtual_address_map.c * diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c index 15af8d3e18..57f7aca8aa 100644 --- a/lib/efi_selftest/efi_selftest_snp.c +++ b/lib/efi_selftest/efi_selftest_snp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_snp * diff --git a/lib/efi_selftest/efi_selftest_startimage_exit.c b/lib/efi_selftest/efi_selftest_startimage_exit.c index b65a10b7a4..71ba030387 100644 --- a/lib/efi_selftest/efi_selftest_startimage_exit.c +++ b/lib/efi_selftest/efi_selftest_startimage_exit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_start_image * diff --git a/lib/efi_selftest/efi_selftest_startimage_return.c b/lib/efi_selftest/efi_selftest_startimage_return.c index 3e0c5a9ffb..69d8bcc34e 100644 --- a/lib/efi_selftest/efi_selftest_startimage_return.c +++ b/lib/efi_selftest/efi_selftest_startimage_return.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_start_image * diff --git a/lib/efi_selftest/efi_selftest_tcg2.c b/lib/efi_selftest/efi_selftest_tcg2.c index 67a886efaa..464e284e81 100644 --- a/lib/efi_selftest/efi_selftest_tcg2.c +++ b/lib/efi_selftest/efi_selftest_tcg2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_devicepath * diff --git a/lib/efi_selftest/efi_selftest_textinput.c b/lib/efi_selftest/efi_selftest_textinput.c index 141856a4cf..7e9b9a41f1 100644 --- a/lib/efi_selftest/efi_selftest_textinput.c +++ b/lib/efi_selftest/efi_selftest_textinput.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_textinput * diff --git a/lib/efi_selftest/efi_selftest_textinputex.c b/lib/efi_selftest/efi_selftest_textinputex.c index bd221d6254..6ed3ea7581 100644 --- a/lib/efi_selftest/efi_selftest_textinputex.c +++ b/lib/efi_selftest/efi_selftest_textinputex.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_textinput * diff --git a/lib/efi_selftest/efi_selftest_textoutput.c b/lib/efi_selftest/efi_selftest_textoutput.c index cc44b38bc2..6916aec592 100644 --- a/lib/efi_selftest/efi_selftest_textoutput.c +++ b/lib/efi_selftest/efi_selftest_textoutput.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_textoutput * diff --git a/lib/efi_selftest/efi_selftest_tpl.c b/lib/efi_selftest/efi_selftest_tpl.c index 909c78a1c2..f66d3ec335 100644 --- a/lib/efi_selftest/efi_selftest_tpl.c +++ b/lib/efi_selftest/efi_selftest_tpl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_tpl * diff --git a/lib/efi_selftest/efi_selftest_unaligned.c b/lib/efi_selftest/efi_selftest_unaligned.c index 7c6bf2d6e8..351cac037c 100644 --- a/lib/efi_selftest/efi_selftest_unaligned.c +++ b/lib/efi_selftest/efi_selftest_unaligned.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_unaligned * diff --git a/lib/efi_selftest/efi_selftest_unicode_collation.c b/lib/efi_selftest/efi_selftest_unicode_collation.c index 32c99caf35..b145db23b6 100644 --- a/lib/efi_selftest/efi_selftest_unicode_collation.c +++ b/lib/efi_selftest/efi_selftest_unicode_collation.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_unicode_collation * diff --git a/lib/efi_selftest/efi_selftest_util.c b/lib/efi_selftest/efi_selftest_util.c index 3681fa6431..b4211d6035 100644 --- a/lib/efi_selftest/efi_selftest_util.c +++ b/lib/efi_selftest/efi_selftest_util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_util * diff --git a/lib/efi_selftest/efi_selftest_variables.c b/lib/efi_selftest/efi_selftest_variables.c index c7a3fdbaa6..0e50a0e3a2 100644 --- a/lib/efi_selftest/efi_selftest_variables.c +++ b/lib/efi_selftest/efi_selftest_variables.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_variables * diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c index 4700d94241..4841147b93 100644 --- a/lib/efi_selftest/efi_selftest_variables_runtime.c +++ b/lib/efi_selftest/efi_selftest_variables_runtime.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_variables_runtime * diff --git a/lib/efi_selftest/efi_selftest_watchdog.c b/lib/efi_selftest/efi_selftest_watchdog.c index 4d7ed5a54b..0543d1529f 100644 --- a/lib/efi_selftest/efi_selftest_watchdog.c +++ b/lib/efi_selftest/efi_selftest_watchdog.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * efi_selftest_watchdog * diff --git a/lib/errno_str.c b/lib/errno_str.c index 2e5f4a887d..9bae8ecb11 100644 --- a/lib/errno_str.c +++ b/lib/errno_str.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Samsung Electronics * Przemyslaw Marczak <p.marczak(a)samsung.com> - * - * SDPX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <errno.h> diff --git a/lib/fdt-libcrypto.c b/lib/fdt-libcrypto.c index ecb0344c8f..b1ae79f797 100644 --- a/lib/fdt-libcrypto.c +++ b/lib/fdt-libcrypto.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Alexandru Gagniuc <mr.nuke.me(a)gmail.com> * Copyright (c) 2013, Google Inc. diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 7a69167648..386e04e66e 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2011 The Chromium OS Authors. * diff --git a/lib/fdtdec_common.c b/lib/fdtdec_common.c index ddaca0087e..e856c15cc7 100644 --- a/lib/fdtdec_common.c +++ b/lib/fdtdec_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index 85351c75ca..34fe6ab60c 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Some very basic tests for fdtdec, accessed through test_fdtdec command. * They are easiest to use with sandbox. diff --git a/lib/gunzip.c b/lib/gunzip.c index 932e3e8036..4cf8b64174 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/gzip.c b/lib/gzip.c index 2595b2d04b..e115880707 100644 --- a/lib/gzip.c +++ b/lib/gzip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2012 * Lei Wen <leiwen(a)marvell.com>, Marvell Inc. diff --git a/lib/hang.c b/lib/hang.c index 2735774f9a..1e564ceced 100644 --- a/lib/hang.c +++ b/lib/hang.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * Andreas Bießmann <andreas(a)biessmann.org> diff --git a/lib/hash-checksum.c b/lib/hash-checksum.c index 68c290d64d..ee75938b04 100644 --- a/lib/hash-checksum.c +++ b/lib/hash-checksum.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Andreas Oetken. */ diff --git a/lib/hexdump.c b/lib/hexdump.c index 149c93ead8..23772c9e58 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * lib/hexdump.c * diff --git a/lib/initcall.c b/lib/initcall.c index 33b7d761dc..6dbcea451e 100644 --- a/lib/initcall.c +++ b/lib/initcall.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors. */ diff --git a/lib/ldiv.c b/lib/ldiv.c index 5b1a25f281..ee36861ab1 100644 --- a/lib/ldiv.c +++ b/lib/ldiv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Copyright (C) 1992, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. */ diff --git a/lib/libavb/Makefile b/lib/libavb/Makefile index b983fe768e..79ae6858a9 100644 --- a/lib/libavb/Makefile +++ b/lib/libavb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Linaro Limited diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile index 1fe50ecbe5..476de435e7 100644 --- a/lib/libfdt/Makefile +++ b/lib/libfdt/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/lmb.c b/lib/lmb.c index da924c6789..05f99df93f 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Procedures for maintaining information about logical memory blocks. * diff --git a/lib/lzma/LzmaTools.c b/lib/lzma/LzmaTools.c index 55f64cd289..8af9477a99 100644 --- a/lib/lzma/LzmaTools.c +++ b/lib/lzma/LzmaTools.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Usefuls routines based on the LzmaTest.c file from LZMA SDK 4.65 * diff --git a/lib/lzma/LzmaTools.h b/lib/lzma/LzmaTools.h index 2c46859a62..1332d21b5e 100644 --- a/lib/lzma/LzmaTools.h +++ b/lib/lzma/LzmaTools.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Usefuls routines based on the LzmaTest.c file from LZMA SDK 4.65 * diff --git a/lib/lzma/Makefile b/lib/lzma/Makefile index c2fd3e4945..4147ff9664 100644 --- a/lib/lzma/Makefile +++ b/lib/lzma/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2007-2008 Industrie Dial Face S.p.A. # Luigi 'Comio' Mantellini (luigi.mantellini(a)idf-hit.com) diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile index 45612a83da..0213acc88f 100644 --- a/lib/lzo/Makefile +++ b/lib/lzo/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2008 # Stefan Roese, DENX Software Engineering, sr(a)denx.de. diff --git a/lib/membuff.c b/lib/membuff.c index 36dc43a523..0ec24eb95e 100644 --- a/lib/membuff.c +++ b/lib/membuff.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/lib/net_utils.c b/lib/net_utils.c index 4283c13a31..3db8384506 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generic network code. Moved from net.c * diff --git a/lib/of_live.c b/lib/of_live.c index 812c488f60..c068323a2b 100644 --- a/lib/of_live.c +++ b/lib/of_live.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009 Benjamin Herrenschmidt, IBM Corp * benh(a)kernel.crashing.org diff --git a/lib/optee/Makefile b/lib/optee/Makefile index 9befe606d8..008de3398c 100644 --- a/lib/optee/Makefile +++ b/lib/optee/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2017 Linaro diff --git a/lib/optee/optee.c b/lib/optee/optee.c index b036224044..e754d6725b 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Linaro * Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> diff --git a/lib/rand.c b/lib/rand.c index d256baf5ce..680a20705c 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple xorshift PRNG * see http://www.jstatsoft.org/v08/i14/paper diff --git a/lib/rbtree.c b/lib/rbtree.c index 333314ad52..5490958c3a 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* Red Black Trees (C) 1999 Andrea Arcangeli <andrea(a)suse.de> diff --git a/lib/rc4.c b/lib/rc4.c index 720112d1fd..5f799d8487 100644 --- a/lib/rc4.c +++ b/lib/rc4.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * diff --git a/lib/rsa/Makefile b/lib/rsa/Makefile index c9ac72c1e2..799cca587d 100644 --- a/lib/rsa/Makefile +++ b/lib/rsa/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013, Google Inc. # diff --git a/lib/rsa/rsa-keyprop.c b/lib/rsa/rsa-keyprop.c index 98855f67b8..8e0cde338c 100644 --- a/lib/rsa/rsa-keyprop.c +++ b/lib/rsa/rsa-keyprop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ and MIT +// SPDX-License-Identifier: GPL-2.0-or-later and MIT /* * RSA library - generate parameters for a public key * diff --git a/lib/rsa/rsa-mod-exp.c b/lib/rsa/rsa-mod-exp.c index d259b2aedf..c734413115 100644 --- a/lib/rsa/rsa-mod-exp.c +++ b/lib/rsa/rsa-mod-exp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index d20bdb58a5..ae73d8411b 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/lib/rsa/rsa-verify.c b/lib/rsa/rsa-verify.c index 2f3b344039..e8b53727bc 100644 --- a/lib/rsa/rsa-verify.c +++ b/lib/rsa/rsa-verify.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/lib/semihosting.c b/lib/semihosting.c index 831774e356..50aa1f39fa 100644 --- a/lib/semihosting.c +++ b/lib/semihosting.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> * Copyright 2014 Broadcom Corporation diff --git a/lib/sha256.c b/lib/sha256.c index 4d26aea1c8..6b13711f2d 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * FIPS-180-2 compliant SHA-256 implementation * diff --git a/lib/sha512.c b/lib/sha512.c index fbe8d5f5bf..ffaaff9524 100644 --- a/lib/sha512.c +++ b/lib/sha512.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * FIPS-180-2 compliant SHA-512 and SHA-384 implementation * diff --git a/lib/smbios-parser.c b/lib/smbios-parser.c index 2b9392936b..eedc81b194 100644 --- a/lib/smbios-parser.c +++ b/lib/smbios-parser.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020, Bachmann electronic GmbH */ diff --git a/lib/smbios.c b/lib/smbios.c index d7f4999e8b..6c0df7dd82 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> * diff --git a/lib/tables_csum.c b/lib/tables_csum.c index e2630d57d9..ee1e4ee5bf 100644 --- a/lib/tables_csum.c +++ b/lib/tables_csum.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/lib/time.c b/lib/time.c index 00f4a1ac8f..3642d854cf 100644 --- a/lib/time.c +++ b/lib/time.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/tpm-common.c b/lib/tpm-common.c index 82ffdc5341..b4175598f1 100644 --- a/lib/tpm-common.c +++ b/lib/tpm-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/lib/tpm-utils.h b/lib/tpm-utils.h index a519e18235..bd7063ce29 100644 --- a/lib/tpm-utils.h +++ b/lib/tpm-utils.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c index 60a18ca504..cc6aac3d51 100644 --- a/lib/tpm-v1.c +++ b/lib/tpm-v1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 The Chromium OS Authors. * Coypright (c) 2013 Guntermann & Drunck GmbH diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c index 9ab5b46df1..9c8dfebc57 100644 --- a/lib/tpm-v2.c +++ b/lib/tpm-v2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Bootlin * Author: Miquel Raynal <miquel.raynal(a)bootlin.com> diff --git a/lib/tpm_api.c b/lib/tpm_api.c index 3ef5e81179..149b69148d 100644 --- a/lib/tpm_api.c +++ b/lib/tpm_api.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019 Google LLC */ diff --git a/lib/trace.c b/lib/trace.c index 4874bef861..5ffc3bebac 100644 --- a/lib/trace.c +++ b/lib/trace.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012 The Chromium OS Authors. */ diff --git a/lib/uuid.c b/lib/uuid.c index afb40bff50..d563eb9eba 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Calxeda, Inc. * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile index 4a3e985a94..a347938d7b 100644 --- a/lib/zlib/Makefile +++ b/lib/zlib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile index 2003e18425..7d1519f52c 100644 --- a/lib/zstd/Makefile +++ b/lib/zstd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause # ################################################################ # Copyright (c) Facebook, Inc. # All rights reserved. diff --git a/lib/zstd/common/mem.h b/lib/zstd/common/mem.h index 9794296285..da9fdea0d6 100644 --- a/lib/zstd/common/mem.h +++ b/lib/zstd/common/mem.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) Yann Collet, Facebook, Inc. * All rights reserved. diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h index e45ec56683..76417f0c97 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) Facebook, Inc. * All rights reserved. diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h index a06ca187aa..368e087d06 100644 --- a/lib/zstd/decompress_sources.h +++ b/lib/zstd/decompress_sources.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause */ /* * Copyright (c) Facebook, Inc. * All rights reserved. diff --git a/lib/zstd/zstd.c b/lib/zstd/zstd.c index 3a2abc8367..c974185fa9 100644 --- a/lib/zstd/zstd.c +++ b/lib/zstd/zstd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC */ diff --git a/lib/zstd/zstd_common_module.c b/lib/zstd/zstd_common_module.c index 73b97c2778..419951c07a 100644 --- a/lib/zstd/zstd_common_module.c +++ b/lib/zstd/zstd_common_module.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (c) Facebook, Inc. * All rights reserved. diff --git a/lib/zstd/zstd_decompress_module.c b/lib/zstd/zstd_decompress_module.c index 06cf3e43bc..90132b51ca 100644 --- a/lib/zstd/zstd_decompress_module.c +++ b/lib/zstd/zstd_decompress_module.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (c) Facebook, Inc. * All rights reserved. diff --git a/net/Makefile b/net/Makefile index 64ab7ec740..edc5bbad35 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/dhcpv6.c b/net/dhcpv6.c index 73a1067877..ced8220689 100644 --- a/net/dhcpv6.c +++ b/net/dhcpv6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) Microsoft Corporation * Author: Sean Edmond <seanedmond(a)microsoft.com> diff --git a/net/dhcpv6.h b/net/dhcpv6.h index 65c8e4c71d..48edfdffdf 100644 --- a/net/dhcpv6.h +++ b/net/dhcpv6.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) Microsoft Corporation * Author: Sean Edmond <seanedmond(a)microsoft.com> diff --git a/net/dns.h b/net/dns.h index 79ac76f590..82808b46ab 100644 --- a/net/dns.h +++ b/net/dns.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Masami Komiya <mkomiya(a)sonare.it> 2005 * Copyright 2009, Robin Getz <rgetz(a)blackfin.uclinux.org> diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c index f64c68e340..73a9d5168e 100644 --- a/net/dsa-uclass.c +++ b/net/dsa-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2019-2021 NXP */ diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 4311f3fe6e..58a7ae8d98 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c index 869adf8cbb..f3c6457feb 100644 --- a/net/eth_bootdev.c +++ b/net/eth_bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Bootdev for ethernet (uses PXE) * diff --git a/net/eth_common.c b/net/eth_common.c index 14d4c07b69..13ea284256 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/eth_internal.h b/net/eth_internal.h index 0b829a8d38..fbff28cbe0 100644 --- a/net/eth_internal.h +++ b/net/eth_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2001-2015 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c index 94b90e0657..42a17024d9 100644 --- a/net/mdio-mux-uclass.c +++ b/net/mdio-mux-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index e758cc66d7..7fdb05896a 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/net/ndisc.c b/net/ndisc.c index d1cec0601c..5b4a511880 100644 --- a/net/ndisc.c +++ b/net/ndisc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Allied Telesis Labs NZ * Chris Packham, <judge.packham(a)gmail.com> diff --git a/net/net6.c b/net/net6.c index 2dd64c0e16..9bddb328de 100644 --- a/net/net6.c +++ b/net/net6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Allied Telesis Labs NZ * Chris Packham, <judge.packham(a)gmail.com> diff --git a/net/nfs.h b/net/nfs.h index 68ada0efeb..fbf6f65e45 100644 --- a/net/nfs.h +++ b/net/nfs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Masami Komiya <mkomiya(a)sonare.it> 2004 */ diff --git a/net/ping6.c b/net/ping6.c index 4882a17f51..40cc023dc9 100644 --- a/net/ping6.c +++ b/net/ping6.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Allied Telesis Labs NZ * Chris Packham, <judge.packham(a)gmail.com> diff --git a/net/rarp.c b/net/rarp.c index 231b6233c0..e34dda0923 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/rarp.h b/net/rarp.h index de4504e5d8..3af5499131 100644 --- a/net/rarp.h +++ b/net/rarp.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/net/udp.c b/net/udp.c index a93822f511..8c27a3956f 100644 --- a/net/udp.c +++ b/net/udp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> */ diff --git a/net/wol.c b/net/wol.c index 0a625668a9..ab8709f04c 100644 --- a/net/wol.c +++ b/net/wol.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Lothar Felten, lothar.felten(a)gmail.com */ diff --git a/net/wol.h b/net/wol.h index ebc81f24b6..1eb603552b 100644 --- a/net/wol.h +++ b/net/wol.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * wol - Wake-on-LAN * diff --git a/post/Makefile b/post/Makefile index afd49403c2..17b308604b 100644 --- a/post/Makefile +++ b/post/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/cpu/mpc83xx/Makefile b/post/cpu/mpc83xx/Makefile index 2c1a0edd0f..55a9deb7fa 100644 --- a/post/cpu/mpc83xx/Makefile +++ b/post/cpu/mpc83xx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index 68da8ff417..46a0010b10 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Eastman Kodak Company, <www.kodak.com> diff --git a/post/drivers/Makefile b/post/drivers/Makefile index 9a5a73a0f3..e99e3b0655 100644 --- a/post/drivers/Makefile +++ b/post/drivers/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c index 557d6329a4..baaf2fc366 100644 --- a/post/drivers/i2c.c +++ b/post/drivers/i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/drivers/memory.c b/post/drivers/memory.c index 1be2b41df4..f58cb203b2 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c index cc7a49847c..3373157d1e 100644 --- a/post/drivers/rtc.c +++ b/post/drivers/rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/Makefile b/post/lib_powerpc/Makefile index 85584972ce..c7f100afe4 100644 --- a/post/lib_powerpc/Makefile +++ b/post/lib_powerpc/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 4f30216688..1c3451b4fd 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/asm.S b/post/lib_powerpc/asm.S index 93c7856393..f9c68af7aa 100644 --- a/post/lib_powerpc/asm.S +++ b/post/lib_powerpc/asm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2002 Wolfgang Denk <wd(a)denx.de> */ diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c index 0ec032dcb1..5bcaad9981 100644 --- a/post/lib_powerpc/b.c +++ b/post/lib_powerpc/b.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c index 57f2b9694c..ece50c88fd 100644 --- a/post/lib_powerpc/cmp.c +++ b/post/lib_powerpc/cmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c index 6e2bd636d7..84179eb0d9 100644 --- a/post/lib_powerpc/cmpi.c +++ b/post/lib_powerpc/cmpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c index 751bce6737..ff3a5d888c 100644 --- a/post/lib_powerpc/complex.c +++ b/post/lib_powerpc/complex.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c index 98a8c6392c..3a2f06b733 100644 --- a/post/lib_powerpc/cpu.c +++ b/post/lib_powerpc/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/cpu_asm.h b/post/lib_powerpc/cpu_asm.h index 75cf71b637..7a726caf03 100644 --- a/post/lib_powerpc/cpu_asm.h +++ b/post/lib_powerpc/cpu_asm.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c index 3c7b611384..3bb77967de 100644 --- a/post/lib_powerpc/cr.c +++ b/post/lib_powerpc/cr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/20001122-1.c b/post/lib_powerpc/fpu/20001122-1.c index 9c1c886fc4..9def034098 100644 --- a/post/lib_powerpc/fpu/20001122-1.c +++ b/post/lib_powerpc/fpu/20001122-1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/20010114-2.c b/post/lib_powerpc/fpu/20010114-2.c index 01bac50038..aee528342c 100644 --- a/post/lib_powerpc/fpu/20010114-2.c +++ b/post/lib_powerpc/fpu/20010114-2.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/20010226-1.c b/post/lib_powerpc/fpu/20010226-1.c index cc4aa0dca6..5b5688d2a9 100644 --- a/post/lib_powerpc/fpu/20010226-1.c +++ b/post/lib_powerpc/fpu/20010226-1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/980619-1.c b/post/lib_powerpc/fpu/980619-1.c index 111a2013fb..eeff5a5af9 100644 --- a/post/lib_powerpc/fpu/980619-1.c +++ b/post/lib_powerpc/fpu/980619-1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/Makefile b/post/lib_powerpc/fpu/Makefile index 9b2c1fadb6..09565bf72f 100644 --- a/post/lib_powerpc/fpu/Makefile +++ b/post/lib_powerpc/fpu/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/acc1.c b/post/lib_powerpc/fpu/acc1.c index 63cc3eeafc..ec5c804ae2 100644 --- a/post/lib_powerpc/fpu/acc1.c +++ b/post/lib_powerpc/fpu/acc1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/compare-fp-1.c b/post/lib_powerpc/fpu/compare-fp-1.c index 4b4589664f..f1684129f3 100644 --- a/post/lib_powerpc/fpu/compare-fp-1.c +++ b/post/lib_powerpc/fpu/compare-fp-1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/darwin-ldouble.c b/post/lib_powerpc/fpu/darwin-ldouble.c index 16105c837b..1290d5ea27 100644 --- a/post/lib_powerpc/fpu/darwin-ldouble.c +++ b/post/lib_powerpc/fpu/darwin-ldouble.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Borrowed from GCC 4.2.2 (which still was GPL v2+) */ diff --git a/post/lib_powerpc/fpu/fpu.c b/post/lib_powerpc/fpu/fpu.c index 59109f71e3..4bda3e4b06 100644 --- a/post/lib_powerpc/fpu/fpu.c +++ b/post/lib_powerpc/fpu/fpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c index 891aa95685..e557e73ed8 100644 --- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c +++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2007 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c index e4ac6bf186..f208fd6144 100644 --- a/post/lib_powerpc/load.c +++ b/post/lib_powerpc/load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c index 4df45790ab..5b0122b73b 100644 --- a/post/lib_powerpc/multi.c +++ b/post/lib_powerpc/multi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index da21913225..b54393fc86 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index b0b976f98a..b9d6295561 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index 22cd4568fc..b201eca087 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index a103df75eb..d8f1eb8ccd 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c index 71a4b6aba4..f46f9abde8 100644 --- a/post/lib_powerpc/store.c +++ b/post/lib_powerpc/store.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c index 21e02bcb26..4267f33612 100644 --- a/post/lib_powerpc/string.c +++ b/post/lib_powerpc/string.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index 68339b05ef..478cae86c8 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index 885dd8cb09..227ab34779 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index 62ac713ecf..45f959582d 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c index 7985669ba6..b706ef8336 100644 --- a/post/lib_powerpc/two.c +++ b/post/lib_powerpc/two.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index 33d1a1d8d9..74e39cd451 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/post.c b/post/post.c index 946d9094d4..c1ff7ad049 100644 --- a/post/post.c +++ b/post/post.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/post/tests.c b/post/tests.c index 8cea428fcd..00d5bfd0cb 100644 --- a/post/tests.c +++ b/post/tests.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts index 5e2429c617..83a785aa82 100644 --- a/scripts/Makefile.dts +++ b/scripts/Makefile.dts @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later dtb-y += $(patsubst %,%.dtb,$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE) $(CONFIG_OF_LIST) $(CONFIG_SPL_OF_LIST))) diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 32f4384657..1f739d85b7 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2011 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/scripts/build-cb.sh b/scripts/build-cb.sh index 1da708fb6e..0e30ecd88d 100755 --- a/scripts/build-cb.sh +++ b/scripts/build-cb.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Sample script to build a disk image suitable for use with coreboot. The image # includes a kernel and initrd. diff --git a/scripts/build-efi.sh b/scripts/build-efi.sh index 6b7df2e9bf..d932216df6 100755 --- a/scripts/build-efi.sh +++ b/scripts/build-efi.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Script to build an EFI thing suitable for booting with QEMU, possibly running # it also. diff --git a/scripts/coreboot.sed b/scripts/coreboot.sed index 0cbb5fc9b3..86404985bf 100644 --- a/scripts/coreboot.sed +++ b/scripts/coreboot.sed @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc # Script to convert coreboot code to something similar to what U-Boot uses diff --git a/scripts/dtc-version.sh b/scripts/dtc-version.sh index 53ff868bcd..b461dd9f59 100755 --- a/scripts/dtc-version.sh +++ b/scripts/dtc-version.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # dtc-version dtc-command # diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped index 56cc5d48f4..671591f2f0 100644 --- a/scripts/dtc/pylibfdt/libfdt.i_shipped +++ b/scripts/dtc/pylibfdt/libfdt.i_shipped @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause */ /* * pylibfdt - Flat Device Tree manipulation in Python * Copyright (C) 2017 Google, Inc. diff --git a/scripts/env2string.awk b/scripts/env2string.awk index de470a4994..539502bd6d 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -1,8 +1,8 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Awk script to parse a text file containing an environment and convert it # to a C string which can be compiled into U-Boot. diff --git a/scripts/event_dump.py b/scripts/event_dump.py index 24dfe2bda9..102d1b4428 100755 --- a/scripts/event_dump.py +++ b/scripts/event_dump.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Decode the evspy_info linker list in a U-Boot ELF image""" diff --git a/scripts/gcc-stack-usage.sh b/scripts/gcc-stack-usage.sh index 3db32e35f6..f736f8940c 100755 --- a/scripts/gcc-stack-usage.sh +++ b/scripts/gcc-stack-usage.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Test for gcc '-fstack-usage' support # Copyright (C) 2013, Masahiro Yamada <yamada.m(a)jp.panasonic.com> # diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh index d0864804aa..a887ff1b55 100755 --- a/scripts/gen_ll_addressable_symbols.sh +++ b/scripts/gen_ll_addressable_symbols.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2020 Marek Behún <kabel(a)kernel.org> # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh index fedf7206fe..f09dca9994 100755 --- a/scripts/get_default_envs.sh +++ b/scripts/get_default_envs.sh @@ -1,5 +1,5 @@ #! /bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016, Lukasz Majewski <l.majewski(a)majess.pl> # diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c index fd161cfff1..29960ed000 100644 --- a/scripts/kconfig/lxdialog/checklist.c +++ b/scripts/kconfig/lxdialog/checklist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * checklist.c -- implements the checklist box * diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h index 68b565e3c4..3930d93a4a 100644 --- a/scripts/kconfig/lxdialog/dialog.h +++ b/scripts/kconfig/lxdialog/dialog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * dialog.h -- common declarations for all dialog modules * diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c index 611945611b..f9c55ff89c 100644 --- a/scripts/kconfig/lxdialog/inputbox.c +++ b/scripts/kconfig/lxdialog/inputbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * inputbox.c -- implements the input box * diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c index 58c2f8afe5..4287745566 100644 --- a/scripts/kconfig/lxdialog/menubox.c +++ b/scripts/kconfig/lxdialog/menubox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * menubox.c -- implements the menu box * diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c index 4e339b1266..b5987735b0 100644 --- a/scripts/kconfig/lxdialog/textbox.c +++ b/scripts/kconfig/lxdialog/textbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * textbox.c -- implements the text box * diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c index 1b490d4af0..0de2b05352 100644 --- a/scripts/kconfig/lxdialog/util.c +++ b/scripts/kconfig/lxdialog/util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * util.c * diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c index bcaac9b7ba..ff1db42b3d 100644 --- a/scripts/kconfig/lxdialog/yesno.c +++ b/scripts/kconfig/lxdialog/yesno.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * yesno.c -- implements the yes/no box * diff --git a/scripts/mailmapper b/scripts/mailmapper index 0e744ec1a0..60c63c5999 100755 --- a/scripts/mailmapper +++ b/scripts/mailmapper @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2014, Masahiro Yamada <yamada.m(a)jp.panasonic.com> diff --git a/scripts/make_pip.sh b/scripts/make_pip.sh index 4602dcf61c..b921e63342 100755 --- a/scripts/make_pip.sh +++ b/scripts/make_pip.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Packages a U-Boot tool # diff --git a/scripts/show-gnu-make b/scripts/show-gnu-make index 90a5f3862b..ee0062177d 100755 --- a/scripts/show-gnu-make +++ b/scripts/show-gnu-make @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Show the command name for GNU Make # diff --git a/scripts/style.py b/scripts/style.py index 7b73b007de..9c8aa5357d 100755 --- a/scripts/style.py +++ b/scripts/style.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Google LLC # diff --git a/test/Makefile b/test/Makefile index 8e1fed2c28..ef2f9b5e48 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2012 The Chromium Authors diff --git a/test/bloblist.c b/test/bloblist.c index 720be7e244..2e70c79567 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018, Google Inc. All rights reserved. */ diff --git a/test/boot/Makefile b/test/boot/Makefile index 52947580ae..e5cc7ae2f0 100644 --- a/test/boot/Makefile +++ b/test/boot/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Google LLC diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index c5f14a7a13..48da512310 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for bootdev functions. All start with 'bootdev' * diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index f5b2059140..b99a94517d 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for bootdev functions. All start with 'bootdev' * diff --git a/test/boot/bootmeth.c b/test/boot/bootmeth.c index e498eee036..81d71f3982 100644 --- a/test/boot/bootmeth.c +++ b/test/boot/bootmeth.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for bootdev functions. All start with 'bootmeth' * diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c index e71a2975c5..563d6512ee 100644 --- a/test/boot/bootstd_common.c +++ b/test/boot/bootstd_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for bootdev functions. All start with 'bootdev' * diff --git a/test/boot/bootstd_common.h b/test/boot/bootstd_common.h index 4a126e43ff..d7505921b5 100644 --- a/test/boot/bootstd_common.h +++ b/test/boot/bootstd_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common header file for bootdev, bootflow, bootmeth tests * diff --git a/test/boot/cedit.c b/test/boot/cedit.c index aa41719048..3577eb9285 100644 --- a/test/boot/cedit.c +++ b/test/boot/cedit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/boot/expo.c b/test/boot/expo.c index 714fdfa415..d49007e1ec 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/boot/files/expo_ids.h b/test/boot/files/expo_ids.h index a86e0d06f6..a49bcfe1cd 100644 --- a/test/boot/files/expo_ids.h +++ b/test/boot/files/expo_ids.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Sample expo screen layout (ID numbers) */ diff --git a/test/boot/files/expo_layout.dts b/test/boot/files/expo_layout.dts index bed552288f..307ea91842 100644 --- a/test/boot/files/expo_layout.dts +++ b/test/boot/files/expo_layout.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Sample expo screen layout */ diff --git a/test/boot/image.c b/test/boot/image.c index 2844b05785..e41a1035a2 100644 --- a/test/boot/image.c +++ b/test/boot/image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for vbe-simple bootmeth. All start with 'vbe_simple' * diff --git a/test/boot/vbe_fixup.c b/test/boot/vbe_fixup.c index eba5c4ebe6..b46d82b444 100644 --- a/test/boot/vbe_fixup.c +++ b/test/boot/vbe_fixup.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for VBE device tree fix-ups * diff --git a/test/boot/vbe_simple.c b/test/boot/vbe_simple.c index 5e61840652..51ee81683b 100644 --- a/test/boot/vbe_simple.c +++ b/test/boot/vbe_simple.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for vbe-simple bootmeth. All start with 'vbe_simple' * diff --git a/test/bootm.c b/test/bootm.c index 4bb3ca0655..f1384f4d10 100644 --- a/test/bootm.c +++ b/test/bootm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for bootm routines * diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 8d70ac510a..cae43ad0f2 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013 Google, Inc # Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c index 1eb5955db1..d1ff3e8074 100644 --- a/test/cmd/addrmap.c +++ b/test/cmd/addrmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for addrmap command * diff --git a/test/cmd/armffa.c b/test/cmd/armffa.c index 9a44a397e8..46e419bf2e 100644 --- a/test/cmd/armffa.c +++ b/test/cmd/armffa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for armffa command * diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 8c09281cac..3da6f2f3ac 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for bdinfo command * diff --git a/test/cmd/exit.c b/test/cmd/exit.c index 7e160f7e4b..91feb5877f 100644 --- a/test/cmd/exit.c +++ b/test/cmd/exit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for exit command * diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c index 1f103a1d7e..ef192609ef 100644 --- a/test/cmd/fdt.c +++ b/test/cmd/fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for fdt command * diff --git a/test/cmd/font.c b/test/cmd/font.c index 40682e5ce4..7d854778ac 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for font command * diff --git a/test/cmd/history.c b/test/cmd/history.c index 06517fcdbb..ccac008acd 100644 --- a/test/cmd/history.c +++ b/test/cmd/history.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for history command * diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c index 41e005ac59..c268249e3f 100644 --- a/test/cmd/loadm.c +++ b/test/cmd/loadm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for loadm command * diff --git a/test/cmd/mem.c b/test/cmd/mem.c index d76f47cf31..ab173c249f 100644 --- a/test/cmd/mem.c +++ b/test/cmd/mem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Executes tests for memory-related commands * diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c index f80c9c4068..7c4e99b59c 100644 --- a/test/cmd/mem_search.c +++ b/test/cmd/mem_search.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for memory commands * diff --git a/test/cmd/pci_mps.c b/test/cmd/pci_mps.c index fd96f4fba6..36e28cfc15 100644 --- a/test/cmd/pci_mps.c +++ b/test/cmd/pci_mps.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests that the PCI Maximum Payload Size (MPS) command can set the sandbox * PCI Express device to safe mode and determine the correct payload size. diff --git a/test/cmd/pinmux.c b/test/cmd/pinmux.c index df40bb7743..30459778dd 100644 --- a/test/cmd/pinmux.c +++ b/test/cmd/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Executes tests for pinmux command * diff --git a/test/cmd/pwm.c b/test/cmd/pwm.c index cf7ee0e0e6..8b87187d11 100644 --- a/test/cmd/pwm.c +++ b/test/cmd/pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for pwm command * diff --git a/test/cmd/seama.c b/test/cmd/seama.c index b1b56930c6..4660990e7f 100644 --- a/test/cmd/seama.c +++ b/test/cmd/seama.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Executes tests for SEAMA (SEAttle iMAge) command * diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index 312593e1e3..b2f5c067d8 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for setexpr command * diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c index 091e4f823c..32bd12b22b 100644 --- a/test/cmd/test_echo.c +++ b/test/cmd/test_echo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for echo command * diff --git a/test/cmd/test_pause.c b/test/cmd/test_pause.c index 2b85cce327..6bec2e5104 100644 --- a/test/cmd/test_pause.c +++ b/test/cmd/test_pause.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for pause command * diff --git a/test/command_ut.c b/test/command_ut.c index a74bd109e1..0f21afa497 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, The Chromium Authors */ diff --git a/test/common/Makefile b/test/common/Makefile index 12c65f8c95..28183b878f 100644 --- a/test/common/Makefile +++ b/test/common/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later obj-y += cmd_ut_common.o obj-$(CONFIG_AUTOBOOT) += test_autoboot.o obj-$(CONFIG_CYCLIC) += cyclic.o diff --git a/test/common/cread.c b/test/common/cread.c index 2fdd29a265..015768203a 100644 --- a/test/common/cread.c +++ b/test/common/cread.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Google LLC */ diff --git a/test/common/cyclic.c b/test/common/cyclic.c index 6e758e89db..c2e2f793ef 100644 --- a/test/common/cyclic.c +++ b/test/common/cyclic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2022 Stefan Roese <sr(a)denx.de> */ diff --git a/test/common/event.c b/test/common/event.c index c0912a3437..7ebd6eb57a 100644 --- a/test/common/event.c +++ b/test/common/event.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Unit tests for event handling * diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c index 42a1e4ab1f..fa29ba29f7 100644 --- a/test/common/test_autoboot.c +++ b/test/common/test_autoboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Steffen Jaeckel * diff --git a/test/compression.c b/test/compression.c index 3df90819a1..8855824b8d 100644 --- a/test/compression.c +++ b/test/compression.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, The Chromium Authors */ diff --git a/test/dm/Makefile b/test/dm/Makefile index 02c651a786..c85c7266fc 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2013 Google, Inc # Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office(a)arm.com> diff --git a/test/dm/acpi.c b/test/dm/acpi.c index 5997bda649..fa8db6f367 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for ACPI table generation * diff --git a/test/dm/acpi.h b/test/dm/acpi.h index c6636b8824..0e8b64f3b8 100644 --- a/test/dm/acpi.h +++ b/test/dm/acpi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Common functions for ACPI tests * diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c index 44bcabda6b..dfb80b47d7 100644 --- a/test/dm/acpi_dp.c +++ b/test/dm/acpi_dp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for ACPI code generation via a device-property table * diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c index 15b2b6f64a..51542853be 100644 --- a/test/dm/acpigen.c +++ b/test/dm/acpigen.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for ACPI code generation * diff --git a/test/dm/adc.c b/test/dm/adc.c index 740167e16b..bc6345f6a1 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for the driver model ADC API * diff --git a/test/dm/audio.c b/test/dm/audio.c index add15ae20e..4b03ee7767 100644 --- a/test/dm/audio.c +++ b/test/dm/audio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/axi.c b/test/dm/axi.c index dc029df5e4..cc0aab324f 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/dm/blk.c b/test/dm/blk.c index 799f1e4dc7..cfa03064d3 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/blkmap.c b/test/dm/blkmap.c index 7a163d6eae..c10757534b 100644 --- a/test/dm/blkmap.c +++ b/test/dm/blkmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 Addiva Elektronik * Author: Tobias Waldekranz <tobias(a)waldekranz.com> diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index b77b472d1f..92d9a490dd 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/test/dm/bus.c b/test/dm/bus.c index 89a6aa6554..4cdf067c5c 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc */ diff --git a/test/dm/button.c b/test/dm/button.c index 3318668df2..1602804180 100644 --- a/test/dm/button.c +++ b/test/dm/button.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Philippe Reynes <philippe.reynes(a)softathome.com> * diff --git a/test/dm/clk.c b/test/dm/clk.c index 01417fbd82..3ca733f615 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index e4ebb93cda..02ce822c0a 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 * Lukasz Majewski, DENX Software Engineering, lukma(a)denx.de diff --git a/test/dm/core.c b/test/dm/core.c index 7f3f8d183b..f57b2c7f5a 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for the core driver model code * diff --git a/test/dm/cpu.c b/test/dm/cpu.c index 5734cd0a92..e437b81b07 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/dm/cros_ec_pwm.c b/test/dm/cros_ec_pwm.c index f8d6e1e6c4..de2a32096f 100644 --- a/test/dm/cros_ec_pwm.c +++ b/test/dm/cros_ec_pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <cros_ec.h> diff --git a/test/dm/devres.c b/test/dm/devres.c index 3df0f64362..41584e8db4 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for the devres ( * diff --git a/test/dm/dma.c b/test/dm/dma.c index cce47cb218..6e67b11057 100644 --- a/test/dm/dma.c +++ b/test/dm/dma.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Direct Memory Access U-Class tests * diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index 6e0a5df704..5ebd9ebd2b 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2019 STMicroelectronics - All Rights Reserved * Author(s): Yannick Fertre <yannick.fertre(a)st.com> for STMicroelectronics. diff --git a/test/dm/efi_media.c b/test/dm/efi_media.c index e343a0e9c8..0badbdd83f 100644 --- a/test/dm/efi_media.c +++ b/test/dm/efi_media.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for EFI_MEDIA uclass * diff --git a/test/dm/extcon.c b/test/dm/extcon.c index 6a4e22bfdc..f95f4de795 100644 --- a/test/dm/extcon.c +++ b/test/dm/extcon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Svyatoslav Ryhel <clamor95(a)gmail.com> */ diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c index 758538d0e8..d4d5d35409 100644 --- a/test/dm/fastboot.c +++ b/test/dm/fastboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c index 087d4846da..b0214491d6 100644 --- a/test/dm/fdtdec.c +++ b/test/dm/fdtdec.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 NXP */ diff --git a/test/dm/ffa.c b/test/dm/ffa.c index 6912666bb4..70f479f515 100644 --- a/test/dm/ffa.c +++ b/test/dm/ffa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Functional tests for UCLASS_FFA class * diff --git a/test/dm/firmware.c b/test/dm/firmware.c index f37bccfe4a..dab9c8a659 100644 --- a/test/dm/firmware.c +++ b/test/dm/firmware.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Xilinx, Inc. */ diff --git a/test/dm/fpga.c b/test/dm/fpga.c index 8bb3535853..6b9bfe9be2 100644 --- a/test/dm/fpga.c +++ b/test/dm/fpga.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Alexander Dahl <post(a)lespocky.de> */ diff --git a/test/dm/fwu_mdata_disk_image.h b/test/dm/fwu_mdata_disk_image.h index b9803417c8..4babad4295 100644 --- a/test/dm/fwu_mdata_disk_image.h +++ b/test/dm/fwu_mdata_disk_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Non-zero 8 byte strings of a disk image * diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 0d88ec24bd..8e5722f435 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Google, Inc */ diff --git a/test/dm/host.c b/test/dm/host.c index ca05a36b31..198188a917 100644 --- a/test/dm/host.c +++ b/test/dm/host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright 2022 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index 995759d4d7..3c1e44a058 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/test/dm/i2c.c b/test/dm/i2c.c index b46a22e79b..3696c517cb 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Google, Inc * diff --git a/test/dm/i2s.c b/test/dm/i2s.c index c2bf4d5604..65be04d785 100644 --- a/test/dm/i2s.c +++ b/test/dm/i2s.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/iommu.c b/test/dm/iommu.c index 62d38f1214..2d4a2d1a09 100644 --- a/test/dm/iommu.c +++ b/test/dm/iommu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Mark Kettenis <kettenis(a)openbsd.org> */ diff --git a/test/dm/irq.c b/test/dm/irq.c index 51dd5e4abb..43ab395459 100644 --- a/test/dm/irq.c +++ b/test/dm/irq.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for irq uclass * diff --git a/test/dm/led.c b/test/dm/led.c index eed3f4654c..cf3a6aaed1 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/mdio.c b/test/dm/mdio.c index f863c52645..999789dc3a 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index bfe3518221..e297286b82 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2019 * Alex Marginean, NXP diff --git a/test/dm/memory.c b/test/dm/memory.c index 7d9500aa91..934acb7ef5 100644 --- a/test/dm/memory.c +++ b/test/dm/memory.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 * Texas Instruments Incorporated, <www.ti.com> diff --git a/test/dm/misc.c b/test/dm/misc.c index 8bdd8c64bc..ddb60b6ebf 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/dm/mmc.c b/test/dm/mmc.c index b1eb8bee2f..3207efd31b 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c index 58233edc9b..181260a5fb 100644 --- a/test/dm/mux-emul.c +++ b/test/dm/mux-emul.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ * Pratyush Yadav <p.yadav(a)ti.com> diff --git a/test/dm/mux-mmio.c b/test/dm/mux-mmio.c index fd353d8b15..718e3a43aa 100644 --- a/test/dm/mux-mmio.c +++ b/test/dm/mux-mmio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017-2018 Texas Instruments Incorporated - http://www.ti.com/ * Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/test/dm/nop.c b/test/dm/nop.c index 75b9e7b6cc..b61b39616f 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for the NOP uclass * diff --git a/test/dm/nvmxip.c b/test/dm/nvmxip.c index f0ad47d4ef..8f2156eb9c 100644 --- a/test/dm/nvmxip.c +++ b/test/dm/nvmxip.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Functional tests for UCLASS_FFA class * diff --git a/test/dm/of_extra.c b/test/dm/of_extra.c index ac2d886892..4717ed9ad5 100644 --- a/test/dm/of_extra.c +++ b/test/dm/of_extra.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index a241c42793..7e49d600a4 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <clk.h> diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index a5bc43aea4..bd4c360e6f 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Google LLC * diff --git a/test/dm/ofread.c b/test/dm/ofread.c index 3523860d2b..63b377962f 100644 --- a/test/dm/ofread.c +++ b/test/dm/ofread.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <common.h> #include <dm.h> diff --git a/test/dm/osd.c b/test/dm/osd.c index 6279b391ca..eb7bbbb84b 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/dm/p2sb.c b/test/dm/p2sb.c index df24709141..b001a7cd57 100644 --- a/test/dm/p2sb.c +++ b/test/dm/p2sb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for Primary-to-Sideband bus (P2SB) * diff --git a/test/dm/panel.c b/test/dm/panel.c index 4d435a0d25..a91426debd 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for panel uclass * diff --git a/test/dm/part.c b/test/dm/part.c index d6e4345812..9adfd32e15 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/test/dm/pch.c b/test/dm/pch.c index 53f7bbf180..69949c3d7a 100644 --- a/test/dm/pch.c +++ b/test/dm/pch.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC */ diff --git a/test/dm/pci.c b/test/dm/pci.c index 8c5e7da9e6..b88aa9ff18 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index 9941abd4ce..c144aceab8 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019 Ramon Fried */ diff --git a/test/dm/phy.c b/test/dm/phy.c index 4f91abca3a..16915683e0 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ * Written by Jean-Jacques Hiblot <jjhiblot(a)ti.com> diff --git a/test/dm/phys2bus.c b/test/dm/phys2bus.c index 342f2fa8eb..1a84c018d0 100644 --- a/test/dm/phys2bus.c +++ b/test/dm/phys2bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> */ diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c index 6880b2d2cd..06a2f7f920 100644 --- a/test/dm/pinmux.c +++ b/test/dm/pinmux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/dm/pmc.c b/test/dm/pmc.c index e70227e780..b8618c6b3a 100644 --- a/test/dm/pmc.c +++ b/test/dm/pmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for power-management controller uclass (PMC) * diff --git a/test/dm/pmic.c b/test/dm/pmic.c index ce671202fb..7fd2bf216d 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for the driver model pmic API * diff --git a/test/dm/pwm.c b/test/dm/pwm.c index dff626c771..0504c6de58 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Google, Inc */ diff --git a/test/dm/qfw.c b/test/dm/qfw.c index f3f3568983..a23f054dc5 100644 --- a/test/dm/qfw.c +++ b/test/dm/qfw.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Asherah Connor <ashe(a)kivikakk.ee> */ diff --git a/test/dm/ram.c b/test/dm/ram.c index f624343138..5ac2f310a4 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/read.c b/test/dm/read.c index 7768aa2968..7a774df886 100644 --- a/test/dm/read.c +++ b/test/dm/read.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> */ diff --git a/test/dm/reboot-mode.c b/test/dm/reboot-mode.c index fbb9c3a542..395a59bd67 100644 --- a/test/dm/reboot-mode.c +++ b/test/dm/reboot-mode.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) 2018 Theobroma Systems Design und Consulting GmbH */ diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 8560f2afc2..9bc42a86c1 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/regulator.c b/test/dm/regulator.c index 86f4862d9d..97b4996dc6 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for the driver model regulator API * diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index 7a8ff47fa1..2c5494d0c3 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 * Texas Instruments Incorporated - http://www.ti.com/ diff --git a/test/dm/rtc.c b/test/dm/rtc.c index bf97dbbd2f..7342c7cd97 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/scsi.c b/test/dm/scsi.c index 380cfc88ba..ba57d04eae 100644 --- a/test/dm/scsi.c +++ b/test/dm/scsi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/sf.c b/test/dm/sf.c index 17d43fef3b..5b674ef3c0 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Google, Inc */ diff --git a/test/dm/simple-bus.c b/test/dm/simple-bus.c index 3530b47fac..454893ef2f 100644 --- a/test/dm/simple-bus.c +++ b/test/dm/simple-bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/test/dm/sm.c b/test/dm/sm.c index 7ebb0c9c85..1f9cc5b70e 100644 --- a/test/dm/sm.c +++ b/test/dm/sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023 SberDevices, Inc. * diff --git a/test/dm/smem.c b/test/dm/smem.c index 289fb59ba1..c56b5d24ab 100644 --- a/test/dm/smem.c +++ b/test/dm/smem.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Ramon Fried <ramon.fried(a)gmail.com> */ diff --git a/test/dm/soc.c b/test/dm/soc.c index 17e1b5ba01..c877542953 100644 --- a/test/dm/soc.c +++ b/test/dm/soc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test for the SOC uclass * diff --git a/test/dm/sound.c b/test/dm/sound.c index 15d545ab5a..20ff664cbc 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/spi.c b/test/dm/spi.c index 325799bbf1..85bdfd8179 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2013 Google, Inc */ diff --git a/test/dm/spmi.c b/test/dm/spmi.c index 9cc284b98c..9ab824f26b 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> */ diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c index eeaddf8839..582b64ee7b 100644 --- a/test/dm/syscon-reset.c +++ b/test/dm/syscon-reset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/dm/syscon.c b/test/dm/syscon.c index be23297233..4fe1b8e350 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/sysinfo-gpio.c b/test/dm/sysinfo-gpio.c index 2e494b3f34..3fe5002b94 100644 --- a/test/dm/sysinfo-gpio.c +++ b/test/dm/sysinfo-gpio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2021 Sean Anderson <sean.anderson(a)seco.com> */ diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c index 96b3a8ebab..648c27f2ee 100644 --- a/test/dm/sysinfo.c +++ b/test/dm/sysinfo.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 691683c567..8bf4a8b1c9 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/tag.c b/test/dm/tag.c index 8ae8a1fcd6..b2eab91813 100644 --- a/test/dm/tag.c +++ b/test/dm/tag.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DM tag test * diff --git a/test/dm/tee.c b/test/dm/tee.c index 7a11bf8913..3e429597f3 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018 Linaro Limited */ diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index e73a1dd8f8..9a2c55262b 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 02cb974b0f..62837505e5 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 72d0eb57e2..f94ceac96f 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc */ diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 067701734a..13effbfa5d 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 Google, Inc * diff --git a/test/dm/timer.c b/test/dm/timer.c index 9f94d47692..88ef310ee6 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> */ diff --git a/test/dm/tpm.c b/test/dm/tpm.c index cde933ab28..e5b49f51d8 100644 --- a/test/dm/tpm.c +++ b/test/dm/tpm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/usb.c b/test/dm/usb.c index 7671ef156d..8642ae370a 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Google, Inc */ diff --git a/test/dm/video.c b/test/dm/video.c index d907f68160..1abf487947 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 3e108cdc35..69f02cd443 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/test/dm/virtio_device.c b/test/dm/virtio_device.c index fdda4da417..60835783cb 100644 --- a/test/dm/virtio_device.c +++ b/test/dm/virtio_device.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ diff --git a/test/dm/virtio_rng.c b/test/dm/virtio_rng.c index 8b9a04b1fd..436e94657f 100644 --- a/test/dm/virtio_rng.c +++ b/test/dm/virtio_rng.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 2bbebcdbf2..d19f957bfb 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2017 Google, Inc */ diff --git a/test/env/Makefile b/test/env/Makefile index 9a98fd4796..3cb93da12b 100644 --- a/test/env/Makefile +++ b/test/env/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2015 National Instruments, Inc diff --git a/test/fs/fat-noncontig-test.sh b/test/fs/fat-noncontig-test.sh index b02dae765f..c511645ac6 100755 --- a/test/fs/fat-noncontig-test.sh +++ b/test/fs/fat-noncontig-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # (C) Copyright 2015 Stephen Warren diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index dec2634de3..2d6dadc9ef 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2014 Suriyan Ramasami diff --git a/test/fuzz/Makefile b/test/fuzz/Makefile index 663b79ce80..06be0174e6 100644 --- a/test/fuzz/Makefile +++ b/test/fuzz/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022 Google, Inc. # Written by Andrew Scull <ascull(a)google.com> diff --git a/test/fuzz/cmd_fuzz.c b/test/fuzz/cmd_fuzz.c index d0bc7b8d7b..14ddbc22a1 100644 --- a/test/fuzz/cmd_fuzz.c +++ b/test/fuzz/cmd_fuzz.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/test/fuzz/virtio.c b/test/fuzz/virtio.c index 8a47667e77..45c12539f0 100644 --- a/test/fuzz/virtio.c +++ b/test/fuzz/virtio.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2022 Google, Inc. * Written by Andrew Scull <ascull(a)google.com> diff --git a/test/image/Kconfig b/test/image/Kconfig index 8f9e6ae036..f9e4107f6f 100644 --- a/test/image/Kconfig +++ b/test/image/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> config SPL_UT_LOAD diff --git a/test/image/Makefile b/test/image/Makefile index b30210106a..2bb12538ca 100644 --- a/test/image/Makefile +++ b/test/image/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2021 Google LLC diff --git a/test/image/spl_load.c b/test/image/spl_load.c index ab4c14d649..1ff2365a23 100644 --- a/test/image/spl_load.c +++ b/test/image/spl_load.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index 297ab08a82..28f32533fc 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/image/spl_load_net.c b/test/image/spl_load_net.c index f570cef163..0588ab7301 100644 --- a/test/image/spl_load_net.c +++ b/test/image/spl_load_net.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/image/spl_load_nor.c b/test/image/spl_load_nor.c index a62bb60d25..8f5e340ff5 100644 --- a/test/image/spl_load_nor.c +++ b/test/image/spl_load_nor.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/image/spl_load_os.c b/test/image/spl_load_os.c index 49edf152d7..441e4a2750 100644 --- a/test/image/spl_load_os.c +++ b/test/image/spl_load_os.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/image/spl_load_spi.c b/test/image/spl_load_spi.c index 8f9b6e0139..e21bc82f25 100644 --- a/test/image/spl_load_spi.c +++ b/test/image/spl_load_spi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2023 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/image/test-imagetools.sh b/test/image/test-imagetools.sh index 907f46a7b5..0f6a66b3f4 100755 --- a/test/image/test-imagetools.sh +++ b/test/image/test-imagetools.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira(a)gmail.com> # diff --git a/test/lib/Kconfig b/test/lib/Kconfig index ae0aa2ff7a..d512d51124 100644 --- a/test/lib/Kconfig +++ b/test/lib/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC config TEST_KCONFIG diff --git a/test/lib/Makefile b/test/lib/Makefile index e75a263e6a..9662fc5d80 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2018 # Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/lib/abuf.c b/test/lib/abuf.c index 42803b20e2..4acf1ad053 100644 --- a/test/lib/abuf.c +++ b/test/lib/abuf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/lib/asn1.c b/test/lib/asn1.c index a66cdd77df..e11ab4168b 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Linaro Limited * Author: AKASHI Takahiro diff --git a/test/lib/efi_device_path.c b/test/lib/efi_device_path.c index 24e2f23c5a..ee052d6222 100644 --- a/test/lib/efi_device_path.c +++ b/test/lib/efi_device_path.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device path functions * diff --git a/test/lib/efi_image_region.c b/test/lib/efi_image_region.c index 0b888f8433..ddfabbbc50 100644 --- a/test/lib/efi_image_region.c +++ b/test/lib/efi_image_region.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ diff --git a/test/lib/getopt.c b/test/lib/getopt.c index 3c68b93c8a..9b114c4bf8 100644 --- a/test/lib/getopt.c +++ b/test/lib/getopt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> * diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c index 5dccf43886..9fde2407c0 100644 --- a/test/lib/hexdump.c +++ b/test/lib/hexdump.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 * Mario Six, Guntermann & Drunck GmbH, mario.six(a)gdsys.cc diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c index 3914f69965..432a9e7edc 100644 --- a/test/lib/kconfig.c +++ b/test/lib/kconfig.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test of linux/kconfig.h macros * diff --git a/test/lib/kconfig_spl.c b/test/lib/kconfig_spl.c index 8f8a3411b1..1cc217efe0 100644 --- a/test/lib/kconfig_spl.c +++ b/test/lib/kconfig_spl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test of linux/kconfig.h macros for SPL * diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 15c68ce396..854332049a 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Simon Goldschmidt */ diff --git a/test/lib/longjmp.c b/test/lib/longjmp.c index 201367a5a3..9ba1c019f3 100644 --- a/test/lib/longjmp.c +++ b/test/lib/longjmp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test setjmp(), longjmp() * diff --git a/test/lib/rsa.c b/test/lib/rsa.c index 44f8ade226..61a7778d67 100644 --- a/test/lib/rsa.c +++ b/test/lib/rsa.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Linaro Limited * Author: AKASHI Takahiro diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c index 772e4b9204..d6372f25ac 100644 --- a/test/lib/sscanf.c +++ b/test/lib/sscanf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2002, Uwe Bonnes * Copyright (c) 2001-2004, Roger Dingledine. diff --git a/test/lib/string.c b/test/lib/string.c index 5dcf4d6db0..cf7669ea7a 100644 --- a/test/lib/string.c +++ b/test/lib/string.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c index cbc712f7ed..15b80a92ab 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Philippe Reynes <philippe.reynes(a)softathome.com> * diff --git a/test/lib/test_crc8.c b/test/lib/test_crc8.c index 0dac97bc5b..b3e272a0d7 100644 --- a/test/lib/test_crc8.c +++ b/test/lib/test_crc8.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> * diff --git a/test/lib/test_crypt.c b/test/lib/test_crypt.c index fb21edf974..7c24d21c55 100644 --- a/test/lib/test_crypt.c +++ b/test/lib/test_crypt.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 Steffen Jaeckel * diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c index 8a9f1fd980..8fe4918568 100644 --- a/test/lib/test_errno_str.c +++ b/test/lib/test_errno_str.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019 Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/lib/test_print.c b/test/lib/test_print.c index 79b67c7793..3383b647ce 100644 --- a/test/lib/test_print.c +++ b/test/lib/test_print.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Tests for print functions * diff --git a/test/lib/uuid.c b/test/lib/uuid.c index e24331a136..696d45c212 100644 --- a/test/lib/uuid.c +++ b/test/lib/uuid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Functional tests for UCLASS_FFA class * diff --git a/test/log/Makefile b/test/log/Makefile index 08eea70e34..9689634f59 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2017 Google, Inc diff --git a/test/log/cont_test.c b/test/log/cont_test.c index de7b7f064c..654e83a5ce 100644 --- a/test/log/cont_test.c +++ b/test/log/cont_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/log_filter.c b/test/log/log_filter.c index b644b40a85..69c7788a25 100644 --- a/test/log/log_filter.c +++ b/test/log/log_filter.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2020 Sean Anderson <seanga2(a)gmail.com> */ diff --git a/test/log/log_test.c b/test/log/log_test.c index c5abff80d1..10b0d61d4c 100644 --- a/test/log/log_test.c +++ b/test/log/log_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Logging support test program * diff --git a/test/log/log_ut.c b/test/log/log_ut.c index 5aa3a18400..75a61144ef 100644 --- a/test/log/log_ut.c +++ b/test/log/log_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/nolog_ndebug.c b/test/log/nolog_ndebug.c index bd9a4f408e..c442b15fac 100644 --- a/test/log/nolog_ndebug.c +++ b/test/log/nolog_ndebug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c index 4e52e5bed8..382c79265a 100644 --- a/test/log/nolog_test.c +++ b/test/log/nolog_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c index df4520d280..bc12408764 100644 --- a/test/log/pr_cont_test.c +++ b/test/log/pr_cont_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/syslog_test.c b/test/log/syslog_test.c index 4db649db82..ace31fd25b 100644 --- a/test/log/syslog_test.c +++ b/test/log/syslog_test.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/syslog_test.h b/test/log/syslog_test.h index 39cce4ed49..e048991464 100644 --- a/test/log/syslog_test.h +++ b/test/log/syslog_test.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/log/syslog_test_ndebug.c b/test/log/syslog_test_ndebug.c index 4438791044..ad231a6b9a 100644 --- a/test/log/syslog_test_ndebug.c +++ b/test/log/syslog_test_ndebug.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> * diff --git a/test/optee/Makefile b/test/optee/Makefile index 8793fd7ad6..6ec20abb93 100644 --- a/test/optee/Makefile +++ b/test/optee/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index c3887ab11d..40b039a3a4 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ diff --git a/test/optee/test-optee-base.dts b/test/optee/test-optee-base.dts index 3c1d0c60ef..9abca92e52 100644 --- a/test/optee/test-optee-base.dts +++ b/test/optee/test-optee-base.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ diff --git a/test/optee/test-optee-no-optee.dts b/test/optee/test-optee-no-optee.dts index 3c1d0c60ef..9abca92e52 100644 --- a/test/optee/test-optee-no-optee.dts +++ b/test/optee/test-optee-no-optee.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ diff --git a/test/optee/test-optee-optee.dts b/test/optee/test-optee-optee.dts index 11e26a2728..28b2295ec2 100644 --- a/test/optee/test-optee-optee.dts +++ b/test/optee/test-optee-optee.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH */ diff --git a/test/overlay/Makefile b/test/overlay/Makefile index 2deec929ab..151176c33b 100644 --- a/test/overlay/Makefile +++ b/test/overlay/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 NextThing Co # Copyright (c) 2016 Free Electrons diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index 56a3df1713..29b7ce270e 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons diff --git a/test/overlay/test-fdt-base.dts b/test/overlay/test-fdt-base.dts index 38278334e4..0301451597 100644 --- a/test/overlay/test-fdt-base.dts +++ b/test/overlay/test-fdt-base.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons diff --git a/test/overlay/test-fdt-overlay-stacked.dts b/test/overlay/test-fdt-overlay-stacked.dts index 6411adec53..c705170120 100644 --- a/test/overlay/test-fdt-overlay-stacked.dts +++ b/test/overlay/test-fdt-overlay-stacked.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons diff --git a/test/overlay/test-fdt-overlay.dts b/test/overlay/test-fdt-overlay.dts index 5a21b346d0..6622ff1287 100644 --- a/test/overlay/test-fdt-overlay.dts +++ b/test/overlay/test-fdt-overlay.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 NextThing Co * Copyright (c) 2016 Free Electrons diff --git a/test/print_ut.c b/test/print_ut.c index b26f6281b0..6527ce01d0 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2012, The Chromium Authors */ diff --git a/test/py/tests/fit_util.py b/test/py/tests/fit_util.py index 79718d431a..5c0070b354 100644 --- a/test/py/tests/fit_util.py +++ b/test/py/tests/fit_util.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC """Common utility functions for FIT tests""" diff --git a/test/py/tests/fs_helper.py b/test/py/tests/fs_helper.py index 9882ddb1da..e3149a402c 100644 --- a/test/py/tests/fs_helper.py +++ b/test/py/tests/fs_helper.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_android/test_abootimg.py b/test/py/tests/test_android/test_abootimg.py index 6a8ff34538..4d77ebc3c6 100644 --- a/test/py/tests/test_android/test_abootimg.py +++ b/test/py/tests/test_android/test_abootimg.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020 # Author: Sam Protsenko <joe.skb7(a)gmail.com> diff --git a/test/py/tests/test_android/test_avb.py b/test/py/tests/test_android/test_avb.py index 238b48c90f..e355e7b22d 100644 --- a/test/py/tests/test_android/test_avb.py +++ b/test/py/tests/test_android/test_avb.py @@ -1,6 +1,6 @@ # Copyright (c) 2018, Linaro Limited # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Android Verified Boot 2.0 Test diff --git a/test/py/tests/test_bootmenu.py b/test/py/tests/test_bootmenu.py index 70f51de699..4fcd71f42e 100644 --- a/test/py/tests/test_bootmenu.py +++ b/test/py/tests/test_bootmenu.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Test bootmenu""" diff --git a/test/py/tests/test_button.py b/test/py/tests/test_button.py index 3b7f148c8f..5fd0a05ab9 100644 --- a/test/py/tests/test_button.py +++ b/test/py/tests/test_button.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later import pytest diff --git a/test/py/tests/test_cat/conftest.py b/test/py/tests/test_cat/conftest.py index 320e7ebd29..237936ffb6 100644 --- a/test/py/tests/test_cat/conftest.py +++ b/test/py/tests/test_cat/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Fixture for cat command test """ diff --git a/test/py/tests/test_cat/test_cat.py b/test/py/tests/test_cat/test_cat.py index 132527bd4c..f25eb6bbda 100644 --- a/test/py/tests/test_cat/test_cat.py +++ b/test/py/tests/test_cat/test_cat.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Unit test for cat command """ diff --git a/test/py/tests/test_efi_bootmgr/conftest.py b/test/py/tests/test_efi_bootmgr/conftest.py index 0eca025058..c22fb168dc 100644 --- a/test/py/tests/test_efi_bootmgr/conftest.py +++ b/test/py/tests/test_efi_bootmgr/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Fixture for UEFI bootmanager test.""" diff --git a/test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py b/test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py index 1bb59d8fcf..4bf1e6b59f 100644 --- a/test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py +++ b/test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Unit test for UEFI bootmanager """ diff --git a/test/py/tests/test_efi_capsule/capsule_common.py b/test/py/tests/test_efi_capsule/capsule_common.py index fc0d851c61..3af333e73b 100644 --- a/test/py/tests/test_efi_capsule/capsule_common.py +++ b/test/py/tests/test_efi_capsule/capsule_common.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2023, Linaro Limited diff --git a/test/py/tests/test_efi_capsule/capsule_defs.py b/test/py/tests/test_efi_capsule/capsule_defs.py index 3cc695e29b..956beb9638 100644 --- a/test/py/tests/test_efi_capsule/capsule_defs.py +++ b/test/py/tests/test_efi_capsule/capsule_defs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Directoreis used for authentication and capsule tests.""" diff --git a/test/py/tests/test_efi_capsule/capsule_gen_binman.dts b/test/py/tests/test_efi_capsule/capsule_gen_binman.dts index e8a1858509..4815aed2b5 100644 --- a/test/py/tests/test_efi_capsule/capsule_gen_binman.dts +++ b/test/py/tests/test_efi_capsule/capsule_gen_binman.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Devicetree for capsule generation through binman */ diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py index dd41da9284..c489e3b53e 100644 --- a/test/py/tests/test_efi_capsule/conftest.py +++ b/test/py/tests/test_efi_capsule/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py index 11bcdc2bb2..6c82bddd23 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py index a5b5c8a385..529bd8e348 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py index 44a58baa31..728205e59b 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2021, Linaro Limited # Copyright (c) 2022, Arm Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org>, diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py index 83a10e160b..c8e245858e 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2021, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_efi_capsule/version.dts b/test/py/tests/test_efi_capsule/version.dts index 07850cc606..d7d0e0f02c 100644 --- a/test/py/tests/test_efi_capsule/version.dts +++ b/test/py/tests/test_efi_capsule/version.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; /plugin/; diff --git a/test/py/tests/test_efi_secboot/conftest.py b/test/py/tests/test_efi_secboot/conftest.py index ff7ac7c810..0ed74c9965 100644 --- a/test/py/tests/test_efi_secboot/conftest.py +++ b/test/py/tests/test_efi_secboot/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_efi_secboot/defs.py b/test/py/tests/test_efi_secboot/defs.py index 6a2317e295..e822ec2a3e 100644 --- a/test/py/tests/test_efi_secboot/defs.py +++ b/test/py/tests/test_efi_secboot/defs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Constants used for secure boot test.""" diff --git a/test/py/tests/test_efi_secboot/test_authvar.py b/test/py/tests/test_efi_secboot/test_authvar.py index f99b8270a6..d5b2ef2f2a 100644 --- a/test/py/tests/test_efi_secboot/test_authvar.py +++ b/test/py/tests/test_efi_secboot/test_authvar.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_efi_secboot/test_signed.py b/test/py/tests/test_efi_secboot/test_signed.py index ca52e853d8..ba5ce2b267 100644 --- a/test/py/tests/test_efi_secboot/test_signed.py +++ b/test/py/tests/test_efi_secboot/test_signed.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_efi_secboot/test_signed_intca.py b/test/py/tests/test_efi_secboot/test_signed_intca.py index d8d599d22f..5bdd923ede 100644 --- a/test/py/tests/test_efi_secboot/test_signed_intca.py +++ b/test/py/tests/test_efi_secboot/test_signed_intca.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_efi_secboot/test_unsigned.py b/test/py/tests/test_efi_secboot/test_unsigned.py index df63f0df08..001c4ecc6e 100644 --- a/test/py/tests/test_efi_secboot/test_unsigned.py +++ b/test/py/tests/test_efi_secboot/test_unsigned.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Linaro Limited # Author: AKASHI Takahiro <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_eficonfig/conftest.py b/test/py/tests/test_eficonfig/conftest.py index 0a82fbefd7..47057c0394 100644 --- a/test/py/tests/test_eficonfig/conftest.py +++ b/test/py/tests/test_eficonfig/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Fixture for UEFI eficonfig test """ diff --git a/test/py/tests/test_eficonfig/test_eficonfig.py b/test/py/tests/test_eficonfig/test_eficonfig.py index b0a6cc47df..7e0eb23f3e 100644 --- a/test/py/tests/test_eficonfig/test_eficonfig.py +++ b/test/py/tests/test_eficonfig/test_eficonfig.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Unit test for UEFI menu-driven configuration """ diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py index e282c67335..4985b23f9c 100644 --- a/test/py/tests/test_event_dump.py +++ b/test/py/tests/test_event_dump.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/py/tests/test_extension.py b/test/py/tests/test_extension.py index 267cf2ff27..7836b856c3 100644 --- a/test/py/tests/test_extension.py +++ b/test/py/tests/test_extension.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020 # Author: Kory Maincent <kory.maincent(a)bootlin.com> diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py index f45848484e..b897f67dbb 100755 --- a/test/py/tests/test_fit.py +++ b/test/py/tests/test_fit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2013, Google Inc. # # Sanity check of the FIT handling in U-Boot diff --git a/test/py/tests/test_fit_auto_signed.py b/test/py/tests/test_fit_auto_signed.py index 9ea3351619..a8fa37c0ed 100644 --- a/test/py/tests/test_fit_auto_signed.py +++ b/test/py/tests/test_fit_auto_signed.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2022 Massimo Pegorer """ diff --git a/test/py/tests/test_fit_ecdsa.py b/test/py/tests/test_fit_ecdsa.py index cc6c0c4dc4..35d980e492 100644 --- a/test/py/tests/test_fit_ecdsa.py +++ b/test/py/tests/test_fit_ecdsa.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2020,2021 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> diff --git a/test/py/tests/test_fit_hashes.py b/test/py/tests/test_fit_hashes.py index 4891e77ca2..610621ac28 100644 --- a/test/py/tests/test_fit_hashes.py +++ b/test/py/tests/test_fit_hashes.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2021 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 0d87d180c7..db84172c9d 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> diff --git a/test/py/tests/test_fs/fstest_defs.py b/test/py/tests/test_fs/fstest_defs.py index 35b2bb6518..24c4145fd2 100644 --- a/test/py/tests/test_fs/fstest_defs.py +++ b/test/py/tests/test_fs/fstest_defs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # $MIN_FILE is the name of the 20KB file in the file system image MIN_FILE='testfile' diff --git a/test/py/tests/test_fs/fstest_helpers.py b/test/py/tests/test_fs/fstest_helpers.py index faec298248..32f08d39b6 100644 --- a/test/py/tests/test_fs/fstest_helpers.py +++ b/test/py/tests/test_fs/fstest_helpers.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Texas Instrument # Author: JJ Hiblot <jjhiblot(a)ti.com> # diff --git a/test/py/tests/test_fs/test_basic.py b/test/py/tests/test_fs/test_basic.py index 71f3e86fb1..5bc76f965b 100644 --- a/test/py/tests/test_fs/test_basic.py +++ b/test/py/tests/test_fs/test_basic.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_fs/test_erofs.py b/test/py/tests/test_fs/test_erofs.py index 458a52ba79..d4b29fceaf 100644 --- a/test/py/tests/test_fs/test_erofs.py +++ b/test/py/tests/test_fs/test_erofs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Huang Jianan <jnhuang95(a)gmail.com> # Author: Huang Jianan <jnhuang95(a)gmail.com> diff --git a/test/py/tests/test_fs/test_ext.py b/test/py/tests/test_fs/test_ext.py index 05fefa53a0..204eb16af1 100644 --- a/test/py/tests/test_fs/test_ext.py +++ b/test/py/tests/test_fs/test_ext.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_fs/test_mkdir.py b/test/py/tests/test_fs/test_mkdir.py index fa9561ec35..bc3037d918 100644 --- a/test/py/tests/test_fs/test_mkdir.py +++ b/test/py/tests/test_fs/test_mkdir.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_fs/test_symlink.py b/test/py/tests/test_fs/test_symlink.py index 9ced101a29..7a913efabe 100644 --- a/test/py/tests/test_fs/test_symlink.py +++ b/test/py/tests/test_fs/test_symlink.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019, Texas Instrument # Author: Jean-Jacques Hiblot <jjhiblot(a)ti.com> # diff --git a/test/py/tests/test_fs/test_unlink.py b/test/py/tests/test_fs/test_unlink.py index 97aafc63bb..fe18ee4a3f 100644 --- a/test/py/tests/test_fs/test_unlink.py +++ b/test/py/tests/test_fs/test_unlink.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Linaro Limited # Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> # diff --git a/test/py/tests/test_gpio.py b/test/py/tests/test_gpio.py index 0af186f236..b7406945dc 100644 --- a/test/py/tests/test_gpio.py +++ b/test/py/tests/test_gpio.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2021 Adarsh Babu Kalepalli <opensource.kab(a)gmail.com> # Copyright (c) 2020 Alex Kiernan <alex.kiernan(a)gmail.com> diff --git a/test/py/tests/test_handoff.py b/test/py/tests/test_handoff.py index 038f03064a..548292f053 100644 --- a/test/py/tests/test_handoff.py +++ b/test/py/tests/test_handoff.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc import pytest diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index 140dcb9aa2..4d20251c4e 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016, Google Inc. # # U-Boot Verified Boot Test diff --git a/test/py/tests/test_lsblk.py b/test/py/tests/test_lsblk.py index a719a48e6e..5a95bae6f5 100644 --- a/test/py/tests/test_lsblk.py +++ b/test/py/tests/test_lsblk.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2020 # Niel Fourie, DENX Software Engineering, lusus(a)denx.de diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 51a188454f..62e1f14002 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc import pytest diff --git a/test/py/tests/test_pstore.py b/test/py/tests/test_pstore.py index 5a35724f60..760f6ce457 100644 --- a/test/py/tests/test_pstore.py +++ b/test/py/tests/test_pstore.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2020, Collabora # Author: Frédéric Danis <frederic.danis(a)collabora.com> diff --git a/test/py/tests/test_qfw.py b/test/py/tests/test_qfw.py index 8b668c9721..415dac499d 100644 --- a/test/py/tests/test_qfw.py +++ b/test/py/tests/test_qfw.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2021, Asherah Connor <ashe(a)kivikakk.ee> # Test qfw command implementation diff --git a/test/py/tests/test_scp03.py b/test/py/tests/test_scp03.py index 1a104b365f..c346f05948 100644 --- a/test/py/tests/test_scp03.py +++ b/test/py/tests/test_scp03.py @@ -1,6 +1,6 @@ # Copyright (c) 2021 Foundries.io Ltd # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # SCP03 command test diff --git a/test/py/tests/test_semihosting/test_hostfs.py b/test/py/tests/test_semihosting/test_hostfs.py index 51f6fa7702..4c5c2d4f1c 100644 --- a/test/py/tests/test_semihosting/test_hostfs.py +++ b/test/py/tests/test_semihosting/test_hostfs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Unit test for semihosting """ diff --git a/test/py/tests/test_source.py b/test/py/tests/test_source.py index bbc311df6d..d502a23047 100644 --- a/test/py/tests/test_source.py +++ b/test/py/tests/test_source.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Sean Anderson <sean.anderson(a)seco.com> import os diff --git a/test/py/tests/test_tpm2.py b/test/py/tests/test_tpm2.py index c2579fa02c..c249ae7e22 100644 --- a/test/py/tests/test_tpm2.py +++ b/test/py/tests/test_tpm2.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018, Bootlin # Author: Miquel Raynal <miquel.raynal(a)bootlin.com> diff --git a/test/py/tests/test_vbe.py b/test/py/tests/test_vbe.py index 50b6c1cd91..91420be618 100644 --- a/test/py/tests/test_vbe.py +++ b/test/py/tests/test_vbe.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # # Test addition of VBE diff --git a/test/py/tests/test_vbe_vpl.py b/test/py/tests/test_vbe_vpl.py index ed12d3a461..938c2a3e6b 100644 --- a/test/py/tests/test_vbe_vpl.py +++ b/test/py/tests/test_vbe_vpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # # Test addition of VBE diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index 04fa59f98b..1834ba96e0 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016, Google Inc. # # U-Boot Verified Boot Test diff --git a/test/py/tests/test_xxd/conftest.py b/test/py/tests/test_xxd/conftest.py index 47c7cce1aa..10adc83a5d 100644 --- a/test/py/tests/test_xxd/conftest.py +++ b/test/py/tests/test_xxd/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """Fixture for xxd command test """ diff --git a/test/py/tests/test_xxd/test_xxd.py b/test/py/tests/test_xxd/test_xxd.py index 06b9cfc000..385ca3aff8 100644 --- a/test/py/tests/test_xxd/test_xxd.py +++ b/test/py/tests/test_xxd/test_xxd.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Unit test for xxd command """ diff --git a/test/py/tests/vboot/sandbox-binman-pss.dts b/test/py/tests/vboot/sandbox-binman-pss.dts index 56e3a42fa6..93e469d0ad 100644 --- a/test/py/tests/vboot/sandbox-binman-pss.dts +++ b/test/py/tests/vboot/sandbox-binman-pss.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/test/py/tests/vboot/sandbox-binman.dts b/test/py/tests/vboot/sandbox-binman.dts index b24aeba0fa..9c5d1fbfe9 100644 --- a/test/py/tests/vboot/sandbox-binman.dts +++ b/test/py/tests/vboot/sandbox-binman.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/test/py/tests/vboot/sandbox-u-boot-global-pss.dts b/test/py/tests/vboot/sandbox-u-boot-global-pss.dts index c59a68221b..ac1af60922 100644 --- a/test/py/tests/vboot/sandbox-u-boot-global-pss.dts +++ b/test/py/tests/vboot/sandbox-u-boot-global-pss.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/test/py/tests/vboot/sandbox-u-boot-global.dts b/test/py/tests/vboot/sandbox-u-boot-global.dts index 1409f9e1a1..808fdce42e 100644 --- a/test/py/tests/vboot/sandbox-u-boot-global.dts +++ b/test/py/tests/vboot/sandbox-u-boot-global.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/test/py/tests/vboot/simple-images.its b/test/py/tests/vboot/simple-images.its index f62786456b..61a0085e41 100644 --- a/test/py/tests/vboot/simple-images.its +++ b/test/py/tests/vboot/simple-images.its @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/test/str_ut.c b/test/str_ut.c index fa9328ede5..a1515f1abd 100644 --- a/test/str_ut.c +++ b/test/str_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2020 Google LLC */ diff --git a/test/test-main.c b/test/test-main.c index b7015d9f38..3464f53be1 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/time_ut.c b/test/time_ut.c index 80b82dbfd8..84b8025bdf 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/test/trace/test-trace.sh b/test/trace/test-trace.sh index 5130b2bf01..44cb561999 100755 --- a/test/trace/test-trace.sh +++ b/test/trace/test-trace.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2013 The Chromium OS Authors. # diff --git a/test/unicode_ut.c b/test/unicode_ut.c index 1d0d90c2d7..4a4ca3b3bc 100644 --- a/test/unicode_ut.c +++ b/test/unicode_ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Unit tests for Unicode functions * diff --git a/test/ut.c b/test/ut.c index 28da417686..425b6269be 100644 --- a/test/ut.c +++ b/test/ut.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Simple unit test library * diff --git a/tools/Makefile b/tools/Makefile index 1aa1e36137..9e69359ea9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/aisimage.c b/tools/aisimage.c index c5b33b559b..7f56dfe42f 100644 --- a/tools/aisimage.c +++ b/tools/aisimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/tools/aisimage.h b/tools/aisimage.h index d8637a0fa5..a2415d23ca 100644 --- a/tools/aisimage.h +++ b/tools/aisimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/tools/atmel_pmecc_params.c b/tools/atmel_pmecc_params.c index a4ae03f0fd..68a572be5c 100644 --- a/tools/atmel_pmecc_params.c +++ b/tools/atmel_pmecc_params.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 Andreas Bießmann <andreas(a)biessmann.org> */ diff --git a/tools/atmelimage.c b/tools/atmelimage.c index 6a2d9d8fea..2e3040559d 100644 --- a/tools/atmelimage.c +++ b/tools/atmelimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Andreas Bießmann <andreas(a)biessmann.org> diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index 020988d955..c764556ee5 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2016 Google, Inc Introduction diff --git a/tools/binman/bintool.py b/tools/binman/bintool.py index 3c4ad1adbb..4b0ad07e5c 100644 --- a/tools/binman/bintool.py +++ b/tools/binman/bintool.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> @@ -424,7 +424,7 @@ class Bintool: test_missing: Used for testing. This is a module to report as missing """ - print('''.. SPDX-License-Identifier: GPL-2.0+ + print('''.. SPDX-License-Identifier: GPL-2.0-or-later Binman bintool Documentation ============================ diff --git a/tools/binman/bintool_test.py b/tools/binman/bintool_test.py index f9b16d4c73..9c5b7135a9 100644 --- a/tools/binman/bintool_test.py +++ b/tools/binman/bintool_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/bintools.rst b/tools/binman/bintools.rst index 1336f4d011..39130b633a 100644 --- a/tools/binman/bintools.rst +++ b/tools/binman/bintools.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Binman bintool Documentation ============================ diff --git a/tools/binman/btool/_testing.py b/tools/binman/btool/_testing.py index 4005e8a8a5..a42fdc77ff 100644 --- a/tools/binman/btool/_testing.py +++ b/tools/binman/btool/_testing.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool used for testing diff --git a/tools/binman/btool/bootgen.py b/tools/binman/btool/bootgen.py index 1bc9f0aa96..f455e5f1dd 100644 --- a/tools/binman/btool/bootgen.py +++ b/tools/binman/btool/bootgen.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2023 Weidmüller Interface GmbH & Co. KG # Lukas Funke <lukas.funke(a)weidmueller.com> # diff --git a/tools/binman/btool/btool_gzip.py b/tools/binman/btool/btool_gzip.py index 0d75028120..86402054a1 100644 --- a/tools/binman/btool/btool_gzip.py +++ b/tools/binman/btool/btool_gzip.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> # diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py index c3897d63ac..4ae33c5a50 100644 --- a/tools/binman/btool/bzip2.py +++ b/tools/binman/btool/bzip2.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> # diff --git a/tools/binman/btool/cbfstool.py b/tools/binman/btool/cbfstool.py index 29be2d8a2b..0753beb7af 100644 --- a/tools/binman/btool/cbfstool.py +++ b/tools/binman/btool/cbfstool.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for cbfstool diff --git a/tools/binman/btool/fdt_add_pubkey.py b/tools/binman/btool/fdt_add_pubkey.py index a50774200c..e295f48059 100644 --- a/tools/binman/btool/fdt_add_pubkey.py +++ b/tools/binman/btool/fdt_add_pubkey.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2023 Weidmüller Interface GmbH & Co. KG # Lukas Funke <lukas.funke(a)weidmueller.com> # diff --git a/tools/binman/btool/fiptool.py b/tools/binman/btool/fiptool.py index 34002f54af..530b3fdc11 100644 --- a/tools/binman/btool/fiptool.py +++ b/tools/binman/btool/fiptool.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for fiptool diff --git a/tools/binman/btool/futility.py b/tools/binman/btool/futility.py index 0d3980d071..5ffd48446d 100644 --- a/tools/binman/btool/futility.py +++ b/tools/binman/btool/futility.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for futility diff --git a/tools/binman/btool/ifwitool.py b/tools/binman/btool/ifwitool.py index 96778fce87..10dcfdc61a 100644 --- a/tools/binman/btool/ifwitool.py +++ b/tools/binman/btool/ifwitool.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for ifwitool diff --git a/tools/binman/btool/lz4.py b/tools/binman/btool/lz4.py index fd520d13a5..820c8a6de6 100644 --- a/tools/binman/btool/lz4.py +++ b/tools/binman/btool/lz4.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for lz4 diff --git a/tools/binman/btool/lzma_alone.py b/tools/binman/btool/lzma_alone.py index 1fda2f68c7..047d188a49 100644 --- a/tools/binman/btool/lzma_alone.py +++ b/tools/binman/btool/lzma_alone.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for lzma_alone diff --git a/tools/binman/btool/lzop.py b/tools/binman/btool/lzop.py index f6903b4db7..49bb45fc2b 100644 --- a/tools/binman/btool/lzop.py +++ b/tools/binman/btool/lzop.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> # diff --git a/tools/binman/btool/mkeficapsule.py b/tools/binman/btool/mkeficapsule.py index ef1da638df..59e7460b8f 100644 --- a/tools/binman/btool/mkeficapsule.py +++ b/tools/binman/btool/mkeficapsule.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2023 Linaro Limited # """Bintool implementation for mkeficapsule tool diff --git a/tools/binman/btool/mkimage.py b/tools/binman/btool/mkimage.py index d5b407c554..df38f3a49a 100644 --- a/tools/binman/btool/mkimage.py +++ b/tools/binman/btool/mkimage.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for mkimage""" diff --git a/tools/binman/btool/openssl.py b/tools/binman/btool/openssl.py index aad3b61ae2..b767a3d81e 100644 --- a/tools/binman/btool/openssl.py +++ b/tools/binman/btool/openssl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # """Bintool implementation for openssl diff --git a/tools/binman/btool/xz.py b/tools/binman/btool/xz.py index e2b413d18b..73d45a4311 100644 --- a/tools/binman/btool/xz.py +++ b/tools/binman/btool/xz.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> # diff --git a/tools/binman/btool/zstd.py b/tools/binman/btool/zstd.py index 299bd37126..e075fbd719 100644 --- a/tools/binman/btool/zstd.py +++ b/tools/binman/btool/zstd.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG # Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> # diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py index fc56b40b75..7b5a37859b 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binman/cbfs_util.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/cbfs_util_test.py b/tools/binman/cbfs_util_test.py index ee951d10cf..6119a9f771 100755 --- a/tools/binman/cbfs_util_test.py +++ b/tools/binman/cbfs_util_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py index 9632ec115e..3ca99b64ff 100644 --- a/tools/binman/cmdline.py +++ b/tools/binman/cmdline.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/control.py b/tools/binman/control.py index c6d3205b8c..0495c89709 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/elf.py b/tools/binman/elf.py index 2ecc95f7eb..704bf74ba5 100644 --- a/tools/binman/elf.py +++ b/tools/binman/elf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index e3dee79d06..9cd4c8eb60 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2017 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 42e0b7b914..a87138a898 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # # Base class for all entries diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index ac6582cf86..aa2a7c605d 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/_testing.py b/tools/binman/etype/_testing.py index e092d98ce1..e04eeb9733 100644 --- a/tools/binman/etype/_testing.py +++ b/tools/binman/etype/_testing.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/atf_bl31.py b/tools/binman/etype/atf_bl31.py index 2041da416c..ca9a035891 100644 --- a/tools/binman/etype/atf_bl31.py +++ b/tools/binman/etype/atf_bl31.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2020 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/atf_fip.py b/tools/binman/etype/atf_fip.py index 73a3f85b9f..81a081779c 100644 --- a/tools/binman/etype/atf_fip.py +++ b/tools/binman/etype/atf_fip.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py index 064fae5036..dfb55166c1 100644 --- a/tools/binman/etype/blob.py +++ b/tools/binman/etype/blob.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py index d543de9f75..1b209ef76f 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binman/etype/blob_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob_ext.py b/tools/binman/etype/blob_ext.py index ca26530738..dd2227c32b 100644 --- a/tools/binman/etype/blob_ext.py +++ b/tools/binman/etype/blob_ext.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob_ext_list.py b/tools/binman/etype/blob_ext_list.py index 1bfcf6733a..f91ea2cf2b 100644 --- a/tools/binman/etype/blob_ext_list.py +++ b/tools/binman/etype/blob_ext_list.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob_named_by_arg.py b/tools/binman/etype/blob_named_by_arg.py index 7c486b2dc9..ed19f85f85 100644 --- a/tools/binman/etype/blob_named_by_arg.py +++ b/tools/binman/etype/blob_named_by_arg.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/blob_phase.py b/tools/binman/etype/blob_phase.py index 951d993405..de311e0a0a 100644 --- a/tools/binman/etype/blob_phase.py +++ b/tools/binman/etype/blob_phase.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py index 575aa624f6..18fc8caef5 100644 --- a/tools/binman/etype/cbfs.py +++ b/tools/binman/etype/cbfs.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/collection.py b/tools/binman/etype/collection.py index c532aafe3e..5855646153 100644 --- a/tools/binman/etype/collection.py +++ b/tools/binman/etype/collection.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/cros_ec_rw.py b/tools/binman/etype/cros_ec_rw.py index bf676b2d1a..0c5f00dee9 100644 --- a/tools/binman/etype/cros_ec_rw.py +++ b/tools/binman/etype/cros_ec_rw.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/efi_capsule.py b/tools/binman/etype/efi_capsule.py index e320371782..53444b35f7 100644 --- a/tools/binman/etype/efi_capsule.py +++ b/tools/binman/etype/efi_capsule.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2023 Linaro Limited # # Entry-type module for producing a EFI capsule diff --git a/tools/binman/etype/efi_empty_capsule.py b/tools/binman/etype/efi_empty_capsule.py index 064bf9a77f..b3fb6b2dc6 100644 --- a/tools/binman/etype/efi_empty_capsule.py +++ b/tools/binman/etype/efi_empty_capsule.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2023 Linaro Limited # # Entry-type module for producing an empty EFI capsule diff --git a/tools/binman/etype/encrypted.py b/tools/binman/etype/encrypted.py index 53d0e76bab..44b382bc88 100644 --- a/tools/binman/etype/encrypted.py +++ b/tools/binman/etype/encrypted.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2023 Weidmüller Interface GmbH & Co. KG # Written by Christian Taedcke <christian.taedcke(a)weidmueller.com> # diff --git a/tools/binman/etype/fdtmap.py b/tools/binman/etype/fdtmap.py index f1f6217940..f776978264 100644 --- a/tools/binman/etype/fdtmap.py +++ b/tools/binman/etype/fdtmap.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/etype/files.py b/tools/binman/etype/files.py index c8757eafab..3df2b13541 100644 --- a/tools/binman/etype/files.py +++ b/tools/binman/etype/files.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/fill.py b/tools/binman/etype/fill.py index 7c93d4e268..00d3fc388f 100644 --- a/tools/binman/etype/fill.py +++ b/tools/binman/etype/fill.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index 2c14b15b03..306a1eac57 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/fmap.py b/tools/binman/etype/fmap.py index 3669d91a0b..784c7cb6ee 100644 --- a/tools/binman/etype/fmap.py +++ b/tools/binman/etype/fmap.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/gbb.py b/tools/binman/etype/gbb.py index cca18af6e2..ffe54af69e 100644 --- a/tools/binman/etype/gbb.py +++ b/tools/binman/etype/gbb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/image_header.py b/tools/binman/etype/image_header.py index 2401188495..28b60b0e7f 100644 --- a/tools/binman/etype/image_header.py +++ b/tools/binman/etype/image_header.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/etype/intel_cmc.py b/tools/binman/etype/intel_cmc.py index 494d43c9cf..ca599f581d 100644 --- a/tools/binman/etype/intel_cmc.py +++ b/tools/binman/etype/intel_cmc.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py index 7fe88a9ec1..4bb9bce780 100644 --- a/tools/binman/etype/intel_descriptor.py +++ b/tools/binman/etype/intel_descriptor.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fit.py b/tools/binman/etype/intel_fit.py index f1a10c55a6..88443ebcae 100644 --- a/tools/binman/etype/intel_fit.py +++ b/tools/binman/etype/intel_fit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fit_ptr.py b/tools/binman/etype/intel_fit_ptr.py index 01f082281c..91fd596b8d 100644 --- a/tools/binman/etype/intel_fit_ptr.py +++ b/tools/binman/etype/intel_fit_ptr.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fsp.py b/tools/binman/etype/intel_fsp.py index 326cb7d09b..96f7dab426 100644 --- a/tools/binman/etype/intel_fsp.py +++ b/tools/binman/etype/intel_fsp.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fsp_m.py b/tools/binman/etype/intel_fsp_m.py index 9bcac790ed..9ca2d26c22 100644 --- a/tools/binman/etype/intel_fsp_m.py +++ b/tools/binman/etype/intel_fsp_m.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fsp_s.py b/tools/binman/etype/intel_fsp_s.py index 1d5046d452..df560bb00f 100644 --- a/tools/binman/etype/intel_fsp_s.py +++ b/tools/binman/etype/intel_fsp_s.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_fsp_t.py b/tools/binman/etype/intel_fsp_t.py index 80d95cc6f9..89b20e39de 100644 --- a/tools/binman/etype/intel_fsp_t.py +++ b/tools/binman/etype/intel_fsp_t.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py index 6513b97c3e..147262b6bc 100644 --- a/tools/binman/etype/intel_ifwi.py +++ b/tools/binman/etype/intel_ifwi.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_me.py b/tools/binman/etype/intel_me.py index b93ebabdc9..75857d5891 100644 --- a/tools/binman/etype/intel_me.py +++ b/tools/binman/etype/intel_me.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_mrc.py b/tools/binman/etype/intel_mrc.py index bb8b26ff68..a1465c24bd 100644 --- a/tools/binman/etype/intel_mrc.py +++ b/tools/binman/etype/intel_mrc.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_refcode.py b/tools/binman/etype/intel_refcode.py index 9112730a9a..c2ff9917e7 100644 --- a/tools/binman/etype/intel_refcode.py +++ b/tools/binman/etype/intel_refcode.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/intel_vbt.py b/tools/binman/etype/intel_vbt.py index 8afd576600..736f0638f6 100644 --- a/tools/binman/etype/intel_vbt.py +++ b/tools/binman/etype/intel_vbt.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2017, Bin Meng <bmeng.cn(a)gmail.com> # # Entry-type module for Intel Video BIOS Table binary blob diff --git a/tools/binman/etype/intel_vga.py b/tools/binman/etype/intel_vga.py index 51e6465f0d..bac0094067 100644 --- a/tools/binman/etype/intel_vga.py +++ b/tools/binman/etype/intel_vga.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index 6ae5d0c8a4..bb8a567db1 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/null.py b/tools/binman/etype/null.py index 263fb5244d..8368c3855b 100644 --- a/tools/binman/etype/null.py +++ b/tools/binman/etype/null.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2023 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/opensbi.py b/tools/binman/etype/opensbi.py index 74d473d535..c561a366d9 100644 --- a/tools/binman/etype/opensbi.py +++ b/tools/binman/etype/opensbi.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2021, Bin Meng <bmeng.cn(a)gmail.com> # diff --git a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py b/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py index 3a92fa399f..e71f3092ec 100644 --- a/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py +++ b/tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2018 NXP # # Entry-type module for the PowerPC mpc85xx bootpg and resetvec code for U-Boot diff --git a/tools/binman/etype/pre_load.py b/tools/binman/etype/pre_load.py index 2e4c72359f..041ddc178e 100644 --- a/tools/binman/etype/pre_load.py +++ b/tools/binman/etype/pre_load.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2022 Softathome # Written by Philippe Reynes <philippe.reynes(a)softathome.com> # diff --git a/tools/binman/etype/rockchip_tpl.py b/tools/binman/etype/rockchip_tpl.py index 74f58ba857..a9cd3d1358 100644 --- a/tools/binman/etype/rockchip_tpl.py +++ b/tools/binman/etype/rockchip_tpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Entry-type module for Rockchip TPL binary # diff --git a/tools/binman/etype/scp.py b/tools/binman/etype/scp.py index a9bee3ce8b..bc63c0df7f 100644 --- a/tools/binman/etype/scp.py +++ b/tools/binman/etype/scp.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2020 Samuel Holland <samuel(a)sholland.org> # # Entry-type module for System Control Processor (SCP) firmware blob diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 30c1041c7e..af49911e67 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/etype/tee_os.py b/tools/binman/etype/tee_os.py index 5529727e83..c11d10ca16 100644 --- a/tools/binman/etype/tee_os.py +++ b/tools/binman/etype/tee_os.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ # # Entry-type module for OP-TEE Trusted OS firmware blob diff --git a/tools/binman/etype/text.py b/tools/binman/etype/text.py index e4deb4abac..b074684c6f 100644 --- a/tools/binman/etype/text.py +++ b/tools/binman/etype/text.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/ti_board_config.py b/tools/binman/etype/ti_board_config.py index 94f894c281..ed1e1cc9fc 100644 --- a/tools/binman/etype/ti_board_config.py +++ b/tools/binman/etype/ti_board_config.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # Written by Neha Malcom Francis <n-francis(a)ti.com> # diff --git a/tools/binman/etype/ti_secure.py b/tools/binman/etype/ti_secure.py index d939dce571..c58d51b404 100644 --- a/tools/binman/etype/ti_secure.py +++ b/tools/binman/etype/ti_secure.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # Written by Neha Malcom Francis <n-francis(a)ti.com> # diff --git a/tools/binman/etype/ti_secure_rom.py b/tools/binman/etype/ti_secure_rom.py index 9a7ac9e9e0..81e479e22a 100644 --- a/tools/binman/etype/ti_secure_rom.py +++ b/tools/binman/etype/ti_secure_rom.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/ # Written by Neha Malcom Francis <n-francis(a)ti.com> # diff --git a/tools/binman/etype/u_boot.py b/tools/binman/etype/u_boot.py index d5639eef2e..b01ed315c7 100644 --- a/tools/binman/etype/u_boot.py +++ b/tools/binman/etype/u_boot.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_dtb.py b/tools/binman/etype/u_boot_dtb.py index 65e71291d2..97647ba040 100644 --- a/tools/binman/etype/u_boot_dtb.py +++ b/tools/binman/etype/u_boot_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binman/etype/u_boot_dtb_with_ucode.py index f7225cecc1..365e981efe 100644 --- a/tools/binman/etype/u_boot_dtb_with_ucode.py +++ b/tools/binman/etype/u_boot_dtb_with_ucode.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_elf.py b/tools/binman/etype/u_boot_elf.py index f4d86aa176..9c160c62a5 100644 --- a/tools/binman/etype/u_boot_elf.py +++ b/tools/binman/etype/u_boot_elf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_env.py b/tools/binman/etype/u_boot_env.py index c027e93d42..652d5ff161 100644 --- a/tools/binman/etype/u_boot_env.py +++ b/tools/binman/etype/u_boot_env.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_expanded.py b/tools/binman/etype/u_boot_expanded.py index 8797824c9f..2873c1f861 100644 --- a/tools/binman/etype/u_boot_expanded.py +++ b/tools/binman/etype/u_boot_expanded.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_img.py b/tools/binman/etype/u_boot_img.py index 8a739d8edb..9591cd29b9 100644 --- a/tools/binman/etype/u_boot_img.py +++ b/tools/binman/etype/u_boot_img.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_nodtb.py b/tools/binman/etype/u_boot_nodtb.py index 347ba7dc69..0863bc7afd 100644 --- a/tools/binman/etype/u_boot_nodtb.py +++ b/tools/binman/etype/u_boot_nodtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl.py b/tools/binman/etype/u_boot_spl.py index 7f710c857d..2c2d2863f6 100644 --- a/tools/binman/etype/u_boot_spl.py +++ b/tools/binman/etype/u_boot_spl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_bss_pad.py b/tools/binman/etype/u_boot_spl_bss_pad.py index 4af4045d37..5c8c0d13a6 100644 --- a/tools/binman/etype/u_boot_spl_bss_pad.py +++ b/tools/binman/etype/u_boot_spl_bss_pad.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_dtb.py b/tools/binman/etype/u_boot_spl_dtb.py index eefc4a44aa..4614a9a717 100644 --- a/tools/binman/etype/u_boot_spl_dtb.py +++ b/tools/binman/etype/u_boot_spl_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_elf.py b/tools/binman/etype/u_boot_spl_elf.py index 7b7b4e0149..f76934da70 100644 --- a/tools/binman/etype/u_boot_spl_elf.py +++ b/tools/binman/etype/u_boot_spl_elf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_expanded.py b/tools/binman/etype/u_boot_spl_expanded.py index fcd0dd19ac..7ceae0a21b 100644 --- a/tools/binman/etype/u_boot_spl_expanded.py +++ b/tools/binman/etype/u_boot_spl_expanded.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_nodtb.py b/tools/binman/etype/u_boot_spl_nodtb.py index e7ec329c90..032350254c 100644 --- a/tools/binman/etype/u_boot_spl_nodtb.py +++ b/tools/binman/etype/u_boot_spl_nodtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_spl_pubkey_dtb.py b/tools/binman/etype/u_boot_spl_pubkey_dtb.py index cb196061de..1acedb906e 100644 --- a/tools/binman/etype/u_boot_spl_pubkey_dtb.py +++ b/tools/binman/etype/u_boot_spl_pubkey_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2023 Weidmueller GmbH # Written by Lukas Funke <lukas.funke(a)weidmueller.com> # diff --git a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py b/tools/binman/etype/u_boot_spl_with_ucode_ptr.py index 18b99b00f4..b4575204d5 100644 --- a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py +++ b/tools/binman/etype/u_boot_spl_with_ucode_ptr.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl.py b/tools/binman/etype/u_boot_tpl.py index 397b9f8953..dccfb7c8c4 100644 --- a/tools/binman/etype/u_boot_tpl.py +++ b/tools/binman/etype/u_boot_tpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_bss_pad.py b/tools/binman/etype/u_boot_tpl_bss_pad.py index 46d2cd58f7..d48311a502 100644 --- a/tools/binman/etype/u_boot_tpl_bss_pad.py +++ b/tools/binman/etype/u_boot_tpl_bss_pad.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_dtb.py b/tools/binman/etype/u_boot_tpl_dtb.py index 2ff1d7ced1..cb64ca97cb 100644 --- a/tools/binman/etype/u_boot_tpl_dtb.py +++ b/tools/binman/etype/u_boot_tpl_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py b/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py index 066f18dfef..5501ae4d6a 100644 --- a/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py +++ b/tools/binman/etype/u_boot_tpl_dtb_with_ucode.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_elf.py b/tools/binman/etype/u_boot_tpl_elf.py index fd100019b3..ad1d378198 100644 --- a/tools/binman/etype/u_boot_tpl_elf.py +++ b/tools/binman/etype/u_boot_tpl_elf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_expanded.py b/tools/binman/etype/u_boot_tpl_expanded.py index 58db4f3755..35ea11a4fd 100644 --- a/tools/binman/etype/u_boot_tpl_expanded.py +++ b/tools/binman/etype/u_boot_tpl_expanded.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_nodtb.py b/tools/binman/etype/u_boot_tpl_nodtb.py index 9bb2b5dda3..955e3076d0 100644 --- a/tools/binman/etype/u_boot_tpl_nodtb.py +++ b/tools/binman/etype/u_boot_tpl_nodtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py b/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py index f8cc22011c..7575de105d 100644 --- a/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py +++ b/tools/binman/etype/u_boot_tpl_with_ucode_ptr.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_ucode.py b/tools/binman/etype/u_boot_ucode.py index 97ed7d7eb1..78e59b8af9 100644 --- a/tools/binman/etype/u_boot_ucode.py +++ b/tools/binman/etype/u_boot_ucode.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl.py b/tools/binman/etype/u_boot_vpl.py index 31d7e8374e..875f9db376 100644 --- a/tools/binman/etype/u_boot_vpl.py +++ b/tools/binman/etype/u_boot_vpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl_bss_pad.py b/tools/binman/etype/u_boot_vpl_bss_pad.py index 12b286a719..12bad4bef4 100644 --- a/tools/binman/etype/u_boot_vpl_bss_pad.py +++ b/tools/binman/etype/u_boot_vpl_bss_pad.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl_dtb.py b/tools/binman/etype/u_boot_vpl_dtb.py index f6253bf243..24606b1f6c 100644 --- a/tools/binman/etype/u_boot_vpl_dtb.py +++ b/tools/binman/etype/u_boot_vpl_dtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl_elf.py b/tools/binman/etype/u_boot_vpl_elf.py index 2c68679019..e89af18b01 100644 --- a/tools/binman/etype/u_boot_vpl_elf.py +++ b/tools/binman/etype/u_boot_vpl_elf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl_expanded.py b/tools/binman/etype/u_boot_vpl_expanded.py index deff5a3f8c..c24c7a1759 100644 --- a/tools/binman/etype/u_boot_vpl_expanded.py +++ b/tools/binman/etype/u_boot_vpl_expanded.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_vpl_nodtb.py b/tools/binman/etype/u_boot_vpl_nodtb.py index 64c2767488..771cd92701 100644 --- a/tools/binman/etype/u_boot_vpl_nodtb.py +++ b/tools/binman/etype/u_boot_vpl_nodtb.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binman/etype/u_boot_with_ucode_ptr.py index aab27ac8ee..0ef8f8e1fe 100644 --- a/tools/binman/etype/u_boot_with_ucode_ptr.py +++ b/tools/binman/etype/u_boot_with_ucode_ptr.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py index 4adb9a4e9b..ff560395da 100644 --- a/tools/binman/etype/vblock.py +++ b/tools/binman/etype/vblock.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x509_cert.py b/tools/binman/etype/x509_cert.py index d028cfe38c..bbe77866ec 100644 --- a/tools/binman/etype/x509_cert.py +++ b/tools/binman/etype/x509_cert.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2023 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_reset16.py b/tools/binman/etype/x86_reset16.py index 5d49f16e21..6d67de1dcb 100644 --- a/tools/binman/etype/x86_reset16.py +++ b/tools/binman/etype/x86_reset16.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_reset16_spl.py b/tools/binman/etype/x86_reset16_spl.py index 775b90699b..06bddc6f8d 100644 --- a/tools/binman/etype/x86_reset16_spl.py +++ b/tools/binman/etype/x86_reset16_spl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_reset16_tpl.py b/tools/binman/etype/x86_reset16_tpl.py index 52d3f4869a..492499ed7d 100644 --- a/tools/binman/etype/x86_reset16_tpl.py +++ b/tools/binman/etype/x86_reset16_tpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_start16.py b/tools/binman/etype/x86_start16.py index 18fdd95d37..9f9fde8203 100644 --- a/tools/binman/etype/x86_start16.py +++ b/tools/binman/etype/x86_start16.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_start16_spl.py b/tools/binman/etype/x86_start16_spl.py index ac8e90f2e0..df7158cc82 100644 --- a/tools/binman/etype/x86_start16_spl.py +++ b/tools/binman/etype/x86_start16_spl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/x86_start16_tpl.py b/tools/binman/etype/x86_start16_tpl.py index 72d4608bb7..380cef6432 100644 --- a/tools/binman/etype/x86_start16_tpl.py +++ b/tools/binman/etype/x86_start16_tpl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/etype/xilinx_bootgen.py b/tools/binman/etype/xilinx_bootgen.py index 70a4b2e242..ede41c428b 100644 --- a/tools/binman/etype/xilinx_bootgen.py +++ b/tools/binman/etype/xilinx_bootgen.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2023 Weidmueller GmbH # Written by Lukas Funke <lukas.funke(a)weidmueller.com> # diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py index 7ef8729546..3536d834d7 100644 --- a/tools/binman/fdt_test.py +++ b/tools/binman/fdt_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/fip_util.py b/tools/binman/fip_util.py index b5caab2d37..d7b9980759 100755 --- a/tools/binman/fip_util.py +++ b/tools/binman/fip_util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/fip_util_test.py b/tools/binman/fip_util_test.py index 56aa56f464..d51bd3c373 100755 --- a/tools/binman/fip_util_test.py +++ b/tools/binman/fip_util_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2021 Google LLC # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py index 40f2dbfe0f..8d8a128687 100644 --- a/tools/binman/fmap_util.py +++ b/tools/binman/fmap_util.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 16156b7410..5ad58b7156 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/image.py b/tools/binman/image.py index e77b5d0d97..b299ae9c74 100644 --- a/tools/binman/image.py +++ b/tools/binman/image.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/image_test.py b/tools/binman/image_test.py index bd51c1e55d..039543da81 100644 --- a/tools/binman/image_test.py +++ b/tools/binman/image_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2017 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/index.rst b/tools/binman/index.rst index 6eef7b5d05..88aa67e5ba 100644 --- a/tools/binman/index.rst +++ b/tools/binman/index.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Binman ====== diff --git a/tools/binman/main.py b/tools/binman/main.py index 92d2431aea..5bffbedf2e 100755 --- a/tools/binman/main.py +++ b/tools/binman/main.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/binman/setup.py b/tools/binman/setup.py index 9a9206eb04..9194b9f48a 100644 --- a/tools/binman/setup.py +++ b/tools/binman/setup.py @@ -1,9 +1,9 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later from distutils.core import setup setup(name='binman', version='1.0', - license='GPL-2.0+', + license='GPL-2.0-or-later', scripts=['binman'], packages=['binman', 'binman.etype', 'binman.btool'], package_dir={'binman': ''}, diff --git a/tools/binman/state.py b/tools/binman/state.py index 45bae40c52..64ea07550d 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2018 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/binman/test/054_unit_address.dts b/tools/binman/test/054_unit_address.dts index 3216dbbcc1..e2d99e6fc1 100644 --- a/tools/binman/test/054_unit_address.dts +++ b/tools/binman/test/054_unit_address.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/055_sections.dts b/tools/binman/test/055_sections.dts index 6b306aeda4..7b5277676a 100644 --- a/tools/binman/test/055_sections.dts +++ b/tools/binman/test/055_sections.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/056_name_prefix.dts b/tools/binman/test/056_name_prefix.dts index f38c80eb18..137cf7ef25 100644 --- a/tools/binman/test/056_name_prefix.dts +++ b/tools/binman/test/056_name_prefix.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/057_unknown_contents.dts b/tools/binman/test/057_unknown_contents.dts index 6ea98d7cab..c34a29391f 100644 --- a/tools/binman/test/057_unknown_contents.dts +++ b/tools/binman/test/057_unknown_contents.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/058_x86_ucode_spl_needs_retry.dts b/tools/binman/test/058_x86_ucode_spl_needs_retry.dts index a04adaaf7b..5bacb90ae9 100644 --- a/tools/binman/test/058_x86_ucode_spl_needs_retry.dts +++ b/tools/binman/test/058_x86_ucode_spl_needs_retry.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/059_change_size.dts b/tools/binman/test/059_change_size.dts index 1a69026a64..e138f56e5d 100644 --- a/tools/binman/test/059_change_size.dts +++ b/tools/binman/test/059_change_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/060_fdt_update.dts b/tools/binman/test/060_fdt_update.dts index f53c8a5053..80546bf6d4 100644 --- a/tools/binman/test/060_fdt_update.dts +++ b/tools/binman/test/060_fdt_update.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/061_fdt_update_bad.dts b/tools/binman/test/061_fdt_update_bad.dts index e5abf31699..8e4b574cc7 100644 --- a/tools/binman/test/061_fdt_update_bad.dts +++ b/tools/binman/test/061_fdt_update_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/062_entry_args.dts b/tools/binman/test/062_entry_args.dts index 4d4f102d60..6fa1ddc521 100644 --- a/tools/binman/test/062_entry_args.dts +++ b/tools/binman/test/062_entry_args.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/063_entry_args_missing.dts b/tools/binman/test/063_entry_args_missing.dts index 1644e2fef3..75ab5eafaa 100644 --- a/tools/binman/test/063_entry_args_missing.dts +++ b/tools/binman/test/063_entry_args_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/064_entry_args_required.dts b/tools/binman/test/064_entry_args_required.dts index 705be10069..22b1b215bc 100644 --- a/tools/binman/test/064_entry_args_required.dts +++ b/tools/binman/test/064_entry_args_required.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/065_entry_args_unknown_datatype.dts b/tools/binman/test/065_entry_args_unknown_datatype.dts index 3e4838f4ff..6b1e7a6b9f 100644 --- a/tools/binman/test/065_entry_args_unknown_datatype.dts +++ b/tools/binman/test/065_entry_args_unknown_datatype.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/066_text.dts b/tools/binman/test/066_text.dts index f23a75ae92..1a3469db40 100644 --- a/tools/binman/test/066_text.dts +++ b/tools/binman/test/066_text.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/067_fmap.dts b/tools/binman/test/067_fmap.dts index 24fa6351ec..2618ba0b4f 100644 --- a/tools/binman/test/067_fmap.dts +++ b/tools/binman/test/067_fmap.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/068_blob_named_by_arg.dts b/tools/binman/test/068_blob_named_by_arg.dts index e129f843cd..4ad4d66585 100644 --- a/tools/binman/test/068_blob_named_by_arg.dts +++ b/tools/binman/test/068_blob_named_by_arg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/069_fill.dts b/tools/binman/test/069_fill.dts index e372ea37aa..7f08949662 100644 --- a/tools/binman/test/069_fill.dts +++ b/tools/binman/test/069_fill.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/070_fill_no_size.dts b/tools/binman/test/070_fill_no_size.dts index 7b1fcf1b68..37499b261f 100644 --- a/tools/binman/test/070_fill_no_size.dts +++ b/tools/binman/test/070_fill_no_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/071_gbb.dts b/tools/binman/test/071_gbb.dts index 551756372a..a62a3c266b 100644 --- a/tools/binman/test/071_gbb.dts +++ b/tools/binman/test/071_gbb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/072_gbb_too_small.dts b/tools/binman/test/072_gbb_too_small.dts index c088f36a1d..eb8a1aa6dd 100644 --- a/tools/binman/test/072_gbb_too_small.dts +++ b/tools/binman/test/072_gbb_too_small.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/073_gbb_no_size.dts b/tools/binman/test/073_gbb_no_size.dts index 83be403785..bbb9e2e734 100644 --- a/tools/binman/test/073_gbb_no_size.dts +++ b/tools/binman/test/073_gbb_no_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/074_vblock.dts b/tools/binman/test/074_vblock.dts index f0c21bfe9f..2998beadc2 100644 --- a/tools/binman/test/074_vblock.dts +++ b/tools/binman/test/074_vblock.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/075_vblock_no_content.dts b/tools/binman/test/075_vblock_no_content.dts index 676d9474b3..fa5b006908 100644 --- a/tools/binman/test/075_vblock_no_content.dts +++ b/tools/binman/test/075_vblock_no_content.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/076_vblock_bad_phandle.dts b/tools/binman/test/076_vblock_bad_phandle.dts index ffbd0c335c..bb0b5b34fc 100644 --- a/tools/binman/test/076_vblock_bad_phandle.dts +++ b/tools/binman/test/076_vblock_bad_phandle.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/077_vblock_bad_entry.dts b/tools/binman/test/077_vblock_bad_entry.dts index 764c42a56e..d0da7a3d88 100644 --- a/tools/binman/test/077_vblock_bad_entry.dts +++ b/tools/binman/test/077_vblock_bad_entry.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/078_u_boot_tpl.dts b/tools/binman/test/078_u_boot_tpl.dts index 6c60b4c46f..b95677e363 100644 --- a/tools/binman/test/078_u_boot_tpl.dts +++ b/tools/binman/test/078_u_boot_tpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/079_uses_pos.dts b/tools/binman/test/079_uses_pos.dts index 7638b9b5e0..778fd37b23 100644 --- a/tools/binman/test/079_uses_pos.dts +++ b/tools/binman/test/079_uses_pos.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/080_fill_empty.dts b/tools/binman/test/080_fill_empty.dts index 2b78d3ae88..6a79f5d5d6 100644 --- a/tools/binman/test/080_fill_empty.dts +++ b/tools/binman/test/080_fill_empty.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/081_x86_start16_tpl.dts b/tools/binman/test/081_x86_start16_tpl.dts index 68e6bbd68f..ddcc36ae68 100644 --- a/tools/binman/test/081_x86_start16_tpl.dts +++ b/tools/binman/test/081_x86_start16_tpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/082_fdt_update_all.dts b/tools/binman/test/082_fdt_update_all.dts index 1aea56989f..32d57bcf38 100644 --- a/tools/binman/test/082_fdt_update_all.dts +++ b/tools/binman/test/082_fdt_update_all.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/083_compress.dts b/tools/binman/test/083_compress.dts index 07813bdeaa..d7234ec64b 100644 --- a/tools/binman/test/083_compress.dts +++ b/tools/binman/test/083_compress.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/084_files.dts b/tools/binman/test/084_files.dts index 8f09afd24e..d8c1c840ae 100644 --- a/tools/binman/test/084_files.dts +++ b/tools/binman/test/084_files.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/085_files_compress.dts b/tools/binman/test/085_files_compress.dts index 5aeead2e6e..2f49d0c6c1 100644 --- a/tools/binman/test/085_files_compress.dts +++ b/tools/binman/test/085_files_compress.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/086_files_none.dts b/tools/binman/test/086_files_none.dts index 34bd92f224..92617bf342 100644 --- a/tools/binman/test/086_files_none.dts +++ b/tools/binman/test/086_files_none.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/087_files_no_pattern.dts b/tools/binman/test/087_files_no_pattern.dts index 0cb5b469cb..80163a9d06 100644 --- a/tools/binman/test/087_files_no_pattern.dts +++ b/tools/binman/test/087_files_no_pattern.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/088_extend_size.dts b/tools/binman/test/088_extend_size.dts index f352699e37..0203893b9d 100644 --- a/tools/binman/test/088_extend_size.dts +++ b/tools/binman/test/088_extend_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/089_extend_size_bad.dts b/tools/binman/test/089_extend_size_bad.dts index edc60e43fd..331abd196b 100644 --- a/tools/binman/test/089_extend_size_bad.dts +++ b/tools/binman/test/089_extend_size_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/090_hash.dts b/tools/binman/test/090_hash.dts index 200304599d..e1798aff4e 100644 --- a/tools/binman/test/090_hash.dts +++ b/tools/binman/test/090_hash.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/091_hash_no_algo.dts b/tools/binman/test/091_hash_no_algo.dts index b64df20511..c530f7667e 100644 --- a/tools/binman/test/091_hash_no_algo.dts +++ b/tools/binman/test/091_hash_no_algo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/092_hash_bad_algo.dts b/tools/binman/test/092_hash_bad_algo.dts index d2402000db..05700656a9 100644 --- a/tools/binman/test/092_hash_bad_algo.dts +++ b/tools/binman/test/092_hash_bad_algo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/094_fmap_x86.dts b/tools/binman/test/094_fmap_x86.dts index 613c5dab42..43a22c0fe2 100644 --- a/tools/binman/test/094_fmap_x86.dts +++ b/tools/binman/test/094_fmap_x86.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/095_fmap_x86_section.dts b/tools/binman/test/095_fmap_x86_section.dts index fd5f018c92..a498f1d184 100644 --- a/tools/binman/test/095_fmap_x86_section.dts +++ b/tools/binman/test/095_fmap_x86_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/096_elf.dts b/tools/binman/test/096_elf.dts index 8e3f3f15ef..972c8458d9 100644 --- a/tools/binman/test/096_elf.dts +++ b/tools/binman/test/096_elf.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/097_elf_strip.dts b/tools/binman/test/097_elf_strip.dts index 6f3c66fd70..3c826c0037 100644 --- a/tools/binman/test/097_elf_strip.dts +++ b/tools/binman/test/097_elf_strip.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/098_4gb_and_skip_at_start_together.dts b/tools/binman/test/098_4gb_and_skip_at_start_together.dts index 90c467d910..b5bff69855 100644 --- a/tools/binman/test/098_4gb_and_skip_at_start_together.dts +++ b/tools/binman/test/098_4gb_and_skip_at_start_together.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/tools/binman/test/099_hash_section.dts b/tools/binman/test/099_hash_section.dts index dcd8683d64..d331976385 100644 --- a/tools/binman/test/099_hash_section.dts +++ b/tools/binman/test/099_hash_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/101_sections_offset.dts b/tools/binman/test/101_sections_offset.dts index 46708ff9b6..c12f367f57 100644 --- a/tools/binman/test/101_sections_offset.dts +++ b/tools/binman/test/101_sections_offset.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/102_cbfs_raw.dts b/tools/binman/test/102_cbfs_raw.dts index 779cbc121a..2c1fbccdc2 100644 --- a/tools/binman/test/102_cbfs_raw.dts +++ b/tools/binman/test/102_cbfs_raw.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/103_cbfs_raw_ppc.dts b/tools/binman/test/103_cbfs_raw_ppc.dts index df1caf092f..a9827c0e44 100644 --- a/tools/binman/test/103_cbfs_raw_ppc.dts +++ b/tools/binman/test/103_cbfs_raw_ppc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/104_cbfs_stage.dts b/tools/binman/test/104_cbfs_stage.dts index 215e2f287a..05f5630a25 100644 --- a/tools/binman/test/104_cbfs_stage.dts +++ b/tools/binman/test/104_cbfs_stage.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/105_cbfs_raw_compress.dts b/tools/binman/test/105_cbfs_raw_compress.dts index 646168d84b..de601bcc3b 100644 --- a/tools/binman/test/105_cbfs_raw_compress.dts +++ b/tools/binman/test/105_cbfs_raw_compress.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/106_cbfs_bad_arch.dts b/tools/binman/test/106_cbfs_bad_arch.dts index 4318d45a7d..7a811d155a 100644 --- a/tools/binman/test/106_cbfs_bad_arch.dts +++ b/tools/binman/test/106_cbfs_bad_arch.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/107_cbfs_no_size.dts b/tools/binman/test/107_cbfs_no_size.dts index 3592f62f7e..09f653d833 100644 --- a/tools/binman/test/107_cbfs_no_size.dts +++ b/tools/binman/test/107_cbfs_no_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/108_cbfs_no_contents.dts b/tools/binman/test/108_cbfs_no_contents.dts index 623346760d..7789a03b28 100644 --- a/tools/binman/test/108_cbfs_no_contents.dts +++ b/tools/binman/test/108_cbfs_no_contents.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/109_cbfs_bad_compress.dts b/tools/binman/test/109_cbfs_bad_compress.dts index 9695024ee9..ab39a100f0 100644 --- a/tools/binman/test/109_cbfs_bad_compress.dts +++ b/tools/binman/test/109_cbfs_bad_compress.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/110_cbfs_name.dts b/tools/binman/test/110_cbfs_name.dts index 98c16f30b4..465cfead72 100644 --- a/tools/binman/test/110_cbfs_name.dts +++ b/tools/binman/test/110_cbfs_name.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/111_x86_rom_ifwi.dts b/tools/binman/test/111_x86_rom_ifwi.dts index c0ba4f2ea4..63834b47a5 100644 --- a/tools/binman/test/111_x86_rom_ifwi.dts +++ b/tools/binman/test/111_x86_rom_ifwi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/112_x86_rom_ifwi_nodesc.dts b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts index 0874440ab5..05d186e2cc 100644 --- a/tools/binman/test/112_x86_rom_ifwi_nodesc.dts +++ b/tools/binman/test/112_x86_rom_ifwi_nodesc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/113_x86_rom_ifwi_nodata.dts b/tools/binman/test/113_x86_rom_ifwi_nodata.dts index 82a4bc8cdd..d3467c82c5 100644 --- a/tools/binman/test/113_x86_rom_ifwi_nodata.dts +++ b/tools/binman/test/113_x86_rom_ifwi_nodata.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/114_cbfs_offset.dts b/tools/binman/test/114_cbfs_offset.dts index 7aa9d9d4bf..b4045642fc 100644 --- a/tools/binman/test/114_cbfs_offset.dts +++ b/tools/binman/test/114_cbfs_offset.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/125_cbfs_update.dts b/tools/binman/test/125_cbfs_update.dts index 6d2e8a0b8f..f4e87b9ec0 100644 --- a/tools/binman/test/125_cbfs_update.dts +++ b/tools/binman/test/125_cbfs_update.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/126_cbfs_bad_type.dts b/tools/binman/test/126_cbfs_bad_type.dts index 2cd6fc6d52..055f319a83 100644 --- a/tools/binman/test/126_cbfs_bad_type.dts +++ b/tools/binman/test/126_cbfs_bad_type.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/127_list.dts b/tools/binman/test/127_list.dts index c1d6fce3f9..e76b630e7f 100644 --- a/tools/binman/test/127_list.dts +++ b/tools/binman/test/127_list.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/128_decode_image.dts b/tools/binman/test/128_decode_image.dts index 449fccc41d..df2ca3eda7 100644 --- a/tools/binman/test/128_decode_image.dts +++ b/tools/binman/test/128_decode_image.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/129_decode_image_nohdr.dts b/tools/binman/test/129_decode_image_nohdr.dts index 90fdd8820c..bd54d213d6 100644 --- a/tools/binman/test/129_decode_image_nohdr.dts +++ b/tools/binman/test/129_decode_image_nohdr.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/130_list_fdtmap.dts b/tools/binman/test/130_list_fdtmap.dts index 449fccc41d..df2ca3eda7 100644 --- a/tools/binman/test/130_list_fdtmap.dts +++ b/tools/binman/test/130_list_fdtmap.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/132_replace.dts b/tools/binman/test/132_replace.dts index 6ebdcda45c..1f7d609d5e 100644 --- a/tools/binman/test/132_replace.dts +++ b/tools/binman/test/132_replace.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/133_replace_multi.dts b/tools/binman/test/133_replace_multi.dts index 38b2f39d02..d37a7a4aa6 100644 --- a/tools/binman/test/133_replace_multi.dts +++ b/tools/binman/test/133_replace_multi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/134_fdt_update_all_repack.dts b/tools/binman/test/134_fdt_update_all_repack.dts index 625d37673b..4524c58d38 100644 --- a/tools/binman/test/134_fdt_update_all_repack.dts +++ b/tools/binman/test/134_fdt_update_all_repack.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/139_replace_repack.dts b/tools/binman/test/139_replace_repack.dts index a3daf6f9b4..488aef81bb 100644 --- a/tools/binman/test/139_replace_repack.dts +++ b/tools/binman/test/139_replace_repack.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/141_descriptor_offset.dts b/tools/binman/test/141_descriptor_offset.dts index f9bff016aa..6693098b10 100644 --- a/tools/binman/test/141_descriptor_offset.dts +++ b/tools/binman/test/141_descriptor_offset.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/142_replace_cbfs.dts b/tools/binman/test/142_replace_cbfs.dts index d64142f9d5..48c2178468 100644 --- a/tools/binman/test/142_replace_cbfs.dts +++ b/tools/binman/test/142_replace_cbfs.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/143_replace_all.dts b/tools/binman/test/143_replace_all.dts index c5744a3c1c..9538372b62 100644 --- a/tools/binman/test/143_replace_all.dts +++ b/tools/binman/test/143_replace_all.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts index 8f4b16c399..08e188de53 100644 --- a/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts +++ b/tools/binman/test/150_powerpc_mpc85xx_bootpg_resetvec.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/tools/binman/test/151_x86_rom_ifwi_section.dts b/tools/binman/test/151_x86_rom_ifwi_section.dts index 7e455c3a4b..9c772b5e9b 100644 --- a/tools/binman/test/151_x86_rom_ifwi_section.dts +++ b/tools/binman/test/151_x86_rom_ifwi_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/155_symbols_tpl_x86.dts b/tools/binman/test/155_symbols_tpl_x86.dts index e1ce33e67f..e81daac22d 100644 --- a/tools/binman/test/155_symbols_tpl_x86.dts +++ b/tools/binman/test/155_symbols_tpl_x86.dts @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /dts-v1/; / { diff --git a/tools/binman/test/156_mkimage.dts b/tools/binman/test/156_mkimage.dts index 933b13143a..a040fa93e3 100644 --- a/tools/binman/test/156_mkimage.dts +++ b/tools/binman/test/156_mkimage.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/157_blob_ext.dts b/tools/binman/test/157_blob_ext.dts index 8afdd5339e..30b28bc4b1 100644 --- a/tools/binman/test/157_blob_ext.dts +++ b/tools/binman/test/157_blob_ext.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/158_blob_ext_missing.dts b/tools/binman/test/158_blob_ext_missing.dts index d315e5592e..4a471fcbb5 100644 --- a/tools/binman/test/158_blob_ext_missing.dts +++ b/tools/binman/test/158_blob_ext_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/159_blob_ext_missing_sect.dts b/tools/binman/test/159_blob_ext_missing_sect.dts index 5f14c54138..48c58b2ddc 100644 --- a/tools/binman/test/159_blob_ext_missing_sect.dts +++ b/tools/binman/test/159_blob_ext_missing_sect.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/160_pack_overlap_zero.dts b/tools/binman/test/160_pack_overlap_zero.dts index 731aa1cbe6..9648d4aac6 100644 --- a/tools/binman/test/160_pack_overlap_zero.dts +++ b/tools/binman/test/160_pack_overlap_zero.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/161_fit.dts b/tools/binman/test/161_fit.dts index c52d760b73..8212ec2a7c 100644 --- a/tools/binman/test/161_fit.dts +++ b/tools/binman/test/161_fit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/162_fit_external.dts b/tools/binman/test/162_fit_external.dts index 6f2a629a98..f1648f36ef 100644 --- a/tools/binman/test/162_fit_external.dts +++ b/tools/binman/test/162_fit_external.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/163_x86_rom_me_empty.dts b/tools/binman/test/163_x86_rom_me_empty.dts index 9349d2d724..3b78862fe1 100644 --- a/tools/binman/test/163_x86_rom_me_empty.dts +++ b/tools/binman/test/163_x86_rom_me_empty.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/164_x86_rom_me_missing.dts b/tools/binman/test/164_x86_rom_me_missing.dts index dce3be5e05..00e1c5e27b 100644 --- a/tools/binman/test/164_x86_rom_me_missing.dts +++ b/tools/binman/test/164_x86_rom_me_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/165_section_ignore_hash_signature.dts b/tools/binman/test/165_section_ignore_hash_signature.dts index 8adbe25512..c2448ddc52 100644 --- a/tools/binman/test/165_section_ignore_hash_signature.dts +++ b/tools/binman/test/165_section_ignore_hash_signature.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/166_pad_in_sections.dts b/tools/binman/test/166_pad_in_sections.dts index f2b327ff9f..7177a4d25a 100644 --- a/tools/binman/test/166_pad_in_sections.dts +++ b/tools/binman/test/166_pad_in_sections.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/167_fit_image_subentry_alignment.dts b/tools/binman/test/167_fit_image_subentry_alignment.dts index 360cac5266..3202daeb0e 100644 --- a/tools/binman/test/167_fit_image_subentry_alignment.dts +++ b/tools/binman/test/167_fit_image_subentry_alignment.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/168_fit_missing_blob.dts b/tools/binman/test/168_fit_missing_blob.dts index 15f6cc07e5..426aa8a6ed 100644 --- a/tools/binman/test/168_fit_missing_blob.dts +++ b/tools/binman/test/168_fit_missing_blob.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/169_atf_bl31.dts b/tools/binman/test/169_atf_bl31.dts index 2b7547d70f..3ba5bce470 100644 --- a/tools/binman/test/169_atf_bl31.dts +++ b/tools/binman/test/169_atf_bl31.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/170_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts index 0197ffd159..744410a1fb 100644 --- a/tools/binman/test/170_fit_fdt.dts +++ b/tools/binman/test/170_fit_fdt.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/171_fit_fdt_missing_prop.dts b/tools/binman/test/171_fit_fdt_missing_prop.dts index c36134715c..c0d2527c96 100644 --- a/tools/binman/test/171_fit_fdt_missing_prop.dts +++ b/tools/binman/test/171_fit_fdt_missing_prop.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/172_scp.dts b/tools/binman/test/172_scp.dts index 354e4ef17d..dfc8d037bb 100644 --- a/tools/binman/test/172_scp.dts +++ b/tools/binman/test/172_scp.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/173_missing_blob.dts b/tools/binman/test/173_missing_blob.dts index ffb655a1cb..313d0c1902 100644 --- a/tools/binman/test/173_missing_blob.dts +++ b/tools/binman/test/173_missing_blob.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/174_env.dts b/tools/binman/test/174_env.dts index d1393d2db9..5efc85d49a 100644 --- a/tools/binman/test/174_env.dts +++ b/tools/binman/test/174_env.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/175_env_no_size.dts b/tools/binman/test/175_env_no_size.dts index 267acd1549..cfbf8e3b6d 100644 --- a/tools/binman/test/175_env_no_size.dts +++ b/tools/binman/test/175_env_no_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/176_env_too_small.dts b/tools/binman/test/176_env_too_small.dts index 2db8d05463..5271655af9 100644 --- a/tools/binman/test/176_env_too_small.dts +++ b/tools/binman/test/176_env_too_small.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/177_skip_at_start.dts b/tools/binman/test/177_skip_at_start.dts index 021460b1a0..f1eb3d7503 100644 --- a/tools/binman/test/177_skip_at_start.dts +++ b/tools/binman/test/177_skip_at_start.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/tools/binman/test/178_skip_at_start_pad.dts b/tools/binman/test/178_skip_at_start_pad.dts index deda3c862e..a488d9b1bf 100644 --- a/tools/binman/test/178_skip_at_start_pad.dts +++ b/tools/binman/test/178_skip_at_start_pad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/tools/binman/test/179_skip_at_start_section_pad.dts b/tools/binman/test/179_skip_at_start_section_pad.dts index bf2f8f69b4..7b1d934791 100644 --- a/tools/binman/test/179_skip_at_start_section_pad.dts +++ b/tools/binman/test/179_skip_at_start_section_pad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP */ diff --git a/tools/binman/test/180_section_pad.dts b/tools/binman/test/180_section_pad.dts index 7e4ebf257b..14ca6820fe 100644 --- a/tools/binman/test/180_section_pad.dts +++ b/tools/binman/test/180_section_pad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/181_section_align.dts b/tools/binman/test/181_section_align.dts index 90795d131b..ff2d2cde92 100644 --- a/tools/binman/test/181_section_align.dts +++ b/tools/binman/test/181_section_align.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/182_compress_image.dts b/tools/binman/test/182_compress_image.dts index 4176b7f2e6..66eba1efdf 100644 --- a/tools/binman/test/182_compress_image.dts +++ b/tools/binman/test/182_compress_image.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/183_compress_image_less.dts b/tools/binman/test/183_compress_image_less.dts index 1d9d57b78c..d70b5b4bfd 100644 --- a/tools/binman/test/183_compress_image_less.dts +++ b/tools/binman/test/183_compress_image_less.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/184_compress_section_size.dts b/tools/binman/test/184_compress_section_size.dts index 95ed30add1..2f10d6a2f5 100644 --- a/tools/binman/test/184_compress_section_size.dts +++ b/tools/binman/test/184_compress_section_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/185_compress_section.dts b/tools/binman/test/185_compress_section.dts index dc3e340c5d..3c1b76c41a 100644 --- a/tools/binman/test/185_compress_section.dts +++ b/tools/binman/test/185_compress_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/186_compress_extra.dts b/tools/binman/test/186_compress_extra.dts index 59aae82263..96068581f2 100644 --- a/tools/binman/test/186_compress_extra.dts +++ b/tools/binman/test/186_compress_extra.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/188_image_entryarg.dts b/tools/binman/test/188_image_entryarg.dts index 29d8149162..072d0c14ba 100644 --- a/tools/binman/test/188_image_entryarg.dts +++ b/tools/binman/test/188_image_entryarg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/189_vblock_content.dts b/tools/binman/test/189_vblock_content.dts index dcc74449c1..55a8b083d6 100644 --- a/tools/binman/test/189_vblock_content.dts +++ b/tools/binman/test/189_vblock_content.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/190_files_align.dts b/tools/binman/test/190_files_align.dts index 213ba966d3..252039ffac 100644 --- a/tools/binman/test/190_files_align.dts +++ b/tools/binman/test/190_files_align.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/191_read_image_skip.dts b/tools/binman/test/191_read_image_skip.dts index 31df518fae..76bc0fac14 100644 --- a/tools/binman/test/191_read_image_skip.dts +++ b/tools/binman/test/191_read_image_skip.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/192_u_boot_tpl_nodtb.dts b/tools/binman/test/192_u_boot_tpl_nodtb.dts index 94cef395e8..1a0147d8e8 100644 --- a/tools/binman/test/192_u_boot_tpl_nodtb.dts +++ b/tools/binman/test/192_u_boot_tpl_nodtb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/193_tpl_bss_pad.dts b/tools/binman/test/193_tpl_bss_pad.dts index f5c2db0646..f0f834f666 100644 --- a/tools/binman/test/193_tpl_bss_pad.dts +++ b/tools/binman/test/193_tpl_bss_pad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/194_fdt_incl.dts b/tools/binman/test/194_fdt_incl.dts index b14c8ff8f5..63bd36d13d 100644 --- a/tools/binman/test/194_fdt_incl.dts +++ b/tools/binman/test/194_fdt_incl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/195_fdt_incl_tpl.dts b/tools/binman/test/195_fdt_incl_tpl.dts index 3756ac4fc4..9b7c807f50 100644 --- a/tools/binman/test/195_fdt_incl_tpl.dts +++ b/tools/binman/test/195_fdt_incl_tpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/196_symbols_nodtb.dts b/tools/binman/test/196_symbols_nodtb.dts index 5c900d6070..c789020cf2 100644 --- a/tools/binman/test/196_symbols_nodtb.dts +++ b/tools/binman/test/196_symbols_nodtb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/197_symbols_expand.dts b/tools/binman/test/197_symbols_expand.dts index 8aee76dc75..f1b8b91e00 100644 --- a/tools/binman/test/197_symbols_expand.dts +++ b/tools/binman/test/197_symbols_expand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/198_collection.dts b/tools/binman/test/198_collection.dts index 484a1b0050..b10e76be18 100644 --- a/tools/binman/test/198_collection.dts +++ b/tools/binman/test/198_collection.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/199_collection_section.dts b/tools/binman/test/199_collection_section.dts index 03a73194c3..906dd87a89 100644 --- a/tools/binman/test/199_collection_section.dts +++ b/tools/binman/test/199_collection_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/200_align_default.dts b/tools/binman/test/200_align_default.dts index 1b155770d4..05dd033ffc 100644 --- a/tools/binman/test/200_align_default.dts +++ b/tools/binman/test/200_align_default.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/201_opensbi.dts b/tools/binman/test/201_opensbi.dts index 942183f990..e4bbf6f95a 100644 --- a/tools/binman/test/201_opensbi.dts +++ b/tools/binman/test/201_opensbi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/202_section_timeout.dts b/tools/binman/test/202_section_timeout.dts index 1481450367..678bf32227 100644 --- a/tools/binman/test/202_section_timeout.dts +++ b/tools/binman/test/202_section_timeout.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/203_fip.dts b/tools/binman/test/203_fip.dts index 0897337324..4398b24713 100644 --- a/tools/binman/test/203_fip.dts +++ b/tools/binman/test/203_fip.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/204_fip_other.dts b/tools/binman/test/204_fip_other.dts index 6503941098..1f29763b05 100644 --- a/tools/binman/test/204_fip_other.dts +++ b/tools/binman/test/204_fip_other.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/205_fip_no_type.dts b/tools/binman/test/205_fip_no_type.dts index 23c8c3bc37..3b77da1df0 100644 --- a/tools/binman/test/205_fip_no_type.dts +++ b/tools/binman/test/205_fip_no_type.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/206_fip_uuid.dts b/tools/binman/test/206_fip_uuid.dts index c9bd44f9c3..4f5ec08513 100644 --- a/tools/binman/test/206_fip_uuid.dts +++ b/tools/binman/test/206_fip_uuid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/207_fip_ls.dts b/tools/binman/test/207_fip_ls.dts index 630fca1502..545a5cf640 100644 --- a/tools/binman/test/207_fip_ls.dts +++ b/tools/binman/test/207_fip_ls.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/208_fip_replace.dts b/tools/binman/test/208_fip_replace.dts index 432c12474d..d86916ec3f 100644 --- a/tools/binman/test/208_fip_replace.dts +++ b/tools/binman/test/208_fip_replace.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/209_fip_missing.dts b/tools/binman/test/209_fip_missing.dts index 43bb600d04..65142fa6a5 100644 --- a/tools/binman/test/209_fip_missing.dts +++ b/tools/binman/test/209_fip_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/210_fip_size.dts b/tools/binman/test/210_fip_size.dts index 9dfee79645..154bf0e0fc 100644 --- a/tools/binman/test/210_fip_size.dts +++ b/tools/binman/test/210_fip_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/211_fip_bad_align.dts b/tools/binman/test/211_fip_bad_align.dts index a0901496d8..8278115522 100644 --- a/tools/binman/test/211_fip_bad_align.dts +++ b/tools/binman/test/211_fip_bad_align.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/212_fip_collection.dts b/tools/binman/test/212_fip_collection.dts index 332c023af8..edc55572c8 100644 --- a/tools/binman/test/212_fip_collection.dts +++ b/tools/binman/test/212_fip_collection.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/213_fdtmap_alt_format.dts b/tools/binman/test/213_fdtmap_alt_format.dts index d9aef04bcf..b2a1aa765e 100644 --- a/tools/binman/test/213_fdtmap_alt_format.dts +++ b/tools/binman/test/213_fdtmap_alt_format.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/214_no_alt_format.dts b/tools/binman/test/214_no_alt_format.dts index f00bcdd576..fc2b14c6dd 100644 --- a/tools/binman/test/214_no_alt_format.dts +++ b/tools/binman/test/214_no_alt_format.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/215_blob_ext_list.dts b/tools/binman/test/215_blob_ext_list.dts index aad2f0300d..be16967aa7 100644 --- a/tools/binman/test/215_blob_ext_list.dts +++ b/tools/binman/test/215_blob_ext_list.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/216_blob_ext_list_missing.dts b/tools/binman/test/216_blob_ext_list_missing.dts index c02c335c76..485097e4de 100644 --- a/tools/binman/test/216_blob_ext_list_missing.dts +++ b/tools/binman/test/216_blob_ext_list_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/217_fake_blob.dts b/tools/binman/test/217_fake_blob.dts index 22cf67f4f8..f8669799d0 100644 --- a/tools/binman/test/217_fake_blob.dts +++ b/tools/binman/test/217_fake_blob.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/218_blob_ext_list_fake.dts b/tools/binman/test/218_blob_ext_list_fake.dts index 54ee54fdaa..b62fd2e299 100644 --- a/tools/binman/test/218_blob_ext_list_fake.dts +++ b/tools/binman/test/218_blob_ext_list_fake.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/219_fit_gennode.dts b/tools/binman/test/219_fit_gennode.dts index e9eda29983..15b4080b86 100644 --- a/tools/binman/test/219_fit_gennode.dts +++ b/tools/binman/test/219_fit_gennode.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/220_fit_subentry_bintool.dts b/tools/binman/test/220_fit_subentry_bintool.dts index 6e29d41eeb..54c06733c7 100644 --- a/tools/binman/test/220_fit_subentry_bintool.dts +++ b/tools/binman/test/220_fit_subentry_bintool.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/221_fit_subentry_hash.dts b/tools/binman/test/221_fit_subentry_hash.dts index 2cb04f96d0..a3c58a7cd7 100644 --- a/tools/binman/test/221_fit_subentry_hash.dts +++ b/tools/binman/test/221_fit_subentry_hash.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/222_tee_os.dts b/tools/binman/test/222_tee_os.dts index 6885497294..a6bf7204b8 100644 --- a/tools/binman/test/222_tee_os.dts +++ b/tools/binman/test/222_tee_os.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/223_fit_fdt_oper.dts b/tools/binman/test/223_fit_fdt_oper.dts index e630165acf..a8fb5142ba 100644 --- a/tools/binman/test/223_fit_fdt_oper.dts +++ b/tools/binman/test/223_fit_fdt_oper.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/224_fit_bad_oper.dts b/tools/binman/test/224_fit_bad_oper.dts index 8a8014ea33..e2d3937888 100644 --- a/tools/binman/test/224_fit_bad_oper.dts +++ b/tools/binman/test/224_fit_bad_oper.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/225_expand_size_bad.dts b/tools/binman/test/225_expand_size_bad.dts index d4ad9a6a1a..0fb95a190c 100644 --- a/tools/binman/test/225_expand_size_bad.dts +++ b/tools/binman/test/225_expand_size_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/226_fit_split_elf.dts b/tools/binman/test/226_fit_split_elf.dts index 22c453e603..cc576311a2 100644 --- a/tools/binman/test/226_fit_split_elf.dts +++ b/tools/binman/test/226_fit_split_elf.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/227_fit_bad_dir.dts b/tools/binman/test/227_fit_bad_dir.dts index 51f4816c4c..549791e6a6 100644 --- a/tools/binman/test/227_fit_bad_dir.dts +++ b/tools/binman/test/227_fit_bad_dir.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/228_fit_bad_dir_config.dts b/tools/binman/test/228_fit_bad_dir_config.dts index 825a346c3e..22727393bb 100644 --- a/tools/binman/test/228_fit_bad_dir_config.dts +++ b/tools/binman/test/228_fit_bad_dir_config.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/229_mkimage_missing.dts b/tools/binman/test/229_mkimage_missing.dts index 54a5a6c571..0c2fb1c2ad 100644 --- a/tools/binman/test/229_mkimage_missing.dts +++ b/tools/binman/test/229_mkimage_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/230_pre_load.dts b/tools/binman/test/230_pre_load.dts index e6d9ef40c6..a166ad20f7 100644 --- a/tools/binman/test/230_pre_load.dts +++ b/tools/binman/test/230_pre_load.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/231_pre_load_pkcs.dts b/tools/binman/test/231_pre_load_pkcs.dts index 66268cdb21..da4c96502f 100644 --- a/tools/binman/test/231_pre_load_pkcs.dts +++ b/tools/binman/test/231_pre_load_pkcs.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/232_pre_load_pss.dts b/tools/binman/test/232_pre_load_pss.dts index 3008d3f464..1dd7394b6c 100644 --- a/tools/binman/test/232_pre_load_pss.dts +++ b/tools/binman/test/232_pre_load_pss.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/233_pre_load_invalid_padding.dts b/tools/binman/test/233_pre_load_invalid_padding.dts index bbe2d1ba86..4abbc697ad 100644 --- a/tools/binman/test/233_pre_load_invalid_padding.dts +++ b/tools/binman/test/233_pre_load_invalid_padding.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/234_pre_load_invalid_sha.dts b/tools/binman/test/234_pre_load_invalid_sha.dts index 29afd2e37e..23f55414b8 100644 --- a/tools/binman/test/234_pre_load_invalid_sha.dts +++ b/tools/binman/test/234_pre_load_invalid_sha.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/235_pre_load_invalid_algo.dts b/tools/binman/test/235_pre_load_invalid_algo.dts index d6f6dd20cd..86ba029d3c 100644 --- a/tools/binman/test/235_pre_load_invalid_algo.dts +++ b/tools/binman/test/235_pre_load_invalid_algo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/236_pre_load_invalid_key.dts b/tools/binman/test/236_pre_load_invalid_key.dts index f93bc9792c..4c3f21113f 100644 --- a/tools/binman/test/236_pre_load_invalid_key.dts +++ b/tools/binman/test/236_pre_load_invalid_key.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/237_unique_names.dts b/tools/binman/test/237_unique_names.dts index 6780d37f71..c45991fda2 100644 --- a/tools/binman/test/237_unique_names.dts +++ b/tools/binman/test/237_unique_names.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/238_unique_names_multi.dts b/tools/binman/test/238_unique_names_multi.dts index db63afb445..c3253c68e7 100644 --- a/tools/binman/test/238_unique_names_multi.dts +++ b/tools/binman/test/238_unique_names_multi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/239_replace_with_bintool.dts b/tools/binman/test/239_replace_with_bintool.dts index d7fabd2cd8..62acd260b9 100644 --- a/tools/binman/test/239_replace_with_bintool.dts +++ b/tools/binman/test/239_replace_with_bintool.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/240_fit_extract_replace.dts b/tools/binman/test/240_fit_extract_replace.dts index b44d05afe1..9e9091fa1f 100644 --- a/tools/binman/test/240_fit_extract_replace.dts +++ b/tools/binman/test/240_fit_extract_replace.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/241_replace_section_simple.dts b/tools/binman/test/241_replace_section_simple.dts index c9d5c32856..a4d51b65c3 100644 --- a/tools/binman/test/241_replace_section_simple.dts +++ b/tools/binman/test/241_replace_section_simple.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/242_mkimage_name.dts b/tools/binman/test/242_mkimage_name.dts index fbc82f1f8d..dd8f711631 100644 --- a/tools/binman/test/242_mkimage_name.dts +++ b/tools/binman/test/242_mkimage_name.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/243_mkimage_image.dts b/tools/binman/test/243_mkimage_image.dts index 6b8f4a4a40..7bfa70cddf 100644 --- a/tools/binman/test/243_mkimage_image.dts +++ b/tools/binman/test/243_mkimage_image.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/244_mkimage_image_no_content.dts b/tools/binman/test/244_mkimage_image_no_content.dts index 7306c06af4..11c0fa0eee 100644 --- a/tools/binman/test/244_mkimage_image_no_content.dts +++ b/tools/binman/test/244_mkimage_image_no_content.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/245_mkimage_image_bad.dts b/tools/binman/test/245_mkimage_image_bad.dts index 54d2c99d62..c27a596f8d 100644 --- a/tools/binman/test/245_mkimage_image_bad.dts +++ b/tools/binman/test/245_mkimage_image_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/246_collection_other.dts b/tools/binman/test/246_collection_other.dts index 09de20e5bc..1bbe62a886 100644 --- a/tools/binman/test/246_collection_other.dts +++ b/tools/binman/test/246_collection_other.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/247_mkimage_coll.dts b/tools/binman/test/247_mkimage_coll.dts index 3086011886..3c217a76bc 100644 --- a/tools/binman/test/247_mkimage_coll.dts +++ b/tools/binman/test/247_mkimage_coll.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/248_compress_dtb_prepend_invalid.dts b/tools/binman/test/248_compress_dtb_prepend_invalid.dts index ee32670a91..9b2a21017b 100644 --- a/tools/binman/test/248_compress_dtb_prepend_invalid.dts +++ b/tools/binman/test/248_compress_dtb_prepend_invalid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/249_compress_dtb_prepend_length.dts b/tools/binman/test/249_compress_dtb_prepend_length.dts index 1570233637..f91417e3bd 100644 --- a/tools/binman/test/249_compress_dtb_prepend_length.dts +++ b/tools/binman/test/249_compress_dtb_prepend_length.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/250_compress_dtb_invalid.dts b/tools/binman/test/250_compress_dtb_invalid.dts index 228139060b..a7d932dfab 100644 --- a/tools/binman/test/250_compress_dtb_invalid.dts +++ b/tools/binman/test/250_compress_dtb_invalid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/251_compress_dtb_zstd.dts b/tools/binman/test/251_compress_dtb_zstd.dts index 90cf85d1e2..e0009b0d15 100644 --- a/tools/binman/test/251_compress_dtb_zstd.dts +++ b/tools/binman/test/251_compress_dtb_zstd.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/252_mkimage_mult_data.dts b/tools/binman/test/252_mkimage_mult_data.dts index a092bc39bf..7d6e679d98 100644 --- a/tools/binman/test/252_mkimage_mult_data.dts +++ b/tools/binman/test/252_mkimage_mult_data.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/253_mkimage_mult_no_content.dts b/tools/binman/test/253_mkimage_mult_no_content.dts index dd65666c62..04be2c349d 100644 --- a/tools/binman/test/253_mkimage_mult_no_content.dts +++ b/tools/binman/test/253_mkimage_mult_no_content.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/254_mkimage_filename.dts b/tools/binman/test/254_mkimage_filename.dts index 4483790ae8..4b9691296d 100644 --- a/tools/binman/test/254_mkimage_filename.dts +++ b/tools/binman/test/254_mkimage_filename.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/255_u_boot_vpl.dts b/tools/binman/test/255_u_boot_vpl.dts index a3a281a91e..c9af93467a 100644 --- a/tools/binman/test/255_u_boot_vpl.dts +++ b/tools/binman/test/255_u_boot_vpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/256_u_boot_vpl_nodtb.dts b/tools/binman/test/256_u_boot_vpl_nodtb.dts index 055016badd..35b6903e0e 100644 --- a/tools/binman/test/256_u_boot_vpl_nodtb.dts +++ b/tools/binman/test/256_u_boot_vpl_nodtb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/257_fdt_incl_vpl.dts b/tools/binman/test/257_fdt_incl_vpl.dts index 435256fe31..575952a0cd 100644 --- a/tools/binman/test/257_fdt_incl_vpl.dts +++ b/tools/binman/test/257_fdt_incl_vpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/258_vpl_bss_pad.dts b/tools/binman/test/258_vpl_bss_pad.dts index d308dcade1..726b15e529 100644 --- a/tools/binman/test/258_vpl_bss_pad.dts +++ b/tools/binman/test/258_vpl_bss_pad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/260_symbols_elf.dts b/tools/binman/test/260_symbols_elf.dts index 0fae118fc1..a5aa897fc1 100644 --- a/tools/binman/test/260_symbols_elf.dts +++ b/tools/binman/test/260_symbols_elf.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/261_section_fname.dts b/tools/binman/test/261_section_fname.dts index 790381e730..45188bdf37 100644 --- a/tools/binman/test/261_section_fname.dts +++ b/tools/binman/test/261_section_fname.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/262_absent.dts b/tools/binman/test/262_absent.dts index 2ab8766c87..ae6c640fca 100644 --- a/tools/binman/test/262_absent.dts +++ b/tools/binman/test/262_absent.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/263_tee_os_opt.dts b/tools/binman/test/263_tee_os_opt.dts index 2e4ec24ac2..29779e0005 100644 --- a/tools/binman/test/263_tee_os_opt.dts +++ b/tools/binman/test/263_tee_os_opt.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/264_tee_os_opt_fit.dts b/tools/binman/test/264_tee_os_opt_fit.dts index e9634d3ccd..ba489d1222 100644 --- a/tools/binman/test/264_tee_os_opt_fit.dts +++ b/tools/binman/test/264_tee_os_opt_fit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/265_tee_os_opt_fit_bad.dts b/tools/binman/test/265_tee_os_opt_fit_bad.dts index 7fa363cc19..c6415ef741 100644 --- a/tools/binman/test/265_tee_os_opt_fit_bad.dts +++ b/tools/binman/test/265_tee_os_opt_fit_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/266_blob_ext_opt.dts b/tools/binman/test/266_blob_ext_opt.dts index 717153152c..2e4432575d 100644 --- a/tools/binman/test/266_blob_ext_opt.dts +++ b/tools/binman/test/266_blob_ext_opt.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/267_section_inner.dts b/tools/binman/test/267_section_inner.dts index f6faab3d2f..d4b2442625 100644 --- a/tools/binman/test/267_section_inner.dts +++ b/tools/binman/test/267_section_inner.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/268_null.dts b/tools/binman/test/268_null.dts index 3824ba8509..08dcf5a45c 100644 --- a/tools/binman/test/268_null.dts +++ b/tools/binman/test/268_null.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/269_overlap.dts b/tools/binman/test/269_overlap.dts index f949b8b359..1f56cae72a 100644 --- a/tools/binman/test/269_overlap.dts +++ b/tools/binman/test/269_overlap.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/270_overlap_null.dts b/tools/binman/test/270_overlap_null.dts index feed9ec892..6f6f10edc1 100644 --- a/tools/binman/test/270_overlap_null.dts +++ b/tools/binman/test/270_overlap_null.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/271_overlap_bad.dts b/tools/binman/test/271_overlap_bad.dts index f281802114..f78266f501 100644 --- a/tools/binman/test/271_overlap_bad.dts +++ b/tools/binman/test/271_overlap_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/272_overlap_no_size.dts b/tools/binman/test/272_overlap_no_size.dts index 4517536f2e..2c2ef9f302 100644 --- a/tools/binman/test/272_overlap_no_size.dts +++ b/tools/binman/test/272_overlap_no_size.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/273_blob_symbol.dts b/tools/binman/test/273_blob_symbol.dts index 87b0aba212..52c19fde53 100644 --- a/tools/binman/test/273_blob_symbol.dts +++ b/tools/binman/test/273_blob_symbol.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/274_offset_from_elf.dts b/tools/binman/test/274_offset_from_elf.dts index e3372fc7c3..a0941d03cc 100644 --- a/tools/binman/test/274_offset_from_elf.dts +++ b/tools/binman/test/274_offset_from_elf.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/275_fit_align.dts b/tools/binman/test/275_fit_align.dts index c7b06e390f..ecfd715018 100644 --- a/tools/binman/test/275_fit_align.dts +++ b/tools/binman/test/275_fit_align.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/276_fit_firmware_loadables.dts b/tools/binman/test/276_fit_firmware_loadables.dts index 2f79cdc9bb..eff8d85633 100644 --- a/tools/binman/test/276_fit_firmware_loadables.dts +++ b/tools/binman/test/276_fit_firmware_loadables.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/277_replace_fit_sibling.dts b/tools/binman/test/277_replace_fit_sibling.dts index fc941a8081..a2bf519eaf 100644 --- a/tools/binman/test/277_replace_fit_sibling.dts +++ b/tools/binman/test/277_replace_fit_sibling.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/278_replace_section_deep.dts b/tools/binman/test/278_replace_section_deep.dts index fba2d7dcf2..7fa111f430 100644 --- a/tools/binman/test/278_replace_section_deep.dts +++ b/tools/binman/test/278_replace_section_deep.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/279_x509_cert.dts b/tools/binman/test/279_x509_cert.dts index 7123817271..aed069d48d 100644 --- a/tools/binman/test/279_x509_cert.dts +++ b/tools/binman/test/279_x509_cert.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/280_fit_sign.dts b/tools/binman/test/280_fit_sign.dts index b9f17dc5c0..4c271904a2 100644 --- a/tools/binman/test/280_fit_sign.dts +++ b/tools/binman/test/280_fit_sign.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/281_sign_non_fit.dts b/tools/binman/test/281_sign_non_fit.dts index e16c954246..d221b75905 100644 --- a/tools/binman/test/281_sign_non_fit.dts +++ b/tools/binman/test/281_sign_non_fit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/282_symbols_disable.dts b/tools/binman/test/282_symbols_disable.dts index 6efa933504..fad8b7463a 100644 --- a/tools/binman/test/282_symbols_disable.dts +++ b/tools/binman/test/282_symbols_disable.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/283_mkimage_special.dts b/tools/binman/test/283_mkimage_special.dts index c234093e6e..7f04da67fb 100644 --- a/tools/binman/test/283_mkimage_special.dts +++ b/tools/binman/test/283_mkimage_special.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/284_fit_fdt_list.dts b/tools/binman/test/284_fit_fdt_list.dts index 8885313f5b..59275a1e21 100644 --- a/tools/binman/test/284_fit_fdt_list.dts +++ b/tools/binman/test/284_fit_fdt_list.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/285_spl_expand.dts b/tools/binman/test/285_spl_expand.dts index 9c88ccb287..96003f6293 100644 --- a/tools/binman/test/285_spl_expand.dts +++ b/tools/binman/test/285_spl_expand.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/286_template.dts b/tools/binman/test/286_template.dts index 6980dbfafc..afe468a8b9 100644 --- a/tools/binman/test/286_template.dts +++ b/tools/binman/test/286_template.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/287_template_multi.dts b/tools/binman/test/287_template_multi.dts index 122bfccd56..039e40b653 100644 --- a/tools/binman/test/287_template_multi.dts +++ b/tools/binman/test/287_template_multi.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/288_template_fit.dts b/tools/binman/test/288_template_fit.dts index d84dca4ea4..19eb8671c1 100644 --- a/tools/binman/test/288_template_fit.dts +++ b/tools/binman/test/288_template_fit.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/289_template_section.dts b/tools/binman/test/289_template_section.dts index 8a744a0cf6..fd03317a62 100644 --- a/tools/binman/test/289_template_section.dts +++ b/tools/binman/test/289_template_section.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/290_mkimage_sym.dts b/tools/binman/test/290_mkimage_sym.dts index 2dfd286ad4..8845504f16 100644 --- a/tools/binman/test/290_mkimage_sym.dts +++ b/tools/binman/test/290_mkimage_sym.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/291_rockchip_tpl.dts b/tools/binman/test/291_rockchip_tpl.dts index 269f56e254..6e5cd9fb2c 100644 --- a/tools/binman/test/291_rockchip_tpl.dts +++ b/tools/binman/test/291_rockchip_tpl.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/292_mkimage_missing_multiple.dts b/tools/binman/test/292_mkimage_missing_multiple.dts index f84aea49ea..cfb645b544 100644 --- a/tools/binman/test/292_mkimage_missing_multiple.dts +++ b/tools/binman/test/292_mkimage_missing_multiple.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/293_ti_board_cfg.dts b/tools/binman/test/293_ti_board_cfg.dts index cda024c1b8..3e1c964b47 100644 --- a/tools/binman/test/293_ti_board_cfg.dts +++ b/tools/binman/test/293_ti_board_cfg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/294_ti_board_cfg_combined.dts b/tools/binman/test/294_ti_board_cfg_combined.dts index 95ef449cbf..0e42fc4dc3 100644 --- a/tools/binman/test/294_ti_board_cfg_combined.dts +++ b/tools/binman/test/294_ti_board_cfg_combined.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/295_ti_board_cfg_no_type.dts b/tools/binman/test/295_ti_board_cfg_no_type.dts index 584b7acc5a..e811038e34 100644 --- a/tools/binman/test/295_ti_board_cfg_no_type.dts +++ b/tools/binman/test/295_ti_board_cfg_no_type.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/296_ti_secure.dts b/tools/binman/test/296_ti_secure.dts index 941d0ab4ca..a32ea8d649 100644 --- a/tools/binman/test/296_ti_secure.dts +++ b/tools/binman/test/296_ti_secure.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/297_ti_secure_rom.dts b/tools/binman/test/297_ti_secure_rom.dts index d1313769f4..c4ac49bb17 100644 --- a/tools/binman/test/297_ti_secure_rom.dts +++ b/tools/binman/test/297_ti_secure_rom.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/298_ti_secure_rom_combined.dts b/tools/binman/test/298_ti_secure_rom_combined.dts index bf872739bc..d8d0d4d8c0 100644 --- a/tools/binman/test/298_ti_secure_rom_combined.dts +++ b/tools/binman/test/298_ti_secure_rom_combined.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/299_ti_secure_rom_a.dts b/tools/binman/test/299_ti_secure_rom_a.dts index 887138f0e4..40b6c72143 100644 --- a/tools/binman/test/299_ti_secure_rom_a.dts +++ b/tools/binman/test/299_ti_secure_rom_a.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/300_ti_secure_rom_b.dts b/tools/binman/test/300_ti_secure_rom_b.dts index c6d6182158..7c66a9858f 100644 --- a/tools/binman/test/300_ti_secure_rom_b.dts +++ b/tools/binman/test/300_ti_secure_rom_b.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/301_encrypted_no_algo.dts b/tools/binman/test/301_encrypted_no_algo.dts index 03f7ffee90..fd39923261 100644 --- a/tools/binman/test/301_encrypted_no_algo.dts +++ b/tools/binman/test/301_encrypted_no_algo.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/302_encrypted_invalid_iv_file.dts b/tools/binman/test/302_encrypted_invalid_iv_file.dts index 388a0a6ad9..358d83524c 100644 --- a/tools/binman/test/302_encrypted_invalid_iv_file.dts +++ b/tools/binman/test/302_encrypted_invalid_iv_file.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; / { diff --git a/tools/binman/test/303_encrypted_missing_key.dts b/tools/binman/test/303_encrypted_missing_key.dts index d1daaa0885..4ca8ae7bcb 100644 --- a/tools/binman/test/303_encrypted_missing_key.dts +++ b/tools/binman/test/303_encrypted_missing_key.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/304_encrypted_key_source.dts b/tools/binman/test/304_encrypted_key_source.dts index 884ec508db..481186711d 100644 --- a/tools/binman/test/304_encrypted_key_source.dts +++ b/tools/binman/test/304_encrypted_key_source.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/305_encrypted_key_file.dts b/tools/binman/test/305_encrypted_key_file.dts index efd7ee5f35..5157b91691 100644 --- a/tools/binman/test/305_encrypted_key_file.dts +++ b/tools/binman/test/305_encrypted_key_file.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/306_spl_pubkey_dtb.dts b/tools/binman/test/306_spl_pubkey_dtb.dts index 3256ff970c..b633439b35 100644 --- a/tools/binman/test/306_spl_pubkey_dtb.dts +++ b/tools/binman/test/306_spl_pubkey_dtb.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/307_xilinx_bootgen_sign.dts b/tools/binman/test/307_xilinx_bootgen_sign.dts index 02acf8652a..b6a6e5ae6a 100644 --- a/tools/binman/test/307_xilinx_bootgen_sign.dts +++ b/tools/binman/test/307_xilinx_bootgen_sign.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/308_xilinx_bootgen_sign_enc.dts b/tools/binman/test/308_xilinx_bootgen_sign_enc.dts index 5d7ce4c1f5..1d647c6dd0 100644 --- a/tools/binman/test/308_xilinx_bootgen_sign_enc.dts +++ b/tools/binman/test/308_xilinx_bootgen_sign_enc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/309_template_phandle.dts b/tools/binman/test/309_template_phandle.dts index c4ec1dd41b..20c5a627c3 100644 --- a/tools/binman/test/309_template_phandle.dts +++ b/tools/binman/test/309_template_phandle.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/310_template_phandle_dup.dts b/tools/binman/test/310_template_phandle_dup.dts index dc86f06463..30609340a4 100644 --- a/tools/binman/test/310_template_phandle_dup.dts +++ b/tools/binman/test/310_template_phandle_dup.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/311_capsule.dts b/tools/binman/test/311_capsule.dts index 0a62ef81dd..864c01d659 100644 --- a/tools/binman/test/311_capsule.dts +++ b/tools/binman/test/311_capsule.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/312_capsule_signed.dts b/tools/binman/test/312_capsule_signed.dts index 4ab838efed..2ef738a8a0 100644 --- a/tools/binman/test/312_capsule_signed.dts +++ b/tools/binman/test/312_capsule_signed.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/313_capsule_version.dts b/tools/binman/test/313_capsule_version.dts index 19e7e83348..eea792a85a 100644 --- a/tools/binman/test/313_capsule_version.dts +++ b/tools/binman/test/313_capsule_version.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/314_capsule_signed_ver.dts b/tools/binman/test/314_capsule_signed_ver.dts index 649b8ccb2d..36c573873c 100644 --- a/tools/binman/test/314_capsule_signed_ver.dts +++ b/tools/binman/test/314_capsule_signed_ver.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/315_capsule_oemflags.dts b/tools/binman/test/315_capsule_oemflags.dts index 45853f69c3..ae53d6f477 100644 --- a/tools/binman/test/315_capsule_oemflags.dts +++ b/tools/binman/test/315_capsule_oemflags.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/316_capsule_missing_key.dts b/tools/binman/test/316_capsule_missing_key.dts index a14a74ee77..9044e6659a 100644 --- a/tools/binman/test/316_capsule_missing_key.dts +++ b/tools/binman/test/316_capsule_missing_key.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/317_capsule_missing_index.dts b/tools/binman/test/317_capsule_missing_index.dts index 99a54d55c3..1ab1251f1a 100644 --- a/tools/binman/test/317_capsule_missing_index.dts +++ b/tools/binman/test/317_capsule_missing_index.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/318_capsule_missing_guid.dts b/tools/binman/test/318_capsule_missing_guid.dts index 85d3317ecb..1bc30aa35a 100644 --- a/tools/binman/test/318_capsule_missing_guid.dts +++ b/tools/binman/test/318_capsule_missing_guid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/319_capsule_accept.dts b/tools/binman/test/319_capsule_accept.dts index d48e59f859..c53bbf3374 100644 --- a/tools/binman/test/319_capsule_accept.dts +++ b/tools/binman/test/319_capsule_accept.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/320_capsule_revert.dts b/tools/binman/test/320_capsule_revert.dts index bd141ef292..4e49d8aa2a 100644 --- a/tools/binman/test/320_capsule_revert.dts +++ b/tools/binman/test/320_capsule_revert.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/321_capsule_accept_missing_guid.dts b/tools/binman/test/321_capsule_accept_missing_guid.dts index a0088b174c..849f77bd93 100644 --- a/tools/binman/test/321_capsule_accept_missing_guid.dts +++ b/tools/binman/test/321_capsule_accept_missing_guid.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/322_empty_capsule_type_missing.dts b/tools/binman/test/322_empty_capsule_type_missing.dts index d356168e77..0f501f6b72 100644 --- a/tools/binman/test/322_empty_capsule_type_missing.dts +++ b/tools/binman/test/322_empty_capsule_type_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/323_capsule_accept_revert_missing.dts b/tools/binman/test/323_capsule_accept_revert_missing.dts index 31268b20b8..1c5b0952d2 100644 --- a/tools/binman/test/323_capsule_accept_revert_missing.dts +++ b/tools/binman/test/323_capsule_accept_revert_missing.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /dts-v1/; diff --git a/tools/binman/test/Makefile b/tools/binman/test/Makefile index 4d152eee9c..7cb1e9dc35 100644 --- a/tools/binman/test/Makefile +++ b/tools/binman/test/Makefile @@ -4,7 +4,7 @@ # Copyright (C) 2017 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ ) diff --git a/tools/binman/test/blob_syms.c b/tools/binman/test/blob_syms.c index 1df8d64353..c044353a12 100644 --- a/tools/binman/test/blob_syms.c +++ b/tools/binman/test/blob_syms.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * diff --git a/tools/binman/test/blob_syms.lds b/tools/binman/test/blob_syms.lds index 787e38dd85..9c75ea8c4c 100644 --- a/tools/binman/test/blob_syms.lds +++ b/tools/binman/test/blob_syms.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/bss_data.c b/tools/binman/test/bss_data.c index 7047a3bb01..0afdf97207 100644 --- a/tools/binman/test/bss_data.c +++ b/tools/binman/test/bss_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * diff --git a/tools/binman/test/bss_data.lds b/tools/binman/test/bss_data.lds index 306dab5043..774e691216 100644 --- a/tools/binman/test/bss_data.lds +++ b/tools/binman/test/bss_data.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/bss_data_zero.c b/tools/binman/test/bss_data_zero.c index 7047a3bb01..0afdf97207 100644 --- a/tools/binman/test/bss_data_zero.c +++ b/tools/binman/test/bss_data_zero.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * diff --git a/tools/binman/test/bss_data_zero.lds b/tools/binman/test/bss_data_zero.lds index 8fa0210a8f..29f7e62631 100644 --- a/tools/binman/test/bss_data_zero.lds +++ b/tools/binman/test/bss_data_zero.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/elf_sections.c b/tools/binman/test/elf_sections.c index 9bcce9af02..2d58e1e931 100644 --- a/tools/binman/test/elf_sections.c +++ b/tools/binman/test/elf_sections.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2022 Google LLC * diff --git a/tools/binman/test/elf_sections.lds b/tools/binman/test/elf_sections.lds index 7b6e932592..3704140eb0 100644 --- a/tools/binman/test/elf_sections.lds +++ b/tools/binman/test/elf_sections.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/embed_data.c b/tools/binman/test/embed_data.c index 08b68c550f..f743fac513 100644 --- a/tools/binman/test/embed_data.c +++ b/tools/binman/test/embed_data.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * diff --git a/tools/binman/test/embed_data.lds b/tools/binman/test/embed_data.lds index d416cb2111..739cac7aaf 100644 --- a/tools/binman/test/embed_data.lds +++ b/tools/binman/test/embed_data.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2021 Google LLC */ diff --git a/tools/binman/test/u_boot_binman_embed.c b/tools/binman/test/u_boot_binman_embed.c index 75874bb6e2..f0b0459d52 100644 --- a/tools/binman/test/u_boot_binman_embed.c +++ b/tools/binman/test/u_boot_binman_embed.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * diff --git a/tools/binman/test/u_boot_binman_embed.lds b/tools/binman/test/u_boot_binman_embed.lds index e213fa8a84..70f13f338f 100644 --- a/tools/binman/test/u_boot_binman_embed.lds +++ b/tools/binman/test/u_boot_binman_embed.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/u_boot_binman_embed_sm.c b/tools/binman/test/u_boot_binman_embed_sm.c index ae245d78a6..1d09196b8b 100644 --- a/tools/binman/test/u_boot_binman_embed_sm.c +++ b/tools/binman/test/u_boot_binman_embed_sm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2021 Google LLC * diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binman/test/u_boot_binman_syms.c index 147c90230f..63f4b43fd8 100644 --- a/tools/binman/test/u_boot_binman_syms.c +++ b/tools/binman/test/u_boot_binman_syms.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * diff --git a/tools/binman/test/u_boot_binman_syms.lds b/tools/binman/test/u_boot_binman_syms.lds index 825fc3f649..c566fcb2c4 100644 --- a/tools/binman/test/u_boot_binman_syms.lds +++ b/tools/binman/test/u_boot_binman_syms.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/u_boot_binman_syms_bad.lds b/tools/binman/test/u_boot_binman_syms_bad.lds index 849d158ac8..1b75fcbf35 100644 --- a/tools/binman/test/u_boot_binman_syms_bad.lds +++ b/tools/binman/test/u_boot_binman_syms_bad.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/u_boot_binman_syms_size.c b/tools/binman/test/u_boot_binman_syms_size.c index f686892a4d..23e00ac458 100644 --- a/tools/binman/test/u_boot_binman_syms_size.c +++ b/tools/binman/test/u_boot_binman_syms_size.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2017 Google, Inc * diff --git a/tools/binman/test/u_boot_binman_syms_x86.lds b/tools/binman/test/u_boot_binman_syms_x86.lds index 9daf86f833..a9b0bab194 100644 --- a/tools/binman/test/u_boot_binman_syms_x86.lds +++ b/tools/binman/test/u_boot_binman_syms_x86.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/u_boot_no_ucode_ptr.c b/tools/binman/test/u_boot_no_ucode_ptr.c index 24cdb909d0..337ca154f7 100644 --- a/tools/binman/test/u_boot_no_ucode_ptr.c +++ b/tools/binman/test/u_boot_no_ucode_ptr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * diff --git a/tools/binman/test/u_boot_ucode_ptr.c b/tools/binman/test/u_boot_ucode_ptr.c index 243c8e9e1a..8f6cf25fe8 100644 --- a/tools/binman/test/u_boot_ucode_ptr.c +++ b/tools/binman/test/u_boot_ucode_ptr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2016 Google, Inc * diff --git a/tools/binman/test/u_boot_ucode_ptr.lds b/tools/binman/test/u_boot_ucode_ptr.lds index cf4d1b8bbd..6a80cedb2b 100644 --- a/tools/binman/test/u_boot_ucode_ptr.lds +++ b/tools/binman/test/u_boot_ucode_ptr.lds @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (c) 2016 Google, Inc */ diff --git a/tools/binman/test/yaml/config.yaml b/tools/binman/test/yaml/config.yaml index 5f799a6e3a..1410dd6980 100644 --- a/tools/binman/test/yaml/config.yaml +++ b/tools/binman/test/yaml/config.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Test config # diff --git a/tools/binman/test/yaml/schema.yaml b/tools/binman/test/yaml/schema.yaml index 8aa03f3c8e..668e96d528 100644 --- a/tools/binman/test/yaml/schema.yaml +++ b/tools/binman/test/yaml/schema.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Test schema # diff --git a/tools/binman/test/yaml/schema_notype.yaml b/tools/binman/test/yaml/schema_notype.yaml index 6b4d98ffa1..ebc49f8d9d 100644 --- a/tools/binman/test/yaml/schema_notype.yaml +++ b/tools/binman/test/yaml/schema_notype.yaml @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Test schema # diff --git a/tools/buildman/board.py b/tools/buildman/board.py index 248d8bfff1..b61e54cc6f 100644 --- a/tools/buildman/board.py +++ b/tools/buildman/board.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. diff --git a/tools/buildman/boards.py b/tools/buildman/boards.py index 341a5056df..250f478cc4 100644 --- a/tools/buildman/boards.py +++ b/tools/buildman/boards.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # Author: Simon Glass <sjg(a)chromium.org> # Author: Masahiro Yamada <yamada.m(a)jp.panasonic.com> diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py index f7f8276e62..d78ddc963d 100644 --- a/tools/buildman/bsettings.py +++ b/tools/buildman/bsettings.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. import configparser diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 5305477c5b..163e150727 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2013 The Chromium OS Authors. # # Bloat-o-meter code used here Copyright 2004 Matt Mackall <mpm(a)selenic.com> diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 6a61f64da1..4699cdc138 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2014 Google, Inc # diff --git a/tools/buildman/buildman.rst b/tools/buildman/buildman.rst index aae2477b5c..dcc47b8b06 100644 --- a/tools/buildman/buildman.rst +++ b/tools/buildman/buildman.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Buildman build tool =================== diff --git a/tools/buildman/cfgutil.py b/tools/buildman/cfgutil.py index a340e01cb6..2373b1cc81 100644 --- a/tools/buildman/cfgutil.py +++ b/tools/buildman/cfgutil.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 Google LLC # Written by Simon Glass <sjg(a)chromium.org> # diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 03211bd5aa..cf1325bcf3 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2014 Google, Inc # diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8f6850c521..bb389df1af 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2013 The Chromium OS Authors. # diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 55dd494fe8..d0fc68ad35 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2014 Google, Inc # diff --git a/tools/buildman/main.py b/tools/buildman/main.py index 3cf877e5e6..ad7d70e513 100755 --- a/tools/buildman/main.py +++ b/tools/buildman/main.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2012 The Chromium OS Authors. # diff --git a/tools/buildman/test.py b/tools/buildman/test.py index bdd3d84158..b725fef703 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 79c7c11a11..3bf44381f0 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # diff --git a/tools/default_image.c b/tools/default_image.c index 04bc85bf93..6da4ce1820 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index c4a2596b48..d0f122e04d 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. diff --git a/tools/dtoc/README.rst b/tools/dtoc/README.rst index 92b39759ed..f97f2a961d 100644 --- a/tools/dtoc/README.rst +++ b/tools/dtoc/README.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later Devicetree-to-C generator ========================= diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index 39f416cfd8..3aeacda7f9 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index 5963925146..6d5ee94fd4 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py index f1f70568cf..df1ea2367d 100644 --- a/tools/dtoc/fdt_util.py +++ b/tools/dtoc/fdt_util.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/dtoc/main.py b/tools/dtoc/main.py index 6c91450410..552c4985a9 100755 --- a/tools/dtoc/main.py +++ b/tools/dtoc/main.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/dtoc/setup.py b/tools/dtoc/setup.py index 5e092fe087..a9ccb9769e 100644 --- a/tools/dtoc/setup.py +++ b/tools/dtoc/setup.py @@ -1,9 +1,9 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later from distutils.core import setup setup(name='dtoc', version='1.0', - license='GPL-2.0+', + license='GPL-2.0-or-later', scripts=['dtoc'], packages=['dtoc'], package_dir={'dtoc': ''}, diff --git a/tools/dtoc/src_scan.py b/tools/dtoc/src_scan.py index 3bef59d616..ecf1951736 100644 --- a/tools/dtoc/src_scan.py +++ b/tools/dtoc/src_scan.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (C) 2017 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/dtoc/test/dtoc_test.dts b/tools/dtoc/test/dtoc_test.dts index b2259483a6..552f9a7406 100644 --- a/tools/dtoc/test/dtoc_test.dts +++ b/tools/dtoc/test/dtoc_test.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_add_prop.dts b/tools/dtoc/test/dtoc_test_add_prop.dts index 8225de36d2..e5773488b5 100644 --- a/tools/dtoc/test/dtoc_test_add_prop.dts +++ b/tools/dtoc/test/dtoc_test_add_prop.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_addr32.dts b/tools/dtoc/test/dtoc_test_addr32.dts index 3e7dc56729..99d9f12745 100644 --- a/tools/dtoc/test/dtoc_test_addr32.dts +++ b/tools/dtoc/test/dtoc_test_addr32.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_addr32_64.dts b/tools/dtoc/test/dtoc_test_addr32_64.dts index 7ce16feef1..d6243acff0 100644 --- a/tools/dtoc/test/dtoc_test_addr32_64.dts +++ b/tools/dtoc/test/dtoc_test_addr32_64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_addr64.dts b/tools/dtoc/test/dtoc_test_addr64.dts index 5f8c23f04b..7c608fd9aa 100644 --- a/tools/dtoc/test/dtoc_test_addr64.dts +++ b/tools/dtoc/test/dtoc_test_addr64.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_addr64_32.dts b/tools/dtoc/test/dtoc_test_addr64_32.dts index bfbfd87b8d..d9ada918ea 100644 --- a/tools/dtoc/test/dtoc_test_addr64_32.dts +++ b/tools/dtoc/test/dtoc_test_addr64_32.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_alias_bad.dts b/tools/dtoc/test/dtoc_test_alias_bad.dts index 69761f9114..a07dc41845 100644 --- a/tools/dtoc/test/dtoc_test_alias_bad.dts +++ b/tools/dtoc/test/dtoc_test_alias_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_alias_bad_path.dts b/tools/dtoc/test/dtoc_test_alias_bad_path.dts index 6f566fe4ab..5c8bd55e56 100644 --- a/tools/dtoc/test/dtoc_test_alias_bad_path.dts +++ b/tools/dtoc/test/dtoc_test_alias_bad_path.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_alias_bad_uc.dts b/tools/dtoc/test/dtoc_test_alias_bad_uc.dts index 5d23c63a63..c78a08c024 100644 --- a/tools/dtoc/test/dtoc_test_alias_bad_uc.dts +++ b/tools/dtoc/test/dtoc_test_alias_bad_uc.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_aliases.dts b/tools/dtoc/test/dtoc_test_aliases.dts index 018b834046..5c6d36f3ae 100644 --- a/tools/dtoc/test/dtoc_test_aliases.dts +++ b/tools/dtoc/test/dtoc_test_aliases.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_bad_reg.dts b/tools/dtoc/test/dtoc_test_bad_reg.dts index 1312acb619..569df7a897 100644 --- a/tools/dtoc/test/dtoc_test_bad_reg.dts +++ b/tools/dtoc/test/dtoc_test_bad_reg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_bad_reg2.dts b/tools/dtoc/test/dtoc_test_bad_reg2.dts index 3e9efa43af..15de442c22 100644 --- a/tools/dtoc/test/dtoc_test_bad_reg2.dts +++ b/tools/dtoc/test/dtoc_test_bad_reg2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_copy.dts b/tools/dtoc/test/dtoc_test_copy.dts index 8e50c75659..f7a36a3cc5 100644 --- a/tools/dtoc/test/dtoc_test_copy.dts +++ b/tools/dtoc/test/dtoc_test_copy.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_driver_alias.dts b/tools/dtoc/test/dtoc_test_driver_alias.dts index 22369a4406..ea65272a80 100644 --- a/tools/dtoc/test/dtoc_test_driver_alias.dts +++ b/tools/dtoc/test/dtoc_test_driver_alias.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_empty.dts b/tools/dtoc/test/dtoc_test_empty.dts index b2259483a6..552f9a7406 100644 --- a/tools/dtoc/test/dtoc_test_empty.dts +++ b/tools/dtoc/test/dtoc_test_empty.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_inst.dts b/tools/dtoc/test/dtoc_test_inst.dts index 9689be391b..0134382f8a 100644 --- a/tools/dtoc/test/dtoc_test_inst.dts +++ b/tools/dtoc/test/dtoc_test_inst.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_invalid_driver.dts b/tools/dtoc/test/dtoc_test_invalid_driver.dts index 042a325913..84e84a1ffd 100644 --- a/tools/dtoc/test/dtoc_test_invalid_driver.dts +++ b/tools/dtoc/test/dtoc_test_invalid_driver.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_noparent.dts b/tools/dtoc/test/dtoc_test_noparent.dts index 0efb17e0cb..0e33935a1e 100644 --- a/tools/dtoc/test/dtoc_test_noparent.dts +++ b/tools/dtoc/test/dtoc_test_noparent.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_noprops.dts b/tools/dtoc/test/dtoc_test_noprops.dts index 75296beb31..ae4f0bfde9 100644 --- a/tools/dtoc/test/dtoc_test_noprops.dts +++ b/tools/dtoc/test/dtoc_test_noprops.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle.dts b/tools/dtoc/test/dtoc_test_phandle.dts index 74a146b9a3..96160db721 100644 --- a/tools/dtoc/test/dtoc_test_phandle.dts +++ b/tools/dtoc/test/dtoc_test_phandle.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle_bad.dts b/tools/dtoc/test/dtoc_test_phandle_bad.dts index 94cfada95b..3369da5126 100644 --- a/tools/dtoc/test/dtoc_test_phandle_bad.dts +++ b/tools/dtoc/test/dtoc_test_phandle_bad.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle_bad2.dts b/tools/dtoc/test/dtoc_test_phandle_bad2.dts index 4d24b96ce6..acaca57dab 100644 --- a/tools/dtoc/test/dtoc_test_phandle_bad2.dts +++ b/tools/dtoc/test/dtoc_test_phandle_bad2.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts index 6ad8006266..35f46287d1 100644 --- a/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts +++ b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle_reorder.dts b/tools/dtoc/test/dtoc_test_phandle_reorder.dts index 573a4f6396..775c30cd7d 100644 --- a/tools/dtoc/test/dtoc_test_phandle_reorder.dts +++ b/tools/dtoc/test/dtoc_test_phandle_reorder.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_phandle_single.dts b/tools/dtoc/test/dtoc_test_phandle_single.dts index 1b1763932c..e0e8a9e85b 100644 --- a/tools/dtoc/test/dtoc_test_phandle_single.dts +++ b/tools/dtoc/test/dtoc_test_phandle_single.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_simple.dts b/tools/dtoc/test/dtoc_test_simple.dts index 08f667ee5a..7db7187f66 100644 --- a/tools/dtoc/test/dtoc_test_simple.dts +++ b/tools/dtoc/test/dtoc_test_simple.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test/dtoc_test_single_reg.dts b/tools/dtoc/test/dtoc_test_single_reg.dts index 035937cfbf..110995ffe6 100644 --- a/tools/dtoc/test/dtoc_test_single_reg.dts +++ b/tools/dtoc/test/dtoc_test_single_reg.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Test device tree file for dtoc * diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 597c93e8a8..5f34bdc2ae 100755 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index 0b01518f3a..30c7e08dc0 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Tests for the Fdt module diff --git a/tools/dtoc/test_src_scan.py b/tools/dtoc/test_src_scan.py index 64b740841c..f2c762e546 100644 --- a/tools/dtoc/test_src_scan.py +++ b/tools/dtoc/test_src_scan.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2020 Google LLC # diff --git a/tools/dumpimage.c b/tools/dumpimage.c index 4791dd0dfe..5704605a9f 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Based on mkimage.c. * diff --git a/tools/dumpimage.h b/tools/dumpimage.h index e31d163292..46937ccb4e 100644 --- a/tools/dumpimage.h +++ b/tools/dumpimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Based on mkimage.c. * diff --git a/tools/endian-swap.py b/tools/endian-swap.py index 5990efa313..4bbe651d97 100755 --- a/tools/endian-swap.py +++ b/tools/endian-swap.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Simple tool to swap the byte endianness of a binary file. diff --git a/tools/env/Makefile b/tools/env/Makefile index b627796e94..4c515ad124 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index c9a8774ace..5f22b5a929 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 78c803c944..a3c336e9ed 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 0b201b9e62..1ef3bdce2f 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h index 86be16dabc..82121ac9ba 100644 --- a/tools/env/fw_env_private.h +++ b/tools/env/fw_env_private.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/envcrc.c b/tools/envcrc.c index 550f31038b..7e69a2f556 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio(a)tin.it diff --git a/tools/expo.py b/tools/expo.py index ea80c70f04..b316433aaa 100755 --- a/tools/expo.py +++ b/tools/expo.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later """ Expo utility - used for testing of expo features diff --git a/tools/fdt_add_pubkey.c b/tools/fdt_add_pubkey.c index 5582d7a8ef..c91f5071fb 100644 --- a/tools/fdt_add_pubkey.c +++ b/tools/fdt_add_pubkey.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later #include <image.h> #include "fit_common.h" diff --git a/tools/fdt_host.h b/tools/fdt_host.h index bc42306c9e..cde22e2b79 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 Semihalf */ diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 7eabcab439..f9fd051213 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/file2include.c b/tools/file2include.c index 775440cba9..9a67a818e2 100644 --- a/tools/file2include.c +++ b/tools/file2include.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Convert a file image to a C define * @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) count = fread(buf, 1, count, file); /* Generate output */ - printf("/* SPDX-License-Identifier: GPL-2.0+ */\n"); + printf("/* SPDX-License-Identifier: GPL-2.0-or-later */\n"); printf("/*\n"); printf(" * Non-zero %u byte strings of a disk image\n", BLOCK_SIZE); printf(" *\n"); diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c index 3d1d33fdab..c2b7004909 100644 --- a/tools/fit_check_sign.c +++ b/tools/fit_check_sign.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * DENX Software Engineering diff --git a/tools/fit_common.c b/tools/fit_common.c index 2d417d4719..ac0dd2ff2d 100644 --- a/tools/fit_common.c +++ b/tools/fit_common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * DENX Software Engineering diff --git a/tools/fit_common.h b/tools/fit_common.h index 2da4b9422d..d414bd6a2a 100644 --- a/tools/fit_common.h +++ b/tools/fit_common.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 */ diff --git a/tools/fit_image.c b/tools/fit_image.c index 71e031c855..01e0eecc63 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/tools/fit_info.c b/tools/fit_info.c index b2642ec5b7..5962bf33fb 100644 --- a/tools/fit_info.c +++ b/tools/fit_info.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * DENX Software Engineering diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index 24152dcc3c..61a34b7ad9 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/gdb/error.c b/tools/gdb/error.c index 22a9b43e08..61f4eeacbf 100644 --- a/tools/gdb/error.c +++ b/tools/gdb/error.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/error.h b/tools/gdb/error.h index 252e89f927..c7c772d1f4 100644 --- a/tools/gdb/error.h +++ b/tools/gdb/error.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/gdbcont.c b/tools/gdb/gdbcont.c index 9291a71749..63cf192f10 100644 --- a/tools/gdb/gdbcont.c +++ b/tools/gdb/gdbcont.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/gdbsend.c b/tools/gdb/gdbsend.c index 19c4dcb1d9..4f3bcc00b7 100644 --- a/tools/gdb/gdbsend.c +++ b/tools/gdb/gdbsend.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/remote.c b/tools/gdb/remote.c index 3cd0421351..45bd4fbeab 100644 --- a/tools/gdb/remote.c +++ b/tools/gdb/remote.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * taken from gdb/remote.c * diff --git a/tools/gdb/remote.h b/tools/gdb/remote.h index 2a68402b80..7ae37ba0ec 100644 --- a/tools/gdb/remote.h +++ b/tools/gdb/remote.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/serial.c b/tools/gdb/serial.c index 34ac609df1..6d97eafab5 100644 --- a/tools/gdb/serial.c +++ b/tools/gdb/serial.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gdb/serial.h b/tools/gdb/serial.h index c45d1dfd1a..cdf1644d93 100644 --- a/tools/gdb/serial.h +++ b/tools/gdb/serial.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen(a)csiro.au> diff --git a/tools/gen_eth_addr.c b/tools/gen_eth_addr.c index ad36f3f0c2..12c46dda89 100644 --- a/tools/gen_eth_addr.c +++ b/tools/gen_eth_addr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2001 * Murray Jensen <Murray.Jensen(a)cmst.csiro.au> diff --git a/tools/gen_ethaddr_crc.c b/tools/gen_ethaddr_crc.c index e73d0429a0..b86bb5a8ba 100644 --- a/tools/gen_ethaddr_crc.c +++ b/tools/gen_ethaddr_crc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2016 * Olliver Schinagl <oliver(a)schinagl.nl> diff --git a/tools/getline.c b/tools/getline.c index 64f1260099..bd4a8abd28 100644 --- a/tools/getline.c +++ b/tools/getline.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* getline.c -- Replacement for GNU C library function getline * * Copyright (C) 1993, 1996, 2001, 2002 Free Software Foundation, Inc. diff --git a/tools/gpheader.h b/tools/gpheader.h index d5bf86e589..74b25cc115 100644 --- a/tools/gpheader.h +++ b/tools/gpheader.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2014 * Texas Instruments Incorporated diff --git a/tools/gpimage-common.c b/tools/gpimage-common.c index fc6406b913..683aec02ff 100644 --- a/tools/gpimage-common.c +++ b/tools/gpimage-common.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Texas Instruments Incorporated diff --git a/tools/gpimage.c b/tools/gpimage.c index d2bc79d46b..d6e4881650 100644 --- a/tools/gpimage.c +++ b/tools/gpimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2014 * Texas Instruments Incorporated diff --git a/tools/ifdtool.c b/tools/ifdtool.c index b70570361f..b2cf387303 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -757,7 +757,7 @@ static void print_version(void) { printf("ifdtool v%s -- ", IFDTOOL_VERSION); printf("Copyright (C) 2014 Google Inc.\n\n"); - printf("SPDX-License-Identifier: GPL-2.0+\n"); + printf("SPDX-License-Identifier: GPL-2.0-or-later\n"); } static void print_usage(const char *name) diff --git a/tools/image-host.c b/tools/image-host.c index ca4950312f..13357d2eff 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. * diff --git a/tools/image-sig-host.c b/tools/image-sig-host.c index d0133aec4c..97c7445be2 100644 --- a/tools/image-sig-host.c +++ b/tools/image-sig-host.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013, Google Inc. */ diff --git a/tools/imagetool.c b/tools/imagetool.c index b293211cf8..244da3212e 100644 --- a/tools/imagetool.c +++ b/tools/imagetool.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2013 * diff --git a/tools/imagetool.h b/tools/imagetool.h index a766aa2ae9..429e0bac4b 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2013 * diff --git a/tools/imx8image.c b/tools/imx8image.c index 76d0cd62dc..97c431e1d4 100644 --- a/tools/imx8image.c +++ b/tools/imx8image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh index 4ab3116ee0..e1e502fd33 100755 --- a/tools/imx8m_image.sh +++ b/tools/imx8m_image.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # script to check whether the file exists in imximage.cfg for i.MX8M # diff --git a/tools/imx8mimage.c b/tools/imx8mimage.c index 21075c2379..23ad72e828 100644 --- a/tools/imx8mimage.c +++ b/tools/imx8mimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2018 NXP * diff --git a/tools/imx_cntr_image.sh b/tools/imx_cntr_image.sh index 972b95ccbe..faa8982495 100755 --- a/tools/imx_cntr_image.sh +++ b/tools/imx_cntr_image.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # script to check whether the file exists in imximage.cfg for i.MX8 # diff --git a/tools/imximage.c b/tools/imximage.c index b3da1f244c..ca840fc187 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de. diff --git a/tools/kermit/README b/tools/kermit/README index 2b3f0b5cd4..81e89c55af 100644 --- a/tools/kermit/README +++ b/tools/kermit/README @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # (C) Copyright 2001 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 4dce495ff0..4013427af9 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Image manipulator for Marvell SoCs * supports Kirkwood, Dove, Armada 370, Armada XP, Armada 375, Armada 38x and diff --git a/tools/kwbimage.h b/tools/kwbimage.h index 505522332b..62d951005c 100644 --- a/tools/kwbimage.h +++ b/tools/kwbimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> diff --git a/tools/libfdt/fdt_rw.c b/tools/libfdt/fdt_rw.c index 7189f01429..f6c1b8d555 100644 --- a/tools/libfdt/fdt_rw.c +++ b/tools/libfdt/fdt_rw.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-or-later BSD-2-Clause */ #include "fdt_host.h" #include "../../scripts/dtc/libfdt/fdt_rw.c" diff --git a/tools/lpc32xximage.c b/tools/lpc32xximage.c index 715a55a5b5..d68c60d821 100644 --- a/tools/lpc32xximage.c +++ b/tools/lpc32xximage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Image manipulator for LPC32XX SoCs * diff --git a/tools/microcode-tool.py b/tools/microcode-tool.py index 24c02c4fca..15f5a80e4e 100755 --- a/tools/microcode-tool.py +++ b/tools/microcode-tool.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2014 Google, Inc # diff --git a/tools/mips-relocs.c b/tools/mips-relocs.c index 5db610f5c7..cf1fe9dff6 100644 --- a/tools/mips-relocs.c +++ b/tools/mips-relocs.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MIPS Relocation Data Generator * diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index a8eebab6c3..767bcf61a6 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 Free Electrons * David Wagner <david.wagner(a)free-electrons.com> diff --git a/tools/mkexynosspl.c b/tools/mkexynosspl.c index 53122b8614..fdb7656c97 100644 --- a/tools/mkexynosspl.c +++ b/tools/mkexynosspl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Samsung Electronics */ diff --git a/tools/mkfwumdata.c b/tools/mkfwumdata.c index 9732a8ddc5..0beef84104 100644 --- a/tools/mkfwumdata.c +++ b/tools/mkfwumdata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2023, Linaro Limited */ diff --git a/tools/mkimage.c b/tools/mkimage.c index 6dfe3e1d42..77bba9ddfb 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2008 Semihalf * diff --git a/tools/mkimage.h b/tools/mkimage.h index d92a3ff811..d4c29ee1bd 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2000-2004 * DENX Software Engineering diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c index becc36565b..c4ff5e1527 100644 --- a/tools/mksunxiboot.c +++ b/tools/mksunxiboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> diff --git a/tools/mtk_image.c b/tools/mtk_image.c index 1b1aed5992..2bd68107e5 100644 --- a/tools/mtk_image.c +++ b/tools/mtk_image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Generate MediaTek BootROM header for SPL/U-Boot images * diff --git a/tools/mtk_image.h b/tools/mtk_image.h index 54a838de86..094fbe89f0 100644 --- a/tools/mtk_image.h +++ b/tools/mtk_image.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MediaTek BootROM header definitions * diff --git a/tools/mtk_nand_headers.c b/tools/mtk_nand_headers.c index 2fa91e7af0..07f6f6e722 100644 --- a/tools/mtk_nand_headers.c +++ b/tools/mtk_nand_headers.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * MediaTek BootROM NAND header definitions * diff --git a/tools/mtk_nand_headers.h b/tools/mtk_nand_headers.h index 9b1c4bab11..266f5d37eb 100644 --- a/tools/mtk_nand_headers.h +++ b/tools/mtk_nand_headers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * MediaTek BootROM NAND header definitions * diff --git a/tools/mxsboot.c b/tools/mxsboot.c index 04d86f87a8..7cf0530ea6 100644 --- a/tools/mxsboot.c +++ b/tools/mxsboot.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX28 image generator * diff --git a/tools/mxsimage.c b/tools/mxsimage.c index ead61d0cd6..734fdfb87d 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Freescale i.MX23/i.MX28 SB image generator * diff --git a/tools/mxsimage.h b/tools/mxsimage.h index a6a45a4b03..b1ac30ce5d 100644 --- a/tools/mxsimage.h +++ b/tools/mxsimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Freescale i.MX28 SB image generator * diff --git a/tools/omap/clocks_get_m_n.c b/tools/omap/clocks_get_m_n.c index e21b0e2b60..0ef8874372 100644 --- a/tools/omap/clocks_get_m_n.c +++ b/tools/omap/clocks_get_m_n.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Program for finding M & N values for DPLLs * To be run on Host PC diff --git a/tools/omapimage.c b/tools/omapimage.c index b79c1c3b64..758681d973 100644 --- a/tools/omapimage.c +++ b/tools/omapimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2010 * Linaro LTD, www.linaro.org diff --git a/tools/omapimage.h b/tools/omapimage.h index 175fac2da6..6f717572ae 100644 --- a/tools/omapimage.h +++ b/tools/omapimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2010 * Linaro LTD, www.linaro.org diff --git a/tools/os_support.c b/tools/os_support.c index 6890c3183f..8fa7da6985 100644 --- a/tools/os_support.c +++ b/tools/os_support.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2009 Extreme Engineering Solutions, Inc. */ diff --git a/tools/os_support.h b/tools/os_support.h index 471d605f5c..6b59f3cd73 100644 --- a/tools/os_support.h +++ b/tools/os_support.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.0+ */ +/* SPDX-License-Identifier: LGPL-2.0-or-later */ /* * Copyright 2009 Extreme Engineering Solutions, Inc. */ diff --git a/tools/patman/__init__.py b/tools/patman/__init__.py index 08eeffdf6d..4d9891907b 100644 --- a/tools/patman/__init__.py +++ b/tools/patman/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later __all__ = ['checkpatch', 'commit', 'control', 'func_test', 'get_maintainer', 'gitutil', '__main__', 'patchstream', 'project', 'series', diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py index 8eba5d3486..a49cc7b3ef 100755 --- a/tools/patman/__main__.py +++ b/tools/patman/__main__.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index e03cac115e..a0bc5b00a7 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/commit.py b/tools/patman/commit.py index 684225c0e6..3bdfd36bc7 100644 --- a/tools/patman/commit.py +++ b/tools/patman/commit.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/control.py b/tools/patman/control.py index 916ddf8fcf..0e8e71b196 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 Google LLC # diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index e3918497cf..4352cb1077 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2017 Google, Inc # diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py index 8df3d124ba..3572ec728e 100644 --- a/tools/patman/get_maintainer.py +++ b/tools/patman/get_maintainer.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer(a)savoirfairelinux.com> # diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index b0a12f2e8c..e6f8f11f38 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index f91669a940..7ebbcb825e 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst index 038b651ee8..28026c333e 100644 --- a/tools/patman/patman.rst +++ b/tools/patman/patman.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later .. Copyright (c) 2011 The Chromium OS Authors .. Simon Glass <sjg(a)chromium.org> .. Maxim Cournoyer <maxim.cournoyer(a)savoirfairelinux.com> diff --git a/tools/patman/project.py b/tools/patman/project.py index 4459042b5d..136cc69a3f 100644 --- a/tools/patman/project.py +++ b/tools/patman/project.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2012 The Chromium OS Authors. # diff --git a/tools/patman/series.py b/tools/patman/series.py index 6866e1dbd0..5074ca8565 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 636983e32d..c138c0c786 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer(a)savoirfairelinux.com> # diff --git a/tools/patman/setup.py b/tools/patman/setup.py index 2ff791da0f..8ddb5c2e07 100644 --- a/tools/patman/setup.py +++ b/tools/patman/setup.py @@ -1,9 +1,9 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later from setuptools import setup setup(name='patman', version='1.0', - license='GPL-2.0+', + license='GPL-2.0-or-later', scripts=['patman'], packages=['patman'], package_dir={'patman': ''}, diff --git a/tools/patman/status.py b/tools/patman/status.py index 5fb436e08f..4d820e39f3 100644 --- a/tools/patman/status.py +++ b/tools/patman/status.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2020 Google LLC # diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index a8bb364e42..97d5740fe1 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Tests for U-Boot-specific checkpatch.pl features # @@ -267,7 +267,7 @@ index 0000000..2234c87 1.7.3.1 ''' signoff = 'Signed-off-by: Simon Glass <sjg(a)chromium.org>\n' - license = '// SPDX-License-Identifier: GPL-2.0+' + license = '// SPDX-License-Identifier: GPL-2.0-or-later' tab = ' ' indent = ' ' if data_type == 'good': diff --git a/tools/patman/test_settings.py b/tools/patman/test_settings.py index 06b7cbc3ab..f8342d29fd 100644 --- a/tools/patman/test_settings.py +++ b/tools/patman/test_settings.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2022 Maxim Cournoyer <maxim.cournoyer(a)savoirfairelinux.com> # diff --git a/tools/pbl_crc32.c b/tools/pbl_crc32.c index 9b1ca55348..268309cf8e 100644 --- a/tools/pbl_crc32.c +++ b/tools/pbl_crc32.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Freescale Semiconductor, Inc. * diff --git a/tools/pbl_crc32.h b/tools/pbl_crc32.h index 4320a47d4c..b982a6ed2c 100644 --- a/tools/pbl_crc32.h +++ b/tools/pbl_crc32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/tools/pblimage.c b/tools/pblimage.c index 6c4d360e46..c72e1cdf2a 100644 --- a/tools/pblimage.c +++ b/tools/pblimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012-2014 Freescale Semiconductor, Inc. */ diff --git a/tools/pblimage.h b/tools/pblimage.h index 0222e8067b..78621914ed 100644 --- a/tools/pblimage.h +++ b/tools/pblimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright 2012 Freescale Semiconductor, Inc. */ diff --git a/tools/prelink-riscv.c b/tools/prelink-riscv.c index 43d6412ee9..c55b7e2d95 100644 --- a/tools/prelink-riscv.c +++ b/tools/prelink-riscv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Andes Technology * Chih-Mao Chen <cmchen(a)andestech.com> diff --git a/tools/prelink-riscv.inc b/tools/prelink-riscv.inc index 57c0f655d4..3b4610815d 100644 --- a/tools/prelink-riscv.inc +++ b/tools/prelink-riscv.inc @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2017 Andes Technology * Chih-Mao Chen <cmchen(a)andestech.com> diff --git a/tools/printinitialenv.c b/tools/printinitialenv.c index c58b234d67..e1878b8c10 100644 --- a/tools/printinitialenv.c +++ b/tools/printinitialenv.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2022 * Max Krummenacher, Toradex diff --git a/tools/proftool.c b/tools/proftool.c index fca45e4a5a..79bc624457 100644 --- a/tools/proftool.c +++ b/tools/proftool.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2023 Google LLC * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/qconfig.py b/tools/qconfig.py index 04118d942d..3997a20e39 100755 --- a/tools/qconfig.py +++ b/tools/qconfig.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> # diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c index 613abd25ef..17abe5acac 100644 --- a/tools/relocate-rela.c +++ b/tools/relocate-rela.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause /* * Copyright 2013 Freescale Semiconductor, Inc. * diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 12c27b34ea..a96d411198 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/rkcommon.h b/tools/rkcommon.h index 5d2770a80f..85b1daa62e 100644 --- a/tools/rkcommon.h +++ b/tools/rkcommon.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/rkimage.c b/tools/rkimage.c index 1c5540b1c3..c68577279f 100644 --- a/tools/rkimage.c +++ b/tools/rkimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/rksd.c b/tools/rksd.c index 7d46a1b07b..fa8d1eb097 100644 --- a/tools/rksd.c +++ b/tools/rksd.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/rkspi.c b/tools/rkspi.c index f2530f7bde..b085d56ce8 100644 --- a/tools/rkspi.c +++ b/tools/rkspi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/tools/rmboard.py b/tools/rmboard.py index 0c56b149e0..39bdc700f2 100755 --- a/tools/rmboard.py +++ b/tools/rmboard.py @@ -1,5 +1,5 @@ #! /usr/bin/python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2019 Google LLC # diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 953dfeed4d..4297208706 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2014 Charles Manning <cdhmanning(a)gmail.com> * diff --git a/tools/spl_size_limit.c b/tools/spl_size_limit.c index c6c139e834..c274e2bbab 100644 --- a/tools/spl_size_limit.c +++ b/tools/spl_size_limit.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2019, Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> * diff --git a/tools/stm32image.c b/tools/stm32image.c index 5c6991f35d..be78787221 100644 --- a/tools/stm32image.c +++ b/tools/stm32image.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause /* * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */ diff --git a/tools/sunxi_egon.c b/tools/sunxi_egon.c index a514427809..d1ec0332c7 100644 --- a/tools/sunxi_egon.c +++ b/tools/sunxi_egon.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Arm Ltd. */ diff --git a/tools/sunxi_toc0.c b/tools/sunxi_toc0.c index 292649fe90..154cbaaae2 100644 --- a/tools/sunxi_toc0.c +++ b/tools/sunxi_toc0.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2018 Arm Ltd. * (C) Copyright 2020-2021 Samuel Holland <samuel(a)sholland.org> diff --git a/tools/termios_linux.h b/tools/termios_linux.h index 0806a91180..b481636905 100644 --- a/tools/termios_linux.h +++ b/tools/termios_linux.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * termios fuctions to support arbitrary baudrates (on Linux) * diff --git a/tools/u_boot_pylib/README.rst b/tools/u_boot_pylib/README.rst index 93858f5571..b553bfc74d 100644 --- a/tools/u_boot_pylib/README.rst +++ b/tools/u_boot_pylib/README.rst @@ -1,4 +1,4 @@ -.. SPDX-License-Identifier: GPL-2.0+ +.. SPDX-License-Identifier: GPL-2.0-or-later # U-Boot Python Library ===================== diff --git a/tools/u_boot_pylib/__init__.py b/tools/u_boot_pylib/__init__.py index 63c88e85ec..cb84a0ab94 100644 --- a/tools/u_boot_pylib/__init__.py +++ b/tools/u_boot_pylib/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later __all__ = ['command', 'cros_subprocess','terminal', 'test_util', 'tools', 'tout'] diff --git a/tools/u_boot_pylib/__main__.py b/tools/u_boot_pylib/__main__.py index 8f98d7bd9f..932ce7a1d4 100755 --- a/tools/u_boot_pylib/__main__.py +++ b/tools/u_boot_pylib/__main__.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright 2023 Google LLC # diff --git a/tools/u_boot_pylib/command.py b/tools/u_boot_pylib/command.py index 9bbfc5bdd8..ab02110f18 100644 --- a/tools/u_boot_pylib/command.py +++ b/tools/u_boot_pylib/command.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/u_boot_pylib/terminal.py b/tools/u_boot_pylib/terminal.py index 40d79f8ac0..3805786d16 100644 --- a/tools/u_boot_pylib/terminal.py +++ b/tools/u_boot_pylib/terminal.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2011 The Chromium OS Authors. # diff --git a/tools/u_boot_pylib/test_util.py b/tools/u_boot_pylib/test_util.py index f18d385d99..7f5f532ed3 100644 --- a/tools/u_boot_pylib/test_util.py +++ b/tools/u_boot_pylib/test_util.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc # diff --git a/tools/u_boot_pylib/tools.py b/tools/u_boot_pylib/tools.py index 187725b501..7c827aca63 100644 --- a/tools/u_boot_pylib/tools.py +++ b/tools/u_boot_pylib/tools.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # # Copyright (c) 2016 Google, Inc # diff --git a/tools/u_boot_pylib/tout.py b/tools/u_boot_pylib/tout.py index 6bd2806f88..a1ef71abc1 100644 --- a/tools/u_boot_pylib/tout.py +++ b/tools/u_boot_pylib/tout.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2016 Google, Inc # # Terminal output logging. diff --git a/tools/ublimage.c b/tools/ublimage.c index 8f9b58c798..2567a14eb6 100644 --- a/tools/ublimage.c +++ b/tools/ublimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/tools/ublimage.h b/tools/ublimage.h index 65d6aa1ff0..053e27db65 100644 --- a/tools/ublimage.h +++ b/tools/ublimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. diff --git a/tools/vybridimage.c b/tools/vybridimage.c index c38886fa90..abec903b0f 100644 --- a/tools/vybridimage.c +++ b/tools/vybridimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Image manipulator for Vybrid SoCs * diff --git a/tools/zynqimage.c b/tools/zynqimage.c index 359c93d1ac..8692a80477 100644 --- a/tools/zynqimage.c +++ b/tools/zynqimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Nathan Rossi <nathan(a)nathanrossi.com> * diff --git a/tools/zynqmp_pm_cfg_obj_convert.py b/tools/zynqmp_pm_cfg_obj_convert.py index 239991a526..5f8583aa09 100755 --- a/tools/zynqmp_pm_cfg_obj_convert.py +++ b/tools/zynqmp_pm_cfg_obj_convert.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019 Luca Ceresoli <luca(a)lucaceresoli.net> import sys diff --git a/tools/zynqmp_psu_init_minimize.sh b/tools/zynqmp_psu_init_minimize.sh index 5c8b73703b..96eea15f95 100755 --- a/tools/zynqmp_psu_init_minimize.sh +++ b/tools/zynqmp_psu_init_minimize.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2018 Michal Simek <michal.simek(a)amd.com> # Copyright (C) 2019 Luca Ceresoli <luca(a)lucaceresoli.net> # Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG @@ -100,7 +100,7 @@ sed -ri 's/return $([0-9]+)$/return \1/g' ${OUT} # Add header cat << EOF >${TMP} -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * (c) Copyright 2015 Xilinx, Inc. All rights reserved. */ diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c index 82ce0ac1a5..72cb9db57e 100644 --- a/tools/zynqmpbif.c +++ b/tools/zynqmpbif.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2018 Alexander Graf <agraf(a)suse.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "imagetool.h" diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index bb54f41a15..ef0e58a223 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2016 Michal Simek <michal.simek(a)amd.com> * Copyright (C) 2015 Nathan Rossi <nathan(a)nathanrossi.com> diff --git a/tools/zynqmpimage.h b/tools/zynqmpimage.h index ca7489835a..ed18cd1032 100644 --- a/tools/zynqmpimage.h +++ b/tools/zynqmpimage.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * Copyright (C) 2016 Michal Simek <michal.simek(a)amd.com> * Copyright (C) 2015 Nathan Rossi <nathan(a)nathanrossi.com> -- 2.40.1

4 7

[PATCH 0/4] bootstd: Test and boot_targets improvements
by Simon Glass 23 Oct '23

23 Oct '23

This series makes another attempt to support things like "mmc" in the boot_targets variable. The previous attempt introduced a bug which made iteration fail. New test coverage is provided for some previously untested behaviour, to prevent regressions. Simon Glass (4): Revert "bootstd: Scan all bootdevs in a boot_targets entry" bootstd: Expand boot-ordering test to include USB bootstd: Correct logic for single uclass bootstd: Scan all bootdevs in a boot_targets entry (take 2) boot/bootflow.c | 29 ++++++++++++++++++++---- test/boot/bootdev.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 73 insertions(+), 10 deletions(-) -- 2.42.0.655.g421f12c284-goog

3 7

[RESEND PATCH] bootstd: sata: bootdev scanning for ahci sata with no drive attached
by Tony Dinh 23 Oct '23

23 Oct '23

It's normal to have no SATA drive attached to the controller, so return a successful status when there is no block device found after probing. Note: this patch depends on the previous patch https://patchwork.ozlabs.org/project/uboot/patch/20230917230649.30357-1-mib… Resend the right patch. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- drivers/ata/sata.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c index f126b84e05..dcb5fcf476 100644 --- a/drivers/ata/sata.c +++ b/drivers/ata/sata.c @@ -79,6 +79,12 @@ int sata_rescan(bool verbose) ret = uclass_probe_all(UCLASS_AHCI); + if (ret == -ENODEV) { + if (verbose) + printf("No SATA block device found\n"); + return 0; + } + return ret; } -- 2.39.2

4 3

[PATCH] CI: Re-enable maintainer check
by Tom Rini 23 Oct '23

23 Oct '23

At this point we have all of the defconfigs maintained again, so re-enable the check to prevent further regressions. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 6f91553e8613..eb9353fc3dcf 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -91,7 +91,7 @@ stages: options: $(container_option) steps: - script: | - ./tools/buildman/buildman --maintainer-check || exit 0 + ./tools/buildman/buildman --maintainer-check - job: tools_only displayName: 'Ensure host tools and env tools build' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6decdfdee334..1e11b5a6fea8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -177,7 +177,7 @@ docs: Check for configs without MAINTAINERS entry: extends: .testsuites script: - - ./tools/buildman/buildman --maintainer-check || exit 0 + - ./tools/buildman/buildman --maintainer-check # Ensure host tools build Build tools-only and envtools: -- 2.34.1

2 2

[PATCH] ae350: Update defconfig list
by Tom Rini 23 Oct '23

23 Oct '23

Update the list of defconfigs, this was missed with the last pull request of the u-boot-riscv tree. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/AndesTech/ae350/MAINTAINERS | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/board/AndesTech/ae350/MAINTAINERS b/board/AndesTech/ae350/MAINTAINERS index ead8e0e2afb6..a6bc90baf883 100644 --- a/board/AndesTech/ae350/MAINTAINERS +++ b/board/AndesTech/ae350/MAINTAINERS @@ -4,10 +4,14 @@ S: Maintained F: board/AndesTech/ae350/ F: include/configs/ae350.h F: configs/ae350_rv32_defconfig -F: configs/ae350_rv64_defconfig -F: configs/ae350_rv32_xip_defconfig -F: configs/ae350_rv64_xip_defconfig +F: configs/ae350_rv32_falcon_defconfig +F: configs/ae350_rv32_falcon_xip_defconfig F: configs/ae350_rv32_spl_defconfig -F: configs/ae350_rv64_spl_defconfig F: configs/ae350_rv32_spl_xip_defconfig +F: configs/ae350_rv32_xip_defconfig +F: configs/ae350_rv64_defconfig +F: configs/ae350_rv64_falcon_defconfig +F: configs/ae350_rv64_falcon_xip_defconfig +F: configs/ae350_rv64_spl_defconfig F: configs/ae350_rv64_spl_xip_defconfig +F: configs/ae350_rv64_xip_defconfig -- 2.34.1

1 1

← Newer
1
...
33
34
35
36
37
38
39
...
78
Older →

Jump to page: