Cleaned up bootloader linker control file and added the H300 target

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

1 files changed, 15 insertions, 24 deletions

diff --git a/firmware/boot.lds b/firmware/boot.lds
index 2d320e2b81..d785fdcc2e 100644
--- a/firmware/boot.lds
+++ b/firmware/boot.lds
@@ -12,13 +12,7 @@ OUTPUT_FORMAT(elf32-sh)
 INPUT(crt0.o)
 #endif
 
-#if MEMORYSIZE >= 32
-#define PLUGINSIZE 0xC0000
-#else
-#define PLUGINSIZE 0x8000
-#endif
-
-#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE
+#define DRAMSIZE (MEMORYSIZE * 0x100000)
 
 #ifdef IRIVER_H100_SERIES
 #define DRAMORIG 0x31000000
@@ -26,6 +20,12 @@ INPUT(crt0.o)
 #define IRAMSIZE 0x18000
 #define FLASHORIG 0x001f0000
 #define FLASHSIZE 2M
+#elif defined(IRIVER_H300_SERIES)
+#define DRAMORIG 0x31000000
+#define IRAMORIG 0x10000000
+#define IRAMSIZE 0x18000
+#define FLASHORIG 0x003f0000
+#define FLASHSIZE 4M
 #elif CONFIG_CPU == PP5020
 #define DRAMORIG 0x10000000
 #define IRAMORIG 0x40000000
@@ -40,8 +40,6 @@ INPUT(crt0.o)
 #define FLASHSIZE 256K - ROM_START
 #endif
 
-#define ENDADDR  (IRAMORIG + IRAMSIZE)
-
 #if CONFIG_CPU!=PP5020
 MEMORY
 {
@@ -141,29 +139,22 @@ SECTIONS
        stackend = .;
     } > IRAM
 
+#ifdef IRIVER_H300_SERIES
+    .bss DRAMORIG+0x1000000:
+#else
     .bss :
+#endif
     {
        _edata = .;
         *(.ibss)
         *(.bss)
         *(COMMON)
        _end = .;
+#ifdef IRIVER_H300_SERIES
+    } > DRAM
+#else
     } > IRAM
+#endif
 
-    .mp3buf :
-    {
-        . = ALIGN(0x4);
-        _mp3buffer = .;
-    } > IRAM
-
-    .mp3end ENDADDR:
-    {
-        _mp3end = .;
-    } > IRAM
-
-    .plugin ENDADDR:
-    {
-        _pluginbuf = .;
-    }
 }
 #endif