Bring up the M5 port to a working stage: Extended numerous explicit checks for IAUDIO_X5 to also check for IAUDIO_M5, moved code around the target tree, added preliminary background for the sim.

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

3 files changed, 4 insertions, 4 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index d6c5ef4d1c..531ac106f4 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1077,7 +1077,7 @@ bool dbg_ports(void)
         snprintf(buf, sizeof(buf), "ADC_BUTTONS: %02x", adc_buttons);
 #endif
         lcd_puts(0, line++, buf);
-#ifdef IAUDIO_X5
+#if defined(IAUDIO_X5) || defined(IAUDIO_M5)
         snprintf(buf, sizeof(buf), "ADC_REMOTE  (%c): %02x",
             remote_detect() ? '+' : '-', adc_remote);
 #else
@@ -1953,7 +1953,7 @@ static bool dbg_save_roms(void)
     fd = creat("/internal_rom_000000-1FFFFF.bin");
 #elif defined(IRIVER_H300_SERIES)
     fd = creat("/internal_rom_000000-3FFFFF.bin");
-#elif defined(IAUDIO_X5)
+#elif defined(IAUDIO_X5) || defined(IAUDIO_M5)
     fd = creat("/internal_rom_000000-3FFFFF.bin");
 #endif
     if(fd >= 0)
diff --git a/apps/playback.c b/apps/playback.c
index 89caec92aa..2873c90772 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -169,7 +169,7 @@ enum {
 #if defined(CPU_PP)
 #define CODEC_IRAM_ORIGIN   0x4000c000
 #define CODEC_IRAM_SIZE     0xc000
-#elif defined(IAUDIO_X5)
+#elif defined(IAUDIO_X5) || defined(IAUDIO_M5)
 #define CODEC_IRAM_ORIGIN   0x10010000
 #define CODEC_IRAM_SIZE     0x10000
 #else
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 5181e5604d..f38f60656a 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -24,7 +24,7 @@ OUTPUT_FORMAT(elf32-sh)
 #define DRAMORIG 0x31000000
 #define IRAMORIG 0x1000c000
 #define IRAMSIZE 0xc000
-#elif defined(IAUDIO_X5)
+#elif defined(IAUDIO_X5) || defined(IAUDIO_M5)
 #define DRAMORIG 0x31000000
 #define IRAMORIG 0x10010000
 #define IRAMSIZE 0x10000