SKR Mini: Disable SWD for version 2.0

Arksine · May 23, 2020 · 34587ef · 34587ef
1 parent 293b5c2
commit 34587ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bootloader/F1/Inc/config.h b/bootloader/F1/Inc/config.h
@@ -152,7 +152,7 @@
 	#define DISC_HIGH		WRITE_REG(GPIOC->BSRR, GPIO_BSRR_BS13)
 	#define DISC_LOW		WRITE_REG(GPIOC->BRR, GPIO_BRR_BR13)
 
-	#define DISABLE_JTAG
+	#define DISABLE_DEBUG   AFIO_MAPR_SWJ_CFG_JTAGDISABLE
 	#define AFIO_CLOCK      RCC_APB2ENR_AFIOEN
 
 	#ifdef ENABLE_BUTTON
@@ -186,7 +186,7 @@
 	#define DISC_HIGH		WRITE_REG(GPIOA->BSRR, GPIO_BSRR_BS14)
 	#define DISC_LOW		WRITE_REG(GPIOA->BRR, GPIO_BRR_BR14)
 
-	#define DISABLE_JTAG
+	#define DISABLE_DEBUG   AFIO_MAPR_SWJ_CFG_DISABLE
 	#define AFIO_CLOCK      RCC_APB2ENR_AFIOEN
 
 	#ifdef ENABLE_BUTTON

diff --git a/bootloader/F1/Src/led.c b/bootloader/F1/Src/led.c
@@ -25,9 +25,9 @@ void pins_init(void)
 	SET_BIT(RCC->APB2ENR,
 		LED1_CLOCK | LED2_CLOCK | DISC_CLOCK | BOOT_CLOCK | AFIO_CLOCK);
 
-#if defined DISABLE_JTAG
+#if defined DISABLE_DEBUG
 	RCC->APB2ENR;
-	AFIO->MAPR = AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
+	AFIO->MAPR = DISABLE_DEBUG;
 #endif
 
 	LED1_BIT_0;