deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

clean up and flash type workaround.

Browse source
This commit is contained in:
Mariano Alvira 2009-05-09 15:30:54 -04:00
parent 37a5b3d2ec
commit 706da17807
2 changed files with 59 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
tests/flasher.c
View file

@ -20,6 +20,11 @@
#define DELAY 400000 #define DELAY 400000
/* if both BOOT_OK and BOOT_SECURE are 0 then flash image will not be bootable */
/* if both are 1 then flash image will be secure */
#define BOOT_OK 1
#define BOOT_SECURE 0
#define DEBUG 1 #define DEBUG 1
#if DEBUG #if DEBUG
#define dbg_putc(...) putc(__VA_ARGS__) #define dbg_putc(...) putc(__VA_ARGS__)
@ -85,31 +90,26 @@ void main(void) {
vreg_init(); vreg_init();
// puts("CRM status: 0x"); dbg_puts("Detecting internal nvm\n\r");
// put_hex32(reg(0x80003018));
// puts("\n\r");
// puts("Detecting internal nvm\n\r");
err = nvm_detect(gNvmInternalInterface_c, &type); err = nvm_detect(gNvmInternalInterface_c, &type);
/* dbg_puts("nvm_detect returned: 0x");
puts("nvm_detect returned: 0x"); dbg_put_hex(err);
put_hex(err); dbg_puts(" type is: 0x");
puts(" type is: 0x"); dbg_put_hex32(type);
put_hex32(type); dbg_puts("\n\r");
puts("\n\r");
*/
/* erase the flash */ /* erase the flash */
// err = nvm_erase(gNvmInternalInterface_c, type, 0x4fffffff); err = nvm_erase(gNvmInternalInterface_c, type, 0x4fffffff);
err = nvm_erase(gNvmInternalInterface_c, 1, 0x4fffffff);
/* dbg_puts("nvm_erase returned: 0x");
puts("nvm_erase returned: 0x"); dbg_put_hex(err);
put_hex(err); dbg_puts("\n\r");
puts("\n\r");
*/ dbg_puts(" type is: 0x");
dbg_put_hex32(type);
dbg_puts("\n\r");
/* say we are ready */ /* say we are ready */
len = 0; len = 0;
@ -123,21 +123,32 @@ void main(void) {
len += (c<<(i*8)); len += (c<<(i*8));
} }
// puts("len: "); dbg_puts("len: ");
// put_hex32(len); dbg_put_hex32(len);
// puts("\n\r"); dbg_puts("\n\r");
/* write the OKOK magic */ /* write the OKOK magic */
#if BOOT_OK
((uint8_t *)buf)[0] = 'O'; ((uint8_t *)buf)[1] = 'K'; ((uint8_t *)buf)[2] = 'O'; ((uint8_t *)buf)[3] = 'K'; ((uint8_t *)buf)[0] = 'O'; ((uint8_t *)buf)[1] = 'K'; ((uint8_t *)buf)[2] = 'O'; ((uint8_t *)buf)[3] = 'K';
// ((uint8_t *)buf)[3] = 'x'; #elif BOOT_SECURE
// err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, 0, 4); ((uint8_t *)buf)[0] = 'S'; ((uint8_t *)buf)[1] = 'E'; ((uint8_t *)buf)[2] = 'C'; ((uint8_t *)buf)[3] = 'U';
err = nvm_write(gNvmInternalInterface_c, 1, (uint8_t *)buf, 0, 4); #else
// puts("nvm_write returned: 0x"); ((uint8_t *)buf)[0] = 'N'; ((uint8_t *)buf)[1] = 'O'; ((uint8_t *)buf)[2] = 'N'; ((uint8_t *)buf)[3] = 'O';
// put_hex(err); #endif
// puts("\n\r");
dbg_puts(" type is: 0x");
dbg_put_hex32(type);
dbg_puts("\n\r");
err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)buf, 0, 4);
dbg_puts("nvm_write returned: 0x");
dbg_put_hex(err);
dbg_puts("\n\r");
/* write the length */ /* write the length */
err = nvm_write(gNvmInternalInterface_c, 1, (uint8_t *)&len, 4, 4); err = nvm_write(gNvmInternalInterface_c, type, (uint8_t *)&len, 4, 4);
/* read a byte, write a byte */ /* read a byte, write a byte */
/* byte at a time will make this work as a contiki process better */ /* byte at a time will make this work as a contiki process better */
@ -146,9 +157,22 @@ void main(void) {
c = getc(); c = getc();
// put_hex(c); // put_hex(c);
// puts(": "); // puts(": ");
/*for some reason I have to hard code the type here for it to work reliably */
// err = nvm_write(gNvmInternalInterface_c, type, &c, 4+i, 1); // err = nvm_write(gNvmInternalInterface_c, type, &c, 4+i, 1);
err = nvm_write(gNvmInternalInterface_c, 1, &c, 8+i, 1); switch(type)
// if(err==0) { putc('.'); } else { putc('x'); } {
case 1:
err = nvm_write(gNvmInternalInterface_c, 1, &c, 8+i, 1);
break;
case 2:
err = nvm_write(gNvmInternalInterface_c, 2, &c, 8+i, 1);
break;
case 3:
err = nvm_write(gNvmInternalInterface_c, 3, &c, 8+i, 1);
break;
}
// puts("nvm_write returned: 0x"); // puts("nvm_write returned: 0x");
// put_hex(err); // put_hex(err);
// puts("\n\r"); // puts("\n\r");

4
tests/nvm-read.c
View file

@ -31,7 +31,7 @@ const uint8_t hex[16]={'0','1','2','3','4','5','6','7',
#include "isr.h" #include "isr.h"
#define NBYTES 1024 #define NBYTES 16
__attribute__ ((section ("startup"))) __attribute__ ((section ("startup")))
void main(void) { void main(void) {
nvmType_t type=0; nvmType_t type=0;
@ -76,7 +76,7 @@ void main(void) {
nvm_setsvar(0); nvm_setsvar(0);
err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, 0x1F000, NBYTES); err = nvm_read(gNvmInternalInterface_c, type, (uint8_t *)buf, 0x1e000, NBYTES);
puts("nvm_read returned: 0x"); puts("nvm_read returned: 0x");
put_hex(err); put_hex(err);
puts("\n\r"); puts("\n\r");