From dcacbaa54f33692e0d8ba29fc5093c93abe62181 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Mon, 15 Mar 2010 08:48:27 +0100
Subject: [PATCH] --- yaml --- r: 189280 b: refs/heads/master c:
 ee68f1745e7734a55c8bf680f6f464205f1f15da h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/microblaze/kernel/head.S | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 58a75d6e5857..6b51a613c821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89ae9753aef160c2f7bcecec21a7c4a6bc4c9b9b
+refs/heads/master: ee68f1745e7734a55c8bf680f6f464205f1f15da
diff --git a/trunk/arch/microblaze/kernel/head.S b/trunk/arch/microblaze/kernel/head.S
index cb7815cfe5ab..e397d5d52571 100644
--- a/trunk/arch/microblaze/kernel/head.S
+++ b/trunk/arch/microblaze/kernel/head.S
@@ -51,6 +51,12 @@ swapper_pg_dir:
 
 	.text
 ENTRY(_start)
+#if CONFIG_KERNEL_BASE_ADDR == 0
+	brai	TOPHYS(real_start)
+	.org	0x100
+real_start:
+#endif
+
 	mfs	r1, rmsr
 	andi	r1, r1, ~2
 	mts	rmsr, r1