Attention is currently required from: Arthur Heymans, Christian Walter, Johnny Lin, Jonathan Zhang, Lean Sheng Tan, Morgan Jang, Patrick Rudolph, Tim Chu.
Shuo Liu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82033?usp=email )
Change subject: soc/intel/xeon_sp/acpi: Refactor Xeon-SP ASL file location ......................................................................
soc/intel/xeon_sp/acpi: Refactor Xeon-SP ASL file location
soc/intel/xeon_sp/acpi/*.asl are actually used only by SKX and CPX platforms and not forward compatible to later SoC generations. Move them to soc/intel/xeon_sp/acpi/gen1/ for clean maintenance.
TEST=Build and boot on intel/archercity CRB
Change-Id: Ib060b123ab0fd761f00d9a0573e9b73d600ea9ef Signed-off-by: Shuo Liu shuo.liu@intel.com --- M src/mainboard/intel/cedarisland_crb/dsdt.asl M src/mainboard/ocp/deltalake/dsdt.asl M src/mainboard/ocp/tiogapass/dsdt.asl R src/soc/intel/xeon_sp/acpi/gen1/gpio.asl R src/soc/intel/xeon_sp/acpi/gen1/iiostack.asl R src/soc/intel/xeon_sp/acpi/gen1/pch.asl R src/soc/intel/xeon_sp/acpi/gen1/pch_irq.asl R src/soc/intel/xeon_sp/acpi/gen1/pci_irqs.asl R src/soc/intel/xeon_sp/acpi/gen1/southcluster.asl R src/soc/intel/xeon_sp/acpi/gen1/uncore.asl R src/soc/intel/xeon_sp/acpi/gen1/uncore_irq.asl 11 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/82033/1
diff --git a/src/mainboard/intel/cedarisland_crb/dsdt.asl b/src/mainboard/intel/cedarisland_crb/dsdt.asl index 3d83217..59ce66c 100644 --- a/src/mainboard/intel/cedarisland_crb/dsdt.asl +++ b/src/mainboard/intel/cedarisland_crb/dsdt.asl @@ -22,7 +22,7 @@ { Device (PCI0) { - #include <soc/intel/xeon_sp/acpi/southcluster.asl> + #include <soc/intel/xeon_sp/acpi/gen1/southcluster.asl> #include <soc/intel/common/block/acpi/acpi/lpc.asl>
} diff --git a/src/mainboard/ocp/deltalake/dsdt.asl b/src/mainboard/ocp/deltalake/dsdt.asl index c1e8bee..8442319 100644 --- a/src/mainboard/ocp/deltalake/dsdt.asl +++ b/src/mainboard/ocp/deltalake/dsdt.asl @@ -20,11 +20,11 @@ #include <cpu/intel/common/acpi/cpu.asl>
// CPX-SP ACPI tables - #include <soc/intel/xeon_sp/acpi/uncore.asl> + #include <soc/intel/xeon_sp/acpi/gen1/uncore.asl>
// LPC related entries Scope (_SB.PC00) { - #include <soc/intel/xeon_sp/acpi/pch.asl> + #include <soc/intel/xeon_sp/acpi/gen1/pch.asl> } } diff --git a/src/mainboard/ocp/tiogapass/dsdt.asl b/src/mainboard/ocp/tiogapass/dsdt.asl index 06145c4..49f20f1 100644 --- a/src/mainboard/ocp/tiogapass/dsdt.asl +++ b/src/mainboard/ocp/tiogapass/dsdt.asl @@ -15,9 +15,9 @@ #include "acpi/platform.asl" #include <soc/intel/common/block/acpi/acpi/globalnvs.asl> #include <cpu/intel/common/acpi/cpu.asl> - #include <soc/intel/xeon_sp/acpi/uncore.asl> + #include <soc/intel/xeon_sp/acpi/gen1/uncore.asl> Scope (_SB.PC00) { - #include <soc/intel/xeon_sp/acpi/pch.asl> + #include <soc/intel/xeon_sp/acpi/gen1/pch.asl> } } diff --git a/src/soc/intel/xeon_sp/acpi/gpio.asl b/src/soc/intel/xeon_sp/acpi/gen1/gpio.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/gpio.asl rename to src/soc/intel/xeon_sp/acpi/gen1/gpio.asl diff --git a/src/soc/intel/xeon_sp/acpi/iiostack.asl b/src/soc/intel/xeon_sp/acpi/gen1/iiostack.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/iiostack.asl rename to src/soc/intel/xeon_sp/acpi/gen1/iiostack.asl diff --git a/src/soc/intel/xeon_sp/acpi/pch.asl b/src/soc/intel/xeon_sp/acpi/gen1/pch.asl similarity index 81% rename from src/soc/intel/xeon_sp/acpi/pch.asl rename to src/soc/intel/xeon_sp/acpi/gen1/pch.asl index fef68b0..93d468a 100644 --- a/src/soc/intel/xeon_sp/acpi/pch.asl +++ b/src/soc/intel/xeon_sp/acpi/gen1/pch.asl @@ -3,7 +3,7 @@ /* This file should be included in the proper platform ACPI _SB PCI scope */
/* GPIO */ -#include <soc/intel/xeon_sp/acpi/gpio.asl> +#include <soc/intel/xeon_sp/acpi/gen1/gpio.asl>
/* LPC 0:1f.0 */ #include <soc/intel/common/block/acpi/acpi/lpc.asl> diff --git a/src/soc/intel/xeon_sp/acpi/pch_irq.asl b/src/soc/intel/xeon_sp/acpi/gen1/pch_irq.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/pch_irq.asl rename to src/soc/intel/xeon_sp/acpi/gen1/pch_irq.asl diff --git a/src/soc/intel/xeon_sp/acpi/pci_irqs.asl b/src/soc/intel/xeon_sp/acpi/gen1/pci_irqs.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/pci_irqs.asl rename to src/soc/intel/xeon_sp/acpi/gen1/pci_irqs.asl diff --git a/src/soc/intel/xeon_sp/acpi/southcluster.asl b/src/soc/intel/xeon_sp/acpi/gen1/southcluster.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/southcluster.asl rename to src/soc/intel/xeon_sp/acpi/gen1/southcluster.asl diff --git a/src/soc/intel/xeon_sp/acpi/uncore.asl b/src/soc/intel/xeon_sp/acpi/gen1/uncore.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/uncore.asl rename to src/soc/intel/xeon_sp/acpi/gen1/uncore.asl diff --git a/src/soc/intel/xeon_sp/acpi/uncore_irq.asl b/src/soc/intel/xeon_sp/acpi/gen1/uncore_irq.asl similarity index 100% rename from src/soc/intel/xeon_sp/acpi/uncore_irq.asl rename to src/soc/intel/xeon_sp/acpi/gen1/uncore_irq.asl