[PATCH v2 0/2] Fix sid-ports riscv64 build

[PATCH v2 0/2] Fix sid-ports riscv64 build

[Uladzimir Bely]

Sid-ports got newer version of binutils and this led to the broken
native riscv64 build for linux-mainline and opensbi-sifive-fu540.

Here we update to newer versions of these packages that include
the corresponding fixes.

Changes since v1:
 - update linux-mainline and opensbi-sifive-fu540 instead of backported
patches support in Isar.

Uladzimir Bely (2):
  linux-mainline: update to version 5.4.203
  opensbi-sifive-fu540: update to version 1.1

 meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules        | 2 +-
 ...pensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} | 4 ++--
 .../{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb}   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-isar/recipes-bsp/opensbi/{opensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} (68%)
 rename meta-isar/recipes-kernel/linux/{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb} (93%)

-- 
2.20.1

[PATCH v2 1/2] linux-mainline: update to version 5.4.203

[Uladzimir Bely]

This version is current stable one for 5.4 branch and includes a
build fix for riscv64 arch with binutils >=2.38:

https://github.com/torvalds/linux/commit/6df2a016c0c8

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 .../{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-isar/recipes-kernel/linux/{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb} (93%)

diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
similarity index 93%
rename from meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
rename to meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
index 644535e8..3313cf7b 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.70.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb
@@ -15,7 +15,7 @@ SRC_URI += " \
     file://no-ubifs-fs.cfg \
     file://no-root-nfs.cfg;apply=no"
 
-SRC_URI[sha256sum] = "c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22c45007"
+SRC_URI[sha256sum] = "fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a"
 
 S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"
 
-- 
2.20.1

[PATCH v2 2/2] opensbi-sifive-fu540: update to version 1.1

[Uladzimir Bely]

This version includes a build fix for riscv64 against binutils >=2.38:

https://github.com/riscv-software-src/opensbi/commit/5d53b55

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules        | 2 +-
 ...pensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-isar/recipes-bsp/opensbi/{opensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} (68%)

diff --git a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
index 04e5b5ae..98bc1b49 100644
--- a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
+++ b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
@@ -5,7 +5,7 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
 endif
 
 override_dh_auto_build:
-	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=sifive/fu540 \
+	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \
 		FW_PAYLOAD_PATH=/usr/lib/u-boot/sifive_unleashed/u-boot.bin
 
 %:
diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
similarity index 68%
rename from meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
rename to meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
index c25215be..92f75f2d 100644
--- a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
+++ b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
@@ -8,7 +8,7 @@ inherit dpkg
 SRC_URI = " \
     https://github.com/riscv/opensbi/archive/v${PV}.tar.gz;downloadfilename=opensbi-${PV}.tar.gz \
     file://sifive-fu540-rules"
-SRC_URI[sha256sum] = "60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0"
+SRC_URI[sha256sum] = "d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec"
 
 S = "${WORKDIR}/opensbi-${PV}"
 
@@ -19,5 +19,5 @@ do_prepare_build() {
     cp ${WORKDIR}/sifive-fu540-rules ${WORKDIR}/rules
     deb_debianize
 
-    echo "build/platform/sifive/fu540/firmware/fw_payload.bin /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install
+    echo "build/platform/generic/firmware/fw_payload.bin /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install
 }
-- 
2.20.1

Re: [PATCH v2 2/2] opensbi-sifive-fu540: update to version 1.1

[Jan Kiszka]

On 02.09.22 09:58, Uladzimir Bely wrote:
> This version includes a build fix for riscv64 against binutils >=2.38:
> 
> https://github.com/riscv-software-src/opensbi/commit/5d53b55
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules        | 2 +-
>  ...pensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename meta-isar/recipes-bsp/opensbi/{opensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} (68%)
> 
> diff --git a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> index 04e5b5ae..98bc1b49 100644
> --- a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> +++ b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> @@ -5,7 +5,7 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
>  endif
>  
>  override_dh_auto_build:
> -	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=sifive/fu540 \
> +	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \
>  		FW_PAYLOAD_PATH=/usr/lib/u-boot/sifive_unleashed/u-boot.bin
>  
>  %:
> diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
> similarity index 68%
> rename from meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
> rename to meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
> index c25215be..92f75f2d 100644
> --- a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
> +++ b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
> @@ -8,7 +8,7 @@ inherit dpkg
>  SRC_URI = " \
>      https://github.com/riscv/opensbi/archive/v${PV}.tar.gz;downloadfilename=opensbi-${PV}.tar.gz \
>      file://sifive-fu540-rules"
> -SRC_URI[sha256sum] = "60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0"
> +SRC_URI[sha256sum] = "d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec"
>  
>  S = "${WORKDIR}/opensbi-${PV}"
>  
> @@ -19,5 +19,5 @@ do_prepare_build() {
>      cp ${WORKDIR}/sifive-fu540-rules ${WORKDIR}/rules
>      deb_debianize
>  
> -    echo "build/platform/sifive/fu540/firmware/fw_payload.bin /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install
> +    echo "build/platform/generic/firmware/fw_payload.bin /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install
                            ^^^^^^^
This looks suspicious. Are we still building the right configuration?

We have some fu540 somewhere. Could try to find it and test the image,
but that may take some time.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH v2 2/2] opensbi-sifive-fu540: update to version 1.1

[Uladzimir Bely]

[-- Attachment #1: Type: text/plain, Size: 3339 bytes --]

In the email from Friday, 2 September 2022 16:26:15 +03 user Jan Kiszka wrote:
> On 02.09.22 09:58, Uladzimir Bely wrote:
> > This version includes a build fix for riscv64 against binutils >=2.38:
> > 
> > https://github.com/riscv-software-src/opensbi/commit/5d53b55
> > 
> > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > ---
> > 
> >  meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules        | 2 +-
> >  ...pensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} | 4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >  rename meta-isar/recipes-bsp/opensbi/{opensbi-sifive-fu540_0.9.bb =>
> >  opensbi-sifive-fu540_1.1.bb} (68%)> 
> > diff --git a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> > b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules index
> > 04e5b5ae..98bc1b49 100644
> > --- a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> > +++ b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules
> > @@ -5,7 +5,7 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
> > 
> >  endif
> > 
> >  override_dh_auto_build:
> > -	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=sifive/fu540 \
> > +	CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \
> > 
> >  		FW_PAYLOAD_PATH=/usr/lib/u-boot/sifive_unleashed/u-boot.bin
> >  
> >  %:
> > diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
> > b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb similarity
> > index 68%
> > rename from meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
> > rename to meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
> > index c25215be..92f75f2d 100644
> > --- a/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_0.9.bb
> > +++ b/meta-isar/recipes-bsp/opensbi/opensbi-sifive-fu540_1.1.bb
> > @@ -8,7 +8,7 @@ inherit dpkg
> > 
> >  SRC_URI = " \
> >  
> >      https://github.com/riscv/opensbi/archive/v${PV}.tar.gz;downloadfilena
> >      me=opensbi-${PV}.tar.gz \ file://sifive-fu540-rules"
> > 
> > -SRC_URI[sha256sum] =
> > "60f995cb3cd03e3cf5e649194d3395d0fe67499fd960a36cf7058a4efde686f0"
> > +SRC_URI[sha256sum] =
> > "d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec"> 
> >  S = "${WORKDIR}/opensbi-${PV}"
> > 
> > @@ -19,5 +19,5 @@ do_prepare_build() {
> > 
> >      cp ${WORKDIR}/sifive-fu540-rules ${WORKDIR}/rules
> >      deb_debianize
> > 
> > -    echo "build/platform/sifive/fu540/firmware/fw_payload.bin
> > /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install +    echo
> > "build/platform/generic/firmware/fw_payload.bin
> > /usr/lib/opensbi/sifive-fu540/" > ${S}/debian/install
>                             ^^^^^^^
> This looks suspicious. Are we still building the right configuration?
> 
> We have some fu540 somewhere. Could try to find it and test the image,
> but that may take some time.
> 
> Jan

Yes, it would be great. 

There was a change in opensbi that moved fu540 platform into some generic one ( https://
github.com/riscv-software-src/opensbi/commit/9a7a677[1] ), so I considered it in the patch, but 
don't have an opportunity to check it on real hardware.

Also, if you are on topic, you might advice some RISCV RISC-V that is worth buying and be 
supported in Isar. SiFive FU540 looks a bit outdated.

-- 
Uladzimir Bely


--------
[1] https://github.com/riscv-software-src/opensbi/commit/9a7a677

[-- Attachment #2: Type: text/html, Size: 9703 bytes --]

Re: [PATCH v2 2/2] opensbi-sifive-fu540: update to version 1.1

[Anton Mikanovich]

02.09.2022 16:26, Jan Kiszka wrote:
> We have some fu540 somewhere. Could try to find it and test the image,
> but that may take some time.

Hello Jan,

Did you manage to check updated versions on the board?

If it requires more time I propose to merge the patchset and revert if
something will be not ok after testing on hardware.

Re: [PATCH v2 2/2] opensbi-sifive-fu540: update to version 1.1

[Jan Kiszka]

On 09.09.22 09:24, Anton Mikanovich wrote:
> 02.09.2022 16:26, Jan Kiszka wrote:
>> We have some fu540 somewhere. Could try to find it and test the image,
>> but that may take some time.
> 
> Hello Jan,
> 
> Did you manage to check updated versions on the board?
> 
> If it requires more time I propose to merge the patchset and revert if
> something will be not ok after testing on hardware.
> 

Testing will have to wait after the upcoming OSS/ELC-E. Go ahead and
make things build again, we can then do as you suggested.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [PATCH v2 0/2] Fix sid-ports riscv64 build

[Anton Mikanovich]

02.09.2022 10:58, Uladzimir Bely wrote:
> Sid-ports got newer version of binutils and this led to the broken
> native riscv64 build for linux-mainline and opensbi-sifive-fu540.
>
> Here we update to newer versions of these packages that include
> the corresponding fixes.
>
> Changes since v1:
>   - update linux-mainline and opensbi-sifive-fu540 instead of backported
> patches support in Isar.
>
> Uladzimir Bely (2):
>    linux-mainline: update to version 5.4.203
>    opensbi-sifive-fu540: update to version 1.1
>
>   meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules        | 2 +-
>   ...pensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} | 4 ++--
>   .../{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb}   | 2 +-
>   3 files changed, 4 insertions(+), 4 deletions(-)
>   rename meta-isar/recipes-bsp/opensbi/{opensbi-sifive-fu540_0.9.bb => opensbi-sifive-fu540_1.1.bb} (68%)
>   rename meta-isar/recipes-kernel/linux/{linux-mainline_5.4.70.bb => linux-mainline_5.4.203.bb} (93%)
>
Applied to next, thanks.