From 2575b72620a9d90af26d9863b4a0675079c1c019 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Wed, 4 Jul 2012 20:06:23 +0000 Subject: ArmPkg: Fixed RVCT compiler warnings Signed-off-by: Olivier Martin git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13490 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h | 10 +++++----- .../Library/ArmVExpressSecLibCTA9x4/CTA9x4Boot.asm | 2 ++ .../ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ArmPlatformPkg/ArmVExpressPkg') diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h b/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h index 63b4005e96..3555f3635a 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h +++ b/ArmPlatformPkg/ArmVExpressPkg/Include/VExpressMotherBoard.h @@ -48,11 +48,11 @@ // VRAM offset for the PL111 Colour LCD Controller on the motherboard #define VRAM_MOTHERBOARD_BASE (ARM_VE_SMB_PERIPH_BASE + 0x00000) -#define ARM_VE_SYS_PROC_ID_MASK (0xFF << 24) -#define ARM_VE_SYS_PROC_ID_UNSUPPORTED (0xFF << 24) -#define ARM_VE_SYS_PROC_ID_CORTEX_A9 (0x0C << 24) -#define ARM_VE_SYS_PROC_ID_CORTEX_A5 (0x12 << 24) -#define ARM_VE_SYS_PROC_ID_CORTEX_A15 (0x14 << 24) +#define ARM_VE_SYS_PROC_ID_MASK (UINT32)(0xFFU << 24) +#define ARM_VE_SYS_PROC_ID_UNSUPPORTED (UINT32)(0xFFU << 24) +#define ARM_VE_SYS_PROC_ID_CORTEX_A9 (UINT32)(0x0CU << 24) +#define ARM_VE_SYS_PROC_ID_CORTEX_A5 (UINT32)(0x12U << 24) +#define ARM_VE_SYS_PROC_ID_CORTEX_A15 (UINT32)(0x14U << 24) // // Sites where the peripheral is fitted diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibCTA9x4/CTA9x4Boot.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibCTA9x4/CTA9x4Boot.asm index ebcee9a0d9..16fab1605b 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibCTA9x4/CTA9x4Boot.asm +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibCTA9x4/CTA9x4Boot.asm @@ -123,3 +123,5 @@ ArmPlatformSecBootMemoryInit ldr r0, [r2, #0] bx r5 + + END diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm index f62a1998ed..2d0b94679f 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMBoot.asm @@ -50,3 +50,5 @@ ArmPlatformSecBootAction ArmPlatformSecBootMemoryInit // The SMC does not need to be initialized for RTSM bx lr + + END -- cgit v1.2.3