Index: Integrity.c
===================================================================
diff -u -r629c834017d19fe3fdeb2d98857794e99f170c98 -rdb72c9fcbb268f4e924171450a6392bf3673fdb7
--- Integrity.c	(.../Integrity.c)	(revision 629c834017d19fe3fdeb2d98857794e99f170c98)
+++ Integrity.c	(.../Integrity.c)	(revision db72c9fcbb268f4e924171450a6392bf3673fdb7)
@@ -39,14 +39,12 @@
 
 #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             0x10020             ///< 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
+#endif
 
 #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