1 files changed, 74 insertions, 47 deletions

diff --git a/docs/README.booting.microblaze.md b/docs/README.booting.microblaze.md
index 1ffcc3c8..91c0eda9 100644
--- a/docs/README.booting.microblaze.md
+++ b/docs/README.booting.microblaze.md
@@ -4,11 +4,16 @@ Booting OS images on MicroBlaze target boards can be done using JTAG and QSPI bo
 
 * [Setting Up the Target](#setting-up-the-target)
 * [Booting from JTAG](#booting-from-jtag)
-  * [Loading Bitstream using XSCT](#loading-bitstream-using-xsct)
-  * [Loading U-boot using XSCT](#loading-u-boot-using-xsct)
-  * [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
-    * [Using XSCT](#using-xsct)
-    * [Using TFTP](#using-tftp)
+  * [Sourcing the XSDB tools](#sourcing-the-xsdb-tools)
+  * [Deploying the images to target](#deploying-the-images-to-target)
+    * [Using devtool boot-jtag script](#using-devtool-boot-jtag-script)
+    * [Manually executing xsdb commands](#manually-executing-xsdb-commands)
+      * [Loading Bitstream using XSDB](#loading-bitstream-using-xsdb)
+      * [Loading U-boot using XSDB](#loading-u-boot-using-xsdb)
+      * [Loading Kernel, Device tree, Root Filesystem and U-boot boot script](#loading-kernel-device-tree-root-filesystem-and-u-boot-boot-script)
+        * [Using XSDB](#using-xsdb)
+        * [Using TFTP](#using-tftp)
+      * [Booting Linux](#booting-linux)
 
 ## Setting Up the Target
 
@@ -34,59 +39,79 @@ Booting OS images on MicroBlaze target boards can be done using JTAG and QSPI bo
 
 ## Booting from JTAG
 
-This boot flow requires the use of the AMD Xilinx tools, specifically XSCT and 
+This boot flow requires the use of the AMD Xilinx tools, specifically XSDB and
 the associated JTAG device drivers. This also requires access to the JTAG interface
 on the board, a number of AMD Xilinx and third-party boards come with on-board JTAG
 modules.
 
-1. Source the Vivado or Vitis tools `settings.sh` scripts.
-2. Power on the board, Open the XSCT console in the Vitis IDE by clicking the
-   XSCT button. Alternatively, you can also open the XSCT console by selecting
-   Xilinx -> XSCT Console.
+### Sourcing the XSDB tools
+
+Source the Vivado or Vitis tools `settings.sh` scripts.
+
+### Deploying the images to target
+
+Deploying the images can be done in two methods.
+
+#### Using devtool boot-jtag script
+
+1. Run devtool command to generate the boot-jtag.tcl script.
+```
+$ devtool boot-jtag --help
+$ devtool boot-jtag --image core-image-minimal --hw_server TCP:<hostname/ip-addr>:3121
+```
+2. Script will be generated under ${DEPLOY_DIR_IMAGE}/boot-jtag.tcl
+3. Execute this script using xsdb tool as shown below.
+```
+$ xsdb <absolute-path-to-deploy-dir-image>/boot-jtag.tcl
+```
+
+#### Manually executing xsdb commands
+
+1. Power on the board, Launch the XSDB shell from command line as shown below.
 ```
-$ xsct
+$ xsdb
 ```
-3. In the XSCT console, connect to the target over JTAG using the connect command.
+2. In the XSDB console, connect to the target over JTAG using the connect command.
    Optionally user can use `-url` to specify the local/remote hw_server. The 
    connect command returns the channel ID of the connection.
 ```
-xsct% connect
+xsdb% connect
 ```
-4. The targets command lists the available targets and allows you to select a
+3. The targets command lists the available targets and allows you to select a
    target using its ID. The targets are assigned IDs as they are discovered on
    the JTAG chain, so the IDs can change from session to session.
 ```
-xsct% targets
+xsdb% targets
 ```
 
 > **Note:** For non-interactive usage such as scripting, you can use the `-filter`
    option to select a target instead of selecting the target using its ID.
 
-### Loading Bitstream using XSCT
+##### Loading Bitstream using XSDB
 
-* Download the bitstream for the target using XSCT with the `fpga` command. Microblaze 
+* Download the bitstream for the target using XSDB with the `fpga` command. Microblaze
 bitstream will be located in the `${DEPLOY_DIR_IMAGE}` directory. Optionally user
 can use `fpga -no-revision-check` to skip FPGA silicon revision.
 
 ```
-xsct% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/system-${MACHINE}.bit
-xsct% after 2000
-xsct% targets -set -nocase -filter {name =~ "microblaze*#0"}
-xsct% catch {stop}
-xsct% after 1000
+xsdb% fpga -no-revision-check ${DEPLOY_DIR_IMAGE}/system-${MACHINE}.bit
+xsdb% after 2000
+xsdb% targets -set -nocase -filter {name =~ "microblaze*#0"}
+xsdb% catch {stop}
+xsdb% after 1000
 ```
-### Loading U-boot using XSCT
+##### Loading U-boot using XSDB
 
-1. Download `u-boot.elf` to the target CPU using XSCT. Microblaze u-boot.elf will be
+1. Download `u-boot.elf` to the target CPU using XSDB. Microblaze u-boot.elf will be
 located in the `${DEPLOY_DIR_IMAGE}` directory. Before u-boot.elf is loaded suspend
 the execution of active target using `stop` command.
 ```
-xsct% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
+xsdb% dow ${DEPLOY_DIR_IMAGE}/u-boot.elf
 ```
 2. After loading u-boot.elf resume the execution of active target using the `con`
-command in XSCT shell.
+command in XSDB shell.
 ```
-xsct% con
+xsdb% con
 ```
 3. In the target Serial Terminal, press any key to stop the U-Boot auto-boot.
 ```
@@ -95,7 +120,7 @@ Hit any key to stop autoboot: 0
 U-Boot>
 ```
 
-### Loading Kernel, Device tree, Root Filesystem and U-boot boot script
+##### Loading Kernel, Device tree, Root Filesystem and U-boot boot script
 
 Load the images into the target DDR/MIG load address i.e., 
 `DDR base address + <image_offset>`. MicroBlaze U-boot boot script(boot.scr) 
@@ -121,48 +146,50 @@ this process can take a long time to execute (more than 10 minutes). If your
 system has ethernet it is recommended that you use TFTP to load these images
 using U-Boot. 
 
-#### Using XSCT
+###### Using XSDB
 
-1. Suspend the execution of active target using `stop` command in XSCT.
+1. Suspend the execution of active target using `stop` command in XSDB.
 ```
-xsct% stop
+xsdb% stop
 ```
 2. Using the `dow` command to load the images into the target DDR/MIG
 load address.
 ```
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/linux.bin.ub 0x80000000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x81e00000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x82e00000
-xsct% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0xff200000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/linux.bin.ub 0x80000000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/system.dtb 0x81e00000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/core-image-minimal-${MACHINE}.cpio.gz.u-boot 0x82e00000
+xsdb% dow -data ${DEPLOY_DIR_IMAGE}/boot.scr 0xff200000
 ```
 
-#### Using TFTP
+###### Using TFTP
 
-1. Configure the `ipaddr` and `serverip` of the U-Boot environment. 
+1. Setup TFTP directory on host machine and copy the images to your TFTP directory
+   so that you can load them from U-Boot.
+2. Configure the `ipaddr` and `serverip` of the U-Boot environment.
 ```
 U-Boot> set serverip <server ip>
 U-Boot> set ipaddr <board ip>
 ```
-2. Load the images to DDR address. Make sure images are copied to tftp directory.
+3. Load the images to DDR address.
 ```
-U-Boot> tftpboot 0x80000000 ${TFTPDIR}/linux.bin.ub
-U-Boot> tftpboot 0x81e00000 ${TFTPDIR}/system.dtb
-U-Boot> tftpboot 0x82e00000 ${TFTPDIR}/core-image-minimal-${MACHINE}.cpio.gz.u-boot
-U-Boot> tftpboot 0xff200000 ${TFTPDIR}/boot.scr
+U-Boot> tftpboot 0x80000000 linux.bin.ub
+U-Boot> tftpboot 0x81e00000 system.dtb
+U-Boot> tftpboot 0x82e00000 core-image-minimal-${MACHINE}.cpio.gz.u-boot
+U-Boot> tftpboot 0xff200000 boot.scr
 ```
 
-### Booting Linux
+##### Booting Linux
 
 Once the images are loaded continue the execution.
 
 1. After loading images resume the execution of active target using the `con`
-command in XSCT shell, Skip step 1 for if you have used TFTP to load images.
+command in XSDB shell, Skip step 1 for if you have used TFTP to load images.
 ```
-xsct% con
+xsdb% con
 ```
-2. Terminate xsct shell.
+2. Terminate xsdb shell.
 ```
-xsct% exit
+xsdb% exit
 ```
 3. In the target Serial Terminal, from U-Boot prompt run `boot` command.
 ```