svn commit: r336968 - stable/11/release/arm

[Glen Barber]

Author: gjb
Date: Tue Jul 31 13:32:36 2018
New Revision: 336968
URL: https://svnweb.freebsd.org/changeset/base/336968

Log:
  MFC r336721, r336750 [1]:
  
   r336721 (manu):
    Add OL_DIR forgot in r336600.
  
   r336750:
    Fix OL_DIR definition following r336721.
  
  [1] These commits were stated to have been merged in
      r336726, however are not present in context nor
      svn:mergeinfo.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/arm/RPI-B.conf
  stable/11/release/arm/RPI2.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/arm/RPI-B.conf
==============================================================================
--- stable/11/release/arm/RPI-B.conf	Tue Jul 31 12:53:27 2018	(r336967)
+++ stable/11/release/arm/RPI-B.conf	Tue Jul 31 13:32:36 2018	(r336968)
@@ -13,13 +13,14 @@ IMAGE_SIZE="1G"
 KERNEL="RPI-B"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
+RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
+OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
 OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
 PART_SCHEME="MBR"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
-	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi"
-	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \

Modified: stable/11/release/arm/RPI2.conf
==============================================================================
--- stable/11/release/arm/RPI2.conf	Tue Jul 31 12:53:27 2018	(r336967)
+++ stable/11/release/arm/RPI2.conf	Tue Jul 31 13:32:36 2018	(r336968)
@@ -13,13 +13,14 @@ IMAGE_SIZE="1536M"
 KERNEL="RPI2"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
+RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
+OL_DIR="${RPI_FIRMWARE_DIR}/overlays"
 OVERLAYS="mmc.dtbo"
 PART_SCHEME="MBR"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 
 arm_install_uboot() {
-	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
-	RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware"
 	UBOOT_FILES="u-boot.bin"
 	RPI_FIRMWARE_FILES="bootcode.bin config.txt \
 		fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \