diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
index 67a047592..aff998bd8 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -70,6 +70,7 @@ set(BOOTLOADER_SRC
   ../../../../../targets/${TARGET_DIR}/backlight_driver.cpp
   ../../../../../targets/${TARGET_DIR}/keys_driver.cpp
   ../../../../../targets/${TARGET_DIR}/diskio.cpp
+  ../../../../../targets/${TARGET_DIR}/board_preinit.cpp
   ../../../../../targets/${TARGET_DIR}/pwr_driver.cpp
   ../../../../../targets/${TARGET_DIR}/bootloader/boot_menu.cpp
   ../usbd_usr.cpp
diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
index c34cc38ed..c4a0ba33f 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
+++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
@@ -219,6 +219,8 @@ int main()
   rotaryEncoderInit();
 #endif
 
+  boardPreInit();
+
   // wait for inputs to stabilize
   for (uint32_t i = 0; i < 50000; i += 1) {
     wdt_reset();
diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h
index 0ffaadb34..830d23c1b 100644
--- a/radio/src/targets/sky9x/board.h
+++ b/radio/src/targets/sky9x/board.h
@@ -34,6 +34,7 @@ extern uint16_t ResetReason;
 #define FIRMWARE_ADDRESS               0x00400000
 
 // Board driver
+void boardPreInit(void);
 void boardInit(void);
 #define boardOff()  pwrOff()
 
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 34bb3315a..8313789d7 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -114,6 +114,7 @@ extern "C" {
 extern uint16_t sessionTimer;
 
 // Board driver
+void boardPreInit(void);
 void boardInit(void);
 void boardOff(void);
 
diff --git a/radio/src/targets/taranis/board_preinit.cpp b/radio/src/targets/taranis/board_preinit.cpp
new file mode 100644
index 000000000..ea8d94bf6
--- /dev/null
+++ b/radio/src/targets/taranis/board_preinit.cpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "board.h"
+
+void boardPreInit()
+{
+  GPIO_InitTypeDef GPIO_InitStructure;
+  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
+  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
+  GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
+  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
+
+#if defined(INTMODULE_BOOTCMD_GPIO)
+  GPIO_SetBits(INTMODULE_BOOTCMD_GPIO, INTMODULE_BOOTCMD_GPIO_PIN);
+  GPIO_InitStructure.GPIO_Pin = INTMODULE_BOOTCMD_GPIO_PIN;
+  GPIO_Init(INTMODULE_BOOTCMD_GPIO, &GPIO_InitStructure);
+#endif
+}
diff --git a/radio/src/targets/taranis/pwr_driver.cpp b/radio/src/targets/taranis/pwr_driver.cpp
index dae375e83..e50f5c6bf 100644
--- a/radio/src/targets/taranis/pwr_driver.cpp
+++ b/radio/src/targets/taranis/pwr_driver.cpp
@@ -37,13 +37,6 @@ void pwrInit()
   GPIO_InitStructure.GPIO_Pin = EXTMODULE_PWR_GPIO_PIN;
   GPIO_Init(EXTMODULE_PWR_GPIO, &GPIO_InitStructure);
 
-#if defined(INTMODULE_BOOTCMD_GPIO)
-  GPIO_SetBits(INTMODULE_BOOTCMD_GPIO, INTMODULE_BOOTCMD_GPIO_PIN);
-  GPIO_InitStructure.GPIO_Pin = INTMODULE_BOOTCMD_GPIO_PIN;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
-  GPIO_Init(INTMODULE_BOOTCMD_GPIO, &GPIO_InitStructure);
-#endif
-
 #if defined(PCBREV_GPIO_PIN)
   GPIO_ResetBits(PCBREV_GPIO, PCBREV_GPIO_PIN);
   GPIO_InitStructure.GPIO_Pin = PCBREV_GPIO_PIN;