Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e016db authored by Keith Fallows's avatar Keith Fallows
Browse files

Revert "Change license to GPLv2"



This reverts commit 487e7433.

Revert change prior to re-submitting with the correct author.

Change-Id: I51f026d2c793be11aff38205cc38adf2217fd9e2
Signed-off-by: default avatarKeith Fallows <keithf@codeaurora.org>
parent abeeb696
Loading
Loading
Loading
Loading
+35 −8
Original line number Original line Diff line number Diff line
/*
/*
 * Copyright (c) 2013-2014 TRUSTONIC LIMITED
 * Copyright (c) 2013-2014 TRUSTONIC LIMITED
 * All Rights Reserved.
 * All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or
 * Redistribution and use in source and binary forms, with or without
 * modify it under the terms of the GNU General Public License
 * modification, are permitted provided that the following conditions are met:
 * version 2 as published by the Free Software Foundation.
 *
 *
 * This program is distributed in the hope that it will be useful,
 * 1. Redistributions of source code must retain the above copyright notice,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    this list of conditions and the following disclaimer.
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 *
 * GNU General Public License for more details.
 * 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.
 *
 * 3. Neither the name of the TRUSTONIC LIMITED nor the names of its
 *    contributors may be used to endorse or promote products derived from
 *    this software without specific prior written permission.
 *
 * 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.
 */
/*
 * The <t-base Driver Kernel Module is a Linux device driver, which represents
 * the command proxy on the lowest layer to the secure world (Swd). Additional
 * services like memory allocation via mmap and generation of a MMU tables for
 * given virtual memory are also supported. IRQ functionality receives
 * information from the SWd in the non secure world (NWd).
 * As customary the driver is handled as Linux device driver with "open",
 * "close" and "ioctl" commands. Access to the driver is possible after the
 * devices "/dev/mobicore" and "/dev/mobicore-user" have been created.
 */
 */


#ifndef _MC_LINUX_H_
#ifndef _MC_LINUX_H_
+25 −8
Original line number Original line Diff line number Diff line
/*
/*
 * Copyright (c) 2013-2014 TRUSTONIC LIMITED
 * Copyright (c) 2013-2014 TRUSTONIC LIMITED
 * All Rights Reserved.
 * All rights reserved.
 *
 *
 * This program is free software; you can redistribute it and/or
 * Redistribution and use in source and binary forms, with or without
 * modify it under the terms of the GNU General Public License
 * modification, are permitted provided that the following conditions are met:
 * version 2 as published by the Free Software Foundation.
 *
 *
 * This program is distributed in the hope that it will be useful,
 * 1. Redistributions of source code must retain the above copyright notice,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    this list of conditions and the following disclaimer.
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 *
 * GNU General Public License for more details.
 * 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.
 *
 * 3. Neither the name of the TRUSTONIC LIMITED nor the names of its
 *    contributors may be used to endorse or promote products derived from
 *    this software without specific prior written permission.
 *
 * 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.
 */
 */


#ifndef _MC_DRV_VERSION_H_
#ifndef _MC_DRV_VERSION_H_
+4 −4
Original line number Original line Diff line number Diff line
t-base is an operating system being shipped with TZBSP
MobiCore is an operating system being shipped with TZBSP
on msm chipsets. t-base consists of several components in
on msm chipsets. MobiCore consists of several components in
the secure world(TrustZone) and non-secure world(linux
the secure world(TrustZone) and non-secure world(linux
kernel, Android user space). The t-base driver
kernel, Android user space). The MobiCore driver
communicates with the t-base kernel that exists in
communicates with the MobiCore kernel that exists in
TrustZone.
TrustZone.