soc: arm: nordic_nrf: Remove deprecated GPREGRET Kconfig option

Removes the Kconfig NRF_STORE_REBOOT_TYPE_GPREGRET which was deprecated in zephyr 3.4 Signed-off-by: Jamie McCrae <[email protected]>
zephyrproject-rtos · Nov 29, 2023 · 93f5375 · 93f5375
1 parent 7d56743
commit 93f5375
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 39 deletions.
diff --git a/soc/arm/nordic_nrf/Kconfig b/soc/arm/nordic_nrf/Kconfig
@@ -167,17 +167,4 @@ config NRF_TRACE_PORT
 	  Unit) for tracing using a hardware probe. If disabled, the trace
 	  pins will be used as GPIO.
 
-config NRF_STORE_REBOOT_TYPE_GPREGRET
-	bool "Set GPREGRET to reboot type (DEPRECATED)"
-	depends on SOC_SERIES_NRF51X || SOC_SERIES_NRF52X
-	depends on REBOOT
-	depends on !RETENTION_BOOT_MODE
-	select DEPRECATED
-	help
-	  If this option is enabled, then the parameter supplied to the
-	  sys_reboot() function will be set in the GPREGRET register.
-
-	  This has been replaced with the bootmode part of the retention
-	  subsystem, which should be used instead.
-
 endif # SOC_FAMILY_NRF
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -21,19 +21,6 @@
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
 
-#ifdef CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET
-/* Overrides the weak ARM implementation:
- * Set general purpose retention register and reboot
- * This is deprecated and has been replaced with the boot mode retention
- * subsystem
- */
-void sys_arch_reboot(int type)
-{
-	nrf_power_gpregret_set(NRF_POWER, 0, (uint8_t)type);
-	NVIC_SystemReset();
-}
-#endif
-
 #define DELAY_CALL_OVERHEAD_US 2
 
 void arch_busy_wait(uint32_t time_us)

diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -23,19 +23,6 @@
 #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
 LOG_MODULE_REGISTER(soc);
 
-#ifdef CONFIG_NRF_STORE_REBOOT_TYPE_GPREGRET
-/* Overrides the weak ARM implementation:
- * Set general purpose retention register and reboot
- * This is deprecated and has been replaced with the boot mode retention
- * subsystem
- */
-void sys_arch_reboot(int type)
-{
-	nrf_power_gpregret_set(NRF_POWER, 0, (uint8_t)type);
-	NVIC_SystemReset();
-}
-#endif
-
 static int nordicsemi_nrf52_init(void)
 {
 #ifdef CONFIG_NRF_ENABLE_ICACHE