Mon Dec 31 15:06:47 2018 UTC ()
U-Boot 2018.11 broke compatibility of U-Boot image type IDs. Restore IDs
used in previous (and subsequent) U-Boot versions to fix booting GENERIC
armv7 NetBSD kernels.


(jmcneill)
diff -r1.18 -r1.19 pkgsrc/sysutils/u-boot/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-m3/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beagleboard/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beagleboneblack/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-chip/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-chip-pro/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubieboard2/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubieboard4/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubietruck/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-jetson-tk1/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-jetson-tx1/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-jetson-tx2/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-nanopi-m1/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-nanopi-neo/Makefile
diff -r1.3 -r1.5 pkgsrc/sysutils/u-boot-nanopi-neo/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-odroid-xu3/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-orangepi-2/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-orangepi-one/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-orangepi-zero/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pine-h64/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-pine64/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-pocketchip/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches/patch-include_image.h
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/u-boot/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo 2018/12/19 12:03:01 1.18
+++ pkgsrc/sysutils/u-boot/distinfo 2018/12/31 15:06:44 1.19
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.18 2018/12/19 12:03:01 ryoon Exp $ 1$NetBSD: distinfo,v 1.19 2018/12/31 15:06:44 jmcneill Exp $
2 2
3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6 3SHA1 (u-boot-2018.11.tar.bz2) = e58e86c633ad3e2613196e0c0b0a7760ae5966d6
4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453 4RMD160 (u-boot-2018.11.tar.bz2) = f63c67750951d0e2883935a5d4cc3252f51a5453
5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff 5SHA512 (u-boot-2018.11.tar.bz2) = 1ea0bbb5f5e6d4c60b3a6bd345d1fa6e9da025daf36f47e8392bab34cb432c2e3633d903efb260f71fff87dffd6f2bf09ac900e96b3d4247073958d83b89ceff
6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes 6Size (u-boot-2018.11.tar.bz2) = 13045125 bytes
7SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9 7SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
8SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95 8SHA1 (patch-configs_jetson-tk1_defconfig) = e25d89b9440f9bb4486ac22fc47083ed24abdd95
9SHA1 (patch-configs_orangepi_zero_plus_defconfig) = 328204fda6f202a2468c34b60fda71e0aa72e92a 9SHA1 (patch-configs_orangepi_zero_plus_defconfig) = 328204fda6f202a2468c34b60fda71e0aa72e92a
10SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c 10SHA1 (patch-configs_p2371-2180_defconfig) = 2a3f1ad4f9963af403c2c9f2f01b892bbe55188c
11SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6 11SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 8e6a6a781cce25af5cba289fc2ca76e30b62aff6
12SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4 12SHA1 (patch-include_configs_tegra-common-post.h) = dfc081d2a3f7cd32e340b03f6c77c629bffd29b4
13SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8 13SHA1 (patch-include_configs_tegra-common.h) = 4cda8f9df2c7fc2b9cd9d4139ec679a42648e4f8
 14SHA1 (patch-include_image.h) = c9b134b2b5624a1e6c9f091a2192185b8d0f85fe
14SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47 15SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
15SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042 16SHA1 (patch-tools_imx__cntr__image.sh) = 715647e3b77b505513ae79b4fe673f4f7f9bf042
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile 2018/05/25 10:45:22 1.3
+++ pkgsrc/sysutils/u-boot-a10-olinuxino-lime/Makefile 2018/12/31 15:06:44 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= a10-olinuxino-lime 3UBOOT_TARGET= a10-olinuxino-lime
4UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig 4UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-bananapi/Makefile 2018/05/25 10:45:22 1.3
+++ pkgsrc/sysutils/u-boot-bananapi/Makefile 2018/12/31 15:06:44 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= bananapi 3UBOOT_TARGET= bananapi
4UBOOT_CONFIG= Bananapi_defconfig 4UBOOT_CONFIG= Bananapi_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-bananapi-m3/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-bananapi-m3/Makefile 2018/05/25 10:45:22 1.3
+++ pkgsrc/sysutils/u-boot-bananapi-m3/Makefile 2018/12/31 15:06:44 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= bananapi-m3 3UBOOT_TARGET= bananapi-m3
4UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig 4UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beagleboard/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboard/Makefile 2017/08/26 19:56:36 1.1
+++ pkgsrc/sysutils/u-boot-beagleboard/Makefile 2018/12/31 15:06:44 1.2
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1# $NetBSD: Makefile,v 1.1 2017/08/26 19:56:36 sevan Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= beagleboard 3UBOOT_TARGET= beagleboard
4UBOOT_CONFIG= omap3_beagle_defconfig 4UBOOT_CONFIG= omap3_beagle_defconfig
5UBOOT_BIN= u-boot.img 5UBOOT_BIN= u-boot.img
6UBOOT_BIN+= MLO 6UBOOT_BIN+= MLO
7 7
 8PKGREVISION= 1
 9
8.include "../../sysutils/u-boot/u-boot-arm.mk" 10.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beagleboneblack/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2017/08/26 18:46:07 1.2
+++ pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2018/12/31 15:06:44 1.3
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1# $NetBSD: Makefile,v 1.2 2017/08/26 18:46:07 sevan Exp $ 1# $NetBSD: Makefile,v 1.3 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= beagleboneblack 3UBOOT_TARGET= beagleboneblack
4UBOOT_CONFIG= am335x_boneblack_defconfig 4UBOOT_CONFIG= am335x_boneblack_defconfig
5UBOOT_BIN= u-boot.img 5UBOOT_BIN= u-boot.img
6UBOOT_BIN+= MLO 6UBOOT_BIN+= MLO
7 7
 8PKGREVISION= 1
 9
8.include "../../sysutils/u-boot/u-boot-arm.mk" 10.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2017/08/26 18:35:33 1.1
+++ pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2018/12/31 15:06:44 1.2
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1# $NetBSD: Makefile,v 1.1 2017/08/26 18:35:33 sevan Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= beaglebonewhite 3UBOOT_TARGET= beaglebonewhite
4UBOOT_CONFIG= am335x_evm_defconfig 4UBOOT_CONFIG= am335x_evm_defconfig
5UBOOT_BIN= u-boot.img 5UBOOT_BIN= u-boot.img
6UBOOT_BIN+= MLO 6UBOOT_BIN+= MLO
7 7
 8PKGREVISION= 1
 9
