Rename BL33_BASE option to PRELOADED_BL33_BASE
To avoid confusion the build option BL33_BASE has been renamed to
PRELOADED_BL33_BASE, which is more descriptive of what it does and
doesn't get mistaken by similar names like BL32_BASE that work in a
completely different way.
NOTE: PLATFORMS USING BUILD OPTION `BL33_BASE` MUST CHANGE TO THE NEW
BUILD OPTION `PRELOADED_BL33_BASE`.
Change-Id: I658925ebe95406edf0325f15aa1752e1782aa45b
diff --git a/Makefile b/Makefile
index d7a7a36..ccc0ca2 100644
--- a/Makefile
+++ b/Makefile
@@ -316,9 +316,9 @@
################################################################################
ifdef EL3_PAYLOAD_BASE
- ifdef BL33_BASE
- $(warning "BL33_BASE and EL3_PAYLOAD_BASE are incompatible \
- build options. EL3_PAYLOAD_BASE has priority.")
+ ifdef PRELOADED_BL33_BASE
+ $(warning "PRELOADED_BL33_BASE and EL3_PAYLOAD_BASE are \
+ incompatible build options. EL3_PAYLOAD_BASE has priority.")
endif
endif
@@ -327,9 +327,10 @@
$(warning "BL33 image is not needed when option \
BL33_PAYLOAD_BASE is used and won't be added to the FIP file.")
endif
- ifdef BL33_BASE
- $(warning "BL33 image is not needed when option BL33_BASE is \
- used and won't be added to the FIP file.")
+ ifdef PRELOADED_BL33_BASE
+ $(warning "BL33 image is not needed when option \
+ PRELOADED_BL33_BASE is used and won't be added to the FIP \
+ file.")
endif
endif
@@ -352,7 +353,7 @@
# in the FIP file.
NEED_BL33 := no
else
- ifdef BL33_BASE
+ ifdef PRELOADED_BL33_BASE
# If booting a BL33 preloaded image there is no need of
# another one in the FIP file.
NEED_BL33 := no
@@ -444,10 +445,10 @@
ifdef EL3_PAYLOAD_BASE
$(eval $(call add_define,EL3_PAYLOAD_BASE))
else
- # Define the BL33_BASE flag only if it is provided and EL3_PAYLOAD_BASE
- # is not defined, as it has priority.
- ifdef BL33_BASE
- $(eval $(call add_define,BL33_BASE))
+ # Define the PRELOADED_BL33_BASE flag only if it is provided and
+ # EL3_PAYLOAD_BASE is not defined, as it has priority.
+ ifdef PRELOADED_BL33_BASE
+ $(eval $(call add_define,PRELOADED_BL33_BASE))
endif
endif