public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Marcin Wojtas <mw@semihalf.com>
To: edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org,
	nadavh@marvell.com, neta@marvell.com, kostap@marvell.com,
	jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com,
	ka@semihalf.com
Subject: [platforms: PATCH v3 6/7] Marvell/Drivers: Modify location and rename the MvEeprom driver
Date: Fri,  8 Dec 2017 15:57:36 +0100	[thread overview]
Message-ID: <1512745057-19038-7-git-send-email-mw@semihalf.com> (raw)
In-Reply-To: <1512745057-19038-1-git-send-email-mw@semihalf.com>

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>
---
 Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf                                             |  2 +-
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc                                              |  2 +-
 Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.c => MvEepromDxe/MvEepromDxe.c}     |  2 +-
 Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.h => MvEepromDxe/MvEepromDxe.h}     |  0
 Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.inf => MvEepromDxe/MvEepromDxe.inf} | 20 ++++++++++----------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.c => MvEepromDxe/MvEepromDxe.c} (96%)
 rename Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.h => MvEepromDxe/MvEepromDxe.h} (100%)
 rename Silicon/Marvell/Drivers/I2c/{Devices/MvEeprom/MvEeprom.inf => MvEepromDxe/MvEepromDxe.inf} (94%)

diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
index 24ee32e..7fcb90a 100644
--- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
+++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf
@@ -109,7 +109,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
   INF Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
   INF MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
-  INF Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
+  INF Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf
   INF Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
   INF Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf
   INF Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index ed3dba6..9450830 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
similarity index 96%
rename from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.c
rename to Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.c
index d8fd1bf..9d2f650 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
similarity index 100%
rename from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.h
rename to 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
similarity index 94%
rename from Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
rename to Silicon/Marvell/Drivers/I2c/MvEepromDxe/MvEepromDxe.inf
index 510b550..9b19db7 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]
-- 
2.7.4



  parent reply	other threads:[~2017-12-08 14:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-08 14:57 [platforms: PATCH v3 0/7] Armada 7k/8k files reorganization Marcin Wojtas
2017-12-08 14:57 ` [platforms: PATCH v3 1/7] Marvell: Reorganize file structure Marcin Wojtas
2017-12-08 14:57 ` [platforms: PATCH v3 2/7] Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries Marcin Wojtas
2017-12-08 14:57 ` [platforms: PATCH v3 3/7] Marvell/Armada70x0Db: Rename fd file Marcin Wojtas
2017-12-08 14:57 ` [platforms: PATCH v3 4/7] Marvell/Drivers: Reorganize Spi drivers Marcin Wojtas
2017-12-08 14:57 ` [platforms: PATCH v3 5/7] Marvell/Drivers: Modify MvPhyDxe location Marcin Wojtas
2017-12-08 14:57 ` Marcin Wojtas [this message]
2017-12-08 14:57 ` [platforms: PATCH v3 7/7] Marvell/Drivers: Drop 'PciEmulation' naming Marcin Wojtas
2017-12-08 15:33 ` [platforms: PATCH v3 0/7] Armada 7k/8k files reorganization Ard Biesheuvel
2017-12-08 15:54   ` Marcin Wojtas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1512745057-19038-7-git-send-email-mw@semihalf.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox