diff options
Diffstat (limited to 'src/flash/nor')
| -rw-r--r-- | src/flash/nor/Makefile.am | 1 | ||||
| -rw-r--r-- | src/flash/nor/avrf.c | 17 | ||||
| -rw-r--r-- | src/flash/nor/avrf.h | 39 |
3 files changed, 16 insertions, 41 deletions
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index b008d759..2964d64e 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -33,7 +33,6 @@ NOR_DRIVERS = \ virtual.c noinst_HEADERS = \ - avrf.h \ core.h \ cfi.h \ driver.h \ diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c index 4dc7c239..5a2482e4 100644 --- a/src/flash/nor/avrf.c +++ b/src/flash/nor/avrf.c @@ -22,7 +22,6 @@ #endif #include "imp.h" -#include "avrf.h" #include <target/avrt.h> @@ -50,6 +49,22 @@ #define AVR_JTAG_REG_ProgrammingCommand_Len 15 #define AVR_JTAG_REG_FlashDataByte_Len 16 +struct avrf_type +{ + char name[15]; + uint16_t chip_id; + int flash_page_size; + int flash_page_num; + int eeprom_page_size; + int eeprom_page_num; +}; + +struct avrf_flash_bank +{ + int ppage_size; + int probed; +}; + static struct avrf_type avft_chips_info[] = { /* name, chip_id, flash_page_size, flash_page_num, diff --git a/src/flash/nor/avrf.h b/src/flash/nor/avrf.h deleted file mode 100644 index 1a69e862..00000000 --- a/src/flash/nor/avrf.h +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Simon Qian * - * SimonQian@SimonQian.com * - * * - * 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. * - ***************************************************************************/ -#ifndef AVRF_H -#define AVRF_H - -struct avrf_type -{ - char name[15]; - uint16_t chip_id; - int flash_page_size; - int flash_page_num; - int eeprom_page_size; - int eeprom_page_num; -}; - -struct avrf_flash_bank -{ - int ppage_size; - int probed; -}; - -#endif /* AVRF_H */ |