Increase the arm/armv6 and arm/armv7 images from 2.5GB to 3GB,

since the RPI2 (at least) does not fit in 2.5GB.

While here, add a missing BOARDNAME to RPI2.conf.

Sponsored by:	The FreeBSD Foundation

10 files changed, 11 insertions, 10 deletions

diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index 873cedeb9ef1..19f4e70e872e 100644
--- a/release/arm/BANANAPI.conf
+++ b/release/arm/BANANAPI.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-bananapi"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 5cc27f674603..61445c389cf1 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/CUBIEBOARD.conf b/release/arm/CUBIEBOARD.conf
index 8b4523688faa..f4befc65a5f0 100644
--- a/release/arm/CUBIEBOARD.conf
+++ b/release/arm/CUBIEBOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf
index ff80dc37c052..b68c40cb9f2f 100644
--- a/release/arm/CUBIEBOARD2.conf
+++ b/release/arm/CUBIEBOARD2.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="32m -b 1m"
 FAT_TYPE="16"
diff --git a/release/arm/CUBOX-HUMMINGBOARD.conf b/release/arm/CUBOX-HUMMINGBOARD.conf
index 289ecd20e220..da659ec29732 100644
--- a/release/arm/CUBOX-HUMMINGBOARD.conf
+++ b/release/arm/CUBOX-HUMMINGBOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 KERNEL="IMX6"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
diff --git a/release/arm/GUMSTIX.conf b/release/arm/GUMSTIX.conf
index 196d5411f361..5e979b130dd0 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="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 35a88f8868d6..41e8d003b225 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 8b8e48e08ae7..84217f4838aa 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="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="17m"
 FAT_TYPE="16"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index e9324550df4f..67cbcf286701 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -9,12 +9,13 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
-IMAGE_SIZE="2560M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+export BOARDNAME="RPI2"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
index 75ad6a26216a..9766be967180 100644
--- a/release/arm/WANDBOARD.conf
+++ b/release/arm/WANDBOARD.conf
@@ -9,7 +9,7 @@ EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="IMX6"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
-IMAGE_SIZE="1536M"
+IMAGE_SIZE="3072M"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"