1 files changed, 1 insertions, 23 deletions
diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c
index 3e75ebef0151..7e207687d30a 100644
--- a/src/soc/amd/picasso/romstage.c
+++ b/src/soc/amd/picasso/romstage.c
@@ -1,38 +1,16 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <acpi/acpi.h>
-#include <amdblocks/acpi.h>
 #include <amdblocks/apob_cache.h>
 #include <amdblocks/memmap.h>
+#include <amdblocks/pmlib.h>
 #include <arch/cpu.h>
-#include <cbmem.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <fsp/api.h>
 #include <program_loading.h>
-#include <soc/acpi.h>
 #include <types.h>
 
-static struct chipset_power_state chipset_state;
-
-static void fill_chipset_state(void)
-{
-	acpi_fill_pm_gpe_state(&chipset_state.gpe_state);
-	gpio_fill_wake_state(&chipset_state.gpio_state);
-}
-
-static void add_chipset_state_cbmem(int unused)
-{
-	struct chipset_power_state *state;
-
-	state = cbmem_add(CBMEM_ID_POWER_STATE, sizeof(*state));
-
-	if (state)
-		memcpy(state, &chipset_state, sizeof(*state));
-}
-
-ROMSTAGE_CBMEM_INIT_HOOK(add_chipset_state_cbmem);
-
 asmlinkage void car_stage_entry(void)
 {
 	post_code(0x40);