From 037809374f6077ca987e0f9c1872c7b5e48afd36 Mon Sep 17 00:00:00 2001 From: Yuchou Gan Date: Mon, 29 Jan 2018 19:22:06 +0800 Subject: [PATCH] MGS-3622 [#imx-905] fix gpu gc_hal_kernel_platform_imx.c license error The GPU kernel driver file gc_hal_kernel_platform_imx.c license is incorrect, Need fix it with GPL and MIT license statement. Date: Jan 29, 2017 Signed-off-by: Yuchou Gan yuchou.gan@nxp.com --- drivers/mxc/gpu-viv/Kbuild | 4 +- drivers/mxc/gpu-viv/config | 6 +-- ...rm_imx6.c => gc_hal_kernel_platform_imx.c} | 54 ++++++++++++++++--- ...nfig => gc_hal_kernel_platform_imx.config} | 0 4 files changed, 53 insertions(+), 11 deletions(-) rename drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/{gc_hal_kernel_platform_imx6.c => gc_hal_kernel_platform_imx.c} (93%) rename drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/{gc_hal_kernel_platform_imx6.config => gc_hal_kernel_platform_imx.config} (100%) diff --git a/drivers/mxc/gpu-viv/Kbuild b/drivers/mxc/gpu-viv/Kbuild index 580855fa186e..39141de2d27d 100644 --- a/drivers/mxc/gpu-viv/Kbuild +++ b/drivers/mxc/gpu-viv/Kbuild @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2014 - 2017 Vivante Corporation +# Copyright (c) 2014 - 2018 Vivante Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ # # The GPL License (GPL) # -# Copyright (C) 2014 - 2017 Vivante Corporation +# Copyright (C) 2014 - 2018 Vivante Corporation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/config b/drivers/mxc/gpu-viv/config index a4fe0590f57a..9873ae29c580 100644 --- a/drivers/mxc/gpu-viv/config +++ b/drivers/mxc/gpu-viv/config @@ -2,7 +2,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2014 - 2017 Vivante Corporation +# Copyright (c) 2014 - 2018 Vivante Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ # # The GPL License (GPL) # -# Copyright (C) 2014 - 2017 Vivante Corporation +# Copyright (C) 2014 - 2018 Vivante Corporation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -71,4 +71,4 @@ BANK_BIT_START ?= 13 BANK_BIT_END ?= 15 BANK_CHANNEL_BIT ?= 12 SECURITY ?= 0 -SOC_PLATFORM ?= freescale-imx6 +SOC_PLATFORM ?= freescale-imx diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c similarity index 93% rename from drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c rename to drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c index 3e0d26b053c8..0a8bf3e79c35 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.c @@ -1,12 +1,54 @@ /**************************************************************************** * -* Copyright (c) 2005 - 2018 by Vivante Corp. All rights reserved. +* The MIT License (MIT) * -* The material in this file is confidential and contains trade secrets -* of Vivante Corporation. This is proprietary information owned by -* Vivante Corporation. No part of this work may be disclosed, -* reproduced, copied, transmitted, or used in any way for any purpose, -* without the express written permission of Vivante Corporation. +* Copyright (c) 2014 - 2018 Vivante Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +***************************************************************************** +* +* The GPL License (GPL) +* +* Copyright (C) 2014 - 2018 Vivante Corporation +* +* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* +***************************************************************************** +* +* Note: This software is released under dual MIT and GPL licenses. A +* recipient may use this file under the terms of either the MIT license or +* GPL License. If you wish to use only one license not the other, you can +* indicate your decision by deleting one of the above license notices in your +* version of this file. * *****************************************************************************/ diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.config b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config similarity index 100% rename from drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.config rename to drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx.config -- 2.17.1