Newer lime2 boards (which now use a micrel etherner PHY) needs

CONFIG_GMAC_TX_DELAY=4
This doens't seem to hurt on older boards.
Bump PKGREVSIONs

5 files changed, 39 insertions, 3 deletions

diff --git a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
index 03c180f86e0..facc226cc76 100644
--- a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/12 05:08:38 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/18 19:18:33 bouyer Exp $
 
 UBOOT_TARGET=		a20-olinuxino-lime2-emmc
 UBOOT_CONFIG=		A20-OLinuXino-Lime2-eMMC_defconfig
@@ -6,4 +6,6 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
 UBOOT_INSTALLBOOT_PLIST=installboot.plist
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot-a20-olinuxino-lime2/Makefile b/sysutils/u-boot-a20-olinuxino-lime2/Makefile
index 491470b112d..b0b979a6d8e 100644
--- a/sysutils/u-boot-a20-olinuxino-lime2/Makefile
+++ b/sysutils/u-boot-a20-olinuxino-lime2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/07/12 05:08:38 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/18 19:18:33 bouyer Exp $
 
 UBOOT_TARGET=		a20-olinuxino-lime2
 UBOOT_CONFIG=		A20-OLinuXino-Lime2_defconfig
@@ -6,4 +6,6 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 
 UBOOT_INSTALLBOOT_PLIST=installboot.plist
 
+PKGREVISION=		1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
index 7fd1dacf59d..79a7d9dfe1d 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2019/06/05 05:43:15 thorpej Exp $
+$NetBSD: distinfo,v 1.24 2019/07/18 19:18:33 bouyer Exp $
 
 SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
 RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
@@ -9,6 +9,8 @@ SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01a
 SHA1 (patch-arch_arm_dts_Makefile) = 184fdb8b04b25c0c827823779874306ce1bc746d
 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-configs_A20-OLinuXino-Lime2-eMMC_defconfig) = 38cbe5607bed15ed63ec48be51bc075ec5efde87
+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
diff --git a/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig b/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig
new file mode 100644
index 00000000000..d17be153b12
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig
@@ -0,0 +1,15 @@
+$NetBSD: patch-configs_A20-OLinuXino-Lime2-eMMC_defconfig,v 1.1 2019/07/18 19:18:33 bouyer Exp $
+
+CONFIG_GMAC_TX_DELAY=4 required for lime2 boards with a Micrel PHY,
+doesn't hurt for older ones (with the realtek PHY)
+
+--- configs/A20-OLinuXino-Lime2-eMMC_defconfig.orig	2019-07-17 18:57:03.912432611 +0200
++++ configs/A20-OLinuXino-Lime2-eMMC_defconfig	2019-07-17 18:59:35.091714198 +0200
+@@ -9,6 +9,7 @@
+ CONFIG_I2C1_ENABLE=y
+ CONFIG_SATAPWR="PC3"
+ CONFIG_AHCI=y
++CONFIG_GMAC_TX_DELAY=4
+ CONFIG_NR_DRAM_BANKS=1
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+ CONFIG_SPL_I2C_SUPPORT=y
diff --git a/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2_defconfig b/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2_defconfig
new file mode 100644
index 00000000000..3778b8af9e1
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-configs_A20-OLinuXino-Lime2_defconfig
@@ -0,0 +1,15 @@
+$NetBSD: patch-configs_A20-OLinuXino-Lime2_defconfig,v 1.1 2019/07/18 19:18:33 bouyer Exp $
+
+CONFIG_GMAC_TX_DELAY=4 required for lime2 boards with a Micrel PHY,
+doesn't hurt for older ones (with the realtek PHY)
+
+--- configs/A20-OLinuXino-Lime2_defconfig.orig	2019-07-17 18:57:03.912432611 +0200
++++ configs/A20-OLinuXino-Lime2_defconfig	2019-07-17 18:59:35.091714198 +0200
+@@ -9,6 +9,7 @@
+ CONFIG_I2C1_ENABLE=y
+ CONFIG_SATAPWR="PC3"
+ CONFIG_AHCI=y
++CONFIG_GMAC_TX_DELAY=4
+ CONFIG_NR_DRAM_BANKS=1
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+ CONFIG_SPL_I2C_SUPPORT=y