qualcommax: cleanup whitespace and sort-order

Replace blanks with tabs, also sort base-files alphabetically.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
Reviewed-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
index ee7707540b785337094bc801d11faa3967cfe291..6eb8ed2ce2785584006572f001dfa2c5418d97cb 100644 (file)
--- a/target/linux/qualcommax/image/ipq807x.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
@@ -48,16 +48,16 @@ endef
 TARGET_DEVICES += buffalo_wxr-5950ax12
 
 define Device/compex_wpq873
-       $(call Device/FitImage)
-       $(call Device/UbiFit)
-       DEVICE_VENDOR := Compex
-       DEVICE_MODEL := WPQ873
-       BLOCKSIZE := 128k
-       PAGESIZE := 2048
-       DEVICE_DTS_CONFIG := config@hk09.wpq873
-       SOC := ipq8072
-       DEVICE_PACKAGES := ipq-wifi-compex_wpq873
-       IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand
+       $(call Device/FitImage)
+       $(call Device/UbiFit)
+       DEVICE_VENDOR := Compex
+       DEVICE_MODEL := WPQ873
+       BLOCKSIZE := 128k
+       PAGESIZE := 2048
+       DEVICE_DTS_CONFIG := config@hk09.wpq873
+       SOC := ipq8072
+       DEVICE_PACKAGES := ipq-wifi-compex_wpq873
+       IMAGE/factory.ubi := append-ubi | qsdk-ipq-factory-nand
 endef
 TARGET_DEVICES += compex_wpq873
 
@@ -242,18 +242,6 @@ endif
 endef
 TARGET_DEVICES += xiaomi_ax9000
 
-define Device/zyxel_nbg7815
-       $(call Device/FitImage)
-       $(call Device/EmmcImage)
-       DEVICE_VENDOR := ZYXEL
-       DEVICE_MODEL := NBG7815
-       DEVICE_DTS_CONFIG := config@nbg7815
-       SOC := ipq8074
-       DEVICE_PACKAGES += ipq-wifi-zyxel_nbg7815 kmod-ath11k-pci kmod-hwmon-tmp103 \
-               kmod-bluetooth
-endef
-TARGET_DEVICES += zyxel_nbg7815
-
 define Device/yuncore_ax880
        $(call Device/FitImage)
        $(call Device/UbiFit)
@@ -269,3 +257,14 @@ define Device/yuncore_ax880
 endef
 TARGET_DEVICES += yuncore_ax880
 
+define Device/zyxel_nbg7815
+       $(call Device/FitImage)
+       $(call Device/EmmcImage)
+       DEVICE_VENDOR := ZYXEL
+       DEVICE_MODEL := NBG7815
+       DEVICE_DTS_CONFIG := config@nbg7815
+       SOC := ipq8074
+       DEVICE_PACKAGES += ipq-wifi-zyxel_nbg7815 kmod-ath11k-pci \
+               kmod-bluetooth kmod-hwmon-tmp103
+endef
+TARGET_DEVICES += zyxel_nbg7815

diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network
index 95f1ab4bdf5c7bbf928413fc845f9447ee582405..82f16519aaf2c081ec3b6e875285f87182f500e8 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network
@@ -16,6 +16,11 @@ ipq807x_setup_interfaces()
        xiaomi,ax9000)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
                ;;
+       compex,wpq873|\
+       redmi,ax6|\
+       xiaomi,ax3600)
+               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
+               ;;
        edgecore,eap102|\
        yuncore,ax880)
                ucidef_set_interfaces_lan_wan "lan" "wan"
@@ -39,11 +44,6 @@ ipq807x_setup_interfaces()
        qnap,301w)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 10g-2" "10g-1"
                ;;
-       compex,wpq873|\
-       redmi,ax6|\
-       xiaomi,ax3600)
-               ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
-               ;;
        zyxel,nbg7815)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 10g" "wan"
                ;;

diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
index f427009669e65ec92c04e0beccefde8a152e36d1..6139ff0faae7b64d158bdd4f7fa4508bc63681b7 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
@@ -11,9 +11,9 @@ case "$FIRMWARE" in
        case "$board" in
        buffalo,wxr-5950ax12|\
        compex,wpq873|\
+       dynalink,dl-wrx36|\
        edgecore,eap102|\
        edimax,cax1800|\
-       dynalink,dl-wrx36|\
        netgear,rax120v2|\
        netgear,wax218|\
        netgear,wax620|\
@@ -27,7 +27,7 @@ case "$FIRMWARE" in
                caldata_extract "0:art" 0x1000 0x20000
                ;;
        prpl,haze)
-                caldata_extract_mmc "0:ART" 0x1000 0x20000
+               caldata_extract_mmc "0:ART" 0x1000 0x20000
                ;;
        esac
        ;;
