return rx;
}
+void flash_reset(u8 bank) {
+
+ if((bank!='0')&(bank!='2'))
+ return;
+
+ if(bank=='0')
+ B0F=0xf0;
+ else
+ B2F=0xf0;
+}
+
void flash_sector_erase(u8 flash,u8 sector) {
u32 a18_12;
void flash_chip_erase(u8 bank) {
+ u8 status;
+
if((bank!='0')&(bank!='2'))
return;
B2F2AA=0x55;
B2F555=0x10;
}
+
+ while(1) {
+ if(bank=='0')
+ status=B0F;
+ else
+ status=B2F;
+
+ if(status&0x80) {
+ /* send an ack */
+ uart0_send_byte(status);
+ break;
+ }
+ }
}
void unlock_bypass(u8 bank) {
}
}
-void flash_write(u32 addr,u16 data) {
+int flash_write(u32 addr,u16 data) {
+
+ u16 check;
+
+ if(data==0xffff)
+ return 0;
+
+ *((unsigned volatile short *)addr)=0xa0;
+ *((unsigned volatile short *)addr)=data;
+ while(1) {
+ check=*((unsigned short *)addr);
+ if((data&0x80)==(check&0x80))
+ break;
+ }
+ if(data!=check)
+ return -1;
- *((volatile unsigned short *)addr)=0xa0;
- *((volatile unsigned short *)addr)=data;
+ return 0;
}
-void receive_data_and_write_to_flash(u32 addr,u32 datalen) {
+int receive_data_and_write_to_flash(u32 addr,u32 datalen) {
u8 bank;
- u32 i;
+ u32 i,ret;
u16 data;
- u8 byte;
u8 cksm;
+ u8 byte;
/* which bank to program */
if(addr<0x82000000)
/* receive and write data */
cksm=0;
+ ret=0;
for(i=0;i<datalen/2;i++) {
byte=uart0_get_byte();
data=byte;
byte=uart0_get_byte();
cksm+=byte;
data|=byte<<8;
- *((unsigned volatile short *)addr)=0xa0;
- *((unsigned volatile short *)addr)=data;
+ if(flash_write(addr,data)<0)
+ ret=-1;
addr+=2;
}
/* relock bypass */
unlock_bypass_reset(bank);
- /* send an ack */
+ /* modify cksm on purpose, so the user knows ... */
+ if(ret==-1)
+ cksm+=1;
+
+ /* send the cksm */
uart0_send_byte(cksm);
+
+ return ret;
}
/*
uart0_send_buf16((u16 *)addr,datalen);
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-1+BL_SIZE))
uart0_send_buf32((u32 *)addr,datalen);
break;
case CMD_WRITE: