diff options
| author | wma <wma@FreeBSD.org> | 2017-02-02 06:07:39 +0000 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-09-15 01:31:38 -0500 |
| commit | 1b1838c047d3f1c62b1f7219cedfdbf77c11e68c (patch) | |
| tree | daba238d89ba1db3a17d62a5e18eb5db7c4d3cf8 /sys/dev/cesa | |
| parent | bc10b361275fddbfaad64e0810b8038a24ff08a5 (diff) | |
| download | FreeBSD-src-1b1838c047d3f1c62b1f7219cedfdbf77c11e68c.zip FreeBSD-src-1b1838c047d3f1c62b1f7219cedfdbf77c11e68c.tar.gz | |
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@semihalf.com>
Obtained from: Semihalf
Sponsored by: Stormshield
(cherry picked from commit 7242a1d9cbe51787ade8e6d6f173c7bf95052b40)
Diffstat (limited to 'sys/dev/cesa')
| -rw-r--r-- | sys/dev/cesa/cesa.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/dev/cesa/cesa.h b/sys/dev/cesa/cesa.h index 0e5f01c..eb1342a 100644 --- a/sys/dev/cesa/cesa.h +++ b/sys/dev/cesa/cesa.h @@ -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) @@ -356,10 +353,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 |
