Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Alexei Babich <a.babich@rez.ru> imx31 nand flash controller support
[openocd.git] / src / flash / nand.c
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 192565f7e35395f949850c1cd1b610ccdf47a216..84ed0a478c91cd6ad7a99fe22e0b0d125982f1d1 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -38,10 +38,10 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm
 
 static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-static int nand_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size);
-//static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size);
+static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
+//static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size);
 
-static int nand_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size);
+static int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 
 /* NAND flash controller
  */
@@ -52,6 +52,7 @@ extern nand_flash_controller_t s3c2410_nand_controller;
 extern nand_flash_controller_t s3c2412_nand_controller;
 extern nand_flash_controller_t s3c2440_nand_controller;
 extern nand_flash_controller_t s3c2443_nand_controller;
+extern nand_flash_controller_t imx31_nand_flash_controller;
 
 /* extern nand_flash_controller_t boundary_scan_nand_controller; */
 
@@ -64,6 +65,7 @@ static nand_flash_controller_t *nand_flash_controllers[] =
        &s3c2412_nand_controller,
        &s3c2440_nand_controller,
        &s3c2443_nand_controller,
+       &imx31_nand_flash_controller,
 /*     &boundary_scan_nand_controller, */
        NULL
 };
@@ -311,9 +313,9 @@ int nand_init(struct command_context_s *cmd_ctx)
                                                 "erase blocks on NAND flash device <num> <offset> <length>");
                register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC,
                                                 "dump from NAND flash device <num> <filename> "
-                                                "<offset> <length> [oob_raw|oob_only]");
+                                                "<offset> <length> [oob_raw | oob_only]");
                register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC,
-                                                "write to NAND flash device <num> <filename> <offset> [oob_raw|oob_only|oob_softecc|oob_softecc_kw]");
+                                                "write to NAND flash device <num> <filename> <offset> [oob_raw | oob_only | oob_softecc | oob_softecc_kw]");
                register_command(cmd_ctx, nand_cmd, "raw_access", handle_nand_raw_access_command, COMMAND_EXEC,
                                                 "raw access to NAND flash device <num> ['enable'|'disable']");
        }
@@ -339,7 +341,7 @@ nand_device_t *get_nand_device_by_num(int num)
 
 static int nand_build_bbt(struct nand_device_s *device, int first, int last)
 {
-       u32 page = 0x0;
+       uint32_t page = 0x0;
        int i;
        uint8_t oob[6];
 
@@ -518,9 +520,9 @@ int nand_probe(struct nand_device_s *device)
        {
                if (device->bus_width == 8)
                {
-                       device->controller->read_data(device, id_buff+3);
-                       device->controller->read_data(device, id_buff+4);
-                       device->controller->read_data(device, id_buff+5);
+                       device->controller->read_data(device, id_buff + 3);
+                       device->controller->read_data(device, id_buff + 4);
+                       device->controller->read_data(device, id_buff + 5);
                }
                else
                {
@@ -638,7 +640,7 @@ int nand_probe(struct nand_device_s *device)
 int nand_erase(struct nand_device_s *device, int first_block, int last_block)
 {
        int i;
-       u32 page;
+       uint32_t page;
        uint8_t status;
        int retval;
 
@@ -721,7 +723,7 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block)
 }
 
 #if 0
-static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size)
+static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size)
 {
        uint8_t *page;
 
@@ -736,10 +738,10 @@ static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *d
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
-               u32 thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
-               u32 page_address;
+               uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
+               uint32_t page_address;
 
 
                page_address = address / device->page_size;
@@ -758,7 +760,7 @@ static int nand_read_plain(struct nand_device_s *device, u32 address, uint8_t *d
        return ERROR_OK;
 }
 
-static int nand_write_plain(struct nand_device_s *device, u32 address, uint8_t *data, u32 data_size)
+static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size)
 {
        uint8_t *page;
 
@@ -773,10 +775,10 @@ static int nand_write_plain(struct nand_device_s *device, u32 address, uint8_t *
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
-               u32 thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
-               u32 page_address;
+               uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
+               uint32_t page_address;
 
                memset(page, 0xff, device->page_size);
                memcpy(page, data, thisrun_size);
@@ -796,9 +798,9 @@ static int nand_write_plain(struct nand_device_s *device, u32 address, uint8_t *
 }
 #endif
 
-int nand_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
-       u32 block;
+       uint32_t block;
 
        if (!device->device)
                return ERROR_NAND_DEVICE_NOT_PROBED;
@@ -813,7 +815,7 @@ int nand_write_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 d
                return device->controller->write_page(device, page, data, data_size, oob, oob_size);
 }
 
-static int nand_read_page(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
        if (!device->device)
                return ERROR_NAND_DEVICE_NOT_PROBED;
@@ -824,9 +826,9 @@ static int nand_read_page(struct nand_device_s *device, u32 page, uint8_t *data,
                return device->controller->read_page(device, page, data, data_size, oob, oob_size);
 }
 
-int nand_read_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
-       u32 i;
+       uint32_t i;
 
        if (!device->device)
                return ERROR_NAND_DEVICE_NOT_PROBED;
@@ -938,9 +940,9 @@ int nand_read_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u3
        return ERROR_OK;
 }
 
-int nand_write_page_raw(struct nand_device_s *device, u32 page, uint8_t *data, u32 data_size, uint8_t *oob, u32 oob_size)
+int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
-       u32 i;
+       uint32_t i;
        int retval;
        uint8_t status;
 
@@ -1138,9 +1140,13 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd
                                else
                                        bad_state = " (block condition unknown)";
 
-                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (%dkB) %s%s",
-                                                       j, p->blocks[j].offset, p->blocks[j].size / 1024,
-                                                       erase_state, bad_state);
+                               command_print(cmd_ctx,
+                                             "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
+                                             j,
+                                             p->blocks[j].offset,
+                                             p->blocks[j].size / 1024,
+                                             erase_state,
+                                             bad_state);
                        }
                }
                else
