diff options
| author | Scott Branden <sbranden@users.noreply.github.com> | 2017-04-29 08:36:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 08:36:12 -0700 |
| commit | 0f22bef31d402e24fab77eb2a3c643d042b7e79c (patch) | |
| tree | 6595ed7f87249ccbd4a953ba5cdc00963a130d18 /lib/aarch32/misc_helpers.S | |
| parent | 53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (diff) | |
| parent | dd454b40dfe42dbf77e2f04a3965295380b4f78d (diff) | |
Merge branch 'integration' into tf_issue_461
Diffstat (limited to 'lib/aarch32/misc_helpers.S')
| -rw-r--r-- | lib/aarch32/misc_helpers.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/aarch32/misc_helpers.S b/lib/aarch32/misc_helpers.S index 5b17c21c..03b47eae 100644 --- a/lib/aarch32/misc_helpers.S +++ b/lib/aarch32/misc_helpers.S @@ -162,7 +162,7 @@ endfunc zeromem * -------------------------------------------------------------------------- */ func memcpy4 -#if ASM_ASSERTION +#if ENABLE_ASSERTIONS orr r3, r0, r1 tst r3, #0x3 ASM_ASSERT(eq) |