diff --git a/docs/plat/index.rst b/docs/plat/index.rst
index 2695d4e..d0b4827 100644
--- a/docs/plat/index.rst
+++ b/docs/plat/index.rst
@@ -9,6 +9,7 @@
    allwinner
    meson-gxbb
    meson-gxl
+   meson-g12a
    fvp_ve
    hikey
    hikey960
@@ -23,7 +24,9 @@
    ls1043a
    poplar
    qemu
+   qemu-sbsa
    rpi3
+   rpi4
    rcar-gen3
    rockchip
    socionext-uniphier
diff --git a/docs/plat/qemu-sbsa.rst b/docs/plat/qemu-sbsa.rst
new file mode 100644
index 0000000..51fe414
--- /dev/null
+++ b/docs/plat/qemu-sbsa.rst
@@ -0,0 +1,48 @@
+QEMU SBSA Target
+================
+
+Trusted Firmware-A (TF-A) implements the EL3 firmware layer for QEMU SBSA
+Armv8-A. While running Qemu from command line, we need to supply two Flash
+images. First Secure BootRom is supplied by -pflash argument. This Flash image
+is made by EDK2 build system by composing BL1 and FIP. Second parameter for Qemu
+is responsible for Non-secure rom which also given with -pflash argument and
+contains of UEFI and EFI variables (also made by EDK2 build system). Semihosting
+is not used
+
+When QEMU starts all CPUs are released simultaneously, BL1 selects a
+primary CPU to handle the boot and the secondaries are placed in a polling
+loop to be released by normal world via PSCI.
+
+BL2 edits the FDT, generated by QEMU at run-time to add a node describing PSCI
+and also enable methods for the CPUs.
+
+Current limitations:
+
+-  Only cold boot is supported
+-  No instructions for how to load a BL32 (Secure Payload)
+
+To build TF-A:
+
+::
+
+    git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git tfa
+    cd tfa
+    export CROSS_COMPILE=aarch64-linux-gnu-
+    make PLAT=qemu_sbsa all fip
+
+Images will be placed at build/qemu_sbsa/release (bl1.bin and fip.bin).
+Need to copy them into top directory for EDK2 compilation.
+
+::
+
+    cp build/qemu_sbsa/release/bl1.bin ../
+    cp build/qemu_sbsa/release/fip.bin ../
+
+Those images cannot be used by itself (no semihosing support). Flash images are built by
+EDK2 build system, refer to edk2-platform repo for full build instructions.
+
+::
+
+    git clone https://github.com/tianocore/edk2-platforms.git
+    Platform/Qemu/SbsaQemu/Readme.md
+
diff --git a/docs/plat/qemu_sbsa.rst b/docs/plat/qemu_sbsa.rst
deleted file mode 100644
index e04a63c..0000000
--- a/docs/plat/qemu_sbsa.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-Trusted Firmware-A for QEMU SBSA target
-========================================
-
-Trusted Firmware-A (TF-A) implements the EL3 firmware layer for QEMU SBSA
-Armv8-A. While running Qemu from command line, we need to supply two Flash
-images. First Secure BootRom is supplied by -pflash argument. This Flash image
-is made by EDK2 build system by composing BL1 and FIP. Second parameter for Qemu
-is responsible for Non-secure rom which also given with -pflash argument and
-contains of UEFI and EFI variables (also made by EDK2 build system). Semihosting
-is not used
-
-When QEMU starts all CPUs are released simultaneously, BL1 selects a
-primary CPU to handle the boot and the secondaries are placed in a polling
-loop to be released by normal world via PSCI.
-
-BL2 edits the FDT, generated by QEMU at run-time to add a node describing PSCI
-and also enable methods for the CPUs.
-
-Current limitations:
-
--  Only cold boot is supported
--  No instructions for how to load a BL32 (Secure Payload)
-
-To build TF-A:
-
-::
-
-    git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git tfa
-    cd tfa
-    export CROSS_COMPILE=aarch64-linux-gnu-
-    make PLAT=qemu_sbsa all fip
-
-Images will be placed at build/qemu_sbsa/release (bl1.bin and fip.bin).
-Need to copy them into top directory for EDK2 compilation.
-
-::
-
-    cp build/qemu_sbsa/release/bl1.bin ../
-    cp build/qemu_sbsa/release/fip.bin ../
-
-Those images cannot be used by itself (no semihosing support). Flash images are built by
-EDK2 build system, refer to edk2-platform repo for full build instructions.
-
-::
-
-    git clone https://github.com/tianocore/edk2-platforms.git
-    Platform/Qemu/SbsaQemu/Readme.md
-