[PATCH 0/6] Starfive VisionFive 2 updates

[PATCH 0/6] Starfive VisionFive 2 updates

[Jan Kiszka]

This first fixes a build issue of the current U-Boot recipe and then
switches the firmware to upstream U-Boot, simplifying things
significantly.

The kernel cannot be switched yet, unfortunately. Already the MMC driver
is still missing.

Jan

Jan Kiszka (6):
  meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP
    version VF2_v3.0.4
  meta-isar: starfive-visionfive2: Drop IMAGE_INSTALL from machine
    config
  meta-isar: starfive-visionfive2: Use kernel DTB
  meta-isar: jh7110-u-boot-spl-tool: Rework
  meta-isar: starfive-visionfive2: Switch to upstream U-Boot
  meta-isar: starfive-visionfive2: Drop obsolete recipes

 .../conf/machine/starfive-visionfive2.conf    | 18 ++------
 .../jh7110-u-boot-spl-image/files/install     |  1 -
 .../jh7110-u-boot-spl-image/files/rules       | 10 -----
 .../jh7110-u-boot-spl-image_0.1.bb            | 30 --------------
 .../jh7110-u-boot-spl-tool_0.1.bb             |  5 +--
 .../opensbi/files/starfive-visionfive2-rules  | 12 ++++++
 .../files/starfive-visionfive2-rules.tmpl     | 17 --------
 ...ensbi-starfive-visionfive2_1.2+20230310.bb | 11 +----
 .../files/starfive-visionfive2-rules.tmpl     | 35 ++++++++++++++++
 ...five-visionfive2_2022.01-rc4+VF2-2.11.5.bb | 31 --------------
 ...u-boot-starfive-visionfive2_2023.07-rc2.bb | 26 ++++++++++++
 .../files/rules.tmpl                          | 12 ------
 .../files/visionfive2-u-boot-firmware.install |  1 -
 .../visionfive2-uboot-fit-image.its.tmpl      | 41 -------------------
 .../visionfive2-u-boot-firmware.bb            | 36 ----------------
 .../canned-wks/starfive-visionfive2.wks.in    |  6 +--
 16 files changed, 83 insertions(+), 209 deletions(-)
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
 create mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
 delete mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
 create mode 100755 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
 delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
 create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb

-- 
2.35.3

[PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

JH7110_VisionFive2_devel is apparently rebasing, and now it left
our previously chosen commit orphaned behind. Update to latest BSP
U-Boot release and avoid that we may be surprised again.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ....5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-isar/recipes-bsp/u-boot/{u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} (85%)

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
similarity index 85%
rename from meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
rename to meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
index 0eeedc1a..1be1080e 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
@@ -5,8 +5,8 @@
 
 require recipes-bsp/u-boot/u-boot-custom.inc
 
-SRC_URI += "git://github.com/starfive-tech/u-boot.git;branch=JH7110_VisionFive2_devel;protocol=https;destsuffix=u-boot-${PV}"
-SRCREV = "ac0ac696256abf412826d74ee918dd417e207d7b"
+SRC_URI += "git://github.com/starfive-tech/u-boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}"
+SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
 
 DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${DISTRO_ARCH}"
 # when cross compiling, we need the library on the host as well, as the signature computation is done locally
-- 
2.35.3

[PATCH 2/6] meta-isar: starfive-visionfive2: Drop IMAGE_INSTALL from machine config

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This has no place in the machine config prevents clean reuse by other
layers. It's an image decision.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/machine/starfive-visionfive2.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf
index a07b064f..b051902f 100644
--- a/meta-isar/conf/machine/starfive-visionfive2.conf
+++ b/meta-isar/conf/machine/starfive-visionfive2.conf
@@ -20,9 +20,6 @@ IMAGER_BUILD_DEPS += " \
     jh7110-u-boot-spl-image \
     visionfive2-u-boot-firmware"
 
-IMAGE_INSTALL += "sshd-regen-keys"
-IMAGE_INSTALL += "expand-on-first-boot"
-
 # DTB file for OpenSBI
 DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb"
 # DTB file for booting
-- 
2.35.3

[PATCH 3/6] meta-isar: starfive-visionfive2: Use kernel DTB

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This will be needed when switching to upstream U-Boot as the DTB there
is still incomplete but will be otherwise used also for the kernel.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/machine/starfive-visionfive2.conf               | 3 ++-
 .../scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf
index b051902f..dcab8542 100644
--- a/meta-isar/conf/machine/starfive-visionfive2.conf
+++ b/meta-isar/conf/machine/starfive-visionfive2.conf
@@ -23,4 +23,5 @@ IMAGER_BUILD_DEPS += " \
 # DTB file for OpenSBI
 DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb"
 # DTB file for booting
-DTB_FILES = "starfive/jh7110-visionfive-v2.dtb"
+DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb"
+DTB_FILES = "starfive/${DTB_VISIONFIVE2}"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
index 0f3d76a9..99156f81 100644
--- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
+++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
@@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-b
 # U-Boot FIT
 part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" --ondisk mmcblk1 --fixed-size  4M --offset 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47
 # EFI
-part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024
+part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024
 # rootfs
 part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/
 
-- 
2.35.3

[PATCH 4/6] meta-isar: jh7110-u-boot-spl-tool: Rework

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Setting PACKAGE_ARCH is no longer needed, we can ask via "-native" for
the desired build type. Furthermore, install the binary as normal tool
under /usr/bin to simplify its usage.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules    | 2 +-
 .../jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb   | 2 +-
 .../jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb     | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
index 6a25dd36..a8b2c6b8 100644
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
+++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
@@ -4,7 +4,7 @@ U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin
 
 override_dh_auto_build:
 	cp $(U_BOOT_SPL_BIN) u-boot-spl.bin
-	/usr/lib/jh7110-uboot-spl-tool/spl_tool -c -f u-boot-spl.bin
+	spl_tool -c -f u-boot-spl.bin
 
 %:
 	dh \$@
diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
index 08c53b51..f237a9c3 100644
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
+++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
@@ -8,7 +8,7 @@ inherit dpkg
 SRC_URI = "file://rules file://install"
 
 DESCRIPTION = "StarFive VisionFive 2 u-boot SPL"
-DEPENDS = "jh7110-u-boot-spl-tool u-boot-starfive-visionfive2"
+DEPENDS = "jh7110-u-boot-spl-tool-native u-boot-starfive-visionfive2"
 DEBIAN_BUILD_DEPENDS = "jh7110-u-boot-spl-tool, u-boot-starfive-visionfive2:${DISTRO_ARCH}"
 
 # this is a host tool
diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb
index 1835d474..42d3b9d8 100644
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb
+++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb
@@ -13,11 +13,8 @@ SRCREV = "8c5acc4e5eb7e4ad012463b05a5e3dbbfed1c38d"
 
 S = "${WORKDIR}/tools/spl_tool"
 
-# This is a host tool
-PACKAGE_ARCH = "${HOST_ARCH}"
-
 do_prepare_build[cleandirs] += "${S}/debian"
 do_prepare_build(){
     deb_debianize
-    echo "spl_tool usr/lib/jh7110-uboot-spl-tool" > ${S}/debian/${PN}.install
+    echo "spl_tool usr/bin" > ${S}/debian/${BPN}.install
 }
-- 
2.35.3

[PATCH 5/6] meta-isar: starfive-visionfive2: Switch to upstream U-Boot

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

There are no more reasons to use the vendor tree, upcoming U-Boot
2023.07 will sufficiently support the board. There is just currently one
regression after -rc2, so stick with that intermediate version for now.

Moving upstream allows for significant simplifications in the build. We
are now building OpenSBI first and are then using U-Boot to finish all
artifacts needed for the image.

The wks file is updated accordingly, switching the GUID of the U-Boot
partition to the one upstream is recomending. Unneeded options for the
first two partitions are dropped at this chance.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../conf/machine/starfive-visionfive2.conf    | 12 ++-----
 .../opensbi/files/starfive-visionfive2-rules  | 12 +++++++
 .../files/starfive-visionfive2-rules.tmpl     | 17 ---------
 ...ensbi-starfive-visionfive2_1.2+20230310.bb | 11 ++----
 .../files/starfive-visionfive2-rules.tmpl     | 35 +++++++++++++++++++
 ...-starfive-visionfive2_2021.10+VF2-3.0.4.bb | 31 ----------------
 ...u-boot-starfive-visionfive2_2023.07-rc2.bb | 26 ++++++++++++++
 .../canned-wks/starfive-visionfive2.wks.in    |  4 +--
 8 files changed, 79 insertions(+), 69 deletions(-)
 create mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
 delete mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
 create mode 100755 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
 delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
 create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb

diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf
index dcab8542..c0f61f46 100644
--- a/meta-isar/conf/machine/starfive-visionfive2.conf
+++ b/meta-isar/conf/machine/starfive-visionfive2.conf
@@ -10,18 +10,10 @@ KERNEL_NAME ?= "starfive"
 PREFERRED_PROVIDER_u-boot-starfive-visionfive2 = "u-boot-starfive-visionfive2"
 
 IMAGE_FSTYPES ?= "wic"
-
 WKS_FILE ?= "starfive-visionfive2.wks.in"
-IMAGER_INSTALL += " \
-    jh7110-u-boot-spl-image \
-    visionfive2-u-boot-firmware \
-    ${SYSTEMD_BOOTLOADER_INSTALL}"
-IMAGER_BUILD_DEPS += " \
-    jh7110-u-boot-spl-image \
-    visionfive2-u-boot-firmware"
+IMAGER_INSTALL += " u-boot-starfive-visionfive2 ${SYSTEMD_BOOTLOADER_INSTALL}"
+IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2"
 
-# DTB file for OpenSBI
-DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb"
 # DTB file for booting
 DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb"
 DTB_FILES = "starfive/${DTB_VISIONFIVE2}"
diff --git a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
new file mode 100644
index 00000000..452ff356
--- /dev/null
+++ b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+endif
+
+override_dh_auto_build:
+	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) \
+		PLATFORM=generic FW_TEXT_START=0x40000000 FW_OPTIONS=0
+
+%:
+	dh $@
diff --git a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
deleted file mode 100644
index 5f35c1c2..00000000
--- a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
-endif
-
-UBOOT_DTB_FILE := /usr/share/u-boot/starfive-visionfive2/${DTB_UBOOT_JH7110_VF2}
-FW_TEXT_START := 0x40000000
-
-override_dh_auto_build:
-	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \
-		FW_PAYLOAD_PATH=/usr/lib/u-boot/starfive-visionfive2/u-boot.bin \
-		FW_FDT_PATH=$(UBOOT_DTB_FILE) \
-		FW_TEXT_START=$(FW_TEXT_START)
-
-%:
-	dh $@
diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb
index 86be2932..355a5a38 100644
--- a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb
+++ b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb
@@ -9,23 +9,16 @@ DESCRIPTION = "OpenSBI firmware for StarFive VisionFive 2"
 
 SRC_URI = " \
     git://github.com/riscv-software-src/opensbi.git;destsuffix=opensbi-${PV};protocol=https;branch=master \
-    file://starfive-visionfive2-rules.tmpl"
+    file://starfive-visionfive2-rules"
 # required patches are not yet part of a release, but will be in 1.3
 SRCREV = "2868f26131308ff345382084681ea89c5b0159f1"
 
 S = "${WORKDIR}/opensbi-${PV}"
