ArmPlatformPkg/NorFlashDxe: use one GUID plus index to identify flash banks

[mirror_edk2.git] / ArmPlatformPkg / Drivers / NorFlashDxe / NorFlashDxe.c

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
index 53753a4721ac980f202e690b596a1ad31e7250c6..af40a4c88412c555c5696022a7561f70660ec84b 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
@@ -89,6 +89,7 @@ NOR_FLASH_INSTANCE  mNorFlashInstanceTemplate = {
       },\r
       { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }, // GUID ... NEED TO BE FILLED\r
     },\r
+    0, // Index\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
@@ -105,7 +106,6 @@ NorFlashCreateInstance (
   IN UINT32                 Index,\r
   IN UINT32                 BlockSize,\r
   IN BOOLEAN                SupportFvb,\r
-  IN CONST GUID             *NorFlashGuid,\r
   OUT NOR_FLASH_INSTANCE**  NorFlashInstance\r
   )\r
 {\r
@@ -128,7 +128,8 @@ NorFlashCreateInstance (
   Instance->Media.BlockSize = BlockSize;\r
   Instance->Media.LastBlock = (NorFlashSize / BlockSize)-1;\r
 \r
-  CopyGuid (&Instance->DevicePath.Vendor.Guid, NorFlashGuid);\r
+  CopyGuid (&Instance->DevicePath.Vendor.Guid, &gEfiCallerIdGuid);\r
+  Instance->DevicePath.Index = (UINT8)Index;\r
 \r
   Instance->ShadowBuffer = AllocateRuntimePool (BlockSize);;\r
   if (Instance->ShadowBuffer == NULL) {\r
@@ -1314,7 +1315,6 @@ NorFlashInitialise (
       Index,\r
       NorFlashDevices[Index].BlockSize,\r
       ContainVariableStorage,\r
-      &NorFlashDevices[Index].Guid,\r
       &mNorFlashInstances[Index]\r
     );\r
     if (EFI_ERROR(Status)) {\r