diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /common | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
77 files changed, 77 insertions, 158 deletions
diff --git a/common/Makefile b/common/Makefile index 7011dada993..d0681c7dd96 100644 --- a/common/Makefile +++ b/common/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2004-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # core ifndef CONFIG_SPL_BUILD diff --git a/common/autoboot.c b/common/autoboot.c index 2eef7a04cc7..9b9fb534f08 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/board_f.c b/common/board_f.c index ae8bdb7c5c0..fa667c764bc 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002-2006 @@ -6,8 +7,6 @@ * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/board_info.c b/common/board_info.c index 16cf966233e..a392bece62c 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +// SPDX-License-Identifier: GPL-2.0+ #include <common.h> #include <linux/libfdt.h> diff --git a/common/board_r.c b/common/board_r.c index 7a3d4ca088e..6b297068bd2 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. * (C) Copyright 2002-2006 @@ -6,8 +7,6 @@ * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/boot_fit.c b/common/boot_fit.c index 4b5cec58d08..ffa4d740eb3 100644 --- a/common/boot_fit.c +++ b/common/boot_fit.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2017 * Texas Instruments, <www.ti.com> * * Franklin S Cooper Jr. <fcooper@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <boot_fit.h> diff --git a/common/bootm.c b/common/bootm.c index 36162917a1b..61e8075377e 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef USE_HOSTCC diff --git a/common/bootm_os.c b/common/bootm_os.c index b84a8e26d2c..f4bd9059094 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/bootretry.c b/common/bootretry.c index b3b8271a923..072055b0105 100644 --- a/common/bootretry.c +++ b/common/bootretry.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/bootstage.c b/common/bootstage.c index b1d4ee84e7e..9793b85d4e4 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011, Google Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/common/bouncebuf.c b/common/bouncebuf.c index 054d9e0302c..a7098e2caf4 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Generic bounce buffer implementation * * Copyright (C) 2012 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cli.c b/common/cli.c index 57874d87977..51b8d5f85cb 100644 --- a/common/cli.c +++ b/common/cli.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,6 @@ * Add to readline cmdline-editing by * (C) Copyright 2005 * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cli_hush.c b/common/cli_hush.c index 07c048ec6a9..955e8fe5367 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * sh.c -- a prototype Bourne shell grammar parser * Intended to follow the original Thompson and Ritchie @@ -70,8 +71,6 @@ * document how quoting rules not precisely followed for variable assignments * maybe change map[] to use 2-bit entries * (eventually) remove all the printf's - * - * SPDX-License-Identifier: GPL-2.0+ */ #define __U_BOOT__ diff --git a/common/cli_readline.c b/common/cli_readline.c index ecded11ca39..60a232b065e 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,6 @@ * Add to readline cmdline-editing by * (C) Copyright 2005 * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cli_simple.c b/common/cli_simple.c index cb642d2ff3b..311880ad56a 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,6 @@ * Add to readline cmdline-editing by * (C) Copyright 2005 * JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/command.c b/common/command.c index 21a6d409fba..52d47c133c3 100644 --- a/common/command.c +++ b/common/command.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/common_fit.c b/common/common_fit.c index 3fef74084cc..577b352554c 100644 --- a/common/common_fit.c +++ b/common/common_fit.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/console.c b/common/console.c index b9297e0fc49..2688af56e15 100644 --- a/common/console.c +++ b/common/console.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/ddr_spd.c b/common/ddr_spd.c index 0aa1cbf5f1c..58dc9b3781b 100644 --- a/common/ddr_spd.c +++ b/common/ddr_spd.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright 2008-2014 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/common/dfu.c b/common/dfu.c index 07dff317a6c..2620d3238b1 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * dfu.c -- dfu command * @@ -7,8 +8,6 @@ * Copyright (C) 2012 Samsung Electronics * authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com> * Lukasz Majewski <l.majewski@samsung.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/edid.c b/common/edid.c index 3d0809ad11c..90d1167f6ee 100644 --- a/common/edid.c +++ b/common/edid.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012 The Chromium OS Authors. * * (C) Copyright 2010 * Petr Stetiar <ynezz@true.cz> * - * SPDX-License-Identifier: GPL-2.0+ - * * Contains stolen code from ddcprobe project which is: * Copyright (C) Nalin Dahyabhai <bigfun@pobox.com> */ diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c index 7f095a64a28..f56eebe679f 100644 --- a/common/eeprom/eeprom_field.c +++ b/common/eeprom/eeprom_field.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009-2016 CompuLab, Ltd. * * Authors: Nikita Kiryanov <nikita@compulab.co.il> * Igor Grinberg <grinberg@compulab.co.il> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c index c05923328a6..5a9be1da061 100644 --- a/common/eeprom/eeprom_layout.c +++ b/common/eeprom/eeprom_layout.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009-2016 CompuLab, Ltd. * * Authors: Nikita Kiryanov <nikita@compulab.co.il> * Igor Grinberg <grinberg@compulab.co.il> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/fb_mmc.c b/common/fb_mmc.c index cf5b77ca287..b748b15f638 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/common/fb_nand.c b/common/fb_nand.c index aa28046cbd8..3df0f7287e1 100644 --- a/common/fb_nand.c +++ b/common/fb_nand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Broadcom Corporation. * Copyright 2015 Free Electrons. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/common/fdt_support.c b/common/fdt_support.c index 66a313e2ae9..812eca8173b 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com * * Copyright 2010-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/flash.c b/common/flash.c index 876677493f5..efe8f53de66 100644 --- a/common/flash.c +++ b/common/flash.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ diff --git a/common/hash.c b/common/hash.c index 69d53ed251c..ef146513a07 100644 --- a/common/hash.c +++ b/common/hash.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2012 The Chromium OS Authors. * @@ -6,8 +7,6 @@ * * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef USE_HOSTCC diff --git a/common/hwconfig.c b/common/hwconfig.c index e5186d77968..e9e956a3223 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * An inteface for configuring a hardware via u-boot environment. * @@ -5,8 +6,6 @@ * Copyright 2011 Freescale Semiconductor, Inc. * * Author: Anton Vorontsov <avorontsov@ru.mvista.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef HWCONFIG_TEST diff --git a/common/image-android.c b/common/image-android.c index 5ad3a1fa38a..2f38c191e91 100644 --- a/common/image-android.c +++ b/common/image-android.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 Sebastian Andrzej Siewior <bigeasy@linutronix.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/image-fdt.c b/common/image-fdt.c index 3dc02a12191..9b41f162484 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, Google Inc. * @@ -5,8 +6,6 @@ * * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/image-fit.c b/common/image-fit.c index 030a3e579f5..9798fcd1306 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, Google Inc. * @@ -5,8 +6,6 @@ * * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifdef USE_HOSTCC diff --git a/common/image-sig.c b/common/image-sig.c index d9f712fc1e0..f65d883994b 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, Google Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifdef USE_HOSTCC diff --git a/common/image.c b/common/image.c index e1c50eb25d0..4eae585218b 100644 --- a/common/image.c +++ b/common/image.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 Semihalf * * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef USE_HOSTCC diff --git a/common/init/board_init.c b/common/init/board_init.c index 4a391beba98..526fee35ff6 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Code shared between SPL and U-Boot proper * * Copyright (c) 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/iomux.c b/common/iomux.c index 0e4e6803e7a..7cfd9f2e916 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/iotrace.c b/common/iotrace.c index 2725563e8f9..b16b0d612dd 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2014 Google, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #define IOTRACE_IMPL diff --git a/common/lcd.c b/common/lcd.c index 4b3d7dcd34b..2e2bef3848f 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Common LCD routines * * (C) Copyright 2001-2002 * Wolfgang Denk, DENX Software Engineering -- wd@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ diff --git a/common/lcd_console.c b/common/lcd_console.c index bb0d7c54858..7d1f8830131 100644 --- a/common/lcd_console.c +++ b/common/lcd_console.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001-2015 * DENX Software Engineering -- wd@denx.de * Compulab Ltd - http://compulab.co.il/ * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/lcd_console_rotation.c b/common/lcd_console_rotation.c index 7aac521348e..a5f5c6da7be 100644 --- a/common/lcd_console_rotation.c +++ b/common/lcd_console_rotation.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/lcd_simplefb.c b/common/lcd_simplefb.c index 81f3f42191c..fca600691e9 100644 --- a/common/lcd_simplefb.c +++ b/common/lcd_simplefb.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Simplefb device tree support * * (C) Copyright 2015 * Stephen Warren <swarren@wwwdotorg.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/log.c b/common/log.c index 66d5e3ebf85..3b5588ebe7a 100644 --- a/common/log.c +++ b/common/log.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Logging support * * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/log_console.c b/common/log_console.c index 29027330783..0b5b7089af8 100644 --- a/common/log_console.c +++ b/common/log_console.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Logging support * * Copyright (c) 2017 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/main.c b/common/main.c index 66a03a156eb..9802bed229c 100644 --- a/common/main.c +++ b/common/main.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 611400265ba..c14f8b59c17 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Simple malloc implementation * * Copyright (c) 2014 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/memsize.c b/common/memsize.c index c31527567c3..5670e951371 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/menu.c b/common/menu.c index c53030f3653..bf2b471ff87 100644 --- a/common/menu.c +++ b/common/menu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2010-2011 Calxeda, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 8eb0f761bb0..8d89751122b 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/s_record.c b/common/s_record.c index aa82668a0e7..2b7651fcffc 100644 --- a/common/s_record.c +++ b/common/s_record.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/Makefile b/common/spl/Makefile index 9bf8a2d81a4..814081fedab 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2012 # Texas Instruments Incorporated - http://www.ti.com/ # Aneesh V <aneesh@ti.com> -# -# SPDX-License-Identifier: GPL-2.0+ -# # Based on common/Makefile. # diff --git a/common/spl/spl.c b/common/spl/spl.c index 794dbd03124..3dafeaed3a1 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 5f9aa95e307..cddab6a7358 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: BSD-3-Clause /* * Reference to the ARM TF Project, * plat/arm/common/arm_bl2_setup.c @@ -6,8 +7,6 @@ * Copyright (C) 2016 Rockchip Electronic Co.,Ltd * Written by Kever Yang <kever.yang@rock-chips.com> * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH - * - * SPDX-License-Identifier: BSD-3-Clause */ #include <common.h> diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 6804246d03f..076f5d8d935 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index 05bb21035df..b8e3a6c89eb 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 * Texas Instruments, <www.ti.com> * * Ravi B <ravibabu@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <spl.h> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 559ba0b7971..fd30a61f9ad 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +// SPDX-License-Identifier: GPL-2.0+ #include <common.h> #include <spl.h> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 59a85a986a3..87dd5532103 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> * * Dan Murphy <dmurphy@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * FAT Image Functions copied from spl_mmc.c */ diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 9f03e2648a3..8b5befcec2b 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index e780b82fd2b..db5be3dfa5f 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <dm.h> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index d0759853745..9a525006140 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <config.h> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 33f3b74a970..b6967ff69ee 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2012 * Ilya Yanok <ilya.yanok@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <errno.h> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 1ef8ac8b89b..bb6194fafdc 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Stefan Roese <sr@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index fc98e9cbe58..d32333935a7 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 * ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com> @@ -5,8 +6,6 @@ * Based on common/spl/spl_nand.c * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <config.h> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index a15761e309f..e8701934b87 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 * Xilinx, Inc. @@ -7,8 +8,6 @@ * * Michal Simek <michal.simek@xilinx.com> * Stefan Agner <stefan.agner@toradex.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <binman_sym.h> diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 357f8e5bd96..adfce1d527f 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 * Texas Instruments, <www.ti.com> * * Dan Murphy <dmurphy@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Derived work from spl_usb.c */ diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 69390edcbae..807256e908c 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Toradex * Author: Stefan Agner <stefan.agner@toradex.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 42880d56b91..df460467298 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 OMICRON electronics GmbH * @@ -5,8 +6,6 @@ * * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 5aac10bd573..c8d82318957 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * Texas Instruments, <www.ti.com> * * Dan Murphy <dmurphy@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Derived work from spl_mmc.c */ diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 3f6420ba1e9..1af4da87255 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017, STMicroelectronics - All Rights Reserved * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 4ab3dcd624d..35f8f80013a 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Matt Porter <mporter@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <spl.h> diff --git a/common/splash_source.c b/common/splash_source.c index e0defdebd6a..62763b9ebd5 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 CompuLab, Ltd. <www.compulab.co.il> * * Authors: Igor Grinberg <grinberg@compulab.co.il> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/stdio.c b/common/stdio.c index 2e5143a0255..ee22c1fd585 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2009 Sergey Kubushyn <ksi@koi8.net> * @@ -5,8 +6,6 @@ * * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/common/update.c b/common/update.c index ef61790f4bc..f237ea53bb2 100644 --- a/common/update.c +++ b/common/update.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 Semihalf * * Written by: Rafal Czubak <rcz@semihalf.com> * Bartlomiej Sieka <tur@semihalf.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/usb.c b/common/usb.c index 8d27bc70607..78178c54c89 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Most of this source has been derived from the Linux USB * project: @@ -13,8 +14,6 @@ * * Adapted for U-Boot: * (C) Copyright 2001 Denis Peter, MPL AG Switzerland - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/usb_hub.c b/common/usb_hub.c index 0729a20df48..e1d93b83335 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Most of this source has been derived from the Linux USB * project: @@ -13,8 +14,6 @@ * * Adapted for U-Boot: * (C) Copyright 2001 Denis Peter, MPL AG Switzerland - * - * SPDX-License-Identifier: GPL-2.0+ */ /**************************************************************************** diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 8cbdba6ac29..8b2fccf9ca4 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland * * Part of this source has been derived from the Linux USB * project. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <console.h> diff --git a/common/usb_storage.c b/common/usb_storage.c index a91b1c0d2f9..9cd64744f8a 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Most of this source has been derived from the Linux USB * project: @@ -17,8 +18,6 @@ * * BBB support based on /sys/dev/usb/umass.c from * FreeBSD. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Note: diff --git a/common/xyzModem.c b/common/xyzModem.c index a0c5dfeece5..a126e32ed35 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: eCos-2.0 /* *========================================================================== * @@ -6,8 +7,6 @@ * RedBoot stream handler for xyzModem protocol * *========================================================================== - * SPDX-License-Identifier: eCos-2.0 - *========================================================================== *#####DESCRIPTIONBEGIN#### * * Author(s): gthomas |