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 79858d63c21c7e116a2f4f2b9f7040c58fba6072..84ed0a478c91cd6ad7a99fe22e0b0d125982f1d1 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -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']");
        }
@@ -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
                {
@@ -736,7 +738,7 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
                uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
                uint32_t page_address;
@@ -773,7 +775,7 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint
 
        page = malloc(device->page_size);
 
-       while (data_size > 0 )
+       while (data_size > 0)
        {
                uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
                uint32_t page_address;
@@ -1138,12 +1140,12 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd
                                else
                                        bad_state = " (block condition unknown)";
 
-                               command_print(cmd_ctx, 
+                               command_print(cmd_ctx,
                                              "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
                                              j,
-                                             p->blocks[j].offset, 
+                                             p->blocks[j].offset,
                                              p->blocks[j].size / 1024,
-                                             erase_state, 
+                                             erase_state,
                                              bad_state);
                        }
                }
@@ -1420,7 +1422,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                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];
@@ -1437,7 +1439,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                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;
                                }
                        }