Index: Integrity.c
===================================================================
diff -u -rc57cfc34f4691eae24a420bc3fa64bc55ec5c11a -r4c154d7d1e576dbf2719ed742b24e22e454538ac
--- Integrity.c	(.../Integrity.c)	(revision c57cfc34f4691eae24a420bc3fa64bc55ec5c11a)
+++ Integrity.c	(.../Integrity.c)	(revision 4c154d7d1e576dbf2719ed742b24e22e454538ac)
@@ -29,18 +29,25 @@
 #include "Utilities.h"
 #include "DGDefs.h"
 #include "HDDefs.h"
-
+
 /**
  *  @addtogroup Integrity
  *  @{
  */
 
-// ********** private definitions **********
+// ********** private definitions **********
 
 #ifndef _VECTORCAST_
 // This address is redefined in VectorCAST again
 #define CRC_TABLE_STARTING_ADDR             0x20                ///< The starting address of CRC table for firmware image.
 #endif
+
+#ifdef WITH_BOOTLOADER
+#define CRC_TABLE_STARTING_ADDR             0x10040             ///< The starting address of CRC table for firmware image.
+#else
+#define CRC_TABLE_STARTING_ADDR             0x20                ///< The starting address of CRC table for firmware image.
+#endif // WITH_BOOTLOADER
+
 #define MAX_CRC_CALC_DATA_SIZE              0x8000              ///< The maximum size of data for each CRC calculation.
 #define SERR                                0x00000001          ///< Bit 0 - Single-bit error in TCRAM Module Error Status Register
 #define ADDR_DEC_FAIL                       0x00000004          ///< Bit 2 - Address decode failed in TCRAM Module Error Status Register
@@ -49,7 +56,6 @@
 #define RADDR_PAR_FAIL                      0x00000100          ///< Bit 8 - Read Address Parity Failure in TCRAM Module Error Status Register
 #define WADDR_PAR_FAIL                      0x00000200          ///< Bit 9 - Write Address Parity Failure in TCRAM Module Error Status Register
 
-
 #ifdef _VECTORCAST_
 // Since VectorCAST does not have access to #include <crc_tbl.h>, the structures are defined here so VectoCAST can compile and
 // instrument the code for Dev testing
@@ -90,7 +96,7 @@
 static const U32 RAM_ERROR_CHECK_TIME_THRESHOLD = ((2 * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 
 // ********** private data **********
-
+
 static U32 currentRecord;                                       ///< Current CRC table record to check.
 static U32 currentProcessedSize;                                ///< Current data size processed for CRC calculation.
 static U32 crcCalculated;                                       ///< The calculated CRC value.