From: Barry Song <barry.song@analog.com>
Date: Fri, 15 Jan 2010 03:24:39 +0000 (+0000)
Subject: Blackfin: bf537-stamp: declare parallel flash as ROM with XIP kernel
X-Git-Tag: v2.6.34-rc2~11^2~51
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=38e7673f24e6c19aba9ecff86760cb7981b91464;p=net-next-2.6.git

Blackfin: bf537-stamp: declare parallel flash as ROM with XIP kernel

When the kernel is executing out of parallel flash (XIP), we can't have
the flash go into an erase/programming cycle, otherwise the instruction
fetching steps fail and everything crashes.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index d47f4ed6b93..26429702db5 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -455,6 +455,9 @@ static struct physmap_flash_data stamp_flash_data = {
 	.width      = 2,
 	.parts      = stamp_partitions,
 	.nr_parts   = ARRAY_SIZE(stamp_partitions),
+#ifdef CONFIG_ROMKERNEL
+	.probe_type = "map_rom",
+#endif
 };
 
 static struct resource stamp_flash_resource = {