From 9ff1afa2c108d1b22731e625729ef3a959ee36da Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Tue, 6 Oct 2009 21:22:26 +0000 Subject: [PATCH] --- yaml --- r: 173381 b: refs/heads/master c: b336f124b1cca55c28b2c5df0e02aa5ace5be7d4 h: refs/heads/master i: 173379: 97f126f73e6f52a045c124fc9413a83ed2f85c8c v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/head_32.S | 2 +- trunk/arch/sh/mm/Kconfig | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9eb1ccc9088f..0496dd3d1be6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f69b6af9171f50135cce8023c84d82fbf42a8f5 +refs/heads/master: b336f124b1cca55c28b2c5df0e02aa5ace5be7d4 diff --git a/trunk/arch/sh/kernel/head_32.S b/trunk/arch/sh/kernel/head_32.S index a78be74b8d3e..1151ecdffa71 100644 --- a/trunk/arch/sh/kernel/head_32.S +++ b/trunk/arch/sh/kernel/head_32.S @@ -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 */ diff --git a/trunk/arch/sh/mm/Kconfig b/trunk/arch/sh/mm/Kconfig index 64dc1ad59801..b8a9032c74be 100644 --- a/trunk/arch/sh/mm/Kconfig +++ b/trunk/arch/sh/mm/Kconfig @@ -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