From owner-svn-src-head@FreeBSD.ORG  Sat Jun  6 21:11:18 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4C0A5EEF;
 Sat,  6 Jun 2015 21:11:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A6BC175B;
 Sat,  6 Jun 2015 21:11:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t56LBIVk075378;
 Sat, 6 Jun 2015 21:11:18 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t56LBHct075091;
 Sat, 6 Jun 2015 21:11:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506062111.t56LBHct075091@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 6 Jun 2015 21:11:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284102 - head/release/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jun 2015 21:11:18 -0000

Author: gjb
Date: Sat Jun  6 21:11:17 2015
New Revision: 284102
URL: https://svnweb.freebsd.org/changeset/base/284102

Log:
  Set the correct UBLDR_LOADADDR for the Wandboard and
  Cubox/Hummingboard images.
  
  Submitted by:	ian
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/arm/CUBOX-HUMMINGBOARD.conf
  head/release/arm/WANDBOARD.conf

Modified: head/release/arm/CUBOX-HUMMINGBOARD.conf
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf	Sat Jun  6 20:54:41 2015	(r284101)
+++ head/release/arm/CUBOX-HUMMINGBOARD.conf	Sat Jun  6 21:11:17 2015	(r284102)
@@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"

Modified: head/release/arm/WANDBOARD.conf
==============================================================================
--- head/release/arm/WANDBOARD.conf	Sat Jun  6 20:54:41 2015	(r284101)
+++ head/release/arm/WANDBOARD.conf	Sat Jun  6 21:11:17 2015	(r284102)
@@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"