All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions
@ 2026-09-19 10:29 Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 1/4] board/visionfive2: add rootwait to kernel command line Fengwei Tan
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Fengwei Tan @ 2026-09-19 10:29 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Dugast, Fengwei Tan

Hello all,

This series fixes a boot issue on the StarFive VisionFive 2 and bumps
the Linux, U-Boot, and OpenSBI versions.

The main changes in this series:

- Add the missing 'rootwait' parameter to prevent kernel panics caused
  by asynchronous MMC cards detection.
- Remove the SPL and U-Boot partitions from the SD card image, following
  the deprecation of SD card boot mode in U-Boot since v2025.10.
- Add support for VisionFive 2 v1.2a by enabling U-Boot to dynamically
  decide which FDT to load.

I have tested this series on a VisionFive 2 v1.2a board, and the system
boots successfully [1].

[1] https://gist.github.com/tfx2001/ff21435d8d535160662e13f3da6b7b3f

---
Changes in v2:
- Patch 2: Adjust indentation of the commands in the commit message
- Patch 3: Pin the U-Boot documentation link to v2026.07
- Patch 4: Reword the commit message to clarify that U-Boot sets
  $fdtfile automatically only when it is not already set.
- Link to v1: https://patch.msgid.link/SY8P300MB00419E6035B2DD54F72006D3B5872@SY8P300MB0041.AUSP300.PROD.OUTLOOK.COM

---
Fengwei Tan (4):
      board/visionfive2: add rootwait to kernel command line
      board/visionfive2: remove non-upstream Linux config options
      configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1
      board/visionfive2, configs/visionfive2: add support for v1.2a board

 board/visionfive2/genimage.cfg                     | 10 -------
 board/visionfive2/linux_defconfig                  | 33 +++-------------------
 .../overlay/boot/extlinux/extlinux.conf            |  4 +--
 board/visionfive2/patches/linux/linux.hash         |  2 +-
 board/visionfive2/patches/opensbi/opensbi.hash     |  2 +-
 board/visionfive2/patches/uboot/uboot.hash         |  2 +-
 board/visionfive2/readme.txt                       | 27 ++++++++++--------
 configs/visionfive2_defconfig                      | 11 ++++----
 8 files changed, 30 insertions(+), 61 deletions(-)
---
base-commit: a936a80d9e566234f3060fed521181f3fc7a2120
change-id: 20260912-bump-visonfive2-78f9069f9a69

Best regards,
--  
Fengwei Tan <tfx2001@outlook.com>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 1/4] board/visionfive2: add rootwait to kernel command line
  2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
@ 2026-09-19 10:29 ` Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 2/4] board/visionfive2: remove non-upstream Linux config options Fengwei Tan
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Fengwei Tan @ 2026-09-19 10:29 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Dugast, Fengwei Tan

MMC cards are detected asynchronously, so the root device may not be
available when the kernel tries to mount the root filesystem.

Add rootwait to wait for the root device and avoid a kernel panic.

Fixes: 4567c35d066e ("configs/visionfive2: bump OpenSBI to 1.6, Linux to 6.12.24 and U-Boot to 2025.04")
Signed-off-by: Fengwei Tan <tfx2001@outlook.com>
---
 board/visionfive2/overlay/boot/extlinux/extlinux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
index fd772f3675..48d267f725 100644
--- a/board/visionfive2/overlay/boot/extlinux/extlinux.conf
+++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 label linux
   kernel /boot/Image
   devicetree /boot/jh7110-starfive-visionfive-2-v1.3b.dtb
-  append console=ttyS0,115200 root=/dev/mmcblk1p3
+  append console=ttyS0,115200 root=/dev/mmcblk1p3 rootwait

-- 
2.55.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 2/4] board/visionfive2: remove non-upstream Linux config options
  2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 1/4] board/visionfive2: add rootwait to kernel command line Fengwei Tan
@ 2026-09-19 10:29 ` Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 3/4] configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1 Fengwei Tan
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Fengwei Tan @ 2026-09-19 10:29 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Dugast, Fengwei Tan

Remove vendor-specific config options from linux_defconfig as they are
not present in the upstream kernel.

Regenerate the defconfig by running:

  make visionfive2_defconfig
  make linux-menuconfig
  # Save and exit without making any changes.
  make linux-update-defconfig

