diff options
| author | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-01 23:28:27 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-01 23:28:27 +0000 |
| commit | a79803d7f90940f3ee2cec346260edb8c058bea6 (patch) | |
| tree | 344a255da4eeffc8672317ea13eee9d748d545fc /ArmPlatformPkg/ArmVExpressPkg | |
| parent | 337284066962dd48ecb86e00a07bb6f54841d2a6 (diff) | |
| download | edk2-platforms-a79803d7f90940f3ee2cec346260edb8c058bea6.tar.xz | |
ArmPlatformPkg/ArmVExpressPkg: Do not declare SCC base for the RTSM VE Model
The System Control Configuration registers are not implemented on the Model
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12624 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/ArmVExpressPkg')
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h | 4 | ||||
| -rw-r--r-- | ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h index 64191f32ea..1dcb7e1007 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h +++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM/ArmPlatform.h @@ -65,10 +65,6 @@ // Memory-mapped peripherals
************************************************************************************/
-// Note: There is no System Configuration Controller on the Model,
-// So do dummy definition to avoid build failures
-#define ARM_VE_SCC_BASE
-
// SP810 Controller
#undef SP810_CTRL_BASE
#define SP810_CTRL_BASE 0x1C020000
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c index e26052a0ca..204f2ad9de 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfig.c @@ -217,8 +217,13 @@ ArmPlatformSysConfigSetDevice ( // Intercept some functions
switch(Function) {
case SYS_CFG_SCC:
+#ifdef ARM_VE_SCC_BASE
MmioWrite32 ((ARM_VE_SCC_BASE + (Device * 4)),Value);
return EFI_SUCCESS;
+#else
+ // There is no System Configuration Controller on the Model
+ return EFI_UNSUPPORTED;
+#endif
case SYS_CFG_OSC_SITE1:
Function = SYS_CFG_OSC;
|