sh: fix uImage Entry Point

fix the problem that cannot boot using uImage when PAGE_SIZE is
8kbyte or 64kbyte.

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 89b408620dcbbfb68d2e3f02a534fc22e86f3a64..8b37869a822759efd58dbddfd007590aa873db76 100644 (file)
--- a/arch/sh/boot/Makefile
+++ b/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/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 29d8e3c58b3401c68700a51df7df48fe7473e4ed..56d0a7daa34ba61e45fdcff6e4b9fddf51f902ef 100644 (file)
--- a/arch/sh/mm/Kconfig
+++ b/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