From 2d251224313a42efbbd5b7cde5ccc9245138fbc4 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Fri, 8 Jul 2005 15:08:59 +0000
Subject: H110 adjustments

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7071 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/plugin.lds |  8 ++++++--
 firmware/app.lds        | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 38e5808022..c0150055eb 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -14,14 +14,18 @@ OUTPUT_FORMAT(elf32-sh)
 #define STUBOFFSET 0
 #endif
 
-#if defined(IRIVER_H120) || defined(IRIVER_H300)
+#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300)
 #define ARCH_IRIVER
 #endif
 
-#ifdef ARCH_IRIVER
+#if defined(IRIVER_H120) || defined(IRIVER_H300)
 #define DRAMORIG 0x31000000
 #define IRAMORIG 0x10010000
 #define IRAMSIZE 0x8000
+#elif defined(IRIVER_H100)
+#define DRAMORIG 0x30000000
+#define IRAMORIG 0x10010000
+#define IRAMSIZE 0x8000
 #else
 #define DRAMORIG 0x09000000 + STUBOFFSET
 #endif
diff --git a/firmware/app.lds b/firmware/app.lds
index ee666d8cb3..5816f40d35 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -113,10 +113,14 @@ _pluginbuf = 0;
 
 #define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGINSIZE - STUBOFFSET - CODECSIZE
 
-#if CONFIG_CPU == MCF5249
-#define DRAMORIG 0x31000000 + STUBOFFSET
-#define IRAMORIG 0x10000000
+#ifdef IRIVER_H100_SERIES
 #define IRAMSIZE 0x10000
+#define IRAMORIG 0x10000000
+#ifdef IRIVER_H100
+#define DRAMORIG 0x30000000 + STUBOFFSET
+#else /* H120/H140 */
+#define DRAMORIG 0x31000000 + STUBOFFSET
+#endif
 #else
 #define DRAMORIG 0x09000000 + STUBOFFSET
 #define IRAMORIG 0x0f000000
-- 
cgit v1.2.3