mirror of
https://github.com/genesi/linux-legacy.git
synced 2026-09-24 15:44:22 +00:00
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:
committed by
Matt Sealey
parent
fea4e4245d
commit
22bfe557cb
@@ -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"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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__
|
||||
|
||||
@@ -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__
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user