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>
diff --git a/linaro_devices/extract-linaro_devices.sh-source b/extract-linaro_devices.sh-source
similarity index 100%
rename from linaro_devices/extract-linaro_devices.sh-source
rename to 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
similarity index 100%
rename from linaro_devices/Android.bp
rename to src/Android.bp
diff --git a/linaro_devices/README b/src/README
similarity index 100%
rename from linaro_devices/README
rename to src/README
diff --git a/linaro_devices/android-info.txt b/src/android-info.txt
similarity index 100%
rename from linaro_devices/android-info.txt
rename to src/android-info.txt
diff --git a/linaro_devices/linux-firmware/Android.bp b/src/linux-firmware/Android.bp
similarity index 100%
rename from linaro_devices/linux-firmware/Android.bp
rename to src/linux-firmware/Android.bp
diff --git a/linaro_devices/linux-firmware/LICENSE.Lontium b/src/linux-firmware/LICENSE.Lontium
similarity index 100%
rename from linaro_devices/linux-firmware/LICENSE.Lontium
rename to src/linux-firmware/LICENSE.Lontium
diff --git a/linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k b/src/linux-firmware/LICENSE.QualcommAtheros_ath10k
similarity index 100%
rename from linaro_devices/linux-firmware/LICENSE.QualcommAtheros_ath10k
rename to src/linux-firmware/LICENSE.QualcommAtheros_ath10k
diff --git a/linaro_devices/linux-firmware/LICENSE.qcom b/src/linux-firmware/LICENSE.qcom
similarity index 100%
rename from linaro_devices/linux-firmware/LICENSE.qcom
rename to src/linux-firmware/LICENSE.qcom
diff --git a/linaro_devices/linux-firmware/WHENCE b/src/linux-firmware/WHENCE
similarity index 100%
rename from linaro_devices/linux-firmware/WHENCE
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
rename to src/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
rename to src/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
rename to src/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt b/src/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
similarity index 100%
rename from linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
rename to src/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin b/src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
similarity index 100%
rename from linaro_devices/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
rename to src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/lt9611uxc_fw.bin b/src/linux-firmware/lt9611uxc_fw.bin
similarity index 100%
rename from linaro_devices/linux-firmware/lt9611uxc_fw.bin
rename to src/linux-firmware/lt9611uxc_fw.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/qca/NOTICE.txt b/src/linux-firmware/qca/NOTICE.txt
similarity index 100%
rename from linaro_devices/linux-firmware/qca/NOTICE.txt
rename to src/linux-firmware/qca/NOTICE.txt
diff --git a/linaro_devices/linux-firmware/qca/crbtfw21.tlv b/src/linux-firmware/qca/crbtfw21.tlv
similarity index 100%
rename from linaro_devices/linux-firmware/qca/crbtfw21.tlv
rename to src/linux-firmware/qca/crbtfw21.tlv
Binary files differ
diff --git a/linaro_devices/linux-firmware/qca/crnv21.bin b/src/linux-firmware/qca/crnv21.bin
similarity index 100%
rename from linaro_devices/linux-firmware/qca/crnv21.bin
rename to src/linux-firmware/qca/crnv21.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/qca/htbtfw20.tlv b/src/linux-firmware/qca/htbtfw20.tlv
similarity index 100%
rename from linaro_devices/linux-firmware/qca/htbtfw20.tlv
rename to src/linux-firmware/qca/htbtfw20.tlv
Binary files differ
diff --git a/linaro_devices/linux-firmware/qca/htnv20.bin b/src/linux-firmware/qca/htnv20.bin
similarity index 100%
rename from linaro_devices/linux-firmware/qca/htnv20.bin
rename to src/linux-firmware/qca/htnv20.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/Android.bp b/src/linux-firmware/qcom/Android.bp
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/Android.bp
rename to src/linux-firmware/qcom/Android.bp
diff --git a/linaro_devices/linux-firmware/qcom/NOTICE.txt b/src/linux-firmware/qcom/NOTICE.txt
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/NOTICE.txt
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/a630_gmu.bin
rename to src/linux-firmware/qcom/a630_gmu.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/a630_sqe.fw b/src/linux-firmware/qcom/a630_sqe.fw
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/a630_sqe.fw
rename to src/linux-firmware/qcom/a630_sqe.fw
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/a650_gmu.bin b/src/linux-firmware/qcom/a650_gmu.bin
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/a650_gmu.bin
rename to src/linux-firmware/qcom/a650_gmu.bin
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/a650_sqe.fw b/src/linux-firmware/qcom/a650_sqe.fw
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/a650_sqe.fw
rename to src/linux-firmware/qcom/a650_sqe.fw
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/a630_zap.mbn b/src/linux-firmware/qcom/sdm845/a630_zap.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/a630_zap.mbn
rename to src/linux-firmware/qcom/sdm845/a630_zap.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn b/src/linux-firmware/qcom/sdm845/adsp.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/adsp.mbn
rename to src/linux-firmware/qcom/sdm845/adsp.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/adspr.jsn b/src/linux-firmware/qcom/sdm845/adspr.jsn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/adspr.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/adspua.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/cdsp.mbn
rename to src/linux-firmware/qcom/sdm845/cdsp.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/cdspr.jsn b/src/linux-firmware/qcom/sdm845/cdspr.jsn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/cdspr.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/mba.mbn
rename to src/linux-firmware/qcom/sdm845/mba.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/modem.mbn b/src/linux-firmware/qcom/sdm845/modem.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/modem.mbn
rename to src/linux-firmware/qcom/sdm845/modem.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sdm845/modemuw.jsn b/src/linux-firmware/qcom/sdm845/modemuw.jsn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sdm845/modemuw.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/a650_zap.mbn
rename to src/linux-firmware/qcom/sm8250/a650_zap.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/adsp.mbn b/src/linux-firmware/qcom/sm8250/adsp.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/adsp.mbn
rename to src/linux-firmware/qcom/sm8250/adsp.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/adspr.jsn b/src/linux-firmware/qcom/sm8250/adspr.jsn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/adspr.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/adspua.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/cdsp.mbn
rename to src/linux-firmware/qcom/sm8250/cdsp.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/sm8250/cdspr.jsn b/src/linux-firmware/qcom/sm8250/cdspr.jsn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/sm8250/cdspr.jsn
rename to 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
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.b00
rename to src/linux-firmware/qcom/venus-5.2/venus.b00
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01 b/src/linux-firmware/qcom/venus-5.2/venus.b01
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.b01
rename to src/linux-firmware/qcom/venus-5.2/venus.b01
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02 b/src/linux-firmware/qcom/venus-5.2/venus.b02
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.b02
rename to src/linux-firmware/qcom/venus-5.2/venus.b02
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03 b/src/linux-firmware/qcom/venus-5.2/venus.b03
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.b03
rename to src/linux-firmware/qcom/venus-5.2/venus.b03
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04 b/src/linux-firmware/qcom/venus-5.2/venus.b04
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.b04
rename to src/linux-firmware/qcom/venus-5.2/venus.b04
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn b/src/linux-firmware/qcom/venus-5.2/venus.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.mbn
rename to src/linux-firmware/qcom/venus-5.2/venus.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt b/src/linux-firmware/qcom/venus-5.2/venus.mdt
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/venus-5.2/venus.mdt
rename to src/linux-firmware/qcom/venus-5.2/venus.mdt
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b00 b/src/linux-firmware/qcom/vpu-1.0/venus.b00
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b00
rename to src/linux-firmware/qcom/vpu-1.0/venus.b00
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b01 b/src/linux-firmware/qcom/vpu-1.0/venus.b01
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b01
rename to src/linux-firmware/qcom/vpu-1.0/venus.b01
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b02 b/src/linux-firmware/qcom/vpu-1.0/venus.b02
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b02
rename to src/linux-firmware/qcom/vpu-1.0/venus.b02
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b03 b/src/linux-firmware/qcom/vpu-1.0/venus.b03
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b03
rename to src/linux-firmware/qcom/vpu-1.0/venus.b03
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b04 b/src/linux-firmware/qcom/vpu-1.0/venus.b04
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b04
rename to src/linux-firmware/qcom/vpu-1.0/venus.b04
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b05 b/src/linux-firmware/qcom/vpu-1.0/venus.b05
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b05
rename to src/linux-firmware/qcom/vpu-1.0/venus.b05
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b06 b/src/linux-firmware/qcom/vpu-1.0/venus.b06
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b06
rename to src/linux-firmware/qcom/vpu-1.0/venus.b06
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b07 b/src/linux-firmware/qcom/vpu-1.0/venus.b07
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b07
rename to src/linux-firmware/qcom/vpu-1.0/venus.b07
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b08 b/src/linux-firmware/qcom/vpu-1.0/venus.b08
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b08
rename to src/linux-firmware/qcom/vpu-1.0/venus.b08
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b09 b/src/linux-firmware/qcom/vpu-1.0/venus.b09
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b09
rename to src/linux-firmware/qcom/vpu-1.0/venus.b09
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b10 b/src/linux-firmware/qcom/vpu-1.0/venus.b10
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b10
rename to src/linux-firmware/qcom/vpu-1.0/venus.b10
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b19 b/src/linux-firmware/qcom/vpu-1.0/venus.b19
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.b19
rename to src/linux-firmware/qcom/vpu-1.0/venus.b19
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mbn b/src/linux-firmware/qcom/vpu-1.0/venus.mbn
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mbn
rename to src/linux-firmware/qcom/vpu-1.0/venus.mbn
Binary files differ
diff --git a/linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mdt b/src/linux-firmware/qcom/vpu-1.0/venus.mdt
similarity index 100%
rename from linaro_devices/linux-firmware/qcom/vpu-1.0/venus.mdt
rename to src/linux-firmware/qcom/vpu-1.0/venus.mdt
Binary files differ
diff --git a/linaro_devices/qcom/Android.bp b/src/qcom/Android.bp
similarity index 100%
rename from linaro_devices/qcom/Android.bp
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn
rename to src/qcom/db845c/RB3_firmware_20190529180356-v4/07-devcfg/devcfg.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem
rename to src/qcom/db845c/RB3_firmware_20190529180356-v4/17-USB3-201-202-FW/K2026090.mem
Binary files differ
diff --git a/linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp b/src/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp
similarity index 100%
rename from linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/Android.bp
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/RB3_firmware_20190529180356-v4/LICENSE.qcom.txt
rename to 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
similarity index 66%
rename from linaro_devices/qcom/db845c/device.mk
rename to 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 @@
# 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/BTFM.bin
Binary files differ
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/LICENSE
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/MD5SUMS.txt
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/abl.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/aop.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/boot-erase.img
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/cmnlib64.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/devcfg.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/dspso.bin
Binary files differ
diff --git a/linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall b/src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/flashall
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_backup5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_both5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/gpt_main5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/hyp.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/imagefv.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/keymaster64.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch0.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch1.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch2.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch3.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch4.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/patch5.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/prog_firehose_ddr.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/qupv3fw.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram0.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram1.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram2.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram3.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram4.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/rawprogram5.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/sec.dat
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/storsec.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/tz.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf
rename to src/qcom/db845c/dragonboard-845c-bootloader-ufs-aosp/xbl_config.elf
Binary files differ
diff --git a/linaro_devices/qcom/db845c/qdl/LICENSE b/src/qcom/db845c/qdl/LICENSE
similarity index 100%
rename from linaro_devices/qcom/db845c/qdl/LICENSE
rename to src/qcom/db845c/qdl/LICENSE
diff --git a/linaro_devices/qcom/db845c/qdl/qdl b/src/qcom/db845c/qdl/qdl
similarity index 100%
rename from linaro_devices/qcom/db845c/qdl/qdl
rename to src/qcom/db845c/qdl/qdl
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04
rename to src/qcom/rb5/RB5_firmware_20210331-v4/38-bdwlan_split/bdwlan.e04
Binary files differ
diff --git a/linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/Android.bp b/src/qcom/rb5/RB5_firmware_20210331-v4/Android.bp
similarity index 100%
rename from linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/Android.bp
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/RB5_firmware_20210331-v4/LICENSE.qcom.txt
rename to 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
similarity index 65%
rename from linaro_devices/qcom/rb5/device.mk
rename to 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 @@
# 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
similarity index 100%
rename from linaro_devices/qcom/rb5/qdl/LICENSE
rename to src/qcom/rb5/qdl/LICENSE
diff --git a/linaro_devices/qcom/rb5/qdl/qdl b/src/qcom/rb5/qdl/qdl
similarity index 100%
rename from linaro_devices/qcom/rb5/qdl/qdl
rename to src/qcom/rb5/qdl/qdl
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE b/src/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/LICENSE
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/MD5SUMS.txt
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/abl.elf
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/aop.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/apdp.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/boot-erase.img
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/cdt.bin
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/cmnlib64.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/devcfg.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin b/src/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/dspso.bin
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/featenabler.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/flashall b/src/qcom/rb5/rb5-bootloader-ufs-aosp/flashall
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/flashall
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_backup5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_both5.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main0.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main1.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main2.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main3.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main4.bin
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/gpt_main5.bin
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/hyp.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/km4.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/multi_image.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch0.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch1.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch2.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch3.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch4.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/patch5.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/prog_firehose_ddr.elf
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/qupv3fw.elf
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml b/src/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram0.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram1.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram2.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram3.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram4.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/rawprogram5.xml
rename to 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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/spunvm.bin
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn b/src/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/tz.mbn
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/uefi_sec.mbn
Binary files differ
diff --git a/linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf b/src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl.elf
Binary files differ
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
similarity index 100%
rename from linaro_devices/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf
rename to src/qcom/rb5/rb5-bootloader-ufs-aosp/xbl_config.elf
Binary files differ