Ubuntu
u-boot package

FFE: enable riscv64 Milk-V Mars board

Bug #2055939 reported by Heinrich Schuchardt
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
u-boot (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

With the patch series https://lore<email address hidden>/ we can support the Milk-V Mars board in U-boot which features the same SoC as the VisionFive 2 board.

The changed code only concerns the StarFive VisionFive 2 board and the Milk-V Mars board.

I have tested booting both boards with the enhanced u-boot-starfive package.

Related branches

~xypron/ubuntu/+source/u-boot:merge-lp2055939-noble
Dave Jones: Pending requested
Diff: 1603 lines (+657/-112)
48 files modified
Makefile (+10/-2)
arch/riscv/include/asm/arch-jh7110/eeprom.h (+9/-0)
arch/sandbox/config.mk (+0/-2)
board/samsung/common/bootscripts/autoboot.cmd (+1/-1)
board/samsung/common/bootscripts/bootzimg.cmd (+2/-2)
board/samsung/common/dfu_sample_env.txt (+2/-2)
board/starfive/visionfive2/spl.c (+87/-13)
board/starfive/visionfive2/starfive_visionfive2.c (+30/-14)
board/starfive/visionfive2/visionfive2-i2c-eeprom.c (+8/-1)
boot/Kconfig (+10/-0)
boot/Makefile (+1/-1)
boot/bootmeth_efi.c (+1/-1)
boot/bootmeth_efi_mgr.c (+1/-1)
boot/bootmeth_pxe.c (+1/-1)
cmd/Kconfig (+3/-0)
configs/nitrogen6q2g_defconfig (+13/-1)
configs/qemu-x86_64_defconfig (+2/-0)
configs/qemu_arm64_defconfig (+2/-0)
configs/rpi_2_defconfig (+4/-2)
configs/rpi_3_32b_defconfig (+4/-2)
configs/rpi_3_defconfig (+4/-2)
configs/rpi_4_32b_defconfig (+3/-3)
configs/rpi_4_defconfig (+3/-3)
configs/starfive_visionfive2_defconfig (+1/-1)
debian/changelog (+7/-0)
debian/patches/riscv64/0001-boot-enable-booting-via-EFI-boot-manager-by-default.patch (+67/-0)
debian/patches/riscv64/0002-boot-correct-the-default-sequence-of-boot-methods.patch (+89/-0)
debian/patches/riscv64/0003-board-starfive-support-Milk-V-Mars-board.patch (+5/-7)
debian/patches/riscv64/0003-efi_loader-move-HOST_ARCH-to-version_autogenerated.h.patch (+70/-0)
debian/patches/riscv64/0004-boot-correct-finding-the-default-EFI-binary.patch (+118/-0)
debian/patches/series (+4/-0)
doc/board/starfive/index.rst (+1/-0)
drivers/phy/rockchip/phy-rockchip-inno-usb2.c (+21/-0)
drivers/serial/serial_sbi.c (+1/-1)
include/configs/odroid.h (+1/-1)
include/configs/odroid_xu3.h (+1/-1)
include/configs/s5p_goni.h (+1/-1)
include/configs/s5pc210_universal.h (+1/-1)
include/configs/trats.h (+1/-1)
include/configs/trats2.h (+1/-1)
include/host_arch.h (+2/-0)
lib/efi_loader/Kconfig (+0/-1)
lib/efi_loader/Makefile (+1/-2)
lib/efi_loader/efi_disk.c (+33/-13)
lib/rsa/rsa-sign.c (+11/-1)
test/boot/bootflow.c (+1/-1)
test/image/test-imagetools.sh (+13/-25)
tools/kwbimage.c (+5/-0)
Revision history for this message
Heinrich Schuchardt (xypron) wrote :

Merge request
https://code.launchpad.net/~xypron/ubuntu/+source/u-boot/+git/u-boot/+merge/461725

Revision history for this message
Dave Jones (waveform) wrote :

I suspect the FFe's going to a little bit more detail, specifically (from https://wiki.ubuntu.com/FreezeExceptionProcess):

* the diff of the upstream changelog as changelog.diff -- I'm not sure that's actually necessary here since it's basically the content of your header e-mail which is immediately accessible from https://lore<email address hidden>/

* the build log as a separate file; that's more likely useful here given lack of access to the hardware for those reviewing this

* the template mentions an install log; that *might* be useful but speaks more to flash-kernel in this case than anything else, I suspect, so probably not required

And you've already mentioned the testing you've done which I think is sufficient given the limited nature of the patch. Anyway, I'll go ahead and sponsor this now but you might want to consider attaching a build-log just in case the FFe reviewer wants it.

Revision history for this message
Heinrich Schuchardt (xypron) wrote :

@Dave thanks for indicating the necessary information

* Upstream changelog: The patches are not in upstream yet. This is the shortlog for applied patches:
      eeprom: starfive: function get_product_id_from_eeprom()
      riscv: set fdtfile on Milk-V Mars
      board: starfive: support Milk-V Mars board
      riscv: starfive: avoid including common.h
      doc: describe Milk-V Mars board

* Buildlog: The package is available in ppa:xypron/gnu-efi. The riscv64 buildlog is https://launchpadlibrarian.net/717451106/buildlog_ubuntu-noble-riscv64.u-boot_2024.01+dfsg-1ubuntu3_BUILDING.txt.gz

* Installation log: The u-boot-starfive package only provides the U-Boot files but does not copy them to the SD-card or flash. Flash-kernel is not involved as U-Boot does not provide device-trees.

# dpkg -i u-boot-starfive_2024.01+dfsg-1ubuntu3_riscv64.deb
(Reading database ... 150477 files and directories currently installed.)
Preparing to unpack u-boot-starfive_2024.01+dfsg-1ubuntu3_riscv64.deb ...
Unpacking u-boot-starfive:riscv64 (2024.01+dfsg-1ubuntu3) over (2024.01+dfsg-1ubuntu2) ...
Setting up u-boot-starfive:riscv64 (2024.01+dfsg-1ubuntu3) ...

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

I think this is fine. My only concern is that the package now fails to build from source on armhf, but that's unrelated to the uploaded change. However, I'd ask the uploaders to keep a lookout on the package and making sure that the armhf build is rebuilt once the time_t craziness is over.

For now, approving the FFe.

Changed in u-boot (Ubuntu):
status: New → Triaged
Revision history for this message
Graham Inggs (ginggs) wrote :

u-boot 2024.01+dfsg-1ubuntu3 just built on armhf

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package u-boot - 2024.01+dfsg-1ubuntu3

---------------
u-boot (2024.01+dfsg-1ubuntu3) noble; urgency=medium

  Add support for the Milk-V Mars board to the u-boot-starfive package.
  (LP: #2055939)

 -- Heinrich Schuchardt <email address hidden> Mon, 04 Mar 2024 16:58:44 +0100

Changed in u-boot (Ubuntu):
status: Triaged → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.