ArmPlatformPkg: Introduced ArmPlatformSysConfigLib NULL library

Some platforms do not have SysConfig controller used by the ARM
Versatile Express.
Some peripheral drivers currently rely on SysConfigLib (eg: PL031
RTC driver, LCD driver).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16143 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index d17a3cb65c3b8d230211fde8c9093e9c341a4953..2a6a5b755af66b6566a8a2974c1e4b06ec8be58d 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -75,7 +75,7 @@
   PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf\r
   NorFlashPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEbLib.inf\r
   LcdPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/PL111LcdArmRealViewEbLib/PL111LcdArmRealViewEbLib.inf\r
-  ArmPlatformSysConfigLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf\r
+  ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf\r
 \r
   # Networking Requirements for ArmPlatformPkg/Bds\r
   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEb.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEb.c
deleted file mode 100644 (file)
index 4b1a04d..0000000
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEb.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/** @file  SysConfigArmRealViewEb.c\r
-\r
-  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#include <Base.h>\r
-#include <Library/IoLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#include <Library/ArmPlatformSysConfigLib.h>\r
-#include <ArmPlatform.h>\r
-\r
-/****************************************************************************\r
- *\r
- *  This file makes it easier to access the System Configuration Registers\r
- *  in the ARM Versatile Express motherboard.\r
- *\r
- ****************************************************************************/\r
-\r
-RETURN_STATUS\r
-ArmPlatformSysConfigInitialize (\r
-  VOID\r
-  )\r
-{\r
-  return RETURN_SUCCESS;\r
-}\r
-\r
-RETURN_STATUS\r
-ArmPlatformSysConfigGet (\r
-  IN  SYS_CONFIG_FUNCTION   Function,\r
-  OUT UINT32*               Value\r
-  )\r
-{\r
-  RETURN_STATUS Status;\r
-\r
-  Status = RETURN_SUCCESS;\r
-\r
-  // Intercept some functions\r
-  switch(Function) {\r
-\r
-  default:\r
-    Status = RETURN_UNSUPPORTED;\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-RETURN_STATUS\r
-ArmPlatformSysConfigSet (\r
-  IN  SYS_CONFIG_FUNCTION   Function,\r
-  IN  UINT32                Value\r
-  )\r
-{\r
-  RETURN_STATUS Status;\r
-\r
-  Status = RETURN_SUCCESS;\r
-\r
-  // Intercept some functions\r
-  switch(Function) {\r
-\r
-  default:\r
-    Status = RETURN_UNSUPPORTED;\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
-RETURN_STATUS\r
-ArmPlatformSysConfigSetDevice (\r
-  IN  SYS_CONFIG_FUNCTION   Function,\r
-  IN  UINT32                Device,\r
-  IN  UINT32                Value\r
-  )\r
-{\r
-  RETURN_STATUS Status;\r
-\r
-  Status = RETURN_SUCCESS;\r
-\r
-  // Intercept some functions\r
-  switch(Function) {\r
-\r
-  default:\r
-    Status = RETURN_UNSUPPORTED;\r
-  }\r
-\r
-  return Status;\r
-}\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf
deleted file mode 100644 (file)
index 62cec29..0000000
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/SysConfigArmRealViewEbLib/SysConfigArmRealViewEbLib.inf
+++ /dev/null
@@ -1,34 +0,0 @@
-#/** @file\r
-#\r
-#  Component description file for SysConfigArmRealViewEbLib module\r
-#\r
-#  Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
-#\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = SysConfigArmRealViewEbLib\r
-  FILE_GUID                      = 46eddfa0-8de0-11e0-944b-0002a5d5c51b\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmPlatformSysConfigLib\r
-\r
-[Sources.common]\r
-  SysConfigArmRealViewEb.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec\r
-  ArmPlatformPkg/ArmPlatformPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.c b/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.c
new file mode 100644 (file)
index 0000000..a7199e6
--- /dev/null
+++ b/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.c
@@ -0,0 +1,85 @@
+/** @file\r
+\r
+  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
+\r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+**/\r
+\r
+#include <Base.h>\r
+\r
+#include <Library/ArmPlatformSysConfigLib.h>\r
+\r
+\r
+RETURN_STATUS\r
+ArmPlatformSysConfigInitialize (\r
+  VOID\r
+  )\r
+{\r
+  return RETURN_SUCCESS;\r
+}\r
+\r
+/***************************************\r
+ * GENERAL FUNCTION: AccessSysCfgRegister\r
+ * Interacts with\r
+ *    SYS_CFGSTAT\r
+ *    SYS_CFGDATA\r
+ *    SYS_CFGCTRL\r
+ * for setting and for reading out values\r
+ ***************************************/\r
+RETURN_STATUS\r
+AccessSysCfgRegister (\r
+  IN     UINT32   ReadWrite,\r
+  IN     UINT32   Function,\r
+  IN     UINT32   Site,\r
+  IN     UINT32   Position,\r
+  IN     UINT32   Device,\r
+  IN OUT UINT32*  Data\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r
+RETURN_STATUS\r
+ArmPlatformSysConfigGet (\r
+  IN  SYS_CONFIG_FUNCTION   Function,\r
+  OUT UINT32*               Value\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r
+RETURN_STATUS\r
+ArmPlatformSysConfigGetValues (\r
+  IN  SYS_CONFIG_FUNCTION   Function,\r
+  IN  UINTN                 Size,\r
+  OUT UINT32*               Values\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r
+RETURN_STATUS\r
+ArmPlatformSysConfigSet (\r
+  IN  SYS_CONFIG_FUNCTION   Function,\r
+  IN  UINT32                Value\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r
+\r
+RETURN_STATUS\r
+ArmPlatformSysConfigSetDevice (\r
+  IN  SYS_CONFIG_FUNCTION   Function,\r
+  IN  UINT32                Device,\r
+  IN  UINT32                Value\r
+  )\r
+{\r
+  return RETURN_UNSUPPORTED;\r
+}\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf b/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf
new file mode 100644 (file)
index 0000000..f379d72
--- /dev/null
+++ b/ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf
@@ -0,0 +1,28 @@
+#/** @file\r
+#\r
+#  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
+#\r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = ArmPlatformSysConfigLibNull\r
+  FILE_GUID                      = b2a191a9-9bac-4c83-a2f3-d5f6e71efd03\r
+  MODULE_TYPE                    = BASE\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = ArmPlatformSysConfigLib\r
+\r
+[Sources.common]\r
+  ArmPlatformSysConfigLibNull.c\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  ArmPlatformPkg/ArmPlatformPkg.dec\r