On Mon, Jul 30, 2018 at 03:43:38PM +0200, Mark Kettenis wrote:
> > Date: Mon, 30 Jul 2018 15:16:13 +0200
> > From: Robert <info...@die-optimisten.net>
> >
> > On Mon, 30 Jul 2018 22:07:12 +1000
> > Jonathan Gray <j...@jsg.id.au> wrote:
> > > The miniroot includes a u-boot image/dtb for the pine64+,
> > > you'll need to dd a different image over it.
> > >
> > > If you install the u-boot-aarch64 package it can be found at
> > >
> > > /usr/local/share/u-boot/nanopi_a64/u-boot-sunxi-with-spl.bin
> > >
> > > dd if=u-boot-sunxi-with-spl.bin of=/dev/sdXc bs=1024 seek=8
> >
> > Done, see log below. Now no network is found (same as when I compile
> > the firmware and uboot directly from the latest GIT.
> > I'm afraid I might have to look into the firmware/u-boot; so I wanted
> > to check first if anyone here ever had this working...?
>
> See my other mail.
>
> Below is the diff (against a fairly recent Linux mainline tree) that I
> used to get mine working. If you manage to build the .dtb file with
> this diff, install it on the EFI (msdos) partition in a subdirectory
> named "allwinner". Or wait until we've patched the ports.
>
> Cheers,
>
> Mark
Here's an update to the dtb port for it, though I may wait for the
final 4.18 release before committing it.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/dtb/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 4 Jun 2018 03:14:22 -0000 1.15
+++ Makefile 30 Jul 2018 14:29:21 -0000
@@ -3,7 +3,7 @@
ONLY_FOR_ARCHS= ${GCC4_ARCHS} ${CLANG_ARCHS}
COMMENT= Device Tree Blobs
-VERSION= 4.17
+VERSION= 4.18-rc7
DISTNAME= linux-${VERSION}
PKGNAME= dtb-${VERSION:S/-//}
CATEGORIES= sysutils
@@ -13,9 +13,9 @@ MAINTAINER= Jonathan Gray <jsg@openbsd.o
# dual GPL/BSD
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/v4.x/
-EXTRACT_SUFX= .tar.xz
-#MASTER_SITES= https://git.kernel.org/torvalds/t/
+#MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/v4.x/
+#EXTRACT_SUFX= .tar.xz
+MASTER_SITES= https://git.kernel.org/torvalds/t/
PKG_ARCH= *
MODULES= lang/clang
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/dtb/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 4 Jun 2018 03:14:22 -0000 1.14
+++ distinfo 30 Jul 2018 14:06:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (linux-4.17.tar.xz) = n6od2Jbq6pYdxuiGaXwLMwEncQLlvJdrJ1j5pi08zRM=
-SIZE (linux-4.17.tar.xz) = 102165892
+SHA256 (linux-4.18-rc7.tar.gz) = OJMCO5NPDYMZFbasI2aIhg+ccVRFheGBUXNy1fOZswA=
+SIZE (linux-4.18-rc7.tar.gz) = 158977566
Index: patches/patch-arch_arm64_boot_dts_allwinner_sun50i-a64-nanopi-a64_dts
===================================================================
RCS file: patches/patch-arch_arm64_boot_dts_allwinner_sun50i-a64-nanopi-a64_dts
diff -N patches/patch-arch_arm64_boot_dts_allwinner_sun50i-a64-nanopi-a64_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-arch_arm64_boot_dts_allwinner_sun50i-a64-nanopi-a64_dts
30 Jul 2018 14:29:06 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+
+Enable Ethernet on NanoPi A64.
+
+Index: arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
+--- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts.orig
++++ arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts
+@@ -51,6 +51,7 @@
+ compatible = "friendlyarm,nanopi-a64", "allwinner,sun50i-a64";
+
+ aliases {
++ ethernet0 = &emac;
+ serial0 = &uart0;
+ };
+
+@@ -67,6 +68,14 @@
+ status = "okay";
+ };
+
++&emac {
++ pinctrl-names = "default";
++ pinctrl-0 = <&rgmii_pins>;
++ phy-mode = "rgmii";
++ phy-handle = <&ext_rgmii_phy>;
++ status = "okay";
++};
++
+ /* i2c1 connected with gpio headers like pine64, bananapi */
+ &i2c1 {
+ pinctrl-names = "default";
+@@ -76,6 +85,13 @@
+
+ &i2c1_pins {
+ bias-pull-up;
++};
++
++&mdio {
++ ext_rgmii_phy: ethernet-phy@1 {
++ compatible = "ethernet-phy-ieee802.3-c22";
++ reg = <7>;
++ };
+ };
+
+ &mmc0 {
Index: patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
===================================================================
RCS file:
/cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts,v
retrieving revision 1.1
diff -u -p -r1.1 patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
--- patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts 17 Jul 2016 15:09:39
-0000 1.1
+++ patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts 30 Jul 2018 14:27:53
-0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-arch_arm_boot_dts_imx6q-cm-fx6_dts,v 1.1 2016/07/17 15:09:39
jsg Exp $
---- arch/arm/boot/dts/imx6q-cm-fx6.dts.orig Sun Jul 17 00:15:03 2016
-+++ arch/arm/boot/dts/imx6q-cm-fx6.dts Sun Jul 17 00:15:38 2016
-@@ -22,6 +22,10 @@
+Index: arch/arm/boot/dts/imx6q-cm-fx6.dts
+--- arch/arm/boot/dts/imx6q-cm-fx6.dts.orig
++++ arch/arm/boot/dts/imx6q-cm-fx6.dts
+@@ -54,6 +54,10 @@
reg = <0x10000000 0x80000000>;
};
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/dtb/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 4 Jun 2018 03:14:22 -0000 1.12
+++ pkg/PLIST 30 Jul 2018 14:33:37 -0000
@@ -25,6 +25,7 @@ share/dtb/arm/am335x-nano.dtb
share/dtb/arm/am335x-pdu001.dtb
share/dtb/arm/am335x-pepper.dtb
share/dtb/arm/am335x-phycore-rdk.dtb
+share/dtb/arm/am335x-pocketbeagle.dtb
share/dtb/arm/am335x-sbc-t335.dtb
share/dtb/arm/am335x-shc.dtb
share/dtb/arm/am335x-sl50.dtb
@@ -101,10 +102,13 @@ share/dtb/arm/armada-xp-synology-ds414.d
share/dtb/arm/artpec6-devboard.dtb
share/dtb/arm/aspeed-ast2500-evb.dtb
share/dtb/arm/aspeed-bmc-arm-centriq2400-rep.dtb
+share/dtb/arm/aspeed-bmc-intel-s2600wf.dtb
+share/dtb/arm/aspeed-bmc-opp-lanyang.dtb
share/dtb/arm/aspeed-bmc-opp-palmetto.dtb
share/dtb/arm/aspeed-bmc-opp-romulus.dtb
share/dtb/arm/aspeed-bmc-opp-witherspoon.dtb
share/dtb/arm/aspeed-bmc-opp-zaius.dtb
+share/dtb/arm/aspeed-bmc-portwell-neptune.dtb
share/dtb/arm/aspeed-bmc-quanta-q71l.dtb
share/dtb/arm/at91-ariag25.dtb
share/dtb/arm/at91-ariettag25.dtb
@@ -153,6 +157,7 @@ share/dtb/arm/bcm2835-rpi-b.dtb
share/dtb/arm/bcm2835-rpi-zero-w.dtb
share/dtb/arm/bcm2835-rpi-zero.dtb
share/dtb/arm/bcm2836-rpi-2-b.dtb
+share/dtb/arm/bcm2837-rpi-3-b-plus.dtb
share/dtb/arm/bcm2837-rpi-3-b.dtb
share/dtb/arm/bcm4708-asus-rt-ac56u.dtb
share/dtb/arm/bcm4708-asus-rt-ac68u.dtb
@@ -178,8 +183,10 @@ share/dtb/arm/bcm4709-tplink-archer-c9-v
share/dtb/arm/bcm47094-dlink-dir-885l.dtb
share/dtb/arm/bcm47094-linksys-panamera.dtb
share/dtb/arm/bcm47094-luxul-abr-4500.dtb
+share/dtb/arm/bcm47094-luxul-xap-1610.dtb
share/dtb/arm/bcm47094-luxul-xbr-4500.dtb
share/dtb/arm/bcm47094-luxul-xwr-3100.dtb
+share/dtb/arm/bcm47094-luxul-xwr-3150-v1.dtb
share/dtb/arm/bcm47094-netgear-r8500.dtb
share/dtb/arm/bcm47189-luxul-xap-1440.dtb
share/dtb/arm/bcm47189-luxul-xap-810.dtb
@@ -207,6 +214,7 @@ share/dtb/arm/bcm963138dvt.dtb
share/dtb/arm/bcm988312hr.dtb
share/dtb/arm/berlin2-sony-nsz-gs7.dtb
share/dtb/arm/berlin2cd-google-chromecast.dtb
+share/dtb/arm/berlin2cd-valve-steamlink.dtb
share/dtb/arm/berlin2q-marvell-dmp.dtb
share/dtb/arm/cx92755_equinox.dtb
share/dtb/arm/da850-enbw-cmc.dtb
@@ -267,8 +275,6 @@ share/dtb/arm/exynos5422-odroidhc1.dtb
share/dtb/arm/exynos5422-odroidxu3-lite.dtb
share/dtb/arm/exynos5422-odroidxu3.dtb
share/dtb/arm/exynos5422-odroidxu4.dtb
-share/dtb/arm/exynos5440-sd5v1.dtb
-share/dtb/arm/exynos5440-ssdk5440.dtb
share/dtb/arm/exynos5800-peach-pi.dtb
share/dtb/arm/gemini-dlink-dir-685.dtb
share/dtb/arm/gemini-dlink-dns-313.dtb
@@ -376,6 +382,7 @@ share/dtb/arm/imx6dl-hummingboard2-som-v
share/dtb/arm/imx6dl-hummingboard2.dtb
share/dtb/arm/imx6dl-icore-rqs.dtb
share/dtb/arm/imx6dl-icore.dtb
+share/dtb/arm/imx6dl-mamoj.dtb
share/dtb/arm/imx6dl-nit6xlite.dtb
share/dtb/arm/imx6dl-nitrogen6x.dtb
share/dtb/arm/imx6dl-phytec-mira-rdk-nand.dtb
@@ -416,6 +423,7 @@ share/dtb/arm/imx6q-cubox-i-emmc-som-v15
share/dtb/arm/imx6q-cubox-i-som-v15.dtb
share/dtb/arm/imx6q-cubox-i.dtb
share/dtb/arm/imx6q-dfi-fs700-m60.dtb
+share/dtb/arm/imx6q-dhcom-pdk2.dtb
share/dtb/arm/imx6q-display5-tianma-tm070-1280x768.dtb
share/dtb/arm/imx6q-dmo-edmqmx6.dtb
share/dtb/arm/imx6q-dms-ba16.dtb
@@ -439,10 +447,12 @@ share/dtb/arm/imx6q-hummingboard.dtb
share/dtb/arm/imx6q-hummingboard2-emmc-som-v15.dtb
share/dtb/arm/imx6q-hummingboard2-som-v15.dtb
share/dtb/arm/imx6q-hummingboard2.dtb
+share/dtb/arm/imx6q-icore-mipi.dtb
share/dtb/arm/imx6q-icore-ofcap10.dtb
share/dtb/arm/imx6q-icore-ofcap12.dtb
share/dtb/arm/imx6q-icore-rqs.dtb
share/dtb/arm/imx6q-icore.dtb
+share/dtb/arm/imx6q-kp-tpc.dtb
share/dtb/arm/imx6q-marsboard.dtb
share/dtb/arm/imx6q-mccmon6.dtb
share/dtb/arm/imx6q-nitrogen6_max.dtb
@@ -623,6 +633,7 @@ share/dtb/arm/meson6-atv1200.dtb
share/dtb/arm/meson8-minix-neo-x8.dtb
share/dtb/arm/meson8b-mxq.dtb
share/dtb/arm/meson8b-odroidc1.dtb
+share/dtb/arm/meson8m2-mxiii-plus.dtb
share/dtb/arm/mmp2-brownstone.dtb
share/dtb/arm/moxart-uc7112lx.dtb
share/dtb/arm/mpa1600.dtb
@@ -632,7 +643,10 @@ share/dtb/arm/mt2701-evb.dtb
share/dtb/arm/mt6580-evbp1.dtb
share/dtb/arm/mt6589-aquaris5.dtb
share/dtb/arm/mt6592-evb.dtb
+share/dtb/arm/mt7623a-rfb-emmc.dtb
+share/dtb/arm/mt7623a-rfb-nand.dtb
share/dtb/arm/mt7623n-bananapi-bpi-r2.dtb
+share/dtb/arm/mt7623n-rfb-emmc.dtb
share/dtb/arm/mt7623n-rfb-nand.dtb
share/dtb/arm/mt8127-moose.dtb
share/dtb/arm/mt8135-evbp1.dtb
@@ -740,6 +754,10 @@ share/dtb/arm/qcom-apq8074-dragonboard.d
share/dtb/arm/qcom-apq8084-ifc6540.dtb
share/dtb/arm/qcom-apq8084-mtp.dtb
share/dtb/arm/qcom-ipq4019-ap.dk01.1-c1.dtb
+share/dtb/arm/qcom-ipq4019-ap.dk04.1-c1.dtb
+share/dtb/arm/qcom-ipq4019-ap.dk04.1-c3.dtb
+share/dtb/arm/qcom-ipq4019-ap.dk07.1-c1.dtb
+share/dtb/arm/qcom-ipq4019-ap.dk07.1-c2.dtb
share/dtb/arm/qcom-ipq8064-ap148.dtb
share/dtb/arm/qcom-mdm9615-wp8548-mangoh-green.dtb
share/dtb/arm/qcom-msm8660-surf.dtb
@@ -747,6 +765,7 @@ share/dtb/arm/qcom-msm8960-cdp.dtb
share/dtb/arm/qcom-msm8974-fairphone-fp2.dtb
share/dtb/arm/qcom-msm8974-lge-nexus5-hammerhead.dtb
share/dtb/arm/qcom-msm8974-samsung-klte.dtb
+share/dtb/arm/qcom-msm8974-sony-xperia-amami.dtb
share/dtb/arm/qcom-msm8974-sony-xperia-castor.dtb
share/dtb/arm/qcom-msm8974-sony-xperia-honami.dtb
share/dtb/arm/r7s72100-genmai.dtb
@@ -760,6 +779,7 @@ share/dtb/arm/r8a7743-sk-rzg1m.dtb
share/dtb/arm/r8a7745-iwg22d-sodimm-dbhd-ca.dtb
share/dtb/arm/r8a7745-iwg22d-sodimm.dtb
share/dtb/arm/r8a7745-sk-rzg1e.dtb
+share/dtb/arm/r8a77470-iwg23s-sbc.dtb
share/dtb/arm/r8a7778-bockw.dtb
share/dtb/arm/r8a7779-marzen.dtb
share/dtb/arm/r8a7790-lager.dtb
@@ -836,8 +856,6 @@ share/dtb/arm/spear310-evb.dtb
share/dtb/arm/spear320-evb.dtb
share/dtb/arm/spear320-hmi.dtb
share/dtb/arm/spear600-evb.dtb
-share/dtb/arm/ste-ccu8540.dtb
-share/dtb/arm/ste-ccu9540.dtb
share/dtb/arm/ste-hrefprev60-stuib.dtb
share/dtb/arm/ste-hrefprev60-tvk.dtb
share/dtb/arm/ste-hrefv60plus-stuib.dtb
@@ -925,6 +943,7 @@ share/dtb/arm/sun7i-a20-itead-ibox.dtb
share/dtb/arm/sun7i-a20-lamobo-r1.dtb
share/dtb/arm/sun7i-a20-m3.dtb
share/dtb/arm/sun7i-a20-mk808c.dtb
+share/dtb/arm/sun7i-a20-olimex-som-evb-emmc.dtb
share/dtb/arm/sun7i-a20-olimex-som-evb.dtb
share/dtb/arm/sun7i-a20-olimex-som204-evb-emmc.dtb
share/dtb/arm/sun7i-a20-olimex-som204-evb.dtb
@@ -959,6 +978,7 @@ share/dtb/arm/sun8i-a83t-bananapi-m3.dtb
share/dtb/arm/sun8i-a83t-cubietruck-plus.dtb
share/dtb/arm/sun8i-a83t-tbs-a711.dtb
share/dtb/arm/sun8i-h2-plus-bananapi-m2-zero.dtb
+share/dtb/arm/sun8i-h2-plus-libretech-all-h3-cc.dtb
share/dtb/arm/sun8i-h2-plus-orangepi-r1.dtb
share/dtb/arm/sun8i-h2-plus-orangepi-zero.dtb
share/dtb/arm/sun8i-h3-bananapi-m2-plus.dtb
@@ -976,6 +996,8 @@ share/dtb/arm/sun8i-h3-orangepi-pc.dtb
share/dtb/arm/sun8i-h3-orangepi-plus.dtb
share/dtb/arm/sun8i-h3-orangepi-plus2e.dtb
share/dtb/arm/sun8i-r16-bananapi-m2m.dtb
+share/dtb/arm/sun8i-r16-nintendo-nes-classic.dtb
+share/dtb/arm/sun8i-r16-nintendo-super-nes-classic.dtb
share/dtb/arm/sun8i-r16-parrot.dtb
share/dtb/arm/sun8i-r40-bananapi-m2-ultra.dtb
share/dtb/arm/sun8i-v3s-licheepi-zero-dock.dtb
@@ -1071,6 +1093,7 @@ share/dtb/arm64/allwinner/sun50i-a64-pin
share/dtb/arm64/allwinner/sun50i-a64-pine64.dtb
share/dtb/arm64/allwinner/sun50i-a64-sopine-baseboard.dtb
share/dtb/arm64/allwinner/sun50i-a64-teres-i.dtb
+share/dtb/arm64/allwinner/sun50i-h5-libretech-all-h3-cc.dtb
share/dtb/arm64/allwinner/sun50i-h5-nanopi-neo-plus2.dtb
share/dtb/arm64/allwinner/sun50i-h5-nanopi-neo2.dtb
share/dtb/arm64/allwinner/sun50i-h5-orangepi-pc2.dtb
@@ -1124,6 +1147,7 @@ share/dtb/arm64/arm/juno.dtb
share/dtb/arm64/arm/rtsm_ve-aemv8a.dtb
share/dtb/arm64/arm/vexpress-v2f-1xv7-ca53x2.dtb
share/dtb/arm64/broadcom/
+share/dtb/arm64/broadcom/bcm2837-rpi-3-b-plus.dtb
share/dtb/arm64/broadcom/bcm2837-rpi-3-b.dtb
share/dtb/arm64/broadcom/northstar2/
share/dtb/arm64/broadcom/northstar2/ns2-svk.dtb
@@ -1170,8 +1194,6 @@ share/dtb/arm64/marvell/armada-7040-db.d
share/dtb/arm64/marvell/armada-8040-db.dtb
share/dtb/arm64/marvell/armada-8040-mcbin.dtb
share/dtb/arm64/marvell/armada-8080-db.dtb
-share/dtb/arm64/marvell/berlin4ct-dmp.dtb
-share/dtb/arm64/marvell/berlin4ct-stb.dtb
share/dtb/arm64/mediatek/
share/dtb/arm64/mediatek/mt2712-evb.dtb
share/dtb/arm64/mediatek/mt6755-evb.dtb
@@ -1195,6 +1217,7 @@ share/dtb/arm64/qcom/msm8916-mtp.dtb
share/dtb/arm64/qcom/msm8992-bullhead-rev-101.dtb
share/dtb/arm64/qcom/msm8994-angler-rev-101.dtb
share/dtb/arm64/qcom/msm8996-mtp.dtb
+share/dtb/arm64/qcom/sdm845-mtp.dtb
share/dtb/arm64/realtek/
share/dtb/arm64/realtek/rtd1295-mele-v9.dtb
share/dtb/arm64/realtek/rtd1295-probox2-ava.dtb
@@ -1216,6 +1239,8 @@ share/dtb/arm64/renesas/r8a77965-salvato
share/dtb/arm64/renesas/r8a77970-eagle.dtb
share/dtb/arm64/renesas/r8a77970-v3msk.dtb
share/dtb/arm64/renesas/r8a77980-condor.dtb
+share/dtb/arm64/renesas/r8a77980-v3hsk.dtb
+share/dtb/arm64/renesas/r8a77990-ebisu.dtb
share/dtb/arm64/renesas/r8a77995-draak.dtb
share/dtb/arm64/rockchip/
share/dtb/arm64/rockchip/rk3328-evb.dtb
@@ -1242,6 +1267,9 @@ share/dtb/arm64/socionext/uniphier-pxs3-
share/dtb/arm64/sprd/
share/dtb/arm64/sprd/sc9836-openphone.dtb
share/dtb/arm64/sprd/sp9860g-1h10.dtb
+share/dtb/arm64/synaptics/
+share/dtb/arm64/synaptics/berlin4ct-dmp.dtb
+share/dtb/arm64/synaptics/berlin4ct-stb.dtb
share/dtb/arm64/xilinx/
share/dtb/arm64/xilinx/zynqmp-ep108.dtb
share/dtb/arm64/xilinx/zynqmp-zc1232-revA.dtb
@@ -1338,7 +1366,6 @@ share/dtb/powerpc/arches.dtb
share/dtb/powerpc/asp834x-redboot.dtb
share/dtb/powerpc/bamboo.dtb
share/dtb/powerpc/bluestone.dtb
-share/dtb/powerpc/c2k.dtb
share/dtb/powerpc/canyonlands.dtb
share/dtb/powerpc/charon.dtb
share/dtb/powerpc/cm5200.dtb
@@ -1499,7 +1526,6 @@ share/dtb/powerpc/ps3.dtb
share/dtb/powerpc/rainier.dtb
share/dtb/powerpc/redwood.dtb
share/dtb/powerpc/sam440ep.dtb
-share/dtb/powerpc/sbc8349.dtb
share/dtb/powerpc/sbc8548-altflash.dtb
share/dtb/powerpc/sbc8548.dtb
share/dtb/powerpc/sequoia.dtb
