5 files changed, 2 insertions, 27 deletions
diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h
index 3b6e779..c00d2bd 100644
--- a/apps/codecs/codec.h
+++ b/apps/codecs/codec.h
@@ -21,15 +21,6 @@
 
 #include "config.h"
 
-#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR)
-#define ICODE_ATTR	__attribute__ ((section(".icode")))
-#define IDATA_ATTR	__attribute__ ((section(".idata")))
-#define USE_IRAM	1
-#else
-#define ICODE_ATTR	
-#define IDATA_ATTR	 
-#endif
-
 #include <sys/types.h>
 
 /* Get these functions 'out of the way' of the standard functions. Not doing
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index 116f210..762b68d 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -22,15 +22,6 @@
 
 /* Various codec "helper functions" */
 
-#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR)
-#define ICODE_ATTR	__attribute__ ((section(".icode")))
-#define IDATA_ATTR	__attribute__ ((section(".idata")))
-#define USE_IRAM	1
-#else
-#define ICODE_ATTR	
-#define IDATA_ATTR	 
-#endif
-
 extern int mem_ptr;
 extern int bufsize;
 extern unsigned char* mallocbuf;  // 512K from the start of MP3 buffer
diff --git a/apps/codecs/lib/xxx2wav.h b/apps/codecs/lib/xxx2wav.h
index 1fa7dc9..1cdbc99 100644
--- a/apps/codecs/lib/xxx2wav.h
+++ b/apps/codecs/lib/xxx2wav.h
@@ -19,14 +19,7 @@
 
 /* Various "helper functions" common to all the xxx2wav decoder plugins  */
 
-#if CONFIG_CPU == MCF5249 && !defined(SIMULATOR)
-#define ICODE_ATTR	__attribute__ ((section(".icode")))
-#define IDATA_ATTR	__attribute__ ((section(".idata")))
-#define USE_IRAM	1
-#else
-#define ICODE_ATTR	
-#define IDATA_ATTR	 
-#endif
+#include "config.h"
 
 /* the main data structure of the program */
 typedef struct {
diff --git a/apps/codecs/libmusepack/Makefile b/apps/codecs/libmusepack/Makefile
index 1e3eaf6..79ebffe 100644
--- a/apps/codecs/libmusepack/Makefile
+++ b/apps/codecs/libmusepack/Makefile
@@ -8,7 +8,7 @@
 #
 
 INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export	\
- -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers
+ -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR)
 
 ifdef APPEXTRA
 INCLUDES += -I$(APPSDIR)/$(APPEXTRA)
diff --git a/apps/codecs/libmusepack/config.h b/apps/codecs/libmusepack/config-mpc.h
index 8d764c4..8d764c4 100644
--- a/apps/codecs/libmusepack/config.h
+++ b/apps/codecs/libmusepack/config-mpc.h