diff --git a/BaseTools/ImageTool/Image.c b/BaseTools/ImageTool/Image.c
index de2c8fdd82..472fe34665 100644
--- a/BaseTools/ImageTool/Image.c
+++ b/BaseTools/ImageTool/Image.c
@@ -150,10 +150,12 @@ ToolImageGetRelocSize (
       return sizeof (UINT64);
     }
 
+#if 0
     case EFI_IMAGE_REL_BASED_ARM_MOV32T:
     {
       return sizeof (UINT32);
     }
+#endif
 
     default:
     {
@@ -173,8 +175,11 @@ CheckToolImageReloc (
   uint32_t                   RelocOffset;
   uint32_t                   RemainingSize;
   const image_tool_segment_t *Segment;
+
+#if 0
   uint16_t                   MovHigh;
   uint16_t                   MovLow;
+#endif
 
   RelocOffset = Reloc->Target;
   Segment     = ImageGetSegmentByAddress (
@@ -192,6 +197,7 @@ CheckToolImageReloc (
     return false;
   }
 
+#if 0
   if (Reloc->Type == EFI_IMAGE_REL_BASED_ARM_MOV32T) {
     if (!IS_ALIGNED (Reloc->Target, ALIGNOF (UINT16))) {
       DEBUG_RAISE ();
@@ -206,6 +212,7 @@ CheckToolImageReloc (
       return false;
     }
   }
+#endif
 
   // FIXME: Update drivers?
   if ((Image->HeaderInfo.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER ||
@@ -461,6 +468,7 @@ ToolImageRelocate (
         break;
       }
 
+#if 0
       case EFI_IMAGE_REL_BASED_ARM_MOV32T:
       {
         assert (RemainingSize >= sizeof (UINT32));
@@ -469,6 +477,7 @@ ToolImageRelocate (
         PeCoffThumbMovwMovtImmediateFixup (&Segment->Data[RelocOffset], Adjust);
         break;
       }
+#endif
 
       default:
       {