pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils U-Boot 2018.11 broke compatibility of U-Boot ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2cbd8850ca52
branches:  trunk
changeset: 389392:2cbd8850ca52
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Mon Dec 31 15:06:44 2018 +0000

description:
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.

diffstat:

 sysutils/u-boot-a10-olinuxino-lime/Makefile   |   4 +++-
 sysutils/u-boot-bananapi-m3/Makefile          |   4 +++-
 sysutils/u-boot-bananapi/Makefile             |   4 +++-
 sysutils/u-boot-beagleboard/Makefile          |   4 +++-
 sysutils/u-boot-beagleboneblack/Makefile      |   4 +++-
 sysutils/u-boot-beaglebonewhite/Makefile      |   4 +++-
 sysutils/u-boot-chip-pro/Makefile             |   4 +++-
 sysutils/u-boot-chip/Makefile                 |   4 +++-
 sysutils/u-boot-cubieboard2/Makefile          |   4 +++-
 sysutils/u-boot-cubieboard4/Makefile          |   4 +++-
 sysutils/u-boot-cubietruck/Makefile           |   4 +++-
 sysutils/u-boot-de0-nanosoc/Makefile          |   4 +++-
 sysutils/u-boot-hummingbird-a31/Makefile      |   4 +++-
 sysutils/u-boot-jetson-tk1/Makefile           |   4 +++-
 sysutils/u-boot-jetson-tx1/Makefile           |   4 +++-
 sysutils/u-boot-jetson-tx2/Makefile           |   4 +++-
 sysutils/u-boot-nanopi-m1/Makefile            |   4 +++-
 sysutils/u-boot-nanopi-neo-plus2/Makefile     |   5 +++--
 sysutils/u-boot-nanopi-neo/Makefile           |   4 +++-
 sysutils/u-boot-nanopi-neo2/Makefile          |   4 +++-
 sysutils/u-boot-odroid-xu3/Makefile           |   4 +++-
 sysutils/u-boot-orangepi-2/Makefile           |   4 +++-
 sysutils/u-boot-orangepi-one/Makefile         |   4 +++-
 sysutils/u-boot-orangepi-plus2e/Makefile      |   4 +++-
 sysutils/u-boot-orangepi-zero-plus/Makefile   |   4 +++-
 sysutils/u-boot-orangepi-zero/Makefile        |   4 +++-
 sysutils/u-boot-pine-h64/Makefile             |   4 +++-
 sysutils/u-boot-pine64/Makefile               |   4 +++-
 sysutils/u-boot-pocketchip/Makefile           |   4 +++-
 sysutils/u-boot/distinfo                      |   3 ++-
 sysutils/u-boot/patches/patch-include_image.h |  26 ++++++++++++++++++++++++++
 31 files changed, 115 insertions(+), 31 deletions(-)

diffs (truncated from 474 to 300 lines):

diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-a10-olinuxino-lime/Makefile
--- a/sysutils/u-boot-a10-olinuxino-lime/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          a10-olinuxino-lime
 UBOOT_CONFIG=          A10-OLinuXino-Lime_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-bananapi-m3/Makefile
--- a/sysutils/u-boot-bananapi-m3/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-bananapi-m3/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          bananapi-m3
 UBOOT_CONFIG=          Sinovoip_BPI_M3_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-bananapi/Makefile
--- a/sysutils/u-boot-bananapi/Makefile Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-bananapi/Makefile Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          bananapi
 UBOOT_CONFIG=          Bananapi_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-beagleboard/Makefile
--- a/sysutils/u-boot-beagleboard/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-beagleboard/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 19:56:36 sevan Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          beagleboard
 UBOOT_CONFIG=          omap3_beagle_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-beagleboneblack/Makefile
--- a/sysutils/u-boot-beagleboneblack/Makefile  Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-beagleboneblack/Makefile  Mon Dec 31 15:06:44 2018 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2017/08/26 18:46:07 sevan Exp $
+# $NetBSD: Makefile,v 1.3 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          beagleboneblack
 UBOOT_CONFIG=          am335x_boneblack_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-beaglebonewhite/Makefile
--- a/sysutils/u-boot-beaglebonewhite/Makefile  Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-beaglebonewhite/Makefile  Mon Dec 31 15:06:44 2018 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/08/26 18:35:33 sevan Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          beaglebonewhite
 UBOOT_CONFIG=          am335x_evm_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-chip-pro/Makefile
--- a/sysutils/u-boot-chip-pro/Makefile Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-chip-pro/Makefile Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          chip-pro
 UBOOT_CONFIG=          CHIP_pro_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-chip/Makefile
--- a/sysutils/u-boot-chip/Makefile     Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-chip/Makefile     Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:44 jmcneill Exp $
 
 UBOOT_TARGET=          chip
 UBOOT_CONFIG=          CHIP_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-cubieboard2/Makefile
--- a/sysutils/u-boot-cubieboard2/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-cubieboard2/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          cubieboard2
 UBOOT_CONFIG=          Cubieboard2_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-cubieboard4/Makefile
--- a/sysutils/u-boot-cubieboard4/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-cubieboard4/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          cubieboard4
 UBOOT_CONFIG=          Cubieboard4_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-cubietruck/Makefile
--- a/sysutils/u-boot-cubietruck/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-cubietruck/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          cubietruck
 UBOOT_CONFIG=          Cubietruck_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-de0-nanosoc/Makefile
--- a/sysutils/u-boot-de0-nanosoc/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-de0-nanosoc/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/10/14 19:25:31 aymeric Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          de0-nanosoc
 UBOOT_CONFIG=          socfpga_de0_nano_soc_defconfig
 UBOOT_BIN=             u-boot-with-spl.sfp
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-hummingbird-a31/Makefile
--- a/sysutils/u-boot-hummingbird-a31/Makefile  Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-hummingbird-a31/Makefile  Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          hummingbird-a31
 UBOOT_CONFIG=          Hummingbird_A31_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-jetson-tk1/Makefile
--- a/sysutils/u-boot-jetson-tk1/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-jetson-tk1/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/12/14 00:52:26 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          jetson-tk1
 UBOOT_CONFIG=          jetson-tk1_defconfig
 UBOOT_BIN=             u-boot u-boot-dtb.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-jetson-tx1/Makefile
--- a/sysutils/u-boot-jetson-tx1/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-jetson-tx1/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:26 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:45 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 -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-jetson-tx2/Makefile
--- a/sysutils/u-boot-jetson-tx2/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-jetson-tx2/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/12/14 00:52:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 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 -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-nanopi-m1/Makefile
--- a/sysutils/u-boot-nanopi-m1/Makefile        Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-nanopi-m1/Makefile        Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2017/12/21 11:46:47 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          nanopi-m1
 UBOOT_CONFIG=          nanopi_m1_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-nanopi-neo-plus2/Makefile
--- a/sysutils/u-boot-nanopi-neo-plus2/Makefile Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile Mon Dec 31 15:06:44 2018 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2018/12/14 00:52:27 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 15:06:46 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
 
 post-extract:
        ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50iw1p1/bl31.bin ${WRKSRC}
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-nanopi-neo/Makefile
--- a/sysutils/u-boot-nanopi-neo/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-nanopi-neo/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 15:06:45 jmcneill Exp $
 
 UBOOT_TARGET=          nanopi-neo
 UBOOT_CONFIG=          nanopi_neo_defconfig
 UBOOT_BIN=             u-boot-sunxi-with-spl.bin
 
+PKGREVISION=           1
+
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-nanopi-neo2/Makefile
--- a/sysutils/u-boot-nanopi-neo2/Makefile      Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-nanopi-neo2/Makefile      Mon Dec 31 15:06:44 2018 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/05/25 10:45:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2018/12/31 15:06:46 jmcneill Exp $
 
 UBOOT_TARGET=          nanopi-neo2
 UBOOT_CONFIG=          nanopi_neo2_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
 
diff -r fcbb9409e17e -r 2cbd8850ca52 sysutils/u-boot-odroid-xu3/Makefile
--- a/sysutils/u-boot-odroid-xu3/Makefile       Mon Dec 31 14:36:15 2018 +0000
+++ b/sysutils/u-boot-odroid-xu3/Makefile       Mon Dec 31 15:06:44 2018 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/10/27 10:02:13 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 15:06:46 jmcneill Exp $



Home | Main Index | Thread Index | Old Index