summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRichard Zhu <Richard.Zhu@freescale.com>2014-11-19 15:52:18 +0800
committerRichard Zhu <Richard.Zhu@freescale.com>2014-11-21 09:49:50 +0800
commitde33b64547c017219d8624b03b9f82b2c2a275d2 (patch)
treec44beb045ccd47704f4840a016196c102d21fac9 /arch
parent6dca6d0c358e54caf9c948a5dabdc0e4e926fa57 (diff)
MLK-9843-01 arm: mcc: set dual copyright of mcc common codes
set the dual bsd/gpl copyright of the mcc common codes implemented in linux bsp release. Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com> (cherry picked from commit d7f8c4eff50ba78b82484597bd301c4a87dfe082)
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-imx/mcc_api.c20
-rwxr-xr-xarch/arm/mach-imx/mcc_common.c20
-rwxr-xr-xarch/arm/mach-imx/mcc_config.h20
3 files changed, 27 insertions, 33 deletions
diff --git a/arch/arm/mach-imx/mcc_api.c b/arch/arm/mach-imx/mcc_api.c
index 68c9ed0e6228..435796810d21 100755
--- a/arch/arm/mach-imx/mcc_api.c
+++ b/arch/arm/mach-imx/mcc_api.c
@@ -1,18 +1,16 @@
/*
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
- * Freescale IMX Linux-specific MCC implementation.
+ * This file contains MCC library API functions implementation
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
*
- * This program is distributed in the hope 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+ and/or BSD-3-Clause
+ * The GPL-2.0+ license for this file can be found in the COPYING.GPL file
+ * included with this distribution or at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * The BSD-3-Clause License for this file can be found in the COPYING.BSD file
+ * included with this distribution or at
+ * http://opensource.org/licenses/BSD-3-Clause
*/
#include "mcc_config.h"
diff --git a/arch/arm/mach-imx/mcc_common.c b/arch/arm/mach-imx/mcc_common.c
index 7a54d7b2fdb3..f690c0d48958 100755
--- a/arch/arm/mach-imx/mcc_common.c
+++ b/arch/arm/mach-imx/mcc_common.c
@@ -1,18 +1,16 @@
/*
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
- * Freescale IMX Linux-specific MCC implementation.
+ * This file contains MCC library common functions
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
*
- * This program is distributed in the hope 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+ and/or BSD-3-Clause
+ * The GPL-2.0+ license for this file can be found in the COPYING.GPL file
+ * included with this distribution or at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * The BSD-3-Clause License for this file can be found in the COPYING.BSD file
+ * included with this distribution or at
+ * http://opensource.org/licenses/BSD-3-Clause
*/
#include "mcc_config.h"
diff --git a/arch/arm/mach-imx/mcc_config.h b/arch/arm/mach-imx/mcc_config.h
index 47abf7987c6f..db3d3dcf80db 100755
--- a/arch/arm/mach-imx/mcc_config.h
+++ b/arch/arm/mach-imx/mcc_config.h
@@ -1,18 +1,16 @@
/*
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
- * Freescale IMX Linux-specific MCC implementation.
+ * This is the main MCC configuration file
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * Copyright (C) 2014 Freescale Semiconductor, Inc. All Rights Reserved.
*
- * This program is distributed in the hope 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+ and/or BSD-3-Clause
+ * The GPL-2.0+ license for this file can be found in the COPYING.GPL file
+ * included with this distribution or at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * The BSD-3-Clause License for this file can be found in the COPYING.BSD file
+ * included with this distribution or at
+ * http://opensource.org/licenses/BSD-3-Clause
*/
#ifndef __MCC_CONFIG__