pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc sysutils/u-boot-rockpro64-ayufan: remove in favor of m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/814541c724be
branches: trunk
changeset: 375336:814541c724be
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Mar 12 14:28:54 2022 +0000
description:
sysutils/u-boot-rockpro64-ayufan: remove in favor of mainline u-boot
diffstat:
doc/CHANGES-2022 | 3 +-
sysutils/Makefile | 3 +-
sysutils/u-boot-rockpro64-ayufan/DESCR | 9 -
sysutils/u-boot-rockpro64-ayufan/MESSAGE | 14 -
sysutils/u-boot-rockpro64-ayufan/Makefile | 24 -
sysutils/u-boot-rockpro64-ayufan/PLIST | 6 -
sysutils/u-boot-rockpro64-ayufan/distinfo | 5 -
sysutils/u-boot-rockpro64-ayufan/files/installboot.plist | 47 -
sysutils/u-boot/distinfo-2020.01.2014 | 8 -
sysutils/u-boot/patches-2020.01.2014/patch-arch_arm_lib_interrupts__64.c | 33 -
sysutils/u-boot/patches-2020.01.2014/patch-drivers_pci_pcie__rockchip.c | 271 ----------
11 files changed, 3 insertions(+), 420 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r 77a1c5c145b0 -r 814541c724be doc/CHANGES-2022
--- a/doc/CHANGES-2022 Sat Mar 12 12:36:21 2022 +0000
+++ b/doc/CHANGES-2022 Sat Mar 12 14:28:54 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2022,v 1.1399 2022/03/12 12:03:51 rillig Exp $
+$NetBSD: CHANGES-2022,v 1.1400 2022/03/12 14:28:54 tnn Exp $
Changes to the packages collection and infrastructure in 2022:
@@ -1779,3 +1779,4 @@
Updated www/py-nbconvert to 6.4.3 [adam 2022-03-12]
Updated www/py-uvicorn to 0.17.6 [adam 2022-03-12]
Updated pkgtools/pkglint to 21.4.4 [rillig 2022-03-12]
+ Removed sysutils/u-boot-rockpro64-ayufan successor sysutils/u-boot-rockpro64 [tnn 2022-03-12]
diff -r 77a1c5c145b0 -r 814541c724be sysutils/Makefile
--- a/sysutils/Makefile Sat Mar 12 12:36:21 2022 +0000
+++ b/sysutils/Makefile Sat Mar 12 14:28:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.999 2022/03/10 23:49:17 gutteridge Exp $
+# $NetBSD: Makefile,v 1.1000 2022/03/12 14:28:54 tnn Exp $
#
COMMENT= System utilities
@@ -780,7 +780,6 @@
SUBDIR+= u-boot-roc-rk3328-cc
SUBDIR+= u-boot-rock64
SUBDIR+= u-boot-rockpro64
-SUBDIR+= u-boot-rockpro64-ayufan
SUBDIR+= u-boot-rpi3-32
SUBDIR+= u-boot-sopine-baseboard
SUBDIR+= u-boot-tinker
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/DESCR
--- a/sysutils/u-boot-rockpro64-ayufan/DESCR Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
-several other processors, which can be installed in a boot ROM and used to
-initialize and test the hardware or to download and run application code.
-
-This package provides U-Boot for the rk3399-based RockPRO64 from PINE64;
-built from ayufan's branch.
-
-This branch has improved boot device support that does not yet exist
-in mainline U-Boot. For example for booting from SPI, NVMe and AHCI.
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/MESSAGE
--- a/sysutils/u-boot-rockpro64-ayufan/MESSAGE Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2020/04/06 15:08:34 tnn Exp $
-
-Example command to install U-Boot to an empty SD card:
-
-# dd if=${LOCALBASE}/share/u-boot/rockpro64/rksd_loader.img seek=64 of=/dev/rld0d
-
-Alternatively, to install to SPI flash:
-
-dd if=${LOCALBASE}/share/u-boot/rockpro64/rkspi_loader.img bs=64k of=/dev/spiflash0
-
-See also http://opensource.rock-chips.com/wiki_Boot_option
-
-===========================================================================
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/Makefile
--- a/sysutils/u-boot-rockpro64-ayufan/Makefile Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2021/08/12 07:38:47 wiz Exp $
-
-PKGREVISION= 1
-UBOOT_TARGET= rockpro64
-UBOOT_CONFIG= rockpro64-rk3399_defconfig
-UBOOT_BIN= idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
-
-UBOOT_INSTALLBOOT_PLIST= installboot.plist
-
-UBOOT_IMAGE_TYPE= rk3399
-
-# If updating this package, make sure SPI boot still works.
-# It is broken in mainline 2021.07 as well as in ayufan 2021.07.
-# Until verified fixed keep this version as-is.
-UBOOT_VERSION= 2020.01.2014
-MASTER_SITES= ${MASTER_SITE_GITHUB:=ayufan-rock64/}
-GITHUB_PROJECT= linux-mainline-u-boot
-GITHUB_TAG= 2020.01-ayufan-2014-gff2cdd38
-DISTNAME= u-boot-rockpro64-ayufan-${GITHUB_TAG}
-EXTRACT_SUFX= .tar.gz # keep this
-PKGNAME= u-boot-rockpro64-ayufan-${UBOOT_VERSION}
-
-.include "../../sysutils/u-boot/u-boot-rockchip.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/PLIST
--- a/sysutils/u-boot-rockpro64-ayufan/PLIST Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2020/04/06 15:08:34 tnn Exp $
-share/u-boot/rockpro64/idbloader.img
-share/u-boot/rockpro64/installboot.plist
-share/u-boot/rockpro64/rksd_loader.img
-share/u-boot/rockpro64/rkspi_loader.img
-share/u-boot/rockpro64/u-boot.itb
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/distinfo
--- a/sysutils/u-boot-rockpro64-ayufan/distinfo Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:20:20 nia Exp $
-
-BLAKE2s (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) = 0c9a52b2a58254af888cd4fd2c3ded4e1fd1478be1127689023a8bee752ae5a5
-SHA512 (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) =
938bb081805b1acfb75479115c3e38406b3753f60f13e663dc2a26921380b5c3fbd2adb477e2a83d28bab551294ae697fde72994514f55ed5e36894a29d4502b
-Size (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) = 18847179 bytes
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot-rockpro64-ayufan/files/installboot.plist
--- a/sysutils/u-boot-rockpro64-ayufan/files/installboot.plist Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!-- $NetBSD: installboot.plist,v 1.1 2020/04/06 15:08:34 tnn Exp $ -->
-<!--
- Copyright (c) 2020 The NetBSD Foundation, Inc.
- All rights reserved.
-
- This code is derived from software contributed to The NetBSD Foundation
- by Jason R. Thorpe.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
--->
-<plist>
-<dict>
- <key>pine64,rockpro64</key>
- <dict>
- <key>description</key>
- <string>Pine64 RockPro64</string>
- <key>u-boot-install</key>
- <array>
- <dict>
- <key>file-name</key>
- <string>rksd_loader.img</string>
- <key>image-offset</key>
- <integer>32768</integer>
- </dict>
- </array>
- </dict>
-</dict>
-</plist>
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot/distinfo-2020.01.2014
--- a/sysutils/u-boot/distinfo-2020.01.2014 Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: distinfo-2020.01.2014,v 1.2 2021/07/27 20:47:34 tnn Exp $
-
-SHA1 (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) = 4636aaa91912081708ad69c610b8bfa545c200c7
-RMD160 (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) = 7c32af7ca2411712e6960bce453bbf1fe1dc3445
-SHA512 (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) =
938bb081805b1acfb75479115c3e38406b3753f60f13e663dc2a26921380b5c3fbd2adb477e2a83d28bab551294ae697fde72994514f55ed5e36894a29d4502b
-Size (u-boot-rockpro64-ayufan-2020.01-ayufan-2014-gff2cdd38.tar.gz) = 18847179 bytes
-SHA1 (patch-arch_arm_lib_interrupts__64.c) = 5f24ae8c358bd03383c121fec27fa983765b994f
-SHA1 (patch-drivers_pci_pcie__rockchip.c) = e216698695adcc7e842de9f4e63c36ecf46924d1
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot/patches-2020.01.2014/patch-arch_arm_lib_interrupts__64.c
--- a/sysutils/u-boot/patches-2020.01.2014/patch-arch_arm_lib_interrupts__64.c Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-arch_arm_lib_interrupts__64.c,v 1.1 2021/07/27 20:47:35 tnn Exp $
-
-backport PCIe fixes from sysutils/u-boot-rockpro64
-
---- arch/arm/lib/interrupts_64.c.orig 2020-04-15 17:13:47.000000000 +0000
-+++ arch/arm/lib/interrupts_64.c
-@@ -107,11 +107,26 @@ void do_bad_error(struct pt_regs *pt_reg
- panic("Resetting CPU ...\n");
- }
-
-+#ifdef CONFIG_ROCKCHIP_RK3399
-+extern volatile int rockchip_pcie_expect_data_abort;
-+extern volatile int rockchip_pcie_got_data_abort;
-+#endif
- /*
- * do_sync handles the Synchronous Abort exception.
- */
- void do_sync(struct pt_regs *pt_regs, unsigned int esr)
- {
-+#ifdef CONFIG_ROCKCHIP_RK3399
-+ if ((esr >> 26) == 0x25 && rockchip_pcie_expect_data_abort) {
-+ /*
-+ * Data Abort taken without a change in Exception level.
-+ * This happens when probing nonexistent PCI-e devices.
-+ */
-+ rockchip_pcie_got_data_abort = 1;
-+ pt_regs->elr += 4; /* skip faulting insn */
-+ return;
-+ }
-+#endif
- efi_restore_gd();
- printf("\"Synchronous Abort\" handler, esr 0x%08x\n", esr);
- show_regs(pt_regs);
diff -r 77a1c5c145b0 -r 814541c724be sysutils/u-boot/patches-2020.01.2014/patch-drivers_pci_pcie__rockchip.c
--- a/sysutils/u-boot/patches-2020.01.2014/patch-drivers_pci_pcie__rockchip.c Sat Mar 12 12:36:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-$NetBSD: patch-drivers_pci_pcie__rockchip.c,v 1.1 2021/07/27 20:47:35 tnn Exp $
-
-backport PCIe fixes from sysutils/u-boot-rockpro64
-
---- drivers/pci/pcie_rockchip.c.orig 2020-04-15 17:13:47.000000000 +0000
-+++ drivers/pci/pcie_rockchip.c
-@@ -171,8 +171,11 @@ enum of_gpio_flags {
-
- #define RC_REGION_0_ADDR_TRANS_H 0x00000000
- #define RC_REGION_0_ADDR_TRANS_L 0x00000000
--#define RC_REGION_0_PASS_BITS (25 - 1)
-+#define RC_REGION_0_PASS_BITS (20 - 1)
- #define MAX_AXI_WRAPPER_REGION_NUM 33
-+#define PCIE_ATR_HDR_CFG_TYPE0 0xa
-+#define PCIE_ATR_HDR_CFG_TYPE1 0xb
-+#define PCIE_ATR_HDR_RID BIT(23)
-
- #define PCI_CLASS_BRIDGE_PCI 0x0604
-
-@@ -359,42 +362,64 @@ static int rockchip_pcie_wr_own_conf(voi
- return 0;
- }
-
--static int rockchip_pcie_rd_other_conf(void *priv, int where,
-+static void rockchip_pcie_write(struct pcie_rockchip *rockchip, u32 val, u32 reg);
-+volatile int rockchip_pcie_expect_data_abort;
-+volatile int rockchip_pcie_got_data_abort;
-+
-+static int rockchip_pcie_rd_other_conf(void *priv, pci_dev_t d, int where,
- int size, u32 *val)
- {
- u32 busdev;
- struct pcie_rockchip *rockchip = (struct pcie_rockchip *)priv;
-
-- /*
-- * BDF = 01:00:00
-- * end-to-end support, no hierarchy....
-- */
-- busdev = PCIE_ECAM_ADDR(1, 0, 0, where);
-+ busdev = PCIE_ECAM_ADDR(0, PCI_DEV(d), PCI_FUNC(d), where);
-+ rockchip_pcie_write(rockchip,
-+ (PCI_BUS(d) << 20) | RC_REGION_0_PASS_BITS,
-+ PCIE_CORE_OB_REGION_ADDR0);
-+ rockchip_pcie_write(rockchip,
-+ PCIE_ATR_HDR_RID | (PCI_BUS(d) > (rockchip->first_busno + 1) ? PCIE_ATR_HDR_CFG_TYPE1 : PCIE_ATR_HDR_CFG_TYPE0),
-+ PCIE_CORE_OB_REGION_DESC0);
-+ dsb();
-+ rockchip_pcie_got_data_abort = 0;
-+ rockchip_pcie_expect_data_abort = 1;
-
- if (size == 4) {
- *val = readl(rockchip->axi_base + busdev);
-+ if (rockchip_pcie_got_data_abort) {
-+ *val = 0xFFFFFFFFUL;
-+ }
- } else if (size == 2) {
- *val = readw(rockchip->axi_base + busdev);
-+ if (rockchip_pcie_got_data_abort) {
-+ *val = 0xFFFF;
-+ }
- } else if (size == 1) {
- *val = readb(rockchip->axi_base + busdev);
-+ if (rockchip_pcie_got_data_abort) {
-+ *val = 0xFF;
-+ }
- } else {
- *val = 0;
- return -1;
- }
-+ dsb();
-+ rockchip_pcie_expect_data_abort = 0;
- return 0;
- }
-
--static int rockchip_pcie_wr_other_conf(void *priv, int where, int size, u32 val)
-+static int rockchip_pcie_wr_other_conf(void *priv, pci_dev_t d, int where, int size, u32 val)
- {
- struct pcie_rockchip *rockchip = (struct pcie_rockchip *)priv;
- u32 busdev;
-
-- /*
-- * BDF = 01:00:00
-- * end-to-end support, no hierarchy....
-- */
-- busdev = PCIE_ECAM_ADDR(1, 0, 0, where);
--
-+ busdev = PCIE_ECAM_ADDR(0, PCI_DEV(d), PCI_FUNC(d), where);
Home |
Main Index |
Thread Index |
Old Index