sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmPlatformPkg/ArmVExpressDxe: remove ARM support

Browse Source 
The 32-bit ARM support in this driver is unused, and thus untested.
So let's just remove it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
This commit is contained in:
Ard Biesheuvel
2017-03-29 11:58:43 +01:00
parent ddbe62d6ae
commit de25fa1437
3 changed files with 0 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/Arm/ArmFvpDxeArm.c
View File

@@ -1,84 +0,0 @@
/** @file
Copyright (c) 2014, ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include "ArmVExpressInternal.h"
#include <Library/ArmPlatformLib.h> // To get Core Count
//
// Description of the four ARM model platforms :
// Platform ids are defined in ArmVExpressInternal.h for
// all "ArmVExpress-like" platforms (AARCH64 or ARM architecture,
// model or hardware platforms).
//
CONST ARM_VEXPRESS_PLATFORM ArmVExpressPlatforms[] = {
{ ARM_FVP_VEXPRESS_A9x4, FixedPcdGetPtr (PcdFdtVExpressFvpA9x4), L"rtsm_ve-cortex_a9x4.dtb" },
{ ARM_FVP_VEXPRESS_A15x1, FixedPcdGetPtr (PcdFdtVExpressFvpA15x1), L"rtsm_ve-cortex_a15x1.dtb" },
{ ARM_FVP_VEXPRESS_A15x2, FixedPcdGetPtr (PcdFdtVExpressFvpA15x2), L"rtsm_ve-cortex_a15x2.dtb" },
{ ARM_FVP_VEXPRESS_A15x4, FixedPcdGetPtr (PcdFdtVExpressFvpA15x4), L"rtsm_ve-cortex_a15x4.dtb" },
{ ARM_FVP_VEXPRESS_UNKNOWN, }
};
/**
Get information about the VExpress platform the firmware is running on.
@param[out] Platform Address where the pointer to the platform information
(type ARM_VEXPRESS_PLATFORM*) should be stored.
The returned pointer does not point to an allocated
memory area.
@retval EFI_SUCCESS The platform information was returned.
@retval EFI_NOT_FOUND The platform was not recognised.
**/
EFI_STATUS
ArmVExpressGetPlatform (
OUT CONST ARM_VEXPRESS_PLATFORM** Platform
)
{
UINT32 SysId;
UINTN CpuType;
EFI_STATUS Status;
UINTN CoreCount;
ASSERT (Platform != NULL);
CpuType = 0;
Status = EFI_NOT_FOUND;
*Platform = NULL;
SysId = MmioRead32 (ARM_VE_SYS_ID_REG);
if (SysId == ARM_RTSM_SYS_ID) {
// Get the Cortex-A version
CpuType = (ArmReadMidr () >> 4) & ARM_CPU_TYPE_MASK;
if (CpuType == ARM_CPU_TYPE_A9) {
Status = ArmVExpressGetPlatformFromId (ARM_FVP_VEXPRESS_A9x4, Platform);
} else if (CpuType == ARM_CPU_TYPE_A15) {
CoreCount = ArmGetCpuCountPerCluster ();
if (CoreCount == 1) {
Status = ArmVExpressGetPlatformFromId (ARM_FVP_VEXPRESS_A15x1, Platform);
} else if (CoreCount == 2) {
Status = ArmVExpressGetPlatformFromId (ARM_FVP_VEXPRESS_A15x2, Platform);
} else if (CoreCount == 4) {
Status = ArmVExpressGetPlatformFromId (ARM_FVP_VEXPRESS_A15x4, Platform);
}
}
}
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "Unsupported platform (SysId:0x%X, CpuType:0x%X)\n", SysId, CpuType));
ASSERT_EFI_ERROR (Status);
}
return Status;
}

9
ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf
View File

@@ -24,9 +24,6 @@
ArmFvpDxe.c
ArmVExpressCommon.c
[Sources.ARM]
Arm/ArmFvpDxeArm.c
[Sources.AARCH64]
AArch64/ArmFvpDxeAArch64.c
@@ -61,12 +58,6 @@
[FixedPcd]
gArmVExpressTokenSpaceGuid.PcdFvpFdtDevicePathsBase
[FixedPcd.ARM]
gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA9x4
gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x1
gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x2
gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x4
[FixedPcd.AARCH64]
gArmVExpressTokenSpaceGuid.PcdFdtFvpVExpressAEMv8x4
gArmVExpressTokenSpaceGuid.PcdFdtFvpBaseAEMv8x4GicV2