diff -p -up ./Makefile.flags.tv ./Makefile.flags
--- ./Makefile.flags.tv	2012-01-06 13:09:07.869296427 +0100
+++ ./Makefile.flags	2012-01-06 13:09:15.228231709 +0100
@@ -65,14 +65,14 @@ CFLAGS += $(call cc-option,-fno-builtin-
 #CFLAGS += $(call cc-option,-Wconversion,)
 
 ifneq ($(CONFIG_DEBUG),y)
-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+CFLAGS += $(call cc-option,-Os,$(call cc-option,-Os,))
 else
 CFLAGS += $(call cc-option,-g,)
 #CFLAGS += "-D_FORTIFY_SOURCE=2"
 ifeq ($(CONFIG_DEBUG_PESSIMIZE),y)
 CFLAGS += $(call cc-option,-O0,)
 else
-CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,))
+CFLAGS += $(call cc-option,-Os,$(call cc-option,-Os,))
 endif
 endif
 ifeq ($(CONFIG_DEBUG_SANITIZE),y)
diff -p -up ./Makefile.tv ./Makefile
--- ./Makefile.tv	2012-01-06 13:09:05.841038646 +0100
+++ ./Makefile	2012-01-06 13:09:15.228231709 +0100
@@ -278,8 +278,8 @@ HOSTCXXFLAGS	:=
 # We need some generic definitions
 include $(srctree)/scripts/Kbuild.include
 
-HOSTCFLAGS	+= $(call hostcc-option,-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer,)
-HOSTCXXFLAGS	+= -O2
+HOSTCFLAGS	+= $(call hostcc-option,-Wall -Wstrict-prototypes -Os -fomit-frame-pointer,)
+HOSTCXXFLAGS	+= -Os
 
 # For maximum performance (+ possibly random breakage, uncomment
 # the following)