diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/bl_common.h | 3 | ||||
| -rw-r--r-- | include/lib/utils.h | 41 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 2 |
3 files changed, 43 insertions, 3 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index f13dc316..c43ad5ef 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -137,8 +137,7 @@ #include <cassert.h> #include <stdint.h> #include <stddef.h> - -#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#include <utils.h> /* To retain compatibility */ /* * Declarations of linker defined symbols to help determine memory layout of diff --git a/include/lib/utils.h b/include/lib/utils.h new file mode 100644 index 00000000..d45dff34 --- /dev/null +++ b/include/lib/utils.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of ARM nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __UTILS_H__ +#define __UTILS_H__ + +/* Compute the number of elements in the given array */ +#define ARRAY_SIZE(a) \ + (sizeof(a) / sizeof((a)[0])) + +#define IS_POWER_OF_TWO(x) \ + (((x) & ((x) - 1)) == 0) + +#endif /* __UTILS_H__ */ diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 3cee6ff0..2a32e419 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -31,10 +31,10 @@ #define __PLAT_ARM_H__ #include <bakery_lock.h> -#include <bl_common.h> #include <cassert.h> #include <cpu_data.h> #include <stdint.h> +#include <utils.h> #include <xlat_tables.h> #define ARM_CASSERT_MMAP \ |