X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/49b34728f956238c5fdbec568be0247fb8be95c6..004d10fcc7b043e86be72dfd749336220874e5ba:/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c?ds=sidebyside

diff --git a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
index aed241b98..ef256f90b 100644
--- a/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
+++ b/target/linux/ifxmips/files/drivers/mtd/maps/ifxmips.c
@@ -26,12 +26,13 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_prom.h>
-#include <asm/ifxmips/ifxmips_ebu.h>
 #include <linux/magic.h>
 #include <linux/platform_device.h>
 
+#include <ifxmips.h>
+#include <ifxmips_prom.h>
+#include <ifxmips_ebu.h>
+
 #ifndef CONFIG_MTD_PARTITIONS
 #error Please enable CONFIG_MTD_PARTITIONS
 #endif
@@ -133,8 +134,8 @@ int find_uImage_size(unsigned long start_offset)
 	unsigned long magic;
 	unsigned long temp;
 	ifxmips_copy_from(&ifxmips_map, &magic, start_offset, 4);
-	if (!(ntohl(magic) == 0x27051956)) {
-		printk(KERN_INFO "ifxmips_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", ntohl(magic), start_offset);
+	if (le32_to_cpu(magic) != 0x56190527) {
+		printk(KERN_INFO "ifxmips_mtd: invalid magic (0x%08X) of kernel at 0x%08lx \n", le32_to_cpu(magic), start_offset);
 		return 0;
 	}
 	ifxmips_copy_from(&ifxmips_map, &temp, start_offset + 12, 4);
@@ -158,7 +159,7 @@ int detect_squashfs_partition(unsigned long start_offset)
 {
 	unsigned long temp;
 	ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4);
-	return temp == SQUASHFS_MAGIC;
+	return le32_to_cpu(temp) == SQUASHFS_MAGIC;
 }
 
 static int ifxmips_mtd_probe(struct platform_device *dev)
@@ -231,9 +232,9 @@ static int ifxmips_mtd_probe(struct platform_device *dev)
 
 	if (err <= 0) {
 		if (ifxmips_has_brn_block()) {
-			parts[4].size -= ifxmips_mtd->erasesize;
-			parts[5].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize;
-			parts[5].size = ifxmips_mtd->erasesize;
+			parts[3].size -= ifxmips_mtd->erasesize;
+			parts[4].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize;
+			parts[4].size = ifxmips_mtd->erasesize;
 		} else {
 			num_parts--;
 		}
@@ -243,7 +244,7 @@ static int ifxmips_mtd_probe(struct platform_device *dev)
 	add_mtd_partitions(ifxmips_mtd, &ifxmips_meta_partition, 1);
 
 	printk(KERN_INFO "ifxmips_mtd: added %s flash with %dMB\n",
-		ifxmips_map.name, ifxmips_mtd->size >> 20);
+		ifxmips_map.name, ((int)ifxmips_mtd->size) >> 20);
 	return 0;
 }