From ca04745200e88c1d6d71a7d461fb206372223529 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@pkgsrc.org>
Date: Sat, 23 Sep 2017 17:33:12 +0000
Subject: Increase CONFIG_SYS_BOOTM_LEN as the TEGRA kernel exceeds the default
 size limit. Install the correct files necessary for flashing with L4T
 R24.2.1's flash.sh script.

---
 sysutils/u-boot-jetson-tx1/Makefile                          |  6 ++++--
 sysutils/u-boot-jetson-tx1/PLIST                             |  5 +++--
 sysutils/u-boot/distinfo                                     |  3 ++-
 sysutils/u-boot/patches/patch-include_configs_tegra-common.h | 12 ++++++++++++
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 sysutils/u-boot/patches/patch-include_configs_tegra-common.h

diff --git a/sysutils/u-boot-jetson-tx1/Makefile b/sysutils/u-boot-jetson-tx1/Makefile
index a472bc58f99..56ece26b316 100644
--- a/sysutils/u-boot-jetson-tx1/Makefile
+++ b/sysutils/u-boot-jetson-tx1/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2017/09/08 10:25:17 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/23 17:33:12 jmcneill Exp $
+
+PKGREVISION=		1
 
 UBOOT_TARGET=		jetson-tx1
 UBOOT_CONFIG=		p2371-2180_defconfig
-UBOOT_BIN=		u-boot.bin
+UBOOT_BIN=		u-boot u-boot-dtb.bin
 
 # Switch to EL1 before booting kernel (required for 32-bit support)
 PKG_DEFAULT_OPTIONS+=	el1
diff --git a/sysutils/u-boot-jetson-tx1/PLIST b/sysutils/u-boot-jetson-tx1/PLIST
index 50bb9b31e06..20757abbc24 100644
--- a/sysutils/u-boot-jetson-tx1/PLIST
+++ b/sysutils/u-boot-jetson-tx1/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/09/08 10:25:17 jmcneill Exp $
-share/u-boot/jetson-tx1/u-boot.bin
+@comment $NetBSD: PLIST,v 1.2 2017/09/23 17:33:12 jmcneill Exp $
+share/u-boot/jetson-tx1/u-boot
+share/u-boot/jetson-tx1/u-boot-dtb.bin
diff --git a/sysutils/u-boot/distinfo b/sysutils/u-boot/distinfo
index 6e5d7a9311d..45cecb35338 100644
--- a/sysutils/u-boot/distinfo
+++ b/sysutils/u-boot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2017/09/18 23:07:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2017/09/23 17:33:12 jmcneill Exp $
 
 SHA1 (u-boot-2017.07.tar.bz2) = 517c33f41e2969f3b5b88e9ae3c042acfe1bde05
 RMD160 (u-boot-2017.07.tar.bz2) = b0d83a55b6daabdec28d85fdfb814a529c8d5eb9
@@ -8,5 +8,6 @@ SHA1 (patch-Kconfig) = 7e572929f220af5af6e709fc9493d0aa17bfbea1
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
 SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = 0e1ff9965703ef18c5e6a54a858217ad99617ea6
 SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac
+SHA1 (patch-include_configs_tegra-common.h) = 01b68620414f85edd029e54f7f8dc158888c4072
 SHA1 (patch-lib_bch.c) = 2e20f6d65a736b474859ef3ee840aae05452c6f4
 SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19
diff --git a/sysutils/u-boot/patches/patch-include_configs_tegra-common.h b/sysutils/u-boot/patches/patch-include_configs_tegra-common.h
new file mode 100644
index 00000000000..f7c04d40aa0
--- /dev/null
+++ b/sysutils/u-boot/patches/patch-include_configs_tegra-common.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-include_configs_tegra-common.h,v 1.1 2017/09/23 17:33:12 jmcneill Exp $
+
+--- include/configs/tegra-common.h.orig	2017-07-10 17:07:38.000000000 +0000
++++ include/configs/tegra-common.h
+@@ -101,4 +101,7 @@
+ #include <config_distro_defaults.h>
+ #endif
+ 
++/* Override default uimg size limit */
++#define	CONFIG_SYS_BOOTM_LEN		0x1000000
++
+ #endif /* _TEGRA_COMMON_H_ */
-- 
cgit v1.2.3