From 86e439024c0cfbab22ccf5434ded14dcacd8f230 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 17 Dec 2007 16:08:49 +0900
Subject: [PATCH] --- yaml --- r: 77832 b: refs/heads/master c:
 6fc5153aab2a6eb23e636d962e1aceaabd0dfb12 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sh/boot/Makefile | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b225bb1b17b..725204132fa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003c6af6c6370cc3315ab828a0e6618f00713d96
+refs/heads/master: 6fc5153aab2a6eb23e636d962e1aceaabd0dfb12
diff --git a/trunk/arch/sh/boot/Makefile b/trunk/arch/sh/boot/Makefile
index 4b3a6f19c3b5..59f552c13349 100644
--- a/trunk/arch/sh/boot/Makefile
+++ b/trunk/arch/sh/boot/Makefile
@@ -38,8 +38,9 @@ KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%8x" \
 			$(CONFIG_ZERO_PAGE_OFFSET)]')
 
 KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%8x" \
-		     $$[$(KERNEL_LOAD)+0x1000]')
-
+		     $$[$(CONFIG_PAGE_OFFSET)  + \
+			$(CONFIG_MEMORY_START) + \
+			$(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \