Wed May 8 05:14:20 2019 UTC ()
Add installboot(8) overlay support.


(thorpej)
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-beagleboard/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beagleboard/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-beagleboard/files/installboot.plist
diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-beagleboneblack/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beagleboneblack/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-beagleboneblack/files/installboot.plist
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beaglebonewhite/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-beaglebonewhite/files/installboot.plist
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-beagleboard/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboard/Makefile 2019/04/26 08:32:28 1.4
+++ pkgsrc/sysutils/u-boot-beagleboard/Makefile 2019/05/08 05:14:19 1.5
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $ 1# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:19 thorpej 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= 3 8UBOOT_INSTALLBOOT_PLIST=installboot.plist
 9
 10PKGREVISION= 4
9 11
10.include "../../sysutils/u-boot/u-boot-arm.mk" 12.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beagleboard/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboard/PLIST 2017/08/26 19:56:36 1.1
+++ pkgsrc/sysutils/u-boot-beagleboard/PLIST 2019/05/08 05:14:19 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1 2017/08/26 19:56:36 sevan Exp $ 1@comment $NetBSD: PLIST,v 1.2 2019/05/08 05:14:19 thorpej Exp $
2share/u-boot/beagleboard/MLO 2share/u-boot/beagleboard/MLO
 3share/u-boot/beagleboard/installboot.plist
3share/u-boot/beagleboard/u-boot.img 4share/u-boot/beagleboard/u-boot.img
File Added: pkgsrc/sysutils/u-boot-beagleboard/files/installboot.plist
<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:19 thorpej Exp $ -->
<!--
  Copyright (c) 2019 The NetBSD Foundation, Inc.
  All rights reserved.
 
  This code is derived from software contributed to The NetBSD Foundation
  by Jason R. Thorpe.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
-->
<plist>
<dict>
	<key>ti,omap3-beagle</key>
	<dict>
		<key>description</key>
		<string>TI OMAP3 BeagleBoard</string>
		<key>u-boot-install</key>
		<array>
			<dict>
				<key>file-name</key>
				<string>MLO</string>
				<key>image-offset</key>
				<integer>131072</integer>
			</dict>
			<dict>
				<key>file-name</key>
				<string>u-boot.img</string>
				<key>image-offset</key>
				<integer>393216</integer>
			</dict>
		</array>
	</dict>
</dict>
</plist>
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/u-boot-beagleboneblack/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2019/04/26 08:32:28 1.5
+++ pkgsrc/sysutils/u-boot-beagleboneblack/Makefile 2019/05/08 05:14:20 1.6
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:28 skrll Exp $ 1# $NetBSD: Makefile,v 1.6 2019/05/08 05:14:20 thorpej 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= 3 8UBOOT_INSTALLBOOT_PLIST=installboot.plist
 9
 10PKGREVISION= 4
9 11
10.include "../../sysutils/u-boot/u-boot-arm.mk" 12.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot-beagleboneblack/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beagleboneblack/PLIST 2017/08/26 18:46:07 1.2
+++ pkgsrc/sysutils/u-boot-beagleboneblack/PLIST 2019/05/08 05:14:20 1.3
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.2 2017/08/26 18:46:07 sevan Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/05/08 05:14:20 thorpej Exp $
2share/u-boot/beagleboneblack/MLO 2share/u-boot/beagleboneblack/MLO
 3share/u-boot/beagleboneblack/installboot.plist
3share/u-boot/beagleboneblack/u-boot.img 4share/u-boot/beagleboneblack/u-boot.img
File Added: pkgsrc/sysutils/u-boot-beagleboneblack/files/installboot.plist
<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:20 thorpej Exp $ -->
<!--
  Copyright (c) 2019 The NetBSD Foundation, Inc.
  All rights reserved.
 
  This code is derived from software contributed to The NetBSD Foundation
  by Jason R. Thorpe.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
-->
<plist>
<dict>
	<key>ti,am335x-bone-black</key>
	<dict>
		<key>description</key>
		<string>TI AM335x BeagleBone Black</string>
		<key>u-boot-install</key>
		<array>
			<dict>
				<key>file-name</key>
				<string>MLO</string>
				<key>image-offset</key>
				<integer>131072</integer>
			</dict>
			<dict>
				<key>file-name</key>
				<string>u-boot.img</string>
				<key>image-offset</key>
				<integer>393216</integer>
			</dict>
		</array>
	</dict>
</dict>
</plist>
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2019/04/26 08:32:28 1.4
+++ pkgsrc/sysutils/u-boot-beaglebonewhite/Makefile 2019/05/08 05:14:20 1.5
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $ 1# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:20 thorpej 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= 3 8UBOOT_INSTALLBOOT_PLIST=installboot.plist
 9
 10PKGREVISION= 4
9 11
10.include "../../sysutils/u-boot/u-boot-arm.mk" 12.include "../../sysutils/u-boot/u-boot-arm.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/u-boot-beaglebonewhite/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot-beaglebonewhite/PLIST 2017/08/26 18:35:33 1.1
+++ pkgsrc/sysutils/u-boot-beaglebonewhite/PLIST 2019/05/08 05:14:20 1.2
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.1 2017/08/26 18:35:33 sevan Exp $ 1@comment $NetBSD: PLIST,v 1.2 2019/05/08 05:14:20 thorpej Exp $
2share/u-boot/beaglebonewhite/MLO 2share/u-boot/beaglebonewhite/MLO
 3share/u-boot/beaglebonewhite/installboot.plist
3share/u-boot/beaglebonewhite/u-boot.img 4share/u-boot/beaglebonewhite/u-boot.img
File Added: pkgsrc/sysutils/u-boot-beaglebonewhite/files/installboot.plist
<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:20 thorpej Exp $ -->
<!--
  Copyright (c) 2019 The NetBSD Foundation, Inc.
  All rights reserved.
 
  This code is derived from software contributed to The NetBSD Foundation
  by Jason R. Thorpe.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
-->
<plist>
<dict>
	<key>ti,am335x-bone</key>
	<dict>
		<key>description</key>
		<string>TI AM335x BeagleBone</string>
		<key>u-boot-install</key>
		<array>
			<dict>
				<key>file-name</key>
				<string>MLO</string>
				<key>image-offset</key>
				<integer>131072</integer>
			</dict>
			<dict>
				<key>file-name</key>
				<string>u-boot.img</string>
				<key>image-offset</key>
				<integer>393216</integer>
			</dict>
		</array>
	</dict>
</dict>
</plist>