diff options
author | Marcin Wojtas <mw@semihalf.com> | 2017-12-08 15:57:36 +0100 |
---|---|---|
committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-12-08 15:29:13 +0000 |
commit | 67e0adad7143b089859e14bbba23301f8092a693 (patch) | |
tree | 9038572e2f2b06467016b4bb0fead63bceba2735 /Silicon | |
parent | 7961f156e4197fd7ce8294d76a496b498a0dfeeb (diff) | |
download | edk2-platforms-67e0adad7143b089859e14bbba23301f8092a693.tar.xz |
Marvell/Drivers: Modify location and rename the MvEeprom driver
MvEeprom driver nesting into additional Devices directory
under Silicon/Marvell/Drivers/I2c is redundant. Align
its level with MvI2cDxe.
Change MvEeprom to MvEepromDxe in order to be
more consistent in Marvell drivers naming.
On the occasion add sorting in the .inf file.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'Silicon')
-rw-r--r-- | Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 2 | ||||
-rw-r--r-- | Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.c (renamed from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c) | 2 | ||||
-rw-r--r-- | Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.h (renamed from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h) | 0 | ||||
-rw-r--r-- | Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf (renamed from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf) | 20 |
4 files changed, 12 insertions, 12 deletions
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc index ed3dba609d..9450830793 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -410,7 +410,7 @@ # Platform drivers
Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
- Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
+ Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf
Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf
Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
diff --git a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.c index d8fd1bfe62..9d2f650955 100644 --- a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c +++ b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.c @@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <Pi/PiI2c.h>
-#include "MvEeprom.h"
+#include "MvEepromDxe.h"
#define I2C_DEVICE_INDEX(bus, address) (((address) & 0xffff) | (bus) << 16)
diff --git a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.h index b1af645050..b1af645050 100644 --- a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h +++ b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.h diff --git a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf index 510b5502dc..9b19db7fe4 100644 --- a/Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf +++ b/Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf @@ -31,35 +31,35 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = MvEeprom
+ BASE_NAME = MvEepromDxe
FILE_GUID = 59fc3843-d8d4-40aa-ae07-38967138509c
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
ENTRY_POINT = MvEepromInitialise
[Sources.common]
- MvEeprom.c
+ MvEepromDxe.c
[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- ArmPlatformPkg/ArmPlatformPkg.dec
ArmPkg/ArmPkg.dec
+ ArmPlatformPkg/ArmPlatformPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
Silicon/Marvell/Marvell.dec
[LibraryClasses]
- IoLib
- PcdLib
BaseLib
BaseMemoryLib
DebugLib
- UefiLib
- UefiDriverEntryPoint
+ IoLib
+ PcdLib
UefiBootServicesTableLib
+ UefiDriverEntryPoint
+ UefiLib
[Protocols]
- gEfiI2cIoProtocolGuid
gEfiDriverBindingProtocolGuid
+ gEfiI2cIoProtocolGuid
gMarvellEepromProtocolGuid
[Pcd]
|