summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/flash/nor/Makefile.am1
-rw-r--r--src/flash/nor/lpc288x.c14
-rw-r--r--src/flash/nor/lpc288x.h37
3 files changed, 13 insertions, 39 deletions
diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am
index 7d11bcd5..80428865 100644
--- a/src/flash/nor/Makefile.am
+++ b/src/flash/nor/Makefile.am
@@ -37,7 +37,6 @@ noinst_HEADERS = \
cfi.h \
driver.h \
imp.h \
- lpc288x.h \
non_cfi.h \
ocl.h \
pic32mx.h \
diff --git a/src/flash/nor/lpc288x.c b/src/flash/nor/lpc288x.c
index b6d207e8..d8cecc0b 100644
--- a/src/flash/nor/lpc288x.c
+++ b/src/flash/nor/lpc288x.c
@@ -32,7 +32,6 @@
#endif
#include "imp.h"
-#include "lpc288x.h"
#include <helper/binarybuffer.h>
@@ -85,6 +84,19 @@
/* F_CLK_TIME */
#define FCT_CLK_DIV_MASK 0x0FFF
+struct lpc288x_flash_bank
+{
+ uint32_t working_area;
+ uint32_t working_area_size;
+
+ /* chip id register */
+ uint32_t cidr;
+ char * target_name;
+ uint32_t cclk;
+
+ uint32_t sector_size_break;
+};
+
static uint32_t lpc288x_wait_status_busy(struct flash_bank *bank, int timeout);
static void lpc288x_load_timer(int erase, struct target *target);
static void lpc288x_set_flash_clk(struct flash_bank *bank);
diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h
deleted file mode 100644
index cd5fb734..00000000
--- a/src/flash/nor/lpc288x.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2008 by *
- * Karl RobinSod <karl.robinsod@gmail.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 lpc288x_H
-#define lpc288x_H
-
-struct lpc288x_flash_bank
-{
- uint32_t working_area;
- uint32_t working_area_size;
-
- /* chip id register */
- uint32_t cidr;
- char * target_name;
- uint32_t cclk;
-
- uint32_t sector_size_break;
-};
-
-#endif /* lpc288x_H */