From 73adf3b3f84db87758e02379c15408df18e055af Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 12 Jun 2015 19:42:27 +0000
Subject: [PATCH] Reduce the arm/armv6 image size from 1G to 480M.

Since the images are effectively mostly zeros at 1G,
reduce the size to allow installation on smaller SD
cards, such as 512Mb.

While here, stop writing the /boot.txt file on the
WANDBOARD, which isn't used anyway.

Discussed with:	imp
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf         | 2 +-
 release/arm/CUBOX-HUMMINGBOARD.conf | 2 +-
 release/arm/GUMSTIX.conf            | 2 +-
 release/arm/PANDABOARD.conf         | 2 +-
 release/arm/RPI-B.conf              | 2 +-
 release/arm/RPI2.conf               | 2 +-
 release/arm/WANDBOARD.conf          | 5 +----
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 4fcb07d21d72..48375b3b5da2 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 KERNEL="BEAGLEBONE"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/CUBOX-HUMMINGBOARD.conf b/release/arm/CUBOX-HUMMINGBOARD.conf
index 79e9389a5389..5c82d402c04e 100644
--- a/release/arm/CUBOX-HUMMINGBOARD.conf
+++ b/release/arm/CUBOX-HUMMINGBOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 KERNEL="IMX6"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
diff --git a/release/arm/GUMSTIX.conf b/release/arm/GUMSTIX.conf
index 6812a5f49963..92e847635cf3 100644
--- a/release/arm/GUMSTIX.conf
+++ b/release/arm/GUMSTIX.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-duovero"
 KERNEL="GUMSTIX"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 6b75566319f8..0a51b302ea00 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="PANDABOARD"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index e5abaab9fd18..ee3974b80d58 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi"
 KERNEL="RPI-B"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="17m"
 FAT_TYPE="16"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 2da7e96988b1..d5fbb18a4a4c 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="RPI2"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m"
 FAT_TYPE="16"
diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
index 211844c3e549..3e5fae4c1353 100644
--- a/release/arm/WANDBOARD.conf
+++ b/release/arm/WANDBOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="IMX6"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-IMAGE_SIZE="1G"
+IMAGE_SIZE="480M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
@@ -28,9 +28,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
-	chroot ${CHROOTDIR} /bin/sh -c 'echo \
-		setenv fdt_file wandboard-quad.dtb\; fatload mmc 0:1 11000000 ubldr\; bootelf 11000000\; \
-		> ${FATMOUNT}/boot.txt'
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}