retire i2c library, move its implementation to CirrusLogic5430Dxe

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8085 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
index 3edf540463764a2b463840c8d521776f07067b23..8ff302ac2b97fc8ff4a45a0e13664962093b60fc 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
@@ -38,7 +38,7 @@
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/DevicePathLib.h>\r
-#include <Library/DxeI2cLib.h>\r
+#include <Library/TimerLib.h>\r
 \r
 #include <IndustryStandard/Pci22.h>\r
 //\r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
index dca2b1184f622cc80eb4a5e10452340395c93cb4..82bdce01119a05d1e6a3e540008d7e2a2d60cc20 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
@@ -9,7 +9,7 @@
 #  requires both the UGA Draw and the UGA I/O Protocol. Please refer to Microsoft's\r
 #  documentation on UGA for details on how to write a UGA driver that is able\r
 #  to function both in the EFI pre-boot environment and from the OS runtime.\r
-# Copyright (c) 2006 - 2007, Intel Corporation\r
+# Copyright (c) 2006 - 2009, Intel Corporation\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -49,6 +49,8 @@
   CirrusLogic5430.c\r
   CirrusLogic5430.h\r
   Edid.c\r
+  CirrusLogic5430I2c.h\r
+  CirrusLogic5430I2c.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -62,7 +64,7 @@
   DebugLib\r
   BaseMemoryLib\r
   DevicePathLib\r
-  DxeI2cLib\r
+  TimerLib\r
 \r
 [Protocols]\r
   gEfiDriverSupportedEfiVersionProtocolGuid     # PROTOCOL ALWAYS_PRODUCED\r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
index fcbfc024103ecd7ba180f66d265d15568894b85b..ccf8584787c8be94e68b01679a6ed111edd859b7 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
@@ -13,6 +13,7 @@
 **/\r
 \r
 #include "CirrusLogic5430.h"\r
+#include "CirrusLogic5430I2c.h"\r
 \r
 //\r
 // EDID block\r

diff --git a/OptionRomPkg/Include/Library/DxeI2cLib.h b/OptionRomPkg/Include/Library/DxeI2cLib.h
deleted file mode 100644 (file)
index 5325560..0000000
--- a/OptionRomPkg/Include/Library/DxeI2cLib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
-  I2c Bus byte read/write functions.
-
-  Copyright (c) 2008, Intel Corporation
-  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.
-
-**/\r
-\r
-#include <Protocol/PciIo.h>\r
-\r
-/**\r
-  Read one byte data on I2C Bus.\r
-\r
-  Read one byte data from the slave device connectet to I2C Bus.\r
-  If Data is NULL, then ASSERT().\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  DeviceAddress      Slave device's address.\r
-  @param  RegisterAddress    The register address on slave device.\r
-  @param  Data               The pointer to returned data if EFI_SUCCESS returned.\r
-\r
-  @retval EFI_DEVICE_ERROR\r
-  @retval EFI_SUCCESS\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-I2cReadByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  DeviceAddress,\r
-  UINT8                  RegisterAddress,\r
-  UINT8                  *Data\r
-  );\r
-\r
-/**\r
-  Write one byte data onto I2C Bus.\r
-\r
-  Write one byte data to the slave device connectet to I2C Bus.\r
-  If Data is NULL, then ASSERT().\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  DeviceAddress      Slave device's address.\r
-  @param  RegisterAddress    The register address on slave device.\r
-  @param  Data               The pointer to write data.\r
-\r
-  @retval EFI_DEVICE_ERROR\r
-  @retval EFI_SUCCESS\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-I2cWriteByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  DeviceAddress,\r
-  UINT8                  RegisterAddress,\r
-  UINT8                  *Data\r
-  );\r
-\r

diff --git a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
deleted file mode 100644 (file)
index 4d1a583..0000000
--- a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/** @file\r
-  I2C Bus Libary implementation upon CirrusLogic.\r
-\r
-  Copyright (c) 2008, Intel Corporation\r
-  All rights reserved. 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 <PiDxe.h>\r
-\r
-#include <Library/DxeI2cLib.h>\r
-#include <Library/TimerLib.h>\r
-#include <Library/DebugLib.h>\r
-\r
-#define SEQ_ADDRESS_REGISTER    0x3c4\r
-#define SEQ_DATA_REGISTER       0x3c5\r
-\r
-#define I2C_CONTROL             0x08\r
-#define I2CDAT_IN               7\r
-#define I2CCLK_IN               2\r
-#define I2CDAT_OUT              1\r
-#define I2CCLK_OUT              0\r
-\r
-#define I2C_BUS_SPEED           100  //100kbps\r
-\r
-/**\r
-  PCI I/O byte write function.\r
-\r
-  @param  PciIo        The pointer to PCI_IO_PROTOCOL.\r
-  @param  Address      The bit map of I2C Data or I2C Clock pins.\r
-  @param  Data         The date to write.\r
-\r
-**/\r
-VOID\r
-I2cOutb (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINTN                  Address,\r
-  UINT8                  Data\r
-  )\r
-{\r
-  PciIo->Io.Write (\r
-             PciIo,\r
-             EfiPciIoWidthUint8,\r
-             EFI_PCI_IO_PASS_THROUGH_BAR,\r
-             Address,\r
-             1,\r
-             &Data\r
-             );\r
-}\r
-/**\r
-  PCI I/O byte read function.\r
-\r
-  @param  PciIo        The pointer to PCI_IO_PROTOCOL.\r
-  @param  Address      The bit map of I2C Data or I2C Clock pins.\r
-\r
-  return byte value read from PCI I/O space.\r
-\r
-**/\r
-UINT8\r
-I2cInb (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINTN                  Address\r
-  )\r
-{\r
-  UINT8 Data;\r
-\r
-  PciIo->Io.Read (\r
-             PciIo,\r
-             EfiPciIoWidthUint8,\r
-             EFI_PCI_IO_PASS_THROUGH_BAR,\r
-             Address,\r
-             1,\r
-             &Data\r
-             );\r
-  return Data;\r
-}\r
-\r
-/**\r
-  Read status of I2C Data and I2C Clock Pins.\r
-\r
-  @param  PciIo        The pointer to PCI_IO_PROTOCOL.\r
-  @param  Blt          The bit map of I2C Data or I2C Clock pins.\r
-\r
-  @retval 0            Low on I2C Data or I2C Clock Pin.\r
-  @retval 1            High on I2C Data or I2C Clock Pin.\r
-\r
-**/\r
-UINT8\r
-I2cPinRead (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  Bit\r
-  )\r
-{\r
-  I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
-  return (UINT8) ((I2cInb (PciIo, SEQ_DATA_REGISTER) >> Bit ) & 0xfe);\r
-}\r
-\r
-\r
-/**\r
-  Set/Clear I2C Data and I2C Clock Pins.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  Blt                The bit map to controller I2C Data or I2C Clock pins.\r
-  @param  Value              1 or 0 stands for Set or Clear I2C Data and I2C Clock Pins.\r
-\r
-**/\r
-VOID\r
-I2cPinWrite (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  Bit,\r
-  UINT8                  Value\r
-  )\r
-{\r
-  UINT8        Byte;\r
-  I2cOutb (PciIo, SEQ_ADDRESS_REGISTER, I2C_CONTROL);\r
-  Byte = (UINT8) (I2cInb (PciIo, SEQ_DATA_REGISTER) & (UINT8) ~(1 << Bit)) ;\r
-  Byte = (UINT8) (Byte | ((Value & 0x01) << Bit));\r
-  I2cOutb (PciIo, SEQ_DATA_REGISTER, (UINT8) (Byte | 0x40));\r
-  return;\r
-}\r
-\r
-/**\r
-  Read/write delay acoording to I2C Bus Speed.\r
-\r
-**/\r
-VOID\r
-I2cDelay (\r
-  VOID\r
-  )\r
-{\r
-  MicroSecondDelay (1000 / I2C_BUS_SPEED);\r
-}\r
-\r
-/**\r
-  Write a 8-bit data onto I2C Data Pin.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  Data               The byte data to write.\r
-\r
-**/\r
-VOID\r
-I2cSendByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  Data\r
-  )\r
-{\r
-  UINTN                  Index;\r
-  //\r
-  // Send byte data onto I2C Bus\r
-  //\r
-  for (Index = 0; Index < 8; Index --) {\r
-    I2cPinWrite (PciIo, I2CDAT_OUT, (UINT8) (Data >> (7 - Index)));\r
-    I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-    I2cDelay ();\r
-    I2cPinWrite (PciIo, I2CCLK_OUT, 0);\r
-  }\r
-}\r
-\r
-/**\r
-  Read a 8-bit data from I2C Data Pin.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-\r
-  Return the byte data read from I2C Data Pin.\r
-**/\r
-UINT8\r
-I2cReceiveByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo\r
-  )\r
-{\r
-  UINT8          Data;\r
-  UINTN          Index;\r
-\r
-  Data = 0;\r
-  //\r
-  // Read byte data from I2C Bus\r
-  //\r
-  for (Index = 0; Index < 8; Index --) {\r
-    I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-    I2cDelay ();\r
-    Data = (UINT8) (Data << 1);\r
-    Data = (UINT8) (Data | I2cPinRead (PciIo, I2CDAT_IN));\r
-    I2cPinWrite (PciIo, I2CCLK_OUT, 0);\r
-  }\r
-\r
-  return Data;\r
-}\r
-\r
-/**\r
-  Receive an ACK signal from I2C Bus.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-\r
-**/\r
-BOOLEAN\r
-I2cWaitAck (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo\r
-  )\r
-{\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 1);\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-  I2cDelay ();\r
-  if (I2cPinRead (PciIo, I2CDAT_IN) == 0) {\r
-    I2cPinWrite (PciIo, I2CDAT_OUT, 1);\r
-    return TRUE;\r
-  } else {\r
-    return FALSE;\r
-  }\r
-}\r
-\r
-/**\r
-  Send an ACK signal onto I2C Bus.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-\r
-**/\r
-VOID\r
-I2cSendAck (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo\r
-  )\r
-{\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 1);\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 0);\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 0);\r
-}\r
-\r
-/**\r
-  Start a I2C transfer on I2C Bus.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-\r
-**/\r
-VOID\r
-I2cStart (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo\r
-  )\r
-{\r
-  //\r
-  // Init CLK and DAT pins\r
-  //\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 1);\r
-  //\r
-  // Start a I2C transfer, set SDA low from high, when SCL is high\r
-  //\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 0);\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 0);\r
-}\r
-\r
-/**\r
-  Stop a I2C transfer on I2C Bus.\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-\r
-**/\r
-VOID\r
-I2cStop (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo\r
-  )\r
-{\r
-  //\r
-  // Stop a I2C transfer, set SDA high from low, when SCL is high\r
-  //\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 0);\r
-  I2cPinWrite (PciIo, I2CCLK_OUT, 1);\r
-  I2cPinWrite (PciIo, I2CDAT_OUT, 1);\r
-}\r
-\r
-/**\r
-  Read one byte data on I2C Bus.\r
-\r
-  Read one byte data from the slave device connectet to I2C Bus.\r
-  If Data is NULL, then ASSERT().\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  DeviceAddress      Slave device's address.\r
-  @param  RegisterAddress    The register address on slave device.\r
-  @param  Data               The pointer to returned data if EFI_SUCCESS returned.\r
-\r
-  @retval EFI_DEVICE_ERROR\r
-  @retval EFI_SUCCESS\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-I2cReadByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  DeviceAddress,\r
-  UINT8                  RegisterAddress,\r
-  UINT8                  *Data\r
-  )\r
-{\r
-  ASSERT (Data != NULL);\r
-\r
-  //\r
-  // Start I2C transfer\r
-  //\r
-  I2cStart (PciIo);\r
-\r
-  //\r
-  // Send slave address with enabling write flag\r
-  //\r
-  I2cSendByte (PciIo, (UINT8) (DeviceAddress & 0xfe));\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Send register address\r
-  //\r
-  I2cSendByte (PciIo, RegisterAddress);\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Send slave address with enabling read flag\r
-  //\r
-  I2cSendByte (PciIo, (UINT8) (DeviceAddress | 0x01));\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Read byte data from I2C Bus\r
-  //\r
-  *Data = I2cReceiveByte (PciIo);\r
-\r
-  //\r
-  // Send ACK signal onto I2C Bus\r
-  //\r
-  I2cSendAck (PciIo);\r
-\r
-  //\r
-  // Stop a I2C transfer\r
-  //\r
-  I2cStop (PciIo);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-/**\r
-  Write one byte data onto I2C Bus.\r
-\r
-  Write one byte data to the slave device connectet to I2C Bus.\r
-  If Data is NULL, then ASSERT().\r
-\r
-  @param  PciIo              The pointer to PCI_IO_PROTOCOL.\r
-  @param  DeviceAddress      Slave device's address.\r
-  @param  RegisterAddress    The register address on slave device.\r
-  @param  Data               The pointer to write data.\r
-\r
-  @retval EFI_DEVICE_ERROR\r
-  @retval EFI_SUCCESS\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-I2cWriteByte (\r
-  EFI_PCI_IO_PROTOCOL    *PciIo,\r
-  UINT8                  DeviceAddress,\r
-  UINT8                  RegisterAddress,\r
-  UINT8                  *Data\r
-  )\r
-{\r
-  ASSERT (Data != NULL);\r
-\r
-  I2cStart (PciIo);\r
-  //\r
-  // Send slave address with enabling write flag\r
-  //\r
-  I2cSendByte (PciIo, (UINT8) (DeviceAddress & 0xfe));\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Send register address\r
-  //\r
-  I2cSendByte (PciIo, RegisterAddress);\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Send byte data onto I2C Bus\r
-  //\r
-  I2cSendByte (PciIo, *Data);\r
-\r
-  //\r
-  // Wait for ACK signal\r
-  //\r
-  if (I2cWaitAck (PciIo) == FALSE) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  //\r
-  // Stop a I2C transfer\r
-  //\r
-  I2cStop (PciIo);\r
-\r
-  return EFI_SUCCESS;\r
-}\r
-\r
-\r
-\r

diff --git a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.inf b/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.inf
deleted file mode 100644 (file)
index 7474a4f..0000000
--- a/OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.inf
+++ /dev/null
@@ -1,45 +0,0 @@
-#/** @file\r
-# DxeI2c Library implementation on CirrusLogic.\r
-#\r
-# Provides I2c Bus byte read/write functions upon CirrusLogic5430.\r
-# Copyright (c) 2008, Intel Corporation.\r
-#\r
-#  All rights reserved. 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
-#  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
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = CirrusLogic5430I2cLib\r
-  FILE_GUID                      = 0C86ADD7-ED2A-4b9a-ABC9-D932E8AA349B\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = DxeI2cLib\r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-\r
-[Sources.common]\r
-  CirrusLogic5430I2cLib.c\r
-\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  OptionRomPkg/OptionRomPkg.dec\r
-\r
-\r
-[LibraryClasses]\r
-  TimerLib\r
-  DebugLib\r
-\r
-\r

diff --git a/OptionRomPkg/OptionRomPkg.dec b/OptionRomPkg/OptionRomPkg.dec
index 425214b893a3409bba71aaff1554b84def32b2e2..bcfa8ebd7b3f02d2087fd79dbc9107622fb1394d 100644 (file)
--- a/OptionRomPkg/OptionRomPkg.dec
+++ b/OptionRomPkg/OptionRomPkg.dec
@@ -6,7 +6,7 @@
 # Option ROM image for all CPU architectures, including EBC target.\r
 # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.\r
 #\r
-# Copyright (c) 2007 - 2008, Intel Corporation.\r
+# Copyright (c) 2007 - 2009, Intel Corporation.\r
 #\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -24,12 +24,6 @@
   PACKAGE_GUID                   = AA3865E8-7F30-4f59-8696-99F560101852\r
   PACKAGE_VERSION                = 0.1\r
 \r
-[Includes.common]\r
-  Include\r
-\r
-[LibraryClasses.common]\r
-  DxeI2cLib|Include/Library/DxeI2cLib.h\r
-\r
 [PcdsFeatureFlag.common]\r
   gOptionRomPkgTokenSpaceGuid.PcdSupportScsiPassThru|TRUE|BOOLEAN|0x00010001\r
   gOptionRomPkgTokenSpaceGuid.PcdSupportExtScsiPassThru|TRUE|BOOLEAN|0x00010002\r

diff --git a/OptionRomPkg/OptionRomPkg.dsc b/OptionRomPkg/OptionRomPkg.dsc
index 1e040f68b0682c5452f20f1ef82ac3cca489cf08..29ef5cd51cced9fac3ab7de66be25f3fa1754371 100644 (file)
--- a/OptionRomPkg/OptionRomPkg.dsc
+++ b/OptionRomPkg/OptionRomPkg.dsc
@@ -6,7 +6,7 @@
 # Option ROM image for all CPU architectures, including EBC target.\r
 # A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.\r
 #\r
-# Copyright (c) 2007 - 2008, Intel Corporation\r
+# Copyright (c) 2007 - 2009, Intel Corporation\r
 #\r
 # All rights reserved. This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -55,7 +55,6 @@
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-  DxeI2cLib|OptionRomPkg/Library/CirrusLogicI2cLib/CirrusLogic5430I2cLib.inf\r
 \r
 ################################################################################\r
 #\r