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/raidsonic/ib62x0 | |
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/raidsonic/ib62x0')
-rw-r--r-- | board/raidsonic/ib62x0/Makefile | 16 | ||||
-rw-r--r-- | board/raidsonic/ib62x0/ib62x0.c | 16 | ||||
-rw-r--r-- | board/raidsonic/ib62x0/ib62x0.h | 16 | ||||
-rw-r--r-- | board/raidsonic/ib62x0/kwbimage.cfg | 16 |
4 files changed, 4 insertions, 60 deletions
diff --git a/board/raidsonic/ib62x0/Makefile b/board/raidsonic/ib62x0/Makefile index d450f8d..9d24ad0 100644 --- a/board/raidsonic/ib62x0/Makefile +++ b/board/raidsonic/ib62x0/Makefile @@ -3,21 +3,7 @@ # Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla Wadaskar <prafulla@marvell.com> # -# See file CREDITS for list of people who contributed to this -# project. -# -# 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/>. +# SPDX-License-Identifier: GPL-2.0+ # include $(TOPDIR)/config.mk diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c index cf4ca51..976ba4c 100644 --- a/board/raidsonic/ib62x0/ib62x0.c +++ b/board/raidsonic/ib62x0/ib62x0.c @@ -4,21 +4,7 @@ * Luka Perkov <luka@openwrt.org> * Simon Baatz <gmbnomis@gmail.com> * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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/>. + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/raidsonic/ib62x0/ib62x0.h b/board/raidsonic/ib62x0/ib62x0.h index 3315696..11278a8 100644 --- a/board/raidsonic/ib62x0/ib62x0.h +++ b/board/raidsonic/ib62x0/ib62x0.h @@ -4,21 +4,7 @@ * Simon Baatz <gmbnomis@gmail.com> * Luka Perkov <luka@openwrt.org> * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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/>. + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IB62x0_H diff --git a/board/raidsonic/ib62x0/kwbimage.cfg b/board/raidsonic/ib62x0/kwbimage.cfg index 27a5e31..596071f 100644 --- a/board/raidsonic/ib62x0/kwbimage.cfg +++ b/board/raidsonic/ib62x0/kwbimage.cfg @@ -4,21 +4,7 @@ # Simon Baatz <gmbnomis@gmail.com> # Luka Perkov <luka@openwrt.org> # -# See file CREDITS for list of people who contributed to this -# project. -# -# 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/>. +# SPDX-License-Identifier: GPL-2.0+ # # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image |