diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk
index 60958a1..8e1f273 100644
--- a/make_helpers/defaults.mk
+++ b/make_helpers/defaults.mk
@@ -262,3 +262,8 @@
 
 # Enable Link Time Optimization
 ENABLE_LTO			:= 0
+
+# Build flag to include EL2 registers in cpu context save and restore during
+# S-EL2 firmware entry/exit. This flag is to be used with SPD=spmd option.
+# Default is 0.
+CTX_INCLUDE_EL2_REGS		:= 0