Re: [PATCH 3/3] common: replace license statements with SPDX-License-Identifiers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Nov 23, 2020 at 05:01:28PM +0100, Ahmad Fatoum wrote:
> For all files in common/ that already have a license text:
>   - Replace with appropriate SPDX-License-Identifier
>   - Remove empty comment lines around replacement
>   - remove comment completely if only thing remaining is name
>     of file without description
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> Cc: Roland Hieber <rhi@xxxxxxxxxxxxxx>
> Cc: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>

Like Uwe already said, two instances of "o" instead of "only", otherwise
looks correct to me.

Reviewed-by: Roland Hieber <rhi@xxxxxxxxxxxxxx>

> ---
>  common/bbu.c               | 10 +---------
>  common/binfmt.c            |  3 +--
>  common/block.c             | 11 +----------
>  common/blspec.c            | 13 +------------
>  common/boot.c              | 11 +----------
>  common/bootargs.c          | 11 +----------
>  common/bootchooser.c       | 11 +----------
>  common/bootm.c             | 13 +------------
>  common/bootsource.c        | 13 +------------
>  common/clock.c             | 11 +----------
>  common/command.c           | 12 +-----------
>  common/complete.c          | 11 +----------
>  common/console.c           | 12 +-----------
>  common/console_common.c    | 12 +-----------
>  common/console_countdown.c | 11 +----------
>  common/date.c              | 12 +-----------
>  common/ddr_spd.c           |  5 +----
>  common/env.c               | 11 +----------
>  common/environment.c       | 11 +----------
>  common/fastboot.c          |  3 +--
>  common/file-list.c         | 11 +----------
>  common/filetype.c          | 10 +---------
>  common/firmware.c          | 10 +---------
>  common/hush.c              | 14 +-------------
>  common/image-fit.c         | 14 +-------------
>  common/image.c             | 12 +-----------
>  common/imd.c               | 12 +-----------
>  common/imx-bbu-nand-fcb.c  | 16 +---------------
>  common/memory.c            | 13 +------------
>  common/memsize.c           | 12 +-----------
>  common/memtest.c           | 11 +----------
>  common/menu.c              | 12 +-----------
>  common/menutree.c          | 11 +----------
>  common/misc.c              | 11 +----------
>  common/module.c            | 12 +-----------
>  common/partitions.c        | 13 +------------
>  common/password.c          | 11 +----------
>  common/poller.c            |  4 +---
>  common/poweroff.c          | 11 +----------
>  common/reset_source.c      | 11 +----------
>  common/resource.c          | 10 +---------
>  common/restart.c           | 11 +----------
>  common/s_record.c          | 12 +-----------
>  common/startup.c           | 12 +-----------
>  common/tlsf_malloc.c       | 13 +------------
>  common/ubiformat.c         | 11 +----------
>  common/uimage.c            | 10 +---------
>  common/usbgadget.c         | 11 +----------
>  48 files changed, 48 insertions(+), 480 deletions(-)
> 
> diff --git a/common/bbu.c b/common/bbu.c
> index f284c341b91b..1279d5615525 100644
> --- a/common/bbu.c
> +++ b/common/bbu.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * bbu.c - barebox update functions
>   *
>   * Copyright (c) 2012 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #include <common.h>
>  #include <bbu.h>
> diff --git a/common/binfmt.c b/common/binfmt.c
> index f2ff62458769..184647720648 100644
> --- a/common/binfmt.c
> +++ b/common/binfmt.c
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> - *
> - * GPL v2
>   */
>  
>  #include <common.h>
> diff --git a/common/block.c b/common/block.c
> index c522310dcf52..6371010a905b 100644
> --- a/common/block.c
> +++ b/common/block.c
> @@ -1,17 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * block.c - simple block layer
>   *
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #include <common.h>
>  #include <block.h>
> diff --git a/common/blspec.c b/common/blspec.c
> index 4e4ad29eb3c8..c05d8a8297f8 100644
> --- a/common/blspec.c
> +++ b/common/blspec.c
> @@ -1,15 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  #define pr_fmt(fmt)  "blspec: " fmt
>  
>  #include <environment.h>
> diff --git a/common/boot.c b/common/boot.c
> index 6e41849ee043..fbd23cb57c77 100644
> --- a/common/boot.c
> +++ b/common/boot.c
> @@ -1,13 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; version 2.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License for more details.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
>  
>  #include <environment.h>
>  #include <bootchooser.h>
> diff --git a/common/bootargs.c b/common/bootargs.c
> index fc345560ecf0..c49136609f48 100644
> --- a/common/bootargs.c
> +++ b/common/bootargs.c
> @@ -1,17 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * bootargs.c - concatenate Linux bootargs
>   *
>   * Copyright (c) 2012 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #include <common.h>
>  #include <boot.h>
> diff --git a/common/bootchooser.c b/common/bootchooser.c
> index 7aa59d8a82bb..b0505a6a187b 100644
> --- a/common/bootchooser.c
> +++ b/common/bootchooser.c
> @@ -1,16 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (C) 2012 Jan Luebbe <j.luebbe@xxxxxxxxxxxxxx>
>   * Copyright (C) 2015 Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #define pr_fmt(fmt)	"bootchooser: " fmt
>  
> diff --git a/common/bootm.c b/common/bootm.c
> index f70ef10100b0..f964f7f24705 100644
> --- a/common/bootm.c
> +++ b/common/bootm.c
> @@ -1,15 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - */
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  
>  #include <common.h>
>  #include <bootm.h>
> diff --git a/common/bootsource.c b/common/bootsource.c
> index fdbc4cd63850..1f8d053a8171 100644
> --- a/common/bootsource.c
> +++ b/common/bootsource.c
> @@ -1,18 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
> - *
>   * Copyright (C) 2011 Marc Reilly <marc@xxxxxxxxxxxxxxx>
>   * Copyright (C) 2013 Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/clock.c b/common/clock.c
> index 17b07abdc131..58c2964b1391 100644
> --- a/common/clock.c
> +++ b/common/clock.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * clock.c - generic clocksource implementation
>   *
> @@ -6,16 +7,6 @@
>   *
>   * Copyright (C) 2004, 2005 IBM, John Stultz (johnstul@xxxxxxxxxx)
>   * Copyright (c) 2007 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/command.c b/common/command.c
> index c7c0c4c10380..014b85f9a35f 100644
> --- a/common/command.c
> +++ b/common/command.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2000-2003
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  /*
> diff --git a/common/complete.c b/common/complete.c
> index 36e10405c850..ad630f4c9580 100644
> --- a/common/complete.c
> +++ b/common/complete.c
> @@ -1,17 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * complete.c - functions for TAB completion
>   *
>   * Copyright (c) 2008 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/console.c b/common/console.c
> index ffb5c0f75f7f..306149c99ea1 100644
> --- a/common/console.c
> +++ b/common/console.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2000
>   * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@xxxxxx
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <config.h>
> diff --git a/common/console_common.c b/common/console_common.c
> index 8cd57e623df1..48590c522cc2 100644
> --- a/common/console_common.c
> +++ b/common/console_common.c
> @@ -1,19 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * based on code:
>   *
>   * (C) Copyright 2000 Paolo Scaffardi, AIRVENT SAM s.p.a -
>   * RIMINI(ITALY), arsenio@xxxxxx
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #include <common.h>
>  #include <fs.h>
> diff --git a/common/console_countdown.c b/common/console_countdown.c
> index b92948f503eb..e41641aca23e 100644
> --- a/common/console_countdown.c
> +++ b/common/console_countdown.c
> @@ -1,17 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * console_countdown - contdown on the console - interruptible by a keypress
>   *
>   * Copyright (c) 2007 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <clock.h>
> diff --git a/common/date.c b/common/date.c
> index 1fea02cae0cc..69d82e2d52eb 100644
> --- a/common/date.c
> +++ b/common/date.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2001
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  /**
> diff --git a/common/ddr_spd.c b/common/ddr_spd.c
> index 23df3e71198d..7089923afb94 100644
> --- a/common/ddr_spd.c
> +++ b/common/ddr_spd.c
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright 2008 Freescale Semiconductor, Inc.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * Version 2 as published by the Free Software Foundation.
>   */
>  
>  #include <common.h>
> diff --git a/common/env.c b/common/env.c
> index fbaaac4f2f5c..d5fc98436263 100644
> --- a/common/env.c
> +++ b/common/env.c
> @@ -1,17 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-o
>  /*
>   * env.c - environment variables storage
>   *
>   * Copyright (c) 2007 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  /**
> diff --git a/common/environment.c b/common/environment.c
> index 6e58f122bad2..038a480e5f92 100644
> --- a/common/environment.c
> +++ b/common/environment.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-o
>  /*
>   * Copyright (c) 2007 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  /**
> diff --git a/common/fastboot.c b/common/fastboot.c
> index 1b6dc28d8ee9..26e366e4e8a2 100644
> --- a/common/fastboot.c
> +++ b/common/fastboot.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2008 - 2009
>   * Windriver, <www.windriver.com>
> @@ -14,8 +15,6 @@
>   * Copyright 2020 Edmund Henniges <eh@xxxxxxxxx>
>   * Copyright 2020 Daniel Glöckner <dg@xxxxxxxxx>
>   * Split off of generic parts
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
>  #define pr_fmt(fmt) "fastboot: " fmt
> diff --git a/common/file-list.c b/common/file-list.c
> index eb469cf9beb4..cd52b5e045de 100644
> --- a/common/file-list.c
> +++ b/common/file-list.c
> @@ -1,13 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; version 2.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License for more details.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
>  
>  #define pr_fmt(fmt)	"file_list: " fmt
>  
> diff --git a/common/filetype.c b/common/filetype.c
> index eda8ecb3761b..539c96b74527 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * filetype.c - detect filetypes
>   *
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #include <common.h>
>  #include <filetype.h>
> diff --git a/common/firmware.c b/common/firmware.c
> index 609cf118224e..58509d5da615 100644
> --- a/common/firmware.c
> +++ b/common/firmware.c
> @@ -1,14 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (c) 2013 Juergen Beisert <kernel@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  
>  #include <firmware.h>
> diff --git a/common/hush.c b/common/hush.c
> index ec0d5129b70d..8a55eaec6acb 100644
> --- a/common/hush.c
> +++ b/common/hush.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* vi: set sw=8 ts=8: */
>  /*
>   * hush.c -- a prototype Bourne shell grammar parser
> @@ -94,19 +95,6 @@
>   *
>   */
>  
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License for more details.
> - *
> - */
> -
>  #define pr_fmt(fmt) "hush: " fmt
>  
>  #include <malloc.h>         /* malloc, free, realloc*/
> diff --git a/common/image-fit.c b/common/image-fit.c
> index 658f09b04d5a..538e61f51bb5 100644
> --- a/common/image-fit.c
> +++ b/common/image-fit.c
> @@ -1,20 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (C) Jan Lübbe, 2014
>   *
>   * This code is inspired by the U-Boot FIT image code.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  
>  #define pr_fmt(fmt) "FIT: " fmt
> diff --git a/common/image.c b/common/image.c
> index 8199e2df1771..c9a99ace78c5 100644
> --- a/common/image.c
> +++ b/common/image.c
> @@ -1,19 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2008 Semihalf
>   *
>   * (C) Copyright 2000-2006
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #ifdef __BAREBOX__
> diff --git a/common/imd.c b/common/imd.c
> index 4fd4431aa926..b5173afe53e4 100644
> --- a/common/imd.c
> +++ b/common/imd.c
> @@ -1,16 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2014 Sascha Hauer, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #ifdef __BAREBOX__
>  #include <common.h>
> diff --git a/common/imx-bbu-nand-fcb.c b/common/imx-bbu-nand-fcb.c
> index 0629ae5b73b3..f8c457805688 100644
> --- a/common/imx-bbu-nand-fcb.c
> +++ b/common/imx-bbu-nand-fcb.c
> @@ -1,20 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (C) 2014 Sascha Hauer, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software
> - * Foundation.
> - *
>   */
>  
>  #define pr_fmt(fmt) "imx-bbu-nand-fcb: " fmt
> diff --git a/common/memory.c b/common/memory.c
> index 57c7d6b22003..a56eaf949411 100644
> --- a/common/memory.c
> +++ b/common/memory.c
> @@ -1,17 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
> - * memory.c
> - *
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/memsize.c b/common/memsize.c
> index 2fd2b7145759..de4d8df18afb 100644
> --- a/common/memsize.c
> +++ b/common/memsize.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2004
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/memtest.c b/common/memtest.c
> index 09cfa8a347c5..d47e4a672ed9 100644
> --- a/common/memtest.c
> +++ b/common/memtest.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * memtest.c
>   *
> @@ -5,16 +6,6 @@
>   *
>   * (C) Copyright 2000
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <progress.h>
> diff --git a/common/menu.c b/common/menu.c
> index 089dab8a116f..4007c476c3d9 100644
> --- a/common/menu.c
> +++ b/common/menu.c
> @@ -1,16 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * (C) Copyright 2009-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; version 2 of
> - * the License.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/menutree.c b/common/menutree.c
> index 400d1a69395f..c28284b47a0c 100644
> --- a/common/menutree.c
> +++ b/common/menutree.c
> @@ -1,13 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - */
> +// SPDX-License-Identifier: GPL-2.0-only
>  
>  #include <environment.h>
>  #include <libbb.h>
> diff --git a/common/misc.c b/common/misc.c
> index 323500dfa81b..226635f0d43a 100644
> --- a/common/misc.c
> +++ b/common/misc.c
> @@ -1,16 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * (C) Copyright 2000-2003
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/module.c b/common/module.c
> index a79bc734bb20..b669ec09c99f 100644
> --- a/common/module.c
> +++ b/common/module.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   *  Copyright (C) 2002 Richard Henderson
>   *  Copyright (C) 2001 Rusty Russell, 2002 Rusty Russell IBM.
> - *
> - *   This program is free software; you can redistribute it and/or modify
> - *   it under the terms of the GNU General Public License as published by
> - *   the Free Software Foundation; either version 2 of the License, or
> - *   (at your option) any later version.
> - *
> - *   This program is distributed in the hope that it will be useful,
> - *   but WITHOUT ANY WARRANTY; without even the implied warranty of
> - *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - *   GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/partitions.c b/common/partitions.c
> index 4162e86804db..01697f87d0ed 100644
> --- a/common/partitions.c
> +++ b/common/partitions.c
> @@ -1,17 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (C) 2009...2011 Juergen Beisert, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
> - *
>   */
>  
>  /**
> diff --git a/common/password.c b/common/password.c
> index a11971740009..3f05b81c0c2b 100644
> --- a/common/password.c
> +++ b/common/password.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/poller.c b/common/poller.c
> index 50c518697bde..61da5698d225 100644
> --- a/common/poller.c
> +++ b/common/poller.c
> @@ -1,8 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (C) 2010 Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> - *
> - * This file is released under the GPLv2
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/poweroff.c b/common/poweroff.c
> index 4ce04d158f47..65909c614145 100644
> --- a/common/poweroff.c
> +++ b/common/poweroff.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (c) 2015 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #define pr_fmt(fmt) "poweroff: " fmt
>  
> diff --git a/common/reset_source.c b/common/reset_source.c
> index 343dc08444b4..3554cbd0fbe6 100644
> --- a/common/reset_source.c
> +++ b/common/reset_source.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2012 Juergen Beisert - <kernel@xxxxxxxxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #define pr_fmt(fmt) "reset-source: " fmt
>  
> diff --git a/common/resource.c b/common/resource.c
> index 62497e7a5491..92fe96252fdc 100644
> --- a/common/resource.c
> +++ b/common/resource.c
> @@ -1,16 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * resource.c - barebox resource management
>   *
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #include <common.h>
>  #include <malloc.h>
> diff --git a/common/restart.c b/common/restart.c
> index 2bf7b166b043..b6f2bbf25b10 100644
> --- a/common/restart.c
> +++ b/common/restart.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (c) 2015 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #define pr_fmt(fmt) "restart: " fmt
>  
> diff --git a/common/s_record.c b/common/s_record.c
> index 18068902423b..95fa890b69db 100644
> --- a/common/s_record.c
> +++ b/common/s_record.c
> @@ -1,17 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2000
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/common/startup.c b/common/startup.c
> index adc487363f9e..767d178de8cb 100644
> --- a/common/startup.c
> +++ b/common/startup.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * (C) Copyright 2002-2006
>   * Wolfgang Denk, DENX Software Engineering, wd@xxxxxxx.
> @@ -5,17 +6,6 @@
>   * (C) Copyright 2002
>   * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
>   * Marius Groeger <mgroeger@xxxxxxxx>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #ifdef CONFIG_DEBUG_INITCALLS
> diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c
> index 48a56d86564b..981f09de41cc 100644
> --- a/common/tlsf_malloc.c
> +++ b/common/tlsf_malloc.c
> @@ -1,19 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * tlsf wrapper for barebox
>   *
>   * Copyright (C) 2011 Antony Pavlov <antonynpavlov@xxxxxxxxx>
> - *
> - * This file is part of barebox.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  
>  #include <malloc.h>
> diff --git a/common/ubiformat.c b/common/ubiformat.c
> index cfaa68f16425..e10ce31ce659 100644
> --- a/common/ubiformat.c
> +++ b/common/ubiformat.c
> @@ -1,16 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (C) 2008 Nokia Corporation
>   * Copyright (C) 2012 Wolfram Sang, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> - * the GNU General Public License for more details.
>   */
>  
>  /*
> diff --git a/common/uimage.c b/common/uimage.c
> index a84b8fddc4e7..ef7762c9189a 100644
> --- a/common/uimage.c
> +++ b/common/uimage.c
> @@ -1,18 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * uimage.c - uimage handling code
>   *
>   * Copyright (c) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
>   *
>   * partly based on U-Boot uImage code
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  #include <common.h>
>  #include <image.h>
> diff --git a/common/usbgadget.c b/common/usbgadget.c
> index 8b351c7bf468..feec0b6634be 100644
> --- a/common/usbgadget.c
> +++ b/common/usbgadget.c
> @@ -1,15 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * Copyright (c) 2017 Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>, Pengutronix
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
> - *
>   */
>  #define pr_fmt(fmt) "usbgadget: " fmt
>  
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@xxxxxxxxxxxxxx     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox





[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux