summaryrefslogtreecommitdiff
path: root/board/freescale/mx6slevk/Makefile
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
committerStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
commit326ea986ac150acdc7656d57fca647db80b50158 (patch)
tree15724288b8b6da3a98d934db8330bb964cdfdf36 /board/freescale/mx6slevk/Makefile
parent4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff)
parentfdce7b633a1de24456226b18527cc7900c34282a (diff)
downloadu-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/freescale/mx6slevk/Makefile')
-rw-r--r--board/freescale/mx6slevk/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/board/freescale/mx6slevk/Makefile b/board/freescale/mx6slevk/Makefile
index 43af351..bcd8e4a 100644
--- a/board/freescale/mx6slevk/Makefile
+++ b/board/freescale/mx6slevk/Makefile
@@ -1,9 +1,6 @@
# (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