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/LaCie/common | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.zip u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.tar.gz u-boot-imx-326ea986ac150acdc7656d57fca647db80b50158.tar.bz2 | |
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/LaCie/common')
| -rw-r--r-- | board/LaCie/common/common.c | 5 | ||||
| -rw-r--r-- | board/LaCie/common/common.h | 5 | ||||
| -rw-r--r-- | board/LaCie/common/cpld-gpio-bus.c | 5 | ||||
| -rw-r--r-- | board/LaCie/common/cpld-gpio-bus.h | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/board/LaCie/common/common.c b/board/LaCie/common/common.c index a62bf9f..d6ffefe 100644 --- a/board/LaCie/common/common.c +++ b/board/LaCie/common/common.c @@ -1,10 +1,7 @@ /* * Copyright (C) 2011 Simon Guinot <sguinot@lacie.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 <common.h> diff --git a/board/LaCie/common/common.h b/board/LaCie/common/common.h index 85e433c..c24e588 100644 --- a/board/LaCie/common/common.h +++ b/board/LaCie/common/common.h @@ -1,10 +1,7 @@ /* * Copyright (C) 2011 Simon Guinot <sguinot@lacie.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+ */ #ifndef _LACIE_COMMON_H diff --git a/board/LaCie/common/cpld-gpio-bus.c b/board/LaCie/common/cpld-gpio-bus.c index fb9bf8d..9b24dc53 100644 --- a/board/LaCie/common/cpld-gpio-bus.c +++ b/board/LaCie/common/cpld-gpio-bus.c @@ -9,10 +9,7 @@ * * Copyright (C) 2013 Simon Guinot <simon.guinot@sequanux.org> * - * 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/gpio.h> diff --git a/board/LaCie/common/cpld-gpio-bus.h b/board/LaCie/common/cpld-gpio-bus.h index e9e9b96..3dfac0b 100644 --- a/board/LaCie/common/cpld-gpio-bus.h +++ b/board/LaCie/common/cpld-gpio-bus.h @@ -1,10 +1,7 @@ /* * Copyright (C) 2013 Simon Guinot <simon.guinot@sequanux.org> * - * 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+ */ #ifndef _LACIE_CPLD_GPI0_BUS_H |