[PATCH 0/2] Fix riscv64/trixie build

29 views
Skip to first unread message

Uladzimir Bely

unread,
Apr 8, 2025, 7:36:39 AM4/8/25
to isar-...@googlegroups.com
NoCrossTest.test_nocross_sid test is failing in CI for some time
due to recent Debian Trixie updates.

Backport linux and u-boot upstream patches that solve build issues.

Uladzimir Bely (2):
u-boot-starfive-visionfive2: Fix build with swig 4.3.0
linux-starfive: Fix build with GNU make 4.4

...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++
.../u-boot-starfive-visionfive2_2024.01.bb | 1 +
...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++
.../linux-starfive_6.6.20-visionfive2.bb | 1 +
4 files changed, 91 insertions(+)
create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
create mode 100644 meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch

--
2.49.0

Uladzimir Bely

unread,
Apr 8, 2025, 7:36:41 AM4/8/25
to isar-...@googlegroups.com
After updating "make" in trixie, kernel build fails with errors like:

```
make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop.
make[9]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/img/img-rogue] Error 2
make[9]: *** Waiting for unfinished jobs....
```

Branch "JH7110_VisionFive2_devel" we are using doesn't include
the fix, so we are not updating SRC_REV here, just taking
the patch from branch "JH7110_VIsionFive2_6.12.y_devel.
---
...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++++++++++++
.../linux-starfive_6.6.20-visionfive2.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch

diff --git a/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
new file mode 100644
index 00000000..b7e7a0e6
--- /dev/null
+++ b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
@@ -0,0 +1,29 @@
+From 6b09bb490fb1a575a023c168a6db2d2470129885 Mon Sep 17 00:00:00 2001
+From: Icenowy Zheng <u...@icenowy.me>
+Date: Sat, 22 Jun 2024 22:03:02 +0800
+Subject: [PATCH] drm: img-rogue: fix build issue on GNU Make 4.4+
+
+Signed-off-by: Icenowy Zheng <u...@icenowy.me>
+---
+ drivers/gpu/drm/img/img-rogue/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/img/img-rogue/Makefile b/drivers/gpu/drm/img/img-rogue/Makefile
+index ee37ef8cadbf..fe3bad2b77ea 100644
+--- a/drivers/gpu/drm/img/img-rogue/Makefile
++++ b/drivers/gpu/drm/img/img-rogue/Makefile
+@@ -73,7 +73,11 @@ WINDOW_SYSTEM=nulldrmws
+ #include $(OUT)/config_kernel.mk
+ include $(srctree)/$(src)/config_kernel.mk
+
++ifneq ($(and $(filter notintermediate, $(.FEATURES)),$(filter-out 4.4,$(MAKE_VERSION))),)
++.NOTINTERMEDIATE:
++else
+ .SECONDARY:
++endif
+
+ define symlink-source-file
+ @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
+--
+2.49.0
+
diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
index 80c2d3ff..e4433c5d 100644
--- a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
+++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
@@ -8,6 +8,7 @@ require recipes-kernel/linux/linux-custom.inc
SRC_URI += " \
https://github.com/starfive-tech/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-starfive-${SRCREV}.tar.gz \
file://0001-btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_se.patch \
+ file://0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch \
file://starfive2_extra.cfg"
SRCREV = "d0e7c0486d768a294f4f2b390d00dab8bee5d726"
SRC_URI[sha256sum] = "86f1bb78a84222d4a3d22779e335023a228cd865df866fd08af6a7816eca3add"
--
2.49.0

Uladzimir Bely

unread,
Apr 8, 2025, 7:36:42 AM4/8/25
to isar-...@googlegroups.com
Fixes u-boot build failure on newer trixie that got updated swig-4.3.0
some time ago.

```
scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments
to function ‘SWIG_Python_AppendOutput’
5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
| ^~~~~~~~~~~~~~~~~~~~~~~~
```
---
...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++
.../u-boot-starfive-visionfive2_2024.01.bb | 1 +
2 files changed, 61 insertions(+)
create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch

diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
new file mode 100644
index 00000000..d919eb68
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
@@ -0,0 +1,60 @@
+From a63456b9191fae2fe49f4b121e025792022e3950 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_...@t-online.de>
+Date: Wed, 30 Oct 2024 06:07:16 +0100
+Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Swig has changed language specific AppendOutput functions. The helper
+macro SWIG_AppendOutput remains unchanged. Use that instead
+of SWIG_Python_AppendOutput, which would require an extra parameter
+since swig 4.3.0.
+
+/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
+| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
+| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
+| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
+| | ^~~~~~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Markus Volk <f_...@t-online.de>
+Reported-by: Rudi Heitbaum <ru...@heitbaum.com>
+Link: https://github.com/dgibson/dtc/pull/154
+---
+ scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
+index 56cc5d48f4f..e4659489a96 100644
+--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
+@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
+ fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
+ buff = PyByteArray_FromStringAndSize(
+ (const char *)($1 + 1), fdt32_to_cpu($1->len));
+- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
++ resultobj = SWIG_AppendOutput(resultobj, buff);
+ }
+ }
+
+@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
+
+ %typemap(argout) int *depth {
+ PyObject *val = Py_BuildValue("i", *arg$argnum);
+- resultobj = SWIG_Python_AppendOutput(resultobj, val);
++ resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+
+ %apply int *depth { int *depth };
+@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
+ if (PyTuple_GET_SIZE(resultobj) == 0)
+ resultobj = val;
+ else
+- resultobj = SWIG_Python_AppendOutput(resultobj, val);
++ resultobj = SWIG_AppendOutput(resultobj, val);
+ }
+ }
+
+--
+2.49.0
+
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
index 9f819c3e..becd40da 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
@@ -8,6 +8,7 @@ require recipes-bsp/u-boot/u-boot-custom.inc
COMPATIBLE_MACHINE = "starfive-visionfive2"

SRC_URI += "https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+ file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch \
file://starfive-visionfive2-rules.tmpl"
SRC_URI[sha256sum] = "b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3"

--
2.49.0

Jan Kiszka

unread,
Apr 9, 2025, 10:06:14 AM4/9/25
to Uladzimir Bely, isar-...@googlegroups.com
Better bump U-boot to v2025.01.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center

Jan Kiszka

unread,
Apr 9, 2025, 10:10:07 AM4/9/25
to Uladzimir Bely, isar-...@googlegroups.com
On 08.04.25 13:33, Uladzimir Bely wrote:
> After updating "make" in trixie, kernel build fails with errors like:
>
> ```
> make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop.
> make[9]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/img/img-rogue] Error 2
> make[9]: *** Waiting for unfinished jobs....
> ```
>
> Branch "JH7110_VisionFive2_devel" we are using doesn't include
> the fix, so we are not updating SRC_REV here, just taking
> the patch from branch "JH7110_VIsionFive2_6.12.y_devel.

And why aren't you switching to the newer kernel directly?

Uladzimir Bely

unread,
Apr 10, 2025, 3:25:33 AM4/10/25
to Jan Kiszka, isar-...@googlegroups.com
These patches are aimed to fix CI build issues, while switching to new
kernel require testing with hardware since I don't have firm confidence
that they will work out of the box.

--
Best regards,
Uladzimir.


Jan Kiszka

unread,
Apr 10, 2025, 9:07:38 AM4/10/25
to Uladzimir Bely, isar-...@googlegroups.com
That's not the point. You will test the result anyway, won't you?

We should not pile up patches in isar for upstream if upstream has them
in newer versions. That isar is not a BSP layer. This here is for demo
and testing purposes.

Uladzimir Bely

