On Fri, Aug 24, 2018 at 12:07:13AM +0800, Ming Huang wrote: > ARM_ACPI_HEADER is used by a unify module in HwPkg, > so move some macro to PlatformArch.h for unify D0x. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]> 1,3-5/31 pushed as: 342330470f..1d331a2eaa / Leif > --- > Silicon/Hisilicon/Hi1610/Hi1610.dec | 23 > +++++++++++++++++ > Silicon/Hisilicon/Hi1616/Hi1616.dec | 23 > +++++++++++++++++ > Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf | 2 +- > Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 2 +- > Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h | 27 > +++----------------- > Silicon/Hisilicon/Hi1610/Include/PlatformArch.h | 24 > +++++++++++++++++ > Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h | 24 > +---------------- > Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 23 > +++++++++++++++++ > 8 files changed, 99 insertions(+), 49 deletions(-) > > diff --git a/Silicon/Hisilicon/Hi1610/Hi1610.dec > b/Silicon/Hisilicon/Hi1610/Hi1610.dec > new file mode 100644 > index 0000000000..6ea4867662 > --- /dev/null > +++ b/Silicon/Hisilicon/Hi1610/Hi1610.dec > @@ -0,0 +1,23 @@ > +#/** @file > +# > +# 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. > +# > +#**/ > + > +[Defines] > + DEC_SPECIFICATION = 0x0001001A > + PACKAGE_NAME = Hi1610Pkg > + PACKAGE_GUID = 0063d37d-adab-47b4-9926-af83539ea167 > + PACKAGE_VERSION = 0.1 > + > +[Includes] > + Include > diff --git a/Silicon/Hisilicon/Hi1616/Hi1616.dec > b/Silicon/Hisilicon/Hi1616/Hi1616.dec > new file mode 100644 > index 0000000000..7dad0ab91a > --- /dev/null > +++ b/Silicon/Hisilicon/Hi1616/Hi1616.dec > @@ -0,0 +1,23 @@ > +#/** @file > +# > +# 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. > +# > +#**/ > + > +[Defines] > + DEC_SPECIFICATION = 0x0001001A > + PACKAGE_NAME = Hi1616Pkg > + PACKAGE_GUID = 8a64c436-bcd6-4850-9de3-f9c922bb815a > + PACKAGE_VERSION = 0.1 > + > +[Includes] > + Include > diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf > b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf > index 9577d96b23..caef3da460 100644 > --- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf > +++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf > @@ -40,7 +40,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - > + Silicon/Hisilicon/Hi1610/Hi1610.dec > Silicon/Hisilicon/HisiPkg.dec > > [FixedPcd] > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > index bb279c8e42..d313936b89 100644 > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf > @@ -43,7 +43,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - > + Silicon/Hisilicon/Hi1616/Hi1616.dec > Silicon/Hisilicon/HisiPkg.dec > > [FixedPcd] > diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h > b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h > index 5a95b02055..4b1e4d3aad 100644 > --- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h > +++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h > @@ -1,8 +1,8 @@ > /** @file > * > * Copyright (c) 2011-2015, ARM Limited. All rights reserved. > -* Copyright (c) 2015, Hisilicon Limited. All rights reserved. > -* Copyright (c) 2015, Linaro Limited. All rights reserved. > +* Copyright (c) 2015-2018, Hisilicon Limited. All rights reserved. > +* Copyright (c) 2015-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 > @@ -20,28 +20,7 @@ > #ifndef _HI1610_PLATFORM_H_ > #define _HI1610_PLATFORM_H_ > > -// > -// ACPI table information used to initialize tables. > -// > -#define EFI_ACPI_ARM_OEM_ID 'H','I','S','I',' ',' ' // OEMID 6 > bytes long > -#define EFI_ACPI_ARM_OEM_TABLE_ID SIGNATURE_64('H','I','P','0','6',' ',' > ',' ') // OEM table id 8 bytes long > -#define EFI_ACPI_ARM_OEM_REVISION 0x00000000 > -#define EFI_ACPI_ARM_CREATOR_ID SIGNATURE_32('I','N','T','L') > -#define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124 > - > -// A macro to initialise the common header part of EFI ACPI tables as > defined by > -// EFI_ACPI_DESCRIPTION_HEADER structure. > -#define ARM_ACPI_HEADER(Signature, Type, Revision) { \ > - Signature, /* UINT32 Signature */ \ > - sizeof (Type), /* UINT32 Length */ \ > - Revision, /* UINT8 Revision */ \ > - 0, /* UINT8 Checksum */ \ > - { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \ > - EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \ > - EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \ > - EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \ > - EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \ > - } > +#include <PlatformArch.h> > > #define HI1610_WATCHDOG_COUNT 2 > > diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > index 4bd3a85584..2ff076901e 100644 > --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h > @@ -32,5 +32,29 @@ > > #define S1_BASE 0x40000000000 > > + > +// > +// ACPI table information used to initialize tables. > +// > +#define EFI_ACPI_ARM_OEM_ID 'H','I','S','I',' ',' ' // OEMID 6 > bytes long > +#define EFI_ACPI_ARM_OEM_TABLE_ID SIGNATURE_64 ('H','I','P','0','6',' > ',' ',' ') // OEM table id 8 bytes long > +#define EFI_ACPI_ARM_OEM_REVISION 0x00000000 > +#define EFI_ACPI_ARM_CREATOR_ID SIGNATURE_32 ('I','N','T','L') > +#define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124 > + > +// A macro to initialise the common header part of EFI ACPI tables as > defined by > +// EFI_ACPI_DESCRIPTION_HEADER structure. > +#define ARM_ACPI_HEADER(Signature, Type, Revision) { \ > + Signature, /* UINT32 Signature */ \ > + sizeof (Type), /* UINT32 Length */ \ > + Revision, /* UINT8 Revision */ \ > + 0, /* UINT8 Checksum */ \ > + { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \ > + EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \ > + EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \ > + EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \ > + EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \ > + } > + > #endif > > diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h > b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h > index ad73aa2668..455cc191f0 100644 > --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h > +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h > @@ -21,29 +21,7 @@ > #define _HI1610_PLATFORM_H_ > > #include <IndustryStandard/Acpi.h> > - > -// > -// ACPI table information used to initialize tables. > -// > -#define EFI_ACPI_ARM_OEM_ID 'H','I','S','I',' ',' ' // OEMID 6 > bytes long > -#define EFI_ACPI_ARM_OEM_TABLE_ID SIGNATURE_64('H','I','P','0','7',' ',' > ',' ') // OEM table id 8 bytes long > -#define EFI_ACPI_ARM_OEM_REVISION 0x00000000 > -#define EFI_ACPI_ARM_CREATOR_ID SIGNATURE_32('I','N','T','L') > -#define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124 > - > -// A macro to initialise the common header part of EFI ACPI tables as > defined by > -// EFI_ACPI_DESCRIPTION_HEADER structure. > -#define ARM_ACPI_HEADER(Signature, Type, Revision) { \ > - Signature, /* UINT32 Signature */ \ > - sizeof (Type), /* UINT32 Length */ \ > - Revision, /* UINT8 Revision */ \ > - 0, /* UINT8 Checksum */ \ > - { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \ > - EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \ > - EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \ > - EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \ > - EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \ > - } > +#include <PlatformArch.h> > > #define HI1616_WATCHDOG_COUNT 2 > #define HI1616_GIC_STRUCTURE_COUNT 64 > diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > index 6105749b15..60a60593be 100644 > --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h > @@ -32,5 +32,28 @@ > > #define S1_BASE 0x40000000000 > > +// > +// ACPI table information used to initialize tables. > +// > +#define EFI_ACPI_ARM_OEM_ID 'H','I','S','I',' ',' ' // OEMID 6 > bytes long > +#define EFI_ACPI_ARM_OEM_TABLE_ID SIGNATURE_64 ('H','I','P','0','7',' > ',' ',' ') // OEM table id 8 bytes long > +#define EFI_ACPI_ARM_OEM_REVISION 0x00000000 > +#define EFI_ACPI_ARM_CREATOR_ID SIGNATURE_32 ('I','N','T','L') > +#define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124 > + > +// A macro to initialise the common header part of EFI ACPI tables as > defined by > +// EFI_ACPI_DESCRIPTION_HEADER structure. > +#define ARM_ACPI_HEADER(Signature, Type, Revision) { \ > + Signature, /* UINT32 Signature */ \ > + sizeof (Type), /* UINT32 Length */ \ > + Revision, /* UINT8 Revision */ \ > + 0, /* UINT8 Checksum */ \ > + { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \ > + EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \ > + EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \ > + EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \ > + EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \ > + } > + > #endif > > -- > 2.18.0 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
