[PATCH 4/5] versions: Update microblaze, powerpc, riscv and x86_64

[chrisj at rtems.org]

From: Chris Johns <chrisj at rtems.org>

Updates #4695
---
 user/bsps/bsps-microblaze.rst | 10 +++++-----
 user/bsps/bsps-powerpc.rst    |  8 ++++----
 user/bsps/bsps-riscv.rst      |  3 ++-
 user/bsps/bsps-x86_64.rst     |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/user/bsps/bsps-microblaze.rst b/user/bsps/bsps-microblaze.rst
index e20df53..32aad90 100644
--- a/user/bsps/bsps-microblaze.rst
+++ b/user/bsps/bsps-microblaze.rst
@@ -53,8 +53,8 @@ The name ``system_dtb`` is significant as it is the name expected by the BSP.
   $ rtems-bin2c -C -A 8 -N system_dtb my_device_tree.dtb my_dtb
 
 The ``BSP_MICROBLAZE_FPGA_DTB_HEADER_PATH`` BSP configuration option can then be
-set to the path of the resulting source file, ``my_dtb.c``, to include it in the
-BSP build.
+set to the path of the resulting source file, ``my_dtb.c``, in the waf INI file
+to include it in the BSP build.
 
 .. code-block:: none
 
@@ -64,7 +64,7 @@ BSP build.
 Running Executables
 -------------------
 
-A .dtb (device tree blob) file should be provided to QEMU via the ``-hw-dtb``
+A ``.dtb`` (device tree blob) file should be provided to QEMU via the ``-hw-dtb``
 option. In the example command below, the device tree blob comes from the Xilinx
 Petalinux KCU105 MicroBlaze BSP (https://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/embedded-design-tools.html).
 
@@ -94,7 +94,7 @@ Then start GDB and connect to QEMU.
 
 .. code-block:: none
 
-  $ microblaze-rtems6-gdb build/microblaze/kcu105_qemu/testsuites/samples/hello.exe
+  $ microblaze-rtems at rtems-ver-major@-gdb build/microblaze/kcu105_qemu/testsuites/samples/hello.exe
   (gdb) target remote localhost:1234
   (gdb) break Init
   (gdb) continue
@@ -146,7 +146,7 @@ application, and debug as usual. By default the GDB server listens on port 3002.
 
 .. code-block:: none
 
-  $ microblaze-rtems6-gdb example.exe
+  $ microblaze-rtems at rtems-ver-major@-gdb example.exe
   (gdb) target extended-remote localhost:3002
   (gdb) load
   (gdb) break Init
diff --git a/user/bsps/bsps-powerpc.rst b/user/bsps/bsps-powerpc.rst
index 80edfae..3d1ce88 100644
--- a/user/bsps/bsps-powerpc.rst
+++ b/user/bsps/bsps-powerpc.rst
@@ -36,10 +36,10 @@ image.  Use the following commands:
 
 .. code-block:: none
 
-    powerpc-rtems5-objcopy -O binary -R .comment -S ticker.exe rtems
+    powerpc-rtems at rtems-ver-major@-objcopy -O binary -R .comment -S ticker.exe rtems
     gzip -9 -f rtems
-    powerpc-rtems5-ld -o ticker.boot bootloader.o --just-symbols=ticker.exe -b binary rtems.gz -T ppcboot.lds -no-warn-mismatch
-    powerpc-rtems5-objcopy -O binary ticker.boot ticker.bin
+    powerpc-rtems at rtems-ver-major@-ld -o ticker.boot bootloader.o --just-symbols=ticker.exe -b binary rtems.gz -T ppcboot.lds -no-warn-mismatch
+    powerpc-rtems at rtems-ver-major@-objcopy -O binary ticker.boot ticker.bin
 
 mpc55xxevb
 ==========
@@ -107,7 +107,7 @@ image.  Use the following commands:
 
 .. code-block:: none
 
-    powerpc-rtems5-objcopy -O binary app.exe app.bin
+    powerpc-rtems at rtems-ver-major@-objcopy -O binary app.exe app.bin
     gzip -9 -f -c app.bin > app.bin.gz
     mkimage -A ppc -O linux -T kernel -a 0x4000 -e 0x4000 -n RTEMS -d app.bin.gz app.img
 
diff --git a/user/bsps/bsps-riscv.rst b/user/bsps/bsps-riscv.rst
index 0799ad6..5faa87b 100644
--- a/user/bsps/bsps-riscv.rst
+++ b/user/bsps/bsps-riscv.rst
@@ -50,7 +50,8 @@ The reference platform for this BSP is the Qemu `virt` machine.
 Build Configuration Options
 ---------------------------
 
-The following options are available at the configure command line.
+The following options can be used in the BSP section of the ``waf``
+configuration INI file. The ``waf`` defaults can be used to inspect the values.
 
 ``BSP_PRESS_KEY_FOR_RESET``
     If defined to a non-zero value, then print a message and wait until pressed
diff --git a/user/bsps/bsps-x86_64.rst b/user/bsps/bsps-x86_64.rst
index eefffab..a7f7326 100644
--- a/user/bsps/bsps-x86_64.rst
+++ b/user/bsps/bsps-x86_64.rst
@@ -20,7 +20,7 @@ in the RTEMS testsuite.
 Build Configuration Options
 ---------------------------
 
-There are no options available to ``configure`` at build time, at the moment.
+There are no BSP configuration options available at build time.
 
 Testing with QEMU
 -----------------
-- 
2.24.1