HisiPkg: change the GIC to Hisilicon D01 GIC since there are some differences from ARM GIClinaro-platform-hisilicon-d01-2014.06

Signed-off-by: wei.xu <xuwei5@huawei.com>

10 files changed, 63 insertions, 55 deletions

diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc
index cece5aa28..8bd0f15de 100644
--- a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc
+++ b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc
@@ -190,8 +190,8 @@
   HisiPkg/D01BoardPkg/Sec/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|HisiPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-      #ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSecLib.inf

+      #ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -258,8 +258,9 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  HisiPkg/Drivers/PL390Gic/PL390GicDxe.inf

-  #ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.inf

+  #ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

+

   #ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   #ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   HisiPkg/Drivers/TimerDxe/TimerDxe.inf

diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc
index 1b0c40702..9c006c37b 100644
--- a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc
+++ b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc
@@ -58,8 +58,10 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  ArmGicLib|HisiPkg/Drivers/PL390Gic/PL390GicLib.inf

-  #ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+

+  ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicLib.inf

+  #ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

+

   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf

 

   # Versatile Express Specific Libraries

diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.fdf b/HisiPkg/D01BoardPkg/D01BoardPkg.fdf
index d5037c7f1..f191849e7 100644
--- a/HisiPkg/D01BoardPkg/D01BoardPkg.fdf
+++ b/HisiPkg/D01BoardPkg/D01BoardPkg.fdf
@@ -141,8 +141,8 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF HisiPkg/Drivers/PL390Gic/PL390GicDxe.inf

-  #INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.inf

+  #INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF HisiPkg/Drivers/TimerDxe/TimerDxe.inf

 

   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

diff --git a/HisiPkg/Drivers/PL390Gic/PL390Gic.c b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c
index 98d5107bc..da5e437b3 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390Gic.c
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c
@@ -2,14 +2,14 @@
 *

 *  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

 *  Copyright (c) Huawei Technologies Co., Ltd. 2013. All rights reserved.

-*  

-*  This program and the accompanying materials                          

-*  are licensed and made available under the terms and conditions of the BSD License         

-*  which accompanies this distribution.  The full text of the license may be found at        

-*  http://opensource.org/licenses/bsd-license.php                                            

 *

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*  This program and the accompanying materials

+*  are licensed and made available under the terms and conditions of the BSD License

+*  which accompanies this distribution.  The full text of the license may be found at

+*  http://opensource.org/licenses/bsd-license.php

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 *

 **/

 

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicDxe.c b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.c
index 8a80b667d..a4dfa66d3 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicDxe.c
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.c
@@ -119,11 +119,11 @@ EnableInterruptSource (
     return EFI_UNSUPPORTED;

   }

 

-  // calculate enable register offset and bit position

+  // Calculate enable register offset and bit position

   RegOffset = Source / 32;

   RegShift = Source % 32;

 

-  // write set-enable register

+  // Write set-enable register

   MmioWrite32 (PcdGet32(PcdGicDistributorBase) + ARM_GIC_ICDISER + (4*RegOffset), 1 << RegShift);

 

   return EFI_SUCCESS;

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicDxe.inf b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.inf
index 84650e80e..6ade9e63a 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicDxe.inf
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicDxe.inf
@@ -16,7 +16,7 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PL390GicDxe

+  BASE_NAME                      = HisiliconD01GicDxe

   FILE_GUID                      = DE371F7C-DEC4-4D21-ADF1-593ABCC15882

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -25,8 +25,8 @@
 

 

 [Sources.common]

-  PL390Gic.c

-  PL390GicDxe.c

+  HisiliconD01Gic.c

+  HisiliconD01GicDxe.c

 

 [Packages]

   MdePkg/MdePkg.dec

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicLib.inf b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicLib.inf
index bb605fb52..6d6c66fdc 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicLib.inf
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicLib.inf
@@ -1,28 +1,31 @@
 #/* @file

 #  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

 #  Copyright (c) Huawei Technologies Co., Ltd. 2013. All rights reserved.

-#  

-#  This program and the accompanying materials                          

