diff --git a/Target/Source/ARM7_LPC2000/cpu.c b/Target/Source/ARM7_LPC2000/cpu.c
index c1e36ead..338de8f3 100644
--- a/Target/Source/ARM7_LPC2000/cpu.c
+++ b/Target/Source/ARM7_LPC2000/cpu.c
@@ -86,7 +86,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -101,7 +101,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
 
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM0_STM32F0/cpu.c b/Target/Source/ARMCM0_STM32F0/cpu.c
index 8d6336ad..f747ccfd 100644
--- a/Target/Source/ARMCM0_STM32F0/cpu.c
+++ b/Target/Source/ARMCM0_STM32F0/cpu.c
@@ -86,7 +86,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -101,7 +101,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -142,7 +142,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM0_XMC1/cpu.c b/Target/Source/ARMCM0_XMC1/cpu.c
index 01bd5f53..506939a5 100644
--- a/Target/Source/ARMCM0_XMC1/cpu.c
+++ b/Target/Source/ARMCM0_XMC1/cpu.c
@@ -77,7 +77,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -92,7 +92,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -122,7 +122,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM3_EFM32/cpu.c b/Target/Source/ARMCM3_EFM32/cpu.c
index dda5e8db..09d2b57f 100644
--- a/Target/Source/ARMCM3_EFM32/cpu.c
+++ b/Target/Source/ARMCM3_EFM32/cpu.c
@@ -84,7 +84,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -99,7 +99,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM3_LM3S/cpu.c b/Target/Source/ARMCM3_LM3S/cpu.c
index 3e0c74a2..d22c55a5 100644
--- a/Target/Source/ARMCM3_LM3S/cpu.c
+++ b/Target/Source/ARMCM3_LM3S/cpu.c
@@ -84,7 +84,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -99,7 +99,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM3_STM32F1/cpu.c b/Target/Source/ARMCM3_STM32F1/cpu.c
index 347fa775..daac2860 100644
--- a/Target/Source/ARMCM3_STM32F1/cpu.c
+++ b/Target/Source/ARMCM3_STM32F1/cpu.c
@@ -78,7 +78,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -93,7 +93,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -127,7 +127,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM3_STM32F2/cpu.c b/Target/Source/ARMCM3_STM32F2/cpu.c
index 97cab19b..c0301d89 100644
--- a/Target/Source/ARMCM3_STM32F2/cpu.c
+++ b/Target/Source/ARMCM3_STM32F2/cpu.c
@@ -78,7 +78,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -93,7 +93,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -127,7 +127,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM4_STM32F3/cpu.c b/Target/Source/ARMCM4_STM32F3/cpu.c
index 21cd26f6..8d2d86b7 100644
--- a/Target/Source/ARMCM4_STM32F3/cpu.c
+++ b/Target/Source/ARMCM4_STM32F3/cpu.c
@@ -78,7 +78,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -93,7 +93,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -127,7 +127,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM4_STM32F4/cpu.c b/Target/Source/ARMCM4_STM32F4/cpu.c
index ccb6fafa..836ae3e2 100644
--- a/Target/Source/ARMCM4_STM32F4/cpu.c
+++ b/Target/Source/ARMCM4_STM32F4/cpu.c
@@ -84,7 +84,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -99,7 +99,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM4_STM32L4/cpu.c b/Target/Source/ARMCM4_STM32L4/cpu.c
index c686910e..37b78fea 100644
--- a/Target/Source/ARMCM4_STM32L4/cpu.c
+++ b/Target/Source/ARMCM4_STM32L4/cpu.c
@@ -78,7 +78,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -93,7 +93,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -127,7 +127,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM4_TM4C/cpu.c b/Target/Source/ARMCM4_TM4C/cpu.c
index df966dd2..c3488da3 100644
--- a/Target/Source/ARMCM4_TM4C/cpu.c
+++ b/Target/Source/ARMCM4_TM4C/cpu.c
@@ -84,7 +84,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -99,7 +99,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM4_XMC4/cpu.c b/Target/Source/ARMCM4_XMC4/cpu.c
index bff65d42..45075c82 100644
--- a/Target/Source/ARMCM4_XMC4/cpu.c
+++ b/Target/Source/ARMCM4_XMC4/cpu.c
@@ -84,7 +84,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -99,7 +99,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -131,7 +131,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/ARMCM7_STM32F7/cpu.c b/Target/Source/ARMCM7_STM32F7/cpu.c
index 331d3259..2dbaa95c 100644
--- a/Target/Source/ARMCM7_STM32F7/cpu.c
+++ b/Target/Source/ARMCM7_STM32F7/cpu.c
@@ -79,7 +79,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -94,7 +94,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -128,7 +128,7 @@ void CpuStartUserProgram(void)
   CpuIrqEnable();
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/HCS12/cpu.c b/Target/Source/HCS12/cpu.c
index 3b585d9a..9dcc7f87 100644
--- a/Target/Source/HCS12/cpu.c
+++ b/Target/Source/HCS12/cpu.c
@@ -79,7 +79,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -94,7 +94,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -119,7 +119,7 @@ void CpuStartUserProgram(void)
   pProgResetHandler = (void(*)(void))(*((blt_int16u *)CPU_USER_PROGRAM_STARTADDR_PTR));
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that
diff --git a/Target/Source/TRICORE_TC1798/cpu.c b/Target/Source/TRICORE_TC1798/cpu.c
index 35283865..2bda6c11 100644
--- a/Target/Source/TRICORE_TC1798/cpu.c
+++ b/Target/Source/TRICORE_TC1798/cpu.c
@@ -75,7 +75,7 @@ void CpuStartUserProgram(void)
   /* check if a user program is present by verifying the checksum */
   if (NvmVerifyChecksum() == BLT_FALSE)
   {
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -90,7 +90,7 @@ void CpuStartUserProgram(void)
   /* invoke callback */
   if (CpuUserProgramStartHook() == BLT_FALSE)
   {
-  #if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+  #if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
     /* bootloader will stay active so perform deferred initialization to make sure
      * the communication interface that were not yet initialized are now initialized.
      * this is needed to make sure firmware updates via these communication interfaces
@@ -115,7 +115,7 @@ void CpuStartUserProgram(void)
   pProgResetHandler = (void(*)(void))((blt_addr *)CPU_USER_PROGRAM_STARTADDR_PTR);
   /* start the user program by activating its reset interrupt service routine */
   pProgResetHandler();
-#if (BOOT_COM_DEFERRED_INIT_ENABLE == 1)
+#if (BOOT_COM_DEFERRED_INIT_ENABLE > 0) && (BOOT_COM_ENABLE > 0)
   /* theoretically, the code never gets here because the user program should now be
    * running and the previous function call should not return. In case it did return
    * for whatever reason, make sure all communication interfaces are initialized so that