New makefile solution: A single invocation of 'make' to build the entire tree. Fully controlled dependencies give faster and more correct recompiles.

Many #include lines adjusted to conform to the new standards.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19146 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 3 deletions

diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h
index 572d018328..5f89a9667d 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config-mrobe500.h
@@ -147,8 +147,7 @@
 /* Define this if you have a Motorola SCF5249 */
 #define CONFIG_CPU DM320
 
-/* Define this if you want to use coldfire's i2c interface */
-//#define CONFIG_I2C I2C_S3C2440
+#define CONFIG_I2C I2C_DM320
 
 /* define this if the hardware can be powered off while charging */
 #define HAVE_POWEROFF_WHILE_CHARGING
diff --git a/firmware/export/debug.h b/firmware/export/debug.h
index dd65c3d7be..f9f93fdcd9 100644
--- a/firmware/export/debug.h
+++ b/firmware/export/debug.h
@@ -28,6 +28,7 @@ extern void debugf(const char* fmt,...) ATTRIBUTE_PRINTF(1, 2);
 extern void ldebugf(const char* file, int line, const char *fmt, ...)
                     ATTRIBUTE_PRINTF(3, 4);
 
+#ifndef CODEC                    
 #ifdef __GNUC__
 
 /*  */
@@ -57,5 +58,5 @@ void breakpoint(void);
 
 #endif /* GCC */
 
-
+#endif /* CODEC */
 #endif