diff options
| author | danh-arm <dan.handley@arm.com> | 2017-01-23 16:49:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:49:43 +0000 |
| commit | 4abd2225c232e5d102e52db504c7f0f363b87795 (patch) | |
| tree | 37b3325a0e118c50742f61ba4733a7ff4b9b82bb /lib | |
| parent | e02be2072276769f69735027bcab6868a5ac12e1 (diff) | |
| parent | 6af03f9c455861d1d37439665bc06c415215d36a (diff) | |
Merge pull request #800 from masahir0y/ifdef
Correct preprocessor conditionals
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch32/cpu_helpers.S | 4 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cpu_helpers.S | 8 | ||||
| -rw-r--r-- | lib/el3_runtime/aarch64/context_mgmt.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/cpus/aarch32/cpu_helpers.S b/lib/cpus/aarch32/cpu_helpers.S index 900d158c..d8cabfe5 100644 --- a/lib/cpus/aarch32/cpu_helpers.S +++ b/lib/cpus/aarch32/cpu_helpers.S @@ -34,7 +34,7 @@ #include <cpu_data.h> #include <cpu_macros.S> -#if IMAGE_BL1 || IMAGE_BL32 +#if defined(IMAGE_BL1) || defined(IMAGE_BL32) /* * The reset handler common to all platforms. After a matching * cpu_ops structure entry is found, the correponding reset_handler @@ -68,7 +68,7 @@ endfunc reset_handler #endif /* IMAGE_BL1 || IMAGE_BL32 */ -#if IMAGE_BL32 /* The power down core and cluster is needed only in BL32 */ +#ifdef IMAGE_BL32 /* The power down core and cluster is needed only in BL32 */ /* * void prepare_cpu_pwr_dwn(unsigned int power_level) * diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S index 4f474399..7365d35e 100644 --- a/lib/cpus/aarch64/cpu_helpers.S +++ b/lib/cpus/aarch64/cpu_helpers.S @@ -31,14 +31,14 @@ #include <arch.h> #include <asm_macros.S> #include <assert_macros.S> -#if IMAGE_BL31 +#ifdef IMAGE_BL31 #include <cpu_data.h> #endif #include <cpu_macros.S> #include <debug.h> /* Reset fn is needed in BL at reset vector */ -#if IMAGE_BL1 || IMAGE_BL31 +#if defined(IMAGE_BL1) || defined(IMAGE_BL31) /* * The reset handler common to all platforms. After a matching * cpu_ops structure entry is found, the correponding reset_handler @@ -72,7 +72,7 @@ endfunc reset_handler #endif /* IMAGE_BL1 || IMAGE_BL31 */ -#if IMAGE_BL31 /* The power down core and cluster is needed only in BL31 */ +#ifdef IMAGE_BL31 /* The power down core and cluster is needed only in BL31 */ /* * void prepare_cpu_pwr_dwn(unsigned int power_level) * @@ -130,7 +130,7 @@ func init_cpu_ops endfunc init_cpu_ops #endif /* IMAGE_BL31 */ -#if IMAGE_BL31 && CRASH_REPORTING +#if defined(IMAGE_BL31) && CRASH_REPORTING /* * The cpu specific registers which need to be reported in a crash * are reported via cpu_ops cpu_reg_dump function. After a matching diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c index 35380f36..e26950df 100644 --- a/lib/el3_runtime/aarch64/context_mgmt.c +++ b/lib/el3_runtime/aarch64/context_mgmt.c @@ -116,7 +116,7 @@ static void cm_init_context_common(cpu_context_t *ctx, const entry_point_info_t scr_el3 &= ~SCR_EA_BIT; #endif -#if IMAGE_BL31 +#ifdef IMAGE_BL31 /* * IRQ/FIQ bits only need setting if interrupt routing * model has been set up for BL31. |