From 9b1a938a22e570d080024880bd04c4bbef4b8037 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 11 Sep 2009 06:01:28 +0000
Subject: Alexei Babich <a.babich@rez.ru> cleanup
git-svn-id: svn://svn.berlios.de/openocd/trunk@2688 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/flash/mx3_nand.c | 8 +-------
src/flash/mx3_nand.h | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 7 deletions(-)
(limited to 'src/flash')
diff --git a/src/flash/mx3_nand.c b/src/flash/mx3_nand.c
index 8a32bd50..20ab91e8 100644
--- a/src/flash/mx3_nand.c
+++ b/src/flash/mx3_nand.c
@@ -43,8 +43,6 @@ static const char data_block_size_err_msg[] =
"minimal granularity is one half-word, %d 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";
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;
}
diff --git a/src/flash/mx3_nand.h b/src/flash/mx3_nand.h
index 2759fde3..31938933 100644
--- a/src/flash/mx3_nand.h
+++ b/src/flash/mx3_nand.h
@@ -1,3 +1,30 @@
+
+/***************************************************************************
+ * Copyright (C) 2009 by Alexei Babich *
+ * Rezonans plc., Chelyabinsk, Russia *
+ * impatt@mail.ru *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+/*
+ * Freescale iMX3* OpenOCD NAND Flash controller support.
+ *
+ * Many thanks to Ben Dooks for writing s3c24xx driver.
+ */
#include <nand.h>
#define MX3_NF_BASE_ADDR 0xb8000000
--
cgit v1.2.3