-TEMPLATE_FILES += "starfive-visionfive2-rules.tmpl"
-TEMPLATE_VARS += "DTB_UBOOT_JH7110_VF2"
-
-DEPENDS = "u-boot-starfive-visionfive2"
-DEBIAN_BUILD_DEPENDS = " \
-    u-boot-starfive-visionfive2, \
-    u-boot-starfive-visionfive2-dev"
 
 do_prepare_build[cleandirs] += "${S}/debian"
 do_prepare_build() {
     cp ${WORKDIR}/starfive-visionfive2-rules ${WORKDIR}/rules
     deb_debianize
 
-    echo "build/platform/generic/firmware/fw_payload.bin /usr/lib/opensbi/starfive-visionfive2/" > ${S}/debian/install
+    echo "build/platform/generic/firmware/fw_dynamic.bin /usr/lib/opensbi/starfive-visionfive2/" > ${S}/debian/install
 }
diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
new file mode 100755
index 00000000..01bb9156
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
@@ -0,0 +1,35 @@
+#!/usr/bin/make -f
+
+# Debian rules for custom U-Boot build
+#
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2018-2021
+#
+# SPDX-License-Identifier: MIT
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y
+endif
+
+override_dh_auto_build:
+	$(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG}
+	$(MAKE) $(PARALLEL_MAKE) flash.bin OPENSBI=/usr/lib/opensbi/starfive-visionfive2/fw_dynamic.bin
+	spl_tool -c -f spl/u-boot-spl.bin
+	$(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \
+		$(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \
+	else \
+		./scripts/get_default_envs.sh >u-boot-initial-env; \
+	fi
+	$(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools
+
+override_dh_auto_install:
+	mv tools/env/lib.a tools/env/libubootenv.a
+
+override_dh_auto_test:
+
+override_dh_strip:
+	dh_strip -X libubootenv.a
+
+%:
+	dh $@ --parallel
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
deleted file mode 100644
index 1be1080e..00000000
--- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2023
-#
-# SPDX-License-Identifier: MIT
-
-require recipes-bsp/u-boot/u-boot-custom.inc
-
-SRC_URI += "git://github.com/starfive-tech/u-boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}"
-SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
-
-DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${DISTRO_ARCH}"
-# when cross compiling, we need the library on the host as well, as the signature computation is done locally
-DEBIAN_BUILD_DEPENDS .= "${@ ', libssl-dev:${HOST_ARCH}' if d.getVar('ISAR_CROSS_COMPILE') == '1' else '' }"
-
-U_BOOT_CONFIG = "starfive_visionfive2_defconfig"
-U_BOOT_BIN = "u-boot.bin"
-U_BOOT_SPL_BIN = "spl/u-boot-spl.bin"
-
-S = "${WORKDIR}/u-boot-${PV}"
-
-# install dtb files for opensbi
-do_prepare_build[cleandirs] += "${S}/debian"
-do_prepare_build:append() {
-    # also build and install spl component
-    sed -i 's|${U_BOOT_BIN}|${U_BOOT_BIN} ${U_BOOT_SPL_BIN}|g' ${S}/debian/rules
-    echo "${U_BOOT_SPL_BIN} usr/lib/u-boot/${MACHINE}/" \
-        >> ${S}/debian/u-boot-${MACHINE}.install
-    # install device tree
-    echo "arch/riscv/dts/*.dtb usr/share/u-boot/${MACHINE}/" \
-        >> ${S}/debian/u-boot-${MACHINE}-dev.install
-}
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb
new file mode 100644
index 00000000..b0a2d126
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb
@@ -0,0 +1,26 @@
+#
+# Copyright (c) Siemens AG, 2023
+#
+# SPDX-License-Identifier: MIT
+
+require recipes-bsp/u-boot/u-boot-custom.inc
+
+SRC_URI += "https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+    file://starfive-visionfive2-rules.tmpl"
+SRC_URI[sha256sum] = "184d734699803ce741417e90f6fb9fe218f1ce4fce479dc266a34d869e6df8cb"
+
+DEPENDS += "opensbi-${MACHINE} jh7110-u-boot-spl-tool-native"
+DEBIAN_BUILD_DEPENDS .= ", opensbi-${MACHINE}, jh7110-u-boot-spl-tool:native, \
+    swig, python3-dev:native, python3-setuptools, \
+    libssl-dev:${DISTRO_ARCH}, libssl-dev:native"
+
+U_BOOT_CONFIG = "starfive_visionfive2_defconfig"
+U_BOOT_BIN = "u-boot.itb spl/u-boot-spl.bin.normal.out"
+
+TEMPLATE_FILES += "starfive-visionfive2-rules.tmpl"
+
+S = "${WORKDIR}/u-boot-${PV}"
+
+do_prepare_build:append() {
+	cp ${WORKDIR}/starfive-visionfive2-rules ${S}/debian/rules
+}
diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
index 99156f81..ed8a3b71 100644
--- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
+++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in
@@ -12,9 +12,9 @@
 # This is required to boot efi with the correct device tree, which is included in the fit image.
 
 # SPL
-part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" --ondisk mmcblk1 --fixed-size  2M --offset 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985
+part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin.normal.out" --fixed-size 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985
 # U-Boot FIT
-part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" --ondisk mmcblk1 --fixed-size  4M --offset 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47
+part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot.itb" --fixed-size 4M --part-type BC13C2FF-59E6-4262-A352-B275FD6F7172
 # EFI
 part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024
 # rootfs
-- 
2.35.3

[PATCH 6/6] meta-isar: starfive-visionfive2: Drop obsolete recipes

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

We are now using U-Boot for what these recipes where once introduced.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../jh7110-u-boot-spl-image/files/install     |  1 -
 .../jh7110-u-boot-spl-image/files/rules       | 10 -----
 .../jh7110-u-boot-spl-image_0.1.bb            | 30 --------------
 .../files/rules.tmpl                          | 12 ------
 .../files/visionfive2-u-boot-firmware.install |  1 -
 .../visionfive2-uboot-fit-image.its.tmpl      | 41 -------------------
 .../visionfive2-u-boot-firmware.bb            | 36 ----------------
 7 files changed, 131 deletions(-)
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
 delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl
 delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb

diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
deleted file mode 100644
index c300f842..00000000
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
+++ /dev/null
@@ -1 +0,0 @@
-u-boot-spl.bin.normal.out usr/share/jh7110-uboot-spl-image
diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
deleted file mode 100644
index a8b2c6b8..00000000
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/make -f
-
-U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin
-
-override_dh_auto_build:
-	cp $(U_BOOT_SPL_BIN) u-boot-spl.bin
-	spl_tool -c -f u-boot-spl.bin
-
-%:
-	dh \$@
diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
deleted file mode 100644
index f237a9c3..00000000
--- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2023
-#
-# SPDX-License-Identifier: MIT
-
-inherit dpkg
-
-SRC_URI = "file://rules file://install"
-
-DESCRIPTION = "StarFive VisionFive 2 u-boot SPL"
-DEPENDS = "jh7110-u-boot-spl-tool-native u-boot-starfive-visionfive2"
-DEBIAN_BUILD_DEPENDS = "jh7110-u-boot-spl-tool, u-boot-starfive-visionfive2:${DISTRO_ARCH}"
-
-# this is a host tool
-PACKAGE_ARCH = "${HOST_ARCH}"
-
-do_prepare_build[cleandirs] += "${S}/debian"
-do_prepare_build(){
-    deb_debianize
-    cp ${WORKDIR}/install ${S}/debian/
-}
-
-do_deploy() {
-    dpkg --fsys-tarfile ${WORKDIR}/jh7110-u-boot-spl-image_${PV}*.deb | \
-        tar xOf - "./usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" \
-        > "${DEPLOY_DIR_IMAGE}/u-boot-spl.bin.normal.out"
-}
-
-addtask deploy after do_dpkg_build before do_build
-do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}"
diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
deleted file mode 100644
index 4826f7d6..00000000
--- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/make -f
-
-KERNEL_VERSION=$(shell find /usr/lib/ -maxdepth 1 -type d -name 'linux-image-*' | head -1 | sed 's/.*linux-image-//g')
-
-override_dh_auto_configure:
-	sed -i 's|<KERNEL_VERSION>|$(KERNEL_VERSION)|g' visionfive2-uboot-fit-image.its
-
-override_dh_auto_build:
-	mkimage -A riscv -O u-boot -f ${IMAGE_ITS_FILE} visionfive2_fw_payload.img
-
-%:
-	dh $@
diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install
deleted file mode 100644
index d1bdf6d6..00000000
--- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install
+++ /dev/null
@@ -1 +0,0 @@
-visionfive2_fw_payload.img usr/share/visionfive2-u-boot-firmware
diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl
deleted file mode 100644
index 4cbe9318..00000000
--- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-/dts-v1/;
-
-/ {
-	description = "U-boot-spl FIT image for JH7110 VisionFive2";
-	#address-cells = <2>;
-
-	images {
-		firmware {
-			description = "u-boot";
-			data = /incbin/("/usr/lib/opensbi/starfive-visionfive2/fw_payload.bin");
-			type = "firmware";
-			arch = "riscv";
-			os = "u-boot";
-			load = <0x0 0x40000000>;
-			entry = <0x0 0x40000000>;
-			compression = "none";
-		};
-		fdt {
-			description = "DTB";
-			data = /incbin/("/usr/lib/linux-image-<KERNEL_VERSION>/${DTB_FILES}");
-			type = "flat_dt";
-			arch = "riscv";
-			compression = "none";
-			load = <0x46000000>;
-			entry = <0x46000000>;
-			hash {
-				algo = "sha1";
-			};
-		};
-	};
-
-	configurations {
-		default = "config-1";
-
-		config-1 {
-			description = "U-boot-spl FIT config for JH7110 VisionFive2";
-			firmware = "firmware";
-			fdt = "fdt";
-		};
-	};
-};
diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb
deleted file mode 100644
index b2303968..00000000
--- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (c) Siemens AG, 2023
-#
-# SPDX-License-Identifier: MIT
-
-inherit dpkg
-
-DESCRIPTION = "StarFive VisionFive 2 u-boot firmware"
-
-IMAGE_ITS_FILE = "visionfive2-uboot-fit-image.its"
-SRC_URI = " \
-    file://${IMAGE_ITS_FILE}.tmpl \
-    file://rules.tmpl \
-    file://visionfive2-u-boot-firmware.install"
-
-DEPENDS += "opensbi-starfive-visionfive2 linux-image-${KERNEL_NAME}"
-DEBIAN_BUILD_DEPENDS += "opensbi-starfive-visionfive2, u-boot-tools, device-tree-compiler, linux-image-${KERNEL_NAME}"
-
-TEMPLATE_FILES = "${IMAGE_ITS_FILE}.tmpl rules.tmpl"
-TEMPLATE_VARS = "IMAGE_ITS_FILE DTB_FILES"
-
-do_prepare_build[cleandirs] += "${S}/debian"
-do_prepare_build(){
-    cp ${WORKDIR}/${IMAGE_ITS_FILE} ${S}/
-    cp ${WORKDIR}/visionfive2-u-boot-firmware.install ${S}/debian/
-    deb_debianize
-}
-
-do_deploy() {
-    dpkg --fsys-tarfile ${WORKDIR}/visionfive2-u-boot-firmware_${PV}*.deb | \
-        tar xOf - "./usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" \
-        > "${DEPLOY_DIR_IMAGE}/visionfive2_fw_payload.img"
-}
-
-addtask deploy after do_dpkg_build before do_build
-do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}"
-- 
2.35.3

Re: [PATCH 0/6] Starfive VisionFive 2 updates

[Jan Kiszka]

On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
> This first fixes a build issue of the current U-Boot recipe and then
> switches the firmware to upstream U-Boot, simplifying things
> significantly.

There is one catch I missed so far: Upstream is not yet reading out the
EEPROM, and that means the MAC addresses are not properly set in the DT.
U-Boot patches are under review [1], currently testing the relevant ones
locally. But that may mean we need to keep the legacy version for now
and take patch 1 only.

Jan

[1] https://patchwork.ozlabs.org/project/uboot/list/?series=356602

> 
> The kernel cannot be switched yet, unfortunately. Already the MMC driver
> is still missing.
> 
> Jan
> 
> Jan Kiszka (6):
>   meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP
>     version VF2_v3.0.4
>   meta-isar: starfive-visionfive2: Drop IMAGE_INSTALL from machine
>     config
>   meta-isar: starfive-visionfive2: Use kernel DTB
>   meta-isar: jh7110-u-boot-spl-tool: Rework
>   meta-isar: starfive-visionfive2: Switch to upstream U-Boot
>   meta-isar: starfive-visionfive2: Drop obsolete recipes
> 
>  .../conf/machine/starfive-visionfive2.conf    | 18 ++------
>  .../jh7110-u-boot-spl-image/files/install     |  1 -
>  .../jh7110-u-boot-spl-image/files/rules       | 10 -----
>  .../jh7110-u-boot-spl-image_0.1.bb            | 30 --------------
>  .../jh7110-u-boot-spl-tool_0.1.bb             |  5 +--
>  .../opensbi/files/starfive-visionfive2-rules  | 12 ++++++
>  .../files/starfive-visionfive2-rules.tmpl     | 17 --------
>  ...ensbi-starfive-visionfive2_1.2+20230310.bb | 11 +----
>  .../files/starfive-visionfive2-rules.tmpl     | 35 ++++++++++++++++
>  ...five-visionfive2_2022.01-rc4+VF2-2.11.5.bb | 31 --------------
>  ...u-boot-starfive-visionfive2_2023.07-rc2.bb | 26 ++++++++++++
>  .../files/rules.tmpl                          | 12 ------
>  .../files/visionfive2-u-boot-firmware.install |  1 -
>  .../visionfive2-uboot-fit-image.its.tmpl      | 41 -------------------
>  .../visionfive2-u-boot-firmware.bb            | 36 ----------------
>  .../canned-wks/starfive-visionfive2.wks.in    |  6 +--
>  16 files changed, 83 insertions(+), 209 deletions(-)
>  delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
>  delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
>  delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb
>  create mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
>  delete mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
>  create mode 100755 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
>  delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
>  create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.bb
>  delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
>  delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install
>  delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl
>  delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb
> 

-- 
Siemens AG, Technology
Competence Center Embedded Linux

RE: [PATCH 0/6] Starfive VisionFive 2 updates

[MOESSBAUER, Felix]

Hi Jan,

Thanks for the fix. Just tested it on the VF2 board and can confirm that it works correctly.

Tested-by Felix Moessbauer <felix.moessbauer@siemens.com>

Felix

-----Original Message-----
From: Kiszka, Jan (T CED) <jan.kiszka@siemens.com> 
Sent: Monday, June 5, 2023 2:57 AM
To: isar-users <isar-users@googlegroups.com>
Cc: MOESSBAUER, Felix (T CED INW-CN) <felix.moessbauer@siemens.com>
Subject: Re: [PATCH 0/6] Starfive VisionFive 2 updates

On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
> This first fixes a build issue of the current U-Boot recipe and then 
> switches the firmware to upstream U-Boot, simplifying things 
> significantly.

There is one catch I missed so far: Upstream is not yet reading out the EEPROM, and that means the MAC addresses are not properly set in the DT.
U-Boot patches are under review [1], currently testing the relevant ones locally. But that may mean we need to keep the legacy version for now and take patch 1 only.

Jan

[1] https://patchwork.ozlabs.org/project/uboot/list/?series=356602

> 
> The kernel cannot be switched yet, unfortunately. Already the MMC 
> driver is still missing.
> 
> Jan
> 
> Jan Kiszka (6):
>   meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP
>     version VF2_v3.0.4
>   meta-isar: starfive-visionfive2: Drop IMAGE_INSTALL from machine
>     config
>   meta-isar: starfive-visionfive2: Use kernel DTB
>   meta-isar: jh7110-u-boot-spl-tool: Rework
>   meta-isar: starfive-visionfive2: Switch to upstream U-Boot
>   meta-isar: starfive-visionfive2: Drop obsolete recipes
> 
>  .../conf/machine/starfive-visionfive2.conf    | 18 ++------
>  .../jh7110-u-boot-spl-image/files/install     |  1 -
>  .../jh7110-u-boot-spl-image/files/rules       | 10 -----
>  .../jh7110-u-boot-spl-image_0.1.bb            | 30 --------------
>  .../jh7110-u-boot-spl-tool_0.1.bb             |  5 +--
>  .../opensbi/files/starfive-visionfive2-rules  | 12 ++++++
>  .../files/starfive-visionfive2-rules.tmpl     | 17 --------
>  ...ensbi-starfive-visionfive2_1.2+20230310.bb | 11 +----
>  .../files/starfive-visionfive2-rules.tmpl     | 35 ++++++++++++++++
>  ...five-visionfive2_2022.01-rc4+VF2-2.11.5.bb | 31 --------------  
> ...u-boot-starfive-visionfive2_2023.07-rc2.bb | 26 ++++++++++++
>  .../files/rules.tmpl                          | 12 ------
>  .../files/visionfive2-u-boot-firmware.install |  1 -
>  .../visionfive2-uboot-fit-image.its.tmpl      | 41 -------------------
>  .../visionfive2-u-boot-firmware.bb            | 36 ----------------
>  .../canned-wks/starfive-visionfive2.wks.in    |  6 +--
>  16 files changed, 83 insertions(+), 209 deletions(-)  delete mode 
> 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install
>  delete mode 100644 
> meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules
>  delete mode 100644 
> meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_
> 0.1.bb  create mode 100644 
> meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules
>  delete mode 100644 
> meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl
>  create mode 100755 
> meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl
>  delete mode 100644 
> meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+V
> F2-2.11.5.bb  create mode 100644 
> meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.07-rc2.b
> b  delete mode 100644 
> meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl
>  delete mode 100644 
> meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-
> boot-firmware.install  delete mode 100644 
> meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-ub
> oot-fit-image.its.tmpl  delete mode 100644 
> meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-f
> irmware.bb
> 

--
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Jan Kiszka]

