From e587c488d9401217b9d40826361fd43b300b58e5 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@stericsson.com>
Date: Mon, 1 Jun 2009 14:27:26 +0100
Subject: [PATCH] --- yaml --- r: 149403 b: refs/heads/master c:
 7666c17e2b0986a079da46122d8658544416c2cf h: refs/heads/master i:   149401:
 385ee94dd0e988005a8ceec2e772a085d25a9aaf   149399:
 4761246acf8ace7868196b20f3a44882394e0cc9 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/mach-u300/Makefile.boot | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/mach-u300/Makefile.boot

diff --git a/[refs] b/[refs]
index d31d83e84c95..6fda4f726641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb366d4c95f546bb46a536387a4aca00ed2eda6a
+refs/heads/master: 7666c17e2b0986a079da46122d8658544416c2cf
diff --git a/trunk/arch/arm/mach-u300/Makefile.boot b/trunk/arch/arm/mach-u300/Makefile.boot
new file mode 100644
index 000000000000..6fbfc6ea2d35
--- /dev/null
+++ b/trunk/arch/arm/mach-u300/Makefile.boot
@@ -0,0 +1,15 @@
+# Note: the following conditions must always be true:
+#   ZRELADDR == virt_to_phys(TEXTADDR)
+#   PARAMS_PHYS must be within 4MB of ZRELADDR
+#   INITRD_PHYS must be in RAM
+
+ifdef CONFIG_MACH_U300_SINGLE_RAM
+     zreladdr-y	:= 0x28E08000
+  params_phys-y	:= 0x28E00100
+else
+     zreladdr-y	:= 0x48008000
+  params_phys-y	:= 0x48000100
+endif
+
+# This isn't used.
+#initrd_phys-y	:= 0x29800000