diff options
-rw-r--r-- | sysutils/u-boot-jetson-tk1/Makefile | 4 | ||||
-rw-r--r-- | sysutils/u-boot-jetson-tx1/Makefile | 4 | ||||
-rw-r--r-- | sysutils/u-boot-jetson-tx2/Makefile | 4 | ||||
-rw-r--r-- | sysutils/u-boot-nanopi-neo-plus2/Makefile | 4 | ||||
-rw-r--r-- | sysutils/u-boot-pine-h64/Makefile | 13 | ||||
-rw-r--r-- | sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig | 15 | ||||
-rw-r--r-- | sysutils/u-boot-pine-h64/patches/patch-lib_bch.c | 26 | ||||
-rw-r--r-- | sysutils/u-boot/distinfo | 13 | ||||
-rw-r--r-- | sysutils/u-boot/patches/patch-arch_arm_dts_Makefile | 10 | ||||
-rw-r--r-- | sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts | 27 | ||||
-rw-r--r-- | sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts | 107 | ||||
-rw-r--r-- | sysutils/u-boot/u-boot-version.mk | 4 |
12 files changed, 12 insertions, 219 deletions
diff --git a/sysutils/u-boot-jetson-tk1/Makefile b/sysutils/u-boot-jetson-tk1/Makefile index 9886c611635..fbba12029ea 100644 --- a/sysutils/u-boot-jetson-tk1/Makefile +++ b/sysutils/u-boot-jetson-tk1/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2018/09/27 14:29:36 skrll Exp $ +# $NetBSD: Makefile,v 1.4 2018/12/14 00:52:26 jmcneill Exp $ UBOOT_TARGET= jetson-tk1 UBOOT_CONFIG= jetson-tk1_defconfig UBOOT_BIN= u-boot u-boot-dtb.bin -PKGREVISION= 2 - .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-jetson-tx1/Makefile b/sysutils/u-boot-jetson-tx1/Makefile index 7c4001d0319..d3d034229e5 100644 --- a/sysutils/u-boot-jetson-tx1/Makefile +++ b/sysutils/u-boot-jetson-tx1/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2018/09/25 21:49:20 jmcneill Exp $ +# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:26 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 diff --git a/sysutils/u-boot-jetson-tx2/Makefile b/sysutils/u-boot-jetson-tx2/Makefile index ff9899aa434..c1f9e939099 100644 --- a/sysutils/u-boot-jetson-tx2/Makefile +++ b/sysutils/u-boot-jetson-tx2/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2018/09/25 21:49:20 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 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 diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile index 3453b248efe..06392ac1b98 100644 --- a/sysutils/u-boot-nanopi-neo-plus2/Makefile +++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2018/05/25 20:49:52 jakllsch Exp $ +# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:27 jmcneill Exp $ UBOOT_TARGET= nanopi-neo-plus2 UBOOT_CONFIG= nanopi_neo_plus2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -PKGREVISION= 1 - # Switch to EL1 before booting kernel (required for 32-bit support) #PKG_DEFAULT_OPTIONS+= el1 PKG_DEFAULT_OPTIONS+= debug diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile index d9ce0c72010..8594f583ff2 100644 --- a/sysutils/u-boot-pine-h64/Makefile +++ b/sysutils/u-boot-pine-h64/Makefile @@ -1,25 +1,14 @@ -# $NetBSD: Makefile,v 1.2 2018/05/31 20:25:15 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $ -UBOOT_VERSION= 2018.03rc1 UBOOT_TARGET= pine-h64 UBOOT_CONFIG= pine_h64_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -# Use Icenowy's fork of mainline U-Boot with Pine H64 support patched in -MASTER_SITES= ${MASTER_SITE_GITHUB:=Icenowy/} -GITHUB_PROJECT= u-boot -GITHUB_TAG= f4077661c6c0f3b92f26cb7c35432ad64615fe32 -DISTNAME= u-boot-${UBOOT_TARGET}-${UBOOT_VERSION} -EXTRACT_SUFX= .tar.gz - post-extract: ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC} post-build: ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin -DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-pine-h64/distinfo -PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-pine-h64/patches - .include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk" .include "../../sysutils/u-boot/u-boot-arm64.mk" diff --git a/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig b/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig deleted file mode 100644 index c9c7df4f0f1..00000000000 --- a/sysutils/u-boot-pine-h64/patches/patch-arch_arm_cpu_armv8_Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-arch_arm_cpu_armv8_Kconfig,v 1.1 2018/05/31 20:20:00 jmcneill Exp $ - ---- arch/arm/cpu/armv8/Kconfig.orig 2018-01-23 06:50:34.000000000 +0000 -+++ arch/arm/cpu/armv8/Kconfig -@@ -132,6 +132,10 @@ config ARMV8_PSCI_CPUS_PER_CLUSTER - A value 0 or no definition of it works for single cluster system. - System with multi-cluster should difine their own exact value. - -+config ARMV8_SWITCH_TO_EL1 -+ bool "Switch to EL1 before booting kernel" -+ default n -+ - if SYS_HAS_ARMV8_SECURE_BASE - - config ARMV8_SECURE_BASE diff --git a/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c b/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c deleted file mode 100644 index 8597cd7e3cc..00000000000 --- a/sysutils/u-boot-pine-h64/patches/patch-lib_bch.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-lib_bch.c,v 1.1 2018/05/31 20:20:00 jmcneill Exp $ - ---- lib/bch.c.orig 2018-01-23 06:50:34.000000000 +0000 -+++ lib/bch.c -@@ -61,8 +61,11 @@ - #include <linux/bitops.h> - #else - #include <errno.h> --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) - #include <sys/endian.h> -+#elif defined(__APPLE__) -+#include <machine/endian.h> -+#define htobe32 htonl - #else - #include <endian.h> - #endif -@@ -117,7 +120,7 @@ struct gf_poly_deg1 { - }; - - #ifdef USE_HOSTCC --#if !defined(__DragonFly__) && !defined(__FreeBSD__) -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__) - static int fls(int x) - { - int r = 32; diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo index 35285564fb3..e30240e6b7f 100644 --- a/sysutils/u-boot/distinfo +++ b/sysutils/u-boot/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.16 2018/09/27 14:29:36 skrll Exp $ +$NetBSD: distinfo,v 1.17 2018/12/14 00:52:26 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 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 +RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 +SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff +Size (u-boot-2018.11.tar.bz2) = 13045125 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_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 SHA1 (patch-configs_orangepi_zero_plus_defconfig) = 328204fda6f202a2468c34b60fda71e0aa72e92a SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile b/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile deleted file mode 100644 index 7ff6d2ef06e..00000000000 --- a/sysutils/u-boot/patches/patch-arch_arm_dts_Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- arch/arm/dts/Makefile.orig 2018-06-23 11:16:15.355163284 -0700 -+++ arch/arm/dts/Makefile 2018-06-23 11:17:10.186971126 -0700 -@@ -372,6 +372,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \ - sun50i-h5-nanopi-neo-plus2.dtb \ - sun50i-h5-orangepi-pc2.dtb \ - sun50i-h5-orangepi-prime.dtb \ -+ sun50i-h5-orangepi-zero-plus.dtb \ - sun50i-h5-orangepi-zero-plus2.dtb - dtb-$(CONFIG_MACH_SUN50I) += \ - sun50i-a64-bananapi-m64.dtb \ diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts b/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts deleted file mode 100644 index 122cf4cf7f0..00000000000 --- a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-arch_arm_dts_sun50i-h5-nanopi-neo-plus2.dts,v 1.3 2018/05/25 20:49:52 jakllsch Exp $ - -Enable use of the NanoPi Neo Plus2's onboard Ethernet. - -Templated from the orangepi-pc2.dts. - ---- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts.orig 2018-05-07 15:32:36.000000000 +0000 -+++ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts -@@ -104,3 +104,18 @@ - &usbphy { - status = "okay"; - }; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emac_rgmii_pins>; -+ phy-mode = "rgmii"; -+ phy-handle = <&ext_rgmii_phy>; -+ status = "okay"; -+}; -+ -+&external_mdio { -+ ext_rgmii_phy: ethernet-phy@7 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <7>; -+ }; -+}; diff --git a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts b/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts deleted file mode 100644 index 135fddfd092..00000000000 --- a/sysutils/u-boot/patches/patch-arch_arm_dts_sun50i-h5-orangepi-zero-plus.dts +++ /dev/null @@ -1,107 +0,0 @@ ---- /dev/null 2018-06-23 13:10:16.352268111 -0700 -+++ arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts 2018-06-23 13:09:34.768075589 -0700 -@@ -0,0 +1,104 @@ -+/* -+ * Copyright (C) 2016 ARM Ltd. -+ * Copyright (C) 2018 Hauke Mehrtens <hauke@hauke-m.de> -+ * -+ * SPDX-License-Identifier: (GPL-2.0+ OR X11) -+ */ -+ -+/dts-v1/; -+#include "sun50i-h5.dtsi" -+ -+#include <dt-bindings/gpio/gpio.h> -+#include <dt-bindings/input/input.h> -+#include <dt-bindings/pinctrl/sun4i-a10.h> -+ -+/ { -+ model = "Xunlong Orange Pi Zero Plus"; -+ compatible = "xunlong,orangepi-zero-plus", "allwinner,sun50i-h5"; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ aliases { -+ ethernet0 = &emac; -+ ethernet1 = &rtl8189ftv; -+ serial0 = &uart0; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "orangepi:green:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ default-state = "on"; -+ }; -+ -+ status { -+ label = "orangepi:red:status"; -+ gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */ -+ }; -+ }; -+ -+ reg_gmac_3v3: gmac-3v3 { -+ compatible = "regulator-fixed"; -+ 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>; /* PD6 */ -+ }; -+}; -+ -+&emac { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emac_rgmii_pins>; -+ phy-supply = <®_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 = <1>; -+ }; -+}; -+ -+&mmc0 { -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ -+ status = "okay"; -+}; -+ -+&mmc1 { -+ vmmc-supply = <®_vcc3v3>; -+ bus-width = <4>; -+ non-removable; -+ status = "okay"; -+ -+ /* -+ * Explicitly define the sdio device, so that we can add an ethernet -+ * alias for it (which e.g. makes u-boot set a mac-address). -+ */ -+ rtl8189ftv: sdio_wifi@1 { -+ reg = <1>; -+ }; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pins_a>; -+ status = "okay"; -+}; diff --git a/sysutils/u-boot/u-boot-version.mk b/sysutils/u-boot/u-boot-version.mk index c954c91bb1e..b53947ab7ec 100644 --- a/sysutils/u-boot/u-boot-version.mk +++ b/sysutils/u-boot/u-boot-version.mk @@ -1,3 +1,3 @@ -# $NetBSD: u-boot-version.mk,v 1.2 2018/05/25 10:45:22 jmcneill Exp $ +# $NetBSD: u-boot-version.mk,v 1.3 2018/12/14 00:52:26 jmcneill Exp $ -UBOOT_VERSION?= 2018.05 +UBOOT_VERSION?= 2018.11 |