Fixes: 4567c35d066e ("configs/visionfive2: bump OpenSBI to 1.6, Linux to 6.12.24 and U-Boot to 2025.04")
Signed-off-by: Fengwei Tan <tfx2001@outlook.com>
---
 board/visionfive2/linux_defconfig | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/board/visionfive2/linux_defconfig b/board/visionfive2/linux_defconfig
index 06942928b5..509cd0f475 100644
--- a/board/visionfive2/linux_defconfig
+++ b/board/visionfive2/linux_defconfig
@@ -22,7 +22,6 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SOC_STARFIVE=y
 CONFIG_NONPORTABLE=y
 CONFIG_SMP=y
-CONFIG_RISCV_AMP=y
 CONFIG_HZ_100=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="PARTLABEL=hibernation"
@@ -40,6 +39,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 # CONFIG_SECCOMP is not set
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_BINFMT_MISC=y
@@ -87,7 +87,6 @@ CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_AICUSB=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y
@@ -104,7 +103,6 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_SPI_NOR=y
-CONFIG_OF_CONFIGFS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_NVME=y
@@ -159,21 +157,15 @@ CONFIG_MARVELL_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_MICROCHIP_PHY=y
 CONFIG_MOTORCOMM_PHY=y
-CONFIG_IPMS_CAN=y
 CONFIG_IWLWIFI=y
 CONFIG_IWLDVM=y
 CONFIG_IWLMVM=y
 # CONFIG_RTL_CARDS is not set
-CONFIG_USB_WIFI_ECR6600U=y
-CONFIG_AIC_WLAN_SUPPORT=y
-CONFIG_AIC8800_WLAN_SUPPORT=m
-CONFIG_AIC_LOADFW_SUPPORT=m
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GOODIX=y
-CONFIG_TOUCHSCREEN_TINKER_FT5406=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
@@ -221,10 +213,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CADENCE_CSI2RX=y
 CONFIG_VIDEO_WAVE_VPU=m
-CONFIG_VIN_SENSOR_OV4689=y
-CONFIG_VIDEO_STF_VIN=y
 CONFIG_VIDEO_IMX219=y
-CONFIG_VIDEO_IMX708=y
 # CONFIG_CXD2880_SPI_DRV is not set
 # CONFIG_MEDIA_TUNER_E4000 is not set
 # CONFIG_MEDIA_TUNER_FC0011 is not set
@@ -371,13 +360,8 @@ CONFIG_VIDEO_IMX708=y
 # CONFIG_DVB_SP2 is not set
 CONFIG_DRM=y
 CONFIG_DRM_PANEL_JADARD_JD9365DA_H3=y
-CONFIG_DRM_PANEL_STARFIVE_JADARD=y
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_TOSHIBA_TC358762=y
-CONFIG_DRM_VERISILICON=y
-CONFIG_STARFIVE_INNO_HDMI=y
-CONFIG_STARFIVE_DSI=y
-CONFIG_DRM_IMG_ROGUE=y
 CONFIG_FB=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_SOUND=y
@@ -389,7 +373,6 @@ CONFIG_SND_SOC_RZ=m
 CONFIG_SND_SOC_STARFIVE=y
 CONFIG_SND_SOC_JH7110_PWMDAC=y
 CONFIG_SND_SOC_JH7110_TDM=y
-CONFIG_SND_SOC_AC108=y
 CONFIG_SND_SOC_WM8960=y
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_UHID=y
@@ -477,7 +460,6 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STARFIVE=y
 CONFIG_RTC_DRV_GOLDFISH=y
 CONFIG_DMADEVICES=y
 CONFIG_AMBA_PL08X=y
@@ -492,22 +474,16 @@ CONFIG_CLK_STARFIVE_JH7110_STG=y
 CONFIG_CLK_STARFIVE_JH7110_ISP=y
 CONFIG_CLK_STARFIVE_JH7110_VOUT=y
 CONFIG_MAILBOX=y
-CONFIG_STARFIVE_IPI_MBOX=y
-CONFIG_STARFIVE_MBOX=m
-CONFIG_STARFIVE_MBOX_TEST=m
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_RPMSG_CHAR=y
 CONFIG_RPMSG_CTRL=y
-CONFIG_RPMSG_STARFIVE=m
 CONFIG_RPMSG_VIRTIO=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_IIO=y
 CONFIG_IIO_ST_ACCEL_3AXIS=y
 CONFIG_PWM=y
