This patch fixes some minor casing and file path issues with the AcpiToolPkg from Yao Jiewen (https://github.com/jyao1/EdkiiShellTool).
This patch also adds AARCH64 as one of the supported architectures on which AcpiTool can run. Compiled and tested this patch under the following environment: - Compiled for AARCH64 architecture using GCC4.9 toolchain from Linaro. - Exercised the 'DumpACPI.efi' thus generated on Qemu for AARCH64 as an application. - Able to dump all relevant ACPI tables. This patch is also available here for easy access: https://github.com/bhupesh-sharma/EdkiiShellTool Cc: Ni Ruiyu <ruiyu...@intel.com> Cc: Evan Lloyd <evan.ll...@arm.com> Cc: Sami Mujawar <sami.muja...@arm.com> Cc: Yao Jiewen <jiewen....@intel.com> Signed-off-by: Bhupesh Sharma <bhsha...@redhat.com> Contributed-under: TianoCore Contribution Agreement 1.0 --- AcpiToolPkg/AcpiToolPkg.dsc | 2 +- AcpiToolPkg/DumpAcpi/DumpACPI.c | 2 +- AcpiToolPkg/DumpAcpi/DumpACPI.h | 2 +- AcpiToolPkg/DumpAcpi/DumpAcpiDSDT.c | 2 +- AcpiToolPkg/DumpAcpi/DumpAcpiPSDT.c | 2 +- AcpiToolPkg/DumpAcpi/DumpAcpiSSDT.c | 2 +- AcpiToolPkg/Library/DumpAcpi/DumpAcpiDMARLib/DumpAcpiDMARLib.c | 2 +- .../Library/DumpAcpi/DumpAcpiTableFuncLib/DumpAcpiTableFuncLib.c | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AcpiToolPkg/AcpiToolPkg.dsc b/AcpiToolPkg/AcpiToolPkg.dsc index 9943f7610315..c0fcec5b2518 100644 --- a/AcpiToolPkg/AcpiToolPkg.dsc +++ b/AcpiToolPkg/AcpiToolPkg.dsc @@ -17,7 +17,7 @@ PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/AcpiToolPkg - SUPPORTED_ARCHITECTURES = IA32|X64 + SUPPORTED_ARCHITECTURES = IA32|X64|AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT diff --git a/AcpiToolPkg/DumpAcpi/DumpACPI.c b/AcpiToolPkg/DumpAcpi/DumpACPI.c index 38cc804a72e9..5ea51e67a260 100644 --- a/AcpiToolPkg/DumpAcpi/DumpACPI.c +++ b/AcpiToolPkg/DumpAcpi/DumpACPI.c @@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Guid/Acpi.h> -#include "DumpAcpi.h" +#include "DumpACPI.h" #define RSDP_SIGN_DEFINITION SIGNATURE_32 ('R', 'S', 'D', 'P') diff --git a/AcpiToolPkg/DumpAcpi/DumpACPI.h b/AcpiToolPkg/DumpAcpi/DumpACPI.h index 40c11e70f443..8307f50ec805 100644 --- a/AcpiToolPkg/DumpAcpi/DumpACPI.h +++ b/AcpiToolPkg/DumpAcpi/DumpACPI.h @@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Base.h> #include <Uefi.h> -#include <IndustryStandard\Acpi.h> +#include <IndustryStandard/Acpi.h> #ifndef MAX_FILE_NAME_LEN #define MAX_FILE_NAME_LEN 0x1000 diff --git a/AcpiToolPkg/DumpAcpi/DumpAcpiDSDT.c b/AcpiToolPkg/DumpAcpi/DumpAcpiDSDT.c index 42541be92081..764f4b6470ba 100644 --- a/AcpiToolPkg/DumpAcpi/DumpAcpiDSDT.c +++ b/AcpiToolPkg/DumpAcpi/DumpAcpiDSDT.c @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/DevicePath.h> #include <Protocol/SimpleFileSystem.h> -#include "DumpAcpi.h" +#include "DumpACPI.h" VOID EFIAPI diff --git a/AcpiToolPkg/DumpAcpi/DumpAcpiPSDT.c b/AcpiToolPkg/DumpAcpi/DumpAcpiPSDT.c index 8878d3f6b594..b28e90f18172 100644 --- a/AcpiToolPkg/DumpAcpi/DumpAcpiPSDT.c +++ b/AcpiToolPkg/DumpAcpi/DumpAcpiPSDT.c @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/DevicePath.h> #include <Protocol/SimpleFileSystem.h> -#include "DumpAcpi.h" +#include "DumpACPI.h" VOID EFIAPI diff --git a/AcpiToolPkg/DumpAcpi/DumpAcpiSSDT.c b/AcpiToolPkg/DumpAcpi/DumpAcpiSSDT.c index 0a268eb136ab..c49b84c18ee0 100644 --- a/AcpiToolPkg/DumpAcpi/DumpAcpiSSDT.c +++ b/AcpiToolPkg/DumpAcpi/DumpAcpiSSDT.c @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/DevicePath.h> #include <Protocol/SimpleFileSystem.h> -#include "DumpAcpi.h" +#include "DumpACPI.h" VOID EFIAPI diff --git a/AcpiToolPkg/Library/DumpAcpi/DumpAcpiDMARLib/DumpAcpiDMARLib.c b/AcpiToolPkg/Library/DumpAcpi/DumpAcpiDMARLib/DumpAcpiDMARLib.c index 865a213fa706..7d6d8e0b0194 100644 --- a/AcpiToolPkg/Library/DumpAcpi/DumpAcpiDMARLib/DumpAcpiDMARLib.c +++ b/AcpiToolPkg/Library/DumpAcpi/DumpAcpiDMARLib/DumpAcpiDMARLib.c @@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/UefiLib.h> #include <Library/DumpAcpiTableFuncLib.h> #include <IndustryStandard/Acpi.h> -#include <IndustryStandard/DMARemappingReportingTable.h> +#include <IndustryStandard/DmaRemappingReportingTable.h> VOID DumpDmarDeviceScopeEntry ( diff --git a/AcpiToolPkg/Library/DumpAcpi/DumpAcpiTableFuncLib/DumpAcpiTableFuncLib.c b/AcpiToolPkg/Library/DumpAcpi/DumpAcpiTableFuncLib/DumpAcpiTableFuncLib.c index a52a718bfa40..9036926065cb 100644 --- a/AcpiToolPkg/Library/DumpAcpi/DumpAcpiTableFuncLib/DumpAcpiTableFuncLib.c +++ b/AcpiToolPkg/Library/DumpAcpi/DumpAcpiTableFuncLib/DumpAcpiTableFuncLib.c @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ #include <Uefi.h> -#include <Library\BaseMemoryLib.h> -#include <Library\UefiLib.h> -#include <Library\DumpAcpiTableFuncLib.h> +#include <Library/BaseMemoryLib.h> +#include <Library/UefiLib.h> +#include <Library/DumpAcpiTableFuncLib.h> typedef struct { UINT32 Signature; -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel