v/maiana
1
0
Fork 0
mirror of https://github.com/peterantypas/maiana.git synced 2025-05-19 08:50:09 -07:00
Code Issues Projects Releases Wiki Activity

More bootloader cleanup

Browse Source
This commit is contained in:
Peter Antypas 2016-07-03 20:01:27 -07:00
parent e243ad615f
commit 9ec9b67fe6
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bootloader/src/main.cpp
View File

@ -57,23 +57,20 @@ void erase()
FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT); FLASH_WaitForLastOperation(FLASH_ER_PRG_TIMEOUT);
} }
int int main(int argc, char* argv[])
main(int argc, char* argv[])
{ {
//erase();
/* /*
* - Read page at METADATA_ADDRESS, look for software metadata * - Read page at METADATA_ADDRESS, look for software metadata
* - If no metadata is present, enter UART interactive mode and wait for software upload * - If no metadata is present, enter UART interactive mode and wait for software upload
* - If metadata is present, jump to software start address (APPLICATION_ADDRESS) * - If metadata is present, jump to software start address (APPLICATION_ADDRESS)
*/ */
#if 1
ApplicationMetadata *metadata = (ApplicationMetadata*)METADATA_ADDRESS; ApplicationMetadata *metadata = (ApplicationMetadata*)METADATA_ADDRESS;
if ( metadata == NULL || metadata->magic != METADATA_MAGIC ) { if ( metadata == NULL || metadata->magic != METADATA_MAGIC ) {
trace_printf("There is no software installed. Entering UART mode\n"); trace_printf("There is no software installed. Entering UART mode\n");
enterUARTMode(); enterUARTMode();
} }
//#if 0
else { else {
if ( !verifyApplicationChecksum(*metadata) ) { if ( !verifyApplicationChecksum(*metadata) ) {
@ -81,21 +78,17 @@ main(int argc, char* argv[])
enterUARTMode(); enterUARTMode();
} }
} }
//#endif
trace_printf("Found software rev. %s\n", metadata->revision);
#endif
pFunction start = (pFunction)(*(__IO uint32_t*) (APPLICATION_ADDRESS + 4)); pFunction start = (pFunction)(*(__IO uint32_t*) (APPLICATION_ADDRESS + 4));
trace_printf("Application address: 0x%.8x\n", APPLICATION_ADDRESS);
trace_printf("Jump address: 0x%.8x\n", start);
__timer.start(); __timer.start();
Timer::sleep(2000); Timer::sleep(2000);
jump(); jump();
//while(1);
// This should never be reached
while(1);
} }
void jump() void jump()