Improve str7x config command argument parsing.

[openocd] / src / flash / mx3_nand.c

diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index 8a32bd504e6f11d48f805754f0fa0a9b37a30625..a5df00338be9f0f3821424bb0cbb7fbf1099d226 100644 (file)
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -40,11 +40,9 @@ get_next_halfword_from_sram_buffer() not tested
 static const char target_not_halted_err_msg[] =
        "target must be halted to use mx3 NAND flash controller";
 static const char data_block_size_err_msg[] =
-       "minimal granularity is one half-word, %d is incorrect";
+       "minimal granularity is one half-word, %" PRId32 " is incorrect";
 static const char sram_buffer_bounds_err_msg[] =
-       "trying to access out of SRAM buffer bound (addr=0x%x)";
-static const char invalid_command_sequense_err_msg[] =
-       "invalid command sequence in %s";
+       "trying to access out of SRAM buffer bound (addr=0x%" PRIx32 ")";
 static const char get_status_register_err_msg[] = "can't get NAND status";
 static uint32_t in_sram_address;
 unsigned char sign_of_sequental_byte_read;
@@ -237,7 +235,7 @@ static int imx31_init (struct nand_device_s *device)
         * testing IOMUX settings; must be in "functional-mode output and
         * functional-mode input" mode
         */
-       uint8_t test_iomux;
+       int test_iomux;
        test_iomux = ERROR_OK;
        test_iomux |=
            test_iomux_settings (target, 0x43fac0c0, 0x7f7f7f00, "d0,d1,d2");
@@ -438,10 +436,6 @@ static int imx31_command (struct nand_device_s *device, uint8_t command)
                mx3_nf_info->fin = MX3_NF_FIN_DATAOUT;
                mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
                break;
-           case NAND_CMD_SEQIN:
-               LOG_ERROR ("aaa");
-               return ERROR_FAIL;
-               break;
            default:
                mx3_nf_info->optype = MX3_NF_DATAOUT_PAGE;
        }