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

Commit b336f124 authored by Matt Fleming's avatar Matt Fleming Committed by Paul Mundt
Browse files

sh: CONFIG_PMB doesn't mean the MMU is in 32bit mode 



CONFIG_PMB will eventually allow the MMU to be switched between 29-bit
and 32-bit mode dynamically at runtime.

Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 1f69b6af

arch/sh/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ENTRY(empty_zero_page) 
	.long	1		/* LOADER_TYPE */

	.long	0x00000000	/* INITRD_START */

	.long	0x00000000	/* INITRD_SIZE */

#ifdef CONFIG_32BIT

#if defined(CONFIG_32BIT) && defined(CONFIG_PMB_FIXED)

	.long	0x53453f00 + 32	/* "SE?" = 32 bit */

#else

	.long	0x53453f00 + 29	/* "SE?" = 29 bit */

arch/sh/mm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ config 32BIT 
config PMB_ENABLE

	bool "Support 32-bit physical addressing through PMB"

	depends on MMU && EXPERIMENTAL && (CPU_SUBTYPE_SH7757 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)

	select 32BIT

	default y

	help

	  If you say Y here, physical addressing will be extended to
@@ -98,7 +97,6 @@ choice 
config PMB

	bool "PMB"

	depends on MMU && EXPERIMENTAL && (CPU_SUBTYPE_SH7757 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785)

	select 32BIT

	help

	  If you say Y here, physical addressing will be extended to

	  32-bits through the SH-4A PMB. If this is not set, legacy