@@ -1310,9 +1316,9 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
 
 static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u32 offset;
-       u32 binary_size;
-       u32 buf_cnt;
+       uint32_t offset;
+       uint32_t binary_size;
+       uint32_t buf_cnt;
        enum oob_formats oob_format = NAND_OOB_NONE;
 
        fileio_t fileio;
@@ -1332,9 +1338,9 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
        if (p)
        {
                uint8_t *page = NULL;
-               u32 page_size = 0;
+               uint32_t page_size = 0;
                uint8_t *oob = NULL;
-               u32 oob_size = 0;
+               uint32_t oob_size = 0;
                const int *eccpos = NULL;
 
                offset = strtoul(args[2], NULL, 0);
@@ -1398,7 +1404,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
                while (buf_cnt > 0)
                {
-                       u32 size_read;
+                       uint32_t size_read;
 
                        if (NULL != page)
                        {
@@ -1412,11 +1418,11 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
                        if (oob_format & NAND_OOB_SW_ECC)
                        {
-                               u32 i, j;
+                               uint32_t i, j;
                                uint8_t ecc[3];
                                memset(oob, 0xff, oob_size);
                                for (i = 0, j = 0; i < page_size; i += 256) {
-                                       nand_calculate_ecc(p, page+i, ecc);
+                                       nand_calculate_ecc(p, page + i, ecc);
                                        oob[eccpos[j++]] = ecc[0];
                                        oob[eccpos[j++]] = ecc[1];
                                        oob[eccpos[j++]] = ecc[2];
@@ -1429,11 +1435,11 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                 * at the end of the OOB area.  It consists
                                 * of 10 bytes per 512-byte data block.
                                 */
-                               u32 i;
+                               uint32_t i;
                                uint8_t *ecc = oob + oob_size - page_size/512 * 10;
                                memset(oob, 0xff, oob_size);
                                for (i = 0; i < page_size; i += 512) {
-                                       nand_calculate_ecc_kw(p, page+i, ecc);
+                                       nand_calculate_ecc_kw(p, page + i, ecc);
                                        ecc += 10;
                                }
                        }
@@ -1449,7 +1455,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
                        if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
                        {
-                               command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8x",
+                               command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8" PRIx32 "",
                                        args[1], args[0], offset);
 
                                fileio_close(&fileio);
@@ -1467,7 +1473,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                oob = NULL;
                page = NULL;
                duration_stop_measure(&duration, &duration_text);
-               command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8x in %s",
+               command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8" PRIx32 " in %s",
                        args[1], args[0], offset, duration_text);
                free(duration_text);
                duration_text = NULL;
@@ -1500,12 +1506,12 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd
                        int retval;
 
                        uint8_t *page = NULL;
-                       u32 page_size = 0;
+                       uint32_t page_size = 0;
                        uint8_t *oob = NULL;
-                       u32 oob_size = 0;
-                       u32 address = strtoul(args[2], NULL, 0);
-                       u32 size = strtoul(args[3], NULL, 0);
-                       u32 bytes_done = 0;
+                       uint32_t oob_size = 0;
+                       uint32_t address = strtoul(args[2], NULL, 0);
+                       uint32_t size = strtoul(args[3], NULL, 0);
+                       uint32_t bytes_done = 0;
                        enum oob_formats oob_format = NAND_OOB_NONE;
 
                        if (argc > 4)
@@ -1552,7 +1558,7 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd
 
                        while (size > 0)
                        {
-                               u32 size_written;
+                               uint32_t size_written;
                                if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK)
                                {
                                        command_print(cmd_ctx, "reading NAND flash page failed");
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)