From 0778592fbc1e28dab96b9bf1eb7c7daf75d0c3b0 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 27 Sep 2011 18:29:31 +0900
Subject: [PATCH] --- yaml --- r: 274259 b: refs/heads/master c:
 487881c09b3a34735b0d1c71666703b8f0f10d8f h: refs/heads/master i:   274257:
 046abae551c256624677c5c520f094444d02b7c6   274255:
 0c067ed6cfe4e248b511a1aeba4dd8a7662ffa9a v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-shmobile/board-mackerel.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 784b0038b327..ac673b23640f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d377b170ae0d4df7692f50c9609bea385fe87cc
+refs/heads/master: 487881c09b3a34735b0d1c71666703b8f0f10d8f
diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c
index 3689ad2e9156..6c621c2ce0bc 100644
--- a/trunk/arch/arm/mach-shmobile/board-mackerel.c
+++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c
@@ -273,8 +273,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,
 	}
 };