From d904ce8a52e2f73bdcb1b8fba8016eff12128317 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Wed, 25 Jul 2018 17:45:56 +0000 Subject: [PATCH] release: Add OL_DIR forgot in r336600 Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D16439 --- release/arm/RPI-B.conf | 5 +++-- release/arm/RPI2.conf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index 9f2571380161..0cf2b46ea7a5 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -13,12 +13,13 @@ IMAGE_SIZE="3072M" 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 \ diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf index 769deea0b5d5..ffee1de4472a 100644 --- a/release/arm/RPI2.conf +++ b/release/arm/RPI2.conf @@ -13,13 +13,14 @@ IMAGE_SIZE="3072M" 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 \