CVS commit: pkgsrc/sysutils/u-boot

["Christoph Badura" <bad%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bad
Date:           Tue Oct  8 20:48:49 UTC 2019

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo
        pkgsrc/sysutils/u-boot/patches: patch-arch_arm_dts_Makefile
Added Files:
        pkgsrc/sysutils/u-boot/patches:
            patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts
            patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts
            patch-configs_nanopi__duo2__defconfig
            patch-configs_nanopi__r1__defconfig

Log Message:
Add patches to build u-boot for NanoPi Duo2 and NanoPi R1.

>From https://github.com/armbian/build/blob/master/patch/u-boot/u-boot-sunxi/add-nano+pi-r1-and-duo2.patch


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/u-boot/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts \
    pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts \
    pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__duo2__defconfig \
    pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__r1__defconfig

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.28 pkgsrc/sysutils/u-boot/distinfo:1.29
--- pkgsrc/sysutils/u-boot/distinfo:1.28        Sun Oct  6 17:02:10 2019
+++ pkgsrc/sysutils/u-boot/distinfo     Tue Oct  8 20:48:49 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2019/10/06 17:02:10 bad Exp $
+$NetBSD: distinfo,v 1.29 2019/10/08 20:48:49 bad Exp $
 
 SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
@@ -6,14 +6,18 @@ SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bb
 Size (u-boot-2018.11.tar.bz2) = 13045125 bytes
 SHA1 (patch-Makefile) = 5b86d70e05620cc3133faf508e983e2fe6ca6603
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
-SHA1 (patch-arch_arm_dts_Makefile) = 184fdb8b04b25c0c827823779874306ce1bc746d
+SHA1 (patch-arch_arm_dts_Makefile) = a64a01255af3d2a744fe7b923c66fd8ce0f9d489
 SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-m2-zero.dts) = aaa530a5f520eea0cb5dcece0b730e23db59eb40
 SHA1 (patch-arch_arm_dts_sun8i-h2-plus-bananapi-p2-zero.dts) = 8c78d0e0877aa9784fa209af2e16e80cb1110364
+SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts) = ec4927bb5f024f9aca6f71890c4bc14dc53e8ba7
+SHA1 (patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts) = 6f3ac4f787b503beecbd5c63c40dce355e0a7ebe
 SHA1 (patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 425ae3a82ce9006dbd734f41f7d49bb3587b1493
 SHA1 (patch-configs_A20-OLinuXino-Lime2_defconfig) = 9eecb0a44ec9ddda2425b042c219f59ba546a494
 SHA1 (patch-configs_bananapi_m2_zero_defconfig) = 5e4baef63f0e51cb8c94a1dc0c0e50ecb016807d
 SHA1 (patch-configs_bananapi_p2_zero_defconfig) = 6468b3246cbf35d10320c8a974fc06b794ae68dc
 SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95
+SHA1 (patch-configs_nanopi__duo2__defconfig) = 1464c4eb5d31779caa5714386891ae60b25c1825
+SHA1 (patch-configs_nanopi__r1__defconfig) = deb0edece928cd0a761451b034757a31cb17760f
 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

Index: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
diff -u pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile:1.5 pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile:1.6
--- pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile:1.5      Wed Jun  5 05:43:15 2019
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile  Tue Oct  8 20:48:49 2019
@@ -1,11 +1,13 @@
-$NetBSD: patch-arch_arm_dts_Makefile,v 1.5 2019/06/05 05:43:15 thorpej Exp $
+$NetBSD: patch-arch_arm_dts_Makefile,v 1.6 2019/10/08 20:48:49 bad Exp $
 
 Add device tree files for:
 - Banana Pi BPI-M2 Zero
 - Banana Pi BPI-P2 Zero
+- FriendlyArm NanoPi R1
+- FriendlyArm NanoPi Duo2
 
---- arch/arm/dts/Makefile.orig 2019-06-02 17:45:33.522314609 -0700
-+++ arch/arm/dts/Makefile      2019-06-02 17:46:19.143587602 -0700
+--- arch/arm/dts/Makefile.orig 2018-11-14 16:10:06.000000000 +0000
++++ arch/arm/dts/Makefile
 @@ -365,6 +365,8 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
        sun8i-a83t-cubietruck-plus.dtb \
        sun8i-a83t-tbs-a711.dts
@@ -15,3 +17,12 @@ Add device tree files for:
        sun8i-h2-plus-libretech-all-h3-cc.dtb \
        sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-orangepi-zero.dtb \
+@@ -372,6 +374,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
+       sun8i-h3-libretech-all-h3-cc.dtb \
+       sun8i-h3-nanopi-m1.dtb \
+       sun8i-h3-nanopi-m1-plus.dtb \
++      sun8i-h3-nanopi-r1.dtb \
++      sun8i-h3-nanopi-duo2.dtb \
+       sun8i-h3-nanopi-neo.dtb \
+       sun8i-h3-nanopi-neo-air.dtb \
+       sun8i-h3-orangepi-2.dtb \

Added files:

Index: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts:1.1
--- /dev/null   Tue Oct  8 20:48:49 2019
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts  Tue Oct  8 20:48:49 2019
@@ -0,0 +1,103 @@
+$NetBSD: patch-arch_arm_dts_sun8i-h3-nanopi-duo2.dts,v 1.1 2019/10/08 20:48:49 bad Exp $
+
+--- arch/arm/dts/sun8i-h3-nanopi-duo2.dts.orig 2019-10-05 00:04:53.000000000 +0000
++++ arch/arm/dts/sun8i-h3-nanopi-duo2.dts
+@@ -0,0 +1,98 @@
++/*
++ * adapted by Igor Pecovnik igor%armbian.com@localhost
++ * Copyright (C) 2017 Jelle van der Waa <jelle%vdwaa.nl@localhost>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++#include "sun8i-h3.dtsi"
++#include "sunxi-common-regulators.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/sun4i-a10.h>
++
++/ {
++      model = "FriendlyARM NanoPi DUO 2";
++      compatible = "friendlyarm,nanopi-duo2", "allwinner,sun8i-h3";
++
++      aliases {
++              serial0 = &uart0;
++      };
++
++      chosen {
++              stdout-path = "serial0:115200n8";
++      };
++
++      leds {
++              compatible = "gpio-leds";
++
++              pwr {
++                      label = "nanopi:green:pwr";
++                      gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
++                      default-state = "on";
++              };
++
++              status {
++                      label = "nanopi:blue:status";
++                      gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */
++              };
++      };
++};
++
++&mmc0 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&mmc0_pins>;
++      vmmc-supply = <&reg_vcc3v3>;
++      bus-width = <4>;
++      cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
++      cd-inverted;
++      status = "okay";
++};
++
++&uart0 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&uart0_pins_a>;
++      status = "okay";
++};
++
++&usbphy {
++      /* USB VBUS is always on */
++      status = "okay";
++};
Index: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts:1.1
--- /dev/null   Tue Oct  8 20:48:49 2019
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts    Tue Oct  8 20:48:49 2019
@@ -0,0 +1,107 @@
+$NetBSD: patch-arch_arm_dts_sun8i-h3-nanopi-r1.dts,v 1.1 2019/10/08 20:48:49 bad Exp $
+
+--- arch/arm/dts/sun8i-h3-nanopi-r1.dts.orig   2019-10-05 00:04:53.000000000 +0000
++++ arch/arm/dts/sun8i-h3-nanopi-r1.dts
+@@ -0,0 +1,102 @@
++/*
++ * Copyright (C) 2019 Igor Pecovnik <igor%armbian.com@localhost>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "sun8i-h3-nanopi.dtsi"
++
++/ {
++      model = "FriendlyARM NanoPi R1";
++      compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3";
++
++      reg_gmac_3v3: gmac-3v3 {
++              compatible = "regulator-fixed";
++              pinctrl-names = "default";
++              regulator-name = "gmac-3v3";
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              startup-delay-us = <100000>;
++              enable-active-high;
++              gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
++      };
++
++};
++
++&ehci0 {
++      status = "okay";
++};
++
++&pio {
++      gmac_power_pin_nanopi: gmac_power_pin@0 {
++              pins = "PD6";
++              function = "gpio_out";
++      };
++};
++
++&ohci0 {
++      status = "okay";
++};
++
++&mmc2 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&mmc2_8bit_pins>;
++      vmmc-supply = <&reg_vcc3v3>;
++      bus-width = <8>;
++      non-removable;
++      cap-mmc-hw-reset;
++      status = "okay";
++};
++
++&emac {
++      pinctrl-names = "default";
++      pinctrl-0 = <&emac_rgmii_pins>;
++      phy-supply = <&reg_gmac_3v3>;
++      phy-handle = <&ext_rgmii_phy>;
++      phy-mode = "rgmii";
++
++      status = "okay";
++};
++
++&external_mdio {
++      ext_rgmii_phy: ethernet-phy@1 {
++              compatible = "ethernet-phy-ieee802.3-c22";
++              reg = <7>;
++      };
++};
Index: pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__duo2__defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__duo2__defconfig:1.1
--- /dev/null   Tue Oct  8 20:48:49 2019
+++ pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__duo2__defconfig        Tue Oct  8 20:48:49 2019
@@ -0,0 +1,26 @@
+$NetBSD: patch-configs_nanopi__duo2__defconfig,v 1.1 2019/10/08 20:48:49 bad Exp $
+
+--- configs/nanopi_duo2_defconfig.orig 2019-10-05 00:04:53.000000000 +0000
++++ configs/nanopi_duo2_defconfig
+@@ -0,0 +1,21 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_SYS_TEXT_BASE=0x4a000000
++CONFIG_SPL_SPI_FLASH_SUPPORT=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=408
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++# CONFIG_VIDEO_DE2 is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-duo2"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_CONSOLE_MUX=y
++CONFIG_SPL=y
++CONFIG_SYS_CLK_FREQ=480000000
++# CONFIG_CMD_IMLS is not set
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++CONFIG_SPL_SPI_SUNXI=y
++CONFIG_SUN8I_EMAC=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
Index: pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__r1__defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__r1__defconfig:1.1
--- /dev/null   Tue Oct  8 20:48:49 2019
+++ pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__r1__defconfig  Tue Oct  8 20:48:49 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-configs_nanopi__r1__defconfig,v 1.1 2019/10/08 20:48:49 bad Exp $
+
+--- configs/nanopi_r1_defconfig.orig   2019-10-05 00:04:53.000000000 +0000
++++ configs/nanopi_r1_defconfig
+@@ -0,0 +1,22 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_SPL=y
++CONFIG_MACH_SUN8I_H3=y
++CONFIG_DRAM_CLK=408
++CONFIG_DRAM_ZQ=3881979
++CONFIG_DRAM_ODT_EN=y
++CONFIG_MACPWR="PD6"
++# CONFIG_VIDEO_DE2 is not set
++CONFIG_NR_DRAM_BANKS=1
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_CONSOLE_MUX=y
++CONFIG_SYS_CLK_FREQ=480000000
++# CONFIG_CMD_FLASH is not set
++# CONFIG_SPL_DOS_PARTITION is not set
++# CONFIG_SPL_EFI_PARTITION is not set
++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1"
++CONFIG_SUN8I_EMAC=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB_OHCI_HCD=y
++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
++CONFIG_MMC_SUNXI_SLOT_EXTRA=2