From f85ad474b4e454a3f3372cc1c32f1de2a227c135 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Wed, 7 Jul 2021 15:37:06 +0800
Subject: [PATCH] luci-app-turboacc: use SFE by default

---
 package/lean/luci-app-turboacc/Makefile             |  4 ++--
 target/linux/ath79/dts/qca9558_arris_sbr-ac1750.dts | 12 +++++++++++-
 target/linux/ath79/image/nand.mk                    |  3 ++-
 target/linux/ath79/nand/target.mk                   |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/package/lean/luci-app-turboacc/Makefile b/package/lean/luci-app-turboacc/Makefile
index 09e80eb63..a5c195daf 100644
--- a/package/lean/luci-app-turboacc/Makefile
+++ b/package/lean/luci-app-turboacc/Makefile
@@ -24,11 +24,11 @@ define Package/luci-app-turboacc/config
 config PACKAGE_TURBOACC_INCLUDE_OFFLOADING
 	bool "Include Flow Offload"
 	depends on PACKAGE_TURBOACC_INCLUDE_SHORTCUT_FE=n
-	default y
+	default y if i386||x86_64||TARGET_ramips_mt7621
 
 config PACKAGE_TURBOACC_INCLUDE_SHORTCUT_FE
 	bool "Include Shortcut-FE"
-	default n
+	default y
 
 config PACKAGE_TURBOACC_INCLUDE_BBR_CCA
 	bool "Include BBR CCA"
diff --git a/target/linux/ath79/dts/qca9558_arris_sbr-ac1750.dts b/target/linux/ath79/dts/qca9558_arris_sbr-ac1750.dts
index cfbf9697d..8a505a194 100644
--- a/target/linux/ath79/dts/qca9558_arris_sbr-ac1750.dts
+++ b/target/linux/ath79/dts/qca9558_arris_sbr-ac1750.dts
@@ -133,7 +133,7 @@
 			reg = <0x100000 0x100000>;
 		};
 
-		partition@200000 {
+		kernel: partition@200000 {
 			label = "kernel";
 			reg = <0x200000 0x400000>;
 		};
@@ -160,6 +160,16 @@
 			reg = <0x6d00000 0x100000>;
 			read-only;
 		};
+		
+		kfs: partition@kfs {
+			label = "kfs";
+			reg = <0x200000 0x2400000>;
+		};
+		
+		kfs2: partition@kfs2 {
+			label = "kfs2";
+			reg = <0x2600000 0x2400000>;
+		};
 	};
 };
 
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 1451e34ea..971eae1fe 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -70,9 +70,10 @@ define Device/arris_sbr-ac1750
   PAGESIZE := 2048
   KERNEL := kernel-bin | append-dtb | gzip | uImage gzip
   KERNEL_INITRAMFS := kernel-bin | append-dtb | uImage none
-  IMAGES += kernel1.bin rootfs1.bin
+  IMAGES += kernel1.bin rootfs1.bin factory-kfs.bin
   IMAGE/kernel1.bin := append-kernel | check-size $$$$(KERNEL_SIZE)
   IMAGE/rootfs1.bin := append-ubi | check-size
+  IMAGE/factory-kfs.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
 endef
diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk
index 7ea9b57f4..a852cf0c0 100644
--- a/target/linux/ath79/nand/target.mk
+++ b/target/linux/ath79/nand/target.mk
@@ -2,7 +2,7 @@ BOARDNAME := Generic devices with NAND flash
 
 FEATURES += nand
 
-DEFAULT_PACKAGES += wpad-basic-wolfssl
+DEFAULT_PACKAGES += wpad-openssl
 
 define Target/Description
 	Firmware for boards using Qualcomm Atheros, MIPS-based SoCs