[PATCH 2/2] arm-bsp/docs:corstone1000: Clarify secure debug setup

Replace the incomplete Arm Development Studio steps with the configuratio=
n database and hardware connection flow.

Initialize the required submodules and document that the Secure Debug Man=
ager library must be built before importing the configuration.

Signed-off-by: Alex Chapman <[email protected]>
---
 .../documentation/corstone1000/user-guide.rst | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/meta-arm-bsp/documentation/corstone1000/user-guide.rst b/met=
a-arm-bsp/documentation/corstone1000/user-guide.rst
index 36c6ae35..640e0c5f 100644
--- a/meta-arm-bsp/documentation/corstone1000/user-guide.rst
+++ b/meta-arm-bsp/documentation/corstone1000/user-guide.rst
@@ -2154,8 +2154,10 @@ and `Arm Development Studio <arm-ds-website_>`__ v=
ersions 2022.2, 2022.c, or 202
=20
         cd ${WORKSPACE}/secure-debug-manager
         git checkout b30d6496ca749123e86b39b161b9f70ef76106d6
+        git submodule update --init
=20
 #. Follow the instructions in the `Secure Debug Manager (PSA-ADAC / SDC-=
600)'s README <secure-debug-manager-repo-readme_>`__ for the development =
machine setup.
+   This setup must include building the Secure Debug Manager because the=
 built library completes the Arm Development Studio configuration.
=20
 #. Rebuild the software stack with Secure Debug.
=20
@@ -2177,9 +2179,34 @@ and `Arm Development Studio <arm-ds-website_>`__ v=
ersions 2022.2, 2022.c, or 202
=20
 #. Connect the debug probe to the MPS3 using the 20-pin 1.27mm connector=
 with the ``CS_20W_1.27MM silkscreen`` label.
=20
-#. Create a debug configuration in Arm Development Studio as described i=
n the `Secure Debug Manager (PSA-ADAC / SDC-600)'s README <secure-debug-m=
anager-armds-integration_>`__.
-
-#. Connect the debuger to the target using the debug configuration.
+#. Open a new Arm Development Studio IDE window and add the Secure Debug=
 Manager configuration database.
+
+   #. Select ``Window`` > ``Preferences``.
+   #. Expand ``Arm DS`` and select ``Configuration Database``.
+   #. Select ``Add``.
+   #. Enter a descriptive name, such as ``Corstone-1000 Secure Debug``.
+      The name does not affect the connection.
+   #. Set ``Location`` to ``${WORKSPACE}/secure-debug-manager/arm_ds/DB`=
`.
+   #. Select ``OK`` to close the ``Add configuration database location``=
 dialog.
+   #. Select ``Rebuild database``.
+   #. Select ``Apply and Close``.
+
+#. Create the Arm Development Studio hardware connection.
+
+   #. Select ``Create a debug connection...``.
+   #. Select ``Hardware Connection``, then select ``Next``.
+   #. Enter a descriptive debug connection name, then select ``Next``.
+      The name does not affect the connection.
+   #. In ``Target Selection``, select ``MPS3_Corstone-1000_ADAC``.
+   #. Select ``Finish``.
+
+#. Configure and start the debug connection.
+
+   #. Select ``Arm`` > ``MPS3_Corstone-1000_ADAC`` > ``Bare Metal Debug`=
` > ``Cortex-A35``.
+   #. For ``Target Connection``, select ``ULINKpro``.
+   #. Select ``Browse...``.
+   #. In the ``Connection Browser``, select the name of the connected UL=
INKpro probe, then select ``Select``.
+   #. Select ``Debug``.
=20
 #. Provide the paths to the private key and trust chain certificate when=
 asked by Arm Development Studio Console.
=20