From owner-svn-src-stable@freebsd.org  Thu Jun  8 15:50:52 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 086B7C09233;
 Thu,  8 Jun 2017 15:50:52 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CA9B12553;
 Thu,  8 Jun 2017 15:50:51 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v58FooC5055302;
 Thu, 8 Jun 2017 15:50:50 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v58Fooe6055301;
 Thu, 8 Jun 2017 15:50:50 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201706081550.v58Fooe6055301@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Thu, 8 Jun 2017 15:50:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r319700 - stable/11/release/arm
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2017 15:50:52 -0000

Author: manu
Date: Thu Jun  8 15:50:50 2017
New Revision: 319700
URL: https://svnweb.freebsd.org/changeset/base/319700

Log:
  Currently stable/11 is using custom DTS for beaglebone(-black) while CURRENT
  is using the upstream ones from Linux.
  U-Boot ports have been changed to use the upstream names so 11.1-PRERELEASE
  doesn't boot.
  Since we cannot MFC the DTS easily (a lot of drivers would have to be modified)
  add links on the dts with upstream names.
  
  This is a direct commit to stable/11
  
  Approved by:	re (marius)

Modified:
  stable/11/release/arm/BEAGLEBONE.conf

Modified: stable/11/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/11/release/arm/BEAGLEBONE.conf	Thu Jun  8 15:48:54 2017	(r319699)
+++ stable/11/release/arm/BEAGLEBONE.conf	Thu Jun  8 15:50:50 2017	(r319700)
@@ -28,6 +28,10 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
 	chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
 		${FATMOUNT}/ubldr.bin
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \
+		${UFSMOUNT}/boot/dtb/am335x-bone.dtb
+	chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone-black.dtb \
+		${UFSMOUNT}/boot/dtb/am335x-boneblack.dtb
 	chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}