Skip to contentSkip to conversation

sh: fix uImage Entry Point

PATCH Applied Yoshihiro Shimoda 2 participants 2 messages Jul 23, 2008 – Jul 28, 2008 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sh: fix uImage Entry Point

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

---
 arch/sh/boot/Makefile |    2 +-
 arch/sh/mm/Kconfig    |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)
arch/sh/boot/Makefile +1 -1
index 89b4086..8b37869 100644
@@ -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 \
arch/sh/mm/Kconfig +8 -0
index 29d8e3c..56d0a7d 100644
@@ -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
Signature · 1 line
1.5.5