diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 |
commit | 8b485ba12b0defa0c4ed3559789250238f8331a8 (patch) | |
tree | a1174810bef0d504370272918dca8d485ae2ae3b /board/freescale/mx6slevk | |
parent | 12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff) | |
parent | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff) | |
download | u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.zip u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.bz2 |
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'board/freescale/mx6slevk')
-rw-r--r-- | board/freescale/mx6slevk/Makefile | 5 | ||||
-rw-r--r-- | board/freescale/mx6slevk/imximage.cfg | 5 | ||||
-rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 5 |
3 files changed, 3 insertions, 12 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 diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg index df39a16..16ea597 100644 --- a/board/freescale/mx6slevk/imximage.cfg +++ b/board/freescale/mx6slevk/imximage.cfg @@ -1,10 +1,7 @@ /* * Copyright (C) 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+ * * Refer docs/README.imxmage for more details about how-to configure * and create imximage boot image diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 69fe8fc..5b6ef81 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.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> |