summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBastian Hecht <hechtb@googlemail.com>2011-09-27 13:23:04 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-11-05 00:59:10 +0900
commit832217daec1aa8683c037e8e0e0b910ea24fbca5 (patch)
treed8ac1622632076f5f7f553a0b495a0b23438fd64 /arch
parent487881c09b3a34735b0d1c71666703b8f0f10d8f (diff)
downloadlinux-3.10-832217daec1aa8683c037e8e0e0b910ea24fbca5.tar.gz
linux-3.10-832217daec1aa8683c037e8e0e0b910ea24fbca5.tar.bz2
linux-3.10-832217daec1aa8683c037e8e0e0b910ea24fbca5.zip
ARM: sh7372 ap4evb NOR Flash USB boot fix
Always use CS0 shadow area for NOR flash instead of regular CS0 memory area on ap4evb. When booting from CS0 NOR Flash the regular CS0 memory area is available, but when booting via USB the MASK ROM gets mapped to 0x0 which gets in the way for the NOR Flash. Always using CS0 shadow area works well for both NOR Flash boot and USB boot. Signed-off-by: Bastian Hecht <hechtb@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 5b7edadf464..7283d6913fb 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -200,8 +200,8 @@ static struct physmap_flash_data nor_flash_data = {
static struct resource nor_flash_resources[] = {
[0] = {
- .start = 0x00000000,
- .end = 0x08000000 - 1,
+ .start = 0x20000000, /* CS0 shadow instead of regular CS0 */
+ .end = 0x28000000 - 1, /* needed by USB MASK ROM boot */
.flags = IORESOURCE_MEM,
}
};