-CONFIG_PWM_OCORES=y
 CONFIG_PHY_STARFIVE_JH7110_PCIE=y
 CONFIG_PHY_STARFIVE_JH7110_USB=y
-CONFIG_PHY_M31_DPHY_RX0=y
 CONFIG_RAS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y

-- 
2.55.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 3/4] configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1
  2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 1/4] board/visionfive2: add rootwait to kernel command line Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 2/4] board/visionfive2: remove non-upstream Linux config options Fengwei Tan
@ 2026-09-19 10:29 ` Fengwei Tan
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 4/4] board/visionfive2, configs/visionfive2: add support for v1.2a board Fengwei Tan
  2026-09-20 12:30 ` [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Thomas Petazzoni via buildroot
  4 siblings, 0 replies; 6+ messages in thread
From: Fengwei Tan @ 2026-09-19 10:29 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Dugast, Fengwei Tan

Migrate and clean up removed kernel config options during the upgrade.

Drop uboot and spl partitions from the SD card genimage configuration,
as U-Boot has deprecated the SD card and eMMC boot modes since
v2025.10 [1]. Update the rootfs block device in the kernel command line
accordingly.

Update readme.txt to reflect the new boot flow and instructions.

[1] https://docs.u-boot.org/en/v2026.07/board/starfive/visionfive2.html#zero-stage-program-loader

Signed-off-by: Fengwei Tan <tfx2001@outlook.com>
---
 board/visionfive2/genimage.cfg                     | 10 --------
 board/visionfive2/linux_defconfig                  |  7 +++---
 .../overlay/boot/extlinux/extlinux.conf            |  2 +-
 board/visionfive2/patches/linux/linux.hash         |  2 +-
 board/visionfive2/patches/opensbi/opensbi.hash     |  2 +-
 board/visionfive2/patches/uboot/uboot.hash         |  2 +-
 board/visionfive2/readme.txt                       | 27 ++++++++++++----------
 configs/visionfive2_defconfig                      |  8 +++----
 8 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg
index 8133e740c0..af7bc70d1a 100644
--- a/board/visionfive2/genimage.cfg
+++ b/board/visionfive2/genimage.cfg
@@ -5,16 +5,6 @@ image sdcard.img {
 		partition-table-type = "gpt"
 	}
 
-	partition spl {
-		partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985
-		image = "u-boot-spl.bin.normal.out"
-	}
-
-	partition uboot {
-		partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172
-		image = "u-boot.itb"
-	}
-
 	partition rootfs {
 		partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4
 		bootable = true
diff --git a/board/visionfive2/linux_defconfig b/board/visionfive2/linux_defconfig
index 509cd0f475..1ca11f4097 100644
--- a/board/visionfive2/linux_defconfig
+++ b/board/visionfive2/linux_defconfig
@@ -3,7 +3,6 @@ CONFIG_COMPILE_TEST=y
 CONFIG_DEFAULT_HOSTNAME="StarFive"
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_USELIB=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BPF_SYSCALL=y
@@ -59,6 +58,7 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_TABLES=y
 CONFIG_NFT_CT=y
 CONFIG_NFT_COMPAT=y
+CONFIG_NETFILTER_XTABLES_LEGACY=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
@@ -69,6 +69,7 @@ CONFIG_NETFILTER_XT_MATCH_SOCKET=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STRING=y
 CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_IP_NF_IPTABLES_LEGACY=y
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_DUP_IPV4=y
 CONFIG_NFT_FIB_IPV4=y
@@ -197,7 +198,6 @@ CONFIG_THERMAL=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
-# CONFIG_HISI_THERMAL is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_MFD_AXP20X_I2C=y
@@ -370,7 +370,6 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_DESIGNWARE_I2S=y
 CONFIG_SND_SOC_RZ=m
-CONFIG_SND_SOC_STARFIVE=y
 CONFIG_SND_SOC_JH7110_PWMDAC=y
 CONFIG_SND_SOC_JH7110_TDM=y
 CONFIG_SND_SOC_WM8960=y
@@ -522,7 +521,7 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_INIT_STACK_NONE=y
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_BENCHMARK=m
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
index 48d267f725..7934d70e15 100644
--- a/board/visionfive2/overlay/boot/extlinux/extlinux.conf
+++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 label linux
   kernel /boot/Image
   devicetree /boot/jh7110-starfive-visionfive-2-v1.3b.dtb
-  append console=ttyS0,115200 root=/dev/mmcblk1p3 rootwait
+  append console=ttyS0,115200 root=/dev/mmcblk1p1 rootwait
diff --git a/board/visionfive2/patches/linux/linux.hash b/board/visionfive2/patches/linux/linux.hash
index 1213da86b1..b2cfc9b7e7 100644
--- a/board/visionfive2/patches/linux/linux.hash
+++ b/board/visionfive2/patches/linux/linux.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  643142c1b5991560dd12f950825cc19e4497b95b82641918ecff1177f4130c1d  linux-6.12.24.tar.xz
+sha256  ba2f60f858bf4d1f929101faa356c93dc8b925b17aaa9f95eabd4627758df613  linux-6.18.51.tar.xz
diff --git a/board/visionfive2/patches/opensbi/opensbi.hash b/board/visionfive2/patches/opensbi/opensbi.hash
index d7893a1dee..5e2e695bc1 100644
--- a/board/visionfive2/patches/opensbi/opensbi.hash
+++ b/board/visionfive2/patches/opensbi/opensbi.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667  opensbi-1.6.tar.gz
+sha256  fb1ae61a85e966322101acb1c982f84d9eaafc4de7dd474a7d7546d9bb321c6f  opensbi-1.8.1.tar.gz
diff --git a/board/visionfive2/patches/uboot/uboot.hash b/board/visionfive2/patches/uboot/uboot.hash
index 80ea21b7cb..ff6e4ed2e2 100644
--- a/board/visionfive2/patches/uboot/uboot.hash
+++ b/board/visionfive2/patches/uboot/uboot.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718  u-boot-2025.04.tar.bz2
+sha256  78e8bfc382fe388f9b55aa1daf8c563522a037779b5d4c349d1415e381f1243e  u-boot-2026.07.tar.bz2
diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt
index cc4fece6e9..718494e33e 100644
--- a/board/visionfive2/readme.txt
+++ b/board/visionfive2/readme.txt
@@ -1,8 +1,8 @@
-Starfive VisionFive2
+StarFive VisionFive2
 ====================
 
 The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a
-Starfive JH7110 processor.
+StarFive JH7110 processor.
 
 https://doc-en.rvspace.org/Doc_Center/visionfive_2.html
 
@@ -24,33 +24,36 @@ If you have a booting device use u-boot and tftp:
 
   # tftpboot 0x82000000 spi-nor.img
   # sf probe
-  # sf update 0x82000000 0x0 {filesize}
+  # sf update 0x82000000 0x0 ${filesize}
 
-Otherwise, follow the recovery instruction:
+Otherwise, follow the recovery instructions:
 
 https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/recovering_bootloader%20-%20vf2.html
 
 How to write the SD card
 ========================
 
-Copy the bootable "sdcard.img" onto an SD card with "dd":
+Write "sdcard.img" onto an SD card with "dd":
 
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
 
 Preparing the board
 ===================
 
 Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX).
 
-Use the correct mode for booting:
-- SD card RGPIO_0=1, GRPIO_1=0
-- SPI NOR flash RGPIO_0=1, GRPIO_1=1
-
-Note that Buildroot puts the bootloader both in SPI NOR and on the SD card,
-so after flashing as instructed above, either boot mode should work.
+Select SPI NOR flash boot mode:
+- RGPIO_0=0, RGPIO_1=0
 
 https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/boot_mode_settings.html
 
 Insert your SD card.
 
 Power-up the board using an USB-C cable.
+
+Note that starting with U-Boot v2025.10, booting U-Boot directly from an
+SD card is no longer supported on this board. In this configuration, the
+bootloader is loaded from SPI NOR flash, while the SD card contains the
+Linux kernel, device trees and root filesystem.
+
+https://docs.u-boot.org/en/v2026.07/board/starfive/visionfive2.html#zero-stage-program-loader
diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig
index 8223e6faa1..3e30c0649c 100644
--- a/configs/visionfive2_defconfig
+++ b/configs/visionfive2_defconfig
@@ -1,5 +1,5 @@
 BR2_riscv=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18=y
 BR2_GLOBAL_PATCH_DIR="board/visionfive2/patches"
 BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_SYSTEM_DHCP="eth0"
@@ -7,7 +7,7 @@ BR2_ROOTFS_OVERLAY="board/visionfive2/overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/visionfive2/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.51"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/visionfive2/linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -19,14 +19,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_OPENSBI=y
 BR2_TARGET_OPENSBI_CUSTOM_VERSION=y
-BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.6"
+BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.8.1"
 BR2_TARGET_OPENSBI_PLAT="generic"
 # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set
 BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

-- 
2.55.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 4/4] board/visionfive2, configs/visionfive2: add support for v1.2a board
  2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
                   ` (2 preceding siblings ...)
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 3/4] configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1 Fengwei Tan
@ 2026-09-19 10:29 ` Fengwei Tan
  2026-09-20 12:30 ` [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Thomas Petazzoni via buildroot
  4 siblings, 0 replies; 6+ messages in thread
From: Fengwei Tan @ 2026-09-19 10:29 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Dugast, Fengwei Tan

There are two revisions of the VisionFive 2: v1.2a and v1.3b. The main
difference between them is that v1.2a has one Gigabit Ethernet port and
one Fast Ethernet port, while v1.3b has two Gigabit Ethernet ports.

Unless explicitly set, U-Boot automatically sets $fdtfile based on the
EEPROM product data during initialization, enabling <fdtdir>/<fdtfile>
to be loaded via extlinux.conf.

Additionally, since $fdtfile contains the directory name, preserve the
directory structure of the DTBs when copying them to the target
directory.

Signed-off-by: Fengwei Tan <tfx2001@outlook.com>
---
 board/visionfive2/overlay/boot/extlinux/extlinux.conf | 2 +-
 configs/visionfive2_defconfig                         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
index 7934d70e15..6c290f519c 100644
--- a/board/visionfive2/overlay/boot/extlinux/extlinux.conf
+++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf
@@ -1,4 +1,4 @@
 label linux
   kernel /boot/Image
-  devicetree /boot/jh7110-starfive-visionfive-2-v1.3b.dtb
+  fdtdir /boot
   append console=ttyS0,115200 root=/dev/mmcblk1p1 rootwait
diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig
index 3e30c0649c..7ce605b84b 100644
--- a/configs/visionfive2_defconfig
+++ b/configs/visionfive2_defconfig
@@ -11,7 +11,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.51"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/visionfive2/linux_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-starfive-visionfive-2-v1.3b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-starfive-visionfive-2-v1.3b"
+BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_TARGET_ROOTFS_EXT2=y

-- 
2.55.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions
  2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
                   ` (3 preceding siblings ...)
  2026-09-19 10:29 ` [Buildroot] [PATCH v2 4/4] board/visionfive2, configs/visionfive2: add support for v1.2a board Fengwei Tan
@ 2026-09-20 12:30 ` Thomas Petazzoni via buildroot
  4 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-09-20 12:30 UTC (permalink / raw)
  To: Fengwei Tan; +Cc: buildroot, Francois Dugast