On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> JH7110_VisionFive2_devel is apparently rebasing, and now it left
> our previously chosen commit orphaned behind. Update to latest BSP
> U-Boot release and avoid that we may be surprised again.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  ....5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta-isar/recipes-bsp/u-boot/{u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} (85%)
> 
> diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
> similarity index 85%
> rename from meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
> rename to meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
> index 0eeedc1a..1be1080e 100644
> --- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
> +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
> @@ -5,8 +5,8 @@
>  
>  require recipes-bsp/u-boot/u-boot-custom.inc
>  
> -SRC_URI += "git://github.com/starfive-tech/u-boot.git;branch=JH7110_VisionFive2_devel;protocol=https;destsuffix=u-boot-${PV}"
> -SRCREV = "ac0ac696256abf412826d74ee918dd417e207d7b"
> +SRC_URI += "git://github.com/starfive-tech/u-boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}"
> +SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
>  
>  DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${DISTRO_ARCH}"
>  # when cross compiling, we need the library on the host as well, as the signature computation is done locally

Just to clarify again: This patch here is needed to fix the build. The
rest is under discussion, patch 5 actually has a build issue, and should
not yet be merged.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Anton Mikanovich]

12/06/2023 10:50, Jan Kiszka wrote:
> On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
> Just to clarify again: This patch here is needed to fix the build. The
> rest is under discussion, patch 5 actually has a build issue, and should
> not yet be merged.
>
> Jan
>
Hello Jan,

