4 files changed, 9 insertions, 8 deletions
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 8eb1ebda52..23beb24274 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -95,12 +95,12 @@ typedef enum {
 //
 // ARM Cpu IDs
 //
-#define ARM_CPU_IMPLEMENTER_MASK          (0xFF << 24)
-#define ARM_CPU_IMPLEMENTER_ARMLTD        (0x41 << 24)
-#define ARM_CPU_IMPLEMENTER_DEC           (0x44 << 24)
-#define ARM_CPU_IMPLEMENTER_MOT           (0x4D << 24)
-#define ARM_CPU_IMPLEMENTER_QUALCOMM      (0x51 << 24)
-#define ARM_CPU_IMPLEMENTER_MARVELL       (0x56 << 24)
+#define ARM_CPU_IMPLEMENTER_MASK          (0xFFU << 24)
+#define ARM_CPU_IMPLEMENTER_ARMLTD        (0x41U << 24)
+#define ARM_CPU_IMPLEMENTER_DEC           (0x44U << 24)
+#define ARM_CPU_IMPLEMENTER_MOT           (0x4DU << 24)
+#define ARM_CPU_IMPLEMENTER_QUALCOMM      (0x51U << 24)
+#define ARM_CPU_IMPLEMENTER_MARVELL       (0x56U << 24)
 
 #define ARM_CPU_PRIMARY_PART_MASK         (0xFFF << 4)
 #define ARM_CPU_PRIMARY_PART_CORTEXA5     (0xC05 << 4)
diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
index 39d6c85937..a5ff6b2610 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupportV7.asm
@@ -97,4 +97,4 @@ ReadCLIDR
   mrc p15,1,r0,c0,c0,1 ; Read CP15 Cache Level ID Register
   bx  lr
   
-END
+  END
diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
index 7222cf9b7f..7926d55369 100755
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.asm
@@ -80,4 +80,3 @@ L43
   ldmfd    sp!, {r4-r11, pc}
   
   END
-  
-\ No newline at end of file
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.asm
index 2d901c3a6b..d567cd54e7 100755
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.asm
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.asm
@@ -55,3 +55,5 @@ __aeabi_memclr4
   mov   r2, r1
   mov   r1, #0
   b     __aeabi_memset
+
+  END