boards: arm: twr_ke18f: only enable HW stack protection if !userspace

henrikbrixandersen · nashif · commit 4b7a71962f4a · 2021-01-12T06:47:33.000-05:00
Only enable hardware stack protection by default on the NXP TWR-K18F development board if userspace is not enabled. The NXP KE1xF SoC has 8 MPU regions, which is insufficient for using HW stack protection and userspace simultaneously. Fixes bc9a498. Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
diff --git a/boards/arm/twr_ke18f/Kconfig.defconfig b/boards/arm/twr_ke18f/Kconfig.defconfig
@@ -22,4 +22,9 @@ config TEMP_KINETIS
 	default y if "$(dt_nodelabel_enabled,adc0)"
 	depends on SENSOR && ADC
 
+# The KE1xF has 8 MPU regions, which is not enough for both HW stack protection
+# and userspace. Only enable HW stack protection if userspace is not enabled.
+config HW_STACK_PROTECTION
+	default y if !USERSPACE
+
 endif # BOARD_TWR_KE18F
diff --git a/boards/arm/twr_ke18f/twr_ke18f_defconfig b/boards/arm/twr_ke18f/twr_ke18f_defconfig
@@ -14,4 +14,3 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
 
 # Enable MPU
 CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,3 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000`
`14`	`14`
`15`	`15`	`# Enable MPU`
`16`	`16`	`CONFIG_ARM_MPU=y`
`17`		`-CONFIG_HW_STACK_PROTECTION=y`