diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-04-18 09:25:30 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-09-18 17:29:46 +0100 |
| commit | b4e5765cf0231406fa638c7df927544837e9a0a3 (patch) | |
| tree | 2e5e915fc7c6a825f2702e1e5857569697a30b67 | |
| parent | d79d29c90b8b2cce305b2ea03fea12509f200afb (diff) | |
Revert A9 part of "ArmPkg/ArmCpuLib: Fixed SMP Cortex-A9 and Cortex-A15"
This reverts the A9 changes from this commit:
> commit 9d59a88be171f74ae08ad63b3e8d1b77a87522e8
> Author: oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
> Date: Wed May 2 20:14:55 2012 +0000
>
> ArmPkg/ArmCpuLib: Fixed SMP Cortex-A9 and Cortex-A15
>
> Signed-off-by: Olivier Martin <olivier.martin@arm.com>
>
> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13261 6f19259b-4bc3-4df7-8a09-765794883524
Reverting this change not only fixes ATAGs boot for A9, but Device Tree boot works too.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c index 4fc6a08b9..aed43cb3e 100644 --- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c +++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.c @@ -49,9 +49,6 @@ ArmCpuSetup ( // If MPCore then Enable the SCU
if (ArmIsMpCore()) {
- // Signals the Cortex-A9 processor is taking part in coherency
- ArmSetAuxCrBit (A9_FEATURE_SMP);
-
ArmEnableScu ();
}
}
@@ -64,6 +61,8 @@ ArmCpuSetupSmpNonSecure ( {
INTN ScuBase;
+ ArmSetAuxCrBit (A9_FEATURE_SMP); + // Make the SCU accessible in Non Secure world
if (ArmPlatformIsPrimaryCore (MpId)) {
ScuBase = ArmGetScuBaseAddress();
|