From fc1cd99cfeb396cc9bf03c228a4e66446c526abe Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 12 May 2016 18:38:51 +0200 Subject: kernel: remove ocf support, cryptodev-linux should be used instead Signed-off-by: Felix Fietkau Signed-off-by: Ralph Sennhauser --- .../crypto/ocf/kirkwood/mvHal/common/mvCommon.c | 277 --------------------- 1 file changed, 277 deletions(-) delete mode 100644 target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c (limited to 'target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c') diff --git a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c b/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c deleted file mode 100644 index dc0e0cfc45..0000000000 --- a/target/linux/generic/files/crypto/ocf/kirkwood/mvHal/common/mvCommon.c +++ /dev/null @@ -1,277 +0,0 @@ -/******************************************************************************* -Copyright (C) Marvell International Ltd. and its affiliates - -This software file (the "File") is owned and distributed by Marvell -International Ltd. and/or its affiliates ("Marvell") under the following -alternative licensing terms. Once you have made an election to distribute the -File under one of the following license alternatives, please (i) delete this -introductory statement regarding license alternatives, (ii) delete the two -license alternatives that you have not elected to use and (iii) preserve the -Marvell copyright notice above. - -******************************************************************************** -Marvell Commercial License Option - -If you received this File from Marvell and you have entered into a commercial -license agreement (a "Commercial License") with Marvell, the File is licensed -to you under the terms of the applicable Commercial License. - -******************************************************************************** -Marvell GPL License Option - -If you received this File from Marvell, you may opt to use, redistribute and/or -modify this File in accordance with the terms and conditions of the General -Public License Version 2, June 1991 (the "GPL License"), a copy of which is -available along with the File in the license.txt file or by writing to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or -on the worldwide web at http://www.gnu.org/licenses/gpl.txt. - -THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED -WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY -DISCLAIMED. The GPL License provides additional details about this warranty -disclaimer. -******************************************************************************** -Marvell BSD License Option - -If you received this File from Marvell, you may opt to use, redistribute and/or -modify this File under the following licensing terms. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - * 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. - - * Neither the name of Marvell 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 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. - -*******************************************************************************/ - -#include "mvOs.h" -#include "mv802_3.h" -#include "mvCommon.h" - - -/******************************************************************************* -* mvMacStrToHex - Convert MAC format string to hex. -* -* DESCRIPTION: -* This function convert MAC format string to hex. -* -* INPUT: -* macStr - MAC address string. Fornat of address string is -* uu:vv:ww:xx:yy:zz, where ":" can be any delimiter. -* -* OUTPUT: -* macHex - MAC in hex format. -* -* RETURN: -* None. -* -*******************************************************************************/ -MV_STATUS mvMacStrToHex(const char* macStr, MV_U8* macHex) -{ - int i; - char tmp[3]; - - for(i = 0; i < MV_MAC_ADDR_SIZE; i++) - { - tmp[0] = macStr[(i * 3) + 0]; - tmp[1] = macStr[(i * 3) + 1]; - tmp[2] = '\0'; - macHex[i] = (MV_U8) (strtol(tmp, NULL, 16)); - } - return MV_OK; -} - -/******************************************************************************* -* mvMacHexToStr - Convert MAC in hex format to string format. -* -* DESCRIPTION: -* This function convert MAC in hex format to string format. -* -* INPUT: -* macHex - MAC in hex format. -* -* OUTPUT: -* macStr - MAC address string. String format is uu:vv:ww:xx:yy:zz. -* -* RETURN: -* None. -* -*******************************************************************************/ -MV_STATUS mvMacHexToStr(MV_U8* macHex, char* macStr) -{ - int i; - - for(i = 0; i < MV_MAC_ADDR_SIZE; i++) - { - mvOsSPrintf(&macStr[i * 3], "%02x:", macHex[i]); - } - macStr[(i * 3) - 1] = '\0'; - - return MV_OK; -} - -/******************************************************************************* -* mvSizePrint - Print the given size with size unit description. -* -* DESCRIPTION: -* This function print the given size with size unit description. -* FOr example when size paramter is 0x180000, the function prints: -* "size 1MB+500KB" -* -* INPUT: -* size - Size in bytes. -* -* OUTPUT: -* None. -* -* RETURN: -* None. -* -*******************************************************************************/ -MV_VOID mvSizePrint(MV_U32 size) -{ - mvOsOutput("size "); - - if(size >= _1G) - { - mvOsOutput("%3dGB ", size / _1G); - size %= _1G; - if(size) - mvOsOutput("+"); - } - if(size >= _1M ) - { - mvOsOutput("%3dMB ", size / _1M); - size %= _1M; - if(size) - mvOsOutput("+"); - } - if(size >= _1K) - { - mvOsOutput("%3dKB ", size / _1K); - size %= _1K; - if(size) - mvOsOutput("+"); - } - if(size > 0) - { - mvOsOutput("%3dB ", size); - } -} - -/******************************************************************************* -* mvHexToBin - Convert hex to binary -* -* DESCRIPTION: -* This function Convert hex to binary. -* -* INPUT: -* pHexStr - hex buffer pointer. -* size - Size to convert. -* -* OUTPUT: -* pBin - Binary buffer pointer. -* -* RETURN: -* None. -* -*******************************************************************************/ -MV_VOID mvHexToBin(const char* pHexStr, MV_U8* pBin, int size) -{ - int j, i; - char tmp[3]; - MV_U8 byte; - - for(j=0, i=0; j> 1; - result++; - } - return result; -} - - -- cgit v1.2.3