X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=betty%2Ffwflash.c;h=508b09c6a442990284eb1c8441ceb7ef18eb5f4d;hb=78aa7185d5db2062e66e84ace1212f427f13c260;hp=4462654276e9d69b119e6238b9ab4ad224ed1267;hpb=126d76a189309089c2cd4110d8cca1b68e35002c;p=my-code%2Farm.git

diff --git a/betty/fwflash.c b/betty/fwflash.c
index 4462654..508b09c 100644
--- a/betty/fwflash.c
+++ b/betty/fwflash.c
@@ -9,17 +9,23 @@
  * include files
  */
 
+#include <stdio.h>
+
 #include "lpc2xxx.h"
 
 /*
  * defines
  */
 
-/* band 0/2 addr */
+/* bank 0/2 addr */
 #define BANK0			0x80000000
 #define BANK2			0x82000000
-#define B0HB			0x00000000
-#define B2HB			0x02000000
+
+/* flash cmd addresses - flash[0-18] <--> arm[1-19]*/
+#define B0F555	(*((volatile unsigned long *)(BANK0|0xaaa)))	// 0x555
+#define B0F2AA	(*((volatile unsigned long *)(BANK0|0x554)))	// 0x2aa
+#define B2F555	(*((volatile unsigned long *)(BANK2|0xaaa)))	// 0x555
+#define B2F2AA	(*((volatile unsigned long *)(BANK2|0x554)))	// 0x2aa
 
 /* commands */
 #define CMD_READ		'R'
@@ -40,10 +46,14 @@ typedef unsigned int u32;
  */
 
 #define TX_BYTE(x)		while(!(UART0_LSR&(1<<5))) continue; \
-				UART0_THR=x;
+				UART0_THR=x
+
+#define TX_NL			TX_BYTE('\n'); TX_BYTE('\r')
 
-#define SEND_OK			TX_BYTE('o'); TX_BYTE('k'); TX_BYTE('\n'); \
-				TX_BYTE('\r');
+#define TX_STRING(x,len)	for(scnt=0;scnt<len;scnt++) { 	\
+					TX_BYTE(x[scnt]);	\
+				}				\
+				TX_NL
 
 /*
  * function prototypes
@@ -54,6 +64,12 @@ void uart0_init(void);
 void uart0_send_string(char *txbuf);
 void uart0_send_char(char send);
 
+/*
+ * global variables
+ */
+
+int scnt;
+
 /*
  * main function
  */
@@ -86,8 +102,7 @@ int main(void) {
 
 	/* external memory init */
 
-	BCFG0=0x1000FBEF;		// no boot[1:0] influence? (thnx colibri)
-					// BCFG2 should be fine as is
+	BCFG0=0x1000FBEF;		// BCFG2 should be fine as is
 
 	/* begin the main loop */
 	while(1) {
@@ -100,7 +115,6 @@ int main(void) {
 		cmd=UART0_RBR;
 
 		if(cmd==CMD_CHIP_ERASE) {
-SEND_OK
 			addrlen=0;
 			datalen=1;
 			break;
@@ -117,19 +131,20 @@ SEND_OK
 
 	addr=0;
 	for(i=0;i<addrlen;i++) {
+		//TX_STRING("got addr",8);
 		while(!(UART0_LSR&(1<<0)))
 			continue;
 		txrx=UART0_RBR;
-		addr|=(txrx<<(i*4));
+		//addr|=(txrx<<((addrlen-i-1)*4));
+		addr=0x80000000;
 	}
-SEND_OK
 
 	for(i=0;i<datalen;i++) {
+		//TX_STRING("got data",8);
 		while(!(UART0_LSR&(1<<0)))
 			continue;
-		buf[i++]=UART0_RBR;
+		buf[i]=UART0_RBR;
 	}
-SEND_OK
 
 	/* process the cmd */
 
@@ -142,29 +157,22 @@ SEND_OK
 			}
 			break;	
 		case CMD_CHIP_ERASE:
-			if(buf[0]=='0')
-				addr=B0HB;
-			else if(buf[0]=='2')
-				addr=B2HB;
-			else
-				break;
-			// cycle 1
-			dptr=(u16 *)(addr|0x555);
-			*dptr=0xaa;
-			// cycle 2
-			dptr=(u16 *)(addr|0x2aa);
-			*dptr=0x55;
-			// cycle 3+4
-			dptr=(u16 *)(addr|0x555);
-			*dptr=0x80;
-			*dptr=0xaa;
-			// cycle 5
-			dptr=(u16 *)(addr|0x2aa);
-			*dptr=0x55;
-			// cycle 6
-			dptr=(u16 *)(addr|0x555);
-			*dptr=0x10;
-SEND_OK
+			if(buf[0]=='0') {
+				B0F555=0xaa;
+				B0F2AA=0x55;
+				B0F555=0x80;
+				B0F555=0xaa;
+				B0F2AA=0x55;
+				B0F555=0x10;
+			}
+			else if(buf[0]=='2') {
+				B2F555=0xaa;
+				B2F2AA=0x55;
+				B2F555=0x80;
+				B2F555=0xaa;
+				B2F2AA=0x55;
+				B2F555=0x10;
+			}
 			break;
 		default:
 			break;