-
- If the default package version of OpenOCD in your development
- environment's distribution needs to be updated, it might be necessary to
- build OpenOCD from the source.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -305,4 +297,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash $
- openocd -f board/ti_am625evm.cfg
+ openocd -f board/ti/am625evm.cfg
diff --git a/doc/board/ti/am62ax_sk.rst b/doc/board/ti/am62ax_sk.rst
index 6f3432f7895c..2b338569aad6 100644
--- a/doc/board/ti/am62ax_sk.rst
+++ b/doc/board/ti/am62ax_sk.rst
@@ -224,14 +224,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: August 2023 (git master)
-
- Until the next stable release of OpenOCD is available in your development
- environment's distribution, it might be necessary to build OpenOCD `from the
- source <https://github.com/openocd-org/openocd>`_.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -240,4 +232,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash
- openocd -f board/ti_am62a7evm.cfg
+ openocd -f board/ti/am62a7evm.cfg
diff --git a/doc/board/ti/am62dx_evm.rst b/doc/board/ti/am62dx_evm.rst
index 0d12e3ec1476..28f62914b3bc 100644
--- a/doc/board/ti/am62dx_evm.rst
+++ b/doc/board/ti/am62dx_evm.rst
@@ -235,16 +235,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **AM62A**: OpenOCD support since August 2023 (git master)
-
- **AM62D**: Uses AM62A configuration (compatible due to same core
architecture)
-
- Until the next stable release of OpenOCD is available in your development
- environment's distribution, it might be necessary to build OpenOCD `from the
- source <https://github.com/openocd-org/openocd>`_.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -253,4 +243,9 @@ To start OpenOCD and connect to the board
.. prompt:: bash
- openocd -f board/ti/am62a7evm.cfg
+ openocd -f board/ti/am62a7evm.cfg
+
+.. note::
+
+ The AM62D-EVM uses the same tcl configuration as the AM62A-SK due to
+ same core architecture.
diff --git a/doc/board/ti/am62px_sk.rst b/doc/board/ti/am62px_sk.rst
index 44dae4afc870..d2696282033c 100644
--- a/doc/board/ti/am62px_sk.rst
+++ b/doc/board/ti/am62px_sk.rst
@@ -329,16 +329,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support after**: v0.12.0
-
- While support for the entire K3 generation including the am62xxx
- extended family was added before v0.12.0, the tcl scripts for the
- am62px have been accepted and will be available in the next release of
- OpenOCD. It may be necessary to build OpenOCD from source depending on
- the version your distribution has packaged.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -347,4 +337,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash
- openocd -f board/ti_am62pevm.cfg
+ openocd -f board/ti/am62pevm.cfg
diff --git a/doc/board/ti/am62x_sk.rst b/doc/board/ti/am62x_sk.rst
index ef9425035cb8..ab5dee1ac775 100644
--- a/doc/board/ti/am62x_sk.rst
+++ b/doc/board/ti/am62x_sk.rst
@@ -851,13 +851,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: v0.12.0
-
- If the default package version of OpenOCD in your development
- environment's distribution needs to be updated, it might be necessary to
- build OpenOCD from the source.
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
@@ -867,4 +860,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash $
- openocd -f board/ti_am625evm.cfg
+ openocd -f board/ti/am625evm.cfg
diff --git a/doc/board/ti/am64x_evm.rst b/doc/board/ti/am64x_evm.rst
index 65c4c456528c..dbbdfe0e8036 100644
--- a/doc/board/ti/am64x_evm.rst
+++ b/doc/board/ti/am64x_evm.rst
@@ -227,3 +227,20 @@ https://www.ti.com/lit/pdf/spruim2 under the `Boot Mode
Pins` section.
For SW2 and SW3, the switch state in the "ON" position = 1.
Boot bits on SK is reversed bits to the bootmode signals
+
+
+Debugging U-Boot
+----------------
+
+See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
+detailed setup information.
+
+.. include:: k3.rst
+ :start-after: .. k3_rst_include_start_openocd_connect_XDS110
+ :end-before: .. k3_rst_include_end_openocd_connect_XDS110
+
+To start OpenOCD and connect to the board
+
+.. prompt:: bash
+
+ openocd -f board/ti/am642evm.cfg
diff --git a/doc/board/ti/am65x_evm.rst b/doc/board/ti/am65x_evm.rst
index 60b08ceebf0f..12fa955d2bf5 100644
--- a/doc/board/ti/am65x_evm.rst
+++ b/doc/board/ti/am65x_evm.rst
@@ -305,14 +305,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: v0.12.0
-
- If the default package version of OpenOCD in your development
- environment's distribution needs to be updated, it might be necessary to
- build OpenOCD from the source.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -321,4 +313,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash $
- openocd -f board/ti_am654evm.cfg
+ openocd -f board/ti/am654evm.cfg
diff --git a/doc/board/ti/j7200_evm.rst b/doc/board/ti/j7200_evm.rst
index 4fd2aff83547..74bce4b465d7 100644
--- a/doc/board/ti/j7200_evm.rst
+++ b/doc/board/ti/j7200_evm.rst
@@ -216,14 +216,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: v0.12.0
-
- If the default package version of OpenOCD in your development
- environment's distribution needs to be updated, it might be necessary to
- build OpenOCD from the source.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -232,4 +224,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash $
- openocd -f board/ti_j7200evm.cfg
+ openocd -f board/ti/j7200evm.cfg
diff --git a/doc/board/ti/j721e_evm.rst b/doc/board/ti/j721e_evm.rst
index 41c8d4c72a8d..1302e080d8a8 100644
--- a/doc/board/ti/j721e_evm.rst
+++ b/doc/board/ti/j721e_evm.rst
@@ -245,14 +245,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: v0.12.0
-
- If the default package version of OpenOCD in your development
- environment's distribution needs to be updated, it might be necessary to
- build OpenOCD from the source.
-
.. include:: ../ti/k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -261,4 +253,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash $
- openocd -f board/ti_j721eevm.cfg
+ openocd -f board/ti/j721evm.cfg
diff --git a/doc/board/ti/j722s_evm.rst b/doc/board/ti/j722s_evm.rst
index 4b5cf0275940..5a4ae11a2eb6 100644
--- a/doc/board/ti/j722s_evm.rst
+++ b/doc/board/ti/j722s_evm.rst
@@ -237,16 +237,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support after**: v0.12.0
-
- While support for the entire K3 generation including the am62xxx
- extended family was added before v0.12.0, the tcl scripts for the
- am62px have been accepted and will be available in the next release of
- OpenOCD. It may be necessary to build OpenOCD from source depending on
- the version your distribution has packaged.
-
.. include:: k3.rst
:start-after: .. k3_rst_include_start_openocd_connect_XDS110
:end-before: .. k3_rst_include_end_openocd_connect_XDS110
@@ -255,4 +245,4 @@ To start OpenOCD and connect to the board
.. prompt:: bash
- openocd -f board/ti_j722sevm.cfg
+ openocd -f board/ti/j722sevm.cfg
diff --git a/doc/board/ti/j784s4_evm.rst b/doc/board/ti/j784s4_evm.rst
index ec82228ab908..48decd8d3d64 100644
--- a/doc/board/ti/j784s4_evm.rst
+++ b/doc/board/ti/j784s4_evm.rst
@@ -643,14 +643,6 @@ Debugging U-Boot
See :ref:`Common Debugging environment - OpenOCD<k3_rst_refer_openocd>`: for
detailed setup information.
-.. warning::
-
- **OpenOCD support since**: September 2023 (git master)
-
- Until the next stable release of OpenOCD is available in your development
- environment's distribution, it might be necessary to build OpenOCD `from the
- source <https://github.com/openocd-org/openocd>`_.
-
Debugging U-Boot on J784S4-EVM and AM69-SK
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -663,4 +655,4 @@ following.
.. prompt:: bash
- openocd -f board/ti_j784s4evm.cfg
+ openocd -f board/ti/j784s4evm.cfg
