diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-07-31 11:30:38 +0200 |
| commit | 326ea986ac150acdc7656d57fca647db80b50158 (patch) | |
| tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 /board/wandboard | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | u-boot-326ea986ac150acdc7656d57fca647db80b50158.tar.gz u-boot-326ea986ac150acdc7656d57fca647db80b50158.tar.bz2 u-boot-326ea986ac150acdc7656d57fca647db80b50158.zip | |
Merge git://git.denx.de/u-boot-arm
Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/wandboard')
| -rw-r--r-- | board/wandboard/Makefile | 5 | ||||
| -rw-r--r-- | board/wandboard/wandboard.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/board/wandboard/Makefile b/board/wandboard/Makefile index 014ea6c1f9..d4782e0c79 100644 --- a/board/wandboard/Makefile +++ b/board/wandboard/Makefile @@ -1,10 +1,7 @@ # # (C) Copyright 2013 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 as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# SPDX-License-Identifier: GPL-2.0+ # include $(TOPDIR)/config.mk diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 6cd28eda87..23a78c1663 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -3,10 +3,7 @@ * * Author: Fabio Estevam <fabio.estevam@freescale.com> * - * 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. + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/arch/clock.h> |