Index: head/release/arm/RPI-B.conf
===================================================================
--- head/release/arm/RPI-B.conf
+++ head/release/arm/RPI-B.conf
@@ -13,12 +13,13 @@
 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"
 
 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 \
Index: head/release/arm/RPI2.conf
===================================================================
--- head/release/arm/RPI2.conf
+++ head/release/arm/RPI2.conf
@@ -13,13 +13,14 @@
 KERNEL="GENERIC"
 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"
 export BOARDNAME="RPI2"
 
 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 \