8.include "../../sysutils/u-boot/u-boot-arm.mk" 10.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-chip/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-chip/Makefile 2018/05/25 10:45:22 1.3
+++ pkgsrc/sysutils/u-boot-chip/Makefile 2018/12/31 15:06:44 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
2 2
3UBOOT_TARGET= chip 3UBOOT_TARGET= chip
4UBOOT_CONFIG= CHIP_defconfig 4UBOOT_CONFIG= CHIP_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-chip-pro/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-chip-pro/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-chip-pro/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= chip-pro 3UBOOT_TARGET= chip-pro
4UBOOT_CONFIG= CHIP_pro_defconfig 4UBOOT_CONFIG= CHIP_pro_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubieboard2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-cubieboard2/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-cubieboard2/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= cubieboard2 3UBOOT_TARGET= cubieboard2
4UBOOT_CONFIG= Cubieboard2_defconfig 4UBOOT_CONFIG= Cubieboard2_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubieboard4/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-cubieboard4/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-cubieboard4/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= cubieboard4 3UBOOT_TARGET= cubieboard4
4UBOOT_CONFIG= Cubieboard4_defconfig 4UBOOT_CONFIG= Cubieboard4_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-cubietruck/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-cubietruck/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-cubietruck/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= cubietruck 3UBOOT_TARGET= cubietruck
4UBOOT_CONFIG= Cubietruck_defconfig 4UBOOT_CONFIG= Cubietruck_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile 2018/10/14 19:25:31 1.1
+++ pkgsrc/sysutils/u-boot-de0-nanosoc/Makefile 2018/12/31 15:06:45 1.2
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.1 2018/10/14 19:25:31 aymeric Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= de0-nanosoc 3UBOOT_TARGET= de0-nanosoc
4UBOOT_CONFIG= socfpga_de0_nano_soc_defconfig 4UBOOT_CONFIG= socfpga_de0_nano_soc_defconfig
5UBOOT_BIN= u-boot-with-spl.sfp 5UBOOT_BIN= u-boot-with-spl.sfp
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-hummingbird-a31/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= hummingbird-a31 3UBOOT_TARGET= hummingbird-a31
4UBOOT_CONFIG= Hummingbird_A31_defconfig 4UBOOT_CONFIG= Hummingbird_A31_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-jetson-tk1/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-jetson-tk1/Makefile 2018/12/14 00:52:26 1.4
+++ pkgsrc/sysutils/u-boot-jetson-tk1/Makefile 2018/12/31 15:06:45 1.5
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.4 2018/12/14 00:52:26 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= jetson-tk1 3UBOOT_TARGET= jetson-tk1
4UBOOT_CONFIG= jetson-tk1_defconfig 4UBOOT_CONFIG= jetson-tk1_defconfig
5UBOOT_BIN= u-boot u-boot-dtb.bin 5UBOOT_BIN= u-boot u-boot-dtb.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-jetson-tx1/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-jetson-tx1/Makefile 2018/12/14 00:52:26 1.5
+++ pkgsrc/sysutils/u-boot-jetson-tx1/Makefile 2018/12/31 15:06:45 1.6
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:26 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= jetson-tx1 3UBOOT_TARGET= jetson-tx1
4UBOOT_CONFIG= p2371-2180_defconfig 4UBOOT_CONFIG= p2371-2180_defconfig
5UBOOT_BIN= u-boot u-boot-dtb.bin 5UBOOT_BIN= u-boot u-boot-dtb.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
9 11
10.include "../../sysutils/u-boot/u-boot-arm64.mk" 12.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-jetson-tx2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-jetson-tx2/Makefile 2018/12/14 00:52:27 1.3
+++ pkgsrc/sysutils/u-boot-jetson-tx2/Makefile 2018/12/31 15:06:45 1.4
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= jetson-tx2 3UBOOT_TARGET= jetson-tx2
4UBOOT_CONFIG= p2771-0000-500_defconfig 4UBOOT_CONFIG= p2771-0000-500_defconfig
5UBOOT_BIN= u-boot u-boot-dtb.bin 5UBOOT_BIN= u-boot u-boot-dtb.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
9 11
10.include "../../sysutils/u-boot/u-boot-arm64.mk" 12.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-nanopi-m1/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-m1/Makefile 2017/12/21 11:46:47 1.1
+++ pkgsrc/sysutils/u-boot-nanopi-m1/Makefile 2018/12/31 15:06:45 1.2
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.1 2017/12/21 11:46:47 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= nanopi-m1 3UBOOT_TARGET= nanopi-m1
4UBOOT_CONFIG= nanopi_m1_defconfig 4UBOOT_CONFIG= nanopi_m1_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-nanopi-neo/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2018/12/31 15:06:45 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
2 2
3UBOOT_TARGET= nanopi-neo 3UBOOT_TARGET= nanopi-neo
4UBOOT_CONFIG= nanopi_neo_defconfig 4UBOOT_CONFIG= nanopi_neo_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.5 pkgsrc/sysutils/u-boot-nanopi-neo/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-nanopi-neo/Makefile 2018/12/31 15:06:47 1.5
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:47 jmcneill Exp $
2 2
3UBOOT_TARGET= nanopi-neo 3UBOOT_TARGET= nanopi-neo
4UBOOT_CONFIG= nanopi_neo_defconfig 4UBOOT_CONFIG= nanopi_neo_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2018/12/14 00:52:27 1.5
+++ pkgsrc/sysutils/u-boot-nanopi-neo-plus2/Makefile 2018/12/31 15:06:46 1.6
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:27 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= nanopi-neo-plus2 3UBOOT_TARGET= nanopi-neo-plus2
4UBOOT_CONFIG= nanopi_neo_plus2_defconfig 4UBOOT_CONFIG= nanopi_neo_plus2_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8#PKG_DEFAULT_OPTIONS+= el1 10#PKG_DEFAULT_OPTIONS+= el1
9PKG_DEFAULT_OPTIONS+= debug 
10 11
11post-extract: 12post-extract:
12 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
13 14
14post-build: 15post-build:
15 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
16 17
17.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk" 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
18.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2018/05/25 10:45:23 1.4
+++ pkgsrc/sysutils/u-boot-nanopi-neo2/Makefile 2018/12/31 15:06:46 1.5
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= nanopi-neo2 3UBOOT_TARGET= nanopi-neo2
4UBOOT_CONFIG= nanopi_neo2_defconfig 4UBOOT_CONFIG= nanopi_neo2_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
9 11
10post-extract: 12post-extract:
11 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
12 14
13post-build: 15post-build:
14 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
15 17
16.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk" 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
17.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-odroid-xu3/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-odroid-xu3/Makefile 2018/10/27 10:02:13 1.1
+++ pkgsrc/sysutils/u-boot-odroid-xu3/Makefile 2018/12/31 15:06:46 1.2
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.1 2018/10/27 10:02:13 skrll Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= odroid-xu3 3UBOOT_TARGET= odroid-xu3
4UBOOT_CONFIG= odroid-xu3_defconfig 4UBOOT_CONFIG= odroid-xu3_defconfig
5UBOOT_BIN= u-boot u-boot-dtb.bin 5UBOOT_BIN= u-boot u-boot-dtb.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-orangepi-2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-orangepi-2/Makefile 2018/05/25 10:45:23 1.5
+++ pkgsrc/sysutils/u-boot-orangepi-2/Makefile 2018/12/31 15:06:46 1.6
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= orangepi-2 3UBOOT_TARGET= orangepi-2
4UBOOT_CONFIG= orangepi_2_defconfig 4UBOOT_CONFIG= orangepi_2_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-orangepi-one/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-orangepi-one/Makefile 2018/05/25 10:45:23 1.3
+++ pkgsrc/sysutils/u-boot-orangepi-one/Makefile 2018/12/31 15:06:46 1.4
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= orangepi-one 3UBOOT_TARGET= orangepi-one
4UBOOT_CONFIG= orangepi_one_defconfig 4UBOOT_CONFIG= orangepi_one_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile 2018/05/25 10:45:23 1.5
+++ pkgsrc/sysutils/u-boot-orangepi-plus2e/Makefile 2018/12/31 15:06:46 1.6
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:23 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= orangepi-plus2e 3UBOOT_TARGET= orangepi-plus2e
4UBOOT_CONFIG= orangepi_plus2e_defconfig 4UBOOT_CONFIG= orangepi_plus2e_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-orangepi-zero/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-orangepi-zero/Makefile 2018/06/23 10:48:27 1.1
+++ pkgsrc/sysutils/u-boot-orangepi-zero/Makefile 2018/12/31 15:06:46 1.2
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
1# $NetBSD: Makefile,v 1.1 2018/06/23 10:48:27 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= orangepi-zero 3UBOOT_TARGET= orangepi-zero
4UBOOT_CONFIG= orangepi_zero_defconfig 4UBOOT_CONFIG= orangepi_zero_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7.include "../../sysutils/u-boot/u-boot-arm.mk" 9.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile 2018/06/24 23:18:01 1.1
+++ pkgsrc/sysutils/u-boot-orangepi-zero-plus/Makefile 2018/12/31 15:06:46 1.2
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.1 2018/06/24 23:18:01 thorpej Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= orangepi-zero-plus 3UBOOT_TARGET= orangepi-zero-plus
4UBOOT_CONFIG= orangepi_zero_plus_defconfig 4UBOOT_CONFIG= orangepi_zero_plus_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
9 11
10post-extract: 12post-extract:
11 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
12 14
13post-build: 15post-build:
14 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
15 17
16.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk" 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
17.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/u-boot-pine-h64/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pine-h64/Makefile 2018/12/14 00:52:27 1.3
+++ pkgsrc/sysutils/u-boot-pine-h64/Makefile 2018/12/31 15:06:46 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= pine-h64 3UBOOT_TARGET= pine-h64
4UBOOT_CONFIG= pine_h64_defconfig 4UBOOT_CONFIG= pine_h64_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7post-extract: 9post-extract:
8 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC} 10 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i-h6/bl31.bin ${WRKSRC}
9 11
10post-build: 12post-build:
11 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 13 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
12 14
13.include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk" 15.include "../../sysutils/arm-trusted-firmware-sun50i-h6/buildlink3.mk"
14.include "../../sysutils/u-boot/u-boot-arm64.mk" 16.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-pine64/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pine64/Makefile 2018/05/25 10:45:24 1.5
+++ pkgsrc/sysutils/u-boot-pine64/Makefile 2018/12/31 15:06:46 1.6
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2018/05/25 10:45:24 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= pine64 3UBOOT_TARGET= pine64
4UBOOT_CONFIG= pine64_plus_defconfig 4UBOOT_CONFIG= pine64_plus_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7# Switch to EL1 before booting kernel (required for 32-bit support) 9# Switch to EL1 before booting kernel (required for 32-bit support)
8PKG_DEFAULT_OPTIONS+= el1 10PKG_DEFAULT_OPTIONS+= el1
9 11
10post-extract: 12post-extract:
11 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 13 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
12 14
13post-build: 15post-build:
14 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin 16 ${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
15 17
16.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk" 18.include "../../sysutils/arm-trusted-firmware-sun50iw1p1/buildlink3.mk"
17.include "../../sysutils/u-boot/u-boot-arm64.mk" 19.include "../../sysutils/u-boot/u-boot-arm64.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-pocketchip/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-pocketchip/Makefile 2018/05/25 10:45:24 1.4
+++ pkgsrc/sysutils/u-boot-pocketchip/Makefile 2018/12/31 15:06:46 1.5
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:24 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
2 2
3UBOOT_TARGET= pocketchip 3UBOOT_TARGET= pocketchip
4UBOOT_CONFIG= CHIP_defconfig 4UBOOT_CONFIG= CHIP_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6 6
 7PKGREVISION= 1
 8
7UBOOT_OPTIONS+= CONFIG_I2C1_ENABLE=y 9UBOOT_OPTIONS+= CONFIG_I2C1_ENABLE=y
8UBOOT_OPTIONS+= CONFIG_AXP_GPIO=y 10UBOOT_OPTIONS+= CONFIG_AXP_GPIO=y
9UBOOT_OPTIONS+= CONFIG_VIDEO=y 11UBOOT_OPTIONS+= CONFIG_VIDEO=y
10UBOOT_OPTIONS+= CONFIG_VIDEO_VGA_VIA_LCD=y 12UBOOT_OPTIONS+= CONFIG_VIDEO_VGA_VIA_LCD=y
11UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_MODE=\"x:480,y:272,depth:18,pclk_khz:9000,le:10,ri:5,up:3,lo:8,hs:30,vs:5,sync:3,vmode:0\" 13UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_MODE=\"x:480,y:272,depth:18,pclk_khz:9000,le:10,ri:5,up:3,lo:8,hs:30,vs:5,sync:3,vmode:0\"
12UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_POWER=\"AXP0-1\" 14UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_POWER=\"AXP0-1\"
13UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_EN=\"PD18\" 15UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_EN=\"PD18\"
14UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_PWM=\"PB2\" 16UBOOT_OPTIONS+= CONFIG_VIDEO_LCD_BL_PWM=\"PB2\"
15UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033=y 17UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033=y
16UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033_I2C_BUS=1 18UBOOT_OPTIONS+= CONFIG_VIDEO_CHRONTEL_CH7033_I2C_BUS=1
17 19
18.include "../../sysutils/u-boot/u-boot-arm.mk" 20.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile 2018/06/07 00:58:27 1.1
+++ pkgsrc/sysutils/u-boot-sopine-baseboard/Makefile 2018/12/31 15:06:47 1.2
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.1 2018/06/07 00:58:27 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:47 jmcneill Exp $
2 2
3UBOOT_TARGET= sopine-baseboard 3UBOOT_TARGET= sopine-baseboard
4UBOOT_CONFIG= sopine_baseboard_defconfig 4UBOOT_CONFIG= sopine_baseboard_defconfig
5UBOOT_BIN= u-boot-sunxi-with-spl.bin 5UBOOT_BIN= u-boot-sunxi-with-spl.bin
6UBOOT_ENV+= DEVICE_TREE=sun50i-a64-sopine-baseboard 6UBOOT_ENV+= DEVICE_TREE=sun50i-a64-sopine-baseboard
7 7
 8PKGREVISION= 1
 9
8# Switch to EL1 before booting kernel (required for 32-bit support) 10# Switch to EL1 before booting kernel (required for 32-bit support)
9PKG_DEFAULT_OPTIONS+= el1 11PKG_DEFAULT_OPTIONS+= el1
10 12
11post-extract: 13post-extract:
12 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC} 14 ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
13 ${CP} ${WRKSRC}/arch/arm/dts/sun50i-a64-pine64-plus.dts \ 15 ${CP} ${WRKSRC}/arch/arm/dts/sun50i-a64-pine64-plus.dts \
14 ${WRKSRC}/arch/arm/dts/sun50i-a64-sopine-baseboard.dts 16 ${WRKSRC}/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
15 ${CAT} ${WRKSRC}/configs/${UBOOT_CONFIG} | \ 17 ${CAT} ${WRKSRC}/configs/${UBOOT_CONFIG} | \
16 ${SED} "s/sun50i-a64-pine64-plus/sun50i-a64-sopine-baseboard/" \ 18 ${SED} "s/sun50i-a64-pine64-plus/sun50i-a64-sopine-baseboard/" \
17 > ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp && \ 19 > ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp && \
18 ${MV} ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp ${WRKSRC}/configs/${UBOOT_CONFIG} 20 ${MV} ${WRKSRC}/configs/${UBOOT_CONFIG}.tmp ${WRKSRC}/configs/${UBOOT_CONFIG}
19 21
20post-build: 22post-build:
File Added: pkgsrc/sysutils/u-boot/patches/patch-include_image.h
$NetBSD: patch-include_image.h,v 1.1 2018/12/31 15:06:44 jmcneill Exp $

