From 5f2bf1e4135950d83ea744e05b5fa2d08b31b91c Mon Sep 17 00:00:00 2001 From: rui guo Date: Tue, 14 Jun 2022 16:54:01 +0800 Subject: [PATCH] RDK: License Issue [1/1] PD#SWPL-81777 Problem: License Issue Solution: Update License from kernel source code(5.15) Verify: Android R Signed-off-by: rui guo Change-Id: Ie1719aea7828c38be48be690d8f5ec749e8e6be3 --- Makefile | 1 + build.sh | 4 ++++ include/linux/tee_data_pipe.h | 25 ++----------------------- optee/Makefile | 1 + optee/optee_msg.h | 26 ++------------------------ optee/optee_smc.h | 26 ++------------------------ tee_data_pipe.c | 25 ++----------------------- 7 files changed, 14 insertions(+), 94 deletions(-) diff --git a/Makefile b/Makefile index 3cf532a..4de159d 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only ccflags-y+=-Werror obj-m += optee.o diff --git a/build.sh b/build.sh index 5bc4b81..a4da082 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,7 @@ +#SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# +# Copyright (c) 2015-2022, Amlogic, Inc. + #!/bin/bash LOCAL_PATH=`pwd` diff --git a/include/linux/tee_data_pipe.h b/include/linux/tee_data_pipe.h index 6f5d207..2747797 100644 --- a/include/linux/tee_data_pipe.h +++ b/include/linux/tee_data_pipe.h @@ -1,27 +1,6 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (C) 2014-2017 Amlogic, Inc. All rights reserved. - * - * All information contained herein is Amlogic confidential. - * - * This software is provided to you pursuant to Software License Agreement - * (SLA) with Amlogic Inc ("Amlogic"). This software may be used - * only in accordance with the terms of this agreement. - * - * Redistribution and use in source and binary forms, with or without - * modification is strictly prohibited without prior written permission from - * Amlogic. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2015-2022, Amlogic, Inc. */ #ifndef __DATA_PIPE_H__ diff --git a/optee/Makefile b/optee/Makefile index e9b6556..88ac5b1 100644 --- a/optee/Makefile +++ b/optee/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only LOCAL_INCLUDES += -I$(M)/../include \ -I$(M)/../include/linux \ -I$(M)/include \ diff --git a/optee/optee_msg.h b/optee/optee_msg.h index 41489e2..ec09421 100644 --- a/optee/optee_msg.h +++ b/optee/optee_msg.h @@ -1,28 +1,6 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (c) 2015-2016, Linaro Limited - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2015-2021, Linaro Limited */ #ifndef _OPTEE_MSG_H #define _OPTEE_MSG_H diff --git a/optee/optee_smc.h b/optee/optee_smc.h index ba3161e..47e6db8 100644 --- a/optee/optee_smc.h +++ b/optee/optee_smc.h @@ -1,28 +1,6 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (c) 2015-2016, Linaro Limited - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2015-2021, Linaro Limited */ #ifndef OPTEE_SMC_H #define OPTEE_SMC_H diff --git a/tee_data_pipe.c b/tee_data_pipe.c index fa2fbc6..abeeeea 100644 --- a/tee_data_pipe.c +++ b/tee_data_pipe.c @@ -1,27 +1,6 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */ /* - * Copyright (C) 2014-2017 Amlogic, Inc. All rights reserved. - * - * All information contained herein is Amlogic confidential. - * - * This software is provided to you pursuant to Software License Agreement - * (SLA) with Amlogic Inc ("Amlogic"). This software may be used - * only in accordance with the terms of this agreement. - * - * Redistribution and use in source and binary forms, with or without - * modification is strictly prohibited without prior written permission from - * Amlogic. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2015-2022, Amlogic, Inc. */ #include -- 2.20.1