Commit 42662283 authored by Achin Gupta's avatar Achin Gupta
Browse files

Merge pull request #425 from achingupta/ag/tf-issues#332

Re-introduce evaluation of ENABLE_PLAT_COMPAT build flag
parents 135c9ddd 93271a1e
...@@ -262,6 +262,16 @@ endif ...@@ -262,6 +262,16 @@ endif
include ${PLAT_MAKEFILE_FULL} include ${PLAT_MAKEFILE_FULL}
# If the platform has not defined ENABLE_PLAT_COMPAT, then enable it by default
ifndef ENABLE_PLAT_COMPAT
ENABLE_PLAT_COMPAT := 1
endif
# Include the platform compatibility helpers for PSCI
ifneq (${ENABLE_PLAT_COMPAT}, 0)
include plat/compat/plat_compat.mk
endif
# Include the CPU specific operations makefile. By default all CPU errata # Include the CPU specific operations makefile. By default all CPU errata
# workarounds and CPU specifc optimisations are disabled. This can be # workarounds and CPU specifc optimisations are disabled. This can be
# overridden by the platform. # overridden by the platform.
...@@ -331,6 +341,7 @@ $(eval $(call assert_boolean,TRUSTED_BOARD_BOOT)) ...@@ -331,6 +341,7 @@ $(eval $(call assert_boolean,TRUSTED_BOARD_BOOT))
$(eval $(call assert_boolean,PROGRAMMABLE_RESET_ADDRESS)) $(eval $(call assert_boolean,PROGRAMMABLE_RESET_ADDRESS))
$(eval $(call assert_boolean,PSCI_EXTENDED_STATE_ID)) $(eval $(call assert_boolean,PSCI_EXTENDED_STATE_ID))
$(eval $(call assert_boolean,WARN_DEPRECATED)) $(eval $(call assert_boolean,WARN_DEPRECATED))
$(eval $(call assert_boolean,ENABLE_PLAT_COMPAT))
################################################################################ ################################################################################
...@@ -352,6 +363,7 @@ $(eval $(call add_define,TRUSTED_BOARD_BOOT)) ...@@ -352,6 +363,7 @@ $(eval $(call add_define,TRUSTED_BOARD_BOOT))
$(eval $(call add_define,PROGRAMMABLE_RESET_ADDRESS)) $(eval $(call add_define,PROGRAMMABLE_RESET_ADDRESS))
$(eval $(call add_define,PSCI_EXTENDED_STATE_ID)) $(eval $(call add_define,PSCI_EXTENDED_STATE_ID))
$(eval $(call add_define,WARN_DEPRECATED)) $(eval $(call add_define,WARN_DEPRECATED))
$(eval $(call add_define,ENABLE_PLAT_COMPAT))
################################################################################ ################################################################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment