Skip to content

Commit

Permalink
ACPI: Revert back to stock tables temporarily
Browse files Browse the repository at this point in the history
gus33000 committed Aug 29, 2021
1 parent 3c533e7 commit 7380f45
Showing 62 changed files with 50 additions and 708 deletions.
Binary file removed AcpiTables/8992/builtin/CSRT.aml
Binary file not shown.
Binary file removed AcpiTables/8992/builtin/DBG2.aml
Binary file not shown.
Binary file modified AcpiTables/8992/builtin/DSDT.aml
Binary file not shown.
Binary file removed AcpiTables/8992/builtin/GTDT.aml
Binary file not shown.
Binary file modified AcpiTables/8992/builtin/MCFG.aml
Binary file not shown.
Binary file added AcpiTables/8992/builtin/SSDT.aml
Binary file not shown.
Binary file removed AcpiTables/8992/builtin/TPM2.aml
Binary file not shown.
13 changes: 0 additions & 13 deletions AcpiTables/8992/src/TPM2.asl

This file was deleted.

Binary file removed AcpiTables/8994/builtin/CSRT.aml
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/DBG2.aml
Binary file not shown.
Binary file modified AcpiTables/8994/builtin/DSDT.aml
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/FACS.aml
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/FADT.NoPsci.acpi
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/FADT.PsciSmc.acpi
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/FADT.acpi
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/FPDT.aml
Binary file not shown.
Binary file modified AcpiTables/8994/builtin/MCFG.aml
Binary file not shown.
Binary file added AcpiTables/8994/builtin/SSDT.aml
Binary file not shown.
Binary file removed AcpiTables/8994/builtin/TPM2.aml
Binary file not shown.
40 changes: 0 additions & 40 deletions AcpiTables/8994/src/CSRT.asl

This file was deleted.

184 changes: 0 additions & 184 deletions AcpiTables/8994/src/DBG2.asl

This file was deleted.

13 changes: 0 additions & 13 deletions AcpiTables/8994/src/FACS.asl

This file was deleted.

16 changes: 0 additions & 16 deletions AcpiTables/8994/src/FPDT.asl

This file was deleted.

63 changes: 0 additions & 63 deletions AcpiTables/8994/src/GTDT.asl

This file was deleted.

Binary file removed AcpiTables/Hapanero/builtin/CSRT.aml
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/DBG2.aml
Binary file not shown.
Binary file modified AcpiTables/Hapanero/builtin/DSDT.aml
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/FACS.aml
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/FADT.NoPsci.acpi
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/FADT.PsciSmc.acpi
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/FADT.acpi
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/FPDT.aml
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/GTDT.aml
Binary file not shown.
Binary file modified AcpiTables/Hapanero/builtin/MCFG.aml
Binary file not shown.
Binary file added AcpiTables/Hapanero/builtin/SSDT.aml
Binary file not shown.
Binary file removed AcpiTables/Hapanero/builtin/TPM2.aml
Binary file not shown.
40 changes: 0 additions & 40 deletions AcpiTables/Hapanero/src/CSRT.asl

This file was deleted.

184 changes: 0 additions & 184 deletions AcpiTables/Hapanero/src/DBG2.asl

This file was deleted.

13 changes: 0 additions & 13 deletions AcpiTables/Hapanero/src/FACS.asl

This file was deleted.

16 changes: 0 additions & 16 deletions AcpiTables/Hapanero/src/FPDT.asl

This file was deleted.

63 changes: 0 additions & 63 deletions AcpiTables/Hapanero/src/GTDT.asl

This file was deleted.

13 changes: 0 additions & 13 deletions AcpiTables/Hapanero/src/TPM2.asl

This file was deleted.

Binary file added AcpiTables/common/builtin/CSRT.aml
Binary file not shown.
Binary file added AcpiTables/common/builtin/DBG2.aml
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file added AcpiTables/common/builtin/TPM2.aml
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions Lumia950.fdf
Original file line number Diff line number Diff line change
@@ -136,18 +136,18 @@ READ_LOCK_STATUS = TRUE

# ACPI Tables
FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/CSRT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/DBG2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/CSRT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/DBG2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FACS.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FADT.PsciSmc.acpi
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FPDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/GTDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/TPM2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/DSDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FACS.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FADT.PsciSmc.acpi
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/FPDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/GTDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/MADT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/MCFG.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/PPTT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/TPM2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/generated/SSDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8992/builtin/SSDT.aml
SECTION UI = "AcpiTables"
}

16 changes: 8 additions & 8 deletions Lumia950XL.fdf
Original file line number Diff line number Diff line change
@@ -136,18 +136,18 @@ READ_LOCK_STATUS = TRUE

