diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-12-25 23:36:24 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-01-24 01:01:21 +0900 |
| commit | 3d8256b2a1ef1195aed86bef7378e83d0a61a91b (patch) | |
| tree | 1c61d30c342b22f409e5e0d8700448ec39054e52 /lib/cpus | |
| parent | f38d93fdbf82ebec321c70f7bc15fe12b7d57275 (diff) | |
Use #ifdef for IMAGE_BL* instead of #if
One nasty part of ATF is some of boolean macros are always defined
as 1 or 0, and the rest of them are only defined under certain
conditions.
For the former group, "#if FOO" or "#if !FOO" must be used because
"#ifdef FOO" is always true. (Options passed by $(call add_define,)
are the cases.)
For the latter, "#ifdef FOO" or "#ifndef FOO" should be used because
checking the value of an undefined macro is strange.
Here, IMAGE_BL* is handled by make_helpers/build_macro.mk like
follows:
$(eval IMAGE := IMAGE_BL$(call uppercase,$(3)))
$(OBJ): $(2)
@echo " CC $$<"
$$(Q)$$(CC) $$(TF_CFLAGS) $$(CFLAGS) -D$(IMAGE) -c $$< -o $$@
This means, IMAGE_BL* is defined when building the corresponding
image, but *undefined* for the other images.
So, IMAGE_BL* belongs to the latter group where we should use #ifdef
or #ifndef.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'lib/cpus')
| -rw-r--r-- | lib/cpus/aarch32/cpu_helpers.S | 4 | ||||
| -rw-r--r-- | lib/cpus/aarch64/cpu_helpers.S | 8 |
2 files changed, 6 insertions, 6 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 |