Re: [edk2] [PATCH edk2-platforms v1] Platform/ARM: Correct GIC naming
On Wed, May 02, 2018 at 05:26:42PM +0100, Alexei Fedorov wrote: > From: Alexei Fedorov> > ARM Generic Interrupt Controller is incorrectly named as > "ARM General Interrupt Controller" in ArmJuno.dsc, > ArmVExpress-CTA15-A7.dsc and ArmVExpress-FVP-AArch64.dsc. > > This patch corrects the comment by changing "General" to "Generic". > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Alexei Fedorov > Reviewed-by: Evan Lloyd Like I asked Sami today, please let Evan send his own r-b on the list in future. I'll keep it in here for now. For the patch: Reviewed-by: Leif Lindholm > --- > All the changes can be reviewed at: > https://github.com/AlexeiFedorov/edk2-platforms/tree/261_correct_gic_naming_v1 This is much appreciated - however, please link to the actual version you send out. That one contains a "Change-ID" tag that was not present in this email, and it also lacks the Evan Reviewed-by (also it messes with the commit hash). Thanks for the cleanup - pushed as 5cfda16b1a. > > Notes: > v1: > - Change ARM "General" Interrupt Controller to "Generic" [Alexei] > > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc| 4 ++-- > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc > b/Platform/ARM/JunoPkg/ArmJuno.dsc > index > 5ec563cefbcd9d97614dc9944bfaeb3822c4634d..8d6dd0207db5f16d7fcc0c5fd59fea38498f3034 > 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -150,7 +150,7 @@ [PcdsFixedAtBuild.common] >gEmbeddedTokenSpaceGuid.PcdLan9118DefaultNegotiationTimeout|4 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C01 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C02F000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index > ef737670126db980abcc0e0ac9b84321bfa97584..6405d955f15a87c8d7b379f8c05b43f3e0830c54 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -1,5 +1,5 @@ > # > -# Copyright (c) 2012-2017, ARM Limited. All rights reserved. > +# Copyright (c) 2012-2018, ARM Limited. All rights reserved. > # Copyright (c) 2015, Intel Corporation. All rights reserved. > # > # This program and the accompanying materials > @@ -156,7 +156,7 @@ [PcdsFixedAtBuild.common] > > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index > 600bffb66703305f4a6baec930cd044998744c24..ca19fd65265a531e8c0869460aa9b6358b70bf91 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -147,7 +147,7 @@ [PcdsFixedAtBuild.common] >gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C05 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f00 >gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f10 > -- > 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' > > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms v1] Platform/ARM: Correct GIC naming
On 3 May 2018 at 15:21, Alexei Fedorovwrote: > Hi Ard, > > >>Care to update the second instance in this file as well? > The second instance in VExpressPkg/ArmVExpress-CTA15-A7.dsc > reads: "ARM General Interrupt Driver in Secure and Non-secure" > Do you want it to be changed to "ARM Generic Interrupt Controller Driver in > Secure and Non-secure" or leave it as it is? > Actually, perhaps it is best to remove that first comment entirely. >>And while you're at it, care to update the other platforms too? > Sure, I'll send a new patch after VExpressPkg/ArmVExpress-CTA15-A7.dsc is > sorted out (see above) > Thanks ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH edk2-platforms v1] Platform/ARM: Correct GIC naming
Hi Ard, >Care to update the second instance in this file as well? The second instance in VExpressPkg/ArmVExpress-CTA15-A7.dsc reads: "ARM General Interrupt Driver in Secure and Non-secure" Do you want it to be changed to "ARM Generic Interrupt Controller Driver in Secure and Non-secure" or leave it as it is? >And while you're at it, care to update the other platforms too? Sure, I'll send a new patch after VExpressPkg/ArmVExpress-CTA15-A7.dsc is sorted out (see above) Regards. Alexei. From: Ard BiesheuvelSent: 03 May 2018 12:42 To: Alexei Fedorov Cc: edk2-devel@lists.01.org; Arvind Chauhan; Daniil Egranov; Thomas Abraham; Leif Lindholm; Matteo Carlini; Stephanie Hughes-Fitt; nd; Evan Lloyd Subject: Re: [PATCH edk2-platforms v1] Platform/ARM: Correct GIC naming On 2 May 2018 at 18:26, Alexei Fedorov wrote: > From: Alexei Fedorov > > ARM Generic Interrupt Controller is incorrectly named as > "ARM General Interrupt Controller" in ArmJuno.dsc, > ArmVExpress-CTA15-A7.dsc and ArmVExpress-FVP-AArch64.dsc. > > This patch corrects the comment by changing "General" to "Generic". > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Alexei Fedorov > Reviewed-by: Evan Lloyd > --- > All the changes can be reviewed at: > https://github.com/AlexeiFedorov/edk2-platforms/tree/261_correct_gic_naming_v1 > > Notes: > v1: > - Change ARM "General" Interrupt Controller to "Generic" [Alexei] > Hello Alexei, > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc| 4 ++-- Care to update the second instance in this file as well? And while you're at it, care to update the other platforms too? $ git grep -i 'arm general interrupt' Platform/AMD/OverdriveBoard/OverdriveBoard.dsc: # ARM General Interrupt Controller Platform/ARM/JunoPkg/ArmJuno.dsc: # ARM General Interrupt Controller Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc: # ARM General Interrupt Driver in Secure and Non-secure Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc: # ARM General Interrupt Controller Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc: # ARM General Interrupt Controller Platform/Comcast/RDKQemu/RDKQemu.dsc: # ARM General Interrupt Controller Platform/Hisilicon/HiKey/HiKey.dsc: # ARM General Interrupt Controller Platform/Hisilicon/HiKey960/HiKey960.dsc: # ARM General Interrupt Controller Platform/LeMaker/CelloBoard/CelloBoard.dsc: # ARM General Interrupt Controller Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc: # ARM General Interrupt Controller Thanks, Ard. > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc > b/Platform/ARM/JunoPkg/ArmJuno.dsc > index > 5ec563cefbcd9d97614dc9944bfaeb3822c4634d..8d6dd0207db5f16d7fcc0c5fd59fea38498f3034 > 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -150,7 +150,7 @@ [PcdsFixedAtBuild.common] >gEmbeddedTokenSpaceGuid.PcdLan9118DefaultNegotiationTimeout|4 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C01 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C02F000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index > ef737670126db980abcc0e0ac9b84321bfa97584..6405d955f15a87c8d7b379f8c05b43f3e0830c54 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -1,5 +1,5 @@ > # > -# Copyright (c) 2012-2017, ARM Limited. All rights reserved. > +# Copyright (c) 2012-2018, ARM Limited. All rights reserved. > # Copyright (c) 2015, Intel Corporation. All rights reserved. > # > # This program and the accompanying materials > @@ -156,7 +156,7 @@ [PcdsFixedAtBuild.common] > > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index > 600bffb66703305f4a6baec930cd044998744c24..ca19fd65265a531e8c0869460aa9b6358b70bf91 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -147,7 +147,7 @@ [PcdsFixedAtBuild.common] >gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C05 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f00 >
Re: [edk2] [PATCH edk2-platforms v1] Platform/ARM: Correct GIC naming
On 2 May 2018 at 18:26, Alexei Fedorovwrote: > From: Alexei Fedorov > > ARM Generic Interrupt Controller is incorrectly named as > "ARM General Interrupt Controller" in ArmJuno.dsc, > ArmVExpress-CTA15-A7.dsc and ArmVExpress-FVP-AArch64.dsc. > > This patch corrects the comment by changing "General" to "Generic". > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Alexei Fedorov > Reviewed-by: Evan Lloyd > --- > All the changes can be reviewed at: > https://github.com/AlexeiFedorov/edk2-platforms/tree/261_correct_gic_naming_v1 > > Notes: > v1: > - Change ARM "General" Interrupt Controller to "Generic" [Alexei] > Hello Alexei, > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 +- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc| 4 ++-- Care to update the second instance in this file as well? And while you're at it, care to update the other platforms too? $ git grep -i 'arm general interrupt' Platform/AMD/OverdriveBoard/OverdriveBoard.dsc: # ARM General Interrupt Controller Platform/ARM/JunoPkg/ArmJuno.dsc: # ARM General Interrupt Controller Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc: # ARM General Interrupt Driver in Secure and Non-secure Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc: # ARM General Interrupt Controller Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc: # ARM General Interrupt Controller Platform/Comcast/RDKQemu/RDKQemu.dsc: # ARM General Interrupt Controller Platform/Hisilicon/HiKey/HiKey.dsc: # ARM General Interrupt Controller Platform/Hisilicon/HiKey960/HiKey960.dsc: # ARM General Interrupt Controller Platform/LeMaker/CelloBoard/CelloBoard.dsc: # ARM General Interrupt Controller Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc: # ARM General Interrupt Controller Thanks, Ard. > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc > b/Platform/ARM/JunoPkg/ArmJuno.dsc > index > 5ec563cefbcd9d97614dc9944bfaeb3822c4634d..8d6dd0207db5f16d7fcc0c5fd59fea38498f3034 > 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -150,7 +150,7 @@ [PcdsFixedAtBuild.common] >gEmbeddedTokenSpaceGuid.PcdLan9118DefaultNegotiationTimeout|4 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C01 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C02F000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index > ef737670126db980abcc0e0ac9b84321bfa97584..6405d955f15a87c8d7b379f8c05b43f3e0830c54 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -1,5 +1,5 @@ > # > -# Copyright (c) 2012-2017, ARM Limited. All rights reserved. > +# Copyright (c) 2012-2018, ARM Limited. All rights reserved. > # Copyright (c) 2015, Intel Corporation. All rights reserved. > # > # This program and the accompanying materials > @@ -156,7 +156,7 @@ [PcdsFixedAtBuild.common] > > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000 >gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000 > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index > 600bffb66703305f4a6baec930cd044998744c24..ca19fd65265a531e8c0869460aa9b6358b70bf91 > 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -147,7 +147,7 @@ [PcdsFixedAtBuild.common] >gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C05 > ># > - # ARM General Interrupt Controller > + # ARM Generic Interrupt Controller ># >gArmTokenSpaceGuid.PcdGicDistributorBase|0x2f00 >gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x2f10 > -- > 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' > > ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel