Complete in the drivers directory the work started with commit 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style").

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---

drivers/adc/Makefile | 3 +-- drivers/axi/Makefile | 3 +-- drivers/board/Makefile | 2 +- drivers/board/gazerbeam.h | 1 - drivers/clk/Makefile | 3 +-- drivers/clk/altera/Makefile | 3 +-- drivers/clk/aspeed/Makefile | 3 +-- drivers/clk/owl/Makefile | 2 +- drivers/clk/rockchip/Makefile | 3 +-- drivers/clk/tegra/Makefile | 3 ++- drivers/cpu/Makefile | 4 ++-- drivers/fastboot/Makefile | 2 +- drivers/mailbox/Makefile | 3 ++- drivers/misc/fs_loader.c | 4 ++-- drivers/net/pfe_eth/Makefile | 3 ++- drivers/phy/allwinner/Makefile | 4 ++-- drivers/power/domain/Makefile | 3 ++- drivers/power/regulator/Makefile | 3 +-- drivers/ram/Makefile | 3 +-- drivers/ram/rockchip/Makefile | 3 +-- drivers/reset/Makefile | 3 ++- drivers/usb/common/Makefile | 4 ++-- drivers/usb/dwc3/dwc3-generic.c | 2 +- drivers/video/tegra124/Makefile | 3 +-- 24 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/drivers/adc/Makefile b/drivers/adc/Makefile index cca0fec..c1387f3 100644 --- a/drivers/adc/Makefile +++ b/drivers/adc/Makefile @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Samsung Electronics # Przemyslaw Marczak p.marczak@samsung.com # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_ADC) += adc-uclass.o obj-$(CONFIG_ADC_EXYNOS) += exynos-adc.o diff --git a/drivers/axi/Makefile b/drivers/axi/Makefile index 66b6c5a..045db1a 100644 --- a/drivers/axi/Makefile +++ b/drivers/axi/Makefile @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 # Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_AXI) += axi-uclass.o obj-$(CONFIG_IHS_AXI) += ihs_axi.o diff --git a/drivers/board/Makefile b/drivers/board/Makefile index 2224338..c8dab4f 100644 --- a/drivers/board/Makefile +++ b/drivers/board/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 # Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc diff --git a/drivers/board/gazerbeam.h b/drivers/board/gazerbeam.h index 0ca003a..171729d 100644 --- a/drivers/board/gazerbeam.h +++ b/drivers/board/gazerbeam.h @@ -3,7 +3,6 @@ * (C) Copyright 2017 * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc * - * SPDX-License-Identifier: GPL-2.0+ */

enum { diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 8bc9f52..abd112d 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_$(SPL_TPL_)CLK) += clk-uclass.o clk_fixed_rate.o

diff --git a/drivers/clk/altera/Makefile b/drivers/clk/altera/Makefile index 2542b7f..a3ae8b2 100644 --- a/drivers/clk/altera/Makefile +++ b/drivers/clk/altera/Makefile @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2018 Marek Vasut marex@denx.de # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += clk-arria10.o diff --git a/drivers/clk/aspeed/Makefile b/drivers/clk/aspeed/Makefile index 65d1cd6..81764b4 100644 --- a/drivers/clk/aspeed/Makefile +++ b/drivers/clk/aspeed/Makefile @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_ASPEED_AST2500) += clk_ast2500.o diff --git a/drivers/clk/owl/Makefile b/drivers/clk/owl/Makefile index 9132dcc..63ab573 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+

obj-$(CONFIG_CLK_S900) += clk_s900.o diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile index eae0ef6..41cfb7a 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Rockchip Electronics Co., Ltd # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_ROCKCHIP_RK3036) += clk_rk3036.o obj-$(CONFIG_ROCKCHIP_RK3128) += clk_rk3128.o diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile index 0fcc5205..7f1a318 100644 --- a/drivers/clk/tegra/Makefile +++ b/drivers/clk/tegra/Makefile @@ -1,6 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# # Copyright (c) 2016, NVIDIA CORPORATION. # -# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_TEGRA_CAR_CLOCK) += tegra-car-clk.o obj-$(CONFIG_TEGRA186_CLOCK) += tegra186-clk.o diff --git a/drivers/cpu/Makefile b/drivers/cpu/Makefile index f452ee4..858b037 100644 --- a/drivers/cpu/Makefile +++ b/drivers/cpu/Makefile @@ -1,9 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -# SPDX-License-Identifier: GPL-2.0+ -# + obj-$(CONFIG_CPU) += cpu-uclass.o

obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.o diff --git a/drivers/fastboot/Makefile b/drivers/fastboot/Makefile index a242156..048af5a 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+

obj-y += fb_common.o obj-y += fb_getvar.o diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile index 243ff6f..cd23769 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -1,6 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# # Copyright (c) 2016, NVIDIA CORPORATION. # -# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox-uclass.o obj-$(CONFIG_SANDBOX_MBOX) += sandbox-mbox.o diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index 5fe642b..b7bb96a 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -1,7 +1,7 @@ -/* +// SPDX-License-Identifier: GPL-2.0 + /* * Copyright (C) 2018 Intel Corporation <www.intel.com> * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> #include <dm.h> diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile index 6b5248f..ab5a7b2 100644 --- a/drivers/net/pfe_eth/Makefile +++ b/drivers/net/pfe_eth/Makefile @@ -1,7 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ +# # Copyright 2015-2016 Freescale Semiconductor, Inc. # Copyright 2017 NXP # -# SPDX-License-Identifier:GPL-2.0+

# Layerscape PFE driver obj-y += pfe_cmd.o \ diff --git a/drivers/phy/allwinner/Makefile b/drivers/phy/allwinner/Makefile index 5ed2702..e709fca 100644 --- a/drivers/phy/allwinner/Makefile +++ b/drivers/phy/allwinner/Makefile @@ -1,6 +1,6 @@ -# Copyright (C) 2016 Amarula Solutions +# SPDX-License-Identifier: GPL-2.0+ # -# SPDX-License-Identifier: GPL-2.0+ +# Copyright (C) 2016 Amarula Solutions #

obj-$(CONFIG_PHY_SUN4I_USB) += phy-sun4i-usb.o diff --git a/drivers/power/domain/Makefile b/drivers/power/domain/Makefile index 6bdaa17..15926be 100644 --- a/drivers/power/domain/Makefile +++ b/drivers/power/domain/Makefile @@ -1,6 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# # Copyright (c) 2016, NVIDIA CORPORATION. # -# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_$(SPL_)POWER_DOMAIN) += power-domain-uclass.o obj-$(CONFIG_BCM6328_POWER_DOMAIN) += bcm6328-power-domain.o diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 16208af..a5f5683 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Samsung Electronics # Przemyslaw Marczak p.marczak@samsung.com # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_$(SPL_)DM_REGULATOR) += regulator-uclass.o obj-$(CONFIG_REGULATOR_ACT8846) += act8846.o diff --git a/drivers/ram/Makefile b/drivers/ram/Makefile index 4ad3604..cfba57f 100644 --- a/drivers/ram/Makefile +++ b/drivers/ram/Makefile @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2015 Google, Inc # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_RAM) += ram-uclass.o obj-$(CONFIG_MPC83XX_SDRAM) += mpc83xx_sdram.o obj-$(CONFIG_SANDBOX) += sandbox_ram.o diff --git a/drivers/ram/rockchip/Makefile b/drivers/ram/rockchip/Makefile index 1a1e557..5df1960 100644 --- a/drivers/ram/rockchip/Makefile +++ b/drivers/ram/rockchip/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-$(CONFIG_ROCKCHIP_RK3368) = dmc-rk3368.o obj-$(CONFIG_ROCKCHIP_RK3128) = sdram_rk3128.o diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index abdfa0c..f452087 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -1,6 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# # Copyright (c) 2016, NVIDIA CORPORATION. # -# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_DM_RESET) += reset-uclass.o obj-$(CONFIG_SANDBOX_MBOX) += sandbox-reset.o diff --git a/drivers/usb/common/Makefile b/drivers/usb/common/Makefile index aee7e32..55e0547 100644 --- a/drivers/usb/common/Makefile +++ b/drivers/usb/common/Makefile @@ -1,6 +1,6 @@ -# (C) Copyright 2016 Freescale Semiconductor, Inc. +# SPDX-License-Identifier: GPL-2.0+ # -# SPDX-License-Identifier: GPL-2.0+ +# (C) Copyright 2016 Freescale Semiconductor, Inc. #

obj-$(CONFIG_DM_USB) += common.o diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index ca63eac..56c9fd6 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 /* * Generic DWC3 Glue layer * diff --git a/drivers/video/tegra124/Makefile b/drivers/video/tegra124/Makefile index 4287b9a..a378382 100644 --- a/drivers/video/tegra124/Makefile +++ b/drivers/video/tegra124/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2014 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -#

obj-y += display.o obj-y += dp.o