On Sat, Sep 19, 2026 at 06:29:00PM +0800, Fengwei Tan wrote:

> Fengwei Tan (4):
>       board/visionfive2: add rootwait to kernel command line
>       board/visionfive2: remove non-upstream Linux config options
>       configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1
>       board/visionfive2, configs/visionfive2: add support for v1.2a board

Thanks, series applied!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2026-09-20 12:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-19 10:29 [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Fengwei Tan
2026-09-19 10:29 ` [Buildroot] [PATCH v2 1/4] board/visionfive2: add rootwait to kernel command line Fengwei Tan
2026-09-19 10:29 ` [Buildroot] [PATCH v2 2/4] board/visionfive2: remove non-upstream Linux config options Fengwei Tan
2026-09-19 10:29 ` [Buildroot] [PATCH v2 3/4] configs/visionfive2: bump Linux to 6.18.51, U-Boot to 2026.07, and OpenSBI to 1.8.1 Fengwei Tan
2026-09-19 10:29 ` [Buildroot] [PATCH v2 4/4] board/visionfive2, configs/visionfive2: add support for v1.2a board Fengwei Tan
2026-09-20 12:30 ` [Buildroot] [PATCH v2 0/4] board/visionfive2: fix boot issue and bump Linux/U-Boot/OpenSBI versions Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.