summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucian Copeland <hierophect@gmail.com>2020-01-24 14:47:13 -0500
committerLucian Copeland <hierophect@gmail.com>2020-01-24 14:47:13 -0500
commitb5b94b72c1cef10de16d4c30761791238ce204da (patch)
treeefd760fe271c0b973e6a8ee7673a4647f5b5ff59
parent70932cab4223463816974e57945f6f803bbe7371 (diff)
Return to bootloader options
-rwxr-xr-xports/stm32f4/Makefile2
-rw-r--r--ports/stm32f4/boards/meowbit_v121/mpconfigboard.h2
-rw-r--r--ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk6
3 files changed, 5 insertions, 5 deletions
diff --git a/ports/stm32f4/Makefile b/ports/stm32f4/Makefile
index 1b5b2eee2..ccadeac8a 100755
--- a/ports/stm32f4/Makefile
+++ b/ports/stm32f4/Makefile
@@ -22,7 +22,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-DEBUG = 1
+# DEBUG = 1
# Select the board to build for.
ifeq ($(BOARD),)
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
index 2d8ff8761..c849e03b6 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
@@ -37,7 +37,7 @@
#define BOARD_OSC_DIV 12
#define BOARD_NO_VBUS_SENSE
-//#define BOARD_VTOR_DEFER //Leave VTOR relocation to bootloader
+#define BOARD_VTOR_DEFER //Leave VTOR relocation to bootloader
#define BOARD_USE_INTERNAL_SPI
// On-board flash
diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
index e45d2803f..340fd9d3b 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.mk
@@ -9,7 +9,7 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
EXTERNAL_FLASH_DEVICES = W25Q16JV_IQ
LONGINT_IMPL = MPZ
-# BOOTLOADER_OFFSET = 0x8010000
+BOOTLOADER_OFFSET = 0x8010000
# INTERNAL_FLASH_FILESYSTEM = 1
# LONGINT_IMPL = NONE
@@ -19,5 +19,5 @@ MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f401xe
MCU_PACKAGE = 64
CMSIS_MCU = STM32F401xE
-#LD_FILE = boards/STM32F401_boot.ld
-LD_FILE = boards/STM32F401_fs.ld \ No newline at end of file
+LD_FILE = boards/STM32F401_boot.ld
+# LD_FILE = boards/STM32F401_fs.ld #use for internal flash \ No newline at end of file