diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-11-24 11:15:22 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-11-25 10:15:58 -0500 |
| commit | 2b7d0bba428b573c7f9a3291cff6a1dc9da700ff (patch) | |
| tree | eb6c61a38021a3697ac8d3f51322f55abee64ad0 | |
| parent | 790d48b46c40eae63e96ce3dc7975e5a37290931 (diff) | |
| download | kutter-2b7d0bba428b573c7f9a3291cff6a1dc9da700ff.tar.gz kutter-2b7d0bba428b573c7f9a3291cff6a1dc9da700ff.tar.xz kutter-2b7d0bba428b573c7f9a3291cff6a1dc9da700ff.zip | |
stm32: Add option to disable SWD on GigaDevice STM32F103 clones
Tested by @FotoFieber.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | src/stm32/Kconfig | 10 | ||||
| -rw-r--r-- | src/stm32/stm32f1.c | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index 7a1a6d18..dfaa96eb 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -155,6 +155,16 @@ config STACK_SIZE int default 512 +config STM32F103GD_DISABLE_SWD + bool "Disable SWD at startup (for GigaDevice stm32f103 clones)" + depends on MACH_STM32F103 && LOW_LEVEL_OPTIONS + default n + help + The GigaDevice clone of the STM32F103 may not be able to + reliably disable SWD at run-time. This can prevent the PA13 + and PA14 pins from being available. Selecting this option + disables SWD at startup and thus makes these pins available. + ###################################################################### # Bootloader diff --git a/src/stm32/stm32f1.c b/src/stm32/stm32f1.c index 88500165..77faad72 100644 --- a/src/stm32/stm32f1.c +++ b/src/stm32/stm32f1.c @@ -257,8 +257,13 @@ armcm_main(void) // Disable JTAG to free PA15, PB3, PB4 enable_pclock(AFIO_BASE); - stm32f1_alternative_remap(AFIO_MAPR_SWJ_CFG_Msk, - AFIO_MAPR_SWJ_CFG_JTAGDISABLE); + if (CONFIG_STM32F103GD_DISABLE_SWD) + // GigaDevice clone can't enable PA13/PA14 at runtime - enable here + stm32f1_alternative_remap(AFIO_MAPR_SWJ_CFG_Msk, + AFIO_MAPR_SWJ_CFG_DISABLE); + else + stm32f1_alternative_remap(AFIO_MAPR_SWJ_CFG_Msk, + AFIO_MAPR_SWJ_CFG_JTAGDISABLE); sched_main(); } |