X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=betty%2Ffwflash.c;h=c4a2155a6089a71ce083c36b7bf6fb466bc2187a;hb=783e1e614cda26e0868c909561fb0c0029b26391;hp=8b89941d247a1c799d918cfe63c666673ea13c37;hpb=6c971d9882182e2760171231cec0317d539eb979;p=my-code%2Farm.git

diff --git a/betty/fwflash.c b/betty/fwflash.c
index 8b89941..c4a2155 100644
--- a/betty/fwflash.c
+++ b/betty/fwflash.c
@@ -22,17 +22,21 @@
 #define BANK2			0x82000000
 #define BANK_SIZE		0x00100000
 #define BOOTLOADER		0x7fffe000
-#define BL_SIZE			0x00000800
+#define BL_SIZE			0x00002000
 
 /* 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
+#define B0F555	(*((volatile unsigned short *)(BANK0|0xaaa)))	// 0x555
+#define B0F2AA	(*((volatile unsigned short *)(BANK0|0x554)))	// 0x2aa
+#define B0F	(*((volatile unsigned short *)(BANK0)))
+#define B2F555	(*((volatile unsigned short *)(BANK2|0xaaa)))	// 0x555
+#define B2F2AA	(*((volatile unsigned short *)(BANK2|0x554)))	// 0x2aa
+#define B2F	(*((volatile unsigned short *)(BANK2)))
 
 /* commands */
 #define CMD_READ		'R'
+#define CMD_WRITE		'W'
 #define CMD_CHIP_ERASE		'E'
+#define CMD_SECTOR_ERASE	'S'
 #define CMD_CHIP_ID		'I'
 
 #define BUFSIZE			16
@@ -45,6 +49,21 @@ typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
 
+/*
+ * sector addresses
+ */
+
+unsigned long sector_address[19]={
+	0x00000,0x02000,0x03000,0x04000,0x08000,
+	0x10000,0x18000,
+	0x20000,0x28000,
+	0x30000,0x38000,
+	0x40000,0x48000,
+	0x50000,0x58000,
+	0x60000,0x68000,
+	0x70000,0x78000
+};
+
 /*
  * functions
  */
@@ -54,12 +73,140 @@ void mmap_init(u8 memtype) {
 	MEMMAP=memtype;
 }
 
+void pll_init(void) {
+
+	/* configuration */
+	PLLCFG=0x42;	// multiplier = 3 (for cclk), dividor = 4 (for f_cco)
+	PLLCON=0x03;	// enable and set as clk source for the lpc
+	/* feed sequence */
+	PLLFEED=0xaa;
+	PLLFEED=0x55;
+	/* wait for lock */
+	while(!(PLLSTAT&(1<<10)))
+		continue;
+}
+
+int flash_sector_erase(u8 flash,u8 sector) {
+
+	u32 a18_12;
+	u32 base;
+
+	if(sector>18)
+		return -1;
+	a18_12=sector_address[sector]<<1;
+
+	if((flash!='0')|(flash!='2'))
+		return -1;
+
+	switch(flash) {
+		case '0':
+			base=0x80000000;
+			B0F555=0xaa;
+			B0F2AA=0x55;
+			B0F555=0x80;
+			B0F555=0xaa;
+			B0F2AA=0x55;
+			*((volatile u16 *)(base|a18_12))=0x30;
+			break;
+		case '2': 
+			base=0x82000000;
+			B2F555=0xaa;
+			B2F2AA=0x55;
+			B2F555=0x80;
+			B2F555=0xaa;
+			B2F2AA=0x55;
+			*((volatile u16 *)(base|a18_12))=0x30;
+			break;
+		default:
+			return -1;
+	}
+
+	return 0;
+}
+
+int flash_chip_erase(u8 bank) {
+
+	if((bank!='0')|(bank!='2'))
+		return -1;
+
+	if(bank=='0') {
+		B0F555=0xaa;
+		B0F2AA=0x55;
+		B0F555=0x80;
+		B0F555=0xaa;
+		B0F2AA=0x55;
+		B0F555=0x10;
+	}
+	else {
+		B2F555=0xaa;
+		B2F2AA=0x55;
+		B2F555=0x80;
+		B2F555=0xaa;
+		B2F2AA=0x55;
+		B2F555=0x10;
+	}
+}
+
+void unlock_bypass(u8 bank) {
+
+	if((bank!='0')|(bank!='2'))
+		return;
+
+	if(bank=='0') {
+		B0F555=0xaa;
+		B0F2AA=0x55;
+		B0F555=0x20;
+	}
+	else {
+		B2F555=0xaa;
+		B2F2AA=0x55;
+		B2F555=0x20;
+	}
+}
+
+void unlock_bypass_reset(u8 bank) {
+
+	if((bank!='0')|(bank!='2'))
+		return;
+
+	if(bank=='0') {
+		B0F=0x90;
+		B0F=0x00;
+	}
+	else {
+		B2F=0x90;
+		B2F=0x00;
+	}
+}
+
+void flash_write(u32 addr,u16 data) {
+
+	*((volatile unsigned short *)addr)=0xa0;
+	*((volatile unsigned short *)addr)=data;
+}
+
+void ext_mem_bank_init(void) {
+
+	BCFG0=0x10000420;	// flash 1
+	BCFG1=0x00000c42;	// lcd
+	BCFG2=0x10000420;	// flash 2
+}
+
+void pin_select_init() {
+
+	/*
+	 * a[19:2] -> address lines
+	 */
+
+	PINSEL2=0x0d6041d4;
+}
+
 void uart0_init(void) {
 
 	PINSEL0=0x05;			// pin select -> tx, rx
 	UART0_FCR=0x07;			// enable fifo
 	UART0_LCR=0x83;			// set dlab + word length
-	UART0_DLL=0x10;			// br: 9600 @ 10/4 mhz
+	UART0_DLL=0x04;			// br: 38400 @ 10/4 mhz
 	UART0_DLM=0x00;
 	UART0_LCR=0x03;			// unset dlab
 }
