Merge pull request #456 from Telecominfraproject/main

Merging Fixes for WIFI-9630 and others

feeds/ipq807x/ipq807x/base-files/etc/init.d/bootcount

@@ -11,7 +11,7 @@ boot() {
 	edgecore,eap101|\
 	edgecore,eap102)
 		avail=$(fw_printenv -n upgrade_available)
-		[ ${avail} -eq 0 ] && fw_setenv upgrade_available 1
+		[ "${avail}" -eq 1 ] || fw_setenv upgrade_available 1
 		fw_setenv bootcount 0
 		;;
 	esac

feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh

@@ -44,7 +44,7 @@ do_flash_emmc() {
 	}
 
 	echo erase $4
-	dd if=/dev/zero of=${emmcblock}
+	dd if=/dev/zero of=${emmcblock} 2> /dev/null
 	echo flash $4
 	tar Oxf $tar_file ${board_dir}/$part | dd of=${emmcblock}
 }
@@ -59,7 +59,7 @@ emmc_do_upgrade() {
 
 	local emmcblock="$(find_mmc_part "rootfs_data")"
         if [ -e "$emmcblock" ]; then
-                mkfs.ext4 "$emmcblock"
+                mkfs.ext4 -F "$emmcblock"
         fi
 }
 

feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-q14.dts

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "../../../arm64/boot/dts/qcom/qcom-ipq5018-q14.dts"
+
+/ {
+	pmuv8: pmu {
+		compatible = "arm,cortex-a7-pmu";
+	};
+};