From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::243; helo=mail-lf0-x243.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9C6892218E958 for ; Fri, 8 Dec 2017 06:53:28 -0800 (PST) Received: by mail-lf0-x243.google.com with SMTP id i2so12144705lfe.9 for ; Fri, 08 Dec 2017 06:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i7FBhrlJEAMiaVGFAs/f0isBkyzQsXFjerxqotEe4a0=; b=gFzeYuuFO9JHq5frkunZO1R0wJiWRQFQCQuRbQxfGGjf1lNHZHGsqCXFGq9r6JbUU0 yuNehIxFGQGnKP6fEzykio2sDcVQsfo1OZq9NSO+vp7jOpPihVhrAqKN0iBCs+AthARx BuL9MteEnZ/GKNcmbdbTbSOud6ViKA2yyM/jyZiSPKbyi+jQ+SEMaV24ND5SVzV1My1+ 3zPWaMWnlC5lRDhUIa6wAV4NdkjeV6NU1VP4FNPCXTIfLHbIBJgeTFvrpnhYka/F23Rt qASUY7wlpvX5w+86q5boEf+bXoQH3lXI8wSzy7Wgx1FI4/yoAxp9TjCbgycxgAFzGhxX 6WRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i7FBhrlJEAMiaVGFAs/f0isBkyzQsXFjerxqotEe4a0=; b=n/dM2jixVlzsiqHuT1ibHlnkeTFWoVnxJ7/pfgQoO85fScapMSJtJm8A7YgltyCvfZ whKBt3DNMwptWtlAcbZ4kz8g/fI/S9iMlvgC0wF6QL8B3U50kfeJCYW2nSx1Kem+kyY2 XFaxtCo55NDqruH3ixtyBh5za2URJovQO1+Ue3tRUEZH3Kh7yVkfOyPBWoHvY2AsQes9 ePxiZwjXGT/JzXGX9di5WUwPgmcHhiHG10kQ8EuoU/Uw/OxYKXk0NIuJdA0v6xIIHEdF UIkibf4lgr1uAAzYHFBfLaQrp2uEp57CjbbPaIGoJ8FqmOpvXW/xeG9jF3QRjrm+IY0W naEw== X-Gm-Message-State: AJaThX4Oey8M6LuEo+5G8XB0Bd3cmel3jyZNbvWfM/ikNcHjqbf1BsyX yRb5bX5PJ4dgDhTIFRyjRNZrriDMcc8= X-Google-Smtp-Source: AGs4zMZi+Su/YS848ygJ99qTr+/jd6N1hP6gpMzfzPMu0KdoDPTiqsBZnSd32p2CRAN3j9XQ3iVgfw== X-Received: by 10.46.67.88 with SMTP id q85mr15509382lja.97.1512745080923; Fri, 08 Dec 2017 06:58:00 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id e16sm1500011lja.29.2017.12.08.06.57.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Dec 2017 06:58:00 -0800 (PST) From: Marcin Wojtas 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 Date: Fri, 8 Dec 2017 15:57:36 +0100 Message-Id: <1512745057-19038-7-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512745057-19038-1-git-send-email-mw@semihalf.com> References: <1512745057-19038-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 6/7] Marvell/Drivers: Modify location and rename the MvEeprom driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2017 14:53:29 -0000 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 --- 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 -#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