IH_TYPE_* image type value compatibility was broken in 2018.11. Restore
compatibility with previous and future releases. This has since been fixed
upstream with commit 24431adc366c67c7755c0c6a956978f3b66ad550

--- include/image.h.orig	2018-11-14 16:10:06.000000000 +0000
+++ include/image.h
@@ -251,7 +251,6 @@ enum {
 	IH_TYPE_FLATDT,			/* Binary Flat Device Tree Blob	*/
 	IH_TYPE_KWBIMAGE,		/* Kirkwood Boot Image		*/
 	IH_TYPE_IMXIMAGE,		/* Freescale IMXBoot Image	*/
-	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
 	IH_TYPE_UBLIMAGE,		/* Davinci UBL Image		*/
 	IH_TYPE_OMAPIMAGE,		/* TI OMAP Config Header Image	*/
 	IH_TYPE_AISIMAGE,		/* TI Davinci AIS Image		*/
@@ -278,6 +277,9 @@ enum {
 	IH_TYPE_PMMC,            /* TI Power Management Micro-Controller Firmware */
 	IH_TYPE_STM32IMAGE,		/* STMicroelectronics STM32 Image */
 	IH_TYPE_SOCFPGAIMAGE_V1,	/* Altera SOCFPGA A10 Preloader	*/
+	IH_TYPE_MTKIMAGE,		/* MediaTek BootRO loadable Image */
+	IH_TYPE_IMX8MIMAGE,		/* Freescale IMX8MBoot Image	*/
+	IH_TYPE_IMX8IMAGE,		/* Freescale IMX8Boot Image	*/
 
 	IH_TYPE_COUNT,			/* Number of image types */
 };