aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-09-27 05:29:31 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-11-04 11:59:10 -0400
commit487881c09b3a34735b0d1c71666703b8f0f10d8f (patch)
treec04da16a3cbe02a99ac8ba0b01c0e60544541a13 /arch/arm/mach-shmobile/board-mackerel.c
parent7d377b170ae0d4df7692f50c9609bea385fe87cc (diff)
ARM: mach-shmobile: sh7372 Mackerel NOR Flash USB boot fix
Always use CS0 shadow area for NOR flash instead of regular CS0 memory area on Mackerel. 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: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 3689ad2e9156..6c621c2ce0bc 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -273,8 +273,8 @@ static struct physmap_flash_data nor_flash_data = {
273 273
274static struct resource nor_flash_resources[] = { 274static struct resource nor_flash_resources[] = {
275 [0] = { 275 [0] = {
276 .start = 0x00000000, 276 .start = 0x20000000, /* CS0 shadow instead of regular CS0 */
277 .end = 0x08000000 - 1, 277 .end = 0x28000000 - 1, /* needed by USB MASK ROM boot */
278 .flags = IORESOURCE_MEM, 278 .flags = IORESOURCE_MEM,
279 } 279 }
280}; 280};