Index: apps/codecs/libtta/libtta.make
===================================================================
--- apps/codecs/libtta/libtta.make	(revision 28906)
+++ apps/codecs/libtta/libtta.make	(arbetskopia)
@@ -18,13 +18,8 @@
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 TTAFLAGS = $(filter-out -O%,$(CODECFLAGS))
+TTAFLAGS += -O2
 
-ifeq ($(CPU),coldfire)
-    TTAFLAGS += -O3
-else
-    TTAFLAGS += -O2
-endif
-
 $(CODECDIR)/libtta/%.o: $(ROOTDIR)/apps/codecs/libtta/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(TTAFLAGS) -c $< -o $@
Index: apps/codecs/libffmpegFLAC/libffmpegFLAC.make
===================================================================
--- apps/codecs/libffmpegFLAC/libffmpegFLAC.make	(revision 28906)
+++ apps/codecs/libffmpegFLAC/libffmpegFLAC.make	(arbetskopia)
@@ -15,11 +15,7 @@
 
 # libffmpegFLAC is faster on ARM-targets with -O2 than -O1
 FFMPEGFLACFLAGS = -I$(APPSDIR)/codecs/libffmpegFLAC $(filter-out -O%,$(CODECFLAGS))
-ifeq ($(CPU),arm)
-   FFMPEGFLACFLAGS += -O2
-else
-   FFMPEGFLACFLAGS += -O1
-endif
+FFMPEGFLACFLAGS += -O2
 
 $(FFMPEGFLACLIB): $(FFMPEGFLACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
Index: apps/codecs/libfaad/libfaad.make
===================================================================
--- apps/codecs/libfaad/libfaad.make	(revision 28906)
+++ apps/codecs/libfaad/libfaad.make	(arbetskopia)
@@ -20,11 +20,7 @@
 
 # libfaad is faster on ARM with -O2, use -O1 for other CPUs
 FAADFLAGS = -I$(APPSDIR)/codecs/libfaad $(filter-out -O%,$(CODECFLAGS)) 
-ifeq ($(CPU),arm)
-   FAADFLAGS += -O2
-else
-   FAADFLAGS += -O1
-endif
+FAADFLAGS += -O2
 
 $(CODECDIR)/libfaad/%.o: $(ROOTDIR)/apps/codecs/libfaad/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libmusepack/libmusepack.make
===================================================================
--- apps/codecs/libmusepack/libmusepack.make	(revision 28906)
+++ apps/codecs/libmusepack/libmusepack.make	(arbetskopia)
@@ -19,11 +19,7 @@
 
 # libmusepack is faster on ARM-targets with -O1 than -O2
 MUSEPACKFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmusepack
-ifeq ($(CPU),arm)
-   MUSEPACKFLAGS += -O1
-else
-   MUSEPACKFLAGS += -O2
-endif
+MUSEPACKFLAGS += -O1
 
 $(CODECDIR)/libmusepack/%.o: $(ROOTDIR)/apps/codecs/libmusepack/%.c
 	$(SILENT)mkdir -p $(dir $@)
Index: apps/codecs/libwma/libwma.make
===================================================================
--- apps/codecs/libwma/libwma.make	(revision 28906)
+++ apps/codecs/libwma/libwma.make	(arbetskopia)
@@ -21,8 +21,6 @@
 
 ifeq ($(MEMORYSIZE),2)
     WMAFLAGS += -Os
-else ifeq ($(CPU),coldfire)
-    WMAFLAGS += -O3
 else
     WMAFLAGS += -O2
 endif
Index: apps/codecs/libatrac/libatrac.make
===================================================================
--- apps/codecs/libatrac/libatrac.make	(revision 28906)
+++ apps/codecs/libatrac/libatrac.make	(arbetskopia)
@@ -16,3 +16,16 @@
 $(ATRACLIB): $(ATRACLIB_OBJ)
 	$(SILENT)$(shell rm -f $@)
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+
+ATRACFLAGS = -I$(APPSDIR)/codecs/libatrac $(filter-out -O%,$(CODECFLAGS))
+# not tuned for arm
+ifeq ($(CPU),coldfire)
+    ATRACFLAGS += -O2
+else
+    ATRACFLAGS += -O1
+endif
+
+$(CODECDIR)/libatrac/%.o: $(ROOTDIR)/apps/codecs/libatrac/%.c
+	$(SILENT)mkdir -p $(dir $@)
+	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(ATRACFLAGS) -c $< -o $@
+
Index: apps/codecs/libwavpack/libwavpack.make
===================================================================
--- apps/codecs/libwavpack/libwavpack.make	(revision 28906)
+++ apps/codecs/libwavpack/libwavpack.make	(arbetskopia)
@@ -18,7 +18,7 @@
 ifeq ($(CPU),arm)
     WAVPACKFLAGS += -O3
 else
-    WAVPACKFLAGS += -O2
+    WAVPACKFLAGS += -O1
 endif
 
 
Index: apps/codecs/libalac/libalac.make
===================================================================
--- apps/codecs/libalac/libalac.make	(revision 28906)
+++ apps/codecs/libalac/libalac.make	(arbetskopia)
@@ -22,7 +22,7 @@
 ifeq ($(CPU),arm)
     ALACFLAGS += -O2
 else
-    ALACFLAGS += -O3
+    ALACFLAGS += -O1
 endif
 
 $(CODECDIR)/libalac/%.o: $(ROOTDIR)/apps/codecs/libalac/%.c
Index: apps/codecs/libwmapro/libwmapro.make
===================================================================
--- apps/codecs/libwmapro/libwmapro.make	(revision 28906)
+++ apps/codecs/libwmapro/libwmapro.make	(arbetskopia)
@@ -20,7 +20,7 @@
 WMAPROFLAGS = -I$(APPSDIR)/codecs/libwmapro $(filter-out -O%,$(CODECFLAGS))
 
 ifeq ($(CPU),coldfire)
-	WMAPROFLAGS += -O2
+	WMAPROFLAGS += -O3
 else
 	WMAPROFLAGS += -O1
 endif
Index: apps/codecs/demac/libdemac.make
===================================================================
--- apps/codecs/demac/libdemac.make	(revision 28906)
+++ apps/codecs/demac/libdemac.make	(arbetskopia)
@@ -27,8 +27,13 @@
 	$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 DEMACFLAGS = $(filter-out -O%,$(CODECFLAGS))
-DEMACFLAGS += -O3
 
+ifeq ($(CPU),coldfire)
+    DEMACFLAGS += -O2
+else
+    DEMACFLAGS += -O3
+endif
+
 $(CODECDIR)/ape_free_iram.h: $(CODECDIR)/ape-pre.map
 	$(call PRINTS,GEN $(@F))perl -an \
 		-e 'if(/^PLUGIN_IRAM/){$$istart=hex($$F[1]);$$ilen=hex($$F[2])}' \