From 07f0469bc4d45cedb5915e6886d5acb1c5091882 Mon Sep 17 00:00:00 2001
From: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Date: Wed, 23 Jul 2008 16:49:06 +0900
Subject: [PATCH] --- yaml --- r: 106863 b: refs/heads/master c:
 82cb1f6fb3f69518eaa4ab9c0fa7eabc253ad26f h: refs/heads/master i:   106861:
 a1aa21e96eea06d0e2dffb55ebf2d2424da94ee1   106859:
 91e07b5f8d21aa362c412bf675b37dcdb3ccca05   106855:
 5e75c89f8dc7c5af2ed030544880f8508f9a9ac9   106847:
 38bd6b43301082980f2ba946fddf950d58df6a01 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/sh/boot/Makefile | 2 +-
 trunk/arch/sh/mm/Kconfig    | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f25d4a0bf85..241773a3f7f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3aa43a9db3b18e65f91985b5b91f2450d8b4048
+refs/heads/master: 82cb1f6fb3f69518eaa4ab9c0fa7eabc253ad26f
diff --git a/trunk/arch/sh/boot/Makefile b/trunk/arch/sh/boot/Makefile
index 89b408620dcb..8b37869a8227 100644
--- a/trunk/arch/sh/boot/Makefile
+++ b/trunk/arch/sh/boot/Makefile
@@ -40,7 +40,7 @@ KERNEL_LOAD	:= $(shell /bin/bash -c 'printf "0x%08x" \
 KERNEL_ENTRY	:= $(shell /bin/bash -c 'printf "0x%08x" \
 		     $$[$(CONFIG_PAGE_OFFSET)  + \
 			$(CONFIG_MEMORY_START) + \
-			$(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
+			$(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]')
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig
index 29d8e3c58b34..56d0a7daa34b 100644
--- a/trunk/arch/sh/mm/Kconfig
+++ b/trunk/arch/sh/mm/Kconfig
@@ -170,6 +170,14 @@ config PAGE_SIZE_64KB
 
 endchoice
 
+config ENTRY_OFFSET
+	hex
+	default "0x00001000" if PAGE_SIZE_4KB
+	default "0x00002000" if PAGE_SIZE_8KB
+	default "0x00004000" if PAGE_SIZE_16KB
+	default "0x00010000" if PAGE_SIZE_64KB
+	default "0x00000000"
+
 choice
 	prompt "HugeTLB page size"
 	depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU