From c590ed74cf80f5b84a481637e621f924fcca29c6 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 23 Jun 2020 13:04:39 +0200
Subject: [PATCH] firmware/*: move rest of firmware packages to device/testing
 (MR 1362)

After moving the firmware packages used by devices in community to
device/community, move the rest of the firmware packages to device/testing.
---
 .gitlab-ci/testcases/test_directory_structure.py                 | 1 -
 {firmware => device/testing}/firmware-adreno/APKBUILD            | 0
 {firmware => device/testing}/firmware-alcatel-pop7lte/APKBUILD   | 0
 .../testing}/firmware-aosp-broadcom-wlan/APKBUILD                | 0
 {firmware => device/testing}/firmware-asus-duma/APKBUILD         | 0
 {firmware => device/testing}/firmware-asus-flo/APKBUILD          | 0
 {firmware => device/testing}/firmware-asus-grouper/APKBUILD      | 0
 .../firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt     | 0
 {firmware => device/testing}/firmware-asus-z00t/APKBUILD         | 0
 .../firmware-chuwi-hi10plus/20-touchscreen-firmware.files        | 0
 {firmware => device/testing}/firmware-chuwi-hi10plus/APKBUILD    | 0
 {firmware => device/testing}/firmware-fairphone-fp2/APKBUILD     | 0
 .../testing}/firmware-google-crosshatch-mainline-dtbo/APKBUILD   | 0
 {firmware => device/testing}/firmware-google-glass/APKBUILD      | 0
 {firmware => device/testing}/firmware-hisense-m470bsa/APKBUILD   | 0
 {firmware => device/testing}/firmware-htc-flounder/APKBUILD      | 0
 {firmware => device/testing}/firmware-htc-k2ul/APKBUILD          | 0
 {firmware => device/testing}/firmware-htc-m8/APKBUILD            | 0
 {firmware => device/testing}/firmware-htc-memul/APKBUILD         | 0
 {firmware => device/testing}/firmware-htc-ville/APKBUILD         | 0
 {firmware => device/testing}/firmware-huawei-y530/APKBUILD       | 0
 {firmware => device/testing}/firmware-leeco-s2/APKBUILD          | 0
 {firmware => device/testing}/firmware-lenovo-karate/APKBUILD     | 0
 {firmware => device/testing}/firmware-lg-hammerhead/APKBUILD     | 0
 {firmware => device/testing}/firmware-motorola-cedric/APKBUILD   | 0
 {firmware => device/testing}/firmware-motorola-channel/APKBUILD  | 0
 {firmware => device/testing}/firmware-motorola-def/APKBUILD      | 0
 {firmware => device/testing}/firmware-motorola-falcon/APKBUILD   | 0
 {firmware => device/testing}/firmware-motorola-montana/APKBUILD  | 0
 {firmware => device/testing}/firmware-motorola-perry/APKBUILD    | 0
 {firmware => device/testing}/firmware-motorola-titan/APKBUILD    | 0
 .../firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files       | 0
 {firmware => device/testing}/firmware-oneplus-oneplus3/APKBUILD  | 0
 {firmware => device/testing}/firmware-oneplus-sdm845/APKBUILD    | 0
 .../testing}/firmware-oneplus-sdm845/firmware.files              | 0
 {firmware => device/testing}/firmware-oppo-find-7a/APKBUILD      | 0
 .../testing}/firmware-oppo-find-7a/oppo_checksums.txt            | 0
 {firmware => device/testing}/firmware-ouya-ouya/APKBUILD         | 0
 .../testing}/firmware-pine64-pinebookpro/APKBUILD                | 0
 {firmware => device/testing}/firmware-samsung-apexq/APKBUILD     | 0
 .../testing}/firmware-samsung-baffinlite/APKBUILD                | 0
 {firmware => device/testing}/firmware-samsung-crespo/APKBUILD    | 0
 .../testing}/firmware-samsung-espresso10/APKBUILD                | 0
 {firmware => device/testing}/firmware-samsung-golden/APKBUILD    | 0
 {firmware => device/testing}/firmware-samsung-gt510wifi/APKBUILD | 0
 {firmware => device/testing}/firmware-samsung-hero/APKBUILD      | 0
 {firmware => device/testing}/firmware-samsung-i747m/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-i9070/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-i9100/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-i9195/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-i927/APKBUILD      | 0
 {firmware => device/testing}/firmware-samsung-i9305/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-j53g/APKBUILD      | 0
 {firmware => device/testing}/firmware-samsung-j5nlte/APKBUILD    | 0
 {firmware => device/testing}/firmware-samsung-jflte/APKBUILD     | 0
 {firmware => device/testing}/firmware-samsung-klte/APKBUILD      | 0
 {firmware => device/testing}/firmware-samsung-kminilte/APKBUILD  | 0
 .../firmware-samsung-kminilte.post-install                       | 0
 {firmware => device/testing}/firmware-samsung-kylepro/APKBUILD   | 0
 {firmware => device/testing}/firmware-samsung-lt01wifi/APKBUILD  | 0
 {firmware => device/testing}/firmware-samsung-maguro/APKBUILD    | 0
 .../testing}/firmware-samsung-matissevewifi/APKBUILD             | 0
 {firmware => device/testing}/firmware-samsung-nevisp/APKBUILD    | 0
 {firmware => device/testing}/firmware-samsung-p4wifi/APKBUILD    | 0
 .../testing}/firmware-samsung-universal7880/APKBUILD             | 0
 {firmware => device/testing}/firmware-sony-leo/APKBUILD          | 0
 {firmware => device/testing}/firmware-sony-rhine/APKBUILD        | 0
 {firmware => device/testing}/firmware-sony-sumire/APKBUILD       | 0
 {firmware => device/testing}/firmware-sony-sumire/wlan_macaddr0  | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_2_4g              | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_5g_high           | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_5g_low            | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_5g_mid            | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_co1_2_4g          | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_co1_5g_high       | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_co1_5g_low        | 0
 .../testing}/firmware-sony-sumire/wlan_txpower_co1_5g_mid        | 0
 .../testing}/firmware-surftab-wintron7.0/APKBUILD                | 0
 {firmware => device/testing}/firmware-t2m-flame/APKBUILD         | 0
 {firmware => device/testing}/firmware-xiaomi-armani/APKBUILD     | 0
 {firmware => device/testing}/firmware-xiaomi-beryllium/APKBUILD  | 0
 {firmware => device/testing}/firmware-xiaomi-ferrari/APKBUILD    | 0
 {firmware => device/testing}/firmware-xiaomi-kenzo/APKBUILD      | 0
 {firmware => device/testing}/firmware-xiaomi-mido/APKBUILD       | 0
 {firmware => device/testing}/firmware-xiaomi-santoni/APKBUILD    | 0
 {firmware => device/testing}/firmware-xiaomi-tissot/APKBUILD     | 0
 {firmware => device/testing}/firmware-xiaomi-vince/APKBUILD      | 0
 {firmware => device/testing}/firmware-xiaomi-willow/APKBUILD     | 0
 {firmware => device/testing}/firmware-zuk-z2-row/APKBUILD        | 0
 89 files changed, 1 deletion(-)
 rename {firmware => device/testing}/firmware-adreno/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-alcatel-pop7lte/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-aosp-broadcom-wlan/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-asus-duma/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-asus-flo/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-asus-grouper/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt (100%)
 rename {firmware => device/testing}/firmware-asus-z00t/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-chuwi-hi10plus/20-touchscreen-firmware.files (100%)
 rename {firmware => device/testing}/firmware-chuwi-hi10plus/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-fairphone-fp2/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-google-crosshatch-mainline-dtbo/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-google-glass/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-hisense-m470bsa/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-htc-flounder/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-htc-k2ul/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-htc-m8/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-htc-memul/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-htc-ville/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-huawei-y530/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-leeco-s2/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-lenovo-karate/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-lg-hammerhead/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-cedric/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-channel/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-def/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-falcon/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-montana/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-perry/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-motorola-titan/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files (100%)
 rename {firmware => device/testing}/firmware-oneplus-oneplus3/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-oneplus-sdm845/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-oneplus-sdm845/firmware.files (100%)
 rename {firmware => device/testing}/firmware-oppo-find-7a/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-oppo-find-7a/oppo_checksums.txt (100%)
 rename {firmware => device/testing}/firmware-ouya-ouya/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-pine64-pinebookpro/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-apexq/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-baffinlite/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-crespo/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-espresso10/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-golden/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-gt510wifi/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-hero/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i747m/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i9070/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i9100/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i9195/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i927/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-i9305/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-j53g/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-j5nlte/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-jflte/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-klte/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-kminilte/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-kminilte/firmware-samsung-kminilte.post-install (100%)
 rename {firmware => device/testing}/firmware-samsung-kylepro/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-lt01wifi/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-maguro/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-matissevewifi/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-nevisp/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-p4wifi/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-samsung-universal7880/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-sony-leo/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-sony-rhine/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_macaddr0 (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_2_4g (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_5g_high (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_5g_low (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_5g_mid (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_co1_2_4g (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_co1_5g_high (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_co1_5g_low (100%)
 rename {firmware => device/testing}/firmware-sony-sumire/wlan_txpower_co1_5g_mid (100%)
 rename {firmware => device/testing}/firmware-surftab-wintron7.0/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-t2m-flame/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-armani/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-beryllium/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-ferrari/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-kenzo/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-mido/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-santoni/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-tissot/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-vince/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-xiaomi-willow/APKBUILD (100%)
 rename {firmware => device/testing}/firmware-zuk-z2-row/APKBUILD (100%)

diff --git a/.gitlab-ci/testcases/test_directory_structure.py b/.gitlab-ci/testcases/test_directory_structure.py
index e96c555cc..3f1320d64 100644
--- a/.gitlab-ci/testcases/test_directory_structure.py
+++ b/.gitlab-ci/testcases/test_directory_structure.py
@@ -10,7 +10,6 @@ expected_directories = [
     "device/community",
     "device/main",
     "device/testing",
-    "firmware",
     "hybris",
     "kde",
     "maemo",
diff --git a/firmware/firmware-adreno/APKBUILD b/device/testing/firmware-adreno/APKBUILD
similarity index 100%
rename from firmware/firmware-adreno/APKBUILD
rename to device/testing/firmware-adreno/APKBUILD
diff --git a/firmware/firmware-alcatel-pop7lte/APKBUILD b/device/testing/firmware-alcatel-pop7lte/APKBUILD
similarity index 100%
rename from firmware/firmware-alcatel-pop7lte/APKBUILD
rename to device/testing/firmware-alcatel-pop7lte/APKBUILD
diff --git a/firmware/firmware-aosp-broadcom-wlan/APKBUILD b/device/testing/firmware-aosp-broadcom-wlan/APKBUILD
similarity index 100%
rename from firmware/firmware-aosp-broadcom-wlan/APKBUILD
rename to device/testing/firmware-aosp-broadcom-wlan/APKBUILD
diff --git a/firmware/firmware-asus-duma/APKBUILD b/device/testing/firmware-asus-duma/APKBUILD
similarity index 100%
rename from firmware/firmware-asus-duma/APKBUILD
rename to device/testing/firmware-asus-duma/APKBUILD
diff --git a/firmware/firmware-asus-flo/APKBUILD b/device/testing/firmware-asus-flo/APKBUILD
similarity index 100%
rename from firmware/firmware-asus-flo/APKBUILD
rename to device/testing/firmware-asus-flo/APKBUILD
diff --git a/firmware/firmware-asus-grouper/APKBUILD b/device/testing/firmware-asus-grouper/APKBUILD
similarity index 100%
rename from firmware/firmware-asus-grouper/APKBUILD
rename to device/testing/firmware-asus-grouper/APKBUILD
diff --git a/firmware/firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt b/device/testing/firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt
similarity index 100%
rename from firmware/firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt
rename to device/testing/firmware-asus-grouper/brcmfmac4330-sdio.asus,tilapia.txt
diff --git a/firmware/firmware-asus-z00t/APKBUILD b/device/testing/firmware-asus-z00t/APKBUILD
similarity index 100%
rename from firmware/firmware-asus-z00t/APKBUILD
rename to device/testing/firmware-asus-z00t/APKBUILD
diff --git a/firmware/firmware-chuwi-hi10plus/20-touchscreen-firmware.files b/device/testing/firmware-chuwi-hi10plus/20-touchscreen-firmware.files
similarity index 100%
rename from firmware/firmware-chuwi-hi10plus/20-touchscreen-firmware.files
rename to device/testing/firmware-chuwi-hi10plus/20-touchscreen-firmware.files
diff --git a/firmware/firmware-chuwi-hi10plus/APKBUILD b/device/testing/firmware-chuwi-hi10plus/APKBUILD
similarity index 100%
rename from firmware/firmware-chuwi-hi10plus/APKBUILD
rename to device/testing/firmware-chuwi-hi10plus/APKBUILD
diff --git a/firmware/firmware-fairphone-fp2/APKBUILD b/device/testing/firmware-fairphone-fp2/APKBUILD
similarity index 100%
rename from firmware/firmware-fairphone-fp2/APKBUILD
rename to device/testing/firmware-fairphone-fp2/APKBUILD
diff --git a/firmware/firmware-google-crosshatch-mainline-dtbo/APKBUILD b/device/testing/firmware-google-crosshatch-mainline-dtbo/APKBUILD
similarity index 100%
rename from firmware/firmware-google-crosshatch-mainline-dtbo/APKBUILD
rename to device/testing/firmware-google-crosshatch-mainline-dtbo/APKBUILD
diff --git a/firmware/firmware-google-glass/APKBUILD b/device/testing/firmware-google-glass/APKBUILD
similarity index 100%
rename from firmware/firmware-google-glass/APKBUILD
rename to device/testing/firmware-google-glass/APKBUILD
diff --git a/firmware/firmware-hisense-m470bsa/APKBUILD b/device/testing/firmware-hisense-m470bsa/APKBUILD
similarity index 100%
rename from firmware/firmware-hisense-m470bsa/APKBUILD
rename to device/testing/firmware-hisense-m470bsa/APKBUILD
diff --git a/firmware/firmware-htc-flounder/APKBUILD b/device/testing/firmware-htc-flounder/APKBUILD
similarity index 100%
rename from firmware/firmware-htc-flounder/APKBUILD
rename to device/testing/firmware-htc-flounder/APKBUILD
diff --git a/firmware/firmware-htc-k2ul/APKBUILD b/device/testing/firmware-htc-k2ul/APKBUILD
similarity index 100%
rename from firmware/firmware-htc-k2ul/APKBUILD
rename to device/testing/firmware-htc-k2ul/APKBUILD
diff --git a/firmware/firmware-htc-m8/APKBUILD b/device/testing/firmware-htc-m8/APKBUILD
similarity index 100%
rename from firmware/firmware-htc-m8/APKBUILD
rename to device/testing/firmware-htc-m8/APKBUILD
diff --git a/firmware/firmware-htc-memul/APKBUILD b/device/testing/firmware-htc-memul/APKBUILD
similarity index 100%
rename from firmware/firmware-htc-memul/APKBUILD
rename to device/testing/firmware-htc-memul/APKBUILD
diff --git a/firmware/firmware-htc-ville/APKBUILD b/device/testing/firmware-htc-ville/APKBUILD
similarity index 100%
rename from firmware/firmware-htc-ville/APKBUILD
rename to device/testing/firmware-htc-ville/APKBUILD
diff --git a/firmware/firmware-huawei-y530/APKBUILD b/device/testing/firmware-huawei-y530/APKBUILD
similarity index 100%
rename from firmware/firmware-huawei-y530/APKBUILD
rename to device/testing/firmware-huawei-y530/APKBUILD
diff --git a/firmware/firmware-leeco-s2/APKBUILD b/device/testing/firmware-leeco-s2/APKBUILD
similarity index 100%
rename from firmware/firmware-leeco-s2/APKBUILD
rename to device/testing/firmware-leeco-s2/APKBUILD
diff --git a/firmware/firmware-lenovo-karate/APKBUILD b/device/testing/firmware-lenovo-karate/APKBUILD
similarity index 100%
rename from firmware/firmware-lenovo-karate/APKBUILD
rename to device/testing/firmware-lenovo-karate/APKBUILD
diff --git a/firmware/firmware-lg-hammerhead/APKBUILD b/device/testing/firmware-lg-hammerhead/APKBUILD
similarity index 100%
rename from firmware/firmware-lg-hammerhead/APKBUILD
rename to device/testing/firmware-lg-hammerhead/APKBUILD
diff --git a/firmware/firmware-motorola-cedric/APKBUILD b/device/testing/firmware-motorola-cedric/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-cedric/APKBUILD
rename to device/testing/firmware-motorola-cedric/APKBUILD
diff --git a/firmware/firmware-motorola-channel/APKBUILD b/device/testing/firmware-motorola-channel/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-channel/APKBUILD
rename to device/testing/firmware-motorola-channel/APKBUILD
diff --git a/firmware/firmware-motorola-def/APKBUILD b/device/testing/firmware-motorola-def/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-def/APKBUILD
rename to device/testing/firmware-motorola-def/APKBUILD
diff --git a/firmware/firmware-motorola-falcon/APKBUILD b/device/testing/firmware-motorola-falcon/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-falcon/APKBUILD
rename to device/testing/firmware-motorola-falcon/APKBUILD
diff --git a/firmware/firmware-motorola-montana/APKBUILD b/device/testing/firmware-motorola-montana/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-montana/APKBUILD
rename to device/testing/firmware-motorola-montana/APKBUILD
diff --git a/firmware/firmware-motorola-perry/APKBUILD b/device/testing/firmware-motorola-perry/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-perry/APKBUILD
rename to device/testing/firmware-motorola-perry/APKBUILD
diff --git a/firmware/firmware-motorola-titan/APKBUILD b/device/testing/firmware-motorola-titan/APKBUILD
similarity index 100%
rename from firmware/firmware-motorola-titan/APKBUILD
rename to device/testing/firmware-motorola-titan/APKBUILD
diff --git a/firmware/firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files b/device/testing/firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files
similarity index 100%
rename from firmware/firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files
rename to device/testing/firmware-oneplus-oneplus3/20-adreno-gpu-firmware.files
diff --git a/firmware/firmware-oneplus-oneplus3/APKBUILD b/device/testing/firmware-oneplus-oneplus3/APKBUILD
similarity index 100%
rename from firmware/firmware-oneplus-oneplus3/APKBUILD
rename to device/testing/firmware-oneplus-oneplus3/APKBUILD
diff --git a/firmware/firmware-oneplus-sdm845/APKBUILD b/device/testing/firmware-oneplus-sdm845/APKBUILD
similarity index 100%
rename from firmware/firmware-oneplus-sdm845/APKBUILD
rename to device/testing/firmware-oneplus-sdm845/APKBUILD
diff --git a/firmware/firmware-oneplus-sdm845/firmware.files b/device/testing/firmware-oneplus-sdm845/firmware.files
similarity index 100%
rename from firmware/firmware-oneplus-sdm845/firmware.files
rename to device/testing/firmware-oneplus-sdm845/firmware.files
diff --git a/firmware/firmware-oppo-find-7a/APKBUILD b/device/testing/firmware-oppo-find-7a/APKBUILD
similarity index 100%
rename from firmware/firmware-oppo-find-7a/APKBUILD
rename to device/testing/firmware-oppo-find-7a/APKBUILD
diff --git a/firmware/firmware-oppo-find-7a/oppo_checksums.txt b/device/testing/firmware-oppo-find-7a/oppo_checksums.txt
similarity index 100%
rename from firmware/firmware-oppo-find-7a/oppo_checksums.txt
rename to device/testing/firmware-oppo-find-7a/oppo_checksums.txt
diff --git a/firmware/firmware-ouya-ouya/APKBUILD b/device/testing/firmware-ouya-ouya/APKBUILD
similarity index 100%
rename from firmware/firmware-ouya-ouya/APKBUILD
rename to device/testing/firmware-ouya-ouya/APKBUILD
diff --git a/firmware/firmware-pine64-pinebookpro/APKBUILD b/device/testing/firmware-pine64-pinebookpro/APKBUILD
similarity index 100%
rename from firmware/firmware-pine64-pinebookpro/APKBUILD
rename to device/testing/firmware-pine64-pinebookpro/APKBUILD
diff --git a/firmware/firmware-samsung-apexq/APKBUILD b/device/testing/firmware-samsung-apexq/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-apexq/APKBUILD
rename to device/testing/firmware-samsung-apexq/APKBUILD
diff --git a/firmware/firmware-samsung-baffinlite/APKBUILD b/device/testing/firmware-samsung-baffinlite/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-baffinlite/APKBUILD
rename to device/testing/firmware-samsung-baffinlite/APKBUILD
diff --git a/firmware/firmware-samsung-crespo/APKBUILD b/device/testing/firmware-samsung-crespo/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-crespo/APKBUILD
rename to device/testing/firmware-samsung-crespo/APKBUILD
diff --git a/firmware/firmware-samsung-espresso10/APKBUILD b/device/testing/firmware-samsung-espresso10/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-espresso10/APKBUILD
rename to device/testing/firmware-samsung-espresso10/APKBUILD
diff --git a/firmware/firmware-samsung-golden/APKBUILD b/device/testing/firmware-samsung-golden/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-golden/APKBUILD
rename to device/testing/firmware-samsung-golden/APKBUILD
diff --git a/firmware/firmware-samsung-gt510wifi/APKBUILD b/device/testing/firmware-samsung-gt510wifi/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-gt510wifi/APKBUILD
rename to device/testing/firmware-samsung-gt510wifi/APKBUILD
diff --git a/firmware/firmware-samsung-hero/APKBUILD b/device/testing/firmware-samsung-hero/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-hero/APKBUILD
rename to device/testing/firmware-samsung-hero/APKBUILD
diff --git a/firmware/firmware-samsung-i747m/APKBUILD b/device/testing/firmware-samsung-i747m/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i747m/APKBUILD
rename to device/testing/firmware-samsung-i747m/APKBUILD
diff --git a/firmware/firmware-samsung-i9070/APKBUILD b/device/testing/firmware-samsung-i9070/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i9070/APKBUILD
rename to device/testing/firmware-samsung-i9070/APKBUILD
diff --git a/firmware/firmware-samsung-i9100/APKBUILD b/device/testing/firmware-samsung-i9100/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i9100/APKBUILD
rename to device/testing/firmware-samsung-i9100/APKBUILD
diff --git a/firmware/firmware-samsung-i9195/APKBUILD b/device/testing/firmware-samsung-i9195/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i9195/APKBUILD
rename to device/testing/firmware-samsung-i9195/APKBUILD
diff --git a/firmware/firmware-samsung-i927/APKBUILD b/device/testing/firmware-samsung-i927/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i927/APKBUILD
rename to device/testing/firmware-samsung-i927/APKBUILD
diff --git a/firmware/firmware-samsung-i9305/APKBUILD b/device/testing/firmware-samsung-i9305/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-i9305/APKBUILD
rename to device/testing/firmware-samsung-i9305/APKBUILD
diff --git a/firmware/firmware-samsung-j53g/APKBUILD b/device/testing/firmware-samsung-j53g/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-j53g/APKBUILD
rename to device/testing/firmware-samsung-j53g/APKBUILD
diff --git a/firmware/firmware-samsung-j5nlte/APKBUILD b/device/testing/firmware-samsung-j5nlte/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-j5nlte/APKBUILD
rename to device/testing/firmware-samsung-j5nlte/APKBUILD
diff --git a/firmware/firmware-samsung-jflte/APKBUILD b/device/testing/firmware-samsung-jflte/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-jflte/APKBUILD
rename to device/testing/firmware-samsung-jflte/APKBUILD
diff --git a/firmware/firmware-samsung-klte/APKBUILD b/device/testing/firmware-samsung-klte/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-klte/APKBUILD
rename to device/testing/firmware-samsung-klte/APKBUILD
diff --git a/firmware/firmware-samsung-kminilte/APKBUILD b/device/testing/firmware-samsung-kminilte/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-kminilte/APKBUILD
rename to device/testing/firmware-samsung-kminilte/APKBUILD
diff --git a/firmware/firmware-samsung-kminilte/firmware-samsung-kminilte.post-install b/device/testing/firmware-samsung-kminilte/firmware-samsung-kminilte.post-install
similarity index 100%
rename from firmware/firmware-samsung-kminilte/firmware-samsung-kminilte.post-install
rename to device/testing/firmware-samsung-kminilte/firmware-samsung-kminilte.post-install
diff --git a/firmware/firmware-samsung-kylepro/APKBUILD b/device/testing/firmware-samsung-kylepro/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-kylepro/APKBUILD
rename to device/testing/firmware-samsung-kylepro/APKBUILD
diff --git a/firmware/firmware-samsung-lt01wifi/APKBUILD b/device/testing/firmware-samsung-lt01wifi/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-lt01wifi/APKBUILD
rename to device/testing/firmware-samsung-lt01wifi/APKBUILD
diff --git a/firmware/firmware-samsung-maguro/APKBUILD b/device/testing/firmware-samsung-maguro/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-maguro/APKBUILD
rename to device/testing/firmware-samsung-maguro/APKBUILD
diff --git a/firmware/firmware-samsung-matissevewifi/APKBUILD b/device/testing/firmware-samsung-matissevewifi/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-matissevewifi/APKBUILD
rename to device/testing/firmware-samsung-matissevewifi/APKBUILD
diff --git a/firmware/firmware-samsung-nevisp/APKBUILD b/device/testing/firmware-samsung-nevisp/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-nevisp/APKBUILD
rename to device/testing/firmware-samsung-nevisp/APKBUILD
diff --git a/firmware/firmware-samsung-p4wifi/APKBUILD b/device/testing/firmware-samsung-p4wifi/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-p4wifi/APKBUILD
rename to device/testing/firmware-samsung-p4wifi/APKBUILD
diff --git a/firmware/firmware-samsung-universal7880/APKBUILD b/device/testing/firmware-samsung-universal7880/APKBUILD
similarity index 100%
rename from firmware/firmware-samsung-universal7880/APKBUILD
rename to device/testing/firmware-samsung-universal7880/APKBUILD
diff --git a/firmware/firmware-sony-leo/APKBUILD b/device/testing/firmware-sony-leo/APKBUILD
similarity index 100%
rename from firmware/firmware-sony-leo/APKBUILD
rename to device/testing/firmware-sony-leo/APKBUILD
diff --git a/firmware/firmware-sony-rhine/APKBUILD b/device/testing/firmware-sony-rhine/APKBUILD
similarity index 100%
rename from firmware/firmware-sony-rhine/APKBUILD
rename to device/testing/firmware-sony-rhine/APKBUILD
diff --git a/firmware/firmware-sony-sumire/APKBUILD b/device/testing/firmware-sony-sumire/APKBUILD
similarity index 100%
rename from firmware/firmware-sony-sumire/APKBUILD
rename to device/testing/firmware-sony-sumire/APKBUILD
diff --git a/firmware/firmware-sony-sumire/wlan_macaddr0 b/device/testing/firmware-sony-sumire/wlan_macaddr0
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_macaddr0
rename to device/testing/firmware-sony-sumire/wlan_macaddr0
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_2_4g b/device/testing/firmware-sony-sumire/wlan_txpower_2_4g
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_2_4g
rename to device/testing/firmware-sony-sumire/wlan_txpower_2_4g
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_5g_high b/device/testing/firmware-sony-sumire/wlan_txpower_5g_high
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_5g_high
rename to device/testing/firmware-sony-sumire/wlan_txpower_5g_high
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_5g_low b/device/testing/firmware-sony-sumire/wlan_txpower_5g_low
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_5g_low
rename to device/testing/firmware-sony-sumire/wlan_txpower_5g_low
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_5g_mid b/device/testing/firmware-sony-sumire/wlan_txpower_5g_mid
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_5g_mid
rename to device/testing/firmware-sony-sumire/wlan_txpower_5g_mid
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_co1_2_4g b/device/testing/firmware-sony-sumire/wlan_txpower_co1_2_4g
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_co1_2_4g
rename to device/testing/firmware-sony-sumire/wlan_txpower_co1_2_4g
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_co1_5g_high b/device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_high
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_co1_5g_high
rename to device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_high
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_co1_5g_low b/device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_low
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_co1_5g_low
rename to device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_low
diff --git a/firmware/firmware-sony-sumire/wlan_txpower_co1_5g_mid b/device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_mid
similarity index 100%
rename from firmware/firmware-sony-sumire/wlan_txpower_co1_5g_mid
rename to device/testing/firmware-sony-sumire/wlan_txpower_co1_5g_mid
diff --git a/firmware/firmware-surftab-wintron7.0/APKBUILD b/device/testing/firmware-surftab-wintron7.0/APKBUILD
similarity index 100%
rename from firmware/firmware-surftab-wintron7.0/APKBUILD
rename to device/testing/firmware-surftab-wintron7.0/APKBUILD
diff --git a/firmware/firmware-t2m-flame/APKBUILD b/device/testing/firmware-t2m-flame/APKBUILD
similarity index 100%
rename from firmware/firmware-t2m-flame/APKBUILD
rename to device/testing/firmware-t2m-flame/APKBUILD
diff --git a/firmware/firmware-xiaomi-armani/APKBUILD b/device/testing/firmware-xiaomi-armani/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-armani/APKBUILD
rename to device/testing/firmware-xiaomi-armani/APKBUILD
diff --git a/firmware/firmware-xiaomi-beryllium/APKBUILD b/device/testing/firmware-xiaomi-beryllium/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-beryllium/APKBUILD
rename to device/testing/firmware-xiaomi-beryllium/APKBUILD
diff --git a/firmware/firmware-xiaomi-ferrari/APKBUILD b/device/testing/firmware-xiaomi-ferrari/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-ferrari/APKBUILD
rename to device/testing/firmware-xiaomi-ferrari/APKBUILD
diff --git a/firmware/firmware-xiaomi-kenzo/APKBUILD b/device/testing/firmware-xiaomi-kenzo/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-kenzo/APKBUILD
rename to device/testing/firmware-xiaomi-kenzo/APKBUILD
diff --git a/firmware/firmware-xiaomi-mido/APKBUILD b/device/testing/firmware-xiaomi-mido/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-mido/APKBUILD
rename to device/testing/firmware-xiaomi-mido/APKBUILD
diff --git a/firmware/firmware-xiaomi-santoni/APKBUILD b/device/testing/firmware-xiaomi-santoni/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-santoni/APKBUILD
rename to device/testing/firmware-xiaomi-santoni/APKBUILD
diff --git a/firmware/firmware-xiaomi-tissot/APKBUILD b/device/testing/firmware-xiaomi-tissot/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-tissot/APKBUILD
rename to device/testing/firmware-xiaomi-tissot/APKBUILD
diff --git a/firmware/firmware-xiaomi-vince/APKBUILD b/device/testing/firmware-xiaomi-vince/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-vince/APKBUILD
rename to device/testing/firmware-xiaomi-vince/APKBUILD
diff --git a/firmware/firmware-xiaomi-willow/APKBUILD b/device/testing/firmware-xiaomi-willow/APKBUILD
similarity index 100%
rename from firmware/firmware-xiaomi-willow/APKBUILD
rename to device/testing/firmware-xiaomi-willow/APKBUILD
diff --git a/firmware/firmware-zuk-z2-row/APKBUILD b/device/testing/firmware-zuk-z2-row/APKBUILD
similarity index 100%
rename from firmware/firmware-zuk-z2-row/APKBUILD
rename to device/testing/firmware-zuk-z2-row/APKBUILD