We are going to merge p1 to next separately but riscv targets are currently
unbuildable due to other upstream sid-ports issue. Will proceed right 
after went
back to stable so we can test the build on CI.

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Jan Kiszka]

On 04.07.23 12:02, Anton Mikanovich wrote:
> 12/06/2023 10:50, Jan Kiszka wrote:
>> On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
>> Just to clarify again: This patch here is needed to fix the build. The
>> rest is under discussion, patch 5 actually has a build issue, and should
>> not yet be merged.
>>
>> Jan
>>
> Hello Jan,
> 
> We are going to merge p1 to next separately but riscv targets are currently
> unbuildable due to other upstream sid-ports issue. Will proceed right
> after went
> back to stable so we can test the build on CI.
> 

Yeah, that's why we use snapshot.d.o downstream for RISC-V - with its
own problems.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Anton Mikanovich]

04/07/2023 13:36, Jan Kiszka wrote:
> Yeah, that's why we use snapshot.d.o downstream for RISC-V - with its
> own problems.
>
> Jan

Hello, Jan.

Building out-of-tree modules is still broken with 
linux-starfive_5.15-visionfive2 kernel:

| /usr/bin/make -C /lib/modules/5.15.0-isar+/build M=/<<PKGBUILDDIR>> -j 
24 modules
| make[2]: Entering directory '/usr/src/linux-headers-5.15.0-isar+'
| make[3]: *** No rule to make target 'arch/riscv/kernel/vdso/vdso.lds', 
needed by 'arch/riscv/kernel/vdso/vdso.so.dbg'.  Stop.

