svn commit: r284333 - head/release/arm

[Glen Barber]

Author: gjb
Date: Fri Jun 12 19:42:27 2015
New Revision: 284333
URL: https://svnweb.freebsd.org/changeset/base/284333

Log:
  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

Modified:
  head/release/arm/BEAGLEBONE.conf
  head/release/arm/CUBOX-HUMMINGBOARD.conf
  head/release/arm/GUMSTIX.conf
  head/release/arm/PANDABOARD.conf
  head/release/arm/RPI-B.conf
  head/release/arm/RPI2.conf
  head/release/arm/WANDBOARD.conf

Modified: head/release/arm/BEAGLEBONE.conf
==============================================================================
--- head/release/arm/BEAGLEBONE.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/BEAGLEBONE.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/GUMSTIX.conf
==============================================================================
--- head/release/arm/GUMSTIX.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/GUMSTIX.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/PANDABOARD.conf
==============================================================================
--- head/release/arm/PANDABOARD.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/PANDABOARD.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/RPI-B.conf
==============================================================================
--- head/release/arm/RPI-B.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/RPI-B.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/RPI2.conf
==============================================================================
--- head/release/arm/RPI2.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/RPI2.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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"

Modified: head/release/arm/WANDBOARD.conf
==============================================================================
--- head/release/arm/WANDBOARD.conf	Fri Jun 12 18:59:29 2015	(r284332)
+++ head/release/arm/WANDBOARD.conf	Fri Jun 12 19:42:27 2015	(r284333)
@@ -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}