KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: fix MTD API usage in the RDC specific board patch

Browse source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39734
This commit is contained in:
Gabor Juhos 2014-02-23 21:15:56 +00:00
parent 5b388e5716
commit 6d530eef5d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/x86/patches-3.10/100-rdc_boards.patch
View file

@ -138,7 +138,7 @@
+late_initcall(rdc_board_setup); +late_initcall(rdc_board_setup);
--- /dev/null --- /dev/null
+++ b/arch/x86/mach-rdc321x/boards/ar525w.c +++ b/arch/x86/mach-rdc321x/boards/ar525w.c
@@ -0,0 +1,247 @@ @@ -0,0 +1,251 @@
+/* +/*
+ * ar525w RDC321x platform devices + * ar525w RDC321x platform devices
+ * + *
@ -294,7 +294,7 @@
+ return -ENOMEM; + return -ENOMEM;
+ } + }
+ +
+ res = master->read(master, 0x0, bufferlength, &len, buffer); + res = mtd_read(master, 0x0, bufferlength, &len, buffer);
+ if (res || len != bufferlength) + if (res || len != bufferlength)
+ goto out; + goto out;
+ +
@ -310,8 +310,12 @@
+ header->fastcksum = crc32(crcbuf, sizeof(crcbuf)); + header->fastcksum = crc32(crcbuf, sizeof(crcbuf));
+ header->checksum = crc32(buffer, bufferlength); + header->checksum = crc32(buffer, bufferlength);
+ +
+ if (master->unlock) + res = mtd_unlock(master, 0, master->erasesize);
+ master->unlock(master, 0, master->erasesize); + if (res != 0 && res != -EOPNOTSUPP) {
+ printk(KERN_ERR "Can't unlock image header\n");
+ goto out;
+ }
+
+ res = erase_write (master, 0, master->erasesize, buffer); + res = erase_write (master, 0, master->erasesize, buffer);
+ if (res) + if (res)
+ printk(KERN_ERR "Can't rewrite image header\n"); + printk(KERN_ERR "Can't rewrite image header\n");
@ -334,7 +338,7 @@
+ if (master->size != 0x400000) //4MB + if (master->size != 0x400000) //4MB
+ return -ENOSYS; + return -ENOSYS;
+ +
+ res = master->read(master, 0x0, sizeof(header), &len, (char *)&header); + res = mtd_read(master, 0x0, sizeof(header), &len, (char *)&header);
+ if (res) + if (res)
+ return res; + return res;
+ +
@ -430,7 +434,7 @@
+ u32 kernel_len; + u32 kernel_len;
+ u16 tmp; + u16 tmp;
+ +
+ res = master->read(master, 0x4000 + 1036, 2, &len, (char *) &tmp); + res = mtd_read(master, 0x4000 + 1036, 2, &len, (char *) &tmp);
+ if (res) + if (res)
+ return res; + return res;
+ kernel_len = tmp * master->erasesize; + kernel_len = tmp * master->erasesize;
@ -606,7 +610,7 @@
+ if (master->size != 0x400000) /* 4MB */ + if (master->size != 0x400000) /* 4MB */
+ return -ENOSYS; + return -ENOSYS;
+ +
+ res = master->read(master, 0x8000, sizeof(header), &len, (char *)&header); + res = mtd_read(master, 0x8000, sizeof(header), &len, (char *)&header);
+ if (res) + if (res)
+ return res; + return res;
+ +