svn commit: r284517 - stable/10/release/arm

[Glen Barber]

Author: gjb
Date: Wed Jun 17 16:29:32 2015
New Revision: 284517
URL: https://svnweb.freebsd.org/changeset/base/284517

Log:
  MFC r284333:
    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.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/arm/BEAGLEBONE.conf
  stable/10/release/arm/CUBOX-HUMMINGBOARD.conf
  stable/10/release/arm/GUMSTIX.conf
  stable/10/release/arm/PANDABOARD.conf
  stable/10/release/arm/RPI-B.conf
  stable/10/release/arm/RPI2.conf
  stable/10/release/arm/WANDBOARD.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/10/release/arm/BEAGLEBONE.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/BEAGLEBONE.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -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: stable/10/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- stable/10/release/arm/CUBOX-HUMMINGBOARD.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/CUBOX-HUMMINGBOARD.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -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: stable/10/release/arm/GUMSTIX.conf
==============================================================================
--- stable/10/release/arm/GUMSTIX.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/GUMSTIX.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -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: stable/10/release/arm/PANDABOARD.conf
==============================================================================
--- stable/10/release/arm/PANDABOARD.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/PANDABOARD.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -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: stable/10/release/arm/RPI-B.conf
==============================================================================
--- stable/10/release/arm/RPI-B.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/RPI-B.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -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: stable/10/release/arm/RPI2.conf
==============================================================================
--- stable/10/release/arm/RPI2.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/RPI2.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -10,7 +10,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: stable/10/release/arm/WANDBOARD.conf
==============================================================================
--- stable/10/release/arm/WANDBOARD.conf	Wed Jun 17 16:26:13 2015	(r284516)
+++ stable/10/release/arm/WANDBOARD.conf	Wed Jun 17 16:29:32 2015	(r284517)
@@ -10,7 +10,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"
@@ -29,9 +29,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}