From: Jan Dąbroś jsd@semihalf.com
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jan Dabros jsd@semihalf.com Signed-off-by: Marcin Wojtas mw@semihalf.com --- Platforms/Marvell/Armada/Armada7040_rz.dsc | 5 +++++ Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.c | 5 ++--- Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.inf | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Platforms/Marvell/Armada/Armada7040_rz.dsc b/Platforms/Marvell/Armada/Armada7040_rz.dsc index b8926ef..0bdf506 100644 --- a/Platforms/Marvell/Armada/Armada7040_rz.dsc +++ b/Platforms/Marvell/Armada/Armada7040_rz.dsc @@ -98,3 +98,8 @@ #ResetLib gMarvellTokenSpaceGuid.PcdResetRegAddress|0xf06f0084 gMarvellTokenSpaceGuid.PcdResetRegMask|0x1 + + #IcuLib + gMarvellTokenSpaceGuid.PcdIcuCpBase|0xF2000000 + gMarvellTokenSpaceGuid.PcdIcuSpiBase|64 + gMarvellTokenSpaceGuid.PcdIcuSpiOffset|0 diff --git a/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.c b/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.c index 2a34455..fa480a5 100644 --- a/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.c +++ b/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.c @@ -16,7 +16,7 @@ #include <Library/ArmPlatformLib.h> #include <Library/MppLib.h> #include <Ppi/ArmMpCoreInfo.h> - +#include "Armada7040IcuLib.h"
ARM_CORE_INFO mArmPlatformNullMpCoreInfoTable[] = { { @@ -91,8 +91,7 @@ ArmPlatformInitialize ( return RETURN_SUCCESS; }
- //TODO: Add basic platfrom initialization - + IcuInit (); MppInitialize (); return RETURN_SUCCESS; } diff --git a/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.inf b/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.inf index f586e65..6c1fde6 100644 --- a/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.inf +++ b/Platforms/Marvell/Armada/Library/Armada7040Lib/Armada7040Lib.inf @@ -35,6 +35,7 @@ [Sources.common] Armada7040Lib.c Armada7040LibMem.c + Armada7040IcuLib.c
[Sources.AArch64] AArch64/ArmPlatformHelper.S @@ -45,3 +46,7 @@
gArmTokenSpaceGuid.PcdArmPrimaryCoreMask gArmTokenSpaceGuid.PcdArmPrimaryCore + + gMarvellTokenSpaceGuid.PcdIcuCpBase + gMarvellTokenSpaceGuid.PcdIcuSpiBase + gMarvellTokenSpaceGuid.PcdIcuSpiOffset