From 590501cfe404b5463adecc70628e5bc7c8f142a2 Mon Sep 17 00:00:00 2001
From: Will Robertson <aliask@rockbox.org>
Date: Fri, 21 Sep 2007 15:51:53 +0000
Subject: Merge the Gigabeat S branch back into trunk. Fingers crossed nothing
 breaks.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/app.lds | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'firmware/app.lds')

diff --git a/firmware/app.lds b/firmware/app.lds
index 998ac40791..6c67a96481 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -60,6 +60,10 @@ INPUT(target/sh/crt0.o)
 #define DRAMORIG 0x00900000 + STUBOFFSET
 #define IRAMORIG 0x00000000
 #define IRAMSIZE 0x4000
+#elif CONFIG_CPU==IMX31L
+#define DRAMORIG (0x80000000 + STUBOFFSET)
+#define IRAMORIG 0x1FFFC000
+#define IRAMSIZE 0x4000
 #else
 #define DRAMORIG 0x09000000 + STUBOFFSET
 #define IRAMORIG 0x0f000000
-- 
cgit v1.2.3