From 42873975bf474a102b55c88c1b7590bc16f0dd3e Mon Sep 17 00:00:00 2001
From: Chris Smith <chris.smith@st.com>
Date: Fri, 5 Sep 2008 16:24:13 +0900
Subject: [PATCH] --- yaml --- r: 116091 b: refs/heads/master c:
 664718a34348a9ef6f966c3977e8df927a378134 h: refs/heads/master i:   116089:
 a6ad87392f9138cc32b3943bc6a2ef71a9a8e48f   116087:
 1a402635ddf46c27ecde052a3b87498e2778b36b v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sh/boot/Makefile | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 88e6f656aa27..24c2f3b50da5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96e14e54a6abd5a4bcd75e33962f87bef145d1f6
+refs/heads/master: 664718a34348a9ef6f966c3977e8df927a378134
diff --git a/trunk/arch/sh/boot/Makefile b/trunk/arch/sh/boot/Makefile
index 5b54965eef98..c16ccd4bfa16 100644
--- a/trunk/arch/sh/boot/Makefile
+++ b/trunk/arch/sh/boot/Makefile
@@ -33,10 +33,16 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
 $(obj)/compressed/vmlinux: FORCE
 	$(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
+ifeq ($(CONFIG_32BIT),y)
+KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%08x" \
+		     $$[$(CONFIG_PAGE_OFFSET)  + \
+			$(CONFIG_ZERO_PAGE_OFFSET)]')
+else
 KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%08x" \
 		     $$[$(CONFIG_PAGE_OFFSET)  + \
 			$(CONFIG_MEMORY_START) + \
 			$(CONFIG_ZERO_PAGE_OFFSET)]')
+endif
 
 KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%08x" \
 		     $$[$(CONFIG_PAGE_OFFSET)  + \