From f095b225ddfa034aaec12831a8ad6617aa2e2788 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Tue, 7 Apr 2020 21:59:03 +0800
Subject: [PATCH] bcm27xx: rpi4: enable wifi in first boot (#4220)

---
 .../bcm27xx/base-files/lib/preinit/79_move_config |  2 +-
 .../base-files/lib/preinit/82_set_rpi_info        | 15 +++++++++++++++
 target/linux/bcm27xx/bcm2710/config-4.19          |  1 +
 target/linux/bcm27xx/bcm2711/config-4.19          |  3 ++-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info

diff --git a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
index b8738b645..a2a2efecb 100644
--- a/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/bcm27xx/base-files/lib/preinit/79_move_config
@@ -13,7 +13,7 @@ move_config() {
 		insmod vfat
 		mkdir -p /boot
 		mount -t vfat -o rw,noatime $BOOTPART /boot
-		[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
+		[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
 	fi
 }
 
diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info
new file mode 100644
index 000000000..ad83d90b4
--- /dev/null
+++ b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set_rpi_info() {
+	case "$(board_name)" in
+	raspberrypi,4-model-b)
+		sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
+		sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm
+		;;
+	*)
+		sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm
+		;;
+	esac
+}
+
+boot_hook_add preinit_main set_rpi_info
diff --git a/target/linux/bcm27xx/bcm2710/config-4.19 b/target/linux/bcm27xx/bcm2710/config-4.19
index 99c985965..80cd16728 100644
--- a/target/linux/bcm27xx/bcm2710/config-4.19
+++ b/target/linux/bcm27xx/bcm2710/config-4.19
@@ -542,6 +542,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
diff --git a/target/linux/bcm27xx/bcm2711/config-4.19 b/target/linux/bcm27xx/bcm2711/config-4.19
index 77f3f4554..6aa897a2e 100644
--- a/target/linux/bcm27xx/bcm2711/config-4.19
+++ b/target/linux/bcm27xx/bcm2711/config-4.19
@@ -510,6 +510,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RFS_ACCEL=y
+# CONFIG_RPI_AXIPERF is not set
 # CONFIG_RPIVID_MEM is not set
 CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -551,6 +552,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
@@ -583,4 +585,3 @@ CONFIG_XPS=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
 CONFIG_ZONE_DMA32=y
-# CONFIG_RPI_AXIPERF is not set