CVS commit: pkgsrc/sysutils/u-boot

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Apr  1 00:06:34 UTC 2025

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo-2022.01
        pkgsrc/sysutils/u-boot/patches-2022.01:
            patch-arch_arm_lib_interrupts__64.c

Log Message:
u-boot: amend a patch to fix builds for certain rk3399 boards

Not every rk3399-based board compiles the general PCIe support found in
pcie_rockchip.c, as some don't offer it by design.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/u-boot/distinfo-2022.01
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2022.01:1.5 pkgsrc/sysutils/u-boot/distinfo-2022.01:1.6
--- pkgsrc/sysutils/u-boot/distinfo-2022.01:1.5 Mon Dec 18 17:11:31 2023
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01     Tue Apr  1 00:06:34 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo-2022.01,v 1.5 2023/12/18 17:11:31 gutteridge Exp $
+$NetBSD: distinfo-2022.01,v 1.6 2025/04/01 00:06:34 gutteridge Exp $
 
 BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
 SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
 Size (u-boot-2022.01.tar.bz2) = 17449627 bytes
-SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab
+SHA1 (patch-arch_arm_lib_interrupts__64.c) = 09100688f4ba5848de5c3ed301a36d9e66a1fab7
 SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490
 SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf
 SHA1 (patch-configs_nanopi-r2s-rk3328_defconfig) = 1f75f77420919e834bbf32fc8ef2ac20f0757f2b

Index: pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c
diff -u pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c:1.1 pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c:1.2
--- pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c:1.1      Fri Feb 11 21:46:14 2022
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-arch_arm_lib_interrupts__64.c  Tue Apr  1 00:06:34 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-arch_arm_lib_interrupts__64.c,v 1.1 2022/02/11 21:46:14 mrg Exp $
+$NetBSD: patch-arch_arm_lib_interrupts__64.c,v 1.2 2025/04/01 00:06:34 gutteridge Exp $
 
 u-boot-rockpro64: fix broken PCI config space handling:
 
@@ -19,7 +19,7 @@ devices other than 0:0:0 and 1:0:0.
        panic("Resetting CPU ...\n");
  }
  
-+#ifdef CONFIG_ROCKCHIP_RK3399
++#if defined(CONFIG_ROCKCHIP_RK3399) && defined(CONFIG_PCI)
 +extern volatile int rockchip_pcie_expect_data_abort;
 +extern volatile int rockchip_pcie_got_data_abort;
 +#endif
@@ -28,7 +28,7 @@ devices other than 0:0:0 and 1:0:0.
   */
  void do_sync(struct pt_regs *pt_regs, unsigned int esr)
  {
-+#ifdef CONFIG_ROCKCHIP_RK3399
++#if defined(CONFIG_ROCKCHIP_RK3399) && defined(CONFIG_PCI)
 +      if ((esr >> 26) == 0x25 && rockchip_pcie_expect_data_abort) {
 +              /*
 +               * Data Abort taken without a change in Exception level.