[adm5120] board specific fixes

[openwrt-10.03/.git] / target / linux / adm5120-2.6 / files / drivers / mtd / maps / adm5120_mtd.c

diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
index 230fceee21983e474bd1dd281ba38916eb14d810..ba36298b3e23aae65b176cbc20c301057be22377 100644 (file)
--- a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
+++ b/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120_mtd.c
@@ -407,6 +407,10 @@ int __init init_adm5120_map(void)
        struct mtd_partition *parts;
        int i, parsed_nr_parts = 0;
 #endif
+
+       if (adm5120_nand_boot)
+               return -ENODEV;
+
        printk("adm5120 : flash init : 0x%08x 0x%08x\n", WINDOW_ADDR, adm5120_board.flash0_size);
        adm5120_map.virt = ioremap_nocache(WINDOW_ADDR, adm5120_board.flash0_size);
 
@@ -433,13 +437,13 @@ int __init init_adm5120_map(void)
 
 #ifdef CONFIG_MTD_PARTITIONS
 
-       if (adm5120_boot_loader == BOOT_LOADER_CFE)
+       if (adm5120_boot_loader == BOOT_LOADER_CFE || adm5120_boot_loader == BOOT_LOADER_UNKNOWN)
        {
                printk(KERN_NOTICE "adm5120 : using CFE flash mapping\n");
                parts = init_mtd_partitions(adm5120_mtd, size);
 
                for (i = 0; parts[i].name; i++);
-                       ret = add_mtd_partitions(adm5120_mtd, parts, i);
+               ret = add_mtd_partitions(adm5120_mtd, parts, i);
 
                if (ret) {
                        printk(KERN_ERR "Flash: add_mtd_partitions failed\n");