aboutsummaryrefslogtreecommitdiffstats
path: root/src/stm32
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-09-18 11:26:27 -0400
committerKevin O'Connor <kevin@koconnor.net>2019-09-18 11:59:43 -0400
commit1c6a8267f9514ee5d02948719acab7bae4407311 (patch)
tree63c1f913fc5cf9694375c42c13a367976961bcf5 /src/stm32
parent80e17b1e53801b13ec47a1fd8038641aa4be2e1d (diff)
downloadkutter-1c6a8267f9514ee5d02948719acab7bae4407311.tar.gz
kutter-1c6a8267f9514ee5d02948719acab7bae4407311.tar.xz
kutter-1c6a8267f9514ee5d02948719acab7bae4407311.zip
armcm_reset: Add a new helper file defining command_reset()
Add a generic ARM Cortex-M implementation of the "reset" command. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/stm32')
-rw-r--r--src/stm32/Makefile5
-rw-r--r--src/stm32/main.c7
2 files changed, 3 insertions, 9 deletions
diff --git a/src/stm32/Makefile b/src/stm32/Makefile
index 710c9f83..4e8e2f4a 100644
--- a/src/stm32/Makefile
+++ b/src/stm32/Makefile
@@ -20,8 +20,9 @@ CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld
$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld
# Add source files
-src-y += stm32/main.c stm32/watchdog.c stm32/gpio.c generic/armcm_boot.c
-src-y += generic/crc16_ccitt.c generic/armcm_irq.c generic/armcm_timer.c
+src-y += stm32/main.c stm32/watchdog.c stm32/gpio.c generic/crc16_ccitt.c
+src-y += generic/armcm_boot.c generic/armcm_irq.c generic/armcm_timer.c
+src-y += generic/armcm_reset.c
src-$(CONFIG_MACH_STM32F1) += ../lib/stm32f1/system_stm32f1xx.c
src-$(CONFIG_MACH_STM32F1) += stm32/stm32f1.c
src-$(CONFIG_MACH_STM32F4) += ../lib/stm32f4/system_stm32f4xx.c
diff --git a/src/stm32/main.c b/src/stm32/main.c
index 6d9290fd..56da9718 100644
--- a/src/stm32/main.c
+++ b/src/stm32/main.c
@@ -11,13 +11,6 @@
DECL_CONSTANT_STR("MCU", CONFIG_MCU);
-void
-command_reset(uint32_t *args)
-{
- NVIC_SystemReset();
-}
-DECL_COMMAND_FLAGS(command_reset, HF_IN_SHUTDOWN, "reset");
-
// Main entry point
int
main(void)