# ACPI Tables
FILE FREEFORM = 7E374E25-8E01-4FEE-87F2-390C23C606CD {
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/CSRT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/DBG2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/CSRT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/DBG2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FACS.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FADT.PsciSmc.acpi
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/FPDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/GTDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/common/builtin/TPM2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/DSDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FACS.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FADT.PsciSmc.acpi
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/FPDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/GTDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/MADT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/MCFG.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/PPTT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/TPM2.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/generated/SSDT.aml
SECTION RAW = Lumia950XLPkg/AcpiTables/8994/builtin/SSDT.aml
SECTION UI = "AcpiTables"
}

18 changes: 9 additions & 9 deletions Tools/PsModules/redirector.psm1
Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@
# This script module provides shared utilities.
#

function Get-AcpiToolsPath {
$iaslPath = which "iasl"
if ($null -eq $iaslPath) {
Write-Error -Message "ACPI tools are not present on this system."
return $null
}

return $iaslPath
}
# function Get-AcpiToolsPath {
# $iaslPath = which "iasl"
# if ($null -eq $iaslPath) {
# Write-Error -Message "ACPI tools are not present on this system."
# return $null
# }
#
# return $iaslPath
# }

function Get-GnuAarch64CrossCollectionPath {
param(
42 changes: 21 additions & 21 deletions Tools/edk2-build.ps1
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ $env:GCC5_AARCH64_PREFIX = $ccprefix
Write-Output "Use GCC at $($ccprefix) to run builds."

# Probe iASL
$iaslpath = Get-AcpiToolsPath
if ($null -eq $iaslpath) { return -1 }
Write-Output "Use iASL at $($iaslpath) to compile SSDTs."
# $iaslpath = Get-AcpiToolsPath
# if ($null -eq $iaslpath) { return -1 }
# Write-Output "Use iASL at $($iaslpath) to compile SSDTs."

# Build base tools if not exist (dev).
if (((Test-Path -Path "BaseTools") -eq $false) -or ($Clean -eq $true)) {
@@ -137,24 +137,24 @@ if ($commit) {

# Build SSDT tables
# Because this is quick enough, we build for any possible platforms
$ssdts = Get-ChildItem Lumia950XLPkg/AcpiTables/**/src/SSDT*.asl
if ($null -ne $ssdts) {
foreach ($ssdt in $ssdts) {
Write-Output "Build $($ssdt)."
$srcDir = [System.IO.Path]::GetDirectoryName($ssdt)
$fileName = [System.IO.Path]::GetFileNameWithoutExtension($ssdt)
$outDir = "$($srcDir)/../generated"
if (!(Test-Path -Path $outDir)) {
New-Item -ItemType Directory -Force -Path $outDir
}

. $iaslpath -p "$($outDir)/$($fileName).aml" $ssdt
if (-not $?) {
Write-Error "Build SSDT $($ssdt) failed."
return $?
}
}
}
# $ssdts = Get-ChildItem Lumia950XLPkg/AcpiTables/**/src/SSDT*.asl
# if ($null -ne $ssdts) {
# foreach ($ssdt in $ssdts) {
# Write-Output "Build $($ssdt)."
# $srcDir = [System.IO.Path]::GetDirectoryName($ssdt)
# $fileName = [System.IO.Path]::GetFileNameWithoutExtension($ssdt)
# $outDir = "$($srcDir)/../generated"
# if (!(Test-Path -Path $outDir)) {
# New-Item -ItemType Directory -Force -Path $outDir
# }
#
# . $iaslpath -p "$($outDir)/$($fileName).aml" $ssdt
# if (-not $?) {
# Write-Error "Build SSDT $($ssdt) failed."
# return $?
# }
# }
# }

foreach ($target in $availableTargets) {
Write-Output "Build Lumia950XLPkg for $($target) (Release = $($Release))."
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -27,11 +27,11 @@ steps:

# Build iASL tool from repository
# Eventually we will just install prepackaged version
- script: git clone https://github.com/acpica/acpica acpica-tools
displayName: 'Checkout ACPICA tools repository'
# - script: git clone https://github.com/acpica/acpica acpica-tools
# displayName: 'Checkout ACPICA tools repository'

- script: cd acpica-tools && make clean && make && sudo make install && cd ..
displayName: 'Build and install ACPICA tools'
# - script: cd acpica-tools && make clean && make && sudo make install && cd ..
# displayName: 'Build and install ACPICA tools'

- script: sudo ./Tools/CI/Bootstrapper/Stage0.sh
displayName: 'Prepare pre-build environment, phase 0'

0 comments on commit 7380f45

Please sign in to comment.