From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- board/bachmann/ot1200/Makefile | 4 +--- board/bachmann/ot1200/mx6q_4x_mt41j128.cfg | 3 +-- board/bachmann/ot1200/ot1200.c | 3 +-- board/bachmann/ot1200/ot1200_spl.c | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'board/bachmann') diff --git a/board/bachmann/ot1200/Makefile b/board/bachmann/ot1200/Makefile index 9e50bfeb86..73000e3d3c 100644 --- a/board/bachmann/ot1200/Makefile +++ b/board/bachmann/ot1200/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2012-2013, Guennadi Liakhovetski # (C) Copyright 2012-2013 Freescale Semiconductor, Inc. # Copyright (C) 2013, Boundary Devices -# -# SPDX-License-Identifier: GPL-2.0+ -# ifdef CONFIG_SPL_BUILD obj-y := ot1200.o ot1200_spl.o diff --git a/board/bachmann/ot1200/mx6q_4x_mt41j128.cfg b/board/bachmann/ot1200/mx6q_4x_mt41j128.cfg index c25f99dcfd..ba5c074797 100644 --- a/board/bachmann/ot1200/mx6q_4x_mt41j128.cfg +++ b/board/bachmann/ot1200/mx6q_4x_mt41j128.cfg @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Freescale Semiconductor, Inc. * Jason Liu * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 9465cea72f..2d73441620 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2014, Bachmann electronic GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c index dd1ade7877..a3a822f65a 100644 --- a/board/bachmann/ot1200/ot1200_spl.c +++ b/board/bachmann/ot1200/ot1200_spl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015, Bachmann electronic GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3