Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-riscv into next

CI: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/29548
- board: starfive: Add Xunlong OrangePi RV
- board: starfive: Add VisionFive 2 Lite
- board: beagle: Add BeagleV-Fire

3 files changed, 41 insertions, 6 deletions

diff --git a/doc/board/starfive/index.rst b/doc/board/starfive/index.rst
index f85d7376b44..0996e0a68aa 100644
--- a/doc/board/starfive/index.rst
+++ b/doc/board/starfive/index.rst
@@ -10,5 +10,6 @@ StarFive
    milk-v_mars
    milkv_marscm_emmc
    milkv_marscm_lite
+   orangepi_rv
    pine64_star64
    visionfive2
diff --git a/doc/board/starfive/jh7110_common.rst b/doc/board/starfive/jh7110_common.rst
index 77102fcc189..e9c0ed5b022 100644
--- a/doc/board/starfive/jh7110_common.rst
+++ b/doc/board/starfive/jh7110_common.rst
@@ -162,8 +162,8 @@ Build U-Boot
        git -C opensbi.git checkout v1.7
        # always clean build directory when building OpenSBI due to incomplete
        # dependency tracking
-       make -C opensbi.git -O opensbi clean
-       make -C opensbi.git -O opensbi PLATFORM=generic
+       make -C opensbi.git O=opensbi clean
+       make -C opensbi.git O=opensbi PLATFORM=generic
 
 4.  Now build the First Stage BootLoader (U-Boot Secondary Program Loader) and
     Second Boot Loader (OpenSBI + U-Boot Main):
@@ -171,9 +171,8 @@ Build U-Boot
     .. code-block:: console
 
        git clone https://source.denx.de/u-boot/u-boot.git u-boot.git
-       make -C u-boot.git -O u-boot starfive_visionfive2_defconfig
-       export OPENSBI=opensbi/build/platform/generic/firmware/fw_dynamic.bin
-       make -C u-boot.git -O u-boot
+       make -C u-boot.git O=u-boot starfive_visionfive2_defconfig
+       make -C u-boot.git O=u-boot OPENSBI=opensbi/platform/generic/firmware/fw_dynamic.bin
 
     This will generate the U-Boot SPL image object post-processed with StarFive
     SPL headers (u-boot/spl/u-boot-spl.bin.normal.out) as well as the FIT image
@@ -191,7 +190,7 @@ Build U-Boot
          --set-val SPL_DEBUG_UART_BASE 0x10000000 \
          --set-val DEBUG_UART_SHIFT 2
 
-        make -C u-boot.git -O u-boot olddefconfig
+        make -C u-boot.git O=u-boot olddefconfig
 
 Boot description
 ----------------
diff --git a/doc/board/starfive/orangepi_rv.rst b/doc/board/starfive/orangepi_rv.rst
new file mode 100644
index 00000000000..29cc58a1e2b
--- /dev/null
+++ b/doc/board/starfive/orangepi_rv.rst
@@ -0,0 +1,35 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Xunlong OrangePi RV
+===================
+
+U-Boot for the OrangePi RV uses the same U-Boot binaries as the VisionFive 2
+board. In U-Boot SPL the actual board is detected as a VisionFive2 1.3b due to
+a manufacturer problem and having the same EEPROM data as VisionFive2 1.3b.
+
+Device-tree selection
+---------------------
+
+U-Boot will set variable $fdtfile to starfive/jh7110-starfive-visionfive-2-v1.3b.dtb
+
+This is sufficient for U-Boot however fails to work correctly with the Linux Kernel.
+
+To overrule this selection the variable can be set manually and saved in the
+environment
+
+::
+
+    env set fdtfile starfive/jh7110-orangepi-rv.dtb
+    env save
+
+EEPROM modification
+-------------------
+
+For advanced users and developers an EEPROM identifier product serial number
+beginning with "XOPIRV" will match the OrangePi RV and automatically set the
+correct device-tree at U-Boot SPL phase. The procedure for writing EEPROM data
+is not detailed here however is similar to that of the Pine64 Star64 and Milk-V
+Mars CM. The write-protect disable pads on the Orange Pi RV circuit board
+bottom are labeled WP and GND near the M.2 connector.
+
+.. include:: jh7110_common.rst