update to U-Boot 2017.09-rc3

includes patches to fix Allwinner A20/sun7i Ethernet from https://lists.denx.de/pipermail/u-boot/2017-July/299703.html https://patchwork.ozlabs.org/patch/793903/ via kettenis@
2017-08-29 07:14:50 +00:00 · 2017-08-29 07:14:50 +00:00 · 0ae0fb4598
commit 0ae0fb4598
parent 333b8e6f43
13 changed files with 83 additions and 48 deletions
--- a/sysutils/u-boot/Makefile
+++ b/sysutils/u-boot/Makefile
@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2017/08/24 08:53:02 patrick Exp $
+#	$OpenBSD: Makefile,v 1.26 2017/08/29 07:14:50 jsg Exp $

 BROKEN-sparc64=	Error: the specified option is not accepted in ISB at operand 1 -- isb sy

@ -6,8 +6,7 @@ FLAVORS=	aarch64 arm
 FLAVOR?=	arm

 COMMENT=	U-Boot firmware
-VERSION=	2017.09-rc2
-REVISION=	1
+VERSION=	2017.09-rc3
 DISTNAME=	u-boot-${VERSION}
 PKGNAME=	u-boot-${FLAVOR}-${VERSION:S/-//}
 FULLPKGNAME=	${PKGNAME}
@ -50,7 +49,9 @@ NO_TEST=	Yes

 .if "${FLAVOR}" == "aarch64"
 SUNXI64=\
+	a64-olinuxino \
 	bananapi_m64 \
+	nanopi_a64 \
 	nanopi_neo2 \
 	orangepi_pc2 \
 	orangepi_prime \
@ -73,6 +74,7 @@ SUNXI=\
 	A10s-OLinuXino-M \
 	A20-OLinuXino-Lime \
 	A20-OLinuXino-Lime2 \
+	A20-OLinuXino-Lime2-eMMC \
 	A20-OLinuXino_MICRO \
 	Bananapi \
 	Bananapro \
@ -135,7 +137,6 @@ FILES=\
 	spl/sunxi-spl.bin

 pre-build:
-	${SUBST_CMD} ${WRKBUILD}/tools/Makefile
 .for f in ${MODPY_ADJ_FILES}
 	${MODPY_BIN_ADJ} ${WRKSRC}/${f}
 .endfor
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@ -1,2 +1,2 @@
-SHA256 (u-boot-2017.09-rc2.tar.bz2) = 0FxqIZyS7lY5PacaQ6H5KEQ4UbmavJjMKfVy/8kOs34=
-SIZE (u-boot-2017.09-rc2.tar.bz2) = 11424880
+SHA256 (u-boot-2017.09-rc3.tar.bz2) = tSadijIF3AifY4bWsjpbuVtET1Raq17/2FL11CkxOU0=
+SIZE (u-boot-2017.09-rc3.tar.bz2) = 11437747
--- a/sysutils/u-boot/patches/patch-Makefile
+++ b/sysutils/u-boot/patches/patch-Makefile
@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2017/08/19 04:40:40 jsg Exp $
-
-Index: Makefile
--- Makefile.orig
-+++ Makefile
-@@ -1378,7 +1378,7 @@ $(timestamp_h): $(srctree)/Makefile FORCE
- 	$(call filechk,timestamp.h)
- 
- checkbinman: tools
-	@if ! ( echo 'import libfdt' | ( PYTHONPATH=tools python )); then \
-+	@if ! ( echo 'import libfdt' | ( PYTHONPATH=tools ${MODPY_BIN} )); then \
- 		echo >&2; \
- 		echo >&2 '*** binman needs the Python libfdt library.'; \
- 		echo >&2 '*** Either install it on your system, or try:'; \
--- a/sysutils/u-boot/patches/patch-arch_arm_include_asm_arch-sunxi_sys_proto_h
+++ b/sysutils/u-boot/patches/patch-arch_arm_include_asm_arch-sunxi_sys_proto_h
@ -0,0 +1,14 @@
+$OpenBSD: patch-arch_arm_include_asm_arch-sunxi_sys_proto_h,v 1.1 2017/08/29 07:14:50 jsg Exp $
+
+Index: arch/arm/include/asm/arch-sunxi/sys_proto.h
+--- arch/arm/include/asm/arch-sunxi/sys_proto.h.orig
+++ arch/arm/include/asm/arch-sunxi/sys_proto.h
+@@ -24,7 +24,7 @@ void sdelay(unsigned long);
+ void return_to_fel(uint32_t lr, uint32_t sp);
+ 
+ /* Board / SoC level designware gmac init */
+-#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUNXI_GMAC
+#if !defined CONFIG_SPL_BUILD && defined CONFIG_SUN7I_GMAC
+ void eth_init_board(void);
+ #else
+ static inline void eth_init_board(void) {}
--- a/sysutils/u-boot/patches/patch-board_sunxi_Makefile
+++ b/sysutils/u-boot/patches/patch-board_sunxi_Makefile
@ -0,0 +1,14 @@
+$OpenBSD: patch-board_sunxi_Makefile,v 1.1 2017/08/29 07:14:50 jsg Exp $
+
+Index: board/sunxi/Makefile
+--- board/sunxi/Makefile.orig
+++ board/sunxi/Makefile
+@@ -9,7 +9,7 @@
+ # SPDX-License-Identifier:	GPL-2.0+
+ #
+ obj-y	+= board.o
+-obj-$(CONFIG_SUNXI_GMAC)	+= gmac.o
+obj-$(CONFIG_SUN7I_GMAC)	+= gmac.o
+ ifndef CONFIG_SPL_BUILD
+ obj-$(CONFIG_SUNXI_AHCI)	+= ahci.o
+ endif
--- a/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
+++ b/sysutils/u-boot/patches/patch-configs_rpi_2_defconfig
@ -1,15 +1,15 @@
-$OpenBSD: patch-configs_rpi_2_defconfig,v 1.2 2017/08/19 04:40:40 jsg Exp $
+$OpenBSD: patch-configs_rpi_2_defconfig,v 1.3 2017/08/29 07:14:50 jsg Exp $

 revert 25877d4e4c45451c5398aec3de50e0d5befe0e9f

 Index: configs/rpi_2_defconfig
 --- configs/rpi_2_defconfig.orig
 +++ configs/rpi_2_defconfig
-@@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
+@@ -11,6 +11,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 +CONFIG_OF_EMBED=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
- CONFIG_DM_MMC=y
+ CONFIG_ENV_FAT_INTERFACE="mmc"
--- a/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
+++ b/sysutils/u-boot/patches/patch-configs_rpi_3_32b_defconfig
@ -1,15 +1,15 @@
-$OpenBSD: patch-configs_rpi_3_32b_defconfig,v 1.2 2017/08/19 04:40:40 jsg Exp $
+$OpenBSD: patch-configs_rpi_3_32b_defconfig,v 1.3 2017/08/29 07:14:50 jsg Exp $

 revert 25877d4e4c45451c5398aec3de50e0d5befe0e9f

 Index: configs/rpi_3_32b_defconfig
 --- configs/rpi_3_32b_defconfig.orig
 +++ configs/rpi_3_32b_defconfig
-@@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
+@@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 +CONFIG_OF_EMBED=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
- CONFIG_DM_MMC=y
+ CONFIG_ENV_FAT_INTERFACE="mmc"
--- a/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
+++ b/sysutils/u-boot/patches/patch-configs_rpi_3_defconfig
@ -1,15 +1,15 @@
-$OpenBSD: patch-configs_rpi_3_defconfig,v 1.2 2017/08/19 04:40:40 jsg Exp $
+$OpenBSD: patch-configs_rpi_3_defconfig,v 1.3 2017/08/29 07:14:50 jsg Exp $

 revert 25877d4e4c45451c5398aec3de50e0d5befe0e9f

 Index: configs/rpi_3_defconfig
 --- configs/rpi_3_defconfig.orig
 +++ configs/rpi_3_defconfig
-@@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
+@@ -12,6 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 +CONFIG_OF_EMBED=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
- CONFIG_DM_MMC=y
+ CONFIG_ENV_FAT_INTERFACE="mmc"
--- a/sysutils/u-boot/patches/patch-configs_rpi_defconfig
+++ b/sysutils/u-boot/patches/patch-configs_rpi_defconfig
@ -1,15 +1,15 @@
-$OpenBSD: patch-configs_rpi_defconfig,v 1.2 2017/08/19 04:40:40 jsg Exp $
+$OpenBSD: patch-configs_rpi_defconfig,v 1.3 2017/08/29 07:14:50 jsg Exp $

 revert 25877d4e4c45451c5398aec3de50e0d5befe0e9f

 Index: configs/rpi_defconfig
 --- configs/rpi_defconfig.orig
 +++ configs/rpi_defconfig
-@@ -13,6 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
+@@ -11,6 +11,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 +CONFIG_OF_EMBED=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
- CONFIG_DM_MMC=y
+ CONFIG_ENV_FAT_INTERFACE="mmc"
--- a/sysutils/u-boot/patches/patch-include_configs_sunxi-common_h
+++ b/sysutils/u-boot/patches/patch-include_configs_sunxi-common_h
@ -0,0 +1,14 @@
+$OpenBSD: patch-include_configs_sunxi-common_h,v 1.1 2017/08/29 07:14:50 jsg Exp $
+
+Index: include/configs/sunxi-common.h
+--- include/configs/sunxi-common.h.orig
+++ include/configs/sunxi-common.h
+@@ -294,7 +294,7 @@ extern int soft_i2c_gpio_scl;
+ #define CONFIG_MII			/* MII PHY management		*/
+ #endif
+ 
+-#ifdef CONFIG_SUNXI_GMAC
+#ifdef CONFIG_SUN7I_GMAC
+ #define CONFIG_PHY_ADDR		1
+ #define CONFIG_MII			/* MII PHY management		*/
+ #define CONFIG_PHY_REALTEK
--- a/sysutils/u-boot/patches/patch-scripts_Makefile_spl
+++ b/sysutils/u-boot/patches/patch-scripts_Makefile_spl
@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_Makefile_spl,v 1.2 2017/08/19 04:40:40 jsg Exp $
-
-Index: scripts/Makefile.spl
--- scripts/Makefile.spl.orig
-+++ scripts/Makefile.spl
-@@ -369,7 +369,7 @@ ifneq ($(cmd_files),)
- endif
- 
- checkdtoc: tools
-	@if ! ( echo 'import libfdt' | ( PYTHONPATH=tools python )); then \
-+	@if ! ( echo 'import libfdt' | ( PYTHONPATH=tools ${MODPY_BIN} )); then \
- 		echo '*** dtoc needs the Python libfdt library. Either '; \
- 		echo '*** install it on your system, or try:'; \
- 		echo '***'; \
--- a/sysutils/u-boot/pkg/PFRAG.aarch64
+++ b/sysutils/u-boot/pkg/PFRAG.aarch64
@ -1,5 +1,12 @@
-@comment $OpenBSD: PFRAG.aarch64,v 1.5 2017/08/24 08:53:02 patrick Exp $
+@comment $OpenBSD: PFRAG.aarch64,v 1.6 2017/08/29 07:14:50 jsg Exp $
 share/u-boot/
+share/u-boot/a64-olinuxino/
+share/u-boot/a64-olinuxino/sunxi-spl.bin
+share/u-boot/a64-olinuxino/u-boot
+share/u-boot/a64-olinuxino/u-boot-sunxi-with-spl.bin
+share/u-boot/a64-olinuxino/u-boot.bin
+share/u-boot/a64-olinuxino/u-boot.img
+share/u-boot/a64-olinuxino/u-boot.itb
 share/u-boot/bananapi_m64/
 share/u-boot/bananapi_m64/sunxi-spl.bin
 share/u-boot/bananapi_m64/u-boot
@ -13,6 +20,13 @@ share/u-boot/mvebu_espressobin-88f3720/u-boot.bin
 share/u-boot/mvebu_mcbin-88f8040/
 share/u-boot/mvebu_mcbin-88f8040/u-boot
 share/u-boot/mvebu_mcbin-88f8040/u-boot.bin
+share/u-boot/nanopi_a64/
+share/u-boot/nanopi_a64/sunxi-spl.bin
+share/u-boot/nanopi_a64/u-boot
+share/u-boot/nanopi_a64/u-boot-sunxi-with-spl.bin
+share/u-boot/nanopi_a64/u-boot.bin
+share/u-boot/nanopi_a64/u-boot.img
+share/u-boot/nanopi_a64/u-boot.itb
 share/u-boot/nanopi_neo2/
 share/u-boot/nanopi_neo2/sunxi-spl.bin
 share/u-boot/nanopi_neo2/u-boot
--- a/sysutils/u-boot/pkg/PFRAG.arm
+++ b/sysutils/u-boot/pkg/PFRAG.arm
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.arm,v 1.9 2017/08/24 08:53:02 patrick Exp $
+@comment $OpenBSD: PFRAG.arm,v 1.10 2017/08/29 07:14:50 jsg Exp $
@pkgpath sysutils/u-boot,
 share/u-boot/
 share/u-boot/A10-OLinuXino-Lime/
@ -19,6 +19,12 @@ share/u-boot/A20-OLinuXino-Lime/u-boot
 share/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin
 share/u-boot/A20-OLinuXino-Lime/u-boot.bin
 share/u-boot/A20-OLinuXino-Lime/u-boot.img
+share/u-boot/A20-OLinuXino-Lime2-eMMC/
+share/u-boot/A20-OLinuXino-Lime2-eMMC/sunxi-spl.bin
+share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot
+share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot-sunxi-with-spl.bin
+share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.bin
+share/u-boot/A20-OLinuXino-Lime2-eMMC/u-boot.img
 share/u-boot/A20-OLinuXino-Lime2/
 share/u-boot/A20-OLinuXino-Lime2/sunxi-spl.bin
 share/u-boot/A20-OLinuXino-Lime2/u-boot