ENGR00141478-1 SAHARA: Move header file to include directory

The user mode libsahara library relied on header file
drivers/mxc/security/sahara2/include/sahara.h. However, to make
the lib build after headers_install step and to remove dependency on
kernel source, moved this header to include/linux/mxc_sahara.h.

These are the necessary changes in the SAHARA driver to use the new
header file in the new location.

Signed-off-by: Anish Trivedi <anish@freescale.com>
This commit is contained in:
Anish Trivedi
2011-04-08 10:10:10 -05:00
committed by Matt Sealey
parent fea4e4245d
commit 22bfe557cb
13 changed files with 27 additions and 2288 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -17,7 +17,7 @@
* functions. For now, only AES-CCM is supported.
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "adaptor.h"
#include "sf_util.h"

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -18,7 +18,7 @@
* for Sahara. This does not include HMAC.
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "sf_util.h"
#ifdef LINUX_KERNEL

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -18,7 +18,7 @@
* SHW API for Sahara.
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "sf_util.h"
#ifdef __KERNEL__

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -18,7 +18,7 @@
* for Sahara.
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "sf_util.h"
#ifdef __KERNEL__

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -18,7 +18,7 @@
* Sahara. This does not include CCM.
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "fsl_platform.h"
#include "sf_util.h"

View File

@@ -1,5 +1,9 @@
/*
<<<<<<< HEAD
* Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
=======
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
>>>>>>> 0f39ed8... ENGR00141478-1 SAHARA: Move header file to include directory
*/
/*
@@ -17,7 +21,7 @@
* This file implements user and platform capabilities functions of the FSL SHW
* API for Sahara
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include <adaptor.h>
#include <sf_util.h>

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -64,7 +64,7 @@
*/
#include "sahara.h"
#include <linux/mxc_sahara.h>
#include "fsl_platform.h"
#include "fsl_shw_keystore.h"

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -23,7 +23,7 @@
#ifndef ADAPTOR_H
#define ADAPTOR_H
#include <sahara.h>
#include <linux/mxc_sahara.h>
/*!
* Structure passed during user ioctl() call to submit request.

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -284,7 +284,7 @@
#if defined(FSL_HAVE_SAHARA2) || defined(FSL_HAVE_SAHARA4)
#include "sahara.h"
#include <linux/mxc_sahara.h>
#else

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -22,7 +22,7 @@
#define SAH_DRIVER_COMMON_H
#include "fsl_platform.h"
#include <sahara.h>
#include <linux/mxc_sahara.h>
#include <adaptor.h>
/** This specifies the permissions for the device file. It is equivalent to

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -23,7 +23,7 @@
#ifndef STATUS_MANAGER_H
#define STATUS_MANAGER_H
#include "sah_driver_common.h"
#include "sahara.h"
#include <linux/mxc_sahara.h>
/******************************************************************************

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -20,7 +20,7 @@
#define SF_UTIL_H
#include <fsl_platform.h>
#include <sahara.h>
#include <linux/mxc_sahara.h>
/*! Header value for Sahara Descriptor 1 */
#define SAH_HDR_SKHA_SET_MODE_IV_KEY 0x10880000