CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>
Date: Wed, 10 Jan 2018 00:55:28 +0000

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Wed Jan 10 00:55:28 UTC 2018

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo
Added Files:
        pkgsrc/sysutils/u-boot-nanopi-neo-plus2: DESCR Makefile PLIST
        pkgsrc/sysutils/u-boot/patches: patch-arch_arm_dts_Makefile
            patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts
            patch-configs_nanopi__neo__plus2__defconfig

Log Message:
Add u-boot for nanopi-neo-plus2.

Backported from u-boot master, with some added adjustments.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/u-boot/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/DESCR \
    pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile \
    pkgsrc/sysutils/u-boot-nanopi-neo-plus2/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile \
    pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts \
    pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__neo__plus2__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.10 pkgsrc/sysutils/u-boot/distinfo:1.11
--- pkgsrc/sysutils/u-boot/distinfo:1.10        Tue Dec 19 00:58:50 2017
+++ pkgsrc/sysutils/u-boot/distinfo     Wed Jan 10 00:55:27 2018
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.10 2017/12/19 00:58:50 jmcneill Exp $
+$NetBSD: distinfo,v 1.11 2018/01/10 00:55:27 jakllsch Exp $
 
 SHA1 (u-boot-2017.11.tar.bz2) = 6a3932b39a0f165aba210663ea2500bcfb9c8794
 RMD160 (u-boot-2017.11.tar.bz2) = 38e1331640b81e74ea78ebf41f94bcdbd675dcb2
 SHA512 (u-boot-2017.11.tar.bz2) = 485b9ab7cea0a250d964822bdb99a8426852b4e815b506329dedc4f5a69757c8b1a812998561161d44d98f6fabb9c8937e8250de1244d258fc9f13624b38d643
 Size (u-boot-2017.11.tar.bz2) = 11982382 bytes
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
+SHA1 (patch-arch_arm_dts_Makefile) = 13e812abd46ffd7bf6dca6c78e2f5adf9731b7c6
+SHA1 (patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts) = af01f257b0bec9a71a3fbf2324bed6a4471062b0
+SHA1 (patch-configs_nanopi__neo__plus2__defconfig) = 58156ff8c5f9bd841b3039413911e67ddf8d692a
 SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
 SHA1 (patch-include_configs_tegra-common.h) = 01b68620414f85edd029e54f7f8dc158888c4072
 SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47

Added files:

Index: pkgsrc/sysutils/u-boot-nanopi-neo-plus2/DESCR
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-neo-plus2/DESCR:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/DESCR       Wed Jan 10 00:55:27 2018
@@ -0,0 +1,5 @@
+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 FriendlyElec NanoPi NEO Plus2.
Index: pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile    Wed Jan 10 00:55:27 2018
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+
+PKGREVISION=           1
+
+UBOOT_TARGET=          nanopi-neo-plus2
+UBOOT_CONFIG=          nanopi_neo_plus2_defconfig
+UBOOT_BIN=             u-boot-sunxi-with-spl.bin
+
+# Switch to EL1 before booting kernel (required for 32-bit support)
+PKG_DEFAULT_OPTIONS+=  el1
+
+post-extract:
+       ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
+
+BUILD_DEPENDS+=                arm-trusted-firmware-sun50iw1p1-[0-9]*:../../sysutils/arm-trusted-firmware-sun50iw1p1
+
+post-build:
+       ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
+
+.include "../../sysutils/u-boot/u-boot-arm64.mk"
Index: pkgsrc/sysutils/u-boot-nanopi-neo-plus2/PLIST
diff -u /dev/null pkgsrc/sysutils/u-boot-nanopi-neo-plus2/PLIST:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/PLIST       Wed Jan 10 00:55:27 2018
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+share/u-boot/nanopi-neo-plus2/u-boot-sunxi-with-spl.bin

