CVS commit: pkgsrc/sysutils

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Tue Sep 25 21:49:20 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo
        pkgsrc/sysutils/u-boot-jetson-tk1: Makefile
        pkgsrc/sysutils/u-boot-jetson-tx1: Makefile
        pkgsrc/sysutils/u-boot-jetson-tx2: Makefile
Added Files:
        pkgsrc/sysutils/u-boot/patches: patch-configs_p2371-2180_defconfig
            patch-include_configs_tegra-common-post.h

Log Message:
Set fdtfile env variable and run 'pci enum' by default on tegra boards.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/u-boot/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-jetson-tk1/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/u-boot-jetson-tx1/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-jetson-tx2/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches/patch-configs_p2371-2180_defconfig \
    pkgsrc/sysutils/u-boot/patches/patch-include_configs_tegra-common-post.h

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
diff -u pkgsrc/sysutils/u-boot/distinfo:1.14 pkgsrc/sysutils/u-boot/distinfo:1.15
--- pkgsrc/sysutils/u-boot/distinfo:1.14        Sun Jun 24 23:18:01 2018
+++ pkgsrc/sysutils/u-boot/distinfo     Tue Sep 25 21:49:20 2018
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.14 2018/06/24 23:18:01 thorpej Exp $
+$NetBSD: distinfo,v 1.15 2018/09/25 21:49:20 jmcneill Exp $
 
 SHA1 (u-boot-2018.05.tar.bz2) = 605543501f7450ffa4e9c7fd98d2f36dbc0657b0
 RMD160 (u-boot-2018.05.tar.bz2) = b305357058feb875233c3a32f41e14548b97855d
 SHA512 (u-boot-2018.05.tar.bz2) = 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2
 Size (u-boot-2018.05.tar.bz2) = 12469276 bytes
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
+SHA1 (patch-arch_arm_dts_Makefile) = 1730c74c5ca78a4156cea4a903e153b1d61b3171
 SHA1 (patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts) = 5aae66cd400e7d48312fdf3399d44ec9a5c51aaf
+SHA1 (patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts) = 191402f0f68c1916196430819c50a36a4808b79f
+SHA1 (patch-configs_orangepi_zero_plus_defconfig) = 328204fda6f202a2468c34b60fda71e0aa72e92a
+SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c
 SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
+SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4
 SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
 SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
-SHA1 (patch-arch_arm_dts_Makefile) = 1730c74c5ca78a4156cea4a903e153b1d61b3171
-SHA1 (patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts) = 191402f0f68c1916196430819c50a36a4808b79f
-SHA1 (patch-configs_orangepi_zero_plus_defconfig) = 328204fda6f202a2468c34b60fda71e0aa72e92a

Index: pkgsrc/sysutils/u-boot-jetson-tk1/Makefile
diff -u pkgsrc/sysutils/u-boot-jetson-tk1/Makefile:1.1 pkgsrc/sysutils/u-boot-jetson-tk1/Makefile:1.2
--- pkgsrc/sysutils/u-boot-jetson-tk1/Makefile:1.1      Sat Dec  9 13:02:41 2017
+++ pkgsrc/sysutils/u-boot-jetson-tk1/Makefile  Tue Sep 25 21:49:20 2018
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/12/09 13:02:41 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/25 21:49:20 jmcneill Exp $
 
 UBOOT_TARGET=          jetson-tk1
 UBOOT_CONFIG=          jetson-tk1_defconfig
 UBOOT_BIN=             u-boot u-boot-dtb.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"

Index: pkgsrc/sysutils/u-boot-jetson-tx1/Makefile
diff -u pkgsrc/sysutils/u-boot-jetson-tx1/Makefile:1.3 pkgsrc/sysutils/u-boot-jetson-tx1/Makefile:1.4
--- pkgsrc/sysutils/u-boot-jetson-tx1/Makefile:1.3      Sun Oct  8 12:09:43 2017
+++ pkgsrc/sysutils/u-boot-jetson-tx1/Makefile  Tue Sep 25 21:49:20 2018
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/10/08 12:09:43 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/09/25 21:49:20 jmcneill Exp $
 
 UBOOT_TARGET=          jetson-tx1
 UBOOT_CONFIG=          p2371-2180_defconfig
 UBOOT_BIN=             u-boot u-boot-dtb.bin
 
+PKGREVISION=           1
+
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=  el1
 

Index: pkgsrc/sysutils/u-boot-jetson-tx2/Makefile
diff -u pkgsrc/sysutils/u-boot-jetson-tx2/Makefile:1.1 pkgsrc/sysutils/u-boot-jetson-tx2/Makefile:1.2
--- pkgsrc/sysutils/u-boot-jetson-tx2/Makefile:1.1      Thu Feb  8 08:57:32 2018
+++ pkgsrc/sysutils/u-boot-jetson-tx2/Makefile  Tue Sep 25 21:49:20 2018
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2018/02/08 08:57:32 martin Exp $
+# $NetBSD: Makefile,v 1.2 2018/09/25 21:49:20 jmcneill Exp $
 
 UBOOT_TARGET=          jetson-tx2
 UBOOT_CONFIG=          p2771-0000-500_defconfig
 UBOOT_BIN=             u-boot u-boot-dtb.bin
 
+PKGREVISION=           1
+
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=  el1
 

Added files:

Index: pkgsrc/sysutils/u-boot/patches/patch-configs_p2371-2180_defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-configs_p2371-2180_defconfig:1.1
--- /dev/null   Tue Sep 25 21:49:20 2018
+++ pkgsrc/sysutils/u-boot/patches/patch-configs_p2371-2180_defconfig   Tue Sep 25 21:49:20 2018
@@ -0,0 +1,9 @@
+$NetBSD: patch-configs_p2371-2180_defconfig,v 1.1 2018/09/25 21:49:20 jmcneill Exp $
+
+--- configs/p2371-2180_defconfig.orig  2018-05-07 15:32:36.000000000 +0000
++++ configs/p2371-2180_defconfig
+@@ -47,3 +47,4 @@ CONFIG_CI_UDC=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_USB_HOST_ETHER=y
+ CONFIG_USB_ETHER_ASIX=y
++CONFIG_BOOTCOMMAND="pci enum; run distro_bootcmd"
Index: pkgsrc/sysutils/u-boot/patches/patch-include_configs_tegra-common-post.h
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-include_configs_tegra-common-post.h:1.1
--- /dev/null   Tue Sep 25 21:49:20 2018
+++ pkgsrc/sysutils/u-boot/patches/patch-include_configs_tegra-common-post.h    Tue Sep 25 21:49:20 2018
@@ -0,0 +1,12 @@
+$NetBSD: patch-include_configs_tegra-common-post.h,v 1.1 2018/09/25 21:49:20 jmcneill Exp $
+
+--- include/configs/tegra-common-post.h.orig   2018-05-07 15:32:36.000000000 +0000
++++ include/configs/tegra-common-post.h
+@@ -90,6 +90,7 @@
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+       TEGRA_DEVICE_SETTINGS \
+       MEM_LAYOUT_ENV_SETTINGS \
++      "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "fdt_high=" FDT_HIGH "\0" \
+       "initrd_high=" INITRD_HIGH "\0" \
+       BOOTENV \