@@ -35,7 +35,7 @@ case "$FIRMWARE" in
 "ath11k/QCN9074/hw1.0/cal-pci-0001:01:00.0.bin")
        case "$board" in
        prpl,haze)
-                caldata_extract_mmc "0:ART" 0x26800 0x20000
+               caldata_extract_mmc "0:ART" 0x26800 0x20000
                ;;
        xiaomi,ax9000)
                caldata_extract "0:art" 0x26800 0x20000

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
index dac9ddd5686544d50bd9ae806d753728017f892d..21cd7928e303f4c2b17d35463109658e524db329 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/mmc.sh
@@ -18,11 +18,11 @@ mmc_do_upgrade() {
        local rootfs=
        local kernel=
 
-                       [ -z "$kernel" ] && kernel=$(find_mmc_part ${kernelname})
-                       [ -z "$rootfs" ] && rootfs=$(find_mmc_part ${rootfsname})
+       [ -z "$kernel" ] && kernel=$(find_mmc_part ${kernelname})
+       [ -z "$rootfs" ] && rootfs=$(find_mmc_part ${rootfsname})
 
-                       [ -z "$kernel" ] && echo "Upgrade failed: kernel partition not found! Rebooting..." && reboot -f
-                       [ -z "$rootfs" ] && echo "Upgrade failed: rootfs partition not found! Rebooting..." && reboot -f
+       [ -z "$kernel" ] && echo "Upgrade failed: kernel partition not found! Rebooting..." && reboot -f
+       [ -z "$rootfs" ] && echo "Upgrade failed: rootfs partition not found! Rebooting..." && reboot -f
 
        mmc_do_flash $tar_file $kernel $rootfs
 

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
index 19bd54cf4e45ac1b0c985d0eda26a3fec2701e68..cddf287b5e0f345b2a471394bbd1e46ce0078c7d 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -51,7 +51,13 @@ platform_do_upgrade() {
                nand_do_restore_config || nand_do_upgrade_failed
                buffalo_upgrade_optvol
                ;;
-       dynalink,dl-wrx36)
+       compex,wpq873|\
+       dynalink,dl-wrx36|\
+       edimax,cax1800|\
+       netgear,rax120v2|\
+       netgear,wax218|\
+       netgear,wax620|\
+       netgear,wax630)
                nand_do_upgrade "$1"
                ;;
        edgecore,eap102)
@@ -66,34 +72,12 @@ platform_do_upgrade() {
                fw_setenv upgrade_available 1
                nand_do_upgrade "$1"
                ;;
-       compex,wpq873|\
-       edimax,cax1800|\
-       netgear,rax120v2|\
-       netgear,wax218|\
-       netgear,wax620|\
-       netgear,wax630)
-               nand_do_upgrade "$1"
-               ;;
        prpl,haze|\
        qnap,301w)
                kernelname="0:HLOS"
                rootfsname="rootfs"
                mmc_do_upgrade "$1"
                ;;
-       zyxel,nbg7815)
-               local config_mtdnum="$(find_mtd_index 0:bootconfig)"
-               [ -z "$config_mtdnum" ] && reboot
-               part_num="$(hexdump -e '1/1 "%01x|"' -n 1 -s 168 -C /dev/mtd$config_mtdnum | cut -f 1 -d "|" | head -n1)"
-               if [ "$part_num" -eq "0" ]; then
-                       kernelname="0:HLOS"
-                       rootfsname="rootfs"
-                       mmc_do_upgrade "$1"
-               else
-                       kernelname="0:HLOS_1"
-                       rootfsname="rootfs_1"
-                       mmc_do_upgrade "$1"
-               fi
-               ;;
        redmi,ax6|\
        xiaomi,ax3600|\
        xiaomi,ax9000)
@@ -125,6 +109,20 @@ platform_do_upgrade() {
                fw_setenv upgrade_available 1
                nand_do_upgrade "$1"
                ;;
+       zyxel,nbg7815)
+               local config_mtdnum="$(find_mtd_index 0:bootconfig)"
+               [ -z "$config_mtdnum" ] && reboot
+               part_num="$(hexdump -e '1/1 "%01x|"' -n 1 -s 168 -C /dev/mtd$config_mtdnum | cut -f 1 -d "|" | head -n1)"
+               if [ "$part_num" -eq "0" ]; then
+                       kernelname="0:HLOS"
+                       rootfsname="rootfs"
+                       mmc_do_upgrade "$1"
+               else
+                       kernelname="0:HLOS_1"
+                       rootfsname="rootfs_1"
+                       mmc_do_upgrade "$1"
+               fi
+               ;;
        *)
                default_do_upgrade "$1"
                ;;