@@ -42,9 +42,6 @@
#include <asm/types.h>
#include "mtd/mtd-user.h"
-#define MAX_PAGE_SIZE 4096
-#define MAX_OOB_SIZE 128
-
// oob layouts to pass into the kernel as default
static struct nand_oobinfo none_oobinfo = {
.useecc = MTD_NANDECC_OFF,
@@ -276,12 +273,10 @@ int main(int argc, char * const argv[])
unsigned char *writebuf = NULL;
// points to the OOB for the current page in filebuf
unsigned char *oobreadbuf = NULL;
- unsigned char oobbuf[MAX_OOB_SIZE];
+ unsigned char *oobbuf = NULL;
process_options(argc, argv);
- erase_buffer(oobbuf, sizeof(oobbuf));
-
if (pad && writeoob) {
fprintf(stderr, "Can't pad when oob data is present.\n");
exit(EXIT_FAILURE);
@@ -304,17 +299,6 @@ int main(int argc, char * const argv[])
* (virtual) block size */
meminfo.erasesize *= blockalign;
- /* Make sure device page sizes are valid */
- if (!(meminfo.oobsize == 16 && meminfo.writesize == 512) &&
- !(meminfo.oobsize == 8 && meminfo.writesize == 256) &&
- !(meminfo.oobsize == 64 && meminfo.writesize == 2048) &&
- !(meminfo.oobsize == 64 && meminfo.writesize == 4096) &&
- !(meminfo.oobsize == 128 && meminfo.writesize == 4096)) {
- fprintf(stderr, "Unknown flash (not normal NAND)\n");
- close(fd);
- exit(EXIT_FAILURE);
- }
-
if (mtdoffset & (meminfo.writesize - 1)) {
fprintf(stderr, "The start address is not page-aligned !\n"
"The pagesize of this NAND Flash is 0x%x.\n",
@@ -455,11 +439,19 @@ int main(int argc, char * const argv[])
filebuf = (unsigned char *)malloc(filebuf_max);
if (!filebuf) {
fprintf(stderr, "Failed to allocate memory for file buffer (%d bytes)\n",
- pagelen * meminfo.erasesize / meminfo.writesize);
+ filebuf_max);
goto closeall;
}
erase_buffer(filebuf, filebuf_max);
+ oobbuf = (unsigned char *)malloc(meminfo.oobsize);
+ if (!oobbuf) {
+ fprintf(stderr, "Failed to allocate memory for oob buffer (%d bytes)\n",
+ meminfo.oobsize);
+ goto closeall;
+ }
+ erase_buffer(oobbuf, meminfo.oobsize);
+
/*
* Get data from input and write to the device while there is
* still input to read and we are still within the device
@@ -688,9 +680,10 @@ int main(int argc, char * const argv[])
failed = false;
closeall:
- if (filebuf) {
+ if (filebuf)
free(filebuf);
- }
+ if (oobbuf)
+ free(oobbuf);
close(ifd);
Dynamic allocation of the oob buffer provides the necessary support for removing the oob size check. Now, new unknown OOB sizes can be handled correctly (for example, 8KB page + 448B OOB). Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- nandwrite.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-)