Check bitstream version before reloading, also check + reload before jumping to app

Author: sandeepmistry

bootloaders/zero/board_driver_jtag.c

@@ -687,6 +687,17 @@ int mbRead(uint32_t address, void* data, int len)
 
 #define MB_DEV_FLASH    0x01000000
 
+uint32_t jtagBitstreamVersion()
+{
+  uint32_t ptr[1];
+  uint32_t ver;
+
+  ptr[0] = 0 | 1;
+  ver = mbCmdSend(ptr, 1);
+
+  return ver;
+}
+
 void jtagFlashEraseBlock(uint32_t offset)
 {
   uint32_t rpc[256];

bootloaders/zero/board_driver_jtag.h

@@ -80,6 +80,7 @@ int jtagWriteBuffer(unsigned int address, const uint8_t* data, size_t len);
 int jtagReadBuffer(unsigned int address, uint8_t* data, size_t len);
 void jtagDeinit(void);
 
+uint32_t jtagBitstreamVersion();
 void jtagFlashEraseBlock(uint32_t offset);
 void jtagFlashWriteBlock(uint32_t offset, size_t len, uint32_t* data);
 void jtagFlashReadBlock(uint32_t offset, size_t len, uint8_t* buf);

bootloaders/zero/main.c

@@ -180,9 +180,6 @@ int main(void)
 
 #ifdef CONFIGURE_PMIC
   configure_pmic();
-  if (jump_to_app == true) {
-    jump_to_application();
-  }
 #endif
 
 #ifdef ENABLE_JTAG_LOAD
@@ -196,7 +193,16 @@ int main(void)
   clockout(0, 1);
 
   jtagInit();
-  jtagReload();
+  if ((jtagBitstreamVersion() & 0xFF000000) != 0xB0000000) {
+    // FPGA is not in the bootloader, restart it
+    jtagReload();    
+  }
+#endif
+
+#ifdef CONFIGURE_PMIC
+  if (jump_to_app == true) {
+    jump_to_application();
+  }
 #endif
 
 #if defined(SAM_BA_UART_ONLY)  ||  defined(SAM_BA_BOTH_INTERFACES)