@@ -97,7 +244,7 @@ void uart0_send_buf16(u16 *buf,int len) {
 
 	i=0;
 
-	for(i=0;i<len;i++) {
+	for(i=0;i<len/2;i++) {
 		if(!(i%8))
 			while(!(UART0_LSR&(1<<6)))
 				continue;
@@ -112,7 +259,7 @@ void uart0_send_buf32(u32 *buf,int len) {
 
 	i=0;
 
-	for(i=0;i<len;i++) {
+	for(i=0;i<len/4;i++) {
 		if(!(i%4))
 			while(!(UART0_LSR&(1<<6)))
 				continue;
@@ -143,6 +290,34 @@ u8 uart0_get_byte(void) {
 	return rx;
 }
 
+void receive_data_and_write_to_flash(u32 addr,u32 datalen) {
+
+	u8 bank;
+	u32 i;
+	u16 data;
+
+	/* which bank to program */
+	if(addr<0x82000000)
+		bank='0';
+	else
+		bank='2';
+
+	/* unlock bypass */
+	unlock_bypass(bank);
+
+	/* receive and write data */
+	for(i=0;i<datalen/2;i++) {
+		data=uart0_get_byte();
+		data=uart0_get_byte()<<8;
+		*((unsigned volatile short *)addr)=0xa0;
+		*((unsigned volatile short *)addr)=data;
+		addr+=2;
+	}
+
+	/* relock bypass */
+	unlock_bypass_reset(bank);
+}
+
 /*
  * main function
  */
@@ -160,12 +335,18 @@ int main(void) {
 	/* memory mapping of interrupt vectors to static ram */
 
 	//mmap_init(MMAP_RAM);
+	
+	/* pll initialization */
+	pll_init();
 
 	/* uart initialization */
 	uart0_init();
 
 	/* external memory init */
-	BCFG0=0x1000FBEF;		// BCFG2 should be fine as is
+	ext_mem_bank_init();
+
+	/* pin select init */
+	pin_select_init();
 
 	/* begin the main loop */
 	while(1) {
@@ -180,25 +361,28 @@ int main(void) {
 				addrlen=0;
 				datalen=1;
 				break;
+			case CMD_SECTOR_ERASE:
+				addrlen=0;
+				datalen=2;
+				break;
 			case CMD_READ:
 				addrlen=4;
 				datalen=4;
+			case CMD_WRITE:
+				addrlen=4;
+				datalen=4;
 				break;
 			case CMD_CHIP_ID:
 				addrlen=0;
 				datalen=1;
 				break;
 			default:
-				uart0_send_byte('f');
 				txrx=0;
 				break;
 		}
 
-		if(txrx) {
-			/* send an ack */
-			uart0_send_byte(cmd);
+		if(txrx)
 			break;
-		}
 	}
 
 	/* receive (only if there is) more data from uart0 */
@@ -213,35 +397,30 @@ int main(void) {
 
 	/* process the cmd */
 	switch(cmd) {
+		case CMD_SECTOR_ERASE:
+			flash_sector_erase(buf[0],buf[1]);
+			break;
 		case CMD_READ:
 			/* data length to read */
 			datalen=buf[0]<<24|buf[1]<<16|buf[2]<<8|buf[3];
 			/* check addr and datalen */
-			if((addr>=BANK0)&(addr+datalen<BANK0+BANK_SIZE))
+			if((addr>=BANK0)&(addr+datalen<=BANK0+BANK_SIZE))
 				uart0_send_buf16((u16 *)addr,datalen);
-			if((addr>=BANK2)&(addr+datalen<BANK2+BANK_SIZE))
+			if((addr>=BANK2)&(addr+datalen<=BANK2+BANK_SIZE))
 				uart0_send_buf16((u16 *)addr,datalen);
-			if((addr>=BOOTLOADER)&(addr+datalen<BOOTLOADER+BL_SIZE))
+			if((addr>=BOOTLOADER)&(addr+datalen<=BOOTLOADER+BL_SIZE))
 				uart0_send_buf32((u32 *)addr,datalen);
 			break;
+		case CMD_WRITE:
+			/* data length */
+			datalen=buf[0]<<24|buf[1]<<16|buf[2]<<8|buf[3];
+			/* check addr and data len */
+			if(((addr>=BANK0)&(addr+datalen<=BANK0+BANK_SIZE))|
+			   ((addr>=BANK2)&(addr+datalen<=BANK2+BANK_SIZE)))
+				receive_data_and_write_to_flash(addr,datalen);
+			break;
 		case CMD_CHIP_ERASE:
-			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;
-			}
-			uart0_send_byte(buf[0]);
+			flash_chip_erase(buf[0]);
 			break;
 		case CMD_CHIP_ID:
 			if(buf[0]=='0') {
@@ -249,16 +428,19 @@ int main(void) {
 				B0F2AA=0x55;
 				B0F555=0x90;
 				data=*((u16 *)BANK0);
+				uart0_send_buf16(&data,2);
 				data=*((u16 *)(BANK0|0x200));
+				uart0_send_buf16(&data,2);
 			}
 			else if(buf[0]=='2') {
 				B2F555=0xaa;
 				B2F2AA=0x55;
 				B2F555=0x90;
 				data=*((u16 *)BANK2);
+				uart0_send_buf16(&data,2);
 				data=*((u16 *)(BANK2|0x200));
+				uart0_send_buf16(&data,2);
 			}
-			uart0_send_buf16(&data,2);
 			break;
 		default:
 			break;