summaryrefslogtreecommitdiff
path: root/Silicon
diff options
context:
space:
mode:
Diffstat (limited to 'Silicon')
-rw-r--r--Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc6
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c (renamed from Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c)0
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h (renamed from Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h)0
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf (renamed from Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf)0
-rwxr-xr-xSilicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.c (renamed from Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c)2
-rwxr-xr-xSilicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.h (renamed from Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h)0
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf (renamed from Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf)14
-rwxr-xr-xSilicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.c (renamed from Silicon/Marvell/Drivers/Spi/MvSpiDxe.c)4
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.h (renamed from Silicon/Marvell/Drivers/Spi/MvSpiDxe.h)0
-rw-r--r--Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf (renamed from Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf)20
10 files changed, 23 insertions, 23 deletions
diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index 7d87766e34..0de86214b5 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -411,8 +411,8 @@
Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf
MdeModulePkg/Bus/I2c/I2cDxe/I2cDxe.inf
Silicon/Marvell/Drivers/I2c/Devices/MvEeprom/MvEeprom.inf
- Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
- Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
+ Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
+ Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf
Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
# Network support
@@ -493,7 +493,7 @@
#
# Variable services
#
- Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
+ Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
<LibraryClasses>
diff --git a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
index 252ef67566..252ef67566 100644
--- a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.c
diff --git a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
index 31e6e444be..31e6e444be 100644
--- a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.h
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.h
diff --git a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf
index 117fe8bdd6..117fe8bdd6 100644
--- a/Silicon/Marvell/Drivers/Spi/Variables/MvFvbDxe.inf
+++ b/Silicon/Marvell/Drivers/Spi/MvFvbDxe/MvFvbDxe.inf
diff --git a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.c
index 6886d0104a..a2ce9756d0 100755
--- a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.c
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.c
@@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "MvSpiFlash.h"
+#include "MvSpiFlashDxe.h"
STATIC EFI_EVENT mMvSpiFlashVirtualAddrChangeEvent;
MARVELL_SPI_MASTER_PROTOCOL *SpiMasterProtocol;
diff --git a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.h
index f69c562190..f69c562190 100755
--- a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.h
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.h
diff --git a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf
index bc88a7ea98..20939bfb5c 100644
--- a/Silicon/Marvell/Drivers/Spi/Devices/MvSpiFlash.inf
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiFlashDxe/MvSpiFlashDxe.inf
@@ -31,15 +31,15 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = SpiFlashDxe
+ BASE_NAME = MvSpiFlashDxe
FILE_GUID = 49d7fb74-306d-42bd-94c8-c0c54b181dd7
MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0
ENTRY_POINT = MvSpiFlashEntryPoint
[Sources]
- MvSpiFlash.c
- MvSpiFlash.h
+ MvSpiFlashDxe.c
+ MvSpiFlashDxe.h
[Packages]
EmbeddedPkg/EmbeddedPkg.dec
@@ -47,21 +47,21 @@
Silicon/Marvell/Marvell.dec
[LibraryClasses]
+ DebugLib
+ MemoryAllocationLib
NorFlashInfoLib
+ TimerLib
UefiBootServicesTableLib
UefiDriverEntryPoint
- TimerLib
UefiLib
- DebugLib
- MemoryAllocationLib
UefiRuntimeLib
[Guids]
gEfiEventVirtualAddressChangeGuid
[Protocols]
- gMarvellSpiMasterProtocolGuid
gMarvellSpiFlashProtocolGuid
+ gMarvellSpiMasterProtocolGuid
[Depex]
#
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.c
index bab6cf4d56..cbf403fa48 100755
--- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.c
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.c
@@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "MvSpiDxe.h"
+#include "MvSpiOrionDxe.h"
SPI_MASTER *mSpiMasterInstance;
@@ -399,7 +399,7 @@ SpiMasterInitProtocol (
EFI_STATUS
EFIAPI
-SpiMasterEntryPoint (
+MvSpiOrionEntryPoint (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.h
index 50cdc025c7..50cdc025c7 100644
--- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.h
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.h
diff --git a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
index e7bc170e64..47793715c3 100644
--- a/Silicon/Marvell/Drivers/Spi/MvSpiDxe.inf
+++ b/Silicon/Marvell/Drivers/Spi/MvSpiOrionDxe/MvSpiOrionDxe.inf
@@ -31,15 +31,15 @@
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = SpiMasterDxe
+ BASE_NAME = MvSpiOrionDxe
FILE_GUID = c19dbc8a-f4f9-43b0-aee5-802e3ed03d15
MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0
- ENTRY_POINT = SpiMasterEntryPoint
+ ENTRY_POINT = MvSpiOrionEntryPoint
[Sources]
- MvSpiDxe.c
- MvSpiDxe.h
+ MvSpiOrionDxe.c
+ MvSpiOrionDxe.h
[Packages]
EmbeddedPkg/EmbeddedPkg.dec
@@ -47,21 +47,21 @@
Silicon/Marvell/Marvell.dec
[LibraryClasses]
+ DebugLib
+ DxeServicesTableLib
+ IoLib
+ MemoryAllocationLib
NorFlashInfoLib
+ TimerLib
UefiBootServicesTableLib
UefiDriverEntryPoint
- TimerLib
UefiLib
- DebugLib
- DxeServicesTableLib
- MemoryAllocationLib
- IoLib
UefiRuntimeLib
[FixedPcd]
- gMarvellTokenSpaceGuid.PcdSpiRegBase
gMarvellTokenSpaceGuid.PcdSpiClockFrequency
gMarvellTokenSpaceGuid.PcdSpiMaxFrequency
+ gMarvellTokenSpaceGuid.PcdSpiRegBase
[Protocols]
gMarvellSpiMasterProtocolGuid
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 10:59:06 +0000