diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile
index 7184404..cac9070 100644
--- a/stm-firmware/Makefile
+++ b/stm-firmware/Makefile
@@ -67,7 +67,7 @@ LFLAGS = -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork
 LFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles
 LFLAGS += -Tstm32f407vet6_flash.ld -Wl,-Map=$(mapfile).map
 
-CFLAGS = -c -fmessage-length=0 -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork
+CFLAGS = -c -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork
 CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 -nostartfiles -O0 -g
 CFLAGS += -Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter -Wimplicit-fallthrough=3 -Wsign-compare
 ####################################################################################
diff --git a/stm-firmware/boot/startup_stm32f4xx.S b/stm-firmware/boot/startup_stm32f4xx.S
index 9096057..0b9c10a 100644
--- a/stm-firmware/boot/startup_stm32f4xx.S
+++ b/stm-firmware/boot/startup_stm32f4xx.S
@@ -31,7 +31,7 @@
   */
     
   .syntax unified
-  .cpu cortex-m3
+  .cpu cortex-m4
   .fpu softvfp
   .thumb