vanhofen@jessie:~/ni/buildsystem[master]$ git diff
diff --git a/make/environment.mk b/make/environment.mk
index 1b2a6ab..7d42fc0 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -169,13 +169,15 @@ STATICLIB             = $(STATIC_DIR)/lib
 TARGETLIB             = $(TARGETPREFIX)/lib
 TARGETINCLUDE         = $(TARGETPREFIX)/include
 TARGET_CFLAG_O        = -O2
+TARGET_CFLAGS_ADD     =
 TARGET_LDFLAGS_ADD    =
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), nevis kronos_v2))
-  TARGET_CFLAG_O      += -fdata-sections -ffunction-sections
+  TARGET_CFLAG_O      = -Os
+  TARGET_CFLAGS_ADD   = -fdata-sections -ffunction-sections
   TARGET_LDFLAGS_ADD  = -Wl,--gc-sections
 endif

-TARGET_CFLAGS         = -pipe $(TARGET_CFLAG_O) -g -I$(TARGETINCLUDE)
+TARGET_CFLAGS         = -pipe $(TARGET_CFLAG_O) $(TARGET_CFLAGS_ADD) -g -I$(TARGETINCLUDE)
 TARGET_CPPFLAGS       = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS       = $(TARGET_CFLAGS)
 TARGET_LDFLAGS        = $(CORTEX-STRINGS) -Wl,-O1 $(TARGET_LDFLAGS_ADD) -L$(TARGETLIB)