| Message ID | 20180724070922.63362-3-ming.huang@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Upload for D06 platform | expand |
On Tue, Jul 24, 2018 at 03:08:46PM +0800, Ming Huang wrote: > As the mocro of PlatformArch.h is platform special, so Separate mocro -> macro (typo) special -> specific (subtleties of English language :) Separate -> separate (case) > PlatformArch.h to Hi1610,Hi1616,Hi1620 for unifying D0x. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhou You <zhouyou17@huawei.com> > Signed-off-by: Ming Huang <ming.huang@linaro.org> > --- > Silicon/Hisilicon/{ => Hi1610}/Include/PlatformArch.h | 0 > Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 35 ++++++++++++++++++++ > Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 34 +++++++++++++++++++ Could you move the Hi1620 file to the "add d06 base files" patch? There is nothing else for D06 in the tree at this point. (Don't forget to update comment to reflect.) > 3 files changed, 69 insertions(+) > > diff --git a/Silicon/Hisilicon/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > similarity index 100% > rename from Silicon/Hisilicon/Include/PlatformArch.h > rename to Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > new file mode 100644 > index 0000000000..45995c5893 > --- /dev/null > +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > @@ -0,0 +1,35 @@ > +/** @file > +* > +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. > +* Copyright (c) 2015, Linaro Limited. All rights reserved. Update copyright year? > +* > +* 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. > +* > +**/ > + > + > + > +#ifndef _PLATFORM_ARCH_H_ > +#define _PLATFORM_ARCH_H_ > + > +#define MAX_SOCKET 2 > +#define MAX_DIE 4 > +#define MAX_DDRC 2 > +#define MAX_NODE (MAX_SOCKET * MAX_DIE) > +#define MAX_CHANNEL 4 > +#define MAX_DIMM 3 > +#define MAX_RANK_CH 12 > +#define MAX_RANK_DIMM 4 > +// Max NUMA node number for each node type > +#define MAX_NUM_PER_TYPE 8 > + > +#define S1_BASE 0x40000000000 > + > +#endif > + > diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h > new file mode 100644 > index 0000000000..7243a9ec35 > --- /dev/null > +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h > @@ -0,0 +1,34 @@ > +/** @file > +* > +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. > +* Copyright (c) 2015, Linaro Limited. All rights reserved. Update copyright year? (in other patch) / Leif > +* > +* 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. > +* > +**/ > + > + > + > +#ifndef _PLATFORM_ARCH_H_ > +#define _PLATFORM_ARCH_H_ > + > +#define MAX_SOCKET 2 > +#define MAX_DIE 4 > +#define MAX_DDRC 4 > +#define MAX_NODE (MAX_SOCKET * MAX_DIE) > +#define MAX_CHANNEL 8 > +#define MAX_DIMM 2 > +#define MAX_RANK_CH 8 > +#define MAX_RANK_DIMM 4 > +// Max NUMA node number for each node type > +#define MAX_NUM_PER_TYPE 8 > + > + > +#endif > + > -- > 2.17.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
在 8/2/2018 10:56 PM, Leif Lindholm 写道: > On Tue, Jul 24, 2018 at 03:08:46PM +0800, Ming Huang wrote: >> As the mocro of PlatformArch.h is platform special, so Separate > > mocro -> macro (typo) > special -> specific (subtleties of English language :) > Separate -> separate (case) > >> PlatformArch.h to Hi1610,Hi1616,Hi1620 for unifying D0x. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Zhou You <zhouyou17@huawei.com> >> Signed-off-by: Ming Huang <ming.huang@linaro.org> >> --- >> Silicon/Hisilicon/{ => Hi1610}/Include/PlatformArch.h | 0 >> Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 35 ++++++++++++++++++++ >> Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 34 +++++++++++++++++++ > > Could you move the Hi1620 file to the "add d06 base files" patch? > There is nothing else for D06 in the tree at this point. > (Don't forget to update comment to reflect.) > Yes, Hi1620 file will be move to the "add d06 base files" patch. >> 3 files changed, 69 insertions(+) >> >> diff --git a/Silicon/Hisilicon/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> similarity index 100% >> rename from Silicon/Hisilicon/Include/PlatformArch.h >> rename to Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> new file mode 100644 >> index 0000000000..45995c5893 >> --- /dev/null >> +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> @@ -0,0 +1,35 @@ >> +/** @file >> +* >> +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. >> +* Copyright (c) 2015, Linaro Limited. All rights reserved. > > Update copyright year? > >> +* >> +* 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. >> +* >> +**/ >> + >> + >> + >> +#ifndef _PLATFORM_ARCH_H_ >> +#define _PLATFORM_ARCH_H_ >> + >> +#define MAX_SOCKET 2 >> +#define MAX_DIE 4 >> +#define MAX_DDRC 2 >> +#define MAX_NODE (MAX_SOCKET * MAX_DIE) >> +#define MAX_CHANNEL 4 >> +#define MAX_DIMM 3 >> +#define MAX_RANK_CH 12 >> +#define MAX_RANK_DIMM 4 >> +// Max NUMA node number for each node type >> +#define MAX_NUM_PER_TYPE 8 >> + >> +#define S1_BASE 0x40000000000 >> + >> +#endif >> + >> diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h >> new file mode 100644 >> index 0000000000..7243a9ec35 >> --- /dev/null >> +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h >> @@ -0,0 +1,34 @@ >> +/** @file >> +* >> +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. >> +* Copyright (c) 2015, Linaro Limited. All rights reserved. > > Update copyright year? (in other patch) > > / > Leif > Ok, I will check all patches. Ming >> +* >> +* 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. >> +* >> +**/ >> + >> + >> + >> +#ifndef _PLATFORM_ARCH_H_ >> +#define _PLATFORM_ARCH_H_ >> + >> +#define MAX_SOCKET 2 >> +#define MAX_DIE 4 >> +#define MAX_DDRC 4 >> +#define MAX_NODE (MAX_SOCKET * MAX_DIE) >> +#define MAX_CHANNEL 8 >> +#define MAX_DIMM 2 >> +#define MAX_RANK_CH 8 >> +#define MAX_RANK_DIMM 4 >> +// Max NUMA node number for each node type >> +#define MAX_NUM_PER_TYPE 8 >> + >> + >> +#endif >> + >> -- >> 2.17.0 >>
diff --git a/Silicon/Hisilicon/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h similarity index 100% rename from Silicon/Hisilicon/Include/PlatformArch.h rename to Silicon/Hisilicon/Hi1610/Include/PlatformArch.h diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h new file mode 100644 index 0000000000..45995c5893 --- /dev/null +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h @@ -0,0 +1,35 @@ +/** @file +* +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. +* Copyright (c) 2015, Linaro Limited. 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. +* +**/ + + + +#ifndef _PLATFORM_ARCH_H_ +#define _PLATFORM_ARCH_H_ + +#define MAX_SOCKET 2 +#define MAX_DIE 4 +#define MAX_DDRC 2 +#define MAX_NODE (MAX_SOCKET * MAX_DIE) +#define MAX_CHANNEL 4 +#define MAX_DIMM 3 +#define MAX_RANK_CH 12 +#define MAX_RANK_DIMM 4 +// Max NUMA node number for each node type +#define MAX_NUM_PER_TYPE 8 + +#define S1_BASE 0x40000000000 + +#endif + diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h new file mode 100644 index 0000000000..7243a9ec35 --- /dev/null +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h @@ -0,0 +1,34 @@ +/** @file +* +* Copyright (c) 2015, Hisilicon Limited. All rights reserved. +* Copyright (c) 2015, Linaro Limited. 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. +* +**/ + + + +#ifndef _PLATFORM_ARCH_H_ +#define _PLATFORM_ARCH_H_ + +#define MAX_SOCKET 2 +#define MAX_DIE 4 +#define MAX_DDRC 4 +#define MAX_NODE (MAX_SOCKET * MAX_DIE) +#define MAX_CHANNEL 8 +#define MAX_DIMM 2 +#define MAX_RANK_CH 8 +#define MAX_RANK_DIMM 4 +// Max NUMA node number for each node type +#define MAX_NUM_PER_TYPE 8 + + +#endif +