linaro-vendor-package: Rework to generate versioned paths

This reworks the package generation in a way similar to what
SteveM wanted with versioned paths.

It also cleans up how we generate the tarball so it
doesn't assume we are in the AOSP tree.

Also folded in LINARO_VENDOR_PATH usage from Amit.

Signed-off-by: John Stultz <john.stultz@lianro.org>

185 files changed, 80 insertions, 72 deletions

diff --git a/linaro_devices/extract-linaro_devices.sh-source b/extract-linaro_devices.sh-source
index 52de38a..52de38a 100755
--- a/linaro_devices/extract-linaro_devices.sh-source
+++ b/extract-linaro_devices.sh-source
diff --git a/generate_vendor_package.sh b/generate_vendor_package.sh
new file mode 100755
index 0000000..7fbb237
--- /dev/null
+++ b/generate_vendor_package.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -x
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+DATE=$(date +%Y%m%d)
+SHA1=$(git log --pretty="%h" HEAD~1..HEAD)
+VER=$DATE
+
+SRC_DIR=$SCRIPT_DIR/src/
+TARGET_DIR=out/vendor/linaro-devices/$VER/
+
+
+#Create and copy the files into the out dir
+mkdir -p $TARGET_DIR
+cp -r $SRC_DIR/* $TARGET_DIR
+
+# set the version file in the package
+echo "TARGET_LINARO_VENDOR_VERSION := $VER" > $TARGET_DIR/version.mk
+
+#tar it up
+tar -C out -czf out/vendor.tgz vendor/
+
+# prepend the extraction script
+cp $SCRIPT_DIR/extract-linaro_devices.sh-source out/extract-linaro_devices-$VER.sh
+cat out/vendor.tgz >> out/extract-linaro_devices-$VER.sh
+
+# tar it again
+tar -C out -czf out/extract-linaro_devices-$VER.tgz extract-linaro_devices-$VER.sh
+
+# cleanup: remove the temp/intermediate files
+rm out/extract-linaro_devices-$VER.sh out/vendor.tgz
+rm -rf out/vendor
diff --git a/linaro_devices/generate_vendor_package.sh b/linaro_devices/generate_vendor_package.sh
deleted file mode 100755
index afbc297..0000000
--- a/linaro_devices/generate_vendor_package.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-AOSP_TOP=$SCRIPT_DIR/../..
-
-DATE=$(date +%Y%m%d)
-SHA1=$(git log --pretty="%h" HEAD~1..HEAD)
-VER=$DATE
-
-# set the version file in the package
-echo "TARGET_LINARO_VENDOR_VERSION := $VER" > $SCRIPT_DIR/version.mk
-
-#tar it up
-tar -czf $AOSP_TOP/vendor.tgz --exclude $AOSP_TOP/vendor/.git --exclude $SCRIPT_DIR/generate_vendor_package.sh --exclude $SCRIPT_DIR/extract-linaro_devices.sh-source $AOSP_TOP/vendor/
-
-# prepend the extraction script
-cp $SCRIPT_DIR/extract-linaro_devices.sh-source $AOSP_TOP/extract-linaro_devices-$VER.sh
-cat $AOSP_TOP/vendor.tgz >> $AOSP_TOP/extract-linaro_devices-$VER.sh
-
-# tar it again
-tar -czf $AOSP_TOP/extract-linaro_devices-$VER.tgz $AOSP_TOP/extract-linaro_devices-$VER.sh
-
-# cleanup: remove the temp/intermediate files
-rm $AOSP_TOP/extract-linaro_devices-$VER.sh $AOSP_TOP/vendor.tgz
diff --git a/linaro_devices/version.mk b/linaro_devices/version.mk
deleted file mode 100644
index 24e1db0..0000000
--- a/linaro_devices/version.mk
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_LINARO_VENDOR_VERSION := 20211209
diff --git a/linaro_devices/Android.bp b/src/Android.bp
index c0eb27d..c0eb27d 100644
--- a/linaro_devices/Android.bp
+++ b/src/Android.bp
diff --git a/linaro_devices/README b/src/README
index db5dc77..db5dc77 100644
--- a/linaro_devices/README
+++ b/src/README
diff --git a/linaro_devices/android-info.txt b/src/android-info.txt
index 26077d6..26077d6 100644
--- a/linaro_devices/android-info.txt
+++ b/src/android-info.txt
diff --git a/linaro_devices/linux-firmware/Android.bp b/src/linux-firmware/Android.bp
index 76b9965..76b9965 100644
--- a/linaro_devices/linux-firmware/Android.bp
+++ b/src/linux-firmware/Android.bp
diff --git a/linaro_devices/linux-firmware/LICENSE.Lontium b/src/linux-firmware/LICENSE.Lontium
index 2989473..2989473 100644
--- a/linaro_devices/linux-firmware/LICENSE.Lontium
+++ b/src/linux-firmware/LICENSE.Lontium
diff --git a/linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k b/src/linux-firmware/LICENSE.QualcommAtheros_ath10k
index c68935c..c68935c 100644
--- a/linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k
+++ b/src/linux-firmware/LICENSE.QualcommAtheros_ath10k
diff --git a/linaro_devices/linux-firmware/LICENSE.qcom b/src/linux-firmware/LICENSE.qcom
index faacf9c..faacf9c 100644
--- a/linaro_devices/linux-firmware/LICENSE.qcom
+++ b/src/linux-firmware/LICENSE.qcom
diff --git a/linaro_devices/linux-firmware/WHENCE b/src/linux-firmware/WHENCE
index 4631e54..4631e54 100644
--- a/linaro_devices/linux-firmware/WHENCE
+++ b/src/linux-firmware/WHENCE
diff --git a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin b/src/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
index ecbb1d6..ecbb1d6 100644
--- a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
+++ b/src/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
diff --git a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin b/src/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
index 69b4cae..69b4cae 100644
--- a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
+++ b/src/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
diff --git a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp b/src/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
index b85005c..b85005c 100644
--- a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
+++ b/src/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
diff --git a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn b/src/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
index e044d8c..e044d8c 100644
--- a/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
+++ b/src/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
diff --git a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt b/src/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
index d762020..d762020 100644
--- a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
+++ b/src/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
diff --git a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin b/src/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
index 1d9d34a..1d9d34a 100644
--- a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
+++ b/src/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
diff --git a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin b/src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
index 1ffaab0..1ffaab0 100644
--- a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
+++ b/src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
diff --git a/linaro_devices/linux-firmware/lt9611uxc_fw.bin b/src/linux-firmware/lt9611uxc_fw.bin
index c6398d2..c6398d2 100644
--- a/linaro_devices/linux-firmware/lt9611uxc_fw.bin
+++ b/src/linux-firmware/lt9611uxc_fw.bin
diff --git a/linaro_devices/linux-firmware/qca/NOTICE.txt b/src/linux-firmware/qca/NOTICE.txt
index 9313020..9313020 100644
--- a/linaro_devices/linux-firmware/qca/NOTICE.txt
+++ b/src/linux-firmware/qca/NOTICE.txt
diff --git a/linaro_devices/linux-firmware/qca/crbtfw21.tlv b/src/linux-firmware/qca/crbtfw21.tlv
index 2d5ef8d..2d5ef8d 100644
--- a/linaro_devices/linux-firmware/qca/crbtfw21.tlv
+++ b/src/linux-firmware/qca/crbtfw21.tlv
diff --git a/linaro_devices/linux-firmware/qca/crnv21.bin b/src/linux-firmware/qca/crnv21.bin
index 7f48ef1..7f48ef1 100644
--- a/linaro_devices/linux-firmware/qca/crnv21.bin
+++ b/src/linux-firmware/qca/crnv21.bin
diff --git a/linaro_devices/linux-firmware/qca/htbtfw20.tlv b/src/linux-firmware/qca/htbtfw20.tlv
index f7d8aa9..f7d8aa9 100644
--- a/linaro_devices/linux-firmware/qca/htbtfw20.tlv
+++ b/src/linux-firmware/qca/htbtfw20.tlv
diff --git a/linaro_devices/linux-firmware/qca/htnv20.bin b/src/linux-firmware/qca/htnv20.bin
index 61732d4..61732d4 100644
--- a/linaro_devices/linux-firmware/qca/htnv20.bin
+++ b/src/linux-firmware/qca/htnv20.bin
diff --git a/linaro_devices/linux-firmware/qcom/Android.bp b/src/linux-firmware/qcom/Android.bp
index b34961f..b34961f 100644
--- a/linaro_devices/linux-firmware/qcom/Android.bp
+++ b/src/linux-firmware/qcom/Android.bp
diff --git a/linaro_devices/linux-firmware/qcom/NOTICE.txt b/src/linux-firmware/qcom/NOTICE.txt
index 184f88f..184f88f 100644
--- a/linaro_devices/linux-firmware/qcom/NOTICE.txt
+++ b/src/linux-firmware/qcom/NOTICE.txt
diff --git a/linaro_devices/linux-firmware/qcom/a630_gmu.bin b/src/linux-firmware/qcom/a630_gmu.bin
index 7ab6857..7ab6857 100644
--- a/linaro_devices/linux-firmware/qcom/a630_gmu.bin
+++ b/src/linux-firmware/qcom/a630_gmu.bin
diff --git a/linaro_devices/linux-firmware/qcom/a630_sqe.fw b/src/linux-firmware/qcom/a630_sqe.fw
index 4e2937d..4e2937d 100644
--- a/linaro_devices/linux-firmware/qcom/a630_sqe.fw
+++ b/src/linux-firmware/qcom/a630_sqe.fw
diff --git a/linaro_devices/linux-firmware/qcom/a650_gmu.bin b/src/linux-firmware/qcom/a650_gmu.bin
index e497a14..e497a14 100644
--- a/linaro_devices/linux-firmware/qcom/a650_gmu.bin
+++ b/src/linux-firmware/qcom/a650_gmu.bin
diff --git a/linaro_devices/linux-firmware/qcom/a650_sqe.fw b/src/linux-firmware/qcom/a650_sqe.fw
index 6cbef9b..6cbef9b 100644
--- a/linaro_devices/linux-firmware/qcom/a650_sqe.fw
+++ b/src/linux-firmware/qcom/a650_sqe.fw
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/a630_zap.mbn b/src/linux-firmware/qcom/sdm845/a630_zap.mbn
index 9e6f2ad..9e6f2ad 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/a630_zap.mbn
+++ b/src/linux-firmware/qcom/sdm845/a630_zap.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn b/src/linux-firmware/qcom/sdm845/adsp.mbn
index 271da7f..271da7f 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn
+++ b/src/linux-firmware/qcom/sdm845/adsp.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/adspr.jsn b/src/linux-firmware/qcom/sdm845/adspr.jsn
index 0964c15..0964c15 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/adspr.jsn
+++ b/src/linux-firmware/qcom/sdm845/adspr.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/adspua.jsn b/src/linux-firmware/qcom/sdm845/adspua.jsn
index 2d6824e..2d6824e 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/adspua.jsn
+++ b/src/linux-firmware/qcom/sdm845/adspua.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/cdsp.mbn b/src/linux-firmware/qcom/sdm845/cdsp.mbn
index a115cc8..a115cc8 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/cdsp.mbn
+++ b/src/linux-firmware/qcom/sdm845/cdsp.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/cdspr.jsn b/src/linux-firmware/qcom/sdm845/cdspr.jsn
index 5d976a6..5d976a6 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/cdspr.jsn
+++ b/src/linux-firmware/qcom/sdm845/cdspr.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/mba.mbn b/src/linux-firmware/qcom/sdm845/mba.mbn
index 18e5883..18e5883 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/mba.mbn
+++ b/src/linux-firmware/qcom/sdm845/mba.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/modem.mbn b/src/linux-firmware/qcom/sdm845/modem.mbn
index e172a46..e172a46 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/modem.mbn
+++ b/src/linux-firmware/qcom/sdm845/modem.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/modemuw.jsn b/src/linux-firmware/qcom/sdm845/modemuw.jsn
index 88a400e..88a400e 100644
--- a/linaro_devices/linux-firmware/qcom/sdm845/modemuw.jsn
+++ b/src/linux-firmware/qcom/sdm845/modemuw.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/a650_zap.mbn b/src/linux-firmware/qcom/sm8250/a650_zap.mbn
index ef5624c..ef5624c 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/a650_zap.mbn
+++ b/src/linux-firmware/qcom/sm8250/a650_zap.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/adsp.mbn b/src/linux-firmware/qcom/sm8250/adsp.mbn
index 274cb40..274cb40 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/adsp.mbn
+++ b/src/linux-firmware/qcom/sm8250/adsp.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/adspr.jsn b/src/linux-firmware/qcom/sm8250/adspr.jsn
index 0964c15..0964c15 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/adspr.jsn
+++ b/src/linux-firmware/qcom/sm8250/adspr.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/adspua.jsn b/src/linux-firmware/qcom/sm8250/adspua.jsn
index 2d6824e..2d6824e 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/adspua.jsn
+++ b/src/linux-firmware/qcom/sm8250/adspua.jsn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/cdsp.mbn b/src/linux-firmware/qcom/sm8250/cdsp.mbn
index f8b6653..f8b6653 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/cdsp.mbn
+++ b/src/linux-firmware/qcom/sm8250/cdsp.mbn
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/cdspr.jsn b/src/linux-firmware/qcom/sm8250/cdspr.jsn
index 5d976a6..5d976a6 100644
--- a/linaro_devices/linux-firmware/qcom/sm8250/cdspr.jsn
+++ b/src/linux-firmware/qcom/sm8250/cdspr.jsn
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b00 b/src/linux-firmware/qcom/venus-5.2/venus.b00
index 96c1762..96c1762 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b00
+++ b/src/linux-firmware/qcom/venus-5.2/venus.b00
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01 b/src/linux-firmware/qcom/venus-5.2/venus.b01
index cb335f3..cb335f3 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01
+++ b/src/linux-firmware/qcom/venus-5.2/venus.b01
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02 b/src/linux-firmware/qcom/venus-5.2/venus.b02
index 02a4409..02a4409 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02
+++ b/src/linux-firmware/qcom/venus-5.2/venus.b02
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03 b/src/linux-firmware/qcom/venus-5.2/venus.b03
index e5ff59d..e5ff59d 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03
+++ b/src/linux-firmware/qcom/venus-5.2/venus.b03
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04 b/src/linux-firmware/qcom/venus-5.2/venus.b04
index 90c7fc9..90c7fc9 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04
+++ b/src/linux-firmware/qcom/venus-5.2/venus.b04
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn b/src/linux-firmware/qcom/venus-5.2/venus.mbn
index 0ea5feb..0ea5feb 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn
+++ b/src/linux-firmware/qcom/venus-5.2/venus.mbn
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt b/src/linux-firmware/qcom/venus-5.2/venus.mdt
index 557cf8b..557cf8b 100644
--- a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt
+++ b/src/linux-firmware/qcom/venus-5.2/venus.mdt
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b00 b/src/linux-firmware/qcom/vpu-1.0/venus.b00
index 62fdcb7..62fdcb7 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b00
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b00
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b01 b/src/linux-firmware/qcom/vpu-1.0/venus.b01
index 84af206..84af206 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b01
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b01
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b02 b/src/linux-firmware/qcom/vpu-1.0/venus.b02
index b2764fb..b2764fb 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b02
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b02
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b03 b/src/linux-firmware/qcom/vpu-1.0/venus.b03
index 3d51ce3..3d51ce3 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b03
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b03
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b04 b/src/linux-firmware/qcom/vpu-1.0/venus.b04
index 8451b70..8451b70 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b04
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b04
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b05 b/src/linux-firmware/qcom/vpu-1.0/venus.b05
index 9cf74ff..9cf74ff 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b05
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b05
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b06 b/src/linux-firmware/qcom/vpu-1.0/venus.b06
index 4de9759..4de9759 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b06
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b06
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b07 b/src/linux-firmware/qcom/vpu-1.0/venus.b07
index b521a6f..b521a6f 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b07
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b07
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b08 b/src/linux-firmware/qcom/vpu-1.0/venus.b08
index 9733a4d..9733a4d 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b08
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b08
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b09 b/src/linux-firmware/qcom/vpu-1.0/venus.b09
index 522a268..522a268 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b09
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b09
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b10 b/src/linux-firmware/qcom/vpu-1.0/venus.b10
index 53bb504..53bb504 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b10
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b10
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b19 b/src/linux-firmware/qcom/vpu-1.0/venus.b19
index 90c7fc9..90c7fc9 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b19
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.b19
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mbn b/src/linux-firmware/qcom/vpu-1.0/venus.mbn
index 7a9ddc8..7a9ddc8 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mbn
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.mbn
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mdt b/src/linux-firmware/qcom/vpu-1.0/venus.mdt
index ac4079c..ac4079c 100644
--- a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mdt
+++ b/src/linux-firmware/qcom/vpu-1.0/venus.mdt
diff --git a/linaro_devices/qcom/Android.bp b/src/qcom/Android.bp
index 81dde2d..81dde2d 100644
--- a/linaro_devices/qcom/Android.bp
+++ b/src/qcom/Android.bp
diff --git a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn b/src/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn
index f7080e7..f7080e7 100644
--- a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn
+++ b/src/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn
diff --git a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem b/src/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem
index 47424d4..47424d4 100644
--- a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem
+++ b/src/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem
diff --git a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp b/src/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp
index 4a7da92..4a7da92 100644
--- a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp
+++ b/src/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp
diff --git a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt b/src/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt
index 6b9a0a2..6b9a0a2 100644
--- a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt
+++ b/src/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt
diff --git a/linaro_devices/qcom/db845c/device.mk b/src/qcom/db845c/device.mk
index ca1f27a..d17d800 100644
--- a/linaro_devices/qcom/db845c/device.mk
+++ b/src/qcom/db845c/device.mk
@@ -55,34 +55,34 @@ PRODUCT_PACKAGES +=	\
 # dependency on user sysfs fw loader helper (FW_LOADER_USER_HELPER_FALLBACK)
 ifeq ($(TARGET_USES_BOOT_HDR_V3), true)
     PRODUCT_COPY_FILES += \
-        vendor/linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sdm845/adsp.mbn		\
-        vendor/linaro_devices/linux-firmware/qcom/sdm845/cdsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sdm845/cdsp.mbn		\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b00:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b00	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b01	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b02	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b03	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b04	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mbn	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mdt
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sdm845/adsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sdm845/adsp.mbn		\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sdm845/cdsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sdm845/cdsp.mbn		\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b00:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b00	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b01:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b01	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b02:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b02	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b03:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b03	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b04:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b04	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mbn	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.mdt:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mdt
 else
     PRODUCT_COPY_FILES += \
-        vendor/linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/sdm845/adsp.mbn		\
-        vendor/linaro_devices/linux-firmware/qcom/sdm845/cdsp.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/sdm845/cdsp.mbn		\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b00:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b00	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b01	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b02	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b03	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b04	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mbn	\
-        vendor/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mdt
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sdm845/adsp.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/sdm845/adsp.mbn		\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sdm845/cdsp.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/sdm845/cdsp.mbn		\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b00:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b00	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b01:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b01	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b02:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b02	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b03:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b03	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.b04:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.b04	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.mbn:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mbn	\
+        $(LINARO_VENDOR_PATH)/linux-firmware/qcom/venus-5.2/venus.mdt:$(TARGET_COPY_OUT_RAMDISK)/vendor/firmware/qcom/venus-5.2/venus.mdt
 endif
 
 # Copy notice/license files to rootfs
 # Not an AOSP requirement but other Linux distros do this
 PRODUCT_COPY_FILES += \
-    vendor/linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp:$(TARGET_COPY_OUT_VENDOR)/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp	\
-    vendor/linaro_devices/linux-firmware/qca/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/NOTICE.txt							\
-    vendor/linaro_devices/linux-firmware/qcom/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/NOTICE.txt							\
-    vendor/linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.QualcommAtheros_ath10k			\
-    vendor/linaro_devices/linux-firmware/LICENSE.qcom:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom								\
-    vendor/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom.txt
+    $(LINARO_VENDOR_PATH)/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp:$(TARGET_COPY_OUT_VENDOR)/firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qca/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/NOTICE.txt							\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/NOTICE.txt							\
+    $(LINARO_VENDOR_PATH)/linux-firmware/LICENSE.QualcommAtheros_ath10k:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.QualcommAtheros_ath10k			\
+    $(LINARO_VENDOR_PATH)/linux-firmware/LICENSE.qcom:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom								\
+    $(LINARO_VENDOR_PATH)/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom.txt
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin
index b82e363..b82e363 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE
index 6b9a0a2..6b9a0a2 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
index 90e10db..90e10db 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
index bfc9949..bfc9949 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn
index 59c3db6..59c3db6 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img
index 9e0f96a..9e0f96a 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn
index f6a5688..f6a5688 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn
index 3c1f8e0..3c1f8e0 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
index f7080e7..f7080e7 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin
index 0468851..0468851 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall
index 2c4db9e..2c4db9e 100755
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
index 63cf73f..63cf73f 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
index 6ecd5ed..6ecd5ed 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
index 3bf1983..3bf1983 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
index 2fc8c03..2fc8c03 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
index 89dcf13..89dcf13 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
index 6bed800..6bed800 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
index 6fd3db4..6fd3db4 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
index b3a2bae..b3a2bae 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
index e9158a1..e9158a1 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
index 141bee8..141bee8 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
index 89ef1c2..89ef1c2 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
index 7a67840..7a67840 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
index 025a846..025a846 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
index 83c40e3..83c40e3 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
index 9f02bbf..9f02bbf 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
index 9501602..9501602 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
index da6fc07..da6fc07 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
index c5eb503..c5eb503 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn
index 538dcc6..538dcc6 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf
index 42107de..42107de 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn
index 5bdd1a9..5bdd1a9 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
index 28f4a18..28f4a18 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch1.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch1.xml
index f22f118..f22f118 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch1.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch1.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch2.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch2.xml
index 3a21339..3a21339 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch2.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch2.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch3.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch3.xml
index e818f40..e818f40 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch3.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch3.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch4.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch4.xml
index b808e50..b808e50 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch4.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch4.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch5.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch5.xml
index b9ff1fd..b9ff1fd 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch5.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch5.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf
index 15e2d4c..15e2d4c 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf
index 6236ec4..6236ec4 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
index 44202c6..44202c6 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram1.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram1.xml
index 1793287..1793287 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram1.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram1.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram2.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram2.xml
index e8aa1b8..e8aa1b8 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram2.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram2.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram3.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram3.xml
index a37a8b4..a37a8b4 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram3.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram3.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram4.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram4.xml
index 948dd04..948dd04 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram4.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram4.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram5.xml b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram5.xml
index ea653dd..ea653dd 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram5.xml
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram5.xml
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat
index 2fdcb45..2fdcb45 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn
index 768f20c..768f20c 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn
index 55cdf8f..55cdf8f 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf
index edcad9a..edcad9a 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf
index c9e7408..c9e7408 100644
--- a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf
+++ b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf
diff --git a/linaro_devices/qcom/db845c/qdl/LICENSE b/src/qcom/db845c/qdl/LICENSE
index 4004f3d..4004f3d 100644
--- a/linaro_devices/qcom/db845c/qdl/LICENSE
+++ b/src/qcom/db845c/qdl/LICENSE
diff --git a/linaro_devices/qcom/db845c/qdl/qdl b/src/qcom/db845c/qdl/qdl
index 3eedf67..3eedf67 100755
--- a/linaro_devices/qcom/db845c/qdl/qdl
+++ b/src/qcom/db845c/qdl/qdl
diff --git a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04 b/src/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04
index fac5963..fac5963 100644
--- a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04
+++ b/src/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04
diff --git a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/Android.bp b/src/qcom/rb5/RB5_firmware_20210331-v4/Android.bp
index 95eebb8..95eebb8 100644
--- a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/Android.bp
+++ b/src/qcom/rb5/RB5_firmware_20210331-v4/Android.bp
diff --git a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt b/src/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt
index 6b9a0a2..6b9a0a2 100644
--- a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt
+++ b/src/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt
diff --git a/linaro_devices/qcom/rb5/device.mk b/src/qcom/rb5/device.mk
index 2cfcbd9..be6eb99 100644
--- a/linaro_devices/qcom/rb5/device.mk
+++ b/src/qcom/rb5/device.mk
@@ -47,30 +47,30 @@ PRODUCT_PACKAGES +=	\
 # Also copy a set of Venus and ADSP/CDSP firmware files to ramdisk to drop the
 # dependency on user sysfs fw loader helper (FW_LOADER_USER_HELPER_FALLBACK)
 PRODUCT_COPY_FILES += \
-    vendor/linaro_devices/linux-firmware/qcom/sm8250/adsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sm8250/adsp.mbn	\
-    vendor/linaro_devices/linux-firmware/qcom/sm8250/cdsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sm8250/cdsp.mbn	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b00:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b00	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b01:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b01	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b02:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b02	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b03:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b03	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b04:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b04	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b05:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b05	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b06:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b06	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b07:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b07	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b08:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b08	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b09:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b09	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b10:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b10	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b19:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b19	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.mbn	\
-    vendor/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mdt:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.mdt
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sm8250/adsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sm8250/adsp.mbn	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/sm8250/cdsp.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/sm8250/cdsp.mbn	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b00:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b00	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b01:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b01	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b02:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b02	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b03:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b03	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b04:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b04	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b05:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b05	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b06:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b06	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b07:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b07	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b08:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b08	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b09:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b09	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b10:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b10	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.b19:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.b19	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.mbn:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.mbn	\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/vpu-1.0/venus.mdt:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/vendor/firmware/qcom/vpu-1.0/venus.mdt
 
 # Copy notice/license files to rootfs
 # Not an AOSP requirement but other Linux distros do this
 PRODUCT_COPY_FILES += \
-    vendor/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/ath11k/QCA6390/hw2.0/Notice.txt		\
-    vendor/linaro_devices/linux-firmware/qca/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/NOTICE.txt						\
-    vendor/linaro_devices/linux-firmware/qcom/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/NOTICE.txt						\
-    vendor/linaro_devices/linux-firmware/LICENSE.Lontium:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.Lontium						\
-    vendor/linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.QualcommAtheros_ath10k		\
-    vendor/linaro_devices/linux-firmware/LICENSE.qcom:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom							\
-    vendor/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/ath11k/QCA6390/hw2.0/LICENSE.qcom.txt
+    $(LINARO_VENDOR_PATH)/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/ath11k/QCA6390/hw2.0/Notice.txt		\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qca/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qca/NOTICE.txt						\
+    $(LINARO_VENDOR_PATH)/linux-firmware/qcom/NOTICE.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/qcom/NOTICE.txt						\
+    $(LINARO_VENDOR_PATH)/linux-firmware/LICENSE.Lontium:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.Lontium						\
+    $(LINARO_VENDOR_PATH)/linux-firmware/LICENSE.QualcommAtheros_ath10k:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.QualcommAtheros_ath10k		\
+    $(LINARO_VENDOR_PATH)/linux-firmware/LICENSE.qcom:$(TARGET_COPY_OUT_VENDOR)/firmware/LICENSE.qcom							\
+    $(LINARO_VENDOR_PATH)/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/ath11k/QCA6390/hw2.0/LICENSE.qcom.txt
diff --git a/linaro_devices/qcom/rb5/qdl/LICENSE b/src/qcom/rb5/qdl/LICENSE
index 4004f3d..4004f3d 100644
--- a/linaro_devices/qcom/rb5/qdl/LICENSE
+++ b/src/qcom/rb5/qdl/LICENSE
diff --git a/linaro_devices/qcom/rb5/qdl/qdl b/src/qcom/rb5/qdl/qdl
index fc45c0a..fc45c0a 100755
--- a/linaro_devices/qcom/rb5/qdl/qdl
+++ b/src/qcom/rb5/qdl/qdl
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE b/src/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE
index 6b9a0a2..6b9a0a2 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/MD5SUMS.txt b/src/qcom/rb5/rb5-bootloader-ufs-aosp/MD5SUMS.txt
index b8044ad..b8044ad 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/MD5SUMS.txt
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/MD5SUMS.txt
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf
index be47edd..be47edd 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
index f6fc5a3..f6fc5a3 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
index 9042418..9042418 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img b/src/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img
index 9e0f96a..9e0f96a 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
index a98a6a0..a98a6a0 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
index 3b395f9..3b395f9 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
index c582d2e..c582d2e 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
index c172a76..c172a76 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
index b63ece9..b63ece9 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
index 886afe7..886afe7 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/flashall b/src/qcom/rb5/rb5-bootloader-ufs-aosp/flashall
index 966d670..966d670 100755
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/flashall
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/flashall
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin
index 662b237..662b237 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin
index d87f52c..d87f52c 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin
index 9dd3e05..9dd3e05 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin
index bc892c0..bc892c0 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin
index 200fd16..200fd16 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin
index 427e0a3..427e0a3 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin
index f2377a2..f2377a2 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin
index dc5479e..dc5479e 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin
index f767d6a..f767d6a 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin
index 0731f80..0731f80 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin
index c3de65e..c3de65e 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin
index 72c1d2c..72c1d2c 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin
index 3813917..3813917 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin
index cd02fc4..cd02fc4 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin
index ea6b01f..ea6b01f 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin
index 2848c11..2848c11 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin
index ec75aa8..ec75aa8 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin
index 08572d4..08572d4 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
index 8c9854c..8c9854c 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
index 23e5153..23e5153 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn
index 1ab0654..1ab0654 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml
index 20e4537..20e4537 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch1.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch1.xml
index f22f118..f22f118 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch1.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch1.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch2.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch2.xml
index 3a21339..3a21339 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch2.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch2.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch3.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch3.xml
index 432fa22..432fa22 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch3.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch3.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch4.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch4.xml
index 8e55310..8e55310 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch4.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch4.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch5.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch5.xml
index cdd916f..cdd916f 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch5.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch5.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf
index cfd509c..cfd509c 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
index b484124..b484124 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml
index cfa46b1..cfa46b1 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram1.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram1.xml
index 1793287..1793287 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram1.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram1.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram2.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram2.xml
index e8aa1b8..e8aa1b8 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram2.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram2.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram3.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram3.xml
index 75a1d39..75a1d39 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram3.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram3.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram4.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram4.xml
index 474113f..474113f 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram4.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram4.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram5.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram5.xml
index d1dedcc..d1dedcc 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram5.xml
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram5.xml
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin
index 54b48b6..54b48b6 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
index 1f97ae4..1f97ae4 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn
index 295dab4..295dab4 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
index 8e4c277..8e4c277 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf
index 90c2212..90c2212 100644
--- a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf
+++ b/src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf