X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ec6d32f924ee9e6b4d58885d2f692c8c2a4a2773..adde7768a2eab2950a7628319ec832c63a00ff03:/target/linux/adm5120/files/drivers/mtd/trxsplit.c

diff --git a/target/linux/adm5120/files/drivers/mtd/trxsplit.c b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
index 19d1e9da9..49eb0f979 100644
--- a/target/linux/adm5120/files/drivers/mtd/trxsplit.c
+++ b/target/linux/adm5120/files/drivers/mtd/trxsplit.c
@@ -4,20 +4,10 @@
  *  Copyright (C) 2007 OpenWrt.org
  *  Copyright (C) Gabor Juhos <juhosg at openwrt.org>
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
  */
 
 #include <linux/module.h>
@@ -51,7 +41,7 @@ struct trx_header {
 	u32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions */
 };
 
-#define BLOCK_LEN_MIN		0x10000
+#define TRX_ALIGN	0x1000
 
 static int trx_nr_parts;
 static unsigned long trx_offset;
@@ -104,17 +94,12 @@ err_out:
 static void trxsplit_findtrx(struct mtd_info *mtd)
 {
 	unsigned long offset;
-	unsigned long blocklen;
 	int err;
 
-	blocklen = mtd->erasesize;
-	if (blocklen < BLOCK_LEN_MIN)
-		blocklen = BLOCK_LEN_MIN;
-
 	printk(KERN_INFO PFX "searching TRX header in '%s'\n", mtd->name);
 
 	err = 0;
-	for (offset = 0; offset < mtd->size; offset += blocklen) {
+	for (offset = 0; offset < mtd->size; offset += TRX_ALIGN) {
 		err = trxsplit_checktrx(mtd, offset);
 		if (err == 0)
 			break;
@@ -192,6 +177,12 @@ err:
 
 static void __init trxsplit_add_mtd(struct mtd_info *mtd)
 {
+	if (mtd->type != MTD_NORFLASH) {
+		printk(KERN_INFO PFX "'%s' is not a NOR flash, skipped\n",
+				mtd->name);
+		return;
+	}
+
 	if (!trx_mtd)
 		trxsplit_findtrx(mtd);
 }