-#  are licensed and made available under the terms and conditions of the BSD License         

-#  which accompanies this distribution.  The full text of the license may be found at        

-#  http://opensource.org/licenses/bsd-license.php                                            

 #

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#  This program and the accompanying materials

+#  are licensed and made available under the terms and conditions of the BSD License

+#  which accompanies this distribution.  The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #*/

 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PL390GicLib

+  BASE_NAME                      = HisiliconD01GicLib

   FILE_GUID                      = 03d05ee4-cdeb-458c-9dfc-993f09bdf405

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

-  PL390Gic.c

-  PL390GicNonSec.c

+  HisiliconD01Gic.c

+  HisiliconD01GicNonSec.c

+

+[LibraryClasses]

+  IoLib

 

 [Packages]

   ArmPkg/ArmPkg.dec

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicNonSec.c b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicNonSec.c
index c2828dc36..17a2cd1cb 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicNonSec.c
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicNonSec.c
@@ -2,14 +2,14 @@
 *

 *  Copyright (c) 2011, ARM Limited. All rights reserved.

 *  Copyright (c) Huawei Technologies Co., Ltd. 2013. All rights reserved.

-*  

-*  This program and the accompanying materials                          

-*  are licensed and made available under the terms and conditions of the BSD License         

-*  which accompanies this distribution.  The full text of the license may be found at        

-*  http://opensource.org/licenses/bsd-license.php                                            

 *

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*  This program and the accompanying materials

+*  are licensed and made available under the terms and conditions of the BSD License

+*  which accompanies this distribution.  The full text of the license may be found at

+*  http://opensource.org/licenses/bsd-license.php

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 *

 **/

 

@@ -23,7 +23,7 @@ EFIAPI
 ArmGicEnableInterruptInterface (

   IN  INTN          GicInterruptInterfaceBase

   )

-{  

+{

   /*

   * Enable the CPU interface in Non-Secure world

   * Note: The ICCICR register is banked when Security extensions are implemented

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicSec.c b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSec.c
index 060df2f2f..d097b8a45 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicSec.c
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSec.c
@@ -2,14 +2,14 @@
 *

 *  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

 #  Copyright (c) Huawei Technologies Co., Ltd. 2013. All rights reserved.

-*  

-*  This program and the accompanying materials                          

-*  are licensed and made available under the terms and conditions of the BSD License         

-*  which accompanies this distribution.  The full text of the license may be found at        

-*  http://opensource.org/licenses/bsd-license.php                                            

 *

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*  This program and the accompanying materials

+*  are licensed and made available under the terms and conditions of the BSD License

+*  which accompanies this distribution.  The full text of the license may be found at

+*  http://opensource.org/licenses/bsd-license.php

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 *

 **/

 

diff --git a/HisiPkg/Drivers/PL390Gic/PL390GicSecLib.inf b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSecLib.inf
index c8f77d75a..07a16a415 100644
--- a/HisiPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSecLib.inf
@@ -1,32 +1,34 @@
 #/* @file

 #  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

 #  Copyright (c) Huawei Technologies Co., Ltd. 2013. All rights reserved.

-#  

-#  This program and the accompanying materials                          

-#  are licensed and made available under the terms and conditions of the BSD License         

-#  which accompanies this distribution.  The full text of the license may be found at        

-#  http://opensource.org/licenses/bsd-license.php                                            

 #

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#  This program and the accompanying materials

+#  are licensed and made available under the terms and conditions of the BSD License

+#  which accompanies this distribution.  The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #*/

 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PL390GicSecLib

+  BASE_NAME                      = HisiliconD01GicSecLib

   FILE_GUID                      = 85f3cf80-b5f4-11df-9855-0002a5d5c51b

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

-  PL390Gic.c

-  PL390GicSec.c

+  HisiliconD01Gic.c

+  HisiliconD01GicSec.c

 

 [Packages]

   ArmPkg/ArmPkg.dec

+  ArmPlatformPkg/ArmPlatformPkg.dec

   MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

 

 [LibraryClasses]

   ArmLib