3 files changed, 53 insertions, 13 deletions

diff --git a/doc/develop/index.rst b/doc/develop/index.rst
index 5934d9ffb11..97c526e997e 100644
--- a/doc/develop/index.rst
+++ b/doc/develop/index.rst
@@ -14,8 +14,9 @@ General
    patman
    process
    release_cycle
-   system_configuration
+   security
    sending_patches
+   system_configuration
 
 Implementation
 --------------
diff --git a/doc/develop/security.rst b/doc/develop/security.rst
new file mode 100644
index 00000000000..84b130646f3
--- /dev/null
+++ b/doc/develop/security.rst
@@ -0,0 +1,32 @@
+.. SPDX-License-Identifier: GPL-2.0+:
+
+Handling of security vulnerabilities
+====================================
+
+The U-Boot project takes security very seriously.  As such, we'd like to know
+when a security bug is found so that it can be fixed and disclosed as quickly
+as possible.
+
+Contact
+-------
+
+The preferred initial point of contact is to send email to
+`u-boot@lists.denx.de` and use `scripts/get_maintainers.pl` to also include any
+relevant custodians. In addition, Tom Rini should be contacted at
+`trini@konsulko.com`.
+
+CVE assignment
+--------------
+
+The U-Boot project cannot directly assign CVEs, nor do we require them for
+reports or fixes, as this can needlessly complicate the process and may delay
+the bug handling. If a reporter wishes to have a CVE identifier assigned ahead
+of public disclosure, they will need to coordinate this on their own.  When
+such a CVE identifier is known before a patch is provided, it is desirable to
+mention it in the commit message if the reporter agrees.
+
+Non-disclosure agreements
+-------------------------
+
+The U-Boot project is not a formal body and therefore unable to enter any
+non-disclosure agreements.
diff --git a/doc/usage/cmd/sbi.rst b/doc/usage/cmd/sbi.rst
index 96d8861057f..713e0b9c816 100644
--- a/doc/usage/cmd/sbi.rst
+++ b/doc/usage/cmd/sbi.rst
@@ -21,27 +21,34 @@ The output may look like:
 ::
 
     => sbi
-    SBI 0.2
-    OpenSBI
+    SBI 1.0
+    OpenSBI 1.1
+    Machine:
+      Vendor ID 0
+      Architecture ID 0
+      Implementation ID 0
     Extensions:
-      sbi_set_timer
-      sbi_console_putchar
-      sbi_console_getchar
-      sbi_clear_ipi
-      sbi_send_ipi
-      sbi_remote_fence_i
-      sbi_remote_sfence_vma
-      sbi_remote_sfence_vma_asid
-      sbi_shutdown
+      Set Timer
+      Console Putchar
+      Console Getchar
+      Clear IPI
+      Send IPI
+      Remote FENCE.I
+      Remote SFENCE.VMA
+      Remote SFENCE.VMA with ASID
+      System Shutdown
       SBI Base Functionality
       Timer Extension
       IPI Extension
       RFENCE Extension
       Hart State Management Extension
+      System Reset Extension
+      Performance Monitoring Unit Extension
 
 The first line indicates the version of the RISC-V SBI specification.
 The second line indicates the implementation.
-The further lines enumerate the implemented extensions.
+The Machine section shows the values of the machine information registers.
+The Extensions section enumerates the implemented SBI extensions.
 
 Configuration
 -------------