diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 0293bba497..174a3fb1d5 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -3239,6 +3239,7 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_ROM is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
+# CONFIG_MTD_SBC_GXX is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
diff --git a/target/linux/x86/patches-5.4/999-thermal-tristate.patch b/target/linux/generic/hack-5.4/999-thermal-tristate.patch
similarity index 100%
rename from target/linux/x86/patches-5.4/999-thermal-tristate.patch
rename to target/linux/generic/hack-5.4/999-thermal-tristate.patch
diff --git a/target/linux/ramips/patches-5.4/998-thermal-bool.patch b/target/linux/ramips/patches-5.4/998-thermal-bool.patch
new file mode 100644
index 0000000000..5d2732ef64
--- /dev/null
+++ b/target/linux/ramips/patches-5.4/998-thermal-bool.patch
@@ -0,0 +1,11 @@
+--- a/drivers/thermal/Kconfig
++++ b/drivers/thermal/Kconfig
+@@ -4,7 +4,7 @@
+ #
+
+ menuconfig THERMAL
+-	tristate "Generic Thermal sysfs driver"
++	bool "Generic Thermal sysfs driver"
+ 	help
+ 	  Generic Thermal Sysfs driver offers a generic mechanism for
+ 	  thermal management. Usually it's made up of one or more thermal