From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sat, 26 Apr 2008 15:24:15 +0000 (+0000)
Subject: - luminary flash now loader polls when finished
X-Git-Tag: v0.1.0~667
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=6eb2264d5669c64d87bb26ad079e953423e87ff5

- luminary flash now loader polls when finished

git-svn-id: svn://svn.berlios.de/openocd/trunk@622 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index e4a5ef3113..efcd7818c9 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -74,7 +74,6 @@ flash_driver_t stellaris_flash =
 	.info = stellaris_info
 };
 
-
 struct {
 	u32 partno;
 	char *partname;
@@ -387,7 +386,6 @@ u32 stellaris_wait_status_busy(flash_bank_t *bank, u32 waitbits, int timeout)
 	return status;
 }
 
-
 /* Send one command to the flash controller */
 int stellaris_flash_command(struct flash_bank_s *bank,u8 cmd,u16 pagen) 
 {
@@ -721,7 +719,8 @@ u8 stellaris_write_code[] =
 	0x04,0x36,			/* adds	r6, r6, #4 */
 	0x96,0x42,			/* cmp	r6, r2 */
 	0xF4,0xD1,			/* bne	mainloop */
-	0x00,0xBE,			/* bkpt #0 */
+						/* exit: */
+	0xFE,0xE7,			/* b exit */
 /* pFLASH_CTRL_BASE: */
 	0x00,0xD0,0x0F,0x40,	/* .word	0x400FD000 */
 /* FLASHWRITECMD: */
@@ -895,9 +894,7 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
 			count = 0;
 		}
 	}
-
-
-
+	
 	while(count>0)
 	{
 		if (!(address&0xff)) LOG_DEBUG("0x%x",address);
@@ -926,7 +923,6 @@ int stellaris_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count
 	return ERROR_OK;
 }
 
-
 int stellaris_probe(struct flash_bank_s *bank)
 {
 	/* we can't probe on an stellaris