Graeme, Ard, do either of you have the stamina to go through all this, or will wi settle for testing it?
On Tue, Jul 24, 2018 at 03:08:54PM +0800, Ming Huang wrote: > From: Yan Zhang <zhangya...@huawei.com> > > ACPI tables for D06 2P, especially,Hi1620Iort.asl is include smmu > and Hi1620IortNoSmmu.asl is without smmu. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yan Zhang <zhangya...@huawei.com> > Signed-off-by: Ming Huang <ming.hu...@linaro.org> > Signed-off-by: Heyi Guo <heyi....@linaro.org> > --- > Platform/Hisilicon/D06/D06.dsc | > 1 + > Platform/Hisilicon/D06/D06.fdf | > 1 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf | > 59 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/CPU.asl | > 409 ++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | > 30 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/DsdtHi1620.asl | > 35 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Apei.asl | > 93 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Ged.asl | > 58 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | > 1459 ++++++++++++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mctp.asl | > 41 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | > 1216 ++++++++++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Power.asl | > 28 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Rde.asl | > 47 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Sec.asl | > 57 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c100k.asl | > 249 +++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Socip4_i2c400k.asl | > 249 +++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/LpcUart_clk.asl | > 49 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Pv680UncorePmu.asl | > 1658 ++++++++++++++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/ipmi.asl | > 49 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Facs.aslc | > 67 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc | > 91 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc | > 86 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | > 86 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl | > 1989 ++++++++++++++++++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl | > 1736 +++++++++++++++++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Mcfg.aslc | > 64 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h | > 48 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Slit.aslc | > 64 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Spcr.aslc | > 81 + > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | > 166 ++ > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | > 375 ++++ > 31 files changed, 10641 insertions(+) > > diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc > index 3f6f1ff20d..392225250f 100644 > --- a/Platform/Hisilicon/D06/D06.dsc > +++ b/Platform/Hisilicon/D06/D06.dsc > @@ -336,6 +336,7 @@ > MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf > > + Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf > Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf > > # > diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf > index bc016a32ae..586e9ed77e 100644 > --- a/Platform/Hisilicon/D06/D06.fdf > +++ b/Platform/Hisilicon/D06/D06.fdf > @@ -249,6 +249,7 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > INF Silicon/Hisilicon/Drivers/HisiAcpiPlatformDxe/AcpiPlatformDxe.inf > > + INF RuleOverride=ACPITABLE > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf > INF Silicon/Hisilicon/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf > > # > diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf > b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf > new file mode 100644 > index 0000000000..6229398a17 > --- /dev/null > +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/AcpiTablesHi1620.inf > @@ -0,0 +1,59 @@ > +## @file > +# > +# ACPI table data and ASL sources required to boot the platform. > +# > +# Copyright (c) 2014, ARM Ltd. All rights reserved. > +# Copyright (c) 2018, Hisilicon Limited. All rights reserved. > +# Copyright (c) 2018, 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. > +# > +# Based on the files under ArmPlatformPkg/ArmJunoPkg/AcpiTables/ > +# > +## > + > +[Defines] > + INF_VERSION = 0x0001001A > + BASE_NAME = Hi1620AcpiTables > + FILE_GUID = 7E374E25-8E01-4FEE-87F2-390C23C606CD > + MODULE_TYPE = USER_DEFINED > + VERSION_STRING = 1.0 > + > +[Sources] > + Dsdt/DsdtHi1620.asl > + Facs.aslc > + Fadt.aslc > + Gtdt.aslc > + MadtHi1620.aslc > + Hi1620Mcfg.aslc > + Hi1620Iort.asl > + Hi1620IortNoSmmu.asl > + Hi1620Slit.aslc > + Hi1620Srat.aslc > + Hi1620Spcr.aslc > + Hi1620Dbg2.aslc Please sort source files alphabetically. Other than that, Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org> / Leif > + > +[Packages] > + ArmPkg/ArmPkg.dec > + ArmPlatformPkg/ArmPlatformPkg.dec > + EmbeddedPkg/EmbeddedPkg.dec > + MdeModulePkg/MdeModulePkg.dec > + MdePkg/MdePkg.dec > + Silicon/Hisilicon/HisiPkg.dec > + > +[FixedPcd] > + gArmPlatformTokenSpaceGuid.PcdCoreCount > + gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase > + gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum > + gArmTokenSpaceGuid.PcdArmArchTimerIntrNum > + gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum > + gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum > + gArmTokenSpaceGuid.PcdGicDistributorBase > + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase > + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel