X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fmx3_nand.c;h=a5df00338be9f0f3821424bb0cbb7fbf1099d226;hb=111b7a6a9dbd68c906b8a8dff6e6c34d780297db;hp=8a32bd504e6f11d48f805754f0fa0a9b37a30625;hpb=9262e0dbdfeb6a4c7fa27aa64cfca19379981d6c;p=openocd diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c index 8a32bd50..a5df0033 100644 --- 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; }