Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82cb1f6f authored Jul 23, 2008 by Yoshihiro Shimoda Committed by Paul Mundt Jul 28, 2008

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>

parent d3aa43a9

arch/sh/boot/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ KERNEL_LOAD := $(shell /bin/bash -c 'printf "0x%08x" \
	KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \		KERNEL_ENTRY := $(shell /bin/bash -c 'printf "0x%08x" \
	$$[$(CONFIG_PAGE_OFFSET) + \		$$[$(CONFIG_PAGE_OFFSET) + \
	$(CONFIG_MEMORY_START) + \		$(CONFIG_MEMORY_START) + \
	$(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')		$(CONFIG_ZERO_PAGE_OFFSET) + $(CONFIG_ENTRY_OFFSET)]')

	quiet_cmd_uimage = UIMAGE $@		quiet_cmd_uimage = UIMAGE $@
	cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \		cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \

arch/sh/mm/Kconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -170,6 +170,14 @@ config PAGE_SIZE_64KB

	endchoice		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		choice
	prompt "HugeTLB page size"		prompt "HugeTLB page size"
	depends on HUGETLB_PAGE && (CPU_SH4 \|\| CPU_SH5) && MMU		depends on HUGETLB_PAGE && (CPU_SH4 \|\| CPU_SH5) && MMU