unread,
Apr 10, 2025, 6:51:40 PM4/10/25
to Jan Kiszka, isar-...@googlegroups.com
Tried with this version: it build works but requires adding
"libgnutls28" to the recipe DEPENDS (errors like "gnutls/gnutls.h"
can't be found).

Will be sent with v2.

--
Best regards,
Uladzimir.

Uladzimir Bely

unread,
Apr 10, 2025, 6:55:48 PM4/10/25
to Jan Kiszka, isar-...@googlegroups.com
On Thu, 2025-04-10 at 15:07 +0200, Jan Kiszka wrote:
> On 10.04.25 09:25, Uladzimir Bely wrote:
> > On Wed, 2025-04-09 at 16:09 +0200, Jan Kiszka wrote:
> > > On 08.04.25 13:33, Uladzimir Bely wrote:
> > > > After updating "make" in trixie, kernel build fails with errors
> > > > like:
> > > >
> > > > ```
> > > > make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually
> > > > exclusive.  Stop.
> > > > make[9]: *** [../scripts/Makefile.build:480:
> > > > drivers/gpu/drm/img/img-rogue] Error 2
> > > > make[9]: *** Waiting for unfinished jobs....
> > > > ```
> > > >
> > > > Branch "JH7110_VisionFive2_devel" we are using doesn't include
> > > > the fix, so we are not updating SRC_REV here, just taking
> > > > the patch from branch "JH7110_VIsionFive2_6.12.y_devel.
> > >
> > > And why aren't you switching to the newer kernel directly?
> > >
> > > Jan

Sorry for missleading, but JH7110_VisionFive2_devel actually doesn't
include the fix. I tried to update to the recent branch and there is
still error.

So, we still need the patch (I appeared to take it from "pinetabv-
6.6.y-devel" branch, not from "our" upstream).

The only benefit from moving to 6.12 could be the fact that it already
includes another patch we are applying.

So, for now I would leave patch 2 as is.

> >
> > These patches are aimed to fix CI build issues, while switching to
> > new
> > kernel require testing with hardware since I don't have firm
> > confidence
> > that they will work out of the box.
> >
>
> That's not the point. You will test the result anyway, won't you?
>
> We should not pile up patches in isar for upstream if upstream has
> them
> in newer versions. That isar is not a BSP layer. This here is for
> demo
> and testing purposes.
>
> Jan

--
Best regards,
Uladzimir.

Jan Kiszka

unread,
Apr 11, 2025, 4:11:10 AM4/11/25
to Uladzimir Bely, isar-...@googlegroups.com
Might be worth to update u-boot-custom.inc with the new default build
deps of U-Boot at some point. I'm considering to look into that - for
too long now.

>
> Will be sent with v2.
>

Thanks,

Jan Kiszka

unread,
Apr 11, 2025, 5:50:09 AM4/11/25
to Uladzimir Bely, isar-...@googlegroups.com
Ok, but then please clarify the commit message.

Uladzimir Bely

unread,
Apr 11, 2025, 6:13:35 AM4/11/25
to Jan Kiszka, isar-...@googlegroups.com
Things are becoming more and more interesting...

U-boot 2024.01 with the patch boots the board well.

Switching to u-boot 2025.04 leads to the following boot log:

```
U-Boot SPL 2025.04 (Jan 01 1970 - 01:00:00 +0000)
DDR version: dc2e84f0.
Trying to boot from MMC2
OpenSBI v1.4
____ _____ ____ _____
/ __ \ / ____| _ \_ _|
| | | |_ __ ___ _ __ | (___ | |_) || |
| | | | '_ \ / _ \ '_ \ \___ \| _ < | |
| |__| | |_) | __/ | | |____) | |_) || |_
\____/| .__/ \___|_| |_|_____/|____/_____|
| |
|_|
Platform Name : StarFive VisionFive 2 v1.3B
Platform Features : medeleg
Platform HART Count : 5
Platform IPI Device : aclint-mswi
Platform Timer Device : aclint-mtimer @ 4000000Hz
Platform Console Device : uart8250
Platform HSM Device : ---
Platform PMU Device : ---
Platform Reboot Device : gpio-restart
Platform Shutdown Device : ---
Platform Suspend Device : ---
Platform CPPC Device : ---
Firmware Base : 0x40000000
Firmware Size : 363 KB
Firmware RW Offset : 0x40000
Firmware RW Size : 107 KB
Firmware Heap Offset : 0x50000
Firmware Heap Size : 43 KB (total), 2 KB (reserved), 9 KB
(used), 31 KB (free)
Firmware Scratch Size : 4096 B (total), 328 B (used), 3768 B (free)
Runtime SBI Version : 2.0
Domain0 Name : root
Domain0 Boot HART : 2
Domain0 HARTs : 0*,1*,2*,3*,4*
Domain0 Region00 : 0x0000000010000000-0x0000000010000fff M:
(I,R,W) S/U: (R,W)
Domain0 Region01 : 0x0000000002000000-0x000000000200ffff M:
(I,R,W) S/U: ()
Domain0 Region02 : 0x0000000040040000-0x000000004005ffff M:
(R,W) S/U: ()
Domain0 Region03 : 0x0000000040000000-0x000000004003ffff M:
(R,X) S/U: ()
Domain0 Region04 : 0x000000000c000000-0x000000000fffffff M:
(I,R,W) S/U: (R,W)
Domain0 Region05 : 0x0000000000000000-0xffffffffffffffff M: ()
S/U: (R,W,X)
Domain0 Next Address : 0x0000000040200000
Domain0 Next Arg1 : 0x0000000040400000
Domain0 Next Mode : S-mode
Domain0 SysReset : yes
Domain0 SysSuspend : yes
Boot HART ID : 2
Boot HART Domain : root
Boot HART Priv Version : v1.11
Boot HART Base ISA : rv64imafdcbx
Boot HART ISA Extensions : zihpm
Boot HART PMP Count : 8
Boot HART PMP Granularity : 12 bits
Boot HART PMP Address Bits: 34
Boot HART MHPM Info : 2 (0x00000018)
Boot HART MIDELEG : 0x0000000000000222
Boot HART MEDELEG : 0x000000000000b109

U-Boot 2025.04 (Jan 01 1970 - 01:00:00 +0000)
CPU: sifive,u74-mc
Model: StarFive VisionFive 2 v1.3B
DRAM: 8 GiB
Core: 154 devices, 26 uclasses, devicetree: board
WDT: Not starting watchdog@13070000
MMC: mmc@16010000: 0, mmc@16020000: 1
Loading Environment from SPIFlash... SF: Detected gd25lq128 with page
size 256 Bytes, erase size 4 KiB, total 16 MiB
*** Warning - bad CRC, using default environment
StarFive EEPROM format v2
--------EEPROM INFO--------
Vendor : StarFive Technology Co., Ltd.
Product full SN: VF7110B1-2253-D008E000-00002012
data version: 0x2
PCB revision: 0xb2
BOM revision: A
Ethernet MAC0 address: 6c:cf:39:00:31:81
Ethernet MAC1 address: 6c:cf:39:00:31:82
--------EEPROM INFO--------
starfive_7110_pcie pcie@940000000: Starfive PCIe bus probed.
starfive_7110_pcie pcie@9c0000000: Starfive PCIe bus probed.
In: serial@10000000
Out: serial@10000000
Err: serial@10000000
Net: eth0: ethernet@16030000, eth1: ethernet@16040000
starting USB...
Bus xhci_pci: Register 5000420 NbrPorts 5
Starting the controller
USB XHCI 1.00
scanning bus xhci_pci for devices... 2 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found
Working FDT set to ff720a20
Hit any key to stop autoboot: 0
Card did not respond to voltage select! : -110
** Booting bootflow '<NULL>' with efi_mgr
Booting: mmc 1
EFI stub: Booting Linux Kernel...
EFI stub: Loaded initrd from LINUX_EFI_INITRD_MEDIA_GUID device path
EFI stub: Using DTB from configuration table
EFI stub: Exiting boot services...
Unhandled exception: Store/AMO access fault
EPC: 00000000fff5ddd6 RA: 00000000fff6ccf2 TVAL: 0000000000000000
EPC: 000000004021fdd6 RA: 000000004022ecf2 reloc adjusted
SP: 00000000ff71f350 GP: 00000000ff72de40 TP: 0000000000000002
T0: 00000000ff71f240 T1: 00000000ff787750 T2: 00000000019d8000
S0: 00000000ff731860 S1: 0000000000004600 A0: 00000000ff731988
A1: 0000000000000000 A2: 0000000000004600 A3: 0000000000004000
A4: 0000000000000000 A5: 0000000000000000 A6: 0000000000000001
A7: 0000000000000000 S2: 00000000ff71f468 S3: 00000000fffddd60
S4: 0000000000004600 S5: fffffffffffffdfb S6: ffffffffffffff7f
S7: ffffffffffffffff S8: 00000000fb71a390 S9: 00000000fe6ca030
S10: 0000000000000ac0 S11: 00000000fe6ca008 T3: 00000000fe714fff
T4: 000000000000000a T5: 0000000000cd1000 T6: 00000000ff7877e0
Code: 7402 64e2 6942 69a2 6145 8082 7d1c 6138 (e31c)
UEFI image [0x00000000fe6b2000:0x00000000fe6ce07b]
'/\EFI\BOOT\BOOTRISCV64.EFI'
UEFI image [0x00000000fa8fc000:0x00000000fc2d1fff] '/\vmlinux-6.6.20-
isar'

resetting ...
```

This needs additional time to debug and fix. So, for now we tend to
stay working version now + the patch.

--
Best regards,
Uladzimir.


Uladzimir Bely

unread,
Apr 11, 2025, 6:18:02 AM4/11/25
to isar-...@googlegroups.com
After updating "make" in trixie, kernel build fails with errors like:

```
make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop.
make[9]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/img/img-rogue] Error 2
make[9]: *** Waiting for unfinished jobs....
```

Branch "JH7110_VisionFive2_devel" we are using still doesn't include
required fix, so borrow it from branch "pinetab-6.6.y-devel".
---
...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++++++++++++
.../linux-starfive_6.6.20-visionfive2.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch

diff --git a/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
new file mode 100644
+--
+2.49.0
+

Uladzimir Bely

unread,
Apr 11, 2025, 6:18:02 AM4/11/25
to isar-...@googlegroups.com
NoCrossTest.test_nocross_sid test is failing in CI for some time
due to recent Debian Trixie updates.

Backport linux and u-boot upstream patches that solve build issues.

Changes since v1:
- Correct patch 2 commit message where wrong branch was mentioned.

Uladzimir Bely (2):
u-boot-starfive-visionfive2: Fix build with swig 4.3.0
linux-starfive: Fix build with GNU make 4.4

...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++
.../u-boot-starfive-visionfive2_2024.01.bb | 1 +
...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++
.../linux-starfive_6.6.20-visionfive2.bb | 1 +
4 files changed, 91 insertions(+)
create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch

Uladzimir Bely

unread,
Apr 11, 2025, 6:18:02 AM4/11/25
to isar-...@googlegroups.com
Fixes u-boot build failure on newer trixie that got updated swig-4.3.0
some time ago.

```
scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments
to function ‘SWIG_Python_AppendOutput’
5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
| ^~~~~~~~~~~~~~~~~~~~~~~~
```
---
...bfdt-libfdt.i_shipped-Use-SWIG_Appen.patch | 60 +++++++++++++++++++
.../u-boot-starfive-visionfive2_2024.01.bb | 1 +
2 files changed, 61 insertions(+)
create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch

diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
new file mode 100644
index 00000000..d919eb68
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/files/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
+--
+2.49.0
+
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
index 9f819c3e..becd40da 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb
@@ -8,6 +8,7 @@ require recipes-bsp/u-boot/u-boot-custom.inc
COMPATIBLE_MACHINE = "starfive-visionfive2"

SRC_URI += "https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+ file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch \
file://starfive-visionfive2-rules.tmpl"
SRC_URI[sha256sum] = "b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3"

--
2.49.0

Jan Kiszka

unread,
Apr 11, 2025, 9:35:11 AM4/11/25
to Uladzimir Bely, isar-...@googlegroups.com
Ack.

Uladzimir Bely

unread,
Apr 15, 2025, 3:02:20 AM4/15/25
to isar-...@googlegroups.com
Applied to next.

--
Best regards,
Uladzimir.


Reply all
Reply to author
Forward
0 new messages