diff --git a/config/kernel/linux-mvebu-next.config b/config/kernel/linux-mvebu-next.config
index 53b0e8259..cc75f2101 100644
--- a/config/kernel/linux-mvebu-next.config
+++ b/config/kernel/linux-mvebu-next.config
@@ -4522,13 +4522,6 @@ CONFIG_TEST_HEXDUMP=m
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_KGDB=y
-CONFIG_KGDB_SERIAL_CONSOLE=y
-# CONFIG_KGDB_TESTS is not set
-CONFIG_KGDB_KDB=y
-CONFIG_KDB_DEFAULT_ENABLE=0x1
-CONFIG_KDB_KEYBOARD=y
-CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 # CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
diff --git a/config/sources/mvebu-helios4.inc b/config/sources/mvebu-helios4.inc
index 7dad9301f..a29de9f7f 100644
--- a/config/sources/mvebu-helios4.inc
+++ b/config/sources/mvebu-helios4.inc
@@ -27,7 +27,6 @@ family_tweaks_s()
 
 	next)
 		cp -R $SRC/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf $SDCARD/etc/fancontrol
-		#patch $SDCARD/usr/sbin/fancontrol < $SRC/packages/bsp/helios4/fancontrol.patch
 		;;
 	esac
 }
diff --git a/packages/bsp/helios4/fancontrol.patch b/packages/bsp/helios4/fancontrol.patch
deleted file mode 100644
index ce9ee7670..000000000
--- a/packages/bsp/helios4/fancontrol.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-@@ -157,9 +157,9 @@
- 
- function DevicePath()
- {
--	if [ -h "$1/device" ]
-+	if [ -h "$1" ]
- 	then
--		readlink -f "$1/device" | sed -e 's/^\/sys\///'
-+		readlink -f "$1" | sed -e 's/^\/sys\///;s/\/hwmon\/.*//'
- 	fi
- }
-
diff --git a/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf
index 72392c25f..21677774b 100644
--- a/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf
+++ b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-default.conf
@@ -1,10 +1,11 @@
 # Helios4 PWM Fan Control Configuration
-# Temp source : lm75 sensor
+# Temp source : /dev/thermal-board
 INTERVAL=10
-DEVPATH=hwmon0=devices/platform/j10-pwm hwmon1=devices/platform/j17-pwm hwmon2=devices/platform/soc/soc:internal-regs/f1011000.i2c/i2c-0/0-004c
-DEVNAME=hwmon0=pwmfan hwmon1=pwmfan hwmon2=lm75
-FCTEMPS=hwmon0/pwm1=hwmon2/temp1_input hwmon1/pwm1=hwmon2/temp1_input
-MINTEMP=hwmon0/pwm1=45 hwmon1/pwm1=45
-MAXTEMP=hwmon0/pwm1=65 hwmon1/pwm1=65
-MINSTART=hwmon0/pwm1=100 hwmon1/pwm1=100
-MINSTOP=hwmon0/pwm1=50 hwmon1/pwm1=50
+FCTEMPS=/dev/fan-j10/pwm1=/dev/thermal-board/temp1_input /dev/fan-j17/pwm1=/dev/thermal-board/temp1_input
+MINTEMP=/dev/fan-j10/pwm1=45 /dev/fan-j17/pwm1=45
+MAXTEMP=/dev/fan-j10/pwm1=70 /dev/fan-j17/pwm1=70
+MINSTART=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50
+MINSTOP=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50
+MINPWM=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50
+
+
diff --git a/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf
index 9bd9dc181..2e815954b 100644
--- a/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf
+++ b/packages/bsp/helios4/fancontrol_pwm-fan-mvebu-next.conf
@@ -1,11 +1,10 @@
 # Helios4 PWM Fan Control Configuration
-# Temp source : armada_thermal sensor
+# Temp source : /dev/thermal-cpu
 INTERVAL=10
-DEVPATH=hwmon1=devices/virtual hwmon2=devices/platform/j10-pwm hwmon3=devices/platform/j17-pwm hwmon4=devices/platform/soc/soc:internal-regs/f1011000.i2c/i2c-0/0-004c
-DEVNAME=hwmon1=armada_thermal hwmon2=pwmfan hwmon3=pwmfan hwmon4=lm75
-FCTEMPS=hwmon2/pwm1=hwmon1/temp1_input hwmon3/pwm1=hwmon1/temp1_input
-MINTEMP=hwmon2/pwm1=55 hwmon3/pwm1=55
-MAXTEMP=hwmon2/pwm1=95 hwmon3/pwm1=95
-MINSTART=hwmon2/pwm1=100 hwmon3/pwm1=100
-MINSTOP=hwmon2/pwm1=50 hwmon3/pwm1=50
+FCTEMPS=/dev/fan-j10/pwm1=/dev/thermal-cpu/temp1_input /dev/fan-j17/pwm1=/dev/thermal-cpu/temp1_input
+MINTEMP=/dev/fan-j10/pwm1=55 /dev/fan-j17/pwm1=55
+MAXTEMP=/dev/fan-j10/pwm1=95 /dev/fan-j17/pwm1=95
+MINSTART=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50
+MINSTOP=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50
+MINPWM=/dev/fan-j10/pwm1=50 /dev/fan-j17/pwm1=50