mtd: uclinux: allow systems to override map addr/size

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=fa254ecbcca713a4aec99478e79f858942b3d4e0
Commit:     fa254ecbcca713a4aec99478e79f858942b3d4e0
Parent:     c3a9f35673290f49ec115d36ad283961c82c135a
Author:     Mike Frysinger <vapier at gentoo.org>
AuthorDate: Tue May 26 19:33:16 2009 -0400
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Jun 5 18:29:14 2009 +0100

    mtd: uclinux: allow systems to override map addr/size
    
    Due to a processor anomaly (05000263 to be exact), most Blackfin parts
    cannot keep the embedded filesystem image directly after the kernel in
    RAM.  Instead, the filesystem needs to be relocated to the end of memory.
    As such, we need to tweak the map addr/size during boot for Blackfin
    systems.  This can be done in any early arch/board init code.
    
    Signed-off-by: Mike Frysinger <vapier at gentoo.org>
    CC: Paul Mundt <lethal at linux-sh.org>
    CC: Greg Ungerer <gerg at uclinux.org>
    CC: uclinux-dev at uclinux.org
    CC: linux-mtd at lists.infradead.org
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/maps/uclinux.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index 81756e3..61d4087 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -22,8 +22,12 @@
 
 /****************************************************************************/
 
+extern char _ebss;
+
 struct map_info uclinux_ram_map = {
 	.name = "RAM",
+	.phys = (unsigned long)&_ebss,
+	.size = 0,
 };
 
 struct mtd_info *uclinux_ram_mtdinfo;
@@ -55,12 +59,10 @@ static int __init uclinux_mtd_init(void)
 {
 	struct mtd_info *mtd;
 	struct map_info *mapp;
-	extern char _ebss;
-	unsigned long addr = (unsigned long) &_ebss;
 
 	mapp = &uclinux_ram_map;
-	mapp->phys = addr;
-	mapp->size = PAGE_ALIGN(ntohl(*((unsigned long *)(addr + 8))));
+	if (!mapp->size)
+		mapp->size = PAGE_ALIGN(ntohl(*((unsigned long *)(mapp->phys + 8))));
 	mapp->bankwidth = 4;
 
 	printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",