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>
1 parent f38d93f commit 3d8256b2a1ef1195aed86bef7378e83d0a61a91b
@Masahiro Yamada Masahiro Yamada authored on 25 Dec 2016
Showing 23 changed files
View
drivers/arm/ccn/ccn.c
View
include/common/aarch32/el3_common_macros.S
View
include/common/aarch64/el3_common_macros.S
View
include/common/bl_common.h
View
include/lib/cpus/aarch32/cpu_macros.S
View
include/lib/cpus/aarch64/cpu_macros.S
View
include/plat/arm/board/common/board_arm_def.h
View
include/plat/arm/common/plat_arm.h
View
lib/cpus/aarch32/cpu_helpers.S
View
lib/cpus/aarch64/cpu_helpers.S
View
lib/el3_runtime/aarch64/context_mgmt.c
View
plat/arm/board/common/board_css_common.c
View
plat/arm/board/fvp/fvp_common.c
View
plat/arm/board/juno/include/platform_def.h
View
plat/arm/common/arm_gicv3.c
View
plat/common/plat_gicv3.c
View
plat/mediatek/mt6795/include/platform_def.h
View
plat/mediatek/mt8173/include/platform_def.h
View
plat/nvidia/tegra/include/platform_def.h
View
plat/qemu/qemu_common.c
View
plat/rockchip/common/rockchip_gicv3.c
View
plat/rockchip/rk3368/include/platform_def.h
View
plat/rockchip/rk3399/include/platform_def.h