diff --git a/os/hal/boards/SN_SN32F240/board.c b/os/hal/boards/SN_SN32F240/board.c
index 655a9b04b4..b1715ea6b2 100644
--- a/os/hal/boards/SN_SN32F240/board.c
+++ b/os/hal/boards/SN_SN32F240/board.c
@@ -44,7 +44,6 @@ const PALConfig pal_default_config = {
 #endif
 
 static int flag __attribute__((section(".flag"))) __attribute__((__used__)) = 0xAAAA5555;
-extern void enter_bootloader_mode_if_requested(void);
 
 /**
  * @brief   Early initialization code.
@@ -52,7 +51,6 @@ extern void enter_bootloader_mode_if_requested(void);
  *          and before any other initialization.
  */
 void __early_init(void) {
-  enter_bootloader_mode_if_requested();
   sn32_clock_init();
 }
 
@@ -62,8 +60,6 @@ void __early_init(void) {
  */
 void boardInit(void) {
 
-  SN_SYS0->EXRSTCTRL_b.RESETDIS = 1; // Disable RESET
-  SN_SYS0->SWDCTRL_b.SWDDIS = 1; // Disable SWD
 }
 
 void restart_usb_driver(USBDriver *usbp) {
diff --git a/os/hal/boards/SN_SN32F240B/board.c b/os/hal/boards/SN_SN32F240B/board.c
index ccaf913c45..802d141829 100644
--- a/os/hal/boards/SN_SN32F240B/board.c
+++ b/os/hal/boards/SN_SN32F240B/board.c
@@ -44,7 +44,6 @@ const PALConfig pal_default_config = {
 #endif
 
 static int flag __attribute__((section(".flag"))) __attribute__((__used__)) = 0xAAAA5555;
-extern void enter_bootloader_mode_if_requested(void);
 
 /**
  * @brief   Early initialization code.
@@ -52,7 +51,6 @@ extern void enter_bootloader_mode_if_requested(void);
  *          and before any other initialization.
  */
 void __early_init(void) {
-  enter_bootloader_mode_if_requested();
   sn32_clock_init();
 }
 
@@ -62,6 +60,4 @@ void __early_init(void) {
  */
 void boardInit(void) {
 
-  SN_SYS0->EXRSTCTRL_b.RESETDIS = 1; // Disable RESET
-  SN_SYS0->SWDCTRL_b.SWDDIS = 1; // Disable SWD
 }
diff --git a/os/hal/boards/SN_SN32F260/board.c b/os/hal/boards/SN_SN32F260/board.c
index 72ad880c15..d089216ab6 100644
--- a/os/hal/boards/SN_SN32F260/board.c
+++ b/os/hal/boards/SN_SN32F260/board.c
@@ -56,5 +56,5 @@ void __early_init(void) {
  * @brief   Board-specific initialization code.
  */
 void boardInit(void) {
-  SN_SYS0->SWDCTRL_b.SWDDIS = 1; // Disable SWD
+
 }
diff --git a/os/hal/boards/SN_SN32F280/board.c b/os/hal/boards/SN_SN32F280/board.c
index ccaf913c45..802d141829 100644
--- a/os/hal/boards/SN_SN32F280/board.c
+++ b/os/hal/boards/SN_SN32F280/board.c
@@ -44,7 +44,6 @@ const PALConfig pal_default_config = {
 #endif
 
 static int flag __attribute__((section(".flag"))) __attribute__((__used__)) = 0xAAAA5555;
-extern void enter_bootloader_mode_if_requested(void);
 
 /**
  * @brief   Early initialization code.
@@ -52,7 +51,6 @@ extern void enter_bootloader_mode_if_requested(void);
  *          and before any other initialization.
  */
 void __early_init(void) {
-  enter_bootloader_mode_if_requested();
   sn32_clock_init();
 }
 
@@ -62,6 +60,4 @@ void __early_init(void) {
  */
 void boardInit(void) {
 
-  SN_SYS0->EXRSTCTRL_b.RESETDIS = 1; // Disable RESET
-  SN_SYS0->SWDCTRL_b.SWDDIS = 1; // Disable SWD
 }
diff --git a/os/hal/boards/SN_SN32F290/board.c b/os/hal/boards/SN_SN32F290/board.c
index ccaf913c45..802d141829 100644
--- a/os/hal/boards/SN_SN32F290/board.c
+++ b/os/hal/boards/SN_SN32F290/board.c
@@ -44,7 +44,6 @@ const PALConfig pal_default_config = {
 #endif
 
 static int flag __attribute__((section(".flag"))) __attribute__((__used__)) = 0xAAAA5555;
-extern void enter_bootloader_mode_if_requested(void);
 
 /**
  * @brief   Early initialization code.
@@ -52,7 +51,6 @@ extern void enter_bootloader_mode_if_requested(void);
  *          and before any other initialization.
  */
 void __early_init(void) {
-  enter_bootloader_mode_if_requested();
   sn32_clock_init();
 }
 
@@ -62,6 +60,4 @@ void __early_init(void) {
  */
 void boardInit(void) {
 
-  SN_SYS0->EXRSTCTRL_b.RESETDIS = 1; // Disable RESET
-  SN_SYS0->SWDCTRL_b.SWDDIS = 1; // Disable SWD
 }