ArmPlatformPkg/NorFlashDxe: Fixed CFI NOR Flash driver

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / NorFlashArmVExpressLib / NorFlashArmVExpress.c

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
index 4171aae865bfe809f215f181b884fe459d31b184..6a0b3191ae94f97e9172ac46da3234b1a61b107b 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
@@ -1,6 +1,7 @@
 /** @file\r
 \r
- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
+\r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
@@ -21,24 +22,28 @@
 \r
 NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {\r
   { // BootMon\r
+    ARM_VE_SMB_NOR0_BASE,\r
     ARM_VE_SMB_NOR0_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r
     {0xE7223039, 0x5836, 0x41E1, 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59}\r
   },\r
   { // BootMon non-volatile storage\r
+    ARM_VE_SMB_NOR0_BASE,\r
     ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 4,\r
     SIZE_64KB,\r
     {0x02118005, 0x9DA7, 0x443A, 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB}\r
   },\r
   { // UEFI\r
+    ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r
     {0x1F15DA3C, 0x37FF, 0x4070, 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A}\r
   },\r
   { // UEFI Variable Services non-volatile storage\r
+    ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks\r
     SIZE_64KB,\r