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/sandburst/metrobox/init.S | |
| parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
| download | talos-obmc-uboot-326ea986ac150acdc7656d57fca647db80b50158.tar.gz talos-obmc-uboot-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/sandburst/metrobox/init.S')
| -rw-r--r-- | board/sandburst/metrobox/init.S | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/board/sandburst/metrobox/init.S b/board/sandburst/metrobox/init.S index be3f885a14..13e340eece 100644 --- a/board/sandburst/metrobox/init.S +++ b/board/sandburst/metrobox/init.S @@ -1,24 +1,7 @@ /* * Copyright (C) 2005 * Travis B. Sawyer, Sandburst Corporation, tsawyer@sandburst.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, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> |
