Index: firmware/App/Common.h
===================================================================
diff -u -rb887b4a2796de3b26be07619809f8f4146955867 -r24b4c7f4560296765373099ee83597baddc2cf94
--- firmware/App/Common.h	(.../Common.h)	(revision b887b4a2796de3b26be07619809f8f4146955867)
+++ firmware/App/Common.h	(.../Common.h)	(revision 24b4c7f4560296765373099ee83597baddc2cf94)
@@ -20,7 +20,8 @@
 #define CAN_MESSAGE_FRAME_SIZE_BYTES          8                                                         ///< CAN message frame size in bytes.
 #define CAN_MESSAGE_FRAME_NIBBLE_BYTES        4                                                         ///< CAN message frame nibble in bytes.
 #define FIRMWARE_START_ADDRESS                0x00010000                                                ///< Firmware start address.
-#define FIRMWARE_CRC_TABLE_ADDRESS            0x10020                                                   ///< The starting address of CRC table for firmware image.
+#define FIRMWARE_CRC_TABLE_ADDRESS            ( FIRMWARE_START_ADDRESS + 0x20 )                                                  ///< The starting address of firmware CRC table.
+#define BOOTLOADER_CRC_TABLE_ADDRESS          0x00020                                                   ///< The starting address of bootloader CRC table.
 #define SW_UPDATE_FLASH_BUFFER_SIZE           512                                                       ///< Software update flash buffer bytes.
 #define MASK_OFF_MSB                          0x00FF                                                    ///< Bits to mask off the most significant byte of a 2-byte word.
 #define MASK_OFF_LSB                          0xFF00                                                    ///< Bits to mask off the least significant byte of a 2-byte word.