So we can't even check this target on CI.

Did you try to build out-of-tree modules?

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Jan Kiszka]

On 12.07.23 09:41, Anton Mikanovich wrote:
> 04/07/2023 13:36, Jan Kiszka wrote:
>> Yeah, that's why we use snapshot.d.o downstream for RISC-V - with its
>> own problems.
>>
>> Jan
> 
> Hello, Jan.
> 
> Building out-of-tree modules is still broken with
> linux-starfive_5.15-visionfive2 kernel:
> 
> | /usr/bin/make -C /lib/modules/5.15.0-isar+/build M=/<<PKGBUILDDIR>> -j
> 24 modules
> | make[2]: Entering directory '/usr/src/linux-headers-5.15.0-isar+'
> | make[3]: *** No rule to make target 'arch/riscv/kernel/vdso/vdso.lds',
> needed by 'arch/riscv/kernel/vdso/vdso.so.dbg'.  Stop.
> 
> So we can't even check this target on CI.
> 
> Did you try to build out-of-tree modules?
> 

Yeah, likely the usual problems of downstream stuff.

I think I had the example modules dropped from the build.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Jan Kiszka]

On 12.06.23 09:50, 'Jan Kiszka' via isar-users wrote:
> On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> JH7110_VisionFive2_devel is apparently rebasing, and now it left
>> our previously chosen commit orphaned behind. Update to latest BSP
>> U-Boot release and avoid that we may be surprised again.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  ....5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>  rename meta-isar/recipes-bsp/u-boot/{u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} (85%)
>>
>> diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
>> similarity index 85%
>> rename from meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
>> rename to meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
>> index 0eeedc1a..1be1080e 100644
>> --- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2022.01-rc4+VF2-2.11.5.bb
>> +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
>> @@ -5,8 +5,8 @@
>>  
>>  require recipes-bsp/u-boot/u-boot-custom.inc
>>  
>> -SRC_URI += "git://github.com/starfive-tech/u-boot.git;branch=JH7110_VisionFive2_devel;protocol=https;destsuffix=u-boot-${PV}"
>> -SRCREV = "ac0ac696256abf412826d74ee918dd417e207d7b"
>> +SRC_URI += "git://github.com/starfive-tech/u-boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}"
>> +SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
>>  
>>  DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${DISTRO_ARCH}"
>>  # when cross compiling, we need the library on the host as well, as the signature computation is done locally
> 
> Just to clarify again: This patch here is needed to fix the build. The
> rest is under discussion, patch 5 actually has a build issue, and should
> not yet be merged.


We still need this, even though only non-cross building currently works.
Would someone be so kind an finally merge this single patch?

Jan

-- 
Siemens AG, Technology
Linux Expert Center

Re: [PATCH 1/6] meta-isar: u-boot-starfive-visionfive2: Fix fetching, update to BSP version VF2_v3.0.4

[Uladzimir Bely]

On Mon, 2023-09-18 at 10:13 +0200, Jan Kiszka wrote:
> On 12.06.23 09:50, 'Jan Kiszka' via isar-users wrote:
> > On 04.06.23 18:21, 'Jan Kiszka' via isar-users wrote:
> > > From: Jan Kiszka <jan.kiszka@siemens.com>
> > > 
> > > JH7110_VisionFive2_devel is apparently rebasing, and now it left
> > > our previously chosen commit orphaned behind. Update to latest
> > > BSP
> > > U-Boot release and avoid that we may be surprised again.
> > > 
> > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > > ---
> > >  ....5.bb => u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb} |
> > > 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >  rename meta-isar/recipes-bsp/u-boot/{u-boot-starfive-
> > > visionfive2_2022.01-rc4+VF2-2.11.5.bb => u-boot-starfive-
> > > visionfive2_2021.10+VF2-3.0.4.bb} (85%)
> > > 
> > > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-
> > > visionfive2_2022.01-rc4+VF2-2.11.5.bb b/meta-isar/recipes-bsp/u-
> > > boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb
> > > similarity index 85%
> > > rename from meta-isar/recipes-bsp/u-boot/u-boot-starfive-
> > > visionfive2_2022.01-rc4+VF2-2.11.5.bb
> > > rename to meta-isar/recipes-bsp/u-boot/u-boot-starfive-
> > > visionfive2_2021.10+VF2-3.0.4.bb
> > > index 0eeedc1a..1be1080e 100644
> > > --- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-
> > > visionfive2_2022.01-rc4+VF2-2.11.5.bb
> > > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-
> > > visionfive2_2021.10+VF2-3.0.4.bb
> > > @@ -5,8 +5,8 @@
> > >  
> > >  require recipes-bsp/u-boot/u-boot-custom.inc
> > >  
> > > -SRC_URI += "git://github.com/starfive-tech/u-
> > > boot.git;branch=JH7110_VisionFive2_devel;protocol=https;destsuffi
> > > x=u-boot-${PV}"
> > > -SRCREV = "ac0ac696256abf412826d74ee918dd417e207d7b"
> > > +SRC_URI += "git://github.com/starfive-tech/u-
> > > boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}"
> > > +SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243"
> > >  
> > >  DEBIAN_BUILD_DEPENDS .= ", libssl-dev:${DISTRO_ARCH}"
> > >  # when cross compiling, we need the library on the host as well,
> > > as the signature computation is done locally
> > 
> > Just to clarify again: This patch here is needed to fix the build.
> > The
> > rest is under discussion, patch 5 actually has a build issue, and
> > should
> > not yet be merged.
> 
> 
> We still need this, even though only non-cross building currently
> works.
> Would someone be so kind an finally merge this single patch?
> 
> Jan
> 

Applied signle patch (p1) to next.

For now, p1 and p2 are merged, p3-p6 are not yet.