diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-07-20 14:38:36 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-08-09 17:33:57 +0100 |
| commit | c45f627de4a17d4be6727cbf357e7fb54479a563 (patch) | |
| tree | 8497a4acc24e3b0b7dd3be9ae6483b9e9a95113e | |
| parent | 12ab697e8f91a67a439e6172621b905753d61f46 (diff) | |
Move SIZE_FROM_LOG2_WORDS macro to utils.h
This patch moves the macro SIZE_FROM_LOG2_WORDS() defined in
`arch.h` to `utils.h` as it is utility macro.
Change-Id: Ia8171a226978f053a1ee4037f80142c0a4d21430
| -rw-r--r-- | bl1/bl1_main.c | 1 | ||||
| -rw-r--r-- | include/lib/aarch64/arch.h | 4 | ||||
| -rw-r--r-- | include/lib/utils.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index 3cca1769..cb1bc186 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -38,6 +38,7 @@ #include <platform.h> #include <platform_def.h> #include <smcc_helpers.h> +#include <utils.h> #include "bl1_private.h" #include <uuid.h> diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index 07bbd899..fa5cb12b 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-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: @@ -334,8 +334,6 @@ #define CTR_IMINLINE_MASK 0xf #define MAX_CACHE_LINE_SIZE 0x800 /* 2KB */ -#define SIZE_FROM_LOG2_WORDS(n) (4 << (n)) - /* Physical timer control register bit fields shifts and masks */ #define CNTP_CTL_ENABLE_SHIFT 0 diff --git a/include/lib/utils.h b/include/lib/utils.h index 0936cbb3..a234e3c9 100644 --- a/include/lib/utils.h +++ b/include/lib/utils.h @@ -38,6 +38,8 @@ #define IS_POWER_OF_TWO(x) \ (((x) & ((x) - 1)) == 0) +#define SIZE_FROM_LOG2_WORDS(n) (4 << (n)) + /* * The round_up() macro rounds up a value to the given boundary in a * type-agnostic yet type-safe manner. The boundary must be a power of two. |