Index: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile  Wed Jan 10 00:55:27 2018
@@ -0,0 +1,12 @@
+$NetBSD: patch-arch_arm_dts_Makefile,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+
+--- arch/arm/dts/Makefile.orig 2017-11-14 01:08:06.000000000 +0000
++++ arch/arm/dts/Makefile
+@@ -335,6 +335,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
+ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
+       sun8i-v3s-licheepi-zero.dtb
+ dtb-$(CONFIG_MACH_SUN50I_H5) += \
++      sun50i-h5-nanopi-neo-plus2.dtb \
+       sun50i-h5-nanopi-neo2.dtb \
+       sun50i-h5-orangepi-pc2.dtb \
+       sun50i-h5-orangepi-prime.dtb \
Index: pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts    Wed Jan 10 00:55:27 2018
@@ -0,0 +1,125 @@
+$NetBSD: patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+
+--- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts.orig   2018-01-10 00:43:42.000000000 +0000
++++ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts
+@@ -0,0 +1,120 @@
++/*
++ * Copyright (C) 2017 Icenowy Zheng <icenowy%aosc.io@localhost>
++ * Copyright (C) 2017 Jagan Teki <jteki%openedev.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 library 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 library 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 "sun50i-h5.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++
++/ {
++      model = "FriendlyARM NanoPi NEO Plus 2";
++      compatible = "friendlyarm,nanopi-neo-plus2", "allwinner,sun50i-h5";
++
++      aliases {
++              serial0 = &uart0;
++      };
++
++      chosen {
++              stdout-path = "serial0:115200n8";
++      };
++
++      reg_vcc3v3: vcc3v3 {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc3v3";
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++      };
++};
++
++&ehci1 {
++      status = "okay";
++};
++
++&mmc0 {
++      compatible = "allwinner,sun50i-h5-mmc",
++                   "allwinner,sun50i-a64-mmc",
++                   "allwinner,sun5i-a13-mmc";
++      pinctrl-names = "default";
++      pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
++      vmmc-supply = <&reg_vcc3v3>;
++      bus-width = <4>;
++      cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
++      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";
++};
++
++&ohci1 {
++      status = "okay";
++};
++
++&uart0 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&uart0_pins_a>;
++      status = "okay";
++};
++
++&usbphy {
++      status = "okay";
++};
++
++&emac {
++      pinctrl-names = "default";
++      pinctrl-0 = <&emac_rgmii_pins>;
++      phy-mode = "rgmii";
++      phy = <&phy7>;
++      status = "okay";
++
++      phy7: ethernet-phy@7 {
++              reg = <7>;
++      };
++};
Index: pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__neo__plus2__defconfig
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__neo__plus2__defconfig:1.1
--- /dev/null   Wed Jan 10 00:55:28 2018
+++ pkgsrc/sysutils/u-boot/patches/patch-configs_nanopi__neo__plus2__defconfig  Wed Jan 10 00:55:27 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-configs_nanopi__neo__plus2__defconfig,v 1.1 2018/01/10 00:55:27 jakllsch Exp $
+
+--- configs/nanopi_neo_plus2_defconfig.orig    2018-01-10 00:30:46.000000000 +0000
++++ configs/nanopi_neo_plus2_defconfig
+@@ -0,0 +1,18 @@
++CONFIG_ARM=y
++CONFIG_ARCH_SUNXI=y
++CONFIG_MACH_SUN50I_H5=y
++CONFIG_DRAM_CLK=408
++CONFIG_DRAM_ZQ=3881977
++CONFIG_MACPWR="PD6"
++CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-nanopi-neo-plus2"
++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
++CONFIG_SPL=y
++# CONFIG_CMD_FLASH is not set
++# CONFIG_CMD_FPGA is not set
++# CONFIG_SPL_DOS_PARTITION is not set
++# CONFIG_SPL_ISO_PARTITION is not set
++# CONFIG_SPL_EFI_PARTITION is not set
++CONFIG_SUN8I_EMAC=y
++CONFIG_USB_EHCI_HCD=y
++CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
++# CONFIG_VIDEO_DE2 is not set

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/sysutils
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/sysutils
Indexes:

Home | Main Index | Thread Index | Old Index