Merge with master

This commit is contained in:
Ilmir Usmanov
2014-07-09 18:44:20 +04:00
+5 -6
View File
@@ -68,12 +68,11 @@ SIZE = $(CROSS_COMPILE)size
STRIP = $(CROSS_COMPILE)strip
# General flags
CFLAGS ?= $(INCLUDES) -std=c99 #-fdiagnostics-color=always
CFLAGS += -Wpedantic -Wlogical-op
# CFLAGS += -Wformat-nonliteral -Winit-self -Wstack-protector
# CFLAGS += -Wall -Wextra -Winline
# CFLAGS += -Wconversion -Wsign-conversion -Wformat-security
# CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
CFLAGS ?= $(INCLUDES) -std=c99 -m32 #-fdiagnostics-color=always
#CFLAGS += -Wall -Wextra -Wpedantic -Wlogical-op -Winline
#CFLAGS += -Wformat-nonliteral -Winit-self -Wstack-protector
#CFLAGS += -Wconversion -Wsign-conversion -Wformat-security
#CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
# Flags for MCU
MCU_CFLAGS += -mlittle-endian -mcpu=cortex-m4 -march=armv7e-m -mthumb