3 files changed, 3 insertions, 42 deletions
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
index 2930def1f8..6f62aefe4f 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
@@ -2,6 +2,8 @@
 
 #include <variant/thermal.h>
 
+External (\PPKG, MethodObj)
+
 /* Thermal Zone */
 
 Scope (\_TZ)
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 4c3b6254fd..0a670885f3 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -151,7 +151,5 @@ void generate_cpu_entries(const struct device *device)
 		acpigen_pop_len();
 	}
 
-	acpigen_write_scope("\\");
-	acpigen_write_name_integer("PCNT", cores);
-	acpigen_pop_len();
+	acpigen_write_processor_package("PPKG", 0, cores);
 }
diff --git a/src/soc/amd/stoneyridge/acpi/cpu.asl b/src/soc/amd/stoneyridge/acpi/cpu.asl
index 24b81a13ab..818bcdb4d2 100644
--- a/src/soc/amd/stoneyridge/acpi/cpu.asl
+++ b/src/soc/amd/stoneyridge/acpi/cpu.asl
@@ -4,42 +4,3 @@
 Method (PNOT)
 {
 }
-
-/*
- * Processor Object
- */
-/* These devices are created at runtime */
-External (\PCNT, IntObj)
-External (\_SB.P000, DeviceObj)
-External (\_SB.P001, DeviceObj)
-External (\_SB.P002, DeviceObj)
-External (\_SB.P003, DeviceObj)
-External (\_SB.P004, DeviceObj)
-External (\_SB.P005, DeviceObj)
-External (\_SB.P006, DeviceObj)
-External (\_SB.P007, DeviceObj)
-
-/* Return a package containing enabled processor entries */
-Method (PPKG)
-{
-	If (\PCNT >= 4) {
-		Return (Package ()
-		{
-			\_SB.P000,
-			\_SB.P001,
-			\_SB.P002,
-			\_SB.P003
-		})
-	} ElseIf (\PCNT>= 2) {
-		Return (Package ()
-		{
-			\_SB.P000,
-			\_SB.P001
-		})
-	} Else {
-		Return (Package ()
-		{
-			\_SB.P000
-		})
-	}
-}