svn commit: r313089 - head/sys/dev/cesa

[Wojciech Macek]

Author: wma
Date: Thu Feb  2 06:07:39 2017
New Revision: 313089
URL: https://svnweb.freebsd.org/changeset/base/313089

Log:
  Remove remaining ifdefs from CESA header
  
  Commit r312743 ("Use SoC ID - based detection in CESA") resulted
  in build failing for Marvell armv5 platforms, which don't support
  the newer version of CESA controller. This patch provides a fix by
  removing ifdefs around bitfields' definitions, so that they are
  known to all platforms.
  
  Submitted by:          Marcin Wojtas <mw at semihalf.com>
  Obtained from:         Semihalf
  Sponsored by:          Stormshield

Modified:
  head/sys/dev/cesa/cesa.h

Modified: head/sys/dev/cesa/cesa.h
==============================================================================
--- head/sys/dev/cesa/cesa.h	Thu Feb  2 05:29:22 2017	(r313088)
+++ head/sys/dev/cesa/cesa.h	Thu Feb  2 06:07:39 2017	(r313089)
@@ -336,10 +336,7 @@ struct cesa_chain_info {
 #define CESA_TDMA_CR_ENABLE		(1 << 12)
 #define CESA_TDMA_CR_FETCHND		(1 << 13)
 #define CESA_TDMA_CR_ACTIVE		(1 << 14)
-
-#if defined (SOC_MV_ARMADA38X)
 #define CESA_TDMA_NUM_OUTSTAND		(2 << 16)
-#endif
 
 #define CESA_TDMA_ECR			0x08C8
 #define CESA_TDMA_ECR_MISS		(1 << 0)
@@ -361,10 +358,7 @@ struct cesa_chain_info {
 /* CESA SA registers definitions */
 #define CESA_SA_CMD			0x0E00
 #define CESA_SA_CMD_ACTVATE		(1 << 0)
-
-#if defined (SOC_MV_ARMADA38X)
 #define CESA_SA_CMD_SHA2		(1 << 31)
-#endif
 
 #define CESA_SA_DPR			0x0E04