X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstellaris.h;h=5a852a8f8cb16bc1a7ceffd6a42f5bf096912c23;hp=4ea1fe5aaf6d8f4e77be778312fb079cedd33670;hb=f876d5e9c769a288faa7fd14b7bf373363542aab;hpb=6d3bed69dc023f49b51b6504d977463e722e9e9d

diff --git a/src/flash/stellaris.h b/src/flash/stellaris.h
index 4ea1fe5aaf..5a852a8f8c 100644
--- a/src/flash/stellaris.h
+++ b/src/flash/stellaris.h
@@ -21,7 +21,6 @@
 #define STELLARIS_FLASH_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct stellaris_flash_bank_s
 {
@@ -41,14 +40,13 @@ typedef struct stellaris_flash_bank_s
 	u32 pages_in_lockregion;
 
 	/* nv memory bits */
-	u16 num_lockbits;
+	uint16_t num_lockbits;
 	u32 lockbits;
 
 	/* main clock status */
 	u32 rcc;
-	u8  mck_valid;
+	uint8_t  mck_valid;
 	u32 mck_freq;
-	
 } stellaris_flash_bank_t;
 
 /* STELLARIS control registers */
@@ -67,7 +65,7 @@ typedef struct stellaris_flash_bank_s
 
 #define FMPRE		0x130
 #define FMPPE		0x134
-#define USECRL 		0x140
+#define USECRL		0x140
 
 #define FLASH_CONTROL_BASE	0x400FD000
 #define FLASH_FMA	(FLASH_CONTROL_BASE|0x000)
@@ -83,13 +81,12 @@ typedef struct stellaris_flash_bank_s
 #define AMASK	1
 #define PMASK	2
 
-
 /* Flash Controller Command bits */
 #define FMC_WRKEY	(0xA442<<16)
 #define FMC_COMT	(1<<3)
 #define FMC_MERASE	(1<<2)
 #define FMC_ERASE	(1<<1)
-#define FMC_WRITE	(1<<0)	
+#define FMC_WRITE	(1<<0)
 
 /* STELLARIS constants */