From: Manish V Badarkhe <manish.badarkhe@arm.com>
Date: Tue, 11 Apr 2023 15:10:23 +0000 (+0200)
Subject: Merge changes from topic "mb/rst-to-bl31-update" into integration
X-Git-Tag: baikal/aarch64/sdk5.10~1^2~99
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=a1c924df6d31bfa93710f1c7e84b3ba34f06c5cb;p=arm-tf.git

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"
---

a1c924df6d31bfa93710f1c7e84b3ba34f06c5cb
diff --cc Makefile
index d2427227c,d4132630b..4b6086333
--- a/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 \