Merge changes from topic "mb/rst-to-bl31-update" into integration

* changes:
  docs: update RESET_TO_BL31 documentation
  fix(bl31): avoid clearing of argument registers in RESET_TO_BL31 case
  Revert "docs(bl31): aarch64: RESET_TO_BL31_WITH_PARAMS"
  Revert "feat(bl31): aarch64: RESET_TO_BL31_WITH_PARAMS"

diff --cc Makefile
index d2427227cffff0d63c9fe3f1cb4ddad465027553,d4132630bb902297e0555191ec29171be89d4ec5..4b6086333e445f073e3e3c0bde9f49c1028ef947
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1122,9 -1093,7 +1122,8 @@@ $(eval $(call assert_booleans,
          PLAT_RSS_NOT_SUPPORTED \
          PROGRAMMABLE_RESET_ADDRESS \
          PSCI_EXTENDED_STATE_ID \
 +        PSCI_OS_INIT_MODE \
          RESET_TO_BL31 \
-         RESET_TO_BL31_WITH_PARAMS \
          SAVE_KEYS \
          SEPARATE_CODE_AND_RODATA \
          SEPARATE_BL2_NOLOAD_REGION \
@@@ -1267,10 -1233,8 +1266,9 @@@ $(eval $(call add_defines,
          PLAT_RSS_NOT_SUPPORTED \
          PROGRAMMABLE_RESET_ADDRESS \
          PSCI_EXTENDED_STATE_ID \
 +        PSCI_OS_INIT_MODE \
          RAS_EXTENSION \
          RESET_TO_BL31 \
-         RESET_TO_BL31_WITH_PARAMS \
          SEPARATE_CODE_AND_RODATA \
          SEPARATE_BL2_NOLOAD_REGION \
          SEPARATE_NOBITS_REGION \

diff --cc docs/getting_started/build-options.rst
Simple merge

diff --cc make_helpers/defaults.mk
Simple merge