From 5c5f211b5b6e042637cf0256d2040ea66dadc8e9 Mon Sep 17 00:00:00 2001
From: Raul E Rangel <rrangel@chromium.org>
Date: Thu, 11 Feb 2021 16:00:22 -0700
Subject: [PATCH] soc/amd: Move aoac.asl from picasso into common

I also removed the unnecessary #include in soc.asl.

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: Ifbd79871fd49b18f45d97f64ccd68fa96eaaebce
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50572
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Mathew King <mathewk@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/amd/{picasso => common}/acpi/aoac.asl | 0
 src/soc/amd/picasso/acpi/sb_fch.asl           | 2 +-
 src/soc/amd/picasso/acpi/soc.asl              | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename src/soc/amd/{picasso => common}/acpi/aoac.asl (100%)

diff --git a/src/soc/amd/picasso/acpi/aoac.asl b/src/soc/amd/common/acpi/aoac.asl
similarity index 100%
rename from src/soc/amd/picasso/acpi/aoac.asl
rename to src/soc/amd/common/acpi/aoac.asl
diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index 6c3c51dedf..926bf10c39 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <soc/amd/common/acpi/aoac.asl>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <amdblocks/acpimmio_map.h>
-#include <aoac.asl>
 
 Device (AAHB)
 {
diff --git a/src/soc/amd/picasso/acpi/soc.asl b/src/soc/amd/picasso/acpi/soc.asl
index b3b036ea7d..b411c20ba4 100644
--- a/src/soc/amd/picasso/acpi/soc.asl
+++ b/src/soc/amd/picasso/acpi/soc.asl
@@ -11,9 +11,6 @@ Device(PCI0) {
 /* Describe PCI INT[A-H] for the Southbridge */
 #include "pci_int.asl"
 
-/* Describe the AOAC devices */
-#include "aoac.asl"
-
 /* Describe the devices in the Southbridge